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.

15 files changed, 38 insertions, 38 deletions

diff --git a/modules/mod_blog_roll.tpl b/modules/mod_blog_roll.tpl
index 39c0b1d..e3a3a15 100755
--- a/modules/mod_blog_roll.tpl
+++ b/modules/mod_blog_roll.tpl
@@ -1,6 +1,6 @@
 {* $Header$ *}
 {strip}
-{if $gBitSystem->isPackageActive( 'blogs' ) and $modBlogs}
+{if $gBitSystem->isPackageActive( 'blogs' ) && $modBlogs}
 	{bitmodule title="$moduleTitle" name="blog_roll"}
 		<ul class="blogs">
 			{foreach from=$modBlogs item=blog key=blogId}
diff --git a/modules/mod_last_created_blogs.tpl b/modules/mod_last_created_blogs.tpl
index ec4cd99..a584efe 100755
--- a/modules/mod_last_created_blogs.tpl
+++ b/modules/mod_last_created_blogs.tpl
@@ -1,6 +1,6 @@
 {* $Header$ *}
 {strip}
-{if $gBitSystem->isPackageActive( 'blogs' ) and $modLastCreatedBlogs}
+{if $gBitSystem->isPackageActive( 'blogs' ) && $modLastCreatedBlogs}
 	{if $nonums eq 'y'}
 		{eval var="{tr}Last `$module_rows` Created blogs{/tr}" assign="tpl_module_title"}
 	{else}
diff --git a/modules/mod_top_active_blogs.tpl b/modules/mod_top_active_blogs.tpl
index 99398b2..78d65a4 100755
--- a/modules/mod_top_active_blogs.tpl
+++ b/modules/mod_top_active_blogs.tpl
@@ -1,6 +1,6 @@
 {* $Header$ *}
 {strip}
-{if $gBitSystem->isPackageActive( 'blogs' ) and $gBitUser->hasPermission( 'p_blogs_view' )}
+{if $gBitSystem->isPackageActive( 'blogs' ) && $gBitUser->hasPermission( 'p_blogs_view' )}
 	{if $nonums eq 'y'}
 		{eval var="`$module_rows` {tr}Most Active blogs{/tr}" assign="tpl_module_title"}
 	{else}
diff --git a/templates/blog_list_post.tpl b/templates/blog_list_post.tpl
index 09f7e8e..c77e1ff 100755
--- a/templates/blog_list_post.tpl
+++ b/templates/blog_list_post.tpl
@@ -1,7 +1,7 @@
 {strip}
 {* This template is used by the blogs plugin to liberty. *}
 <div class="post"
