Figured what has been causing a problem with using && and || in smarty templates and related to mistake in processing {2} elements that should use curly brackets and not revert to square ones.

19 files changed, 43 insertions, 43 deletions

diff --git a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
index 8b3a4e8..1452f99 100755
--- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
+++ b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
@@ -9,7 +9,7 @@
 	{pagination gallery_id=$gContent->mGalleryId}
 
 	<div class="body">
-		{if !empty($fisheyeSuccess) or !empty($fisheyeErrors) or !empty($fisheyeWarnings) }
+		{if !empty($fisheyeSuccess) || !empty($fisheyeErrors) || !empty($fisheyeWarnings) }
 			{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings}
 		{/if}
 
@@ -21,7 +21,7 @@
 		<table class="thumbnailblock">
 		{counter assign="imageCount" start="0" print=false}
 		{assign var="max" value=100}
-		{if !empty($cols_per_page) and $cols_per_page > 0}{assign var="tdWidth" value="`$max/$cols_per_page`"}{else}{assign var="tdWidth" value="25"}{assign var="cols_per_page" value="1"}{/if}
+		{if !empty($cols_per_page) && $cols_per_page > 0}{assign var="tdWidth" value="`$max/$cols_per_page`"}{else}{assign var="tdWidth" value="25"}{assign var="cols_per_page" value="1"}{/if}
 		{foreach from=$gContent->mItems item=galItem key=itemContentId}
 			{if $imageCount % $cols_per_page == 0}
 				<tr > <!-- Begin Image Row -->
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
index 1ee82b1..50a97a1 100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
@@ -38,10 +38,10 @@
 								{$galItem->mInfo.event_time|bit_short_date}
 							</div>
 							{/if}
-							{if ($galItem->hasUpdatePermission() or $gContent->getPreference('link_original_images')) and $galItem->getDownloadUrl()}
+							{if ($galItem->hasUpdatePermission() || $gContent->getPreference('link_original_images')) && $galItem->getDownloadUrl()}
 							<div class="download">
 								<a href="{$galItem->getDownloadUrl()}">{tr}Download Original{/tr}</a>
-								{if $galItem->mInfo.width and $galItem->mInfo.height}
+								{if $galItem->mInfo.width && $galItem->mInfo.height}
 								<div class="photo-date">{$galItem->mInfo.width}x{$galItem->mInfo.height} {tr}pixels{/tr}</div>
 								{/if}
 							</div>
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
index f644b83..7dd20d0 100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
@@ -39,10 +39,10 @@
 								{$galItem->mInfo.event_time|bit_short_date}
 							</div>
 							{/if}
-							{if ($galItem->hasUpdatePermission() or $gContent->getPreference('link_original_images')) and $galItem->getDownloadUrl()}
+							{if ($galItem->hasUpdatePermission() || $gContent->getPreference('link_original_images')) && $galItem->getDownloadUrl()}
 							<div class="download">
 								<a href="{$galItem->getDownloadUrl()}">{tr}Download Original{/tr}</a>
-								{if $galItem->mInfo.width and $galItem->mInfo.height}
+								{if $galItem->mInfo.width && $galItem->mInfo.height}
 								<div class="photo-date">{$galItem->mInfo.width}x{$galItem->mInfo.height} {tr}pixels{/tr}</div>
 								{/if}
 							</div>
diff --git a/gallery_views/simple_list/fisheye_simple_list_inc.tpl b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
index f0a3ac2..c0e6417 100755
--- a/gallery_views/simple_list/fisheye_simple_list_inc.tpl
+++ b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
@@ -25,7 +25,7 @@
 			<th style="width:60%">
 				{smartlink ititle=Name isort=title icontrol=$galInfo}
 			</th>
-			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
 				<th style="width:10%">
 					{smartlink ititle=Uploaded isort=created iorder=desc idefault=1 icontrol=$galInfo}
 				</th>
@@ -46,7 +46,7 @@
 					<td style="text-align:center;">
 						{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
 							{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
-								{if $gContent->hasUpdatePermission() or $gGallery and $gGallery->getPreference( 'link_original_images' )}
+								{if $gContent->hasUpdatePermission() || $gGallery && $gGallery->getPreference( 'link_original_images' )}
 									<a href="{$galItem->getDownloadUrl()|escape}">
 								{else}
 									<a href="{$galItem->mInfo.thumbnail_url.large}">
@@ -65,7 +65,7 @@
 				{/if}
 				<td>
 					<h3><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h3>
-					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) and $galItem->mInfo.data}
+					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $galItem->mInfo.data}
 						{$galItem->mInfo.parsed_data}
 					{/if}
 					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_attid' )}
