From d94ebc448c24e8a83c7b6abd6180be4fe6898a80 Mon Sep 17 00:00:00 2001 From: Lester Caine Date: Sat, 6 Jun 2026 10:49:52 +0100 Subject: xref item templates: replace $source eq/ne 'history' with $isHistory Co-Authored-By: Claude Sonnet 4.6 --- templates/view_xref_bank_item.tpl | 22 ++++++++++---------- templates/view_xref_contact_item.tpl | 36 ++++++++++++++++----------------- templates/view_xref_date_item.tpl | 22 ++++++++++---------- templates/view_xref_image_item.tpl | 20 +++++++++--------- templates/view_xref_inc_report_item.tpl | 26 ++++++++++++------------ templates/view_xref_locate_item.tpl | 22 ++++++++++---------- templates/view_xref_sig_item.tpl | 22 ++++++++++---------- 7 files changed, 85 insertions(+), 85 deletions(-) diff --git a/templates/view_xref_bank_item.tpl b/templates/view_xref_bank_item.tpl index d56264f..79c7791 100755 --- a/templates/view_xref_bank_item.tpl +++ b/templates/view_xref_bank_item.tpl @@ -1,22 +1,22 @@ {strip} - {$gContent->mInfo.$source[xref].source_title|escape} + {$xrefInfo.xref_title|escape}   - {$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} + {$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} - {$gContent->mInfo.$source[xref].data|escape} + {$xrefInfo.data|escape} {if $xrefAllowEdit} -{if $source ne 'history' } - {$gContent->mInfo.$source[xref].start_date|bit_short_date} +{if !$isHistory } + {$xrefInfo.start_date|bit_short_date} {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {$xrefInfo.end_date|bit_short_date} {/if} {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )} @@ -26,14 +26,14 @@ {/if} - {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } - {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $gBitUser->hasPermission( 'p_contact_update' ) && !$isHistory } + {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } - {if $source eq 'history' } - {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {if $isHistory } + {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=1} {/if} {/if} diff --git a/templates/view_xref_contact_item.tpl b/templates/view_xref_contact_item.tpl index e24895a..87da69f 100755 --- a/templates/view_xref_contact_item.tpl +++ b/templates/view_xref_contact_item.tpl @@ -1,27 +1,27 @@ {strip} - {$gContent->mInfo.$source[xref].source_title|escape} + {$xrefInfo.xref_title|escape} - {if isset($gContent->mInfo.$source[xref].xref) && $gContent->mInfo.$source[xref].xref <> '' && $gContent->mInfo.$source[xref].xref > 100 } - {$gContent->mInfo.$source[xref].xref|escape} - {smartlink ititle="Link to" ifile="display_contact.php" biticon="edit" content_id=$gContent->mInfo.$source[xref].xref} + {if isset($xrefInfo.xref) && $xrefInfo.xref <> '' && $xrefInfo.xref > 100 } + {$xrefInfo.xref|escape} + {smartlink ititle="Link to" ifile="display_contact.php" biticon="edit" content_id=$xrefInfo.xref} {else}   {/if} - {$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} + {$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} - {$gContent->mInfo.$source[xref].data|escape} + {$xrefInfo.data|escape} {if $xrefAllowEdit} -{if $source ne 'history' } - {$gContent->mInfo.$source[xref].start_date|bit_short_date} +{if !$isHistory } + {$xrefInfo.start_date|bit_short_date} {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {$xrefInfo.end_date|bit_short_date} {/if} {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )} @@ -31,19 +31,19 @@ {/if} - {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } - {if $gContent->mInfo.$source[xref].item eq 'KEY_B' } - {smartlink ititle="Callout" ifile="edit_key_break.php" biticon="edit-redo" expunge=0 content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} - {smartlink ititle="Reseal" ifile="edit_key_break.php" biticon="edit-undo" expunge=2 content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $gBitUser->hasPermission( 'p_contact_update' ) && !$isHistory } + {if $xrefInfo.item eq 'KEY_B' } + {smartlink ititle="Callout" ifile="edit_key_break.php" biticon="edit-redo" expunge=0 content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} + {smartlink ititle="Reseal" ifile="edit_key_break.php" biticon="edit-undo" expunge=2 content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {else} - {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/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" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {if $gBitUser->hasPermission( 'p_contact_expunge' ) && $xrefInfo.item ne 'KEY_B' } + {if $isHistory } + {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=1} {/if} {/if} diff --git a/templates/view_xref_date_item.tpl b/templates/view_xref_date_item.tpl index d56264f..79c7791 100755 --- a/templates/view_xref_date_item.tpl +++ b/templates/view_xref_date_item.tpl @@ -1,22 +1,22 @@ {strip} - {$gContent->mInfo.$source[xref].source_title|escape} + {$xrefInfo.xref_title|escape}   - {$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} + {$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} - {$gContent->mInfo.$source[xref].data|escape} + {$xrefInfo.data|escape} {if $xrefAllowEdit} -{if $source ne 'history' } - {$gContent->mInfo.$source[xref].start_date|bit_short_date} +{if !$isHistory } + {$xrefInfo.start_date|bit_short_date} {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {$xrefInfo.end_date|bit_short_date} {/if} {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )} @@ -26,14 +26,14 @@ {/if} - {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } - {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $gBitUser->hasPermission( 'p_contact_update' ) && !$isHistory } + {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } - {if $source eq 'history' } - {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {if $isHistory } + {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=1} {/if} {/if} diff --git a/templates/view_xref_image_item.tpl b/templates/view_xref_image_item.tpl index 4b1c5dc..6193688 100755 --- a/templates/view_xref_image_item.tpl +++ b/templates/view_xref_image_item.tpl @@ -1,6 +1,6 @@ {strip} - {$gContent->mInfo.$source[xref].source_title|escape} + {$xrefInfo.xref_title|escape}   @@ -9,14 +9,14 @@ - {$gContent->mInfo.$source[xref].data|escape} + {$xrefInfo.data|escape} {if $xrefAllowEdit} -{if $source ne 'history' } - {$gContent->mInfo.$source[xref].start_date|bit_short_date} +{if !$isHistory } + {$xrefInfo.start_date|bit_short_date} {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {$xrefInfo.end_date|bit_short_date} {/if} {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )} @@ -26,14 +26,14 @@ {/if} - {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } - {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $gBitUser->hasPermission( 'p_contact_update' ) && !$isHistory } + {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } - {if $source eq 'history' } - {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {if $isHistory } + {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=1} {/if} {/if} diff --git a/templates/view_xref_inc_report_item.tpl b/templates/view_xref_inc_report_item.tpl index 616a8d3..93f38c3 100755 --- a/templates/view_xref_inc_report_item.tpl +++ b/templates/view_xref_inc_report_item.tpl @@ -1,40 +1,40 @@ {strip} - {if $source eq 'history' } - {$gContent->mInfo.$source[xref].source_title|escape} + {if $isHistory } + {$xrefInfo.xref_title|escape} {else}   {/if} - {if isset($gContent->mInfo.$source[xref].xref) && $gContent->mInfo.$source[xref].xref <> '' && $gContent->mInfo.$source[xref].xref > 100 } - {$gContent->mInfo.$source[xref].xref|escape} - {smartlink ititle="Link to" ifile="view_form.php" biticon="edit" content_id=$gContent->mInfo.$source[xref].xref} + {if isset($xrefInfo.xref) && $xrefInfo.xref <> '' && $xrefInfo.xref > 100 } + {$xrefInfo.xref|escape} + {smartlink ititle="Link to" ifile="view_form.php" biticon="edit" content_id=$xrefInfo.xref} {else} ------ {/if} - {$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} + {$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} - {$gContent->mInfo.$source[xref].data|escape} + {$xrefInfo.data|escape} - {$gContent->mInfo.$source[xref].start_date|bit_short_datetime} + {$xrefInfo.start_date|bit_short_datetime} - Completed: {$gContent->mInfo.$source[xref].last_update_date|bit_short_datetime} + Completed: {$xrefInfo.last_update_date|bit_short_datetime} {if $gBitUser->hasPermission( 'p_contact_view_detail' )} - {smartlink ititle="View" ifile="view_form.php" biticon="view-fullscreen" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {smartlink ititle="View" ifile="view_form.php" biticon="view-fullscreen" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit && $gBitUser->hasPermission( 'p_contact_expunge' ) } - {if $source eq 'history' } - {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {if $isHistory } + {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=1} {/if} {/if} diff --git a/templates/view_xref_locate_item.tpl b/templates/view_xref_locate_item.tpl index d56264f..79c7791 100755 --- a/templates/view_xref_locate_item.tpl +++ b/templates/view_xref_locate_item.tpl @@ -1,22 +1,22 @@ {strip} - {$gContent->mInfo.$source[xref].source_title|escape} + {$xrefInfo.xref_title|escape}   - {$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} + {$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} - {$gContent->mInfo.$source[xref].data|escape} + {$xrefInfo.data|escape} {if $xrefAllowEdit} -{if $source ne 'history' } - {$gContent->mInfo.$source[xref].start_date|bit_short_date} +{if !$isHistory } + {$xrefInfo.start_date|bit_short_date} {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {$xrefInfo.end_date|bit_short_date} {/if} {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )} @@ -26,14 +26,14 @@ {/if} - {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } - {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $gBitUser->hasPermission( 'p_contact_update' ) && !$isHistory } + {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } - {if $source eq 'history' } - {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {if $isHistory } + {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=1} {/if} {/if} diff --git a/templates/view_xref_sig_item.tpl b/templates/view_xref_sig_item.tpl index d56264f..79c7791 100755 --- a/templates/view_xref_sig_item.tpl +++ b/templates/view_xref_sig_item.tpl @@ -1,22 +1,22 @@ {strip} - {$gContent->mInfo.$source[xref].source_title|escape} + {$xrefInfo.xref_title|escape}   - {$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} + {$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} - {$gContent->mInfo.$source[xref].data|escape} + {$xrefInfo.data|escape} {if $xrefAllowEdit} -{if $source ne 'history' } - {$gContent->mInfo.$source[xref].start_date|bit_short_date} +{if !$isHistory } + {$xrefInfo.start_date|bit_short_date} {else} - {$gContent->mInfo.$source[xref].end_date|bit_short_date} + {$xrefInfo.end_date|bit_short_date} {/if} {if $gBitSystem->isFeatureActive( 'contact_list_last_modified' )} @@ -26,14 +26,14 @@ {/if} - {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } - {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $gBitUser->hasPermission( 'p_contact_update' ) && !$isHistory } + {smartlink ititle="Edit" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } - {if $source eq 'history' } - {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=-1} + {if $isHistory } + {smartlink ititle="Restore" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id expunge=1} + {smartlink ititle="Delete" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=1} {/if} {/if} -- cgit v1.3