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.

7 files changed, 20 insertions, 20 deletions

diff --git a/modules/mod_switch_theme.tpl b/modules/mod_switch_theme.tpl
index e8bd1d3..235cb78 100644
--- a/modules/mod_switch_theme.tpl
+++ b/modules/mod_switch_theme.tpl
@@ -11,7 +11,7 @@
 		{/form}
 	{/if}
 	
-	{if $change_theme neq 'y' and $gBitUser->isAdmin()}
+	{if $change_theme neq 'y' && $gBitUser->isAdmin()}
 		{tr}This feature has to be enabled via Admin > User Settings.{/tr}
 	{/if}
 
diff --git a/templates/admin_columns.tpl b/templates/admin_columns.tpl
index 0191904..cc9a865 100755
--- a/templates/admin_columns.tpl
+++ b/templates/admin_columns.tpl
@@ -146,7 +146,7 @@
 								<td>{$name}</td>
 								{foreach from=$hideableAreas item=areaname key=area name=areas}
 									{foreach from=$displayModes item=modename key=mode name=modes}
-										<td class="{if $smarty.foreach.modes.last and !$smarty.foreach.areas.last}splitstyle{/if}">
+										<td class="{if $smarty.foreach.modes.last && !$smarty.foreach.areas.last}splitstyle{/if}">
 											<input type="checkbox" name="hide[{$package}_{$mode}_hide_{$area}_col]" value="y" {if $gBitSystem->isFeatureActive("`$package`_`$mode`_hide_`$area`_col")}checked="checked"{/if} />
 										</td>
 									{/foreach}
diff --git a/templates/admin_layout.tpl b/templates/admin_layout.tpl
index cf825ac..18e65bd 100755
--- a/templates/admin_layout.tpl
+++ b/templates/admin_layout.tpl
@@ -25,7 +25,7 @@
 				{/forminput}
 			</div>
 
-			{if $cloneLayouts and $module_package != kernel}
+			{if $cloneLayouts && $module_package != kernel}
 				<div class="form-group">
 					{formlabel label="Copy existing layout" for="clone_layout"}
 					{forminput}
@@ -50,7 +50,7 @@
 <div class="form-group">
 	<div class="col-md-7">
 		<table class="width100p">
-			<caption>{tr}Current Layout of '{if !$module_package or $module_package=='kernel'}Site Default{else}{$module_package|capitalize}{/if}'{/tr}</caption>
+			<caption>{tr}Current Layout of '{if !$module_package || $module_package=='kernel'}Site Default{else}{$module_package|capitalize}{/if}'{/tr}</caption>
 			<tr>
 				{foreach from=$layoutAreas item=area key=colkey}
 					{if $colkey =='top'}
@@ -100,12 +100,12 @@
 			<div class="form-group">
 				{formlabel label="Package"}
 				{forminput}
-					<span class="highlight">{tr}{if !$module_package or $module_package eq 'kernel'}Site Default{else}{$module_package|capitalize}{/if}{/tr}</span>
+					<span class="highlight">{tr}{if !$module_package || $module_package eq 'kernel'}Site Default{else}{$module_package|capitalize}{/if}{/tr}</span>
 					{formhelp note="This is the package you are currently editing."}
 				{/forminput}
 			</div>
 
-			{if $fEdit and $fAssign.name}
+			{if $fEdit && $fAssign.name}
 				<input type="hidden" name="assign_name" value="{$fAssign.name}" />
 			{else}
 				<div class="form-group">
@@ -252,7 +252,7 @@
 			<div class="form-group">
 				{formlabel label="Package"}
 				{forminput}
-					<span class="highlight">{tr}{if !$module_package or $module_package eq 'kernel'}Site Default{else}{$module_package|capitalize}{/if}{/tr}</span>
+					<span class="highlight">{tr}{if !$module_package || $module_package eq 'kernel'}Site Default{else}{$module_package|capitalize}{/if}{/tr}</span>
 					{formhelp note="This is the package you are currently editing."}
 				{/forminput}
 			</div>
