From 5a0b7541e7ca9b0d0d169b59f2da70672aad4e21 Mon Sep 17 00:00:00 2001
From: azett <githubregistrierung@azett.com>
Date: Sat, 19 Dec 2020 12:52:53 +0100
Subject: [PATCH] Getting FlatPress ready for PHP 8: Added a lot of missing
 checks for undefined variables and array keys in template and PHP files.

---
 admin/main.tpl                                |    9 +-
 admin/panels/entry/admin.entry.cats.tpl       |    3 +
 admin/panels/entry/admin.entry.list.tpl       |    2 +-
 admin/panels/entry/admin.entry.write.tpl      |   10 +-
 admin/panels/maintain/admin.maintain.tpl      |    4 +-
 fp-includes/core/core.fpdb.class.php          | 1802 ++++++++---------
 fp-includes/core/core.widgets.php             |  288 ++-
 .../plugins/function.list_categories.php      |  212 +-
 fp-interface/sharedtpls/errorlist.tpl         |    6 +-
 .../commentcenter/plugin.commentcenter.php    |    4 +-
 10 files changed, 1135 insertions(+), 1205 deletions(-)

diff --git a/admin/main.tpl b/admin/main.tpl
index 84e7787..4dc78a9 100755
--- a/admin/main.tpl
+++ b/admin/main.tpl
@@ -18,7 +18,7 @@
 		{/foreach}
 	</ul>
 	
-	{if $submenu}
+	{if isset($submenu)}
 	<ul id="admin-submenu">
 		{foreach from=$submenu key=subtab item=item}
 		{if $item}
@@ -34,6 +34,9 @@
 	{/if}
 	
 	<div id="admin-content">
-	{include file=$admin_resource|default:"admin:$panel/$action"}
-	
+	{if isset($action)}
+		{include file=$admin_resource|default:"admin:$panel/$action"}
+	{else}
+		{include file=$admin_resource|default:"admin:$panel"}
+	{/if}
 	</div>
diff --git a/admin/panels/entry/admin.entry.cats.tpl b/admin/panels/entry/admin.entry.cats.tpl
index 91240de..e55e14a 100755
--- a/admin/panels/entry/admin.entry.cats.tpl
+++ b/admin/panels/entry/admin.entry.cats.tpl
@@ -8,6 +8,9 @@
 
 
 
+{if !isset($catdefs)}
+	{assign var=catdefs value=""}
+{/if}
 {html_form}
 	
 		<p>
diff --git a/admin/panels/entry/admin.entry.list.tpl b/admin/panels/entry/admin.entry.list.tpl
index 0739e09..38e8f9b 100755
--- a/admin/panels/entry/admin.entry.list.tpl
+++ b/admin/panels/entry/admin.entry.list.tpl
@@ -26,7 +26,7 @@
 
 <p>{$panelstrings.descr}</p>
 
-<form method="get" action="{$smarty.request.PHP_SELF}?p=entry">
+<form method="get" action="{$smarty.server.PHP_SELF}?p=entry">
 <p> <input type="hidden" name="p" value="entry" /> </p>
 <fieldset><legend>{$panelstrings.filter}</legend>
 	<select name="category" class="alignleft">
diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl
index c477b3d..e676eb6 100755
--- a/admin/panels/entry/admin.entry.write.tpl
+++ b/admin/panels/entry/admin.entry.write.tpl
@@ -5,7 +5,7 @@
 
 	{entry_block}
 	<div id="admin-post-preview">
-	{if $preview}
+	{if isset($preview)}
 	<fieldset id="post-preview"><legend>{$panelstrings.preview}</legend>
 	{include file=preview.tpl}
 	</fieldset>
@@ -13,9 +13,11 @@
 	</div>
 
 		
-{html_form}	
-	
-	{entry content=$post alwaysshow=true}
+{html_form}
+	{if !isset($post)}
+		{assign var=post value=""}
+	{/if}
+		{entry content=$post alwaysshow=true}
 	
 		<div id="admin-editor">
 			<p><label for="subject">{$panelstrings.subject}</label><br />
diff --git a/admin/panels/maintain/admin.maintain.tpl b/admin/panels/maintain/admin.maintain.tpl
index e3c971d..3d5c0d8 100644
--- a/admin/panels/maintain/admin.maintain.tpl
+++ b/admin/panels/maintain/admin.maintain.tpl
@@ -1,6 +1,6 @@
 <h2>{$panelstrings.head}</h2>
 {include file=shared:errorlist.tpl}
-{if $files}
+{if isset($files)}
 <p>{$panelstrings.chmod_info}</p>
 <p><a href="admin.php?p=maintain">{$panelstrings.opt0}</a></p>
 <ul> 
@@ -9,7 +9,7 @@
 {/foreach}
 </ul>
 <p><a href="admin.php?p=maintain">{$panelstrings.opt0}</a></p>
-{elseif $phpinfo}
+{elseif isset($phpinfo)}
 <p><a href="admin.php?p=maintain">{$panelstrings.opt0}</a></p>
 {$phpinfo}
 <p><a href="admin.php?p=maintain">{$panelstrings.opt0}</a></p>
diff --git a/fp-includes/core/core.fpdb.class.php b/fp-includes/core/core.fpdb.class.php
index e455b61..f1163e1 100644
--- a/fp-includes/core/core.fpdb.class.php
+++ b/fp-includes/core/core.fpdb.class.php
@@ -1,1004 +1,960 @@
 <?php
 
