Smarty style changes

10 files changed, 28 insertions, 28 deletions

diff --git a/templates/admin_features.tpl b/templates/admin_features.tpl
index bf175f9..9a788b9 100755
--- a/templates/admin_features.tpl
+++ b/templates/admin_features.tpl
@@ -45,7 +45,7 @@
 							{/if}
 							<option value="users_custom_home"{if $gBitSystem->getConfig('bit_index') eq $gBitSystem->getConfig('site_url_index')} selected="selected"{/if}>{tr}Custom home{/tr}</option>
 							{foreach key=name item=package from=$gBitSystem->mPackages}
-								{if $package.homeable && $package.installed}
+								{if $package.homeable and $package.installed}
 									<option {if $gBitSystem->getConfig('bit_index') eq $package.dir}selected="selected"{/if} value="{$package.dir}">{$package.dir|capitalize}</option>
 								{/if}
 							{/foreach}
diff --git a/templates/bit_left.tpl b/templates/bit_left.tpl
index 5e085e9..eff37d4 100644..100755
--- a/templates/bit_left.tpl
+++ b/templates/bit_left.tpl
@@ -1,4 +1,4 @@
-{if $gBitSystem->isFeatureActive( 'site_left_column' ) && $l_modules && !$gHideModules}
+{if $gBitSystem->isFeatureActive( 'site_left_column' ) and $l_modules and !$gHideModules}
 	{section name=homeix loop=$l_modules}
 		{$l_modules[homeix].data}
 	{/section}
diff --git a/templates/bit_right.tpl b/templates/bit_right.tpl
index 455ecdc..55b4f06 100644..100755
--- a/templates/bit_right.tpl
+++ b/templates/bit_right.tpl
@@ -1,4 +1,4 @@
-{if $gBitSystem->isFeatureActive( 'site_right_column' ) && $r_modules && !$gHideModules}
+{if $gBitSystem->isFeatureActive( 'site_right_column' ) and $r_modules and !$gHideModules}
 	{section name=homeix loop=$r_modules}
 		{$r_modules[homeix].data}
 	{/section}
diff --git a/templates/error_ticket.tpl b/templates/error_ticket.tpl
index 1637a80..59d6153 100644..100755
--- a/templates/error_ticket.tpl
+++ b/templates/error_ticket.tpl
@@ -10,7 +10,7 @@
 
 <table border="0" cellspacing="0" cellpadding="0" width="100%">
 <tr>
-{if $gBitSystem->isFeatureActive( 'site_left_column' ) && $l_modules}
+{if $gBitSystem->isFeatureActive( 'site_left_column' ) and $l_modules}
   <td id="bitleft">
     {section name=homeix loop=$l_modules}
       {$l_modules[homeix].data}
@@ -37,7 +37,7 @@
       </div>
     </div>
   </td>
-{if $gBitSystem->isFeatureActive( 'site_right_column' ) && $r_modules}
+{if $gBitSystem->isFeatureActive( 'site_right_column' ) and $r_modules}
   <td id="bitright">
     {section name=homeix loop=$r_modules}
       {$r_modules[homeix].data}
diff --git a/templates/html.tpl b/templates/html.tpl
index 70d962f..3483f1d 100755
--- a/templates/html.tpl
+++ b/templates/html.tpl
@@ -43,11 +43,11 @@
 	{if $gBitSystem->isFeatureActive( 'bidirectional_text' )}<div dir="rtl">{/if}
 
 	{if $gBitThemes->mDisplayMode != 'edit'}