@@ -260,7 +260,7 @@
 			<div class="form-group">
 				{formlabel label="Center Piece" for="module"}
 				{forminput}
-					{if $fEdit and $fAssign.name}
+					{if $fEdit && $fAssign.name}
 						<input type="hidden" name="fAssign[module]" value="{$fAssign.module}" id="module" />{$fAssign.module}
 					{else}
 						{* html_options name="fAssign[module_rsrc]" id="module" values=$allCenters options=$allCenters selected=$mod *}
diff --git a/templates/admin_layout_overview.tpl b/templates/admin_layout_overview.tpl
index 7e05def..88bc03b 100755
--- a/templates/admin_layout_overview.tpl
+++ b/templates/admin_layout_overview.tpl
@@ -10,7 +10,7 @@
 	{jstabs}
 		{foreach name=PkgLayouts from=$layouts item=layout key=module_package}
 
-			{if !$module_package or $module_package == 'kernel'}
+			{if !$module_package || $module_package == 'kernel'}
 				{assign var=tabTitle value="Default"|tra}
 			{else}
 				{assign var=tabTitle value=$module_package|capitalize}
diff --git a/templates/icon_browser.tpl b/templates/icon_browser.tpl
index b1688e1..5c51cbc 100755
--- a/templates/icon_browser.tpl
+++ b/templates/icon_browser.tpl
@@ -39,7 +39,7 @@
 					</td>
 					<td>
 						{* only show huge size if looking at a particular set *}
-						{if $smarty.request.icon_style and $iconList.$iconStyle.$name}
+						{if $smarty.request.icon_style && $iconList.$iconStyle.$name}
 							{* avoid translation here by not using iexplain *}
 							{biticon istyle=$iconStyle ipackage=icons iname="huge/`$iconList.$iconStyle.$name`"}
 						{/if}
diff --git a/templates/module_config_inc.tpl b/templates/module_config_inc.tpl
index 9b1459f..3e9197e 100755
--- a/templates/module_config_inc.tpl
+++ b/templates/module_config_inc.tpl
@@ -1,7 +1,7 @@
 {capture name=shared}
 	{smartlink ititle="Up" booticon="fa-arrow-up" page=$page move_module=up module_package=$module_package module_id=$modInfo.module_id}
 	{smartlink ititle="Down" booticon="fa-arrow-down" page=$page move_module=down module_package=$module_package module_id=$modInfo.module_id}
-	{if $colkey eq 'left' or $colkey eq 'right'}
+	{if $colkey eq 'left' || $colkey eq 'right'}
 		{if $colkey == 'left'}
 			{assign var=move value=right}
 		{elseif $colkey == 'right'}
@@ -17,17 +17,17 @@
 
 {strip}
 <strong>
-	{if !$smarty.request.nocollapse|default:false and !$condensed and $gBitThemes->isJavascriptEnabled()}<a href="javascript:BitBase.flipWithSign('id-{$modInfo.module_id}');"><span id="flipperid-{$modInfo.module_id}" class="monospace">[+]</span> {/if}
+	{if !$smarty.request.nocollapse|default:false && !$condensed && $gBitThemes->isJavascriptEnabled()}<a href="javascript:BitBase.flipWithSign('id-{$modInfo.module_id}');"><span id="flipperid-{$modInfo.module_id}" class="monospace">[+]</span> {/if}
 		{$modInfo.name}
 		<input type="hidden" name="modules[{$modInfo.module_id}][layout_area]" value="{$area}" />
 		<input type="hidden" name="modules[{$modInfo.module_id}][layout]" value="{$module_package}" />
-	{if !$smarty.request.nocollapse|default:false and !$condensed and $gBitThemes->isJavascriptEnabled()}</a>{/if}
+	{if !$smarty.request.nocollapse|default:false && !$condensed && $gBitThemes->isJavascriptEnabled()}</a>{/if}
 	<br />
 	{$smarty.capture.shared}
 </strong>
 
 {if !$condensed}