-	class FPDB_QueryParams {
-		
-		var $id	= null;
-		var $d		= null;
-		var $m		= null;
-		var $y		= null;
-		var $start	= 0;
-		var $count	= -1;
-		var $random = 0;
-		var $category = 0;
-		var $exclude  = null;
-		var $page	= 1;
-		var $fullparse = false;
-		var $comments = false;
-		
-		function __construct($params) {
-		
-			if (is_string($params)) {
-				$this->parse_string($params);
-			} elseif (is_array($params)) {
-				$this->validate_array($params);
-			} else { 
-				trigger_error("FPDB_QueryParams: parameters were not in a valid form", 
-								E_USER_ERROR);
-			}
-			
-		}
-		
-		function pad_date($date) {
-				
-			if (is_numeric($date) && strlen($date)<=2){
-				return str_pad($date,2,'0', STR_PAD_LEFT);
-			}
-			
-			return null;
-		
-		}
-		
-		function validate_array($params) {
-		
-			global $fp_config;
-			
-			if (isset($params['id'])) {
-			
-				if (entry_exists($params['id'])) {
-					$this->id = $params['id'];
-				} else {
-					// let it fail
-					$this->count = 0;
-					return;
-				}
-				
-			}
+class FPDB_QueryParams {
 
-			if (isset($params['fullparse'])) {
+	var $id = null;
 
-				$this->fullparse = 
-						is_string($params['fullparse'])?
-						($params['fullparse'] != 'false')
-						:
-						$params['fullparse'];
+	var $d = null;
 
-				if ($this->fullparse)
-					$this->comments = true;
+	var $m = null;
 
-			}
-			
-		
-			if (isset($params['y'])) {
-				$this->y = $this->pad_date($params['y']);
-			
-				if ($this->y && isset($params['m'])) {
-					$this->m = $this->pad_date($params['m']);
-			
-					if ($this->m && isset($params['d'])) {
-						$this->d = $this->pad_date($params['d']);
-					}
-					
-				}
-				
-			}
-			
-			if (isset($params['random']) && !$this->id) {
-				$this->random = intval($params['random']);
-				$this->count = $this->random;
-			}
+	var $y = null;
 
-			if (isset($params['page'])) {
-				$this->page = $params['page'];
-			} else {
-				$this->page = 1;
-			}
-				
-			if ($this->page<1) {
-				$this->page=1;
-			}
-			
-			if (isset($params['count'])) {
-				$this->count = intval($params['count']);
-			} else {
-				$this->count = intval($fp_config['general']['maxentries']);
-			}
-			
-			
-			$this->start = ($this->page - 1) * $this->count;
-			
-			
-			if (isset($params['start'])) {
-				$this->start = intval($params['start']);
-			}
-			
-			
-			if (isset($params['category'])) {
-				$this->category = intval($params['category']);
-			}			
+	var $start = 0;
 
-			if (isset($params['comments'])) {
-				$this->comments = true;
-			}
-			
-			if (isset($params['exclude'])) {
-				$this->exclude = intval($params['exclude']);
-			}
-			
-		}
-		
-		function parse_string($str) {
-			$params = utils_kexplode(strtolower($str), ',:', false);
+	var $count = -1;
+
+	var $random = 0;
+
+	var $category = 0;
+
+	var $exclude = null;
+
+	var $page = 1;
+
+	var $fullparse = false;
+
+	var $comments = false;
+
+	function __construct($params) {
+		if (is_string($params)) {
+			$this->parse_string($params);
+		} elseif (is_array($params)) {
 			$this->validate_array($params);
+		} else {
+			trigger_error("FPDB_QueryParams: parameters were not in a valid form", E_USER_ERROR);
 		}
-		
 	}
 
-	class FPDB_Query {
-	
-		var $counter 	= -1;
-		var $params 	= null;
-		var $single 	= false;
-		var $pointer 	= 0;		/* pointer points always to NEXT element */
-		var $processed 	= false;
-		var $ID 		= 0;		/* query id */
-		
-		
-		var $lastentry  = array(null, array()); 
-		var $localcache  = array(); 
-		var $nextid		= '';
-		var $previd		= '';
-		var $currentid	= '';		
-		var $main_idx = null;
-		var $secondary_idx = null;
-		var $walker = null;
-	
-		function __construct($params, $ID) {
-			
-			global $current_query;
-			
-			
-			$this->params = new FPDB_QueryParams($params);
-			$this->ID = $ID;
-			
-			if ($this->params->id || $this->params->random) {
-				$this->single = true;
-			}
-			
-			$GLOBALS['current_query'] =& $this;
-			
+	function pad_date($date) {
+		if (is_numeric($date) && strlen($date) <= 2) {
+			return str_pad($date, 2, '0', STR_PAD_LEFT);
 		}
-		
-		function prepare() {
-		
-			global $fpdb;
-			
-			
-			$fpdb->init();
-			
-			$this->main_idx =& $fpdb->get_index($this->params->category);		
-			$entry_index =& $this->main_idx;
 
-			$this->counter++;
+		return null;
+	}
 
-			if (!$entry_index) {
-				$this->params->start = 0;
-				$this->params->count = 0;
-				$this->pointer = 0;
-				return;
-			}
-			
-			if ($this->single || $this->params->random) {
-				if ($this->params->random>0) {
-					$this->_get_random_id($entry_index);
-				}
-				$this->_prepare_single($entry_index);
+	function validate_array($params) {
+		global $fp_config;
+
+		if (isset($params ['id'])) {
+
+			if (entry_exists($params ['id'])) {
+				$this->id = $params ['id'];
 			} else {
-				$this->_prepare_list($entry_index);
-				
-				if ($this->params->exclude) {
-					$o =& $fpdb->get_index($this->params->exclude);
-					if ($o !== false)
-						$this->secondary_idx =& $o;
-				}
-			}
-			
-			// force first entry to be loaded: updates count, pointer
-			$this->peekEntry();
-			
-			
-		
-		}
-		
-		function _prepare_single(&$entry_index) {
-		
-			/*
-			 * this should never happen
-			 */
-			if (!$this->params->id) 
-				trigger_error("FPDB: no ID found for query {$this->ID}", E_USER_ERROR);
-						
-			$qp =& $this->params;
-
-			$time = entry_idtotime($qp->id);
-
-			// let's get a preceding key in the order relation.
-			// please notice this is hardcoded to $time+1, since
-			// order of the indices is not configurable by the user
-			$prevkey = entry_timetokey($time+1); 
-
-			$key = entry_idtokey($qp->id);
-			#print_r($key);
-
-			#$key = entry_idtokey($qp->id);
-			if (!($entry_index->has_key($key))){
-				#trigger_error("FPDB: no entry found for {$qp->id}", E_USER_WARNING);
-				$qp->count = 0;
+				// let it fail
+				$this->count = 0;
 				return;
 			}
+		}
 
-			// if $includelower = 2 (second parameter) then assumes 'loose' inclusion
-			// i.e. includes the first key $newkey such as $newkey <= $prevkey
-			// also, if $prevkey != $newkey then $prevkey := $newkey
-		
-			
-			$this->walker =& $entry_index->walker($prevkey, 2, null, null);
-	
-			// since we're searching for $prevkey, i.e. a key preceding the target $id
-			// in the sequence, if $prevkey becomes equal to $key then it means 
-			// $key is the first post (the last in time)
+		if (isset($params ['fullparse'])) {
 
-			$qp->start = 0;
-			$qp->count = 1;
+			$this->fullparse = is_string($params ['fullparse']) ? ($params ['fullparse'] != 'false') : $params ['fullparse'];
+
+			if ($this->fullparse)
+				$this->comments = true;
+		}
+
+		if (isset($params ['y'])) {
+			$this->y = $this->pad_date($params ['y']);
+
+			if ($this->y && isset($params ['m'])) {
+				$this->m = $this->pad_date($params ['m']);
+
+				if ($this->m && isset($params ['d'])) {
+					$this->d = $this->pad_date($params ['d']);
+				}
+			}
+		}
+
+		if (isset($params ['random']) && !$this->id) {
+			$this->random = intval($params ['random']);
+			$this->count = $this->random;
+		}
+
+		if (isset($params ['page'])) {
+			$this->page = $params ['page'];
+		} else {
+			$this->page = 1;
+		}
+
+		if ($this->page < 1) {
+			$this->page = 1;
+		}
+
+		if (isset($params ['count'])) {
+			$this->count = intval($params ['count']);
+		} else {
+			$this->count = intval($fp_config ['general'] ['maxentries']);
+		}
+
+		$this->start = ($this->page - 1) * $this->count;
+
+		if (isset($params ['start'])) {
+			$this->start = intval($params ['start']);
+		}
+
+		if (isset($params ['category'])) {
+			$this->category = intval($params ['category']);
+		}
+
+		if (isset($params ['comments'])) {
+			$this->comments = true;
+		}
+
+		if (isset($params ['exclude'])) {
+			$this->exclude = intval($params ['exclude']);
+		}
+	}
+
+	function parse_string($str) {
+		$params = utils_kexplode(strtolower($str), ',:', false);
+		$this->validate_array($params);
+	}
+
+}
+
+class FPDB_Query {
+
+	var $counter = -1;
+
+	var $params = null;
+
+	var $single = false;
+
+	var $pointer = 0;
+
+	/* pointer points always to NEXT element */
+	var $processed = false;
+
+	var $ID = 0;
+
+	/* query id */
+	var $lastentry = array(
+		null,
+		array()
+	);
+
+	var $localcache = array();
+
+	var $nextid = '';
+
+	var $previd = '';
+
+	var $currentid = '';
+
+	var $main_idx = null;
+
+	var $secondary_idx = null;
+
+	var $walker = null;
+
+	function __construct($params, $ID) {
+		global $current_query;
+
+		$this->params = new FPDB_QueryParams($params);
+		$this->ID = $ID;
+
+		if ($this->params->id || $this->params->random) {
+			$this->single = true;
+		}
+
+		$GLOBALS ['current_query'] = & $this;
+	}
+
+	function prepare() {
+		global $fpdb;
+
+		$fpdb->init();
+
+		$this->main_idx = & $fpdb->get_index($this->params->category);
+		$entry_index = & $this->main_idx;
+
+		$this->counter++;
+
+		if (!$entry_index) {
+			$this->params->start = 0;
+			$this->params->count = 0;
 			$this->pointer = 0;
-			
-			if ($prevkey == $key) { 
-				$this->prevkey = null;
-				if ($this->walker->valid) { 
-					$this->walker->next(); 
-					$this->nextkey = $this->walker->valid? $this->walker->current_key() : null;
-				} 
-			} else { 
-				$this->prevkey = $prevkey;
+			return;
+		}
+
+		if ($this->single || $this->params->random) {
+			if ($this->params->random > 0) {
+				$this->_get_random_id($entry_index);
+			}
+			$this->_prepare_single($entry_index);
+		} else {
+			$this->_prepare_list($entry_index);
+
+			if ($this->params->exclude) {
+				$o = & $fpdb->get_index($this->params->exclude);
+				if ($o !== false)
+					$this->secondary_idx = & $o;
+			}
+		}
+
+		// force first entry to be loaded: updates count, pointer
+		$this->peekEntry();
+	}
+
+	function _prepare_single(&$entry_index) {
+
+		/*
+		 * this should never happen
+		 */
+		if (!$this->params->id)
+			trigger_error("FPDB: no ID found for query {$this->ID}", E_USER_ERROR);
+
+		$qp = & $this->params;
+
+		$time = entry_idtotime($qp->id);
+
+		// let's get a preceding key in the order relation.
+		// please notice this is hardcoded to $time+1, since
+		// order of the indices is not configurable by the user
+		$prevkey = entry_timetokey($time + 1);
+
+		$key = entry_idtokey($qp->id);
+		// print_r($key);
+
+		// $key = entry_idtokey($qp->id);
+		if (!($entry_index->has_key($key))) {
+			// trigger_error("FPDB: no entry found for {$qp->id}", E_USER_WARNING);
+			$qp->count = 0;
+			return;
+		}
+
+		// if $includelower = 2 (second parameter) then assumes 'loose' inclusion
+		// i.e. includes the first key $newkey such as $newkey <= $prevkey
+		// also, if $prevkey != $newkey then $prevkey := $newkey
+
+		$this->walker = & $entry_index->walker($prevkey, 2, null, null);
+
+		// since we're searching for $prevkey, i.e. a key preceding the target $id
+		// in the sequence, if $prevkey becomes equal to $key then it means
+		// $key is the first post (the last in time)
+
+		$qp->start = 0;
+		$qp->count = 1;
+		$this->pointer = 0;
+
+		if ($prevkey == $key) {
+			$this->prevkey = null;
+			if ($this->walker->valid) {
+				$this->walker->next();
+				$this->nextkey = $this->walker->valid ? $this->walker->current_key() : null;
+			}
+		} else {
+			$this->prevkey = $prevkey;
+			if ($this->walker->valid) {
+				$this->walker->next();
 				if ($this->walker->valid) {
 					$this->walker->next();
-					if ($this->walker->valid) {
-						$this->walker->next();
-						$this->nextkey = $this->walker->valid? $this->walker->current_key() : null;
-					}
+					$this->nextkey = $this->walker->valid ? $this->walker->current_key() : null;
 				}
 			}
-			
-			
-
 		}
-		
-		function _prepare_list(&$entry_index) {
+	}
 
+	function _prepare_list(&$entry_index) {
+		$qp = & $this->params;
 
-			$qp =& $this->params;
-			
-			$entry_num = 0;
-			
+		$entry_num = 0;
 
-			if (!$qp->y){
-				// searches the whole index
-				
-				#$this->local_list = array_keys($entry_index);
-				$firstid=null;
+		if (!$qp->y) {
+			// searches the whole index
 
-				$index_count = $entry_index->length(); 
-				$this->walker =& $entry_index->walker($firstid);	
+			// $this->local_list = array_keys($entry_index);
+			$firstid = null;
 
+			$index_count = $entry_index->length();
+			$this->walker = & $entry_index->walker($firstid);
+		} else {
+			// notice this won't work with cats (for now)
+
+			$obj = new entry_archives($qp->y, $qp->m, $qp->d);
+
+			$filteredkeys = $obj->getList();
+			$index_count = $obj->getCount();
+
+			if ($filteredkeys) {
+				$error302var1 = entry_idtokey($filteredkeys [0]);
+
+				$this->walker = $entry_index->walker($error302var1, true, entry_idtokey($filteredkeys [$index_count - 1]), true);
+			}
+		}
+
+		if ($qp->count < 0) {
+
+			// count<0 means 'all'
+			$qp->count = $index_count;
+		} elseif (($qp->start + $qp->count) > $index_count) {
+
+			if ($index_count >= $qp->start)
+				$qp->count = $index_count - $qp->start;
+			else
+				$index_count = $qp->start = $qp->count = 0;
+		}
+	}
+
+	// not so great implementation... doesn't work well
+	function _get_random_id(&$entry_index) {
+		$qp = & $this->params;
+		$now = time();
+
+		$first = '999999999999';
+		$last = '000000000000';
+		$entry_index->getitem($first, true);
+		$entry_index->getitem($last, true);
+
+		$t1 = entry_keytotime($first);
+		$t2 = entry_keytotime($last);
+
+		$t = mt_rand($t2, $t1);
+
+		$random_key = entry_timetokey($t);
+		$entry_index->getitem($random_key, true);
+
+		$qp->id = entry_keytoid($random_key);
+	}
+
+	/* reading functions */
+	function hasMore() {
+		$GLOBALS ['current_query'] = & $this;
+
+		// if system init has not been done (filling pointer variable etc.)
+		// call prepare()
+		if ($this->counter < 0) {
+			$this->prepare();
+		}
+
+		// hasMore() returns false either if pointer exceeded the count
+		// or peekEntry returns false
+		return ((bool) $this->peekEntry() && $this->pointer < $this->params->start + $this->params->count);
+	}
+
+	function &peekEntry() {
+		global $post;
+
+		$qp = & $this->params;
+		$return = array(
+			false,
+			false
+		);
+
+		if ($this->counter < 0)
+			$this->prepare();
+
+		if ($this->pointer == $this->params->start + $this->params->count)
+			return $return;
+
+		if ($qp->id) {
+			$idx = $this->main_idx;
+			$key = entry_idtokey($qp->id);
+
+			$v = $idx->getitem($key);
+			if ($qp->fullparse) {
+				$entry = isset($this->localcache [$qp->id]) ? $this->localcache [$qp->id] : entry_parse($qp->id);
+				if ($entry && $qp->comments) {
+					$this->comments = new FPDB_CommentList($qp->id, comment_getlist($qp->id));
+					$entry ['comments'] = $this->comments->getCount();
+				}
+
+				$post = $entry;
+
+				if (!$entry)
+					return $return;
 			} else {
-				// notice this won't work with cats (for now)
-				
-				$obj = new entry_archives($qp->y, $qp->m, $qp->d); 
-				
-				$filteredkeys = $obj->getList();
-				$index_count = $obj->getCount();
-
-				if ($filteredkeys) {
-          $error302var1 = entry_idtokey($filteredkeys[0]);
-
-          $this->walker = $entry_index->walker(
-	        $error302var1, true,
-	        entry_idtokey($filteredkeys[$index_count-1]), true);             
-        }
-			}
-			
-			if ($qp->count < 0) {
-
-				// count<0 means 'all'
-				$qp->count = $index_count;
-
-			} elseif (($qp->start + $qp->count) > $index_count) {
-
-				if ($index_count >= $qp->start)
-					$qp->count = $index_count - $qp->start;
-				else
-					$index_count = $qp->start = $qp->count = 0;
-			}
-			
-		}
-
-		// not so great implementation... doesn't work well
-		function _get_random_id(&$entry_index) {
-			$qp =& $this->params;
-			$now = time();
-
-			$first = '999999999999';
-			$last = '000000000000';
-			$entry_index->getitem($first, true);
-			$entry_index->getitem($last, true);
-
-			$t1 = entry_keytotime($first);
-			$t2 = entry_keytotime($last);
-
-			$t = mt_rand($t2, $t1);
-
-			$random_key = entry_timetokey($t);
-			$entry_index->getitem($random_key, true);
-
-			$qp->id = entry_keytoid($random_key);
-		}
-		
-		/* reading functions */
-		
-		function hasMore() {
-			
-			$GLOBALS['current_query'] =& $this;
-			
-			// if system init has not been done (filling pointer variable etc.)
-			// call prepare()
-			if ($this->counter < 0) {
-				$this->prepare();
-			}
-			
-			// hasMore() returns false either if pointer exceeded the count
-			// or peekEntry returns false
-			return ((bool) $this->peekEntry()
-				&&	$this->pointer < $this->params->start + $this->params->count );
-		}
-		
-		function &peekEntry() {
-		
-			global $post;
-
-			$qp =& $this->params;
-			$return = array(false, false);
-			
-			if ($this->counter < 0)
-				$this->prepare();
-
-			if ($this->pointer == $this->params->start + $this->params->count) return $return;
-			
-			if ($qp->id) {
-				$idx = $this->main_idx;
-				$key = entry_idtokey($qp->id);
-				
-				$v = $idx->getitem($key);
-				if ($qp->fullparse) {
-					$entry = isset($this->localcache[ $qp->id ]) ? $this->localcache[ $qp->id ] : entry_parse($qp->id);
-					if ($entry && $qp->comments) {
-						$this->comments = new FPDB_CommentList($qp->id, comment_getlist($qp->id));
-						$entry['comments'] = $this->comments->getCount();
-					}
-					
-					$post = $entry;
-			
-					if (!$entry)  return $return;
-				} else {
-				 	$entry = array('subject' => $v);
-				 	$post = $entry;
-				}
-				
-				$return = array($this->params->id, $entry);
-				return $return;
-			}
-			
-
-			if (!$this->walker) {
-				$false = array(false, false);
-				return $false;
-			}
-		
-			
-			// search first eligible post
-			while ($this->walker->valid && $this->pointer<$qp->start) {
-				
-
-				$this->previd = $this->currentid;
-				$key = $this->walker->current_key();
-				$id = $this->currentid = entry_keytoid($key);
-
-				if ($this->single) 
-					$this->preventry = array('subject' => $this->walker->current_value());
-
-
-				$this->walker->next();
-				$this->pointer++;
-			}
-			
-			// if there is a secondary (not) idx
-			if ($this->secondary_idx) {
-				
-				// skips posts until we find one which is not in the secondary idx
-				while (  $this->walker->valid 
-				         && ($key = $this->walker->current_key())
-					&& $this->secondary_idx->has_key($key)) {
-					$this->walker->next();
-					//$qp->count--;
-				
-				}
-			}
-			
-			if (!$this->walker->valid) {
-				$cont = false; return $cont; 
-			}
- 				
-			
-			// pointer == start
-			
-			$prevcurr = $this->currentid;
-			$id = $this->currentid = entry_keytoid($this->walker->current_key());
-			if ($id != $prevcurr) $this->previd = $prevcurr;
-
-
-
-			if ($qp->fullparse && $this->counter <= 0) {
-
-				// full parse: reads the whole array from file
-				$cont = array();
-				
-				$cont = isset($this->localcache[ $id ]) ? $this->localcache[ $id ] : entry_parse($id);
-
-				
-			} else {
-
-				// only title
-				$cont = array(
-						'subject' => $this->walker->current_value(), 
-						'date' => entry_idtotime($id)
+				$entry = array(
+					'subject' => $v
 				);
-				
+				$post = $entry;
 			}
 
-			if (!$cont) {
-				$cont = false;
-				return $cont;
-			}
-			
-			if ($qp->comments) {
-				$this->comments = new FPDB_CommentList($id, comment_getlist($id));
-				$cont['comments'] = $this->comments->getCount();
-			}
-			
-			$post = $cont;
-			$post['id'] = $id;
-
-			$var = array(&$id, &$cont);
-			return $var;
-		
+			$return = array(
+				$this->params->id,
+				$entry
+			);
+			return $return;
 		}
-		
-		function &getEntry() {
-			
-			if (!$this->hasMore())
-				return false;
-			
-			$var =& $this->peekEntry();
-			$this->lastentry = $var;
-			
+
+		if (!$this->walker) {
+			$false = array(
+				false,
+				false
+			);
+			return $false;
+		}
+
+		// search first eligible post
+		while ($this->walker->valid && $this->pointer < $qp->start) {
+
+			$this->previd = $this->currentid;
+			$key = $this->walker->current_key();
+			$id = $this->currentid = entry_keytoid($key);
+
+			if ($this->single)
+				$this->preventry = array(
+					'subject' => $this->walker->current_value()
+				);
+
 			$this->walker->next();
 			$this->pointer++;
-			
-			return $var;		
-		}
-		
-		function getLastEntry() {
-			return $this->lastentry;
-		}
-		
-		function hasComments() {
-			return $this->comments->getCount();
-		}
-		
-
-		
-		function _getOffsetId($offset, $assume_pointer=null) {
-			if (is_int($assume_pointer))
-				$i = $assume_pointer + $offset;
-			else
-				$i = $this->pointer + $offset;						
-			return isset($this->local_list [ $i ])? $this->local_list [ $i ] : false;
-		}
-		
-		function _fillCurrentId() {
-			return $this->currentid = $this->_getOffsetId(0);
 		}
 
-		
-		function _fillNextId() {
-			return $this->nextid = $this->_getOffsetId(1);
-		}
-		
-	
-		function _fillPrevId() {
-			return $this->previd = $this->_getOffsetId(-1);
-		}
-		
-		function getCurrentId() {
-			return $this->currentid;
-		}
-		
-		function getNextId() {
-			return $this->nextid;
-		}
-		
-		function getPrevId() {
-			return $this->previd;
-		}
-		
-		function getNextPage() {
-			
-			if ($this->single){
-				$key = $this->nextkey;
-				if (!$key)
-					return array(null, null);
-				else {
-					$val = $this->main_idx->getitem($key); 
-					return array($val, entry_keytoid($key));
-				}
-				
-				
-				 
+		// if there is a secondary (not) idx
+		if ($this->secondary_idx) {
+
+			// skips posts until we find one which is not in the secondary idx
+			while ($this->walker->valid && ($key = $this->walker->current_key()) && $this->secondary_idx->has_key($key)) {
+				$this->walker->next();
+				// $qp->count--;
 			}
-			
-			if ($this->params->page) {
-				#if ($this->_getOffsetId(0, ($this->params->start + $this->params->count)))
-				if ($this->walker->valid)
-					return array($GLOBALS['lang']['main']['nextpage'], $this->params->page + 1);
-				
-			}
-			
-			
 		}
-		
-		function getPrevPage() {
-		
-			if ($this->single){
-				$key = $this->prevkey;
-				if (!$key)
-					return array(null, null);
-				else {
-					$val = $this->main_idx->getitem($key); 
-					return array($val, entry_keytoid($key));
-				}
-				
-			}
-			
-			if ($this->params->page > 1) {
-				return array($GLOBALS['lang']['main']['prevpage'], $this->params->page - 1);
-			}
-			
+
+		if (!$this->walker->valid) {
+			$cont = false;
+			return $cont;
 		}
-		
-		
+
+		// pointer == start
+
+		$prevcurr = $this->currentid;
+		$id = $this->currentid = entry_keytoid($this->walker->current_key());
+		if ($id != $prevcurr)
+			$this->previd = $prevcurr;
+
+		if ($qp->fullparse && $this->counter <= 0) {
+
+			// full parse: reads the whole array from file
+			$cont = array();
+
+			$cont = isset($this->localcache [$id]) ? $this->localcache [$id] : entry_parse($id);
+		} else {
+
+			// only title
+			$cont = array(
+				'subject' => $this->walker->current_value(),
+				'date' => entry_idtotime($id)
+			);
+		}
+
+		if (!$cont) {
+			$cont = false;
+			return $cont;
+		}
+
+		if ($qp->comments) {
+			$this->comments = new FPDB_CommentList($id, comment_getlist($id));
+			$cont ['comments'] = $this->comments->getCount();
+		}
+
+		$post = $cont;
+		$post ['id'] = $id;
+
+		$var = array(
+			&$id,
+			&$cont
+		);
+		return $var;
 	}
-	
-	
-	
-	class FPDB_CommentList {
-	
-		var $count = 0;
-		var $list = array();
-		var $current = '';
-		var $entryid = '';
-		
-		function __construct($ID, $array) {
-			
-			if (is_array($array)) {
-				$this->list = $array;
-				$this->count = count($array);
-				$this->entryid = $ID;
-			}
-			
-		}
-		
-		function getCount() {
-			return $this->count;
-		}
-		
-		function hasMore() {
-			
-			if ($this->count) {
-				return current($this->list) !== false;
-			}
-			
+
+	function &getEntry() {
+		if (!$this->hasMore())
 			return false;
 
-		}
-		
-		function &getComment() {
-			
-			if (!$this->hasMore())
-				return false;
-		
-			$id = array_shift($this->list);
-			
-			$comment = comment_parse($this->entryid, $id);
-			$couplet = array(&$id, &$comment);
-			return $couplet;
-			
-		}
-		
+		$var = & $this->peekEntry();
+		$this->lastentry = $var;
+
+		$this->walker->next();
+		$this->pointer++;
+
+		return $var;
 	}
 
-	class FPDB {
-		
-		var $_indexer = array();
-		var $_categories = array();
-		var $queries = array();
-		
-	
-		function __construct() {
-			// constructor
-		}
-		
-		function init() {
-			#if (!$this->_indexer) {
-				#$this->_indexer = new entry_indexer();
-				$this->_categories = entry_categories_get();
-				#$obj =& $this->_indexer;
-				#$this->entry_index = $obj->getList();
-				
-		
-			#}
+	function getLastEntry() {
+		return $this->lastentry;
+	}
+
+	function hasComments() {
+		return $this->comments->getCount();
+	}
+
+	function _getOffsetId($offset, $assume_pointer = null) {
+		if (is_int($assume_pointer))
+			$i = $assume_pointer + $offset;
+		else
+			$i = $this->pointer + $offset;
+		return isset($this->local_list [$i]) ? $this->local_list [$i] : false;
+	}
+
+	function _fillCurrentId() {
+		return $this->currentid = $this->_getOffsetId(0);
+	}
+
+	function _fillNextId() {
+		return $this->nextid = $this->_getOffsetId(1);
+	}
+
+	function _fillPrevId() {
+		return $this->previd = $this->_getOffsetId(-1);
+	}
+
+	function getCurrentId() {
+		return $this->currentid;
+	}
+
+	function getNextId() {
+		return $this->nextid;
+	}
+
+	function getPrevId() {
+		return $this->previd;
+	}
+
+	function getNextPage() {
+		if ($this->single) {
+			$key = $this->nextkey;
+			if (!$key)
+				return array(
+					null,
+					null
+				);
+			else {
+				$val = $this->main_idx->getitem($key);
+				return array(
+					$val,
+					entry_keytoid($key)
+				);
+			}
 		}
 
-		function &get_index($cat_id = 0) {
-			if (!isset($this->_indexer[$cat_id])) {
-				$this->_indexer[$cat_id] =& entry_cached_index($cat_id);
-			}
-			return $this->_indexer[$cat_id];
-		}
-		
-		function reset($queryId=null) {
-			
-			switch ($queryId) {
-				case null: 	$this->_query = array(); break;
-				default:	unset($this->_query[$queryId]);
-			}
-			
-		
-		}
-		
-		/**
-		 * function query
-		 * @param mixed params
-		 * $params may be an associative array or a query string with the following syntax:
-		 * 'key:val,key:val,key:val';
-		 * example: <code>$params = 'start:0,count:5';<br />
-		 *			is a convenient way to express 
-		 *			$params = array('start'=>0,'count'=>5);</code>
-		 *
-		 * Valid parameters:
-		 * 
-		 * start	(int) first entry to show (counting from 0 
-		 *			to the total number of entries).
-		 *			Defaults to 0.
-		 *
-		 * count	(int) offset from start (e.g. for the first 5 entries, 
-		 *			you'll have start=0 and count=5).
-		 *			Defaults to $blog_config['MAXENTRIES'] 
-		 *
-		 * page		(int) page number (counting from 1 to 
-		 *			n=ceil(num_entries/maxentries_setting))
-		 *			This is a shortcut for setting both start and count 
-		 *			and overrides them, if they're set too
-		 * 
-		 * id		(string) entry or static page id
-		 *
-		 * get		(string) 'entry' or 'static' defaults to 'entry'. <-- not anymore
-		 *
-		 * y		(string) two digit year (06 means 2006)
-		 * m		(string) two digit month (06 means June); 'y' must be set
-		 * d		(string) two digit for day; 'y' and 'm' must be set
-		 *
-		 * exclude	(int) experimental: excludes category ID given as argument from listing
-		 *
-		 *
-		 * fullparse	(bool) non-full-parsed entries get their values 
-		 *				right from the indexed list (or <em>cache</em>).
-		 *				These values are 'subject', 'content' and 'categories'. 
-		 *				If you need any of the other values, you'll need to
-		 *				set fullparse=true; defaults to false.
-		 *
-		 */			 
-		
-		function query($params=array()) {
-			
-			static $queryId=-1;
-			$queryId++;
-			 
-			$this->queries[$queryId] = new FPDB_Query($params, $queryId);
-				
-			
-			$this->init();	
-						
-			return $queryId;
-			
-		
-		}
-		
-		function doquery($queryId=0) {
-		
-			if (isset($this->queries[$queryId])) {
-				$q =& $this->queries[$queryId];
-			} else {
-				return false;
-				trigger_error("FPDB: no such query ID ($queryId)", E_USER_WARNING);
-			}
-			
-			if (!$q) 
-				return false;
-				
-			//$this->init();
-			
-			/**
-				 @todo return true/false
-			 */
-			return $q->prepare($this->entry_index);
-		}
-		
-		// "get" functions. todo: move out?
-		
-		function &getQuery($queryId=0) {
-			$o = null;
-			if (isset($this->queries[$queryId]))
-				$o =& $this->queries[$queryId];
-			return $o;
+		if ($this->params->page) {
+			// if ($this->_getOffsetId(0, ($this->params->start + $this->params->count)))
+			if ($this->walker->valid)
+				return array(
+					$GLOBALS ['lang'] ['main'] ['nextpage'],
+					$this->params->page + 1
+				);
 		}
 	}
 
+	function getPrevPage() {
+		if ($this->single) {
+			$key = $this->prevkey;
+			if (!$key)
+				return array(
+					null,
+					null
+				);
+			else {
+				$val = $this->main_idx->getitem($key);
+				return array(
+					$val,
+					entry_keytoid($key)
+				);
+			}
+		}
 
-	class FPDB_transaction {
-
-		var $_index = null;
-		var $_offset = 0;
-		var $_nodesize = 30;
-		var $_keysize = 12;
-
-		function __construct($id_cat=0) {
-			$this->_index = INDEX_DIR.'index-'.$id_cat;
-
-			$this->_tree = caching_SBPT(
-				fopen($this->_cachefile.'.dat', 'r'),
-				fopen($this->_cachefile.'.strings.dat', 'r'),
-				$this->_offset,
-				$this->_chunksize,
-				$this->_keysize
+		if ($this->params->page > 1) {
+			return array(
+				$GLOBALS ['lang'] ['main'] ['prevpage'],
+				$this->params->page - 1
 			);
-	
+		}
+	}
+
+}
+
+class FPDB_CommentList {
+
+	var $count = 0;
+
+	var $list = array();
+
+	var $current = '';
+
+	var $entryid = '';
+
+	function __construct($ID, $array) {
+		if (is_array($array)) {
+			$this->list = $array;
+			$this->count = count($array);
+			$this->entryid = $ID;
+		}
+	}
+
+	function getCount() {
+		return $this->count;
+	}
+
+	function hasMore() {
+		if ($this->count) {
+			return current($this->list) !== false;
 		}
 
+		return false;
 	}
-	
-	// SMARTY FUNCTIONS ----------------------------------------------------
-	
-	
-	function smarty_block_entries($params, $content, &$smarty, &$repeat) {
-		global $fpdb;
-		
-		return $content;
-		
-		$show = false;
-		
-		$smarty->assign('prev_entry_day', '');
-		
-		if ($repeat) {
-		
-			if (isset($params['alwaysshow']) && $params['alwaysshow']) {
-				//$fpdb->doquery();
-				$repeat = false;
-				return $content;
-			}
-			
-			//$show = @$fpdb->doquery();
-		
+
+	function &getComment() {
+		if (!$this->hasMore())
+			return false;
+
+		$id = array_shift($this->list);
+
+		$comment = comment_parse($this->entryid, $id);
+		$couplet = array(
+			&$id,
+			&$comment
+		);
+		return $couplet;
+	}
+
+}
+
+class FPDB {
+
+	var $_indexer = array();
+
+	var $_categories = array();
+
+	var $queries = array();
+
+	function __construct() {
+		// constructor
+	}
+
+	function init() {
+		// if (!$this->_indexer) {
+		// $this->_indexer = new entry_indexer();
+		$this->_categories = entry_categories_get();
+		// $obj =& $this->_indexer;
+		// $this->entry_index = $obj->getList();
+
+		// }
+	}
+
+	function &get_index($cat_id = 0) {
+		if (!isset($this->_indexer [$cat_id])) {
+			$this->_indexer [$cat_id] = & entry_cached_index($cat_id);
+		}
+		return $this->_indexer [$cat_id];
+	}
+
+	function reset($queryId = null) {
+		switch ($queryId) {
+			case null:
+				$this->_query = array();
+				break;
+			default:
+				unset($this->_query [$queryId]);
+		}
+	}
+
+	/**
+	 * function query
+	 *
+	 * @param
+	 *        	mixed params
+	 *        	$params may be an associative array or a query string with the following syntax:
+	 *        	'key:val,key:val,key:val';
+	 *        	example: <code>$params = 'start:0,count:5';<br />
+	 *        	is a convenient way to express
+	 *        	$params = array('start'=>0,'count'=>5);</code>
+	 *        	
+	 *        	Valid parameters:
+	 *        	
+	 *        	start (int) first entry to show (counting from 0
+	 *        	to the total number of entries).
+	 *        	Defaults to 0.
+	 *        	
+	 *        	count (int) offset from start (e.g. for the first 5 entries,
+	 *        	you'll have start=0 and count=5).
+	 *        	Defaults to $blog_config['MAXENTRIES']
+	 *        	
+	 *        	page (int) page number (counting from 1 to
+	 *        	n=ceil(num_entries/maxentries_setting))
+	 *        	This is a shortcut for setting both start and count
+	 *        	and overrides them, if they're set too
+	 *        	
+	 *        	id (string) entry or static page id
+	 *        	
+	 *        	get (string) 'entry' or 'static' defaults to 'entry'. <-- not anymore
+	 *        	
+	 *        	y (string) two digit year (06 means 2006)
+	 *        	m (string) two digit month (06 means June); 'y' must be set
+	 *        	d (string) two digit for day; 'y' and 'm' must be set
+	 *        	
+	 *        	exclude (int) experimental: excludes category ID given as argument from listing
+	 *        	
+	 *        	
+	 *        	fullparse (bool) non-full-parsed entries get their values
+	 *        	right from the indexed list (or <em>cache</em>).
+	 *        	These values are 'subject', 'content' and 'categories'.
+	 *        	If you need any of the other values, you'll need to
+	 *        	set fullparse=true; defaults to false.
+	 *        	
+	 */
+	function query($params = array()) {
+		static $queryId = -1;
+		$queryId++;
+
+		$this->queries [$queryId] = new FPDB_Query($params, $queryId);
+
+		$this->init();
+
+		return $queryId;
+	}
+
+	function doquery($queryId = 0) {
+		if (isset($this->queries [$queryId])) {
+			$q = & $this->queries [$queryId];
 		} else {
-			
-			if (!isset($fpdb->queries[0]->comments) || !$fpdb->queries[0]->comments) 
-				$fpdb->reset(0);
-				$show = true;
-			
+			return false;
+			trigger_error("FPDB: no such query ID ($queryId)", E_USER_WARNING);
 		}
-		
+
+		if (!$q)
+			return false;
+
+		// $this->init();
+
+		/**
+		 *
+		 * @todo return true/false
+		 */
+		return $q->prepare($this->entry_index);
+	}
+
+	// "get" functions. todo: move out?
+	function &getQuery($queryId = 0) {
+		$o = null;
+		if (isset($this->queries [$queryId]))
+			$o = & $this->queries [$queryId];
+		return $o;
+	}
+
+}
+
+class FPDB_transaction {
+
+	var $_index = null;
+
+	var $_offset = 0;
+
+	var $_nodesize = 30;
+
+	var $_keysize = 12;
+
+	function __construct($id_cat = 0) {
+		$this->_index = INDEX_DIR . 'index-' . $id_cat;
+
+		$this->_tree = caching_SBPT(fopen($this->_cachefile . '.dat', 'r'), fopen($this->_cachefile . '.strings.dat', 'r'), $this->_offset, $this->_chunksize, $this->_keysize);
+	}
+
+}
+
+// SMARTY FUNCTIONS ----------------------------------------------------
+function smarty_block_entries($params, $content, &$smarty, &$repeat) {
+	global $fpdb;
+
+	return $content;
+
+	$show = false;
+
+	$smarty->assign('prev_entry_day', '');
+
+	if ($repeat) {
+
+		if (isset($params ['alwaysshow']) && $params ['alwaysshow']) {
+			// $fpdb->doquery();
+			$repeat = false;
+			return $content;
+		}
+
+		// $show = @$fpdb->doquery();
+	} else {
+
+		if (!isset($fpdb->queries [0]->comments) || !$fpdb->queries [0]->comments)
+			$fpdb->reset(0);
 		$show = true;
-		
-		
-		
-		
-		if ($show)
-			return $content;
-		
 	}
-			
-	
-	function smarty_block_entry($params, $content, &$smarty, &$repeat) {
-		global $fpdb;
-		
-		// clean old variables
-		
-		$smarty->assign(array(	'subject'=>'',
-					'content'=>'',
-					'categories' =>array(),
-					'filed_under'=>'',
-					'date'=>'',
-					'author'=>'',
-					'version'=>'',
-					'ip-address'=>''
-					)
-				);
 
-			
-		
-		if (isset($params['content']) && is_array($params['content']) && $params['content']) {
-			//foreach ($params['entry'] as $k => $val)
-			$smarty->assign($params['content']);
-			return $content;
-		}
-		
-		if (isset($params['alwaysshow']) && $params['alwaysshow']) {
-			return $content;
-		}
-		
-		$q =& $fpdb->getQuery();
-		
-		if($repeat=$q->hasMore()) {
-			
-			
-			$couplet =& $q->getEntry() ;
-			
-			$id =& $couplet[0];
-			$entry =& $couplet[1];
+	$show = true;
 
-			if (THEME_LEGACY_MODE) {
-				$entry = theme_entry_filters($entry, $id);
-			}
-			
-			
-			foreach($entry as $k=>$v) 
-				$smarty->assign_by_ref($k, $entry[$k]);
-			
-			$smarty->assign_by_ref('id', $id);
+	if ($show)
+		return $content;
+}
 
-			$smarty->assign('entry_commslock', @in_array('commslock',$entry['categories']));
-			
-			do_action('entry_block', $id);
-			
+function smarty_block_entry($params, $content, &$smarty, &$repeat) {
+	global $fpdb;
+
+	// clean old variables
+
+	$smarty->assign(array(
+		'subject' => '',
+		'content' => '',
+		'categories' => array(),
+		'filed_under' => '',
+		'date' => '',
+		'author' => '',
+		'version' => '',
+		'ip-address' => ''
+	));
+
+	if (isset($params ['content']) && is_array($params ['content']) && $params ['content']) {
+		// foreach ($params['entry'] as $k => $val)
+		$smarty->assign($params ['content']);
+		return $content;
+	}
+
+	if (isset($params ['alwaysshow']) && $params ['alwaysshow']) {
+		return $content;
+	}
+
+	$q = & $fpdb->getQuery();
+
+	if ($repeat = $q->hasMore()) {
+
+		$couplet = & $q->getEntry();
+
+		$id = & $couplet [0];
+		$entry = & $couplet [1];
+
+		if (THEME_LEGACY_MODE) {
+			$entry = theme_entry_filters($entry, $id);
 		}
-		
+
+		foreach ($entry as $k => $v)
+			$smarty->assign_by_ref($k, $entry [$k]);
+
+		$smarty->assign_by_ref('id', $id);
+
+		if (array_key_exists('categories', $entry)) {
+			$smarty->assign('entry_commslock', in_array('commslock', $entry ['categories']));
+		}
+
+		do_action('entry_block', $id);
+	}
+
+	return $content;
+}
+
+function smarty_block_comment($params, $content, &$smarty, &$repeat) {
+	global $fpdb;
+
+	// clean old variables
+
+	$smarty->assign(array(
+		'subject' => '',
+		'content' => '',
+		'date' => '',
+		'name' => '',
+		'url' => '',
+		'email' => '',
+		'version' => '',
+		'ip-address' => '',
+		'loggedin' => ''
+	));
+
+	$q = & $fpdb->getQuery();
+
+	if ($repeat = $q->comments->hasMore()) {
+
+		$couplet = & $q->comments->getComment();
+
+		$id = & $couplet [0];
+		$comment = & $couplet [1];
+
+		foreach ($comment as $k => $v) {
+			$kk = str_replace('-', '_', $k);
+			$smarty->assign_by_ref($kk, $comment [$k]);
+		}
+
+		if (THEME_LEGACY_MODE) {
+			$comment = theme_comments_filters($comment, $id);
+		}
+
+		$smarty->assign('id', $id);
+	}
+
+	return $content;
+}
+
+function smarty_block_comments($params, $content, &$smarty, &$repeat) {
+	global $fpdb;
+
+	$q = & $fpdb->getQuery();
+	$show = $q->comments->getCount();
+	$smarty->assign('entryid', $q->comments->entryid);
+
+	if ($show) {
 
 		return $content;
-		
-	}
-	
-	
-	function smarty_block_comment($params, $content, &$smarty, &$repeat) {
-		global $fpdb;
-		
-		// clean old variables
-		
-		$smarty->assign(array(
-					'subject'=>'',
-					'content'=>'',
-					'date'=>'',
-					'name'=>'',
-					'url'=>'',
-					'email'=>'',
-					'version'=>'',
-					'ip-address'=>'',
-					'loggedin'=>'',
-					)
-				);
-		
-		$q =& $fpdb->getQuery();
-		
-		if($repeat=$q->comments->hasMore()) {
-			
-			$couplet =& $q->comments->getComment();
-			
-			$id =& $couplet[0];
-			$comment =& $couplet[1];
+	} else {
 
-			
-			foreach($comment as $k=>$v) {
-				$kk = str_replace('-', '_', $k);
-				$smarty->assign_by_ref($kk, $comment[$k]);
-			}
-			
-			if (THEME_LEGACY_MODE) {
-				$comment = theme_comments_filters($comment, $id);
-			}
-			
-			$smarty->assign('id', $id);
-			
-			
-			
-		}
-		
-		
-		return $content;
-		
-
-		
+		$repeat = false;
 	}
-	
-	function smarty_block_comments($params, $content, &$smarty, &$repeat) {
-		global $fpdb;
-		
-			$q =& $fpdb->getQuery();
-			$show = $q->comments->getCount();
-			$smarty->assign('entryid', $q->comments->entryid);
-			
-					
-			if ($show) {
-				
-				return $content;
-			} else {
-			
-				$repeat = false;
-			}
+}
 
+function smarty_function_nextpage($params) {
+	$nextPageLink = get_nextpage_link();
+	if (empty($nextPageLink)) {
+		return;
 	}
-	
-	
-	function smarty_function_nextpage($params) {
-		
-		list ($caption, $link) = get_nextpage_link();
-		
-		if (!$link)
-			return;
-		
-		if (isset($params['admin'])) {
-			$qstr=strstr($link, '?');
-			$link = BLOG_BASEURL . 'admin.php' . $qstr;
-		}
-		
-		
-		return "<div class=\"alignright\"><a href=\"$link\">$caption</a></div>";
-		
+	list ($caption, $link) = $nextPageLink;
+
+	if (!$link)
+		return;
+
+	if (isset($params ['admin'])) {
+		$qstr = strstr($link, '?');
+		$link = BLOG_BASEURL . 'admin.php' . $qstr;
 	}
 
-	function smarty_function_prevpage($params) {
+	return "<div class=\"alignright\"><a href=\"$link\">$caption</a></div>";
+}
 
-		list($caption, $link) = get_prevpage_link();
-		
-		if (!$link)
-			return;
-		
-		if (isset($params['admin'])) {
-			$qstr=strstr($link, '?');
-			$link = BLOG_BASEURL .'admin.php' . $qstr;
-		}
-		
-		
-		return "<div class=\"alignleft\"><a href=\"$link\">$caption</a></div>";
+function smarty_function_prevpage($params) {
+	$prevPageLink = get_prevpage_link();
+	if (empty($prevPageLink)) {
+		return;
+	}
+	list ($caption, $link) = $prevPageLink;
 
+	if (!$link)
+		return;
 
+	if (isset($params ['admin'])) {
+		$qstr = strstr($link, '?');
+		$link = BLOG_BASEURL . 'admin.php' . $qstr;
 	}
 
-	$_FP_SMARTY->register_block('comment','smarty_block_comment');
-	$_FP_SMARTY->register_block('comments','smarty_block_comments');
-	$_FP_SMARTY->register_block('comment_block','smarty_block_comments');
-	
-	$_FP_SMARTY->register_block('entries','smarty_block_entries');
-	$_FP_SMARTY->register_block('entry_block','smarty_block_entries');
-	
-	$_FP_SMARTY->register_block('entry','smarty_block_entry');
-	
-	$_FP_SMARTY->register_function('nextpage','smarty_function_nextpage');
-	$_FP_SMARTY->register_function('prevpage','smarty_function_prevpage');
+	return "<div class=\"alignleft\"><a href=\"$link\">$caption</a></div>";
+}
+
+$_FP_SMARTY->register_block('comment', 'smarty_block_comment');
+$_FP_SMARTY->register_block('comments', 'smarty_block_comments');
+$_FP_SMARTY->register_block('comment_block', 'smarty_block_comments');
+
+$_FP_SMARTY->register_block('entries', 'smarty_block_entries');
+$_FP_SMARTY->register_block('entry_block', 'smarty_block_entries');
+
+$_FP_SMARTY->register_block('entry', 'smarty_block_entry');
+
+$_FP_SMARTY->register_function('nextpage', 'smarty_function_nextpage');
+$_FP_SMARTY->register_function('prevpage', 'smarty_function_prevpage');
 
 ?>
diff --git a/fp-includes/core/core.widgets.php b/fp-includes/core/core.widgets.php
index 2363c97..7f3f005 100755
--- a/fp-includes/core/core.widgets.php
+++ b/fp-includes/core/core.widgets.php
@@ -1,174 +1,142 @@
-<?php	
+<?php
 
-	/**
-	 * Block-Managing Functions
-	 */
-	 
-	 
-	 
-	class widget_indexer extends fs_filelister {
-		
-		var $_varname = 'fp_widgets';
-		var $_enabledlist = null;
-		
-		function __construct() {
-			if (!file_exists(CONFIG_DIR. 'widgets.conf.php')) 
-				trigger_error('widgets.conf.php not found. Blog may not work as expected, create a widgetlist.conf.php 
+/**
+ * Block-Managing Functions
+ */
+class widget_indexer extends fs_filelister {
+
+	var $_varname = 'fp_widgets';
+
+	var $_enabledlist = null;
+
+	function __construct() {
+		if (!file_exists(CONFIG_DIR . 'widgets.conf.php'))
+			trigger_error('widgets.conf.php not found. Blog may not work as expected, create a widgetlist.conf.php 
 					or reinstall completely FlatPress. If you have just installed FlatPress, the package you
 					downloaded may be corrupted.', E_USER_WARNING);
-			$this->_enabledlist = CONFIG_DIR . 'widgets.conf.php';
-			$this->getEnableds();
-		}
-
-		function getEnableds() {
-			
-			if (!file_exists($this->_enabledlist))
-				return;
-			
-			include($this->_enabledlist);
-			
-			$this->_list = ${$this->_varname};
-			
-		}
-		
-		function hasMore($hor) {
-
-			return is_array($this->_list[$hor]) &&  (current($this->_list[$hor]) !== false);
-		}
-		
-	
-		
-		function get($hor) {
-		
-			global $fp_registered_widgets;
-		
-			do {
-				$content = array();
-
-				$id = array_shift($this->_list[$hor]);
-				
-				$newid=$id;# @list($newid, $params) = explode(":", $id);
-				if (@$params) $params = explode(',', $params); else $params = array();
-				// $var = 'plugin_' . $newid . '_widget';
-				$var = $fp_registered_widgets[ $newid ]['func'];
-				if (is_callable($var)) {
-					$content = call_user_func_array($var, $params); 
-					if (!isset($content['id'])) {
-						$content['id'] = "widget-$newid";
-					}
-				} /*
-					else $content = array(
-					'subject' => "Sidebar::Error", 
-					'content' => "<ul class=\"widget-error\"><li>No $var function found for plugin $newid. 
-					Plugin may not have been loaded. 
-					Verify whether it is enabled.</li></ul>",
-					);
-					*/
-				
-			} while(!$content && $id);
-				
-			return array_change_key_case($content, CASE_LOWER);
-				
-			
-			
-			
-		}
-
+		$this->_enabledlist = CONFIG_DIR . 'widgets.conf.php';
+		$this->getEnableds();
 	}
-	
-	
-	function register_widgetset($widgetset) {
-		global $fp_registered_widgetsets;
-		if (!$fp_registered_widgetsets) {
-			$fp_registered_widgetsets = array();
-		}
-		
-		if (!in_array($widgetset, $fp_registered_widgetsets))
-			$fp_registered_widgetsets[] = $widgetset;
-			
+
+	function getEnableds() {
+		if (!file_exists($this->_enabledlist))
+			return;
+
+		include ($this->_enabledlist);
+
+		$this->_list = ${$this->_varname};
 	}
-	
-	
-	
-	function get_registered_widgetsets($widgetset) {
-		global $fp_registered_widgetsets;
-		if (!$fp_registered_widgetsets) {
-			$fp_registered_widgetsets = array();
-		}
-		
-		return $fp_registered_widgetsets;
+
+	function hasMore($hor) {
+		return array_key_exists($hor, $this->_list) && is_array($this->_list [$hor]) && (current($this->_list [$hor]) !== false);
 	}
-	
-	
-	
-	function register_widget(
-						$widgetid, 				// widget id
-						$widgetname,			// name to show 
-						$widget_func, 			// function/method to call 
-						$num_params = 0, 		// number of eventually needed parameters
-												// -1 means optional,
-												// 0 means no parameters
-												// each N>0 means *at least* N parameters
-						 
-						$limit_params_to=array()// indexed array of arrays, containing
-														// allowed parameters (not impl.)  
-						) {
-						
+
+	function get($hor) {
 		global $fp_registered_widgets;
-		if (!$fp_registered_widgets)
-			$fp_registered_widgets = array();
-		
-		/* we won't mind about collisions, for now */
-		
-		$fp_registered_widgets[$widgetid] = array(
-			'name'	=>	$widgetname,
-			'func'	=>	$widget_func, 
-			'nparams'=>	$num_params, 
-			//'needed'=>	$params_needed, 
-			'params'=>	$limit_params_to
-		);
-		  
-	}
-	
-	
-	
-	function get_registered_widgets($widget=null) {
-		global $fp_registered_widgets;
-		
-		if (!$fp_registered_widgets)
-			$fp_registered_widgets = array();
-		
-	
-		ksort($fp_registered_widgets);
-	
-		if ($widget)
-			return isset($fp_registered_widgets[$widget])? 
-							$fp_registered_widgets[$widget]
-							:
-							false;
-		
-		return $fp_registered_widgets;	
-	
+
+		do {
+			$content = array();
+
+			$id = array_shift($this->_list [$hor]);
+
+			$newid = $id; // @list($newid, $params) = explode(":", $id);
+			if (@$params)
+				$params = explode(',', $params);
+			else
+				$params = array();
+			// $var = 'plugin_' . $newid . '_widget';
+			$var = $fp_registered_widgets [$newid] ['func'];
+			if (is_callable($var)) {
+				$content = call_user_func_array($var, $params);
+				if (!isset($content ['id'])) {
+					$content ['id'] = "widget-$newid";
+				}
+			} /*
+			   * else $content = array(
+			   * 'subject' => "Sidebar::Error",
+			   * 'content' => "<ul class=\"widget-error\"><li>No $var function found for plugin $newid.
+			   * Plugin may not have been loaded.
+			   * Verify whether it is enabled.</li></ul>",
+			   * );
+			   */
+		} while (!$content && $id);
+
+		return array_change_key_case($content, CASE_LOWER);
 	}
 
+}
 
+function register_widgetset($widgetset) {
+	global $fp_registered_widgetsets;
+	if (!$fp_registered_widgetsets) {
+		$fp_registered_widgetsets = array();
+	}
 
-	function smarty_block_widgets($params, $content, &$smarty, &$repeat) {
-		global $fp_widgets;
-		
-		if($repeat = $fp_widgets->hasMore(($params['pos']))) {
-			
-			$entry = $fp_widgets->get(($params['pos']));
-			$smarty->assign($entry);
-		}
+	if (!in_array($widgetset, $fp_registered_widgetsets))
+		$fp_registered_widgetsets [] = $widgetset;
+}
 
-		return $content;
-		
-	}		
-	
-	
-	$smarty->register_block('widgets','smarty_block_widgets');
-	
-	
+function get_registered_widgetsets($widgetset) {
+	global $fp_registered_widgetsets;
+	if (!$fp_registered_widgetsets) {
+		$fp_registered_widgetsets = array();
+	}
+
+	return $fp_registered_widgetsets;
+}
+
+function register_widget($widgetid, // widget id
+$widgetname, // name to show
+$widget_func, // function/method to call
+$num_params = 0, // number of eventually needed parameters
+                  // -1 means optional,
+                  // 0 means no parameters
+                  // each N>0 means *at least* N parameters
+
+		$limit_params_to = array()) // indexed array of arrays, containing
+		                             // allowed parameters (not impl.)
+{
+	global $fp_registered_widgets;
+	if (!$fp_registered_widgets)
+		$fp_registered_widgets = array();
+
+	/* we won't mind about collisions, for now */
+
+	$fp_registered_widgets [$widgetid] = array(
+		'name' => $widgetname,
+		'func' => $widget_func,
+		'nparams' => $num_params,
+		// 'needed'=> $params_needed,
+		'params' => $limit_params_to
+	);
+}
+
+function get_registered_widgets($widget = null) {
+	global $fp_registered_widgets;
+
+	if (!$fp_registered_widgets)
+		$fp_registered_widgets = array();
+
+	ksort($fp_registered_widgets);
+
+	if ($widget)
+		return isset($fp_registered_widgets [$widget]) ? $fp_registered_widgets [$widget] : false;
+
+	return $fp_registered_widgets;
+}
+
+function smarty_block_widgets($params, $content, &$smarty, &$repeat) {
+	global $fp_widgets;
+
+	if ($repeat = $fp_widgets->hasMore(($params ['pos']))) {
+
+		$entry = $fp_widgets->get(($params ['pos']));
+		$smarty->assign($entry);
+	}
+
+	return $content;
+}
+
+$smarty->register_block('widgets', 'smarty_block_widgets');
 
 ?>
diff --git a/fp-includes/smarty/plugins/function.list_categories.php b/fp-includes/smarty/plugins/function.list_categories.php
index 2353e13..58f5a00 100755
--- a/fp-includes/smarty/plugins/function.list_categories.php
+++ b/fp-includes/smarty/plugins/function.list_categories.php
@@ -1,157 +1,155 @@
 <?php
+
 /**
  * Smarty plugin
  * -------------------------------------------------------------
- * File:     function.list_categories.php
- * Type:     function
- * Name:     list_categories
- * Purpose:  print out the comment form
+ * File: function.list_categories.php
+ * Type: function
+ * Name: list_categories
+ * Purpose: print out the comment form
  *
- * @param	string after
- * @param	string before
- * -------------------------------------------------------------
+ * @param
+ *        	string after
+ * @param
+ *        	string before
+ *        	-------------------------------------------------------------
  */
-function smarty_function_list_categories($params) //, &$smarty)
+function smarty_function_list_categories($params) // , &$smarty)
 {
 	$cat_params = array(
-				'ild'=>'<li>','ird'=>"</li>\n",
-				'old'=>"<ul>\n",'ord'=>"</ul>\n",
-				'name' => isset($params['name'])? $params['name'] : '',
-				'selected' => array()
-				);
-	
+		'ild' => '<li>',
+		'ird' => "</li>\n",
+		'old' => "<ul>\n",
+		'ord' => "</ul>\n",
+		'name' => isset($params ['name']) ? $params ['name'] : '',
+		'selected' => array()
+	);
+
 	$cat_params = array_merge($cat_params, $params);
 
 	// makese 'selected' an arr
-	$cat_params['selected'] = (array)$params['selected'];
+	$cat_params ['selected'] = array_key_exists('selected', $params) ? (array) $params ['selected'] : array();
+
+	// echo "<pre>" . print_r(entry_categories_get()) . "</pre>";
 
-	//echo "<pre>" . print_r(entry_categories_get()) . "</pre>";
-	
 	if (file_exists(CONTENT_DIR . 'categories.txt')) {
 		$cats = trim(io_load_file(CONTENT_DIR . 'categories.txt'));
-		$stack=array(0);
-		$arr=array();
+		$stack = array(
+			0
+		);
+		$arr = array();
 
-    $line36error = explode("\n", $cats);
-    $line35error = '<ul>'.do_print_categories_list($line36error, $stack, $arr, $cat_params).'</ul>';
+		$line36error = explode("\n", $cats);
+		$line35error = '<ul>' . do_print_categories_list($line36error, $stack, $arr, $cat_params) . '</ul>';
 
-    return $line35error;    
+		return $line35error;
 	} else {
 		global $lang;
-			
-		$content = '<a href="'.BLOG_BASEURL.'">Unfiled</a>';
-		if (isset($lang['admin']['entry']['publish']['nocategories']))
-			$content = $lang['admin']['entry']['publish']['nocategories'];
-		return '<ul><li>' . $content .'</li></ul>' ;
+
+		$content = '<a href="' . BLOG_BASEURL . '">Unfiled</a>';
+		if (isset($lang ['admin'] ['entry'] ['publish'] ['nocategories']))
+			$content = $lang ['admin'] ['entry'] ['publish'] ['nocategories'];
+		return '<ul><li>' . $content . '</li></ul>';
 	}
-	
-	//<label><input name="cats[{$catId}]" 
-	//{if (bool)array_intersect(array($catId),$categories) }
-	//checked="checked"{/if} type="checkbox" /> {$cat} </label><br />
-			
+
+	// <label><input name="cats[{$catId}]"
+	// {if (bool)array_intersect(array($catId),$categories) }
+	// checked="checked"{/if} type="checkbox" /> {$cat} </label><br />
 }
 
-
-
-
-
 function do_print_categories_list(&$lines, &$indentstack, &$result, $params) {
-	
 	global $smarty, $fpdb;
-	
+
 	extract($params);
-	
-        if (empty($lines)) {
-		$l = count($indentstack)-1;
+
+	if (empty($lines)) {
+		$l = count($indentstack) - 1;
 		if ($l > 0)
-			$arr = array_fill(0, $l, $ord.$ird);
+			$arr = array_fill(0, $l, $ord . $ird);
 		else
 			$arr = array();
-			
+
 		$result = array_merge($result, $arr);
 		return '';
 	}
-                
 
-        $str = '';
-        $v = reset($lines);
-        $vt = ltrim($v);
+	$str = '';
+	$v = reset($lines);
+	$vt = ltrim($v);
 
-        $indent = utils_countdashes($vt, $text);
-        $indent_old = end($indentstack);
+	$indent = utils_countdashes($vt, $text);
+	$indent_old = end($indentstack);
 
 	$val = explode(':', $text);
-	$vt = $val[0];
-	$vid = trim($val[1]);
-	
-	$catname = $params['name'];
-	
-        if ($indent > $indent_old) {
-                array_push($indentstack, $indent);
-		
-                array_pop($result);
-                array_push($result, $old);
-                //array_push($result, $ild);
-                do_print_categories_list($lines, $indentstack, $result, $params);
-        }elseif($indent < $indent_old) {
-                array_pop($indentstack);
-		
-		array_push($result, $ord);		
+	$vt = $val [0];
+	$vid = trim($val [1]);
+
+	$catname = $params ['name'];
+
+	if ($indent > $indent_old) {
+		array_push($indentstack, $indent);
+
+		array_pop($result);
+		array_push($result, $old);
+		// array_push($result, $ild);
+		do_print_categories_list($lines, $indentstack, $result, $params);
+	} elseif ($indent < $indent_old) {
+		array_pop($indentstack);
+
+		array_push($result, $ord);
 		array_push($result, $ird);
-               
-                do_print_categories_list($lines, $indentstack, $result, $params);
-        }else{
-                array_push($result, $ild);
-		
-		
-		$cat_entry = $params['selected']; 
-		
-		if (isset($params['type']) && ($params['type']=='form' || $params['type']=='check')) {
-			$string = '<label><input name="'.$catname.'cats['.$vid.']" ';
-			
-			if ((bool) array_intersect(array($vid), $cat_entry))
+
+		do_print_categories_list($lines, $indentstack, $result, $params);
+	} else {
+		array_push($result, $ild);
+
+		$cat_entry = $params ['selected'];
+
+		if (isset($params ['type']) && ($params ['type'] == 'form' || $params ['type'] == 'check')) {
+			$string = '<label><input name="' . $catname . 'cats[' . $vid . ']" ';
+
+			if ((bool) array_intersect(array(
+				$vid
+			), $cat_entry))
 				$string .= 'checked="checked" ';
-			
-			$string .=  'type="checkbox" />';
+
+			$string .= 'type="checkbox" />';
 			$before = $string;
-		}elseif (isset($params['type']) && $params['type']=='radio') {
-			$string = '<label><input name="'.$catname.'cats" type="radio" value="'.$vid.'"';
-			if ((bool) array_intersect(array($vid), $cat_entry))
+		} elseif (isset($params ['type']) && $params ['type'] == 'radio') {
+			$string = '<label><input name="' . $catname . 'cats" type="radio" value="' . $vid . '"';
+			if ((bool) array_intersect(array(
+				$vid
+			), $cat_entry))
 				$string .= 'checked="checked" ';
-	
+
 			$string .= ' />';
 			$before = $string;
-			
-			
-		}elseif(isset($params['type']) && $params['type']=='linked'){
-			$before = '<a href="'.get_category_link($vid).'">';
+		} elseif (isset($params ['type']) && $params ['type'] == 'linked') {
+			$before = '<a href="' . get_category_link($vid) . '">';
 		}
-		
-		
+
 		array_push($result, $before);
-		
-		
-                array_push($result, $vt);
-		
-		if (isset($params['type']) && ($params['type']=='form' || $params['type']=='check' || $params['type']=='radio')) {
+
+		array_push($result, $vt);
+
+		if (isset($params ['type']) && ($params ['type'] == 'form' || $params ['type'] == 'check' || $params ['type'] == 'radio')) {
 			$string = '</label>';
 			$after = $string;
-		}elseif(isset($params['type']) && $params['type']=='linked'){
-			$after='</a>';
-			if (isset($params['count']) && $params['count']) {
-				$index =& $fpdb->get_index($vid);
-				$count = ($index)? $index->length() : 0;
-				$after = " ($count) ". $after;
+		} elseif (isset($params ['type']) && $params ['type'] == 'linked') {
+			$after = '</a>';
+			if (isset($params ['count']) && $params ['count']) {
+				$index = & $fpdb->get_index($vid);
+				$count = ($index) ? $index->length() : 0;
+				$after = " ($count) " . $after;
 			}
 		}
-		
+
 		array_push($result, $after);
-		
-                array_push($result, $ird);
-                array_shift($lines);
-                do_print_categories_list($lines, $indentstack, $result, $params);
-        }
 
-        return implode($result);
+		array_push($result, $ird);
+		array_shift($lines);
+		do_print_categories_list($lines, $indentstack, $result, $params);
+	}
 
+	return implode($result);
 }
diff --git a/fp-interface/sharedtpls/errorlist.tpl b/fp-interface/sharedtpls/errorlist.tpl
index 3829ce7..a7cac48 100644
--- a/fp-interface/sharedtpls/errorlist.tpl
+++ b/fp-interface/sharedtpls/errorlist.tpl
@@ -1,5 +1,5 @@
 <div id="errorlist">
-		{if $error}
+		{if isset($error)}
 		<ul class="msgs errors">
 			{foreach from=$error key=field item=msg}
 			<li>
@@ -13,7 +13,7 @@
 		</ul>
 		{/if}
 		
-		{if $warnings}
+		{if isset($warnings)}
 		<ul class="msgs warnings">
 			{foreach from=$warnings key=field item=msg}
 			<li>
@@ -27,7 +27,7 @@
 		</ul>
 		{/if}
 		
-		{if $notifications}
+		{if isset($notifications)}
 		<ul class="msgs notifications">
 			{foreach from=$notifications item=msg}
 			<li>{$msg}</li>
diff --git a/fp-plugins/commentcenter/plugin.commentcenter.php b/fp-plugins/commentcenter/plugin.commentcenter.php
index a15ba3d..626d0a4 100644
--- a/fp-plugins/commentcenter/plugin.commentcenter.php
+++ b/fp-plugins/commentcenter/plugin.commentcenter.php
@@ -62,8 +62,8 @@ class plugin_commentcenter {
 	function lock() {
 		global $fp_params, $post, $smarty;
 		$this->loadPolicies();
-		$cats = is_array($post ['categories']) ? $post ['categories'] : array();
-		$behavoir = $this->behavoirFromPolicies($fp_params ['entry'], $cats);
+		$cats = array_key_exists('categories', $post) && is_array($post ['categories']) ? $post ['categories'] : array();
+		$behavoir = array_key_exists('entry', $fp_params) ? $this->behavoirFromPolicies($fp_params ['entry'], $cats) : 1;
 		if ($behavoir == -1 && !user_loggedin()) {
 			$smarty->assign('entry_commslock', true);
 		}