-		{if $gBitSystem->isFeatureActive( 'site_left_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('l')}
+		{if $gBitSystem->isFeatureActive( 'site_left_column' ) and !$gHideModules and $gBitThemes->hasColumnModules('l')}
 			{assign var=leftCol value=$gBitThemes->fetchLayoutColumn('l')}
 		{/if}
 
-		{if $gBitSystem->isFeatureActive( 'site_right_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('r')}
+		{if $gBitSystem->isFeatureActive( 'site_right_column' ) and !$gHideModules and $gBitThemes->hasColumnModules('r')}
 			{assign var=rightCol value=$gBitThemes->fetchLayoutColumn('r')}
 		{/if}
 	{/if}
@@ -64,7 +64,7 @@
 		{assign var=extraColumns value=0}
 	{/if}
 
-	{if $gBitSystem->isFeatureActive( 'site_top_column' ) && !$gHideModules}
+	{if $gBitSystem->isFeatureActive( 'site_top_column' ) and !$gHideModules}
 	<header itemscope itemtype="http://schema.org/WPHeader" role="banner" class="container{$gBitSystem->getConfig('layout-header')}" id="bw-main-header">
 		{$gBitThemes->displayLayoutColumn('t')}
 		{if $gBitSystem->getConfig('site_notice')}
@@ -117,7 +117,7 @@
 
 	<footer id="bw-main-footer" class="container{$gBitSystem->getConfig('layout-footer')}">
 		{**** Theme Layout Modules : BOTTOM ****}
-		{if $gBitSystem->isFeatureActive( 'site_bottom_column' ) && !$gHideModules}
+		{if $gBitSystem->isFeatureActive( 'site_bottom_column' ) and !$gHideModules}
 			{$gBitThemes->displayLayoutColumn('b')}
 		{/if}
 		{* get custom footer files from individual packages *}
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index a23c364..1ded775 100755
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -7,7 +7,7 @@
 <meta name="description" content="{$metaDescription|escape}" />
 {elseif $smarty.server.REQUEST_URI==$smarty.const.BIT_ROOT_URL}
 <meta name="description" content="{$gBitSystem->getConfig('site_description')|escape}"/>
-{elseif !empty($gContent) && $gContent->isValid()}
+{elseif !empty($gContent) and $gContent->isValid()}
 <meta name="description" content="{$gContent->generateDescription()|strip_tags|escape}"/>
 {/if}
 
@@ -15,7 +15,7 @@
 <meta name="keywords" content="{$metaKeywords|escape}" />
 {elseif $smarty.server.REQUEST_URI==BIT_ROOT_URI}
 <meta name="keywords" content="{$metaKeywords|default:$gBitSystem->getConfig('site_keywords')}" />
-{elseif !empty($gContent) && $gContent->isValid()}
+{elseif !empty($gContent) and $gContent->isValid()}
 <meta name="keywords" content="{','|implode:$gContent->generateKeywords()|strip_tags|escape}"/>
 {/if}
 
@@ -74,7 +74,7 @@
 	var bitTk = "{$gBitUser->mTicket}";
 /* ]]> */</script>
 
-{if $gBitSystem->isPackageActive('jscalendar') && $gBitSystem->isFeatureActive( 'site_use_jscalendar' )}
+{if $gBitSystem->isPackageActive('jscalendar') and $gBitSystem->isFeatureActive( 'site_use_jscalendar' )}
 	<link rel="stylesheet" title="{$style}" type="text/css" href="{$smarty.const.UTIL_PKG_URL}javascript/dynarch/jscalendar/calendar-system.css" media="all" nonce="{$cspNonce} />
 	<script nonce="{$cspNonce}" async src="{$smarty.const.UTIL_PKG_URL}javascript/dynarch/jscalendar/calendar.js"></script>
 	<script nonce="{$cspNonce}" async src="{$smarty.const.UTIL_PKG_URL}javascript/dynarch/jscalendar/lang/calendar-en.js"></script>
diff --git a/templates/menu_top_admin_inc.tpl b/templates/menu_top_admin_inc.tpl
index 8e53573..4858f10 100644..100755
--- a/templates/menu_top_admin_inc.tpl
+++ b/templates/menu_top_admin_inc.tpl
@@ -3,12 +3,12 @@
 </a>
 <ul class="dropdown-menu sub-menu pull-right">	
 {foreach key=key item=menu from=$adminMenu}
-	{if $key=='kernel' || $key=='liberty' || $key=='users' || $key=='themes'}
+	{if $key=='kernel' or $key=='liberty' or $key=='users' or $key=='themes'}
 	<li class="dropdown-submenu favorite">{include file=$menu.tpl packageMenuTitle=$key packageMenuClass="dropdown-menu sub-menu"}</li>
 	{/if}
 {/foreach}
 {foreach key=key item=menu from=$adminMenu}
-	{if $key!=='kernel' && $key!=='liberty' && $key!=='users' && $key!=='themes'}
+	{if $key!=='kernel' and $key!=='liberty' and $key!=='users' and $key!=='themes'}
 	<li class="dropdown-submenu">{include file=$menu.tpl packageMenuTitle=$key packageMenuClass="dropdown-menu sub-menu"}</li>
 	{/if}
 {/foreach}
diff --git a/templates/pagination.tpl b/templates/pagination.tpl
index 8a345dd..05624b0 100755
--- a/templates/pagination.tpl
+++ b/templates/pagination.tpl
@@ -37,19 +37,19 @@
 				sort_mode={$listInfo.sort_mode}&amp;
 			{/if}
 		{/if}
-		{if isset($listInfo.find) && $listInfo.find ne ''}
+		{if isset($listInfo.find) and $listInfo.find ne ''}
 			find={$listInfo.find}&amp;
 		{/if}
 	{/capture}
 	{assign var=pageUrlVar value=$smarty.capture.string|regex_replace:'/"/':'%22'}
 	{assign var=pageUrl value="`$pgnUrl`?`$pageUrlVar`"}
 {/if}
-{if !empty($listInfo) and $listInfo.total_pages > 1 && $listInfo.page_records}
+{if !empty($listInfo) and $listInfo.total_pages > 1 and $listInfo.page_records}
 <div class="paginator overflow-hidden clear">
 	<ul class="pagination pull-left">
 		{if $listInfo.current_page > 1}
 			{assign var=blockStart value=1}
-			<li>{tr}<a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.current_page-1}">&laquo;</a>{/tr}</li>
+			<li>{tr}<a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode ?? ''}&amp;page={$listInfo.current_page-1}">&laquo;</a>{/tr}</li>
 		{/if}
 		{if $listInfo.current_page-$listInfo.block_pages > 0}
 			{assign var=blockStart value=$listInfo.current_page-$listInfo.block_pages}
@@ -57,34 +57,34 @@
 			{assign var=blockStart value=1}
 		{/if}
 		{if $blockStart > 1}
-			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page=1">1</a></li>
-			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.current_page-$listInfo.block_pages}">...</a></li>
+			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode ?? ''}&amp;page=1">1</a></li>
+			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode ?? ''}&amp;page={$listInfo.current_page-$listInfo.block_pages}">...</a></li>
 		{/if}
 
 		{section name=current_page start=$blockStart loop=$blockStart+$listInfo.block_pages*2+1}
 		{if $smarty.section.current_page.index <= $listInfo.total_pages}
 			
 			{if $smarty.section.current_page.index != $listInfo.current_page}