-	{if $gBitUser->getPreference( 'users_double_click' ) and (($aPost.ownsblog eq 'y') or ($gBitUser->mUserId and $aPost.user_id eq $gBitUser->mUserId) or $gBitUser->hasPermission( 'p_blogs_admin' ))}
+	{if $gBitUser->getPreference( 'users_double_click' ) && (($aPost.ownsblog eq 'y') || ($gBitUser->mUserId && $aPost.user_id eq $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_blogs_admin' ))}
 		ondblclick="location.href='{$smarty.const.BLOGS_PKG_URL}post.php?blog_id={$aPost.blog_id|default:0}{$blog_id}&amp;post_id={$aPost.post_id}{$post_id}';"
 	{/if}
 >
@@ -17,7 +17,7 @@
 				<a title="{tr}Email this post{/tr}" href="{$smarty.const.BLOGS_PKG_URL}send_post.php?post_id={$aPost.post_id}">{booticon iname="icon-envelope"  ipackage="icons"  iexplain="email this post"}</a>
 			{/if}
 
-			{if ($aPost.ownsblog eq 'y') or ($gBitUser->mUserId and $aPost.user_id eq $gBitUser->mUserId) or $gBitUser->hasPermission( 'p_blogs_admin' )}
+			{if ($aPost.ownsblog eq 'y') || ($gBitUser->mUserId && $aPost.user_id eq $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_blogs_admin' )}
 				<a title="{tr}Edit{/tr}" href="{$smarty.const.BLOGS_PKG_URL}post.php?blog_id={$aPost.blog_id|default:0}&amp;post_id={$aPost.post_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
 				<a title="{tr}Remove{/tr}" href="{$smarty.const.BLOGS_PKG_URL}post.php?action=remove&amp;post_id={$aPost.post_id}">{booticon iname="icon-trash" ipackage="icons" iexplain="delete"}</a>
 			{/if}
@@ -36,7 +36,7 @@
 		<div class="date">
 			{if $gBitSystem->getConfig('blog_list_user_as') eq 'link'}
 				{tr}By{/tr} {displayname hash=$aPost}
-			{elseif $gBitSystem->getConfig('blog_list_user_as') eq 'avatar' and $aPost.avatar}
+			{elseif $gBitSystem->getConfig('blog_list_user_as') eq 'avatar' && $aPost.avatar}
 				<img src="{$aPost.avatar}" class="avatar" />
 			{else}
 				{tr}By{/tr} {displayname hash=$aPost nolink=true}
@@ -46,7 +46,7 @@
 			{if count($aPost.blogs) > 0}
 				{tr}Posted to{/tr}&nbsp;
 				{foreach from=$aPost.blogs item=memberBlog key=blogContentId name=memberBlogLoop}
-					<a href="{$memberBlog.blog_url}">{$memberBlog.title}</a>{if $smarty.foreach.memberBlogLoop.total > 1 and !$smarty.foreach.memberBlogLoop.last }, {/if}
+					<a href="{$memberBlog.blog_url}">{$memberBlog.title}</a>{if $smarty.foreach.memberBlogLoop.total > 1 && !$smarty.foreach.memberBlogLoop.last }, {/if}
 				{/foreach}
 				<br />
 			{/if}
@@ -62,7 +62,7 @@
 			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$aPost}
 			
 			{* deal with the blog post image if there is one *}
-			{if $gBitSystem->isFeatureActive( 'blog_show_image' ) and $aPost.thumbnail_url}
+			{if $gBitSystem->isFeatureActive( 'blog_show_image' ) && $aPost.thumbnail_url}
 				<div class="image">
 					{jspopup notra=1 href=$aPost.thumbnail_url.original alt=$aPost.title|escape title=$aPost.title|escape img=$aPost.thumbnail_url.medium}
 				</div>
@@ -86,7 +86,7 @@
 		<a href="{$aPost.post_url}" rel="bookmark">{tr}Permalink{/tr}</a>
 		{assign var=spacer value=true}
 
-		{if $showDescriptionsOnly and $aPost.has_more}
+		{if $showDescriptionsOnly && $aPost.has_more}
 			{if $spacer}&nbsp; &bull; &nbsp;{/if}
 			{assign var=spacer value=true}
 			{if $ajax_more}
diff --git a/templates/blog_post.tpl b/templates/blog_post.tpl
index 7541b38..c6b8932 100755
--- a/templates/blog_post.tpl
+++ b/templates/blog_post.tpl
@@ -25,7 +25,7 @@
 			{jstabs}
 				{jstab title="Blog Post"}
 					{legend legend="Post"}
-						{* if !$blog_data.use_title or $blog_data.use_title eq 'y' *}
+						{* if !$blog_data.use_title || $blog_data.use_title eq 'y' *}
 							<div class="form-group">
 								{formlabel label="Title" for="title"}
 								{forminput}
@@ -63,12 +63,12 @@
 									{if count($availableBlogs) > 10}
 										<select name="blog_content_id[]" size="6" id="blog_id" multiple="multiple">
 											{foreach from=$availableBlogs key=blogContentId item=availBlogTitle}
-												<option value="{$blogContentId}" {if !empty($gContent->mInfo.blogs.$blogContentId) or $blogContentId == $smarty.request.blog_id}selected="selected"{/if}>{$availBlogTitle|escape}</option>
+												<option value="{$blogContentId}" {if !empty($gContent->mInfo.blogs.$blogContentId) || $blogContentId == $smarty.request.blog_id}selected="selected"{/if}>{$availBlogTitle|escape}</option>
 											{/foreach}
 										</select>
 									{else}
 										{foreach from=$availableBlogs key=blogContentId item=availBlogTitle}
-											<input name="blog_content_id[]" type="checkbox" value="{$blogContentId}" {if !empty($gContent->mInfo.blogs.$blogContentId) or $blogContentId == $smarty.request.blog_id or $blogContentId == $default_target_blog_content_id}checked="checked"{/if} /> {$availBlogTitle|escape}<br/>
+											<input name="blog_content_id[]" type="checkbox" value="{$blogContentId}" {if !empty($gContent->mInfo.blogs.$blogContentId) || $blogContentId == $smarty.request.blog_id || $blogContentId == $default_target_blog_content_id}checked="checked"{/if} /> {$availBlogTitle|escape}<br/>
 										{/foreach}
 									{/if}
 									{formhelp note="You can cross post to any and all of the blogs listed above.<br />Just check off the blogs you wish this post to also show up in."}
diff --git a/templates/center_list_blog_posts.tpl b/templates/center_list_blog_posts.tpl
index 8b5e4fa..5c380e8 100755
--- a/templates/center_list_blog_posts.tpl
+++ b/templates/center_list_blog_posts.tpl
@@ -1,5 +1,5 @@
 {* $Header$ *}
-{if !( $smarty.request.home|default:true and $gBitSystem->isFeatureActive('blog_hide_empty_usr_list') ) }
+{if !( $smarty.request.home|default:true && $gBitSystem->isFeatureActive('blog_hide_empty_usr_list') ) }
 <div class="floaticon">{bithelp}</div>
 
 <div class="display blogs">
@@ -8,7 +8,7 @@
 	</div>
 
 	<div class="body">
-		{if ($gBitUser->hasPermission( 'p_blog_posts_read_future' ) or $gBitUser->isAdmin() ) and $futures}
+		{if ($gBitUser->hasPermission( 'p_blog_posts_read_future' ) || $gBitUser->isAdmin() ) && $futures}
 			<h3>{tr}Upcoming Blog Posts{/tr}</h3>
 			<ul>
 				{foreach from=$futures item=future}
diff --git a/templates/crosspost.tpl b/templates/crosspost.tpl
index 2c8cef4..ab4fb7d 100755
--- a/templates/crosspost.tpl
+++ b/templates/crosspost.tpl
@@ -16,7 +16,7 @@
 								{formlabel label="Blogs this Post is Already Crossposted To" for="blog_id"}
 								{forminput}
 										{foreach from=$availableBlogs key=blogContentId item=availBlogTitle}
-											{if $gContent->mInfo.blogs.$blogContentId and ($blogContentId != $crosspost.blog_content_id) }
+											{if $gContent->mInfo.blogs.$blogContentId && ($blogContentId != $crosspost.blog_content_id) }
 												{assign var="has_crosspost" value=true}
 												{$availBlogTitle|escape}
 												&nbsp;<a title="{tr}Edit{/tr}" href="{$smarty.const.BLOGS_PKG_URL}crosspost.php?blog_content_id={$blogContentId}&amp;post_id={$post_info.post_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit crosspost note"}</a>
@@ -37,7 +37,7 @@
 								{formlabel label="Include in Blogs" for="blog_id"}
 								{forminput}
 										{foreach from=$availableBlogs key=blogContentId item=availBlogTitle}
-											{if !$gContent->mInfo.blogs.$blogContentId or ($blogContentId == $crosspost.blog_content_id) }
+											{if !$gContent->mInfo.blogs.$blogContentId || ($blogContentId == $crosspost.blog_content_id) }
 												{assign var="has_crosspost_option" value=true}
 												<input name="blog_content_id[]" type="checkbox" option value="{$blogContentId}" {if $blogContentId == $crosspost.blog_content_id}checked="checked"{/if}>{$availBlogTitle|escape}</option><br/>
 											{/if}
@@ -108,7 +108,7 @@
 					{if count($post_info.blogs) > 0}
 						{tr}Posted to{/tr}
 						{foreach from=$post_info.blogs item=memberBlog key=blogContentId name=memberBlogLoop}
-							<a href="{$memberBlog.blog_url}">{$memberBlog.title}</a>{if $smarty.foreach.memberBlogLoop.total > 1 and !$smarty.foreach.memberBlogLoop.last }, {/if}
+							<a href="{$memberBlog.blog_url}">{$memberBlog.title}</a>{if $smarty.foreach.memberBlogLoop.total > 1 && !$smarty.foreach.memberBlogLoop.last }, {/if}
 						{/foreach}
 					<br />
 					{/if}
@@ -126,7 +126,7 @@
 			<div class="footer">
 				<a href="{$post_info.display_url}" rel="bookmark">{tr}Permalink{/tr}</a>
 				{tr}referenced by{/tr} {$post_info.trackbacks_from_count} {tr}posts{/tr} | {tr}references{/tr} {$post_info.trackbacks_to_count} {tr}posts{/tr}
-				{if $post_info.allow_comments eq 'y' and $gBitSystem->isFeatureActive( 'blog_posts_comments' )}
+				{if $post_info.allow_comments eq 'y' && $gBitSystem->isFeatureActive( 'blog_posts_comments' )}
 					| {$post_info.num_comments} {tr}comments{/tr}
 				{/if}
 			</div> {* end .footer *}
diff --git a/templates/edit_blog.tpl b/templates/edit_blog.tpl
index 82169c0..35b8e56 100755
--- a/templates/edit_blog.tpl
+++ b/templates/edit_blog.tpl
@@ -58,21 +58,21 @@
 
 						<div class="form-group">
 							{forminput label="checkbox"}
-								<input type="checkbox" name="use_title" id="use_title" {if !$gContent->isValid() or $gContent->getField('use_title') eq 'y'}checked="checked"{/if} />Use titles in blog posts
+								<input type="checkbox" name="use_title" id="use_title" {if !$gContent->isValid() || $gContent->getField('use_title') eq 'y'}checked="checked"{/if} />Use titles in blog posts
 								{formhelp note='If this is not selected, the time and date of when the post was created will be displayed instead of the post title.'}
 							{/forminput}
 						</div>
 
 						<div class="form-group">
 							{forminput label="checkbox"}
-								<input type="checkbox" name="use_find" id="use_find" {if !$gContent->isValid() or $gContent->getField('use_find') eq 'y'}checked="checked"{/if} />Allow search
+								<input type="checkbox" name="use_find" id="use_find" {if !$gContent->isValid() || $gContent->getField('use_find') eq 'y'}checked="checked"{/if} />Allow search
 								{formhelp note='Allow users to search this blog for occurances of words.'}
 							{/forminput}
 						</div>
 
 						<div class="form-group">
 							{forminput label="checkbox"}
-								<input type="checkbox" name="allow_comments" id="allow_comments" {if !$gContent->isValid() or $gContent->getField('allow_comments') eq 'y'}checked="checked"{/if} />Allow comments
+								<input type="checkbox" name="allow_comments" id="allow_comments" {if !$gContent->isValid() || $gContent->getField('allow_comments') eq 'y'}checked="checked"{/if} />Allow comments
 								{formhelp note='Are other users allowed to add comments to posts made in this blog?'}
 							{/forminput}
 						</div>
diff --git a/templates/edit_blogpost_status_inc.tpl b/templates/edit_blogpost_status_inc.tpl
index 207d9e0..ca4fb03 100755
--- a/templates/edit_blogpost_status_inc.tpl
+++ b/templates/edit_blogpost_status_inc.tpl
@@ -1,4 +1,4 @@
-{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) and $gBitSystem->isFeatureActive( 'liberty_display_status_menu' ) and ($gBitUser->hasPermission('p_liberty_edit_content_status') or $gBitUser->hasPermission('p_liberty_edit_all_status'))}
+{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) && $gBitSystem->isFeatureActive( 'liberty_display_status_menu' ) && ($gBitUser->hasPermission('p_liberty_edit_content_status') || $gBitUser->hasPermission('p_liberty_edit_all_status'))}
 	<div class="form-group">
 		{formlabel label="Publish Status" for="content_status_id"}
 		{forminput}
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index 14ad066..17893ac 100755
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -1,6 +1,6 @@
 {* $Header$ *}
 {strip}
-{if $gBitSystem->isPackageActive( 'rss' ) and $gBitSystem->isFeatureActive( 'blogs_rss' ) and $gBitSystem->getActivePackage() eq 'blogs' and $gBitUser->hasPermission( 'p_blogs_view' )}
+{if $gBitSystem->isPackageActive( 'rss' ) && $gBitSystem->isFeatureActive( 'blogs_rss' ) && $gBitSystem->getActivePackage() eq 'blogs' && $gBitUser->hasPermission( 'p_blogs_view' )}
 	{if isset($gContent->mBlogId)}
 		<link rel="alternate" type="application/rss+xml" title="{$gContent->getTitle()}" href="{$smarty.const.BLOGS_PKG_URL}blogs_rss.php?blog_id={$gContent->blog_content_id}&amp;version={$gBitSystem->getConfig('rssfeed_default_version',0)}" />
 	{elseif isset($post_info.blogs)}
diff --git a/templates/list_blogs.tpl b/templates/list_blogs.tpl
index 580f681..7b11779 100755
--- a/templates/list_blogs.tpl
+++ b/templates/list_blogs.tpl
@@ -43,7 +43,7 @@
 			{foreach from=$blogsList item=listBlog key=blogContentId}
 				<li class="item {cycle values='odd,even'}">
 					<div class="floaticon">
-						{if $gBitUser->hasPermission( 'p_liberty_assign_content_perms' ) and $listBlog.content_id}
+						{if $gBitUser->hasPermission( 'p_liberty_assign_content_perms' ) && $listBlog.content_id}
 							{if !empty($gContent->mPerms)} {* org note from liberty:service_content_icon_inc: don't think there is a serviceHash way of working out if there are individual permissions set *}
 								{assign var=perm_icon value="icon-lock"}
 							{else}
@@ -56,13 +56,13 @@
 							{/if}
 						{/if}
 
-						{if ($gBitUser->mUserId and $listBlog.user_id eq $gBitUser->mUserId) or ($gBitUser->hasPermission( 'p_blogs_admin' )) or ($listBlog.is_public eq 'y')}
+						{if ($gBitUser->mUserId && $listBlog.user_id eq $gBitUser->mUserId) || ($gBitUser->hasPermission( 'p_blogs_admin' )) || ($listBlog.is_public eq 'y')}
 									<a title="{tr}post{/tr}" href="{$smarty.const.BLOGS_PKG_URL}post.php?blog_id={$listBlog.blog_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="post"}</a>
 						{/if}
-						{if ($gBitUser->mUserId and $listBlog.user_id eq $gBitUser->mUserId) or $gBitUser->hasPermission( 'p_blogs_admin' )}
+						{if ($gBitUser->mUserId && $listBlog.user_id eq $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_blogs_admin' )}
 							<a title="{tr}edit{/tr}" href="{$smarty.const.BLOGS_PKG_URL}edit.php?blog_id={$listBlog.blog_id}">{booticon iname="icon-file"  ipackage="icons"  iexplain="configure"}</a>
 						{/if}
-						{if ($gBitUser->mUserId and $listBlog.user_id eq $gBitUser->mUserId) or $gBitUser->hasPermission( 'p_blogs_admin' )}
+						{if ($gBitUser->mUserId && $listBlog.user_id eq $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_blogs_admin' )}
 							<a title="{tr}remove{/tr}" href="{$smarty.const.BLOGS_PKG_URL}list_blogs.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove=1&amp;blog_id={$listBlog.blog_id}">{booticon iname="icon-trash" ipackage="icons" iexplain="delete"}</a>
 						{/if}
 					</div>
diff --git a/templates/menu_blogs.tpl b/templates/menu_blogs.tpl
index 38bef3c..69c2548 100755
--- a/templates/menu_blogs.tpl
+++ b/templates/menu_blogs.tpl
@@ -14,7 +14,7 @@
 	{if $gBitUser->hasPermission( 'p_blogs_post' )}
 		<li><a class="item" href="{$smarty.const.BLOGS_PKG_URL}post.php">{booticon iname="icon-file" iexplain="Write Blog Post" ilocation=menu}</a></li>
 	{/if}
-	{if $gBitSystem->isFeatureActive( 'blog_rankings' ) and $gBitUser->hasPermission( 'p_blogs_view' )}
+	{if $gBitSystem->isFeatureActive( 'blog_rankings' ) && $gBitUser->hasPermission( 'p_blogs_view' )}
 		<li><a class="item" href="{$smarty.const.BLOGS_PKG_URL}rankings.php">{booticon iname="icon-sort" iexplain="Blog Post Rankings" ilocation=menu}</a></li>
 	{/if}
 </ul>
diff --git a/templates/print_blog_post.tpl b/templates/print_blog_post.tpl
index 048dcda..c395084 100755
--- a/templates/print_blog_post.tpl
+++ b/templates/print_blog_post.tpl
@@ -55,7 +55,7 @@ a:hover { background-color : #deceae;  }
 <tr><td>
 <a href="{$smarty.const.BLOGS_PKG_URL}view_post.php?blog_id={$post_info.blog_id|default:0}&post_id={$post_info.post_id}" rel="bookmark">{tr}Permalink{/tr}</a>
 ({tr}referenced by{/tr}: {$post_info.trackbacks_from_count} {tr}posts{/tr} {tr}references{/tr}: {$post_info.trackbacks_to_count} {tr}posts{/tr})
-{if !empty($post_info.allow_comments) and $post_info.allow_comments eq 'y' and $gBitSystem->isFeatureActive( 'blog_posts_comments' )}
+{if !empty($post_info.allow_comments) && $post_info.allow_comments eq 'y' && $gBitSystem->isFeatureActive( 'blog_posts_comments' )}
 {$post_info.num_comments} {tr}comments{/tr}
 &nbsp;<a href="{$smarty.const.BLOGS_PKG_URL}view_post.php?find={$find}&amp;blog_id={$post_info.blog_id}&amp;offset={$offset}&amp;sort_mode={$sort_mode}&amp;post_id={$post_info.post_id}">{tr}view comments{/tr}</a>
 {/if}
diff --git a/templates/view_blog.tpl b/templates/view_blog.tpl
index 96859b2..d03485c 100755
--- a/templates/view_blog.tpl
+++ b/templates/view_blog.tpl
@@ -16,7 +16,7 @@
 			<a title="{tr}Edit blog{/tr}" href="{$smarty.const.BLOGS_PKG_URL}edit.php?blog_id={$gContent->mBlogId}">{booticon iname="icon-file"  ipackage="icons"  iexplain="edit"}</a>
 		{/if}
 
-		{if $gBitUser->isRegistered() and $gBitSystem->isFeatureActive( 'users_watches' )}
+		{if $gBitUser->isRegistered() && $gBitSystem->isFeatureActive( 'users_watches' )}
 			{if $user_watching_blog eq 'n'}
 				<a title="{tr}monitor this blog{/tr}" href="{$smarty.const.BLOGS_PKG_URL}view.php?blog_id={$gContent->mBlogId}&amp;watch_event=blog_post&amp;watch_object={$gContent->mBlogId}&amp;watch_action=add">{booticon iname="icon-asterisk"  ipackage="icons"  iexplain="monitor this blog"}</a>
 			{else}
diff --git a/templates/view_blog_post.tpl b/templates/view_blog_post.tpl
index 70bbb2b..05a7170 100755
--- a/templates/view_blog_post.tpl
+++ b/templates/view_blog_post.tpl
@@ -1,6 +1,6 @@
 {* $Header$ *}
 {if empty($print_page)}{assign var=print_page value=false}{/if}
-{if !empty($liberty_preview) or !empty($preview)}
+{if !empty($liberty_preview) || !empty($preview)}
 <!--
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -23,7 +23,7 @@
 			<div class="floaticon">
 				{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$post_info}
 				{if $gBitUser->hasPermission( 'p_users_view_icons_and_tools' )}
-					{if $gBitSystem->isPackageActive( 'rss' ) and $gBitSystem->isFeatureActive( 'rss_blogs' )}
+					{if $gBitSystem->isPackageActive( 'rss' ) && $gBitSystem->isFeatureActive( 'rss_blogs' )}
 						<a href="{$smarty.const.BLOGS_PKG_URL}blogs_rss.php?user_id={$post_info.user_id}">{booticon iname="icon-rss"  ipackage="icons" iexplain="RSS feed"}</a>
 					{/if}
 
@@ -67,7 +67,7 @@
 			</div>
 
 			<h1>
-				{if $post_info.use_title eq 'y' and $post_info.title}
+				{if $post_info.use_title eq 'y' && $post_info.title}
 					{$post_info.title|escape|highlight}
 				{else}
 					{$post_info.publish_date|default:$post_info.created|bit_long_date}
@@ -80,7 +80,7 @@
 				{if count($post_info.blogs) > 0}
 					{tr}Posted to{/tr}&nbsp;
 					{foreach from=$post_info.blogs item=memberBlog key=blogContentId name=memberBlogLoop}
-						<a href="{$memberBlog.blog_url}">{$memberBlog.title}</a>{if $smarty.foreach.memberBlogLoop.total > 1 and !$smarty.foreach.memberBlogLoop.last }, {/if}
+						<a href="{$memberBlog.blog_url}">{$memberBlog.title}</a>{if $smarty.foreach.memberBlogLoop.total > 1 && !$smarty.foreach.memberBlogLoop.last }, {/if}
 					{/foreach}
 				<br />
 				{/if}
@@ -89,7 +89,7 @@
 		</div>
 
 	<div class="body"
-	    {if $gBitUser->getPreference( 'users_double_click' ) eq 'y' and (($ownsblog eq 'y') or $gContent->hasUserPermission( 'p_blogs_admin' ))}
+	    {if $gBitUser->getPreference( 'users_double_click' ) eq 'y' && (($ownsblog eq 'y') || $gContent->hasUserPermission( 'p_blogs_admin' ))}
 			ondblclick="location.href='{$smarty.const.BLOGS_PKG_URL}post.php?post_id={$post_info.post_id}';"
 		{/if}
 	>
@@ -97,7 +97,7 @@
 			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$post_info}
 
 			{* deal with the blog post image if there is one *}
-			{if $gBitSystem->isFeatureActive( 'blog_show_image' ) and $post_info.thumbnail_url}
+			{if $gBitSystem->isFeatureActive( 'blog_show_image' ) && $post_info.thumbnail_url}
 				<div class="image primary">
 					{jspopup notra=1 href=$post_info.thumbnail_url.original alt=$post_info.title|escape title=$post_info.title|escape img=$post_info.thumbnail_url.medium}
 				</div>
@@ -126,7 +126,7 @@
 		{/if}
 	</div> {* end .footer *}
 
-	{if !empty($pages) and $pages > 1}
+	{if !empty($pages) && $pages > 1}
 		<div class="pagination">
 			<a href="{$smarty.const.BLOGS_PKG_URL}view_post.php?blog_id={$smarty.request.blog_id}&amp;post_id={$smarty.request.post_id}&amp;page={$first_page}">{booticon ipackage="icons" iname="go-first" iexplain="first page"}</a>
 			<a href="{$smarty.const.BLOGS_PKG_URL}view_post.php?blog_id={$smarty.request.blog_id}&amp;post_id={$smarty.request.post_id}&amp;page={$prev_page}">{booticon iname="icon-arrow-left"  ipackage="icons"  iexplain="previous page"}</a>
@@ -156,7 +156,7 @@
 	{/if}
 </div> {* end .blog *}
 
-{if $gBitSystem->isFeatureActive( 'blog_posts_comments' ) and !empty($preview) and !empty($liberty_preview)}
+{if $gBitSystem->isFeatureActive( 'blog_posts_comments' ) && !empty($preview) && !empty($liberty_preview)}
 	{include file="bitpackage:liberty/comments.tpl"}
 {/if}