diff options
27 files changed, 75 insertions, 75 deletions
diff --git a/templates/comments.tpl b/templates/comments.tpl index ae30c01..64970a9 100755 --- a/templates/comments.tpl +++ b/templates/comments.tpl @@ -1,18 +1,18 @@ -{if $gBitUser->hasPermission( 'p_liberty_post_comments' ) or $gBitUser->hasPermission( 'p_liberty_read_comments' ) } +{if $gBitUser->hasPermission( 'p_liberty_post_comments' ) || $gBitUser->hasPermission( 'p_liberty_read_comments' ) } {strip} <div class="display comment"> <div class="header"> <h2>{tr}Notes{/tr}</h2> </div> - <div class="body"{if !( $post_comment_request or $post_comment_preview )} id="editcomments"{/if}> + <div class="body"{if !( $post_comment_request || $post_comment_preview )} id="editcomments"{/if}> <div id="edit_comments" {if $comments_ajax}style="display:none"{/if}> {include file="bitpackage:liberty/comments_post_inc.tpl" post_title="Post Comment"} </div> {include file="bitpackage:liberty/comments_display_option_bar.tpl"} - {if $comments_ajax and $gBitUser->hasPermission( 'p_liberty_post_comments' )} + {if $comments_ajax && $gBitUser->hasPermission( 'p_liberty_post_comments' )} <div class="form-group"> <input type="submit" name="post_comment_request" value="{tr}Add Note{/tr}" onclick="LibertyComment.attachForm('comment_{$gContent->mContentId}', '{$gContent->mContentId}', {if $gContent->mContentId}{$gContent->mContentId}{elseif $commentsParentId}{$commentsParentId}{else}null{/if})"/> </div> diff --git a/templates/comments_edit.tpl b/templates/comments_edit.tpl index e516a23..a6dc14f 100755 --- a/templates/comments_edit.tpl +++ b/templates/comments_edit.tpl @@ -1,7 +1,7 @@ {if $gBitUser->hasPermission( 'p_liberty_post_comments' ) } {strip} <div class="display comment"> - <div class="body"{if !( $post_comment_request or $post_comment_preview )} id="editcomments"{/if}> + <div class="body"{if !( $post_comment_request || $post_comment_preview )} id="editcomments"{/if}> <div id="edit_comments" {if $comments_ajax}style="display:none"{/if}> {include file="bitpackage:contact/comments_post_inc.tpl" post_title="Post Note"} </div> diff --git a/templates/comments_post_inc.tpl b/templates/comments_post_inc.tpl index f8ba054..d28b54a 100755 --- a/templates/comments_post_inc.tpl +++ b/templates/comments_post_inc.tpl @@ -1,7 +1,7 @@ -{if !$hide or $post_comment_request or $smarty.request.post_comment_preview} +{if !$hide || $post_comment_request || $smarty.request.post_comment_preview} <a name="editcomments"></a> - {if $post_comment_preview and !$preview_override} + {if $post_comment_preview && !$preview_override} <h2>{tr}{$post_title} Preview{/tr}</h2> <div class="preview"> {include file='bitpackage:liberty/display_comment.tpl' comment=$postComment} @@ -12,7 +12,7 @@ {formfeedback hash=$formfeedback} - {if $post_comment_request or $smarty.request.post_comment_preview or $comments_ajax} + {if $post_comment_request || $smarty.request.post_comment_preview || $comments_ajax} {legend legend=$post_title} <input type="hidden" name="post_comment_reply_id" value="{$post_comment_reply_id}" /> <input type="hidden" name="post_comment_id" value="{$post_comment_id}" /> @@ -20,7 +20,7 @@ {* This is a little extra value for the funky case when bw learns browser has js at the same time a preview is asked for This will keep comment in non-js mode until previewing is done. Things get messy without this *} - {if !$gBitThemes->isJavascriptEnabled() or $no_js_preview == "y"} + {if !$gBitThemes->isJavascriptEnabled() || $no_js_preview == "y"} <input type="hidden" name="no_js_preview" value="y" /> {/if} @@ -66,7 +66,7 @@ {textarea id="commentpost" name="comment_data" rows=$gBitSystem->getConfig('comments_default_post_lines', 6)}{$postComment.data}{/textarea} {* @TODO perm check more accurately should be on root content object *} - {if $gBitSystem->isFeatureActive( 'comments_allow_attachments' ) and $gBitUser->hasPermission('p_liberty_attach_attachments') } + {if $gBitSystem->isFeatureActive( 'comments_allow_attachments' ) && $gBitUser->hasPermission('p_liberty_attach_attachments') } {* @TODO make edit_storage_list.tpl work with comments attachments - it is nested in edit_storage.tpl - for now bypass it, remove mime code when edit_storage.tpl can be used directly*} {* include file="bitpackage:liberty/edit_storage.tpl" *} {if $gLibertySystem->isPluginActive( $smarty.const.LIBERTY_DEFAULT_MIME_HANDLER )} diff --git a/templates/contact_action_bar.tpl b/templates/contact_action_bar.tpl index 2e7a75d..9a11779 100755 --- a/templates/contact_action_bar.tpl +++ b/templates/contact_action_bar.tpl @@ -1,7 +1,7 @@ <div class="navbar"> {if $show_page eq 'y'} {if $gBitSystem->isFeatureActive('contact_attachments')} - {if $gBitUser->hasPermission('p_contact_view_attachments') or $gBitUser->hasPermission('p_contact_admin_attachments') or $gBitUser->hasPermission('p_contact_attach_files')} + {if $gBitUser->hasPermission('p_contact_view_attachments') || $gBitUser->hasPermission('p_contact_admin_attachments') || $gBitUser->hasPermission('p_contact_attach_files')} <a href="javascript:document.location='#attachments';flip('attzone{if $atts_show eq 'y'}open{/if}');">{if $atts_count eq 0}{tr}attach file{/tr}{elseif $atts_count eq 1}{tr}1 attachment{/tr}{else}{$atts_count} {tr}attachments{/tr}{/if}</a> {else} {if $atts_count eq 1}{tr}1 attachment{/tr}{else}{$atts_count} {tr}attachments{/tr}{/if} diff --git a/templates/contact_header.tpl b/templates/contact_header.tpl index 74db00d..bcc680a 100755 --- a/templates/contact_header.tpl +++ b/templates/contact_header.tpl @@ -1,14 +1,14 @@ <div class="header"> -{if $is_categorized eq 'y' and $gBitSystem->isFeatureActive('package_categories') and $gBitSystem->isFeatureActive('feature_categorypath')} +{if $is_categorized eq 'y' && $gBitSystem->isFeatureActive('package_categories') && $gBitSystem->isFeatureActive('feature_categorypath')} <div class="category"> <div class="path">{$display_catpath}</div> </div> {* end category *} {/if} <h1>{$gContent->mInfo.xkey} - -{* {if isset(gContent->mInfo.organisation) and (gContent->mInfo.organisation <> '') } +{* {if isset(gContent->mInfo.organisation) && (gContent->mInfo.organisation <> '') } {$gContent->mInfo.organisation} - {elseif isset(gContent->mInfo.surname) and (gContent->mInfo.surname <> '') } + {elseif isset(gContent->mInfo.surname) && (gContent->mInfo.surname <> '') } {$gContent->mInfo.prefix} {$gContent->mInfo.forename} {$gContent->mInfo.surname} diff --git a/templates/display_address.tpl b/templates/display_address.tpl index bc41091..84e8bf3 100755 --- a/templates/display_address.tpl +++ b/templates/display_address.tpl @@ -25,7 +25,7 @@ {/forminput} <div class="clear"></div> </div> - {if $locate == 1 and !empty($address.x_coordinate)} + {if $locate == 1 && !empty($address.x_coordinate)} <div class="form-group"> {formlabel label="Visual Centre Coordinates" for="street_start_x"} {forminput} diff --git a/templates/display_contact.tpl b/templates/display_contact.tpl index 02486c9..96767b0 100755 --- a/templates/display_contact.tpl +++ b/templates/display_contact.tpl @@ -1,6 +1,6 @@ {include file="bitpackage:contact/display_type_header.tpl"} - {if isset($gContent->mInfo.usn) and ($gContent->mInfo.usn <> '') } + {if isset($gContent->mInfo.usn) && ($gContent->mInfo.usn <> '') } <div class="form-group"> {formlabel label="USN" for="usn"} {forminput} @@ -9,7 +9,7 @@ <div class="clear"></div> </div> {/if} - {if isset($gContent->mInfo.name) and ($gContent->mInfo.name <> '') } + {if isset($gContent->mInfo.name) && ($gContent->mInfo.name <> '') } <div class="form-group"> {formlabel label="Name" for="name"} {forminput} @@ -18,7 +18,7 @@ <div class="clear"></div> </div> {/if} - {if isset($gContent->mInfo.organisation) and ($gContent->mInfo.organisation <> '') } + {if isset($gContent->mInfo.organisation) && ($gContent->mInfo.organisation <> '') } <div class="form-group"> {formlabel label="Organisation" for="organisation"} {forminput} @@ -27,7 +27,7 @@ <div class="clear"></div> </div> {/if} - {if isset($gContent->mInfo.dob) and ($gContent->mInfo.dob <> '') } + {if isset($gContent->mInfo.dob) && ($gContent->mInfo.dob <> '') } <div class="form-group"> {formlabel label="Date of Birth" for="dob"} {forminput} @@ -36,7 +36,7 @@ <div class="clear"></div> </div> {/if} - {if isset($gContent->mInfo.nino) and ($gContent->mInfo.nino <> '') } + {if isset($gContent->mInfo.nino) && ($gContent->mInfo.nino <> '') } <div class="form-group"> {formlabel label="National Insurance Number" for="nino"} {forminput} diff --git a/templates/edit.tpl b/templates/edit.tpl index 9aae398..65b6627 100755 --- a/templates/edit.tpl +++ b/templates/edit.tpl @@ -53,7 +53,7 @@ {include file="bitpackage:contact/edit_type_header.tpl"} - {if $gContent->mInfo.name or $gContent->mInfo.contact_types.0.content_id or !isset( $gContent->mInfo.contact_types ) } + {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"} {forminput} @@ -83,7 +83,7 @@ <div class="clear"></div> </div> {/if} - {if $gContent->mInfo.organisation or $gContent->mInfo.contact_types.1.content_id or !isset( $gContent->mInfo.contact_types ) } + {if $gContent->mInfo.organisation || $gContent->mInfo.contact_types.1.content_id || !isset( $gContent->mInfo.contact_types ) } <div class="form-group"> {formlabel label="Organisation" for="organisation"} {forminput} diff --git a/templates/list.tpl b/templates/list.tpl index 0739c01..430ad80 100755 --- a/templates/list.tpl +++ b/templates/list.tpl @@ -30,17 +30,17 @@ {$listcontacts[content].title} </a> </td> - <td>{if isset($listcontacts[content].house) and ($listcontacts[content].house <> '') } + <td>{if isset($listcontacts[content].house) && ($listcontacts[content].house <> '') } {$listcontacts[content].house}, {/if} - {if isset($listcontacts[content].add1) and ($listcontacts[content].add1 <> '') } + {if isset($listcontacts[content].add1) && ($listcontacts[content].add1 <> '') } {$listcontacts[content].add1}, {/if} - {if isset($listcontacts[content].add2) and ($listcontacts[content].add2 <> '') } + {if isset($listcontacts[content].add2) && ($listcontacts[content].add2 <> '') } {$listcontacts[content].add2}, {/if} - {if isset($listcontacts[content].add3) and ($listcontacts[content].add3 <> '') } + {if isset($listcontacts[content].add3) && ($listcontacts[content].add3 <> '') } {$listcontacts[content].add3}, {/if} - {if isset($listcontacts[content].add4) and ($listcontacts[content].add4 <> '') } + {if isset($listcontacts[content].add4) && ($listcontacts[content].add4 <> '') } {$listcontacts[content].add4}, {/if} - {if isset($listcontacts[content].town) and ($listcontacts[content].town <> '') } + {if isset($listcontacts[content].town) && ($listcontacts[content].town <> '') } {$listcontacts[content].town}, {/if} {$listcontacts[content].postcode}</td> </tr> @@ -53,8 +53,8 @@ {tr}Addresses{/tr}: {$listcontacts[content].addresses|default:0} </td> {if $gBitUser->hasPermission( 'p_liberty_view_all_status' )} - <td>{if isset($listcontacts[content].dob) and ($listcontacts[content].dob <> '') }DOB: {$listcontacts[content].dob}{/if}</td> - <td>{if isset($listcontacts[content].nino) and ($listcontacts[content].nino <> '') }NI: {$listcontacts[content].nino}{/if}</td> + <td>{if isset($listcontacts[content].dob) && ($listcontacts[content].dob <> '') }DOB: {$listcontacts[content].dob}{/if}</td> + <td>{if isset($listcontacts[content].nino) && ($listcontacts[content].nino <> '') }NI: {$listcontacts[content].nino}{/if}</td> {/if} </tr> {sectionelse} diff --git a/templates/list1.tpl b/templates/list1.tpl index 3f2489b..b9d08c4 100755 --- a/templates/list1.tpl +++ b/templates/list1.tpl @@ -35,17 +35,17 @@ {$listcontacts[content].title} </a> </td> - <td>{if isset($listcontacts[content].house) and ($listcontacts[content].house <> '') } + <td>{if isset($listcontacts[content].house) && ($listcontacts[content].house <> '') } {$listcontacts[content].house}, {/if} - {if isset($listcontacts[content].add1) and ($listcontacts[content].add1 <> '') } + {if isset($listcontacts[content].add1) && ($listcontacts[content].add1 <> '') } {$listcontacts[content].add1}, {/if} - {if isset($listcontacts[content].add2) and ($listcontacts[content].add2 <> '') } + {if isset($listcontacts[content].add2) && ($listcontacts[content].add2 <> '') } {$listcontacts[content].add2}, {/if} - {if isset($listcontacts[content].add3) and ($listcontacts[content].add3 <> '') } + {if isset($listcontacts[content].add3) && ($listcontacts[content].add3 <> '') } {$listcontacts[content].add3}, {/if} - {if isset($listcontacts[content].add4) and ($listcontacts[content].add4 <> '') } + {if isset($listcontacts[content].add4) && ($listcontacts[content].add4 <> '') } {$listcontacts[content].add4}, {/if} - {if isset($listcontacts[content].town) and ($listcontacts[content].town <> '') } + {if isset($listcontacts[content].town) && ($listcontacts[content].town <> '') } {$listcontacts[content].town}, {/if} {$listcontacts[content].postcode}</td> </tr> @@ -58,8 +58,8 @@ {tr}Addresses{/tr}: {$listcontacts[content].addresses|default:0} </td> {if $gBitUser->hasPermission( 'p_liberty_view_all_status' )} - <td>{if isset($listcontacts[content].dob) and ($listcontacts[content].dob <> '') }DOB: {$listcontacts[content].dob}{/if}</td> - <td>{if isset($listcontacts[content].nino) and ($listcontacts[content].nino <> '') }NI: {$listcontacts[content].nino}{/if}</td> + <td>{if isset($listcontacts[content].dob) && ($listcontacts[content].dob <> '') }DOB: {$listcontacts[content].dob}{/if}</td> + <td>{if isset($listcontacts[content].nino) && ($listcontacts[content].nino <> '') }NI: {$listcontacts[content].nino}{/if}</td> {/if} </tr> {sectionelse} diff --git a/templates/list2.tpl b/templates/list2.tpl index 28e8611..44056c2 100755 --- a/templates/list2.tpl +++ b/templates/list2.tpl @@ -42,22 +42,22 @@ </td> <td>{$item.content_status_name}</td> {if $gBitUser->hasPermission( 'p_liberty_view_all_status' )} - <td>{if isset($listcontacts[content].house) and ($listcontacts[content].house <> '') } + <td>{if isset($listcontacts[content].house) && ($listcontacts[content].house <> '') } {$listcontacts[content].house}, {/if} - {if isset($listcontacts[content].add1) and ($listcontacts[content].add1 <> '') } + {if isset($listcontacts[content].add1) && ($listcontacts[content].add1 <> '') } {$listcontacts[content].add1}, {/if} - {if isset($listcontacts[content].add2) and ($listcontacts[content].add2 <> '') } + {if isset($listcontacts[content].add2) && ($listcontacts[content].add2 <> '') } {$listcontacts[content].add2}, {/if} - {if isset($listcontacts[content].add3) and ($listcontacts[content].add3 <> '') } + {if isset($listcontacts[content].add3) && ($listcontacts[content].add3 <> '') } {$listcontacts[content].add3}, {/if} - {if isset($listcontacts[content].add4) and ($listcontacts[content].add4 <> '') } + {if isset($listcontacts[content].add4) && ($listcontacts[content].add4 <> '') } {$listcontacts[content].add4}, {/if}</td> {/if} - <td>{if isset($listcontacts[content].town) and ($listcontacts[content].town <> '') } + <td>{if isset($listcontacts[content].town) && ($listcontacts[content].town <> '') } {$listcontacts[content].town}{/if}</td> <td>{if isset($listcontacts[content].grideast) } <{$listcontacts[content].grideast|escape} , {$listcontacts[content].gridnorth|escape}> {/if} - {if $listcontacts[content].y_coordinate and $listcontacts[content].x_coordinate } + {if $listcontacts[content].y_coordinate && $listcontacts[content].x_coordinate } Exact Cords:<{$listcontacts[content].y_coordinate|escape} , {$listcontacts[content].x_coordinate|escape}> {/if} </td> @@ -65,7 +65,7 @@ </tr> <tr class="second"> <td>{$item.display_link}</td> - <td>{if isset($listcontacts[content].organisation) and ($listcontacts[content].organisation <> '') }Company: {$listcontacts[content].organisation} {/if}</td> + <td>{if isset($listcontacts[content].organisation) && ($listcontacts[content].organisation <> '') }Company: {$listcontacts[content].organisation} {/if}</td> <td>{assign var=content_type_guid value=$item.content_type_guid}{$gLibertySystem->getContentTypeName($content_type_guid)}</td> <td> {tr}Refs{/tr}: {$listcontacts[content].refs|default:0} @@ -73,8 +73,8 @@ {tr}Addresses{/tr}: {$listcontacts[content].addresses|default:0} </td> {if $gBitUser->hasPermission( 'p_liberty_view_all_status' )} - <td>{if isset($listcontacts[content].dob) and ($listcontacts[content].dob <> '') }DOB: {$listcontacts[content].dob}{/if}</td> - <td>{if isset($listcontacts[content].nino) and ($listcontacts[content].nino <> '') }NI: {$listcontacts[content].nino}{/if}</td> + <td>{if isset($listcontacts[content].dob) && ($listcontacts[content].dob <> '') }DOB: {$listcontacts[content].dob}{/if}</td> + <td>{if isset($listcontacts[content].nino) && ($listcontacts[content].nino <> '') }NI: {$listcontacts[content].nino}{/if}</td> {/if} </tr> {sectionelse} diff --git a/templates/list_contracts.tpl b/templates/list_contracts.tpl index 7012f95..1bfc040 100755 --- a/templates/list_contracts.tpl +++ b/templates/list_contracts.tpl @@ -49,15 +49,15 @@ {/if} </td> <td style="text-align:center;">{$list[changes].title}<br /> - {if isset($list[changes].house) and ($list[changes].house <> '') } + {if isset($list[changes].house) && ($list[changes].house <> '') } {$list[changes].house}, {/if} - {if isset($list[changes].add1) and ($list[changes].add1 <> '') } + {if isset($list[changes].add1) && ($list[changes].add1 <> '') } {$list[changes].add1}, {/if} - {if isset($list[changes].add2) and ($list[changes].add2 <> '') } + {if isset($list[changes].add2) && ($list[changes].add2 <> '') } {$list[changes].add2}, {/if} - {if isset($list[changes].add3) and ($list[changes].add3 <> '') } + {if isset($list[changes].add3) && ($list[changes].add3 <> '') } {$list[changes].add3}, {/if} - {if isset($list[changes].add4) and ($list[changes].add4 <> '') } + {if isset($list[changes].add4) && ($list[changes].add4 <> '') } {$list[changes].add4}, {/if} <td style="text-align:center;">{$list[changes].town}<br /> {$list[changes].county}</td> diff --git a/templates/list_xref.tpl b/templates/list_xref.tpl index 4f68f95..794f3ad 100755 --- a/templates/list_xref.tpl +++ b/templates/list_xref.tpl @@ -28,7 +28,7 @@ {$gContent->mInfo.xref[xref].data|escape} </td> <td> - {if isset($gContent->mInfo.xref[xref].usn) and ($gContent->mInfo.xref[xref].usn <> '') } + {if isset($gContent->mInfo.xref[xref].usn) && ($gContent->mInfo.xref[xref].usn <> '') } {$gContent->mInfo.xref[xref].usn|escape} {smartlink ititle="Link to" ifile="../property/display_property.php" booticon="icon-note-edit" property_id=$gContent->mInfo.xref[xref].usn} {/if} diff --git a/templates/menu_contact.tpl b/templates/menu_contact.tpl index ed0eefc..f00f919 100755 --- a/templates/menu_contact.tpl +++ b/templates/menu_contact.tpl @@ -4,10 +4,10 @@ <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> <li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list_contracts.php?contract=1">{booticon ipackage="icons" iname="icon-telephone-key" iexplain="List domestic contacts" ilocation=menu}</a></li> <li><a class="item" href="{$smarty.const.CONTACT_PKG_URL}list_contracts.php?contract=1">{booticon ipackage="icons" iname="icon-telephone-link" iexplain="List business contacts" ilocation=menu}</a></li> - {if $gBitUser->isAdmin() or $gBitUser->hasPermission( 'p_contact_edit' ) } + {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> {/if} - {if !empty($gContent->mContentId) and ( $gBitUser->isAdmin() or $gBitUser->hasPermission( 'p_task_edit' ) ) } + {if !empty($gContent->mContentId) && ( $gBitUser->isAdmin() || $gBitUser->hasPermission( 'p_task_edit' ) ) } <li><a class="item" href="{$smarty.const.TASKS_PKG_URL}edit.php?content_id={$gContent->mContentId}">{booticon ipackage="icons" iname="icon-build_add" iexplain="Create/Edit a Job" ilocation=menu}</a></li> <li><a class="item" href="{$smarty.const.TASKS_PKG_URL}add_callout.php?content_id={$gContent->mContentId}&property={$gContent->mContentId}">{booticon ipackage="icons" iname="icon-telephone-error" iexplain="Log a callout" ilocation=menu}</a></li> {/if} diff --git a/templates/page_display.tpl b/templates/page_display.tpl index 2aa72d4..df211ed 100755 --- a/templates/page_display.tpl +++ b/templates/page_display.tpl @@ -1,5 +1,5 @@ {strip} -<div class="body"{if $users_double_click eq 'y' and $dblclickedit eq 'y' and $gBitUser->hasPermission( 'bit_p_edit' )} ondblclick="location.href='{$smarty.const.CONTACT_PKG_URL}edit.php?content_id={$gContent->mInfo.content_id}';"{/if}> +<div class="body"{if $users_double_click eq 'y' && $dblclickedit eq 'y' && $gBitUser->hasPermission( 'bit_p_edit' )} ondblclick="location.href='{$smarty.const.CONTACT_PKG_URL}edit.php?content_id={$gContent->mInfo.content_id}';"{/if}> <div class="header"> {tr}<h1>Project-{$gContent->mInfo.project_name}{/tr}{tr} Version-{$gContent->mInfo.revision}</h1>{/tr} </div> diff --git a/templates/show_contact_item.tpl b/templates/show_contact_item.tpl index d3e68a9..524a5b8 100755 --- a/templates/show_contact_item.tpl +++ b/templates/show_contact_item.tpl @@ -10,7 +10,7 @@ {tr}Created by {displayname user=$contentInfo.creator_user user_id=$contentInfo.creator_user_id|default:0 real_name=$contentInfo.creator_real_name}, Last modification by {displayname user=$contentInfo.modifier_user user_id=$contentInfo.modifier_user_id real_name=$contentInfo.modifier_real_name} on {$contentInfo.last_modified|bit_short_datetime}{/tr} </div> - {if $comments_at_top_of_page eq 'y' and $print_page ne 'y'} + {if $comments_at_top_of_page eq 'y' && $print_page ne 'y'} {include file="bitpackage:liberty/comments.tpl"} {/if} @@ -24,7 +24,7 @@ {include file="bitpackage:contact/page_action_bar.tpl"} {/if} </div> -{if $comments_at_top_of_page ne 'y' and $print_page ne 'y'} +{if $comments_at_top_of_page ne 'y' && $print_page ne 'y'} {include file="bitpackage:liberty/comments.tpl"} {/if} diff --git a/templates/view_xref_address_record.tpl b/templates/view_xref_address_record.tpl index 8c7a4aa..9750938 100755 --- a/templates/view_xref_address_record.tpl +++ b/templates/view_xref_address_record.tpl @@ -28,10 +28,10 @@ {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 $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {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} - {if $gBitUser->hasPermission( 'p_contact_expunge' ) and $gContent->mInfo.$source[xref].source ne 'KEY_B' } + {if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].source 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} diff --git a/templates/view_xref_bank_record.tpl b/templates/view_xref_bank_record.tpl index fd9d423..3581d36 100755 --- a/templates/view_xref_bank_record.tpl +++ b/templates/view_xref_bank_record.tpl @@ -25,7 +25,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {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} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } diff --git a/templates/view_xref_contact_record.tpl b/templates/view_xref_contact_record.tpl index f9d7afb..77df1f7 100755 --- a/templates/view_xref_contact_record.tpl +++ b/templates/view_xref_contact_record.tpl @@ -3,7 +3,7 @@ {$gContent->mInfo.$source[xref].source_title|escape} </td> <td> - {if isset($gContent->mInfo.$source[xref].xref) and $gContent->mInfo.$source[xref].xref <> '' and $gContent->mInfo.$source[xref].xref > 100 } + {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" booticon="icon-note-edit" content_id=$gContent->mInfo.$source[xref].xref} {else} @@ -30,7 +30,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } {if $gContent->mInfo.$source[xref].source eq 'KEY_B' } {smartlink ititle="Callout" ifile="edit_key_break.php" booticon="icon-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" booticon="icon-undo" expunge=2 content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} @@ -38,7 +38,7 @@ {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 $gBitUser->hasPermission( 'p_contact_expunge' ) and $gContent->mInfo.$source[xref].source ne 'KEY_B' } + {if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].source 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} diff --git a/templates/view_xref_date_record.tpl b/templates/view_xref_date_record.tpl index fd9d423..3581d36 100755 --- a/templates/view_xref_date_record.tpl +++ b/templates/view_xref_date_record.tpl @@ -25,7 +25,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {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} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } diff --git a/templates/view_xref_image_record.tpl b/templates/view_xref_image_record.tpl index 63f9adc..9784fd9 100755 --- a/templates/view_xref_image_record.tpl +++ b/templates/view_xref_image_record.tpl @@ -25,7 +25,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {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} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } diff --git a/templates/view_xref_inc_report_record.tpl b/templates/view_xref_inc_report_record.tpl index 2c91f34..2c5ee03 100755 --- a/templates/view_xref_inc_report_record.tpl +++ b/templates/view_xref_inc_report_record.tpl @@ -6,7 +6,7 @@ {/if}</td> <td> - {if isset($gContent->mInfo.$source[xref].xref) and $gContent->mInfo.$source[xref].xref <> '' and $gContent->mInfo.$source[xref].xref > 100 } + {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" booticon="icon-note-edit" content_id=$gContent->mInfo.$source[xref].xref} {else} diff --git a/templates/view_xref_key_seal_record.tpl b/templates/view_xref_key_seal_record.tpl index 9f8f818..931d0a0 100755 --- a/templates/view_xref_key_seal_record.tpl +++ b/templates/view_xref_key_seal_record.tpl @@ -3,7 +3,7 @@ {$gContent->mInfo.$source[xref].source_title|escape} </td> <td> - {if isset($gContent->mInfo.$source[xref].xref) and $gContent->mInfo.$source[xref].xref <> '' and $gContent->mInfo.$source[xref].xref > 100 } + {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" booticon="icon-note-edit" content_id=$gContent->mInfo.$source[xref].xref} {else} @@ -30,7 +30,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } {smartlink ititle="Callout" ifile="edit_key_break.php" booticon="icon-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" booticon="icon-undo" expunge=2 content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} {/if} diff --git a/templates/view_xref_locate_record.tpl b/templates/view_xref_locate_record.tpl index fd9d423..3581d36 100755 --- a/templates/view_xref_locate_record.tpl +++ b/templates/view_xref_locate_record.tpl @@ -25,7 +25,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {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} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } diff --git a/templates/view_xref_phone_record.tpl b/templates/view_xref_phone_record.tpl index 11ae3b2..dfaf036 100755 --- a/templates/view_xref_phone_record.tpl +++ b/templates/view_xref_phone_record.tpl @@ -25,7 +25,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {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} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } diff --git a/templates/view_xref_sig_record.tpl b/templates/view_xref_sig_record.tpl index fd9d423..3581d36 100755 --- a/templates/view_xref_sig_record.tpl +++ b/templates/view_xref_sig_record.tpl @@ -25,7 +25,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {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} {if $gBitUser->hasPermission( 'p_contact_expunge' ) } diff --git a/templates/view_xref_text_record.tpl b/templates/view_xref_text_record.tpl index f9d7afb..77df1f7 100755 --- a/templates/view_xref_text_record.tpl +++ b/templates/view_xref_text_record.tpl @@ -3,7 +3,7 @@ {$gContent->mInfo.$source[xref].source_title|escape} </td> <td> - {if isset($gContent->mInfo.$source[xref].xref) and $gContent->mInfo.$source[xref].xref <> '' and $gContent->mInfo.$source[xref].xref > 100 } + {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" booticon="icon-note-edit" content_id=$gContent->mInfo.$source[xref].xref} {else} @@ -30,7 +30,7 @@ {/if} <td> <span class="actionicon"> - {if $gBitUser->hasPermission( 'p_contact_update' ) and $source ne 'history' } + {if $gBitUser->hasPermission( 'p_contact_update' ) && $source ne 'history' } {if $gContent->mInfo.$source[xref].source eq 'KEY_B' } {smartlink ititle="Callout" ifile="edit_key_break.php" booticon="icon-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" booticon="icon-undo" expunge=2 content_id=$gContent->mInfo.content_id xref_id=$gContent->mInfo.$source[xref].xref_id} @@ -38,7 +38,7 @@ {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 $gBitUser->hasPermission( 'p_contact_expunge' ) and $gContent->mInfo.$source[xref].source ne 'KEY_B' } + {if $gBitUser->hasPermission( 'p_contact_expunge' ) && $gContent->mInfo.$source[xref].source 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} |