-			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$smarty.section.current_page.index}">{$smarty.section.current_page.index}</a></li>
+			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode ?? ''}&amp;page={$smarty.section.current_page.index}">{$smarty.section.current_page.index}</a></li>
 			{else}
 			<li class="active"><span>{$listInfo.current_page}</span></li>
 			{/if}
 		{/if}
 		{/section}
 		{if $blockStart+$listInfo.block_pages*2 < $listInfo.total_pages}
-			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.current_page+1}">...</a></li>
-			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.total_pages}">{$listInfo.total_pages}</a></li>
+			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode ?? ''}&amp;page={$listInfo.current_page+1}">...</a></li>
+			<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode ?? ''}&amp;page={$listInfo.total_pages}">{$listInfo.total_pages}</a></li>
 		{/if}
 
 		{if $listInfo.current_page < $listInfo.total_pages}
-		<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}&amp;page={$listInfo.current_page+1}">&raquo;</a></li>
+		<li><a href="{$pageUrl}max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode ?? ''}&amp;page={$listInfo.current_page+1}">&raquo;</a></li>
 		{/if}
 	</ul>
 	<div class="pagination pull-right">
 		{form action="$pageUrl" class="form-inline"}
 		{$listInfo.offset+1} {tr}to{/tr} {math equation="x + y" x=$listInfo.offset y=$listInfo.page_records} {tr}of{/tr} {$listInfo.total_records},&nbsp; 
 				<input type="hidden" name="find" value="{$find|default:$smarty.request.find}" />
