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.

12 files changed, 19 insertions, 19 deletions

diff --git a/modules/mod_login_box.tpl b/modules/mod_login_box.tpl
index b4e75f9..a3ec701 100644
--- a/modules/mod_login_box.tpl
+++ b/modules/mod_login_box.tpl
@@ -28,7 +28,7 @@
 				</div>
 			{/if}
 
-			{if $gBitSystem->isFeatureActive('http_login_url') or $gBitSystem->isFeatureActive('https_login_url')}
+			{if $gBitSystem->isFeatureActive('http_login_url') || $gBitSystem->isFeatureActive('https_login_url')}
 				<div class="form-group">
 					<a href="{$gBitSystem->getConfig('http_login_url')}" title="{tr}Click here to login using the default security protocol{/tr}">{tr}standard{/tr}</a> |
 					<a href="{$gBitSystem->getConfig('https_login_url')}" title="{tr}Click here to login using a secure protocol{/tr}">{tr}secure{/tr}</a>
diff --git a/modules/mod_user_profile.tpl b/modules/mod_user_profile.tpl
index 88eb3bc..f63bc44 100644
--- a/modules/mod_user_profile.tpl
+++ b/modules/mod_user_profile.tpl
@@ -1,4 +1,4 @@
-{if $userInfo.is_private neq 'true' or $gBitUser->mUserId eq $userInfo.user_id}
+{if $userInfo.is_private neq 'true' || $gBitUser->mUserId eq $userInfo.user_id}
 {strip}
 {bitmodule}
 <div style="text-align:center;">
@@ -12,7 +12,7 @@
 	{/if}
 
 	<div class="floaticon">
-		{if $gQueryUserId and $gBitSystem->isPackageActive( 'messages' ) and $gBitUser->hasPermission( 'p_messages_send' ) and $userPrefs.messages_allow_messages eq 'y'}
+		{if $gQueryUserId && $gBitSystem->isPackageActive( 'messages' ) && $gBitUser->hasPermission( 'p_messages_send' ) && $userPrefs.messages_allow_messages eq 'y'}
 			&nbsp;<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$userInfo.login}">{booticon iname="fa-envelope" iexplain="Send user a personal message"}</a>
 		{/if}
 		{if $gBitUser->hasPermission('p_users_edit_user_homepage')}
diff --git a/modules/mod_who_is_there.tpl b/modules/mod_who_is_there.tpl
index 348ee0a..6f48111 100644
--- a/modules/mod_who_is_there.tpl
+++ b/modules/mod_who_is_there.tpl
@@ -13,7 +13,7 @@
 		{/if}
 	</div>
 	{section name=ix loop=$online_users}
-		{if $user and $gBitSystem->isFeatureActive( 'feature_messages' ) and $gBitUser->hasPermission( 'p_messages_send' )}
+		{if $user && $gBitSystem->isFeatureActive( 'feature_messages' ) && $gBitUser->hasPermission( 'p_messages_send' )}
 			<a href="{$smarty.const.MESSAGES_PKG_URL}compose.php?to={$online_users[ix].user}" title="{tr}Send a message to{/tr} {$online_users[ix].user}">{booticon iname="fa-envelope" iexplain="send message"}</a>
 		{/if}
 		{if $online_users[ix].users_information eq 'public'}
diff --git a/templates/admin_permissions.tpl b/templates/admin_permissions.tpl
index d2cad5c..50d9b96 100644
--- a/templates/admin_permissions.tpl
+++ b/templates/admin_permissions.tpl
@@ -43,11 +43,11 @@
 							{elseif $perm.perm_level == 'registered'}{assign var=id value=3}
 							{elseif $perm.perm_level == 'basic'     }{assign var=id value=-1}{/if}
 
-							{if $id == $group.group_id and !$group.perms.$p}
+							{if $id == $group.group_id && !$group.perms.$p}
 								{assign var=class value="prio5"}
-							{elseif $id == $group.group_id and $group.perms.$p}
+							{elseif $id == $group.group_id && $group.perms.$p}
 								{assign var=class value="prio1"}
-							{elseif $id != $group.group_id and $group.perms.$p}
+							{elseif $id != $group.group_id && $group.perms.$p}
 								{assign var=class value="prio5"}
 							{else}
 								{assign var=class value=""}
diff --git a/templates/my_group_edit.tpl b/templates/my_group_edit.tpl
index 6e48093..c172437 100644
--- a/templates/my_group_edit.tpl
+++ b/templates/my_group_edit.tpl
@@ -156,7 +156,7 @@
 										<th>&nbsp;</th>
 									</tr>
 									{foreach key=permName item=perm from=$allPerms}
