summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--add_business.php48
-rw-r--r--add_person.php35
-rwxr-xr-xedit.php9
-rwxr-xr-xincludes/classes/Contact.php4
-rw-r--r--templates/add_business.tpl45
-rw-r--r--templates/add_person.tpl53
-rwxr-xr-xtemplates/contact_date_bar.tpl1
-rwxr-xr-xtemplates/display_contact.tpl34
-rwxr-xr-xtemplates/display_type_header.tpl4
-rwxr-xr-xtemplates/edit.tpl29
-rwxr-xr-xtemplates/edit_type_header.tpl4
-rwxr-xr-xtemplates/menu_contact.tpl3
-rwxr-xr-xtemplates/view_xref_address_item.tpl16
-rwxr-xr-xtemplates/view_xref_bank_item.tpl14
-rwxr-xr-xtemplates/view_xref_contact_item.tpl12
-rwxr-xr-xtemplates/view_xref_date_item.tpl14
-rwxr-xr-xtemplates/view_xref_image_item.tpl14
-rwxr-xr-xtemplates/view_xref_inc_report_item.tpl8
-rwxr-xr-xtemplates/view_xref_locate_item.tpl14
-rwxr-xr-xtemplates/view_xref_phone_item.tpl14
-rwxr-xr-xtemplates/view_xref_sig_item.tpl14
-rwxr-xr-xtemplates/view_xref_text_item.tpl12
22 files changed, 307 insertions, 94 deletions
diff --git a/add_business.php b/add_business.php
new file mode 100644
index 0000000..4164768
--- /dev/null
+++ b/add_business.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package contact
+ * @subpackage functions
+ */
+
+use Bitweaver\Contact\Contact;
+use Bitweaver\KernelTools;
+
+require_once '../kernel/includes/setup_inc.php';
+
+global $gBitSystem, $gBitSmarty, $gBitUser;
+
+$gBitSystem->verifyPackage( 'contact' );
+$gBitSystem->verifyPermission( 'p_contact_update' );
+
+$gContent = new Contact();
+
+if( !empty( $_REQUEST['fCancel'] ) ) {
+ KernelTools::bit_redirect( CONTACT_PKG_URL );
+ die;
+}
+
+if( !empty( $_REQUEST['fSaveContact'] ) ) {
+ $types = [];
+ if( !empty( $_REQUEST['contact_types'] ) && is_array( $_REQUEST['contact_types'] ) ) {
+ foreach( $_REQUEST['contact_types'] as $type ) {
+ if( $type !== '$00' ) {
+ $types[] = $type;
+ }
+ }
+ }
+ $_REQUEST['contact_types'] = $types;
+ if( $gContent->store( $_REQUEST ) ) {
+ KernelTools::bit_redirect( CONTACT_PKG_URL.'edit.php?content_id='.$gContent->mContentId );
+ die;
+ }
+}
+
+// Load all business-relevant types ($01 and above) for optional checkboxes
+$allTypes = $gContent->getXrefSourceList();
+$businessTypes = array_filter( $allTypes, fn($t) => $t['item'] !== '$00' && $t['item'] !== '$01' );
+
+$gBitSmarty->assign( 'gContent', $gContent );
+$gBitSmarty->assign( 'businessTypes', array_values( $businessTypes ) );
+$gBitSmarty->assign( 'errors', $gContent->mErrors );
+
+$gBitSystem->display( 'bitpackage:contact/add_business.tpl', KernelTools::tra( 'Add Business' ), [ 'display_mode' => 'edit' ] );
diff --git a/add_person.php b/add_person.php
new file mode 100644
index 0000000..eda69c7
--- /dev/null
+++ b/add_person.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package contact
+ * @subpackage functions
+ */
+
+use Bitweaver\Contact\Contact;
+use Bitweaver\KernelTools;
+
+require_once '../kernel/includes/setup_inc.php';
+
+global $gBitSystem, $gBitSmarty, $gBitUser;
+
+$gBitSystem->verifyPackage( 'contact' );
+$gBitSystem->verifyPermission( 'p_contact_update' );
+
+$gContent = new Contact();
+
+if( !empty( $_REQUEST['fCancel'] ) ) {
+ KernelTools::bit_redirect( CONTACT_PKG_URL );
+ die;
+}
+
+if( !empty( $_REQUEST['fSaveContact'] ) ) {
+ $_REQUEST['contact_types'] = [ '$00' ];
+ if( $gContent->store( $_REQUEST ) ) {
+ KernelTools::bit_redirect( CONTACT_PKG_URL.'edit.php?content_id='.$gContent->mContentId );
+ die;
+ }
+}
+
+$gBitSmarty->assign( 'gContent', $gContent );
+$gBitSmarty->assign( 'errors', $gContent->mErrors );
+
+$gBitSystem->display( 'bitpackage:contact/add_person.tpl', KernelTools::tra( 'Add Person' ), [ 'display_mode' => 'edit' ] );
diff --git a/edit.php b/edit.php
index f62ce5a..b52ddb1 100755
--- a/edit.php
+++ b/edit.php
@@ -69,7 +69,14 @@ if( empty( $formInfo ) ) {
$formInfo = &$gContent->mInfo;
}
-$formInfo['contact_type_list'] = $gContent->getXrefSourceList();
+$isPerson = !empty( $gContent->mInfo['contact_types'][0]['content_id'] );
+$gContent->mInfo['contact_xref_groups'] = $gContent->getXrefGroupList();
+$gBitSmarty->assign( 'isPerson', $isPerson );
+
+$allTypes = $gContent->getXrefSourceList();
+$formInfo['contact_type_list'] = $isPerson
+ ? []
+ : array_values( array_filter( $allTypes, fn($t) => $t['item'] > '$01' ) );
$gBitSmarty->assign( 'pageInfo', $formInfo );
$gBitSmarty->assign( 'errors', $gContent->mErrors );
diff --git a/includes/classes/Contact.php b/includes/classes/Contact.php
index bb48666..41a7fbb 100755
--- a/includes/classes/Contact.php
+++ b/includes/classes/Contact.php
@@ -169,7 +169,9 @@ class Contact extends LibertyContent {
else if ( strlen($pParamHash['forename']) > 0 ) $pParamHash['title'] .= ', '.$pParamHash['forename'];
}
}
- $pParamHash['title'] = $pParamHash['organisation'];
+ if( empty( $pParamHash['title'] ) ) {
+ $pParamHash['title'] = $pParamHash['organisation'] ?? '';
+ }
$pParamHash['title'] = trim( $pParamHash['title'] );
$pParamHash['contact_store']['xkey'] = $pParamHash['xkey'];
return count( $this->mErrors ) == 0;
diff --git a/templates/add_business.tpl b/templates/add_business.tpl
new file mode 100644
index 0000000..b696949
--- /dev/null
+++ b/templates/add_business.tpl
@@ -0,0 +1,45 @@
+{strip}
+<div class="edit contact">
+ <div class="header">
+ <h1>{tr}Add Business{/tr}</h1>
+ </div>
+
+ <div class="body">
+ {formfeedback error=$errors}
+
+ {form id="addBusinessForm"}
+ <div class="form-group">
+ {formlabel label="Organisation" for="organisation"}
+ {forminput}
+ <input type="text" class="form-control" name="organisation" id="organisation" value="{$smarty.request.organisation|escape}" />
+ {/forminput}
+ </div>
+
+ {if $businessTypes}
+ <div class="form-group">
+ {formlabel label="Type"}
+ {forminput}
+ {foreach from=$businessTypes item=type}
+ <label class="checkbox">
+ <input type="checkbox" name="contact_types[]" value="{$type.item|escape}" /> {$type.name|escape}
+ </label>
+ {/foreach}
+ {/forminput}
+ </div>
+ {/if}
+
+ <div class="form-group">
+ {formlabel label="Note" for="edit"}
+ {forminput}
+ <input type="text" class="form-control" name="edit" id="edit" value="{$smarty.request.edit|escape}" />
+ {/forminput}
+ </div>
+
+ <div class="form-group submit">
+ <input type="submit" class="btn btn-default" name="fCancel" value="{tr}Cancel{/tr}" />
+ <input type="submit" class="btn btn-primary" name="fSaveContact" value="{tr}Save{/tr}" />
+ </div>
+ {/form}
+ </div>
+</div>
+{/strip}
diff --git a/templates/add_person.tpl b/templates/add_person.tpl
new file mode 100644
index 0000000..079fa5e
--- /dev/null
+++ b/templates/add_person.tpl
@@ -0,0 +1,53 @@
+{strip}
+<div class="edit contact">
+ <div class="header">
+ <h1>{tr}Add Person{/tr}</h1>
+ </div>
+
+ <div class="body">
+ {formfeedback error=$errors}
+
+ {form id="addPersonForm"}
+ <div class="form-group">
+ {formlabel label="Title" for="prefix"}
+ {forminput}
+ <input type="text" class="form-control input-small" name="prefix" id="prefix" value="{$smarty.request.prefix|escape}" placeholder="Mr / Mrs / Dr …" />
+ {/forminput}
+ </div>
+
+ <div class="form-group">
+ {formlabel label="Forename" for="forename"}
+ {forminput}
+ <input type="text" class="form-control" name="forename" id="forename" value="{$smarty.request.forename|escape}" />
+ {/forminput}
+ </div>
+
+ <div class="form-group">
+ {formlabel label="Surname" for="surname"}
+ {forminput}
+ <input type="text" class="form-control" name="surname" id="surname" value="{$smarty.request.surname|escape}" />
+ {/forminput}
+ </div>
+
+ <div class="form-group">
+ {formlabel label="Suffix" for="suffix"}
+ {forminput}
+ <input type="text" class="form-control input-small" name="suffix" id="suffix" value="{$smarty.request.suffix|escape}" />
+ {/forminput}
+ </div>
+
+ <div class="form-group">
+ {formlabel label="Note" for="edit"}
+ {forminput}
+ <input type="text" class="form-control" name="edit" id="edit" value="{$smarty.request.edit|escape}" />
+ {/forminput}
+ </div>
+
+ <div class="form-group submit">
+ <input type="submit" class="btn btn-default" name="fCancel" value="{tr}Cancel{/tr}" />
+ <input type="submit" class="btn btn-primary" name="fSaveContact" value="{tr}Save{/tr}" />
+ </div>
+ {/form}
+ </div>
+</div>
+{/strip}
diff --git a/templates/contact_date_bar.tpl b/templates/contact_date_bar.tpl
index 883a597..6facd39 100755
--- a/templates/contact_date_bar.tpl
+++ b/templates/contact_date_bar.tpl
@@ -5,7 +5,6 @@
{if $print_page ne 'y'}
{if !$lock}
{if $gBitUser->hasPermission('p_edit_contact')}
- {smartlink ititle='Add additional crossref record' ifile="add_xref.php" booticon="icon-note-add" content_id=$gContent->mInfo.content_id group=-1}
{smartlink ititle="Edit Contact" ifile="edit.php" booticon="icon-user-edit" content_id=$gContent->mInfo.content_id}
{/if}
{/if}
diff --git a/templates/display_contact.tpl b/templates/display_contact.tpl
index 0db300c..be3ed4e 100755
--- a/templates/display_contact.tpl
+++ b/templates/display_contact.tpl
@@ -9,20 +9,19 @@
<div class="clear"></div>
</div>
{/if}
- {if isset($gContent->mInfo.name) && ($gContent->mInfo.name <> '') }
+ {if $gContent->mInfo.contact_types.0.content_id}
<div class="form-group">
- {formlabel label="Name" for="name"}
+ {formlabel label="Name"}
{forminput}
- {$gContent->mInfo.name|escape}
+ {$gContent->mInfo.name|escape}
{/forminput}
<div class="clear"></div>
</div>
- {/if}
- {if isset($gContent->mInfo.organisation) && ($gContent->mInfo.organisation <> '') }
+ {else}
<div class="form-group">
- {formlabel label="Organisation" for="organisation"}
+ {formlabel label="Organisation"}
{forminput}
- {$gContent->mInfo.organisation|escape}
+ {$gContent->mInfo.organisation|escape}
{/forminput}
<div class="clear"></div>
</div>
@@ -45,26 +44,21 @@
<div class="clear"></div>
</div>
{/if}
- {section name=address loop=$gContent->mInfo.address}
- {include file="bitpackage:contact/display_address.tpl" header=$gContent->mInfo.address[address].source_title address=$gContent->mInfo.address[address] locate=1}
- {sectionelse}
- <li class="item norecords">
- {tr}No addresses found{/tr}
- {if $gBitUser->hasPermission('p_edit_contact')}
- {smartlink ititle="Add an address record" ifile="add_xref_address.php" booticon="icon-note-add" content_id=$gContent->mInfo.content_id}
- {/if}
- </li>
- {/section}
-
+ {if $gContent->mInfo.data}
<div class="form-group">
- {formlabel label="General Notes" for="data"}
+ {formlabel label="Note"}
{forminput}
{$gContent->mInfo.data}
{/forminput}
</div>
+ {/if}
+
+ {section name=address loop=$gContent->mInfo.address}
+ {include file="bitpackage:contact/display_address.tpl" header=$gContent->mInfo.address[address].source_title address=$gContent->mInfo.address[address] locate=1}
+ {/section}
{jstabs}
{section name=type loop=$gContent->mInfo.type}
- {include file="bitpackage:liberty/list_xref.tpl" source=$gContent->mInfo.type[type].source source_title=$gContent->mInfo.type[type].title group=$gContent->mInfo.type[type].sort_order allow_add=true}
+ {include file="bitpackage:liberty/list_xref.tpl" source=$gContent->mInfo.type[type].source source_title=$gContent->mInfo.type[type].title group=$gContent->mInfo.type[type].sort_order allow_edit=false}
{/section}
{/jstabs}
diff --git a/templates/display_type_header.tpl b/templates/display_type_header.tpl
index 7440659..350ce1c 100755
--- a/templates/display_type_header.tpl
+++ b/templates/display_type_header.tpl
@@ -1,8 +1,8 @@
<div class="form-group">
- {formlabel label="Content Types" for=content_types}
+ {formlabel label="{if $gContent->mInfo.contact_types.0.content_id}Personal Contact{else}Business Contact{/if}"}
{forminput}
{foreach from=$gContent->mInfo.contact_types key=type_id item=type}
- {if isset($type.content_id) }{$type.cross_ref_title}<br/> {/if}
+ {if isset($type.content_id) && $type.item gt '$01'}{$type.cross_ref_title}<br/>{/if}
{/foreach}
{/forminput}
<div class="clear"></div>
diff --git a/templates/edit.tpl b/templates/edit.tpl
index 82a7086..ca3b9cb 100755
--- a/templates/edit.tpl
+++ b/templates/edit.tpl
@@ -51,8 +51,10 @@
<div class="clear"></div>
</div>
- {include file="bitpackage:contact/edit_type_header.tpl"}
-
+ {if !$isPerson}
+ {include file="bitpackage:contact/edit_type_header.tpl"}
+ {/if}
+
{if $gContent->mInfo.name || $gContent->mInfo.contact_types.0.content_id || !isset( $gContent->mInfo.contact_types ) }
<div class="form-group">
{formlabel label="Title" for="prefix"}
@@ -83,7 +85,7 @@
<div class="clear"></div>
</div>
{/if}
- {if $gContent->mInfo.organisation || $gContent->mInfo.contact_types.1.content_id || !isset( $gContent->mInfo.contact_types ) }
+ {if !$isPerson && ( $gContent->mInfo.organisation || !isset( $gContent->mInfo.contact_types ) )}
<div class="form-group">
{formlabel label="Organisation" for="organisation"}
{forminput}
@@ -95,14 +97,21 @@
{* include edit_personal.tpl *}
- <div class="form-group">
- {formlabel label="Note" for="description"}
- {forminput}
- <input size="60" type="text" name="description" id="description" value="{$gContent->mInfo.description|escape}" />
- {/forminput}
- <div class="clear"></div>
- </div>
{/legend}
+
+ {if $gContent->mInfo.contact_xref_groups && $gContent->isValid()}
+ {jstabs}
+ {section name=xrefGroup loop=$gContent->mInfo.contact_xref_groups}
+ {include file=$gContent->getXrefListTemplate($gContent->mInfo.contact_xref_groups[xrefGroup].template)
+ source=$gContent->mInfo.contact_xref_groups[xrefGroup].source
+ source_title=$gContent->mInfo.contact_xref_groups[xrefGroup].title
+ group=$gContent->mInfo.contact_xref_groups[xrefGroup].sort_order
+ allow_add=true
+ allow_edit=true}
+ {/section}
+ {/jstabs}
+ {/if}
+
{/jstab}
{jstab title="Contact Notes"}
diff --git a/templates/edit_type_header.tpl b/templates/edit_type_header.tpl
index 4ca117f..3d42abb 100755
--- a/templates/edit_type_header.tpl
+++ b/templates/edit_type_header.tpl
@@ -3,7 +3,9 @@
{forminput}
{if isset( $gContent->mInfo.contact_types ) }
{foreach from=$gContent->mInfo.contact_types key=type_id item=type}
- <input type="checkbox" name="contact_types[{$type_id}]" value="{$type.item}" {if isset($type.content_id) } checked="checked"{/if} /> {$type.cross_ref_title}<br/>
+ {if $type.item gt '$01'}
+ <input type="checkbox" name="contact_types[{$type_id}]" value="{$type.item}" {if isset($type.content_id) } checked="checked"{/if} /> {$type.cross_ref_title}<br/>
+ {/if}
{/foreach}
{else}
{foreach from=$gContent->mInfo.contact_type_list key=type_id item=type}
diff --git a/templates/menu_contact.tpl b/templates/menu_contact.tpl
index f6602ed..0f362ba 100755
--- a/templates/menu_contact.tpl
+++ b/templates/menu_contact.tpl
@@ -3,7 +3,8 @@
<ul class="{$packageMenuClass}">
<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list.php">{booticon ipackage="icons" iname="icon-telephone" iexplain="List contacts" ilocation=menu}</a></li>
{if $gBitUser->isAdmin() || $gBitUser->hasPermission( 'p_contact_edit' ) }
- <li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}edit.php">{booticon ipackage="icons" iname="icon-telephone-edit" iexplain="Create/Edit a Contact" ilocation=menu}</a></li>
+ <li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}add_person.php">{booticon ipackage="icons" iname="icon-telephone-edit" iexplain="Add Person" ilocation=menu}</a></li>
+ <li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}add_business.php">{booticon ipackage="icons" iname="icon-telephone-edit" iexplain="Add Business" ilocation=menu}</a></li>
{/if}
{if !empty($gContent->mContentId) && $gBitUser->hasPermission( 'p_liberty_post_comments' ) }
<li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}display_contact.php?content_id={$gContent->mContentId}#addcomment">{booticon ipackage="icons" iname="icon-telephone-error" iexplain="Log a call" ilocation=menu}</a></li>
diff --git a/templates/view_xref_address_item.tpl b/templates/view_xref_address_item.tpl
index f8a217c..f6216e4 100755
--- a/templates/view_xref_address_item.tpl
+++ b/templates/view_xref_address_item.tpl
@@ -11,12 +11,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -27,17 +28,18 @@
<span class="actionicon">
{if $gBitUser->hasPermission( 'p_contact_view_detail' )}
{smartlink ititle="View" ifile="view_xref.php" booticon="icon-view" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
- {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
+ {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].item ne 'KEY_B' }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}
diff --git a/templates/view_xref_bank_item.tpl b/templates/view_xref_bank_item.tpl
index 3581d36..1ea9aa3 100755
--- a/templates/view_xref_bank_item.tpl
+++ b/templates/view_xref_bank_item.tpl
@@ -11,12 +11,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -26,15 +27,16 @@
<td>
<span class="actionicon">
{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
- {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
+ {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}
diff --git a/templates/view_xref_contact_item.tpl b/templates/view_xref_contact_item.tpl
index 01a7095..86a0fa1 100755
--- a/templates/view_xref_contact_item.tpl
+++ b/templates/view_xref_contact_item.tpl
@@ -16,12 +16,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -37,14 +38,15 @@
{else}
{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
{/if}
- {/if}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].item ne 'KEY_B' }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}
diff --git a/templates/view_xref_date_item.tpl b/templates/view_xref_date_item.tpl
index 3581d36..1ea9aa3 100755
--- a/templates/view_xref_date_item.tpl
+++ b/templates/view_xref_date_item.tpl
@@ -11,12 +11,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -26,15 +27,16 @@
<td>
<span class="actionicon">
{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
- {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
+ {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}
diff --git a/templates/view_xref_image_item.tpl b/templates/view_xref_image_item.tpl
index 9784fd9..2a4599c 100755
--- a/templates/view_xref_image_item.tpl
+++ b/templates/view_xref_image_item.tpl
@@ -11,12 +11,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -26,15 +27,16 @@
<td>
<span class="actionicon">
{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
- {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
+ {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}
diff --git a/templates/view_xref_inc_report_item.tpl b/templates/view_xref_inc_report_item.tpl
index 2c5ee03..31d7557 100755
--- a/templates/view_xref_inc_report_item.tpl
+++ b/templates/view_xref_inc_report_item.tpl
@@ -29,14 +29,14 @@
<span class="actionicon">
{if $gBitUser->hasPermission( 'p_contact_view_detail' )}
{smartlink ititle="View" ifile="view_form.php" booticon="icon-view" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
- {if $gBitUser->hasPermission( 'p_contact_expunge' ) }
+ {/if}
+ {if $xrefAllowEdit && $gBitUser->hasPermission( 'p_contact_expunge' ) }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
{/strip}
diff --git a/templates/view_xref_locate_item.tpl b/templates/view_xref_locate_item.tpl
index 3581d36..1ea9aa3 100755
--- a/templates/view_xref_locate_item.tpl
+++ b/templates/view_xref_locate_item.tpl
@@ -11,12 +11,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -26,15 +27,16 @@
<td>
<span class="actionicon">
{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
- {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
+ {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}
diff --git a/templates/view_xref_phone_item.tpl b/templates/view_xref_phone_item.tpl
index dfaf036..1f609fb 100755
--- a/templates/view_xref_phone_item.tpl
+++ b/templates/view_xref_phone_item.tpl
@@ -11,12 +11,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -26,15 +27,16 @@
<td>
<span class="actionicon">
{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
- {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
+ {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}
diff --git a/templates/view_xref_sig_item.tpl b/templates/view_xref_sig_item.tpl
index 3581d36..1ea9aa3 100755
--- a/templates/view_xref_sig_item.tpl
+++ b/templates/view_xref_sig_item.tpl
@@ -11,12 +11,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -26,15 +27,16 @@
<td>
<span class="actionicon">
{if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' }
- {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
- {/if}
+ {smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}
diff --git a/templates/view_xref_text_item.tpl b/templates/view_xref_text_item.tpl
index 01a7095..86a0fa1 100755
--- a/templates/view_xref_text_item.tpl
+++ b/templates/view_xref_text_item.tpl
@@ -16,12 +16,13 @@
<td>
{$gContent->mInfo.$source[xref].data|escape}
</td>
+{if $xrefAllowEdit}
<td>
{if $source ne 'history' }
{$gContent->mInfo.$source[xref].start_date|bit_short_date}
-{else}
+{else}
{$gContent->mInfo.$source[xref].end_date|bit_short_date}
-{/if}
+{/if}
</td>
{if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )}
<td>
@@ -37,14 +38,15 @@
{else}
{smartlink ititle="Edit" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id}
{/if}
- {/if}
+ {/if}
{if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].item ne 'KEY_B' }
{if $source eq 'history' }
{smartlink ititle="Restore" ifile="edit_xref.php" booticon="icon-note-edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1}
{else}
{smartlink ititle="Delete" ifile="edit_xref.php" booticon="icon-note-delete" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1}
- {/if}
- {/if}
+ {/if}
+ {/if}
</span>
</td>
+{/if}
{/strip}