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.V5-php84

7 files changed, 11 insertions, 11 deletions

diff --git a/modules/mod_unread_messages.tpl b/modules/mod_unread_messages.tpl
index 5b18442..ae8f980 100755
--- a/modules/mod_unread_messages.tpl
+++ b/modules/mod_unread_messages.tpl
@@ -1,5 +1,5 @@
 {* $Header$ *}
-{if $gBitUser->isRegistered() and $gBitSystem->isPackageActive( 'messages') and $gBitUser->hasPermission( 'p_messages_send' )}
+{if $gBitUser->isRegistered() && $gBitSystem->isPackageActive( 'messages') && $gBitUser->hasPermission( 'p_messages_send' )}
 	{bitmodule title="$moduleTitle" name="messages_unread_messages"}
 		<a href="{$smarty.const.MESSAGES_PKG_URL}message_box.php">
 			{tr}You have <strong>{$unreadMsgs} unread</strong> {if $unreadMsgs eq '1'}message{else}messages{/if}{/tr}
diff --git a/templates/broadcast.tpl b/templates/broadcast.tpl
index 46d814f..5654afd 100755
--- a/templates/broadcast.tpl
+++ b/templates/broadcast.tpl
@@ -16,7 +16,7 @@
 					{forminput}
 						<select name="group_id" id="broadcast-group">
 							{section name=ix loop=$groups}
-								{if $groups[ix].group_id and $groups[ix].group_name}
+								{if $groups[ix].group_id && $groups[ix].group_name}
 									<option value="{$groups[ix].group_id}">{$groups[ix].group_name}</option>
 								{/if}
 							{/section}
diff --git a/templates/compose.tpl b/templates/compose.tpl
index a4d7b0f..3c9762d 100755
--- a/templates/compose.tpl
+++ b/templates/compose.tpl
@@ -15,7 +15,7 @@
 			{tr}Return to your {smartlink ititle="Message Box" ipackage=messages ifile="message_box.php"}{/tr}
 		{/if}
 
-		{if !$feedback or $feedback.error}
+		{if !$feedback || $feedback.error}
 			{form legend="Compose Private Message"}
 				<div class="form-group">
 					{formlabel label="To" for="to"}
@@ -45,7 +45,7 @@
 						<select name="priority" id="mess-prio">
 							<option value="1" {if $priority eq 1}selected="selected"{/if}>{tr}1 -Lowest-{/tr}</option>
 							<option value="2" {if $priority eq 2}selected="selected"{/if}>{tr}2 -Low-{/tr}</option>
-							<option value="3" {if $priority eq 3 or !$priority}selected="selected"{/if}>{tr}3 -Normal-{/tr}</option>
+							<option value="3" {if $priority eq 3 || !$priority}selected="selected"{/if}>{tr}3 -Normal-{/tr}</option>
 							<option value="4" {if $priority eq 4}selected="selected"{/if}>{tr}4 -High-{/tr}</option>
 							<option value="5" {if $priority eq 5}selected="selected"{/if}>{tr}5 -Very High-{/tr}</option>
 						</select>
diff --git a/templates/contact.tpl b/templates/contact.tpl
index 96a5dec..030e53a 100755
--- a/templates/contact.tpl
+++ b/templates/contact.tpl
@@ -16,7 +16,7 @@
 					<select name="priority" id="priority">
 						<option value="1" {if $priority eq 1}selected="selected"{/if}>{tr}1 -Lowest-{/tr}</option>
 						<option value="2" {if $priority eq 2}selected="selected"{/if}>{tr}2 -Low-{/tr}</option>