-										{if $package eq $perm.package or $package eq 'all'}
+										{if $package eq $perm.package || $package eq 'all'}
 											<tr class="{cycle values="even,odd"}">
 												<td><input type="checkbox" id="{$permName}" name="perm[{$permName}]"{if $groupInfo.perms.$permName} checked="checked"{/if} /></td>
 												<td><label for="{$permName}">{$permName}</label></td>
diff --git a/templates/my_groups_list.tpl b/templates/my_groups_list.tpl
index a8b3043..65b6152 100644
--- a/templates/my_groups_list.tpl
+++ b/templates/my_groups_list.tpl
@@ -44,7 +44,7 @@
 							<th>{tr}Action{/tr}</th>
 						</tr>
 						{foreach from=$publicGroups key=groupId item=group}
-							{if $group.used ne 'y' and $group.is_default ne 'y'}			
+							{if $group.used ne 'y' && $group.is_default ne 'y'}			
 								<tr class="{cycle values="odd,even"}">
 									<td>{$group.group_name}</td>
 									<td>{$group.group_desc}</td>
diff --git a/templates/my_role_edit.tpl b/templates/my_role_edit.tpl
index b9da0c2..1bb56a7 100644
--- a/templates/my_role_edit.tpl
+++ b/templates/my_role_edit.tpl
@@ -156,7 +156,7 @@
 										<th>&nbsp;</th>
 									</tr>
 									{foreach key=permName item=perm from=$allPerms}
-										{if $package eq $perm.package or $package eq 'all'}
+										{if $package eq $perm.package || $package eq 'all'}
 											<tr class="{cycle values="even,odd"}">
 												<td><input type="checkbox" id="{$permName}" name="perm[{$permName}]"{if $roleInfo.perms.$permName} checked="checked"{/if} /></td>
 												<td><label for="{$permName}">{$permName}</label></td>
diff --git a/templates/my_roles_list.tpl b/templates/my_roles_list.tpl
index 0fa65ab..8f11127 100644
--- a/templates/my_roles_list.tpl
+++ b/templates/my_roles_list.tpl
@@ -44,7 +44,7 @@
 							<th>{tr}Action{/tr}</th>
 						</tr>
 						{foreach from=$publicRoles key=roleId item=role}
-							{if $role.used ne 'y' and $role.is_default ne 'y'}			
+							{if $role.used ne 'y' && $role.is_default ne 'y'}			
 								<tr class="{cycle values="odd,even"}">
 									<td>{$role.role_name}</td>
 									<td>{$role.role_desc}</td>
diff --git a/templates/register.tpl b/templates/register.tpl
index bab430c..8999b83 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -114,7 +114,7 @@
 		{/forminput}
 	</div>
 	{/if}
-	{if $gBitSystem->isFeatureActive( 'reg_real_name' ) or $gBitSystem->isFeatureActive( 'reg_homepage' ) or $gBitSystem->isFeatureActive( 'reg_country' ) or $gBitSystem->isFeatureActive( 'reg_language' ) or $gBitSystem->isFeatureActive( 'reg_portrait' )}
+	{if $gBitSystem->isFeatureActive( 'reg_real_name' ) || $gBitSystem->isFeatureActive( 'reg_homepage' ) || $gBitSystem->isFeatureActive( 'reg_country' ) || $gBitSystem->isFeatureActive( 'reg_language' ) || $gBitSystem->isFeatureActive( 'reg_portrait' )}
 		{if $gBitSystem->isFeatureActive( 'reg_homepage' )}
 			<div class="form-group">
 				{formlabel label="HomePage" for="users_homepage"}
@@ -204,7 +204,7 @@
 		{formlabel label="Group" for="group"}
 		{forminput}
 			{foreach item=gr from=$groupList name=group}
-				<input class="form-control" type="radio" name="group" value="{$gr.group_id|escape}"{if ($reg.group eq '' and $smarty.foreach.group.last) or $reg.group eq $gr.group_id} checked="checked"{/if}>
+				<input class="form-control" type="radio" name="group" value="{$gr.group_id|escape}"{if ($reg.group eq '' && $smarty.foreach.group.last) || $reg.group eq $gr.group_id} checked="checked"{/if}>
 					{if $gr.is_default eq "y"}
 						{tr}None{/tr}
 					{elseif $gr.group_desc}