@@ -83,7 +83,7 @@
 						{/if}
 					{/if}
 				</td>
-				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
 					<td>
 						{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' )}
 							{$galItem->mInfo.created|bit_short_date}<br />
@@ -110,13 +110,13 @@
 				{/if}
 				<td class="actionicon">
 					{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
-						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) and $galItem->mInfo.download_url}
+						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) && $galItem->mInfo.download_url}
 							<a href="{$galItem->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a>
 						{/if}
 						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
 							<a href="{$galItem->getDisplayUrl()}">{booticon iname="fa-folder-open" iexplain="View File"}</a>
 						{/if}
-						{if $gContent->isOwner( $galItem->mInfo ) or $gBitUser->isAdmin()}
+						{if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()}
 							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{booticon iname="fa-pencil" iexplain="Edit File"}</a>
 							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{booticon iname="fa-trash" iexplain="Remove File"}</a>
 						{/if}
diff --git a/modules/mod_images.tpl b/modules/mod_images.tpl
index cb9f505..81eb27d 100755
--- a/modules/mod_images.tpl
+++ b/modules/mod_images.tpl
@@ -1,10 +1,10 @@
 {strip}
-{if $gBitSystem->isPackageActive( 'fisheye' ) and $modImages}
+{if $gBitSystem->isPackageActive( 'fisheye' ) && $modImages}
 	{bitmodule title="$moduleTitle" name="fisheye_images"}
 		<ul class="list-unstyled">
 			{foreach from=$modImages item=modImg}
 				<li class="{cycle values='odd,even'} item">
-					<a href="{$modImg.display_url}" title="{$modImg.title|escape} - {$modImg.last_modified|bit_short_datetime}, by {displayname user=$modImg.modifier_user real_name=$modImg.modifier_real_name nolink=1}{if (strlen($modImg.title) > $maxlen) AND ($maxlen > 0)}, {$modImg.title|escape}{/if}">
+					<a href="{$modImg.display_url}" title="{$modImg.title|escape} - {$modImg.last_modified|bit_short_datetime}, by {displayname user=$modImg.modifier_user real_name=$modImg.modifier_real_name nolink=1}{if (strlen($modImg.title) > $maxlen) && ($maxlen > 0)}, {$modImg.title|escape}{/if}">
 						<img src="{$modImg.thumbnail_url}" title="{$modImg.title|escape}" alt="{$modImg.title|escape}" />
 
 						{if !$modImg.has_machine_name}
diff --git a/modules/mod_specials.tpl b/modules/mod_specials.tpl
index fab104c..752034a 100755
--- a/modules/mod_specials.tpl
+++ b/modules/mod_specials.tpl
@@ -1,10 +1,10 @@
 {strip}
-{if $gBitSystem->isPackageActive( 'fisheye' ) and $modImages}
+{if $gBitSystem->isPackageActive( 'fisheye' ) && $modImages}
 	<ul id="specials">
 			{foreach from=$modImages item=modImg}
 				<li>
 					<h1>{$modImg.title|escape}</h1>
-						<a href="{$modImg.display_url}" alt="{$modImg.title|escape}" title="{$modImg.title|escape} - {$modImg.last_modified|bit_short_datetime}, by {displayname user=$modImg.modifier_user real_name=$modImg.modifier_real_name nolink=1}{if (strlen($modImg.title) > $maxlen) AND ($maxlen > 0)}, {$modImg.title|escape}{/if}">
+						<a href="{$modImg.display_url}" alt="{$modImg.title|escape}" title="{$modImg.title|escape} - {$modImg.last_modified|bit_short_datetime}, by {displayname user=$modImg.modifier_user real_name=$modImg.modifier_real_name nolink=1}{if (strlen($modImg.title) > $maxlen) && ($maxlen > 0)}, {$modImg.title|escape}{/if}">
 							<img src="{$modImg.thumbnail_url}" title="{$modImg.title|escape}" alt="{$modImg.title|escape}" />
 						</a>
 				</li>
