From 87ffc50fc40575ef2ade7aac80b274c2e2c542e0 Mon Sep 17 00:00:00 2001 From: Lester Caine Date: Sat, 6 Jun 2026 10:48:04 +0100 Subject: xref item templates: replace $source eq/ne 'history' with $isHistory Co-Authored-By: Claude Sonnet 4.6 --- templates/view_xref_address_item.tpl | 24 ++++++++++++------------ templates/view_xref_bank_item.tpl | 24 ++++++++++++------------ templates/view_xref_contact_item.tpl | 28 ++++++++++++++-------------- templates/view_xref_date_item.tpl | 24 ++++++++++++------------ templates/view_xref_locate_item.tpl | 24 ++++++++++++------------ templates/view_xref_phone_item.tpl | 24 ++++++++++++------------ templates/view_xref_sig_item.tpl | 24 ++++++++++++------------ templates/view_xref_text_item.tpl | 6 +++--- templates/view_xref_value_item.tpl | 24 ++++++++++++------------ 9 files changed, 101 insertions(+), 101 deletions(-) diff --git a/templates/view_xref_address_item.tpl b/templates/view_xref_address_item.tpl index 7b1861d..ef2990e 100644 --- a/templates/view_xref_address_item.tpl +++ b/templates/view_xref_address_item.tpl @@ -1,26 +1,26 @@ {strip} -{$gContent->mInfo.$source[xref].source_title|escape} +{$xrefInfo.xref_title|escape}   -{$gContent->mInfo.$source[xref].xkey_ext|escape}, {$gContent->mInfo.$source[xref].xkey|escape} -{$gContent->mInfo.$source[xref].data|escape} +{$xrefInfo.xkey_ext|escape}, {$xrefInfo.xkey|escape} +{$xrefInfo.data|escape} - {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} -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} +{$xrefInfo.last_update_date|bit_short_date} - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && !$isHistory} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" 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" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ipackage="liberty" 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" ipackage="liberty" 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_bank_item.tpl b/templates/view_xref_bank_item.tpl index 1fd19c0..0cd57d0 100644 --- a/templates/view_xref_bank_item.tpl +++ b/templates/view_xref_bank_item.tpl @@ -1,26 +1,26 @@ {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} -{$gContent->mInfo.$source[xref].data|escape} +{$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} +{$xrefInfo.data|escape} - {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} -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} +{$xrefInfo.last_update_date|bit_short_date} - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && !$isHistory} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" 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" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ipackage="liberty" 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" ipackage="liberty" 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 dbd534a..135174b 100644 --- a/templates/view_xref_contact_item.tpl +++ b/templates/view_xref_contact_item.tpl @@ -1,32 +1,32 @@ {strip} -{$gContent->mInfo.$source[xref].source_title|escape} +{$xrefInfo.xref_title|escape} - {if isset($gContent->mInfo.$source[xref].xref) && $gContent->mInfo.$source[xref].xref > 100} - {$gContent->mInfo.$source[xref].xref|escape} + {if isset($xrefInfo.xref) && $xrefInfo.xref > 100} + {$xrefInfo.xref|escape} {else}   {/if} -{$gContent->mInfo.$source[xref].xkey|escape} {$gContent->mInfo.$source[xref].xkey_ext|escape} -{$gContent->mInfo.$source[xref].data|escape} +{$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} +{$xrefInfo.data|escape} - {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} -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} +{$xrefInfo.last_update_date|bit_short_date} - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && !$isHistory} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" 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" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ipackage="liberty" 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" ipackage="liberty" 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 1fd19c0..0cd57d0 100644 --- a/templates/view_xref_date_item.tpl +++ b/templates/view_xref_date_item.tpl @@ -1,26 +1,26 @@ {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} -{$gContent->mInfo.$source[xref].data|escape} +{$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} +{$xrefInfo.data|escape} - {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} -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} +{$xrefInfo.last_update_date|bit_short_date} - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && !$isHistory} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" 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" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ipackage="liberty" 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" ipackage="liberty" 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 1fd19c0..0cd57d0 100644 --- a/templates/view_xref_locate_item.tpl +++ b/templates/view_xref_locate_item.tpl @@ -1,26 +1,26 @@ {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} -{$gContent->mInfo.$source[xref].data|escape} +{$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} +{$xrefInfo.data|escape} - {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} -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} +{$xrefInfo.last_update_date|bit_short_date} - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && !$isHistory} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" 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" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ipackage="liberty" 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" ipackage="liberty" 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_phone_item.tpl b/templates/view_xref_phone_item.tpl index 5186f72..4ae37bd 100644 --- a/templates/view_xref_phone_item.tpl +++ b/templates/view_xref_phone_item.tpl @@ -1,26 +1,26 @@ {strip} -{$gContent->mInfo.$source[xref].source_title|escape} +{$xrefInfo.xref_title|escape}   -{$gContent->mInfo.$source[xref].xkey|escape} -{$gContent->mInfo.$source[xref].data|escape} +{$xrefInfo.xkey|escape} +{$xrefInfo.data|escape} - {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} -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} +{$xrefInfo.last_update_date|bit_short_date} - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && !$isHistory} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" 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" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ipackage="liberty" 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" ipackage="liberty" 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 1fd19c0..0cd57d0 100644 --- a/templates/view_xref_sig_item.tpl +++ b/templates/view_xref_sig_item.tpl @@ -1,26 +1,26 @@ {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} -{$gContent->mInfo.$source[xref].data|escape} +{$xrefInfo.xkey|escape} {$xrefInfo.xkey_ext|escape} +{$xrefInfo.data|escape} - {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} -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} +{$xrefInfo.last_update_date|bit_short_date} - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && !$isHistory} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" 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" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ipackage="liberty" 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" ipackage="liberty" 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_text_item.tpl b/templates/view_xref_text_item.tpl index 0c9523a..ebb3542 100644 --- a/templates/view_xref_text_item.tpl +++ b/templates/view_xref_text_item.tpl @@ -4,7 +4,7 @@ {$xrefInfo.data|escape} {if $xrefAllowEdit|default:false} - {if $source ne 'history'} + {if !$isHistory} {$xrefInfo.start_date|bit_short_date} {else} {$xrefInfo.end_date|bit_short_date} @@ -13,11 +13,11 @@ {$xrefInfo.last_update_date|bit_short_date} - {if $gContent->hasUpdatePermission() && $source ne 'history'} + {if $gContent->hasUpdatePermission() && !$isHistory} {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $gContent->hasExpungePermission()} - {if $source eq 'history'} + {if $isHistory} {smartlink ititle="Restore" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} {smartlink ititle="Delete" ipackage="liberty" ifile="edit_xref.php" biticon="user-trash" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=1} diff --git a/templates/view_xref_value_item.tpl b/templates/view_xref_value_item.tpl index 17ef97f..4d44c3a 100644 --- a/templates/view_xref_value_item.tpl +++ b/templates/view_xref_value_item.tpl @@ -1,26 +1,26 @@ {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} - {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} -{$gContent->mInfo.$source[xref].last_update_date|bit_short_date} +{$xrefInfo.last_update_date|bit_short_date} - {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && $source ne 'history'} - {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} + {if $xrefAllowEdit|default:true && $gContent->hasUpdatePermission() && !$isHistory} + {smartlink ititle="Edit" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id} {/if} {if $xrefAllowEdit|default:true && $gContent->hasExpungePermission()} - {if $source eq 'history'} - {smartlink ititle="Restore" ipackage="liberty" 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" ipackage="liberty" ifile="edit_xref.php" biticon="edit" content_id=$gContent->mInfo.content_id xref_id=$xrefInfo.xref_id expunge=-1} {else} - {smartlink ititle="Delete" ipackage="liberty" 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" ipackage="liberty" 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