diff --git a/templates/role_register.tpl b/templates/role_register.tpl
index 50fddca..3fe825c 100644
--- a/templates/role_register.tpl
+++ b/templates/role_register.tpl
@@ -130,7 +130,7 @@
 					{/forminput}
 				</div>
 				{/if}
-				{if $gBitSystem->isFeatureActive( 'reg_real_name' ) or $gBitSystem->isFeatureActive( 'reg_homepage' ) or $gBitSystem->isFeatureActive( 'reg_country' ) or $gBitSystem->isFeatureActive( 'reg_language' ) or $gBitSystem->isFeatureActive( 'reg_portrait' )}
+				{if $gBitSystem->isFeatureActive( 'reg_real_name' ) || $gBitSystem->isFeatureActive( 'reg_homepage' ) || $gBitSystem->isFeatureActive( 'reg_country' ) || $gBitSystem->isFeatureActive( 'reg_language' ) || $gBitSystem->isFeatureActive( 'reg_portrait' )}
 					{if $gBitSystem->isFeatureActive( 'reg_homepage' )}
 						<div class="form-group">
 							{formlabel label="HomePage" for="users_homepage"}
@@ -224,7 +224,7 @@
 					{formlabel label="Role" for="role"}
 					{forminput}
 						{foreach item=gr from=$roleList name=role}
-							<input type="radio" name="role" value="{$gr.role_id|escape}"{if ($reg.role eq '' and $smarty.foreach.role.last) or $reg.role eq $gr.role_id} checked="checked"{/if}>
+							<input type="radio" name="role" value="{$gr.role_id|escape}"{if ($reg.role eq '' && $smarty.foreach.role.last) || $reg.role eq $gr.role_id} checked="checked"{/if}>
 								{if $gr.is_default eq "y"}
 									{tr}None{/tr}
 								{elseif $gr.role_desc}
diff --git a/templates/user_information_inc.tpl b/templates/user_information_inc.tpl
index f446ce4..b932649 100644
--- a/templates/user_information_inc.tpl
+++ b/templates/user_information_inc.tpl
@@ -1,6 +1,6 @@
 {* $Header$ *}
 {strip}
-{if $userData->getPreference('users_information') eq 'public' or $gBitUser->mUserId eq $userData->mUserId}
+{if $userData->getPreference('users_information') eq 'public' || $gBitUser->mUserId eq $userData->mUserId}
 	<div class="form-group">
 		{formlabel label="Login"}
 		{forminput}
@@ -85,7 +85,7 @@
 			{/forminput}
 		</div>
 
-		{if $gBitSystem->isPackageActive( 'messages' ) and $userData->getPreference('messages_allow_messages') ne 'n' and $gBitUser->mUserId ne $userData->mUserId}
+		{if $gBitSystem->isPackageActive( 'messages' ) && $userData->getPreference('messages_allow_messages') ne 'n' && $gBitUser->mUserId ne $userData->mUserId}
 			<div class="form-group">
 				{formlabel label="Send Message"}
 				{forminput}
diff --git a/templates/user_preferences.tpl b/templates/user_preferences.tpl
index a511da0..3a57dda 100644
--- a/templates/user_preferences.tpl
+++ b/templates/user_preferences.tpl
@@ -18,7 +18,7 @@
 							{formlabel label="Real Name" for="real_name"}
 							{forminput}
 								<input class="form-control" type="text" name="real_name" id="real_name" value="{$editUser->mInfo.real_name|escape}" />
-								{if !$gBitSystem->getConfig('users_display_name') or $gBitSystem->getConfig('users_display_name') eq 'real_name'}
+								{if !$gBitSystem->getConfig('users_display_name') || $gBitSystem->getConfig('users_display_name') eq 'real_name'}
 									{formhelp note="This is the name that is visible to other users when viewing information added by you."}
 								{/if}
 							{/forminput}
@@ -178,7 +178,7 @@
 				{form legend="Change your password" secure=$gBitSystem->isFeatureActive("site_https_login_required")}
 					<input type="hidden" name="view_user" value="{$editUser->mUserId}" />
 					{* Users with admin priv can change password without knowing the old one *}
-					{if !$view_user or ( !$gBitUser->hasPermission('p_users_admin') and $view_user )}
+					{if !$view_user || ( !$gBitUser->hasPermission('p_users_admin') && $view_user )}
 						<div class="form-group">
 							{formlabel label="Old password" for="old"}
 							{forminput}