diff --git a/templates/center_list_images.tpl b/templates/center_list_images.tpl
index 0033e0e..761e682 100755
--- a/templates/center_list_images.tpl
+++ b/templates/center_list_images.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $thumbnailList or $showEmpty}
+{if $thumbnailList || $showEmpty}
 	<div class="listing fisheye">
 		<div class="header">
 			<h2>{$fisheye_center_params.title|default:"{tr}Random Images{/tr}"}</h2>
diff --git a/templates/edit_gallery.tpl b/templates/edit_gallery.tpl
index 6f655e8..0385406 100755
--- a/templates/edit_gallery.tpl
+++ b/templates/edit_gallery.tpl
@@ -117,7 +117,7 @@ function updateGalleryPagination() {
 
 						<div class="form-group">
 							{forminput label="checkbox"}
-								<input type="checkbox" name="allow_comments" id="allow_comments" value="y" {if !$gContent->isValid() or $gContent->getPreference('allow_comments') eq 'y'}checked="checked"{/if} />{tr}Image Comments{/tr}
+								<input type="checkbox" name="allow_comments" id="allow_comments" value="y" {if !$gContent->isValid() || $gContent->getPreference('allow_comments') eq 'y'}checked="checked"{/if} />{tr}Image Comments{/tr}
 								{formhelp note="Allow posting comments for an image."}
 							{/forminput}
 						</div>
diff --git a/templates/edit_image.tpl b/templates/edit_image.tpl
index 2123d3e..b8722e1 100755
--- a/templates/edit_image.tpl
+++ b/templates/edit_image.tpl
@@ -23,7 +23,7 @@
 									<br />
 									<small>
 										<a href="{$gContent->getDownloadUrl()}">{tr}Full size{/tr}</a>
-										{if $gContent->mInfo.width and $gContent->mInfo.height}
+										{if $gContent->mInfo.width && $gContent->mInfo.height}
 											: {$gContent->mInfo.width} x {$gContent->mInfo.height}
 										{/if}
 									</small>
diff --git a/templates/edit_image_inc.tpl b/templates/edit_image_inc.tpl
index 74d91bf..eb19ea2 100755
--- a/templates/edit_image_inc.tpl
+++ b/templates/edit_image_inc.tpl
@@ -25,7 +25,7 @@
 				<img src="{$gContent->mInfo.thumbnail_url.medium}" alt="{$gContent->getTitle()|escape}" />
 				<br />
 				<small>
-					{if $gContent->mInfo.width and $gContent->mInfo.height}
+					{if $gContent->mInfo.width && $gContent->mInfo.height}
 						{tr}Full size{/tr} - <a href="{$gContent->getDownloadUrl()}">{$gContent->mInfo.width} x {$gContent->mInfo.height}</a>
 					{elseif $gContent->getDownloadUrl()}
 						<a href="{$gContent->getDownloadUrl()}">{tr}Full size{/tr}</a>
diff --git a/templates/gallery_icons_inc.tpl b/templates/gallery_icons_inc.tpl
index fa152cc..9a2c5db 100755
--- a/templates/gallery_icons_inc.tpl
+++ b/templates/gallery_icons_inc.tpl
@@ -7,7 +7,7 @@
 		<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-pen-to-square"  ipackage="icons"  iexplain="Edit"}</a>
 		<a title="{tr}Image Order{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image_order.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-sort" iexplain="Image Order"}</a>
 	{/if}
-	{if $gContent->hasUpdatePermission() or $gContent->getPreference('is_public')}
+	{if $gContent->hasUpdatePermission() || $gContent->getPreference('is_public')}
 		<a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{booticon iname="fa-upload" ipackage="icons" iexplain="Add Image"}</a>
 	{/if}
 	{if $gContent->getPreference('is_public')}
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index 9bebf49..fbca1e6 100755
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -1,6 +1,6 @@
 {* $Header$ *}
 {strip}
-{if !empty($gGallery) and $gContent}
+{if !empty($gGallery) && $gContent}
 	{if !empty($gGallery->mInfo.previous_image_id)}
 		<link rel="prev" title="{tr}Previous{/tr}" href="{$gContent->getImageUrl($gGallery->mInfo.previous_image_id)|escape}" />
 	{/if}
