Smarty style updates

14 files changed, 36 insertions, 36 deletions

diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
index c4f3472..1ee82b1 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() || $gContent->getPreference('link_original_images')) && $galItem->getDownloadUrl()}
+							{if ($galItem->hasUpdatePermission() or $gContent->getPreference('link_original_images')) and $galItem->getDownloadUrl()}
 							<div class="download">
 								<a href="{$galItem->getDownloadUrl()}">{tr}Download Original{/tr}</a>
-								{if $galItem->mInfo.width && $galItem->mInfo.height}
+								{if $galItem->mInfo.width and $galItem->mInfo.height}
 								<div class="photo-date">{$galItem->mInfo.width}x{$galItem->mInfo.height} {tr}pixels{/tr}</div>
 								{/if}
 							</div>
@@ -50,7 +50,7 @@
 						<div class="image-title"><p>{$galItem->mInfo.title|escape}</p></div>
 						<div class="image-desc"><p>{$galItem->mInfo.description|default:''}</p></div>
 					</div>
-				{elseif is_a($galItem, 'FisheyeGallery')}
+				{elseif is_a($galItem, '\Bitweaver\Fisheye\FisheyeGallery')}
 					<a class="thumb" name="{$galItem->mContentId}" href="{$galItem->mPreviewImage->mInfo.thumbnail_url.large}" title="{$galItem->mInfo.title|escape}">
 						<img src="{$galItem->mPreviewImage->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}"/>
 					</a>
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
index 9bece31..f644b83 100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
@@ -6,7 +6,7 @@
 	<nav>
 		{assign var=breadCrumbs value=$gContent->getBreadcrumbLinks(1)}
 		<ol class="breadcrumb">
-			<li>{displayname user=$gContent->mInfo.creator_user user_id=$gContent->mInfo.creator_user_id real_name=$gContent->mInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$gContent->mInfo.user_id}">{tr}Galleries{/tr}</a></li>
+			<li>{displayname user=$gContent->mInfo.creator_user user_id=$gContent->mInfo.creator_user_id|default:0 real_name=$gContent->mInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$gContent->mInfo.user_id}">{tr}Galleries{/tr}</a></li>
 			{if $breadCrumbs}
 				{foreach from=$breadCrumbs item=breadTitle key=breadId}
 					{if $breadId==$gContent->mGalleryId}<li class="active">{$breadTitle}</li>
@@ -25,7 +25,7 @@
 		<ul class="thumbs noscript">
 			{foreach from=$gContent->mItems item=galItem}
 			<li>
-				{if is_a($galItem, 'FisheyeImage')}
+				{if is_a($galItem, '\Bitweaver\Fisheye\FisheyeImage')}
 					<a class="thumb" name="{$galItem->mImageId}" href="{$galItem->mInfo.thumbnail_url.large}{*$smarty.const.FISHEYE_PKG_URL}view_image.php?image_id={$galItem->mImageId*}" title="{$galItem->mInfo.title|escape}">
 						<img src="{$galItem->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}" />
 					</a>
@@ -39,10 +39,10 @@
 								{$galItem->mInfo.event_time|bit_short_date}
 							</div>
 							{/if}
-							{if ($galItem->hasUpdatePermission() || $gContent->getPreference('link_original_images')) && $galItem->getDownloadUrl()}
+							{if ($galItem->hasUpdatePermission() or $gContent->getPreference('link_original_images')) and $galItem->getDownloadUrl()}
 							<div class="download">
 								<a href="{$galItem->getDownloadUrl()}">{tr}Download Original{/tr}</a>
-								{if $galItem->mInfo.width && $galItem->mInfo.height}
+								{if $galItem->mInfo.width and $galItem->mInfo.height}
 								<div class="photo-date">{$galItem->mInfo.width}x{$galItem->mInfo.height} {tr}pixels{/tr}</div>
 								{/if}
 							</div>
@@ -50,7 +50,7 @@
 						</div>
 						<div class="image-desc"><p>{$galItem->mInfo.description|escape}</p></div>
 					</div>
-				{elseif is_a($galItem, 'FisheyeGallery')}
+				{elseif is_a($galItem, '\Bitweaver\Fisheye\FisheyeGallery')}
 					<a class="thumb" name="{$galItem->mContentId}" href="{$galItem->mPreviewImage->mInfo.thumbnail_url.large}" title="{$galItem->mInfo.title|escape}">
 						<img src="{$galItem->mPreviewImage->mInfo.thumbnail_url.avatar}" alt="{$galItem->mInfo.title|escape}"/>
 					</a>
diff --git a/gallery_views/simple_list/fisheye_simple_list_inc.tpl b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
index d95fe78..f0a3ac2 100644..100755
--- a/gallery_views/simple_list/fisheye_simple_list_inc.tpl
+++ b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
@@ -4,7 +4,7 @@
 	<nav>
 		{assign var=breadCrumbs value=$gContent->getBreadcrumbLinks(1)}
 		<ol class="breadcrumb">
-			<li>{displayname user=$gContent->mInfo.creator_user user_id=$gContent->mInfo.creator_user_id real_name=$gContent->mInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$gContent->mInfo.user_id}">{tr}Galleries{/tr}</a></li>
+			<li>{displayname user=$gContent->mInfo.creator_user user_id=$gContent->mInfo.creator_user_id|default:0 real_name=$gContent->mInfo.creator_real_name} :: <a href="{$smarty.const.FISHEYE_PKG_URL}?user_id={$gContent->mInfo.user_id}">{tr}Galleries{/tr}</a></li>
 			{if $breadCrumbs}
 				{foreach from=$breadCrumbs item=breadTitle key=breadId}
 					{if $breadId==$gContent->mGalleryId}<li class="active">{$breadTitle}</li>