-	{if !$smarty.request.nocollapse|default:false and $gBitThemes->isJavascriptEnabled()}<div id="id-{$modInfo.module_id}" style="display:none;">{/if}
+	{if !$smarty.request.nocollapse|default:false && $gBitThemes->isJavascriptEnabled()}<div id="id-{$modInfo.module_id}" style="display:none;">{/if}
 		<table class="table data">
 			<tr>
 				<td class="alignright">{tr}Position{/tr}</td>
@@ -73,6 +73,6 @@
 				</td>
 			</tr>
 		</table>
-	{if !$smarty.request.nocollapse|default:false and $gBitThemes->isJavascriptEnabled()}</div>{/if}
+	{if !$smarty.request.nocollapse|default:false && $gBitThemes->isJavascriptEnabled()}</div>{/if}
 {/if}
 {/strip}
diff --git a/templates/module_config_role_inc.tpl b/templates/module_config_role_inc.tpl
index b3254ba..454995e 100755
--- a/templates/module_config_role_inc.tpl
+++ b/templates/module_config_role_inc.tpl
@@ -1,7 +1,7 @@
 {capture name=shared}
 	{smartlink ititle="Up" booticon="fa-arrow-up" page=$page move_module=up module_package=$module_package module_id=$modInfo.module_id}
 	{smartlink ititle="Down" booticon="fa-arrow-down" page=$page move_module=down module_package=$module_package module_id=$modInfo.module_id}
-	{if $colkey eq 'left' or $colkey eq 'right'}
+	{if $colkey eq 'left' || $colkey eq 'right'}
 		{if $colkey == 'left'}
 			{assign var=icon value=next}
 			{assign var=move value=right}
@@ -19,17 +19,17 @@
 
 {strip}
 <strong>
-	{if !$smarty.request.nocollapse|default:false and !$condensed and $gBitThemes->isJavascriptEnabled()}<a href="javascript:BitBase.flipWithSign('id-{$modInfo.module_id}');"><span id="flipperid-{$modInfo.module_id}" class="monospace">[+]</span> {/if}
+	{if !$smarty.request.nocollapse|default:false && !$condensed && $gBitThemes->isJavascriptEnabled()}<a href="javascript:BitBase.flipWithSign('id-{$modInfo.module_id}');"><span id="flipperid-{$modInfo.module_id}" class="monospace">[+]</span> {/if}
 		{$modInfo.name}
 		<input type="hidden" name="modules[{$modInfo.module_id}][layout_area]" value="{$area}" />
 		<input type="hidden" name="modules[{$modInfo.module_id}][layout]" value="{$module_package}" />
-	{if !$smarty.request.nocollapse|default:false and !$condensed and $gBitThemes->isJavascriptEnabled()}</a>{/if}
+	{if !$smarty.request.nocollapse|default:false && !$condensed && $gBitThemes->isJavascriptEnabled()}</a>{/if}
 	<br />
 	{$smarty.capture.shared}
 </strong>
 
 {if !$condensed}
-	{if !$smarty.request.nocollapse|default:false and $gBitThemes->isJavascriptEnabled()}<div id="id-{$modInfo.module_id}" style="display:none;">{/if}
+	{if !$smarty.request.nocollapse|default:false && $gBitThemes->isJavascriptEnabled()}<div id="id-{$modInfo.module_id}" style="display:none;">{/if}
 		<table class="table data">
 			<tr>
 				<td class="alignright">{tr}Position{/tr}</td>
@@ -75,6 +75,6 @@
 				</td>
 			</tr>
 		</table>
-	{if !$smarty.request.nocollapse and $gBitThemes->isJavascriptEnabled()}</div>{/if}
+	{if !$smarty.request.nocollapse && $gBitThemes->isJavascriptEnabled()}</div>{/if}
 {/if}
 {/strip}