@@ -8,7 +8,7 @@
 		<link rel="next" title="{tr}Next{/tr}" href="{$gContent->getImageUrl($gGallery->mInfo.next_image_id)|escape}" />
 	{/if}
 {/if}
-{if $gBitSystem->isPackageActive( 'rss' ) and $gBitSystem->isFeatureActive( 'fisheye_rss' ) and $gBitSystem->getActivePackage() eq 'fisheye' and $gBitUser->hasPermission( 'p_fisheye_view' )}
+{if $gBitSystem->isPackageActive( 'rss' ) && $gBitSystem->isFeatureActive( 'fisheye_rss' ) && $gBitSystem->getActivePackage() eq 'fisheye' && $gBitUser->hasPermission( 'p_fisheye_view' )}
 	{if !empty($gGallery)}
 		{assign var=fisheye_rss_gal_id value=$gGallery->mGalleryId}
 	{elseif $gContent}
diff --git a/templates/image_order.tpl b/templates/image_order.tpl
index 582768c..2a99b66 100755
--- a/templates/image_order.tpl
+++ b/templates/image_order.tpl
@@ -25,7 +25,7 @@
 				{counter name=pageCount start=1 assign=pageCount}
 				{foreach from=$gContent->mItems item=galItem key=itemContentId}
 					{assign var=thisMantissa value=$galItem->getField('item_position')|floor}
-					{if ($gContent->getPreference('gallery_pagination')==$smarty.const.FISHEYE_PAGINATION_POSITION_NUMBER and $lastMantissa != $thisMantissa) or ($gContent->mInfo.images_per_page and $imageCount % $gContent->mInfo.images_per_page == 0)}
+					{if ($gContent->getPreference('gallery_pagination')==$smarty.const.FISHEYE_PAGINATION_POSITION_NUMBER && $lastMantissa != $thisMantissa) || ($gContent->mInfo.images_per_page && $imageCount % $gContent->mInfo.images_per_page == 0)}
 					<tr class="{cycle values='even,odd' assign='pageClass'}">
 						<th colspan="3" class="pagebreak">
 							{tr}Gallery Page{/tr} {$pageCount}
@@ -47,7 +47,7 @@
 							{/if}
 							<strong>{tr}Uploaded{/tr}</strong>: {$galItem->mInfo.created|bit_short_datetime}<br />
 							<strong>{tr}File name{/tr}</strong>: {$galItem->mInfo.filename|default:''} <br />
-								{if $galItem->mInfo.user_id == $gBitUser->mUserId or $gBitUser->isAdmin()}
+								{if $galItem->mInfo.user_id == $gBitUser->mUserId || $gBitUser->isAdmin()}
 								<strong>{tr}Edit Image{/tr}</strong>: <a href="javascript:void(0);" onclick="BitAjax.updater( 'imgedit', '{$smarty.const.FISHEYE_PKG_URL}edit_image.php', 'ajax=true&amp;content_id={$galItem->mInfo.content_id}&amp;gallery_id={$gContent->mGalleryId}' );">{booticon iname="fa-pen-to-square" iexplain="Edit Details"}</a>
 								<noscript><div><a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a></div></noscript>
 {*								jspopup href="`$smarty.const.FISHEYE_PKG_URL`edit_image.php?content_id=$galItem->mInfo.content_id" title="edit image" *}
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index 56c44d9..3094beb 100755
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -34,7 +34,7 @@
 				{foreach from=$galleryList key=galleryId item=gal}
 				<div class="col-xs-6 col-sm-4 col-md-3 ">
 					<div class="{$gal.content_type_guid} thumbnail">
-						{if $gBitSystem->isFeatureActive('fisheye_list_thumbnail') and $gal.display_url}
+						{if $gBitSystem->isFeatureActive('fisheye_list_thumbnail') && $gal.display_url}
 							{assign var=thumbnailUri value=$gBitSystem->getParameter( $gal, 'thumbnail_uri', "`$smarty.const.FISHEYE_PKG_URL`image/no_image.png")}
 							<a href="{$gal.display_url}"><div class="square" style="background-image:url('{$thumbnailUri}');"alt="{$gal.title|escape}" 
 								title="{$gal.title|truncate:50|escape}" 
@@ -49,7 +49,7 @@
 							{/if}
 							</a>
 							</h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
