mambax7 / planet

class/class-IXR.php

Doc Comments +6 added lines, -6 removed lines

@@ -166,7 +166,7 @@ 
 
     /**
      * IXR_Message constructor.
-     * @param $message
+     * @param string|boolean $message
      */
     public function __construct($message) {
         $this->message = $message;
@@ -863,7 +863,7 @@ 
 
     /**
      * IXR_Base64 constructor.
-     * @param $data
+     * @param string $data
      */
     public function __construct($data) {
         $this->data = $data;
@@ -906,10 +906,10 @@ 
     }
 
     /**
-     * @param $method
-     * @param $callback
-     * @param $args
-     * @param $help
+     * @param string $method
+     * @param string $callback
+     * @param string[] $args
+     * @param string $help
      */
     public function addCallback($method, $callback, $args, $help) {
         $this->callbacks[$method]  = $callback;

class/feedcreator.class.php

Doc Comments +7 added lines, -6 removed lines

@@ -352,7 +352,7 @@ 
     public $_feed;
 
     /**
-     * @param $format
+     * @param string $format
      */
     public function _setFormat($format) {
         switch (strtoupper($format)) {
@@ -529,7 +529,7 @@ 
     /**
      * Adds an FeedItem to the feed.
      *
-     * @param $item
+     * @param FeedItem $item
      * @internal param FeedItem $object $item The FeedItem to add to the feed.
      * @access   public
      */
@@ -547,6 +547,7 @@ 
      * @static
      * @param string     string A string to be truncated.
      * @param int        length the maximum length the string should be truncated to
+     * @param integer $length
      * @return string the truncated string
      */
     public function iTrunc($string, $length) {
@@ -652,7 +653,7 @@ 
     /**
      * @since  1.4
      * @access private
-     * @param $filename
+     * @param string $filename
      */
     public function _redirect($filename) {
         // attention, heavily-commented-out-area
@@ -807,7 +808,7 @@ 
     /**
      * Gets the date stored in this FeedDate as an RFC 822 date.
      *
-     * @return a date in RFC 822 format
+     * @return string date in RFC 822 format
      */
     public function rfc822() {
         //return gmdate("r",$this->unix);
@@ -822,7 +823,7 @@ 
     /**
      * Gets the date stored in this FeedDate as an ISO 8601 date.
      *
-     * @return a date in ISO 8601 format
+     * @return string date in ISO 8601 format
      */
     public function iso8601() {
         $date = gmdate("Y-m-d\TH:i:sO", $this->unix);
@@ -949,7 +950,7 @@ 
     /**
      * Sets this RSS feed's version number.
      * @access private
-     * @param $version
+     * @param string $version
      */
     public function _setRSSVersion($version) {
         $this->RSSVersion = $version;

class/magpie.inc.php

Doc Comments +8 added lines, -8 removed lines

@@ -302,7 +302,7 @@ 
 
     // smart append - field and namespace aware
     /**
-     * @param $el
+     * @param string $el
      * @param $text
      */
     public function append($el, $text) {
@@ -384,7 +384,7 @@ 
     }
 
     /**
-     * @return bool
+     * @return string|false
      */
     public function is_rss() {
         if ($this->feed_type == RSS) {
@@ -395,7 +395,7 @@ 
     }
 
     /**
-     * @return bool
+     * @return string|false
      */
     public function is_atom() {
         if ($this->feed_type == ATOM) {
@@ -407,10 +407,10 @@ 
 
     /**
      * return XML parser, and possibly re-encoded source
-     * @param $source
-     * @param $out_enc
-     * @param $in_enc
-     * @param $detect
+     * @param string $source
+     * @param string $out_enc
+     * @param string|null $in_enc
+     * @param boolean $detect
      * @return array
      */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
@@ -517,7 +517,7 @@ 
 
     /**
      * @param $enc
-     * @return bool|string
+     * @return string|false
      */
     public function known_encoding($enc) {
         $enc = strtoupper($enc);

class/xmlparser.php

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
     }
 
     /**
-     * @return bool|string
+     * @return string|false
      */
     public function is_atom() {
         if ($this->feed_type == ATOM) {

include/functions.php

Doc Comments +3 added lines, -3 removed lines

@@ -108,7 +108,7 @@ 
      * @var mixed  $pattern
      * @var mixed  $replacement
      *
-     * @return bool true on success
+     * @return null|boolean true on success
      */
     function planet_parse_class($class_string, $pattern = '', $replacement = '') {
         if (empty($class_string)) {
@@ -143,7 +143,7 @@ 
      * @var mixed  $pattern
      * @var mixed  $replacement
      *
-     * @return bool true on success
+     * @return null|boolean true on success
      */
     function planet_parse_function($function_string, $pattern = '', $replacement = '') {
         if (empty($function_string)) {
@@ -494,7 +494,7 @@ 
 
     /**
      * @param $url
-     * @return bool|string
+     * @return false|string
      */
     function planet_fetch_fopen($url) {
         if (!$fp = @fopen($url, 'r')) {

view.archive.php

Doc Comments +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
 // Used in get_calendar
 /**
  * @param $num
- * @return mixed
+ * @return double
  */
 function planet_calendar_week_mod($num) {
     $base = 7;

admin/admin.blog.php

Switch Indentation +310 added lines, -310 removed lines

@@ -55,342 +55,342 @@
 
 switch ($op) {
     /* save a single blog */
-    case 'save':
+    	case 'save':
 
-        if ($blog_id) {
-            $blog_obj =& $blog_handler->get($blog_id);
-        } else {
-            if ($blog_exists = $blog_handler->getCount(new Criteria('blog_feed', $_POST['blog_feed']))) {
-                redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
-            }
-            $blog_obj =& $blog_handler->create();
-            $blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
-        }
+        	if ($blog_id) {
+            	$blog_obj =& $blog_handler->get($blog_id);
+        	} else {
+            	if ($blog_exists = $blog_handler->getCount(new Criteria('blog_feed', $_POST['blog_feed']))) {
+                	redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
+            	}
+            	$blog_obj =& $blog_handler->create();
+            	$blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
+        	}
 
-        $blog_obj->setVar('blog_title', $_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', $_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', $_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', $_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', $_POST['blog_link']);
-        $blog_obj->setVar('blog_language', $_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', $_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', $_POST['blog_trackback']);
-        $blog_obj->setVar('blog_status', $_POST['blog_status']);
+        	$blog_obj->setVar('blog_title', $_POST['blog_title']);
+        	$blog_obj->setVar('blog_desc', $_POST['blog_desc']);
+        	$blog_obj->setVar('blog_image', $_POST['blog_image']);
+        	$blog_obj->setVar('blog_feed', $_POST['blog_feed']);
+        	$blog_obj->setVar('blog_link', $_POST['blog_link']);
+        	$blog_obj->setVar('blog_language', $_POST['blog_language']);
+        	$blog_obj->setVar('blog_charset', $_POST['blog_charset']);
+        	$blog_obj->setVar('blog_trackback', $_POST['blog_trackback']);
+        	$blog_obj->setVar('blog_status', $_POST['blog_status']);
 
-        if (!$blog_handler->insert($blog_obj)) {
-        } elseif (!empty($_POST['categories'])) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, $_POST['categories'])) {
-                $_POST['categories'] = array();
-            }
-            $blog_handler->setCategories($blog_id, $_POST['categories']);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
+        	if (!$blog_handler->insert($blog_obj)) {
+        	} elseif (!empty($_POST['categories'])) {
+            	$blog_id = $blog_obj->getVar('blog_id');
+            	if (in_array(0, $_POST['categories'])) {
+                	$_POST['categories'] = array();
+            	}
+            	$blog_handler->setCategories($blog_id, $_POST['categories']);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php', 2, $message);
 
-    /* fetch and add a list of blogs to a category */
-    case 'add':
-        $links =& planet_parseLinks($_POST['links']);
-        $blogs = array();
-        foreach ($links as $link) {
-            if ($blog_exist = $blog_handler->getCount(new Criteria('blog_feed', $link['url']))) {
-                continue;
-            }
-            $blog_obj =& $blog_handler->fetch($link['url']);
-            if (!empty($link['title'])) {
-                $blog_obj->setVar('blog_title', $link['title']);
-            }
-            $blog_handler->insert($blog_obj);
-            $blogs[] = $blog_obj->getVar('blog_id');
-            unset($blog_obj);
-        }
-        if (!empty($_POST['categories'])) {
-            $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            foreach ($_POST['categories'] as $cat_id) {
-                $category_handler->addBlogs($cat_id, $blogs);
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
+    	/* fetch and add a list of blogs to a category */
+    	case 'add':
+        	$links =& planet_parseLinks($_POST['links']);
+        	$blogs = array();
+        	foreach ($links as $link) {
+            	if ($blog_exist = $blog_handler->getCount(new Criteria('blog_feed', $link['url']))) {
+                	continue;
+            	}
+            	$blog_obj =& $blog_handler->fetch($link['url']);
+            	if (!empty($link['title'])) {
+                	$blog_obj->setVar('blog_title', $link['title']);
+            	}
+            	$blog_handler->insert($blog_obj);
+            	$blogs[] = $blog_obj->getVar('blog_id');
+            	unset($blog_obj);
+        	}
+        	if (!empty($_POST['categories'])) {
+            	$category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	foreach ($_POST['categories'] as $cat_id) {
+                	$category_handler->addBlogs($cat_id, $blogs);
+            	}
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php', 2, $message);
 
-    /* update a list of blogs */
-    case 'update':
-        foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->fetch($bid);
-            if (!$blog_handler->insert($blog_obj)) {
-            }
-            unset($blog_obj);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+    	/* update a list of blogs */
+    	case 'update':
+        	foreach ($blog_id as $bid) {
+            	$blog_obj =& $blog_handler->fetch($bid);
+            	if (!$blog_handler->insert($blog_obj)) {
+            	}
+            	unset($blog_obj);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
 
-    /* add a list of blogs to a category */
-    case 'register':
-        if (!empty($_POST['category_dest'])) {
-            if (!is_array($blog_id)) {
-                $blog_id = array($blog_id);
-            }
-            $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $category_handler->addBlogs($_POST['category_dest'], $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $_POST['category_dest'] . '&start=' . $start, 2, $message);
+    	/* add a list of blogs to a category */
+    	case 'register':
+        	if (!empty($_POST['category_dest'])) {
+            	if (!is_array($blog_id)) {
+                	$blog_id = array($blog_id);
+            	}
+            	$category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	$category_handler->addBlogs($_POST['category_dest'], $blog_id);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $_POST['category_dest'] . '&start=' . $start, 2, $message);
 
-    /* remove a list of blogs from a category */
-    case 'remove':
-        if (!is_array($blog_id)) {
-            $blog_id = array($blog_id);
-        }
-        if (!empty($category_id)) {
-            $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $category_handler->removeBlogs($category_id, $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+    	/* remove a list of blogs from a category */
+    	case 'remove':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($blog_id);
+        	}
+        	if (!empty($category_id)) {
+            	$category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	$category_handler->removeBlogs($category_id, $blog_id);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
 
-    /* delete a single blog or a list blogs */
-    case 'del':
-        if (!is_array($blog_id)) {
-            $blog_id = array($blog_id);
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->get($bid);
-            if (!$blog_handler->delete($blog_obj, true)) {
-            }
-            unset($blog_obj);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+    	/* delete a single blog or a list blogs */
+    	case 'del':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($blog_id);
+        	}
+        	foreach ($blog_id as $bid) {
+            	$blog_obj =& $blog_handler->get($bid);
+            	if (!$blog_handler->delete($blog_obj, true)) {
+            	}
+            	unset($blog_obj);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
 
-    /* empty a single blog or a list blogs */
-    case 'empty':
-        if (!is_array($blog_id)) {
-            $blog_id = array($blog_id);
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->get($bid);
-            if (!$blog_handler->do_empty($blog_obj)) {
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+    	/* empty a single blog or a list blogs */
+    	case 'empty':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($blog_id);
+        	}
+        	foreach ($blog_id as $bid) {
+            	$blog_obj =& $blog_handler->get($bid);
+            	if (!$blog_handler->do_empty($blog_obj)) {
+            	}
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
 
-    /* approve a single blog or a list blogs */
-    case 'approve':
-        if (!is_array($blog_id)) {
-            $blog_id = array($blog_id);
-        }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blog_handler->updateAll('blog_status', 1, $criteria, true);
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+    	/* approve a single blog or a list blogs */
+    	case 'approve':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($blog_id);
+        	}
+        	$criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        	$blog_handler->updateAll('blog_status', 1, $criteria, true);
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
 
-    /* mark a single blog or a list blogs as featured */
-    case 'feature':
-        if (!is_array($blog_id)) {
-            $blog_id = array($blog_id);
-        }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blog_handler->updateAll('blog_status', 2, $criteria, true);
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+    	/* mark a single blog or a list blogs as featured */
+    	case 'feature':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($blog_id);
+        	}
+        	$criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        	$blog_handler->updateAll('blog_status', 2, $criteria, true);
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
 
-    /* edit a single blog */
-    case 'edit':
-        if (!empty($_POST['fetch'])) {
-            $blog_obj =& $blog_handler->fetch($_POST['blog_feed']);
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj =& $blog_handler->get($blog_id);
-        }
-        $categories = @$_POST['categories'];
-        if (empty($categories) && $blog_id > 0) {
-            $crit       = new Criteria('bc.blog_id', $blog_id);
-            $categories = array_keys($category_handler->getByBlog($crit));
-        }
-        if (empty($categories)) {
-            $categories = array(0 => _NONE);
-        }
+    	/* edit a single blog */
+    	case 'edit':
+        	if (!empty($_POST['fetch'])) {
+            	$blog_obj =& $blog_handler->fetch($_POST['blog_feed']);
+            	$blog_obj->setVar('blog_id', $blog_id);
+        	} else {
+            	$blog_obj =& $blog_handler->get($blog_id);
+        	}
+        	$categories = @$_POST['categories'];
+        	if (empty($categories) && $blog_id > 0) {
+            	$crit       = new Criteria('bc.blog_id', $blog_id);
+            	$categories = array_keys($category_handler->getByBlog($crit));
+        	}
+        	if (empty($categories)) {
+            	$categories = array(0 => _NONE);
+        	}
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
-            $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj =& $blog_handler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo "<div class=\"errorMsg\">" . planet_constant('AM_BLOGEXISTS');
-                foreach (array_keys($blogs_obj) as $bid) {
-                    echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
-                         . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
-                }
-                echo '</div>';
-            }
-            unset($blogs_obj, $criteria);
-        }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
-        echo '</fieldset>';
-        break;
+        	echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        	echo '<br>';
+        	if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
+            	$criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
+            	$blogs_obj =& $blog_handler->getList($criteria);
+            	if (count($blogs_obj) > 0) {
+                	echo "<div class=\"errorMsg\">" . planet_constant('AM_BLOGEXISTS');
+                	foreach (array_keys($blogs_obj) as $bid) {
+                    	echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
+                         	. URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
+                	}
+                	echo '</div>';
+            	}
+            	unset($blogs_obj, $criteria);
+        	}
+        	include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+        	echo '</fieldset>';
+        	break;
 
-    default:
+    	default:
 
-        $crit = new Criteria('1', 1);
-        $crit->setSort('cat_order');
-        $crit->setOrder('ASC');
-        $categories = $category_handler->getList($crit);
+        	$crit = new Criteria('1', 1);
+        	$crit->setSort('cat_order');
+        	$crit->setOrder('ASC');
+        	$categories = $category_handler->getList($crit);
 
-        // Display category option form
-        $opform    = new XoopsSimpleForm('', 'opform', 'admin.blog.php', 'get');
-        $op_select = new XoopsFormSelect('', 'category', $category_id);
-        $op_select->setExtra('onchange="document.forms.opform.submit()"');
-        $options = array(
-            '0'  => _ALL,
-            '-1' => planet_constant('MD_ACTIVE'),
-            '-2' => planet_constant('MD_FEATURED'),
-            '-3' => planet_constant('MD_PENDING')
-        );
-        foreach (array_keys($categories) as $key) {
-            $options[$key] = $categories[$key];
-        }
-        $op_select->addOptionArray($options);
-        $opform->addElement($op_select);
-        $opform->display();
+        	// Display category option form
+        	$opform    = new XoopsSimpleForm('', 'opform', 'admin.blog.php', 'get');
+        	$op_select = new XoopsFormSelect('', 'category', $category_id);
+        	$op_select->setExtra('onchange="document.forms.opform.submit()"');
+        	$options = array(
+            	'0'  => _ALL,
+            	'-1' => planet_constant('MD_ACTIVE'),
+            	'-2' => planet_constant('MD_FEATURED'),
+            	'-3' => planet_constant('MD_PENDING')
+        	);
+        	foreach (array_keys($categories) as $key) {
+            	$options[$key] = $categories[$key];
+        	}
+        	$op_select->addOptionArray($options);
+        	$opform->addElement($op_select);
+        	$opform->display();
 
-        if ($category_id > 0) {
-            $criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
-            $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $blog_count = $blog_handler->getCountByCategory($criteria);
-            $criteria->setStart($start);
-            $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            $blog_objs =& $blog_handler->getByCategory($criteria);
-        } else {
-            /* All active blogs */
-            if ($category_id == 0) {
-                $criteria = new Criteria('1', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Active blogs */
-            } elseif ($category_id == -1) {
-                $criteria = new Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Featured blogs */
-            } elseif ($category_id == -2) {
-                $criteria = new Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Pending blogs */
-            } else {
-                $criteria = new Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            }
-            $blog_count = $blog_handler->getCount($criteria);
-            $blog_objs  =& $blog_handler->getAll($criteria);
-        }
+        	if ($category_id > 0) {
+            	$criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
+            	$criteria->add(new Criteria('bc.cat_id', $category_id));
+            	$blog_count = $blog_handler->getCountByCategory($criteria);
+            	$criteria->setStart($start);
+            	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+            	$blog_objs =& $blog_handler->getByCategory($criteria);
+        	} else {
+            	/* All active blogs */
+            	if ($category_id == 0) {
+                	$criteria = new Criteria('1', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Active blogs */
+            	} elseif ($category_id == -1) {
+                	$criteria = new Criteria('blog_status', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Featured blogs */
+            	} elseif ($category_id == -2) {
+                	$criteria = new Criteria('blog_status', 2);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Pending blogs */
+            	} else {
+                	$criteria = new Criteria('blog_status', 0);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+            	}
+            	$blog_count = $blog_handler->getCount($criteria);
+            	$blog_objs  =& $blog_handler->getAll($criteria);
+        	}
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
-        echo "<br style=\"clear:both\" />";
+        	echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+        	echo "<br style=\"clear:both\" />";
 
-        echo "<form name='list' id='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox'  onclick=\"xoopsCheckAll('list', 'blog_check');\" /></td>";
-        echo "<th class='bg3'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_STATUS') . '</td>';
-        echo "<th class='bg3' width='40%'>" . planet_constant('AM_FEED') . '</td>';
-        //        echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
-        //        echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
-        echo "<th class='bg3' width='10%'>" . planet_constant('AM_ACTIONS') . '</td>';
-        echo '</tr>';
+        	echo "<form name='list' id='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        	echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+        	echo "<tr align='center'>";
+        	echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox'  onclick=\"xoopsCheckAll('list', 'blog_check');\" /></td>";
+        	echo "<th class='bg3'>" . planet_constant('AM_TITLE') . '</td>';
+        	echo "<th class='bg3' width='5%'>" . planet_constant('AM_STATUS') . '</td>';
+        	echo "<th class='bg3' width='40%'>" . planet_constant('AM_FEED') . '</td>';
+        	//        echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
+        	//        echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
+        	echo "<th class='bg3' width='10%'>" . planet_constant('AM_ACTIONS') . '</td>';
+        	echo '</tr>';
 
-        $status = array(
-            '0' => planet_constant('MD_PENDING'),
-            '1' => planet_constant('MD_ACTIVE'),
-            '2' => planet_constant('MD_FEATURED')
-        );
-        foreach (array_keys($blog_objs) as $bid) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox' /></td>";
-            echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b'
-                 . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
-            echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
-            echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
-            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT
-                 . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
+        	$status = array(
+            	'0' => planet_constant('MD_PENDING'),
+            	'1' => planet_constant('MD_ACTIVE'),
+            	'2' => planet_constant('MD_FEATURED')
+        	);
+        	foreach (array_keys($blog_objs) as $bid) {
+            	echo "<tr class='odd' align='left'>";
+            	echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox' /></td>";
+            	echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b'
+                 	. $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
+            	echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
+            	echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
+            	echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT
+                 	. "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
                       <a href='admin.blog.php?op=del&amp;blog=" . $bid . "' title='" . _DELETE . "'><img src='"
-                 . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . " title='" . _DELETE . " </a>&nbsp;
+                 	. $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . " title='" . _DELETE . " </a>&nbsp;
                       <a href='admin.blog.php?op=empty&amp;blog=" . $bid . "' title='"
-                 . planet_constant('MD_EMPTY_BLOG') . "'><img src='" . $pathIcon16 . "/empty.png '" . " alt='" . _EDIT
-                 . " title='" . planet_constant('MD_EMPTY_BLOG') . '</a></td>';
+                 	. planet_constant('MD_EMPTY_BLOG') . "'><img src='" . $pathIcon16 . "/empty.png '" . " alt='" . _EDIT
+                 	. " title='" . planet_constant('MD_EMPTY_BLOG') . '</a></td>';
 
-            echo '</tr>';
-        }
-        echo "<tr class='even' align='center'>";
-        echo "<td colspan='7'>";
-        echo "<select name='op' onChange='if (this.options[this.selectedIndex].value==\"register\") {setVisible(\"catdiv\");} else {setHidden(\"catdiv\");}'>";
-        echo "<option value=''>" . _SELECT . '</option>';
-        echo "<option value='del'>" . _DELETE . '</option>';
-        echo "<option value='empty'>" . planet_constant('MD_EMPTY_BLOG') . '</option>';
-        echo "<option value='register'>" . planet_constant('AM_REGISTER') . '</option>';
-        if ($category_id > 0) {
-            echo "<option value='remove'>" . planet_constant('AM_REMOVE') . '</option>';
-        }
-        echo "<option value='approve'>" . planet_constant('AM_APPROVE') . '</option>';
-        echo "<option value='feature'>" . planet_constant('AM_FEATURE') . '</option>';
-        echo "<option value='update'>" . planet_constant('AM_UPDATE') . '</option>';
-        echo '</select>';
-        echo "<div id='catdiv' style='visibility:hidden;display:inline;'>";
-        echo "<select name='category_dest'>";
-        echo "<option value=''>" . _SELECT . '</option>';
-        foreach ($categories as $cid => $name) {
-            echo "<option value='" . $cid . "'>" . $name . '</option>';
-        }
-        echo '</select>';
-        echo '</div>';
-        echo "<input name='start' value='" . $start . "' type='hidden' />";
-        echo "<input name='category' value='" . $category_id . "' type='hidden' />";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit' />";
-        echo "<input name='' value='" . _CANCEL . "' type='reset' />";
-        echo '</td>';
-        echo '</tr>';
-        if ($blog_count > $xoopsModuleConfig['list_perpage']) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start',
-                                        'category=' . $category_id);
-            $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
-        }
-        echo '</table></form>';
-        echo "</fieldset><br style='clear:both;'>";
+            	echo '</tr>';
+        	}
+        	echo "<tr class='even' align='center'>";
+        	echo "<td colspan='7'>";
+        	echo "<select name='op' onChange='if (this.options[this.selectedIndex].value==\"register\") {setVisible(\"catdiv\");} else {setHidden(\"catdiv\");}'>";
+        	echo "<option value=''>" . _SELECT . '</option>';
+        	echo "<option value='del'>" . _DELETE . '</option>';
+        	echo "<option value='empty'>" . planet_constant('MD_EMPTY_BLOG') . '</option>';
+        	echo "<option value='register'>" . planet_constant('AM_REGISTER') . '</option>';
+        	if ($category_id > 0) {
+            	echo "<option value='remove'>" . planet_constant('AM_REMOVE') . '</option>';
+        	}
+        	echo "<option value='approve'>" . planet_constant('AM_APPROVE') . '</option>';
+        	echo "<option value='feature'>" . planet_constant('AM_FEATURE') . '</option>';
+        	echo "<option value='update'>" . planet_constant('AM_UPDATE') . '</option>';
+        	echo '</select>';
+        	echo "<div id='catdiv' style='visibility:hidden;display:inline;'>";
+        	echo "<select name='category_dest'>";
+        	echo "<option value=''>" . _SELECT . '</option>';
+        	foreach ($categories as $cid => $name) {
+            	echo "<option value='" . $cid . "'>" . $name . '</option>';
+        	}
+        	echo '</select>';
+        	echo '</div>';
+        	echo "<input name='start' value='" . $start . "' type='hidden' />";
+        	echo "<input name='category' value='" . $category_id . "' type='hidden' />";
+        	echo "<input name='submit' value='" . _SUBMIT . "' type='submit' />";
+        	echo "<input name='' value='" . _CANCEL . "' type='reset' />";
+        	echo '</td>';
+        	echo '</tr>';
+        	if ($blog_count > $xoopsModuleConfig['list_perpage']) {
+            	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+            	$nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start',
+                                        	'category=' . $category_id);
+            	$pagenav = $nav->renderNav(4);
+            	echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+        	}
+        	echo '</table></form>';
+        	echo "</fieldset><br style='clear:both;'>";
 
-        if (empty($start) && empty($category_id)) {
-            $form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'));
-            $form->addElement(new XoopsFormText(planet_constant('AM_FEED'), 'blog_feed', 50, 255), true);
-            $form->addElement(new XoopsFormHidden('op', 'edit'));
-            $button_tray = new XoopsFormElementTray('', '');
-            $butt_save   = new XoopsFormButton('', 'fetch', _SUBMIT, 'submit');
-            $button_tray->addElement($butt_save);
-            $butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
-            $button_tray->addElement($butt_cancel);
-            $form->addElement($button_tray);
+        	if (empty($start) && empty($category_id)) {
+            	$form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'));
+            	$form->addElement(new XoopsFormText(planet_constant('AM_FEED'), 'blog_feed', 50, 255), true);
+            	$form->addElement(new XoopsFormHidden('op', 'edit'));
+            	$button_tray = new XoopsFormElementTray('', '');
+            	$butt_save   = new XoopsFormButton('', 'fetch', _SUBMIT, 'submit');
+            	$button_tray->addElement($butt_save);
+            	$butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
+            	$button_tray->addElement($butt_cancel);
+            	$form->addElement($button_tray);
 
-            $form_add = new XoopsThemeForm(_ADD, 'add', xoops_getenv('PHP_SELF'));
-            $form_add->addElement(new XoopsFormTextArea(planet_constant('AM_FEED'), 'links'));
-            $form_add->addElement(new XoopsFormHidden('op', 'add'));
-            $button_tray = new XoopsFormElementTray('', '');
-            $butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-            $button_tray->addElement($butt_save);
-            $butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
-            $button_tray->addElement($butt_cancel);
-            $form_add->addElement($button_tray);
+            	$form_add = new XoopsThemeForm(_ADD, 'add', xoops_getenv('PHP_SELF'));
+            	$form_add->addElement(new XoopsFormTextArea(planet_constant('AM_FEED'), 'links'));
+            	$form_add->addElement(new XoopsFormHidden('op', 'add'));
+            	$button_tray = new XoopsFormElementTray('', '');
+            	$butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+            	$button_tray->addElement($butt_save);
+            	$butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
+            	$button_tray->addElement($butt_cancel);
+            	$form_add->addElement($button_tray);
 
-            echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
-            echo '<br>';
-            $form->display();
-            $form_add->display();
-            echo '</fieldset>';
-        }
-        break;
+            	echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+            	echo '<br>';
+            	$form->display();
+            	$form_add->display();
+            	echo '</fieldset>';
+        	}
+        	break;
 }
 
 xoops_cp_footer();