-						<option value="3" {if $priority eq 3 or !$priority}selected="selected"{/if}>{tr}3 -Normal-{/tr}</option>
+						<option value="3" {if $priority eq 3 || !$priority}selected="selected"{/if}>{tr}3 -Normal-{/tr}</option>
 						<option value="4" {if $priority eq 4}selected="selected"{/if}>{tr}4 -High-{/tr}</option>
 						<option value="5" {if $priority eq 5}selected="selected"{/if}>{tr}5 -Very High-{/tr}</option>
 					</select>
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index 08dd42d..e14ed24 100755
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -1,4 +1,4 @@
-{* not working currently if $unreadMsgs and $gBitUser->getPreference('messages_alert') == 'y' and !$smarty.cookies.messages_alert_sent}
+{* not working currently if $unreadMsgs && $gBitUser->getPreference('messages_alert') == 'y' && !$smarty.cookies.messages_alert_sent}
 	<script type="text/javascript">
 		var redirect = confirm( '{tr}You have {$unreadMsgs} message(s) waiting for you in your personal message box. Click OK to view your messages.{/tr}' );
 		if( redirect == true ) {ldelim}
diff --git a/templates/mailbox.tpl b/templates/mailbox.tpl
index a8a9e64..7ebae09 100755
--- a/templates/mailbox.tpl
+++ b/templates/mailbox.tpl
@@ -67,10 +67,10 @@
 				{forminput}
 					<select name="flags" id="messages">
 						<option value="">{tr}All{/tr}</option>
-						<option value="is_read_y"    {if $smarty.request.flag eq 'is_read'    and $smarty.request.flagval eq 'y'}selected="selected"{/if}>{tr}Read{/tr}</option>
-						<option value="is_read_n"    {if $smarty.request.flag eq 'is_read'    and $smarty.request.flagval eq 'n'}selected="selected"{/if}>{tr}Unread{/tr}</option>
-						<option value="is_flagged_y" {if $smarty.request.flag eq 'is_flagged' and $smarty.request.flagval eq 'y'}selected="selected"{/if}>{tr}Flagged{/tr}</option>
-						<option value="is_flagged_y" {if $smarty.request.flag eq 'isflagged'  and $smarty.request.flagval eq 'n'}selected="selected"{/if}>{tr}Unflagged{/tr}</option>
+						<option value="is_read_y"    {if $smarty.request.flag eq 'is_read'    && $smarty.request.flagval eq 'y'}selected="selected"{/if}>{tr}Read{/tr}</option>
+						<option value="is_read_n"    {if $smarty.request.flag eq 'is_read'    && $smarty.request.flagval eq 'n'}selected="selected"{/if}>{tr}Unread{/tr}</option>
+						<option value="is_flagged_y" {if $smarty.request.flag eq 'is_flagged' && $smarty.request.flagval eq 'y'}selected="selected"{/if}>{tr}Flagged{/tr}</option>
+						<option value="is_flagged_y" {if $smarty.request.flag eq 'isflagged'  && $smarty.request.flagval eq 'n'}selected="selected"{/if}>{tr}Unflagged{/tr}</option>
 					</select>
 					{formhelp note=""}
 				{/forminput}
diff --git a/templates/preferences_inc.tpl b/templates/preferences_inc.tpl
index aff2b0c..0388191 100755
--- a/templates/preferences_inc.tpl
+++ b/templates/preferences_inc.tpl
@@ -17,7 +17,7 @@
 				<option value="2"  {if $userPrefs.messages_max_records eq 2}selected="selected"{/if}>{tr}2{/tr}</option>
 				<option value="5"  {if $userPrefs.messages_max_records eq 5}selected="selected"{/if}>{tr}5{/tr}</option>
 				<option value="10" {if $userPrefs.messages_max_records eq 10}selected="selected"{/if}>{tr}10{/tr}</option>
-				<option value="20" {if $userPrefs.messages_max_records eq 20 or !$userPrefs.messages_max_records}selected="selected"{/if}>{tr}20{/tr}</option>
+				<option value="20" {if $userPrefs.messages_max_records eq 20 || !$userPrefs.messages_max_records}selected="selected"{/if}>{tr}20{/tr}</option>
 				<option value="30" {if $userPrefs.messages_max_records eq 30}selected="selected"{/if}>{tr}30{/tr}</option>
 				<option value="40" {if $userPrefs.messages_max_records eq 40}selected="selected"{/if}>{tr}40{/tr}</option>
 				<option value="50" {if $userPrefs.messages_max_records eq 50}selected="selected"{/if}>{tr}50{/tr}</option>