-							{if $gal.is_hidden=='y' or $gal.is_private=='y' or $gal.access_answer}
+							{if $gal.is_hidden=='y' || $gal.is_private=='y' || $gal.access_answer}
 								{booticon iname="fa-lock" iexplain="Security" label=true}
 							{/if}
 							{if $gal.is_hidden=='y'}
@@ -72,7 +72,7 @@
 							{booticon iname="fa-lock" iexplain="Protected"}
 						{/if *}
 
-						{if $gBitSystem->isFeatureActive('fisheye_list_created' ) or $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
+						{if $gBitSystem->isFeatureActive('fisheye_list_created' ) || $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
 							<div class="date">
 								{if $gBitSystem->isFeatureActive('fisheye_list_created' ) }
 									<strong>{tr}Created{/tr}:</strong> {$gal.created|bit_short_date}<br />
diff --git a/templates/list_galleries2.tpl b/templates/list_galleries2.tpl
index 615b13e..27b59ee 100755
--- a/templates/list_galleries2.tpl
+++ b/templates/list_galleries2.tpl
@@ -33,7 +33,7 @@
 				{foreach from=$galleryList key=galleryId item=gal}
 				<div class="col-xs-6 col-sm-4 col-md-3 ">
 					<div class="{$gal.content_type_guid} thumbnail">
-						{if $gBitSystem->isFeatureActive('fisheye_list_thumbnail') and $gal.display_url}
+						{if $gBitSystem->isFeatureActive('fisheye_list_thumbnail') && $gal.display_url}
 							{* assign var=thumbnailUri value = $gBitSystem->getParameter( $gal, 'thumbnail_uri', "`$smarty.const.FISHEYE_PKG_URL`image/no_image.png") *}
 							<a href="{$gal.display_url}"><div class="square" alt="{$gal.title|escape}" 
 								title="{$gal.title|truncate:50|escape}" 
@@ -48,7 +48,7 @@
 							{/if}
 							</a>
 							</h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
-							{if $gal.is_hidden|default:'n' == 'y' or $gal.is_private|default:'n' == 'y' or $gal.access_answer|default:false}
+							{if $gal.is_hidden|default:'n' == 'y' || $gal.is_private|default:'n' == 'y' || $gal.access_answer|default:false}
 								{booticon iname="icon-lock" ipackage="icons" iexplain="Security" label=true}
 							{/if}
 							{if $gal.is_hidden|default:'n' =='y'}
@@ -71,7 +71,7 @@
 							{booticon iname="icon-lock" ipackage="icons" iexplain="Protected"}
 						{/if *}
 
-						{if $gBitSystem->isFeatureActive('fisheye_list_created' ) or $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
+						{if $gBitSystem->isFeatureActive('fisheye_list_created' ) || $gBitSystem->isFeatureActive('fisheye_list_lastmodif' )}
 							<div class="date">
 								{if $gBitSystem->isFeatureActive('fisheye_list_created' ) }
 									<strong>Created:</strong> {$gal.created|bit_short_date}<br />
diff --git a/templates/menu_fisheye.tpl b/templates/menu_fisheye.tpl
index e7e84e5..123943f 100755
--- a/templates/menu_fisheye.tpl
+++ b/templates/menu_fisheye.tpl
@@ -14,10 +14,10 @@
 	{* if $gBitUser->hasPermission('p_fisheye_view')}
 		<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}gallery_tree.php">{booticon iname="icon-sitemap" iexplain="growser gallery tree" ilocation=menu} Browse Gallery Tree</a></li>
 	{/if *}
-	{if $gBitUser->isRegistered() and $gBitSystem->isPackageActive('quota')}
+	{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('quota')}
 		<li><a class="item" href="{$smarty.const.QUOTA_PKG_URL}">{booticon iname="icon-hdd" iexplain="Usage" ilocation=menu}</a></li>
 	{/if}
-	{if $gBitUser->isRegistered() and $gBitSystem->isPackageActive('gatekeeper')}
+	{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('gatekeeper')}
 		<li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{booticon iname="fa-lock" iexplain="Security" ilocation=menu}</a></li>
 	{/if}
 	{*if $gBitUser->hasPermission('p_fisheye_admin')}
diff --git a/templates/view_gallery_images_inc.tpl b/templates/view_gallery_images_inc.tpl
index 6201893..6928e28 100755
--- a/templates/view_gallery_images_inc.tpl
+++ b/templates/view_gallery_images_inc.tpl
@@ -29,7 +29,7 @@
 			<th style="width:60%">
 				{smartlink ititle=Name isort=title icontrol=$galInfo}
 			</th>
-			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
 				<th style="width:10%">
 					{smartlink ititle=Uploaded isort=created iorder=desc idefault=1 icontrol=$galInfo}
 				</th>
@@ -50,7 +50,7 @@
 					<td style="text-align:center;">
 						{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
 							{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
-								{if $gContent->hasUpdatePermission() or $gGallery and $gGallery->getPreference( 'link_original_images' )}
+								{if $gContent->hasUpdatePermission() || $gGallery && $gGallery->getPreference( 'link_original_images' )}
 									<a href="{$galItem->getDownloadUrl()|escape}">
 								{else}
 									<a href="{$galItem->mInfo.thumbnail_url.large}">
@@ -69,7 +69,7 @@
 				{/if}
 				<td>
 					<h3><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h3>
-					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) and $galItem->mInfo.data}
+					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $galItem->mInfo.data}
 						{$galItem->mInfo.parsed_data}
 					{/if}
 					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_attid' )}
@@ -87,7 +87,7 @@
 						{/if}
 					{/if}
 				</td>
-				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
 					<td>
 						{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' )}
 							{$galItem->mInfo.created|bit_short_date}<br />
@@ -114,13 +114,13 @@
 				{/if}
 				<td class="actionicon">
 					{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
-						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) and $galItem->mInfo.download_url}
+						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) && $galItem->mInfo.download_url}
 							<a href="{$galItem->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a>
 						{/if}
 						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
 							<a href="{$galItem->getDisplayUrl()}">{booticon iname="fa-folder-open" iexplain="View File"}</a>
 						{/if}