@@ -25,7 +25,7 @@
 			<th style="width:60%">
 				{smartlink ititle=Name isort=title icontrol=$galInfo}
 			</th>
-			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $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() || $gGallery && $gGallery->getPreference( 'link_original_images' )}
+								{if $gContent->hasUpdatePermission() or $gGallery and $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' ) && $galItem->mInfo.data}
+					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) and $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' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $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' ) && $galItem->mInfo.download_url}
+						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) and $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 ) || $gBitUser->isAdmin()}
+						{if $gContent->isOwner( $galItem->mInfo ) or $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 78acfec..cb9f505 100755
--- a/modules/mod_images.tpl
+++ b/modules/mod_images.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $gBitSystem->isPackageActive( 'fisheye' ) && $modImages}
+{if $gBitSystem->isPackageActive( 'fisheye' ) and $modImages}
 	{bitmodule title="$moduleTitle" name="fisheye_images"}
 		<ul class="list-unstyled">
 			{foreach from=$modImages item=modImg}
diff --git a/modules/mod_specials.tpl b/modules/mod_specials.tpl
index 0d43b98..fab104c 100755
--- a/modules/mod_specials.tpl
+++ b/modules/mod_specials.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $gBitSystem->isPackageActive( 'fisheye' ) && $modImages}
+{if $gBitSystem->isPackageActive( 'fisheye' ) and $modImages}
 	<ul id="specials">
 			{foreach from=$modImages item=modImg}
 				<li>
diff --git a/templates/edit_image.tpl b/templates/edit_image.tpl
index b8722e1..2123d3e 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 && $gContent->mInfo.height}
+										{if $gContent->mInfo.width and $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 eb19ea2..74d91bf 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 && $gContent->mInfo.height}
+					{if $gContent->mInfo.width and $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 9a2c5db..fa152cc 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() || $gContent->getPreference('is_public')}
+	{if $gContent->hasUpdatePermission() or $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/image_order.tpl b/templates/image_order.tpl
index 2a99b66..582768c 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 && $lastMantissa != $thisMantissa) || ($gContent->mInfo.images_per_page && $imageCount % $gContent->mInfo.images_per_page == 0)}
+					{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)}
 					<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 || $gBitUser->isAdmin()}
+								{if $galItem->mInfo.user_id == $gBitUser->mUserId or $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 99c1a1a..56c44d9 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') && $gal.display_url}
+						{if $gBitSystem->isFeatureActive('fisheye_list_thumbnail') and $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' || $gal.is_private=='y' || $gal.access_answer}
+							{if $gal.is_hidden=='y' or $gal.is_private=='y' or $gal.access_answer}
 								{booticon iname="fa-lock" iexplain="Security" label=true}
 							{/if}
 							{if $gal.is_hidden=='y'}
diff --git a/templates/menu_fisheye.tpl b/templates/menu_fisheye.tpl
index 123943f..e7e84e5 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() && $gBitSystem->isPackageActive('quota')}
+	{if $gBitUser->isRegistered() and $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() && $gBitSystem->isPackageActive('gatekeeper')}
+	{if $gBitUser->isRegistered() and $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 6928e28..6201893 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' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $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() || $gGallery && $gGallery->getPreference( 'link_original_images' )}
+								{if $gContent->hasUpdatePermission() or $gGallery and $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' ) && $galItem->mInfo.data}
+					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) and $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' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $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' ) && $galItem->mInfo.download_url}
+						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) and $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 ) || $gBitUser->isAdmin()}
+						{if $gContent->isOwner( $galItem->mInfo ) or $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 4d302ae..7d0d0ad 100755
--- a/templates/view_image.tpl
+++ b/templates/view_image.tpl
@@ -9,8 +9,8 @@
 			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
 			{if $gContent->hasUpdatePermission()}
 				<a title="{tr}Refresh{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image/{$gContent->mImageId}?rethumb=1">{booticon iname="fa-arrows-rotate" iexplain="Refresh"}</a>
-				<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image?image_id={$gContent->mImageId}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a>
-				<a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image?image_id={$gContent->mImageId}&amp;delete=1">{booticon iname="fa-trash" iexplain="Delete Image"}</a>
+				<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}">{booticon iname="fa-pen-to-square" iexplain="Edit Image"}</a>
+				<a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}&amp;delete=1">{booticon iname="fa-trash" iexplain="Delete Image"}</a>
 			{/if}
 		</div>
 	{/if}
@@ -32,7 +32,7 @@
 
 	{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
 
-	{if $gGallery && $gGallery->isCommentable()}
+	{if $gGallery and $gGallery->isCommentable()}
 		{include file="bitpackage:liberty/comments.tpl"}
 	{/if}
 
diff --git a/templates/view_image_details.tpl b/templates/view_image_details.tpl
index 2239985..0c6b923 100755
--- a/templates/view_image_details.tpl
+++ b/templates/view_image_details.tpl
@@ -12,7 +12,7 @@
 
 {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='view' serviceHash=$gContent->mInfo}
 
-{if $gGallery && $gGallery->getPreference('allow_comments') eq 'y'}
+{if $gGallery and $gGallery->getPreference('allow_comments') eq 'y'}
 	{include file="bitpackage:liberty/comments.tpl"}
 {/if}