-				<input type="hidden" name="sort_mode" value="{$sort_mode}" />
+				<input type="hidden" name="sort_mode" value="{$sort_mode ?? ''}" />
 				{foreach from=$pgnHidden key=name item=value}
 					<input type="hidden" name="{$name}" value="{$value}" />
 				{/foreach}
diff --git a/templates/server_stats_inc.tpl b/templates/server_stats_inc.tpl
index a05211a..6b8bac2 100644..100755
--- a/templates/server_stats_inc.tpl
+++ b/templates/server_stats_inc.tpl
@@ -1,4 +1,4 @@
-{strip}{if !$gBitSystem->isLive() || $gBitUser->hasPermission('p_stats_view')}
+{strip}{if !$gBitSystem->isLive() or $gBitUser->hasPermission('p_stats_view')}
 <div class="server-stats">
 		{if !$gBitSystem->isLive()}<span class="alert alert-warning">{tr}Site is not live. Search engines will not index this site.{/tr}</span>{/if}
 		{tr}Execution:{/tr} {elapsed}s, {memusage}, {$gBitSystem->mDb->mNumQueries} Queries ( {$gBitSystem->mDb->mQueryTime|string_format:"%.3f"}s / {($gBitSystem->mDb->mQueryTime/$gBitSystem->mTimer->elapsed()*100)|round}% ) 
diff --git a/templates/top_bar.tpl b/templates/top_bar.tpl
index ea6e63c..c84c73e 100755
--- a/templates/top_bar.tpl
+++ b/templates/top_bar.tpl
@@ -9,7 +9,7 @@
 		{if $gBitSystem->mAppMenu.bar}
 		<ul class="nav navbar-nav">
 			{foreach key=key item=menu from=$gBitSystem->mAppMenu.bar}
-				{if $menu.menu_title && $menu.index_url && $menu.menu_template && !$menu.is_disabled}
+				{if $menu.menu_title and $menu.index_url and $menu.menu_template and !$menu.is_disabled}
 					{if $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )}
 					<li class="dropdown m-{$key}{if $gBitSystem->getActivePackage() eq $menu.package_name} active{/if}">
 						{include file="`$menu.menu_template`" packageMenuClass="dropdown-menu" packageMenuTitle=$menu.menu_title}
@@ -25,7 +25,7 @@
 		{/if}
 		{if !empty($gBitSystem->mAppMenu.form)}
 		{foreach key=key item=menu from=$gBitSystem->mAppMenu.form}
-			{if $menu.menu_title && $menu.index_url && $menu.menu_template && !$menu.is_disabled}
+			{if $menu.menu_title and $menu.index_url and $menu.menu_template and !$menu.is_disabled}
 				{include file="`$menu.menu_template`" packageMenuClass="dropdown-menu" packageMenuTitle=$menu.menu_title}
 			{/if}
 		{/foreach}
@@ -55,7 +55,7 @@
 	{/if}
 </nav>
 
-{if $gBitSystem->isFeatureActive('site_top_bar_js') && $gBitSystem->isFeatureActive('site_top_bar_dropdown')}
+{if $gBitSystem->isFeatureActive('site_top_bar_js') and $gBitSystem->isFeatureActive('site_top_bar_dropdown')}
 	<script> /*<![CDATA[*/
 		var listMenu = new FSMenu('listMenu', true, 'left', 'auto', '-999');
 		{if $gBitSystem->isFeatureActive( 'site_top_bar_js_fade' )}