-						{if $gContent->isOwner( $galItem->mInfo ) or $gBitUser->isAdmin()}
+						{if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()}
 							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{booticon iname="fa-pen-to-square" iexplain="Edit File"}</a>
 							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{booticon iname="fa-trash" iexplain="Remove File"}</a>
 						{/if}
diff --git a/templates/view_image.tpl b/templates/view_image.tpl
index 7d0d0ad..e808f89 100755
--- a/templates/view_image.tpl
+++ b/templates/view_image.tpl
@@ -24,7 +24,7 @@
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
 		<div class="image">
 			{include file=$gLibertySystem->getMimeTemplate('view',$gContent->mInfo.attachment_plugin_guid) attachment=$gContent->mInfo.image_file}
-			{if $gBitSystem->isFeatureActive('fisheye_image_list_description') and $gContent->mInfo.data ne ''}
+			{if $gBitSystem->isFeatureActive('fisheye_image_list_description') && $gContent->mInfo.data ne ''}
 				<p class="description">{$gContent->mInfo.parsed_data}</p>
 			{/if}
 			</div>
@@ -32,7 +32,7 @@
 
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
 
-	{if $gGallery and $gGallery->isCommentable()}
+	{if $gGallery && $gGallery->isCommentable()}
 		{include file="bitpackage:liberty/comments.tpl"}
 	{/if}
 
diff --git a/templates/view_image_details.tpl b/templates/view_image_details.tpl
index 0c6b923..44dfb53 100755
--- a/templates/view_image_details.tpl
+++ b/templates/view_image_details.tpl
@@ -4,7 +4,7 @@
 	</div>
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$gContent->mInfo}
 	<div class="image">
-		{if $gBitSystem->isFeatureActive('fisheye_image_list_description') and $gContent->mInfo.data ne ''}
+		{if $gBitSystem->isFeatureActive('fisheye_image_list_description') && $gContent->mInfo.data ne ''}
 			<p class="description">{$gContent->mInfo.parsed_data|default:''}</p>
 		{/if}
 		</div>
@@ -12,7 +12,7 @@
 
 {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
 
-{if $gGallery and $gGallery->getPreference('allow_comments') eq 'y'}
+{if $gGallery && $gGallery->getPreference('allow_comments') eq 'y'}
 	{include file="bitpackage:liberty/comments.tpl"}
 {/if}