mambax7 / planet

comment_new.php

Indentation +4 added lines, -4 removed lines

@@ -27,8 +27,8 @@
 include __DIR__ . '/header.php';
 $com_itemid = isset($_GET['com_itemid']) ? (int)$_GET['com_itemid'] : 0;
 if ($com_itemid > 0) {
-    $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj     =& $article_handler->get($com_itemid);
-    $com_replytitle  = $article_obj->getVar('art_title');
-    include_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+	$article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj     =& $article_handler->get($com_itemid);
+	$com_replytitle  = $article_obj->getVar('art_title');
+	include_once XOOPS_ROOT_PATH . '/include/comment_new.php';
 }

Spacing +5 added lines, -5 removed lines

@@ -24,11 +24,11 @@
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include __DIR__ . '/header.php';
-$com_itemid = isset($_GET['com_itemid']) ? (int)$_GET['com_itemid'] : 0;
-if ($com_itemid > 0) {
+include __DIR__.'/header.php';
+$com_itemid = isset($_GET['com_itemid']) ? (int) $_GET['com_itemid'] : 0;
+if ($com_itemid>0) {
     $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj     =& $article_handler->get($com_itemid);
+    $article_obj     = & $article_handler->get($com_itemid);
     $com_replytitle  = $article_obj->getVar('art_title');
-    include_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+    include_once XOOPS_ROOT_PATH.'/include/comment_new.php';
 }

print.php

Indentation +42 added lines, -42 removed lines

@@ -30,48 +30,48 @@ 
 error_reporting(0);
 
 if (empty($_POST['print_data'])) {
-    if (planet_parse_args($args_num, $args, $args_str)) {
-        $args['article'] = @$args_num[0];
-    }
+	if (planet_parse_args($args_num, $args, $args_str)) {
+		$args['article'] = @$args_num[0];
+	}
 
-    $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+	$article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
-    $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj     =& $article_handler->get($article_id);
+	$article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj     =& $article_handler->get($article_id);
 
-    $article_data = array();
+	$article_data = array();
 
-    // title
-    $article_data['title'] = $article_obj->getVar('art_title');
+	// title
+	$article_data['title'] = $article_obj->getVar('art_title');
 
-    $article_data['author'] = $article_obj->getVar('art_author');
+	$article_data['author'] = $article_obj->getVar('art_author');
 
-    // source
-    $article_data['source'] = $article_obj->getVar('art_link');
+	// source
+	$article_data['source'] = $article_obj->getVar('art_link');
 
-    // publish time
-    $article_data['time'] = $article_obj->getTime('l');
+	// publish time
+	$article_data['time'] = $article_obj->getTime('l');
 
-    // summary
-    $article_data['summary'] =& $article_obj->getSummary();
+	// summary
+	$article_data['summary'] =& $article_obj->getSummary();
 
-    // text of page
-    $article_data['text'] = $article_obj->getVar('art_content');
+	// text of page
+	$article_data['text'] = $article_obj->getVar('art_content');
 
-    $print_data['title']   = $article_data['title'];
-    $print_data['author']  = $article_data['author'];
-    $print_data['date']    = $article_data['time'];
-    $print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY') . ': '
-                                                                    . $article_data['summary'];
-    $print_data['content'] = $article_data['text'];
-    $print_data['url']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/view.article.php'
-                             . URL_DELIMITER . 'c' . $category_id . '/' . $article_id . '/p' . $page;
+	$print_data['title']   = $article_data['title'];
+	$print_data['author']  = $article_data['author'];
+	$print_data['date']    = $article_data['time'];
+	$print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY') . ': '
+																	. $article_data['summary'];
+	$print_data['content'] = $article_data['text'];
+	$print_data['url']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/view.article.php'
+							 . URL_DELIMITER . 'c' . $category_id . '/' . $article_id . '/p' . $page;
 } else {
-    $print_data = unserialize(base64_decode($_POST['print_data']));
+	$print_data = unserialize(base64_decode($_POST['print_data']));
 }
 
 $print_data['image']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/'
-                        . $xoopsModule->getInfo('image');
+						. $xoopsModule->getInfo('image');
 $print_data['module'] = $xoopsModule->getVar('name') . ' V' . $xoopsModule->getInfo('version');
 
 header('Content-Type: text/html; charset=' . _CHARSET);
@@ -99,19 +99,19 @@ 
             </style>\n";
 echo "</head>\n";
 echo "<body style='background-color:#ffffff; color:#000000; font-family: Arial' onload='window.print()'>\n"
-     . "<div style='float:center; width: 750px; border: 1px solid #000; padding: 20px;'>\n"
-     . "<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n" . "<img src='"
-     . $print_data['image'] . "' border='0' alt='" . $print_data['module'] . "' />\n" . '<h2>' . $print_data['title']
-     . "</h2>\n" . "</div>\n"
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n";
+	 . "<div style='float:center; width: 750px; border: 1px solid #000; padding: 20px;'>\n"
+	 . "<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n" . "<img src='"
+	 . $print_data['image'] . "' border='0' alt='" . $print_data['module'] . "' />\n" . '<h2>' . $print_data['title']
+	 . "</h2>\n" . "</div>\n"
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n";
 echo (empty($print_data['author']) ? '' : '<div>' . planet_constant('MD_AUTHOR') . ': ' . $print_data['author']
-                                          . "</div>\n") . '<div>' . planet_constant('MD_DATE') . ': '
-     . $print_data['date'] . "</div>\n"
-     . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n"
-                                               . '<div>' . $print_data['summary'] . "</div>\n")
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n" . '<div>'
-     . $print_data['content'] . "</div>\n"
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n" . '<div>'
-     . $print_data['module'] . "</div>\n" . '<div>URL: ' . $print_data['url'] . "</div>\n" . "</div>\n"
-     . "</body>\n</html>\n";
+										  . "</div>\n") . '<div>' . planet_constant('MD_DATE') . ': '
+	 . $print_data['date'] . "</div>\n"
+	 . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n"
+											   . '<div>' . $print_data['summary'] . "</div>\n")
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n" . '<div>'
+	 . $print_data['content'] . "</div>\n"
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n" . '<div>'
+	 . $print_data['module'] . "</div>\n" . '<div>URL: ' . $print_data['url'] . "</div>\n" . "</div>\n"
+	 . "</body>\n</html>\n";
 exit();

Spacing +28 added lines, -28 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 
 error_reporting(0);
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 error_reporting(0);
 
 if (empty($_POST['print_data'])) {
@@ -34,10 +34,10 @@ 
         $args['article'] = @$args_num[0];
     }
 
-    $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+    $article_id = (int) (empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
     $article_handler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj     =& $article_handler->get($article_id);
+    $article_obj     = & $article_handler->get($article_id);
 
     $article_data = array();
 
@@ -53,7 +53,7 @@ 
     $article_data['time'] = $article_obj->getTime('l');
 
     // summary
-    $article_data['summary'] =& $article_obj->getSummary();
+    $article_data['summary'] = & $article_obj->getSummary();
 
     // text of page
     $article_data['text'] = $article_obj->getVar('art_content');
@@ -61,28 +61,28 @@ 
     $print_data['title']   = $article_data['title'];
     $print_data['author']  = $article_data['author'];
     $print_data['date']    = $article_data['time'];
-    $print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY') . ': '
+    $print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY').': '
                                                                     . $article_data['summary'];
     $print_data['content'] = $article_data['text'];
-    $print_data['url']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/view.article.php'
-                             . URL_DELIMITER . 'c' . $category_id . '/' . $article_id . '/p' . $page;
-} else {
+    $print_data['url']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/view.article.php'
+                             . URL_DELIMITER.'c'.$category_id.'/'.$article_id.'/p'.$page;
+}else {
     $print_data = unserialize(base64_decode($_POST['print_data']));
 }
 
-$print_data['image']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/'
+$print_data['image']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'
                         . $xoopsModule->getInfo('image');
-$print_data['module'] = $xoopsModule->getVar('name') . ' V' . $xoopsModule->getInfo('version');
+$print_data['module'] = $xoopsModule->getVar('name').' V'.$xoopsModule->getInfo('version');
 
-header('Content-Type: text/html; charset=' . _CHARSET);
+header('Content-Type: text/html; charset='._CHARSET);
 echo "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n";
 echo "<html>\n<head>\n";
-echo '<title>' . $xoopsConfig['sitename'] . "</title>\n";
-echo "<meta http-equiv='Content-Type' content='text/html; charset=" . _CHARSET . "' />\n";
-echo "<meta name='AUTHOR' content='" . $myts->htmlspecialchars($xoopsConfig['sitename']) . "' />\n";
-echo "<meta name='COPYRIGHT' content='Copyright (c) " . date('Y') . ' by ' . $xoopsConfig['sitename'] . "' />\n";
-echo "<meta name='DESCRIPTION' content='" . $myts->htmlspecialchars($xoopsConfig['slogan']) . "' />\n";
-echo "<meta name='GENERATOR' content='" . XOOPS_VERSION . "' />\n";
+echo '<title>'.$xoopsConfig['sitename']."</title>\n";
+echo "<meta http-equiv='Content-Type' content='text/html; charset="._CHARSET."' />\n";
+echo "<meta name='AUTHOR' content='".$myts->htmlspecialchars($xoopsConfig['sitename'])."' />\n";
+echo "<meta name='COPYRIGHT' content='Copyright (c) ".date('Y').' by '.$xoopsConfig['sitename']."' />\n";
+echo "<meta name='DESCRIPTION' content='".$myts->htmlspecialchars($xoopsConfig['slogan'])."' />\n";
+echo "<meta name='GENERATOR' content='".XOOPS_VERSION."' />\n";
 echo "<style type='text/css'>
             body {
                 color:#000000;
@@ -100,18 +100,18 @@ 
 echo "</head>\n";
 echo "<body style='background-color:#ffffff; color:#000000; font-family: Arial' onload='window.print()'>\n"
      . "<div style='float:center; width: 750px; border: 1px solid #000; padding: 20px;'>\n"
-     . "<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n" . "<img src='"
-     . $print_data['image'] . "' border='0' alt='" . $print_data['module'] . "' />\n" . '<h2>' . $print_data['title']
-     . "</h2>\n" . "</div>\n"
+     . "<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n"."<img src='"
+     . $print_data['image']."' border='0' alt='".$print_data['module']."' />\n".'<h2>'.$print_data['title']
+     . "</h2>\n"."</div>\n"
      . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n";
-echo (empty($print_data['author']) ? '' : '<div>' . planet_constant('MD_AUTHOR') . ': ' . $print_data['author']
-                                          . "</div>\n") . '<div>' . planet_constant('MD_DATE') . ': '
-     . $print_data['date'] . "</div>\n"
+echo (empty($print_data['author']) ? '' : '<div>'.planet_constant('MD_AUTHOR').': '.$print_data['author']
+                                          . "</div>\n").'<div>'.planet_constant('MD_DATE').': '
+     . $print_data['date']."</div>\n"
      . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n"
-                                               . '<div>' . $print_data['summary'] . "</div>\n")
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n" . '<div>'
-     . $print_data['content'] . "</div>\n"
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n" . '<div>'
-     . $print_data['module'] . "</div>\n" . '<div>URL: ' . $print_data['url'] . "</div>\n" . "</div>\n"
+                                               . '<div>'.$print_data['summary']."</div>\n")
+     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n".'<div>'
+     . $print_data['content']."</div>\n"
+     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n".'<div>'
+     . $print_data['module']."</div>\n".'<div>URL: '.$print_data['url']."</div>\n"."</div>\n"
      . "</body>\n</html>\n";
 exit();

comment_reply.php

Spacing +2 added lines, -2 removed lines

@@ -24,5 +24,5 @@
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include dirname(dirname(__DIR__)) . '/mainfile.php';
-include XOOPS_ROOT_PATH . '/include/comment_reply.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
+include XOOPS_ROOT_PATH.'/include/comment_reply.php';

admin/index.php

Spacing +3 added lines, -3 removed lines

@@ -17,8 +17,8 @@ 
  * @author       XOOPS Development Team
  */
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include_once __DIR__ . '/admin_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+include_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 
@@ -27,4 +27,4 @@ 
 echo $indexAdmin->addNavigation(basename(__FILE__));
 echo $indexAdmin->renderIndex();
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

admin/menu.php

Spacing +10 added lines, -10 removed lines

@@ -29,17 +29,17 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 $path = dirname(dirname(dirname(__DIR__)));
-include_once $path . '/mainfile.php';
+include_once $path.'/mainfile.php';
 
 $dirname         = basename(dirname(__DIR__));
 $moduleHandler   = xoops_getHandler('module');
 $module          = $moduleHandler->getByDirname($dirname);
 $pathIcon32      = $module->getInfo('icons32');
 $pathModuleAdmin = $module->getInfo('dirmoduleadmin');
-$pathLanguage    = $path . $pathModuleAdmin;
+$pathLanguage    = $path.$pathModuleAdmin;
 
-if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+if (!file_exists($fileinc = $pathLanguage.'/language/'.$GLOBALS['xoopsConfig']['language'].'/'.'main.php')) {
+    $fileinc = $pathLanguage.'/language/english/main.php';
 }
 
 include_once $fileinc;
@@ -48,24 +48,24 @@ 
 $i                      = 0;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_HOME;
 $adminmenu[$i]['link']  = 'admin/index.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/home.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/home.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_INDEX');
 $adminmenu[$i]['link']  = 'admin/main.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/manage.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/manage.png';
 
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_CATEGORY');
 $adminmenu[$i]['link']  = 'admin/admin.category.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/category.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/category.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_BLOG');
 $adminmenu[$i]['link']  = 'admin/admin.blog.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/translations.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/translations.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_ARTICLE');
 $adminmenu[$i]['link']  = 'admin/admin.article.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/content.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/content.png';
 //++$i;
 //$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_BLOCK");
 //$adminmenu[$i]['link'] = "admin/admin.block.php";
@@ -73,4 +73,4 @@ 
 ++$i;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
 $adminmenu[$i]['link']  = 'admin/about.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/about.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/about.png';

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 $pathLanguage    = $path . $pathModuleAdmin;
 
 if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+	$fileinc = $pathLanguage . '/language/english/main.php';
 }
 
 include_once $fileinc;

admin/main.php

Indentation +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 //echo '<label>' . '<strong>MySQL Version:</strong>' . ':</label><text>' . mysqli_get_server_info() . '</text><br>';
 echo '<label>' . '<strong>XOOPS Version:</strong>' . ':</label><text>' . XOOPS_VERSION . '</text><br>';
 echo '<label>' . '<strong>Module Version:</strong>' . ':</label><text>' . $xoopsModule->getInfo('version')
-     . '</text><br>';
+	 . '</text><br>';
 echo '</div>';
 echo "<div style='padding: 8px;'>";
 echo '<label>' . planet_constant('AM_SAFEMODE') . ':</label><text>';
@@ -106,7 +106,7 @@ 
 echo '</text><br>';
 echo '<label>' . planet_constant('AM_TOTAL_BLOGS') . ':</label><text>' . $blog_count;
 if ($blog_count_pending > 0) {
-    echo " (<font color=\"red\">" . $blog_count_pending . '</font>)';
+	echo " (<font color=\"red\">" . $blog_count_pending . '</font>)';
 }
 echo '</text><br>';
 echo '<label>' . planet_constant('AM_TOTAL_ARTICLES') . ':</label><text>' . $article_count;

Spacing +22 added lines, -22 removed lines

@@ -24,7 +24,7 @@ 
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 $indexAdmin = new ModuleAdmin();
@@ -50,49 +50,49 @@ 
     </style>
 ";
 
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_PREFERENCES') . '</legend>';
+echo "<fieldset><legend style='font-weight: bold; color: #900;'>".planet_constant('AM_PREFERENCES').'</legend>';
 echo "<div style='padding: 8px;'>";
-echo '<label>' . '<strong>PHP Version:</strong>' . ':</label><text>' . phpversion() . '</text><br>';
+echo '<label>'.'<strong>PHP Version:</strong>'.':</label><text>'.phpversion().'</text><br>';
 //echo '<label>' . '<strong>MySQL Version:</strong>' . ':</label><text>' . mysqli_get_server_info() . '</text><br>';
-echo '<label>' . '<strong>XOOPS Version:</strong>' . ':</label><text>' . XOOPS_VERSION . '</text><br>';
-echo '<label>' . '<strong>Module Version:</strong>' . ':</label><text>' . $xoopsModule->getInfo('version')
+echo '<label>'.'<strong>XOOPS Version:</strong>'.':</label><text>'.XOOPS_VERSION.'</text><br>';
+echo '<label>'.'<strong>Module Version:</strong>'.':</label><text>'.$xoopsModule->getInfo('version')
      . '</text><br>';
 echo '</div>';
 echo "<div style='padding: 8px;'>";
-echo '<label>' . planet_constant('AM_SAFEMODE') . ':</label><text>';
+echo '<label>'.planet_constant('AM_SAFEMODE').':</label><text>';
 echo ini_get('safe_mode') ? planet_constant('AM_ON') : planet_constant('AM_OFF');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_REGISTERGLOBALS') . ':</label><text>';
+echo '<label>'.planet_constant('AM_REGISTERGLOBALS').':</label><text>';
 echo ini_get('register_globals') ? planet_constant('AM_ON') : planet_constant('AM_OFF');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_MAGICQUOTESGPC') . ':</label><text>';
+echo '<label>'.planet_constant('AM_MAGICQUOTESGPC').':</label><text>';
 echo ini_get('magic_quotes_gpc') ? planet_constant('AM_ON') : planet_constant('AM_OFF');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_MAXPOSTSIZE') . ':</label><text>' . ini_get('post_max_size');
+echo '<label>'.planet_constant('AM_MAXPOSTSIZE').':</label><text>'.ini_get('post_max_size');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_MAXINPUTTIME') . ':</label><text>' . ini_get('max_input_time');
+echo '<label>'.planet_constant('AM_MAXINPUTTIME').':</label><text>'.ini_get('max_input_time');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_OUTPUTBUFFERING') . ':</label><text>' . ini_get('output_buffering');
+echo '<label>'.planet_constant('AM_OUTPUTBUFFERING').':</label><text>'.ini_get('output_buffering');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_XML_EXTENSION') . ':</label><text>';
+echo '<label>'.planet_constant('AM_XML_EXTENSION').':</label><text>';
 echo extension_loaded('xml') ? planet_constant('AM_ON') : planet_constant('AM_OFF');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_MB_EXTENSION') . ':</label><text>';
+echo '<label>'.planet_constant('AM_MB_EXTENSION').':</label><text>';
 echo extension_loaded('mbstring') ? planet_constant('AM_ON') : planet_constant('AM_OFF');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_CURL') . ':</label><text>';
+echo '<label>'.planet_constant('AM_CURL').':</label><text>';
 echo function_exists('curl_init') ? planet_constant('AM_ON') : planet_constant('AM_OFF');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_FSOCKOPEN') . ':</label><text>';
+echo '<label>'.planet_constant('AM_FSOCKOPEN').':</label><text>';
 echo function_exists('fsockopen') ? planet_constant('AM_ON') : planet_constant('AM_OFF');
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_URLFOPEN') . ':</label><text>';
+echo '<label>'.planet_constant('AM_URLFOPEN').':</label><text>';
 echo ini_get('allow_url_fopen') ? planet_constant('AM_ON') : planet_constant('AM_OFF');
 echo '</text><br>';
 echo '</div>';
 echo '</fieldset>';
 
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_STATS') . '</legend>';
+echo "<fieldset><legend style='font-weight: bold; color: #900;'>".planet_constant('AM_STATS').'</legend>';
 echo "<div style='padding: 8px;'>";
 $category_handler   = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 $category_count     = $category_handler->getCount();
@@ -102,14 +102,14 @@ 
 $article_count      = $article_handler->getCount();
 $criteria           = new Criteria('blog_status', 0);
 $blog_count_pending = $blog_handler->getCount($criteria);
-echo '<label>' . planet_constant('AM_TOTAL_CATEGORIES') . ':</label><text>' . $category_count;
+echo '<label>'.planet_constant('AM_TOTAL_CATEGORIES').':</label><text>'.$category_count;
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_TOTAL_BLOGS') . ':</label><text>' . $blog_count;
-if ($blog_count_pending > 0) {
-    echo " (<font color=\"red\">" . $blog_count_pending . '</font>)';
+echo '<label>'.planet_constant('AM_TOTAL_BLOGS').':</label><text>'.$blog_count;
+if ($blog_count_pending>0) {
+    echo " (<font color=\"red\">".$blog_count_pending.'</font>)';
 }
 echo '</text><br>';
-echo '<label>' . planet_constant('AM_TOTAL_ARTICLES') . ':</label><text>' . $article_count;
+echo '<label>'.planet_constant('AM_TOTAL_ARTICLES').':</label><text>'.$article_count;
 echo '</text><br>';
 echo '</div>';
 echo '</fieldset>';

admin/admin_footer.php

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@
  */
 
 echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n"
-     . "    <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
-     . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+	 . "    <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+	 . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
 
 xoops_cp_footer();

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
  * @author       XOOPS Development Team
  */
 
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n"
+echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"
      . "    <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
-     . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+     . "  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
 
 xoops_cp_footer();

admin/admin.blog.php

Indentation +312 added lines, -312 removed lines

@@ -50,347 +50,347 @@
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 if ('save' === $op && !empty($_POST['fetch'])) {
-    $op = 'edit';
+	$op = 'edit';
 }
 
 switch ($op) {
-    /* save a single blog */
-    case 'save':
+	/* save a single blog */
+	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();

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();

Spacing +77 added lines, -77 removed lines

@@ -24,8 +24,8 @@ 
 // URL: http://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 xoops_cp_header();
 $indexAdmin = new ModuleAdmin();
@@ -37,14 +37,14 @@ 
  * This is a tricky fix for incomplete solution of module cone
  * it is expected to have a better solution in article 1.0
  */
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //planet_adminmenu(2);
 
 $op          = !empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
 $blog_id     = !empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0);
-$blog_id     = is_array($blog_id) ? array_map('intval', $blog_id) : (int)$blog_id;
-$category_id = (int)(!empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0));
-$start       = (int)(!empty($_POST['start']) ? $_POST['start'] : (!empty($_GET['start']) ? $_GET['start'] : 0));
+$blog_id     = is_array($blog_id) ? array_map('intval', $blog_id) : (int) $blog_id;
+$category_id = (int) (!empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0));
+$start       = (int) (!empty($_POST['start']) ? $_POST['start'] : (!empty($_GET['start']) ? $_GET['start'] : 0));
 
 $blog_handler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -58,12 +58,12 @@ 
     case 'save':
 
         if ($blog_id) {
-            $blog_obj =& $blog_handler->get($blog_id);
-        } else {
+            $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 = & $blog_handler->create();
             $blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
         }
 
@@ -90,13 +90,13 @@ 
 
     /* fetch and add a list of blogs to a category */
     case 'add':
-        $links =& planet_parseLinks($_POST['links']);
+        $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']);
+            $blog_obj = & $blog_handler->fetch($link['url']);
             if (!empty($link['title'])) {
                 $blog_obj->setVar('blog_title', $link['title']);
             }
@@ -116,13 +116,13 @@ 
     /* update a list of blogs */
     case 'update':
         foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->fetch($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);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* add a list of blogs to a category */
     case 'register':
@@ -134,7 +134,7 @@ 
             $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);
+        redirect_header('admin.blog.php?category='.$_POST['category_dest'].'&start='.$start, 2, $message);
 
     /* remove a list of blogs from a category */
     case 'remove':
@@ -146,7 +146,7 @@ 
             $category_handler->removeBlogs($category_id, $blog_id);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* delete a single blog or a list blogs */
     case 'del':
@@ -154,13 +154,13 @@ 
             $blog_id = array($blog_id);
         }
         foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->get($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);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* empty a single blog or a list blogs */
     case 'empty':
@@ -168,43 +168,43 @@ 
             $blog_id = array($blog_id);
         }
         foreach ($blog_id as $bid) {
-            $blog_obj =& $blog_handler->get($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);
+        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');
+        $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);
+        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');
+        $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);
+        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 = & $blog_handler->fetch($_POST['blog_feed']);
             $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj =& $blog_handler->get($blog_id);
+        }else {
+            $blog_obj = & $blog_handler->get($blog_id);
         }
         $categories = @$_POST['categories'];
-        if (empty($categories) && $blog_id > 0) {
+        if (empty($categories) && $blog_id>0) {
             $crit       = new Criteria('bc.blog_id', $blog_id);
             $categories = array_keys($category_handler->getByBlog($crit));
         }
@@ -212,22 +212,22 @@ 
             $categories = array(0 => _NONE);
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        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');
+            $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 "<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';
+        include XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/form.blog.php';
         echo '</fieldset>';
         break;
 
@@ -255,14 +255,14 @@ 
         $opform->addElement($op_select);
         $opform->display();
 
-        if ($category_id > 0) {
+        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 {
+            $blog_objs = & $blog_handler->getByCategory($criteria);
+        }else {
             /* All active blogs */
             if ($category_id == 0) {
                 $criteria = new Criteria('1', 1);
@@ -279,28 +279,28 @@ 
                 $criteria->setStart($start);
                 $criteria->setLimit($xoopsModuleConfig['list_perpage']);
                 /* Pending blogs */
-            } else {
+            }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);
+            $blog_objs  = & $blog_handler->getAll($criteria);
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+        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 "<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'>".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 "<th class='bg3' width='10%'>".planet_constant('AM_ACTIONS').'</td>';
         echo '</tr>';
 
         $status = array(
@@ -310,55 +310,55 @@ 
         );
         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;
-                      <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>';
+            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;
+                      <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>';
 
             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=''>"._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 "<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>';
+        echo "<option value=''>"._SELECT.'</option>';
         foreach ($categories as $cid => $name) {
-            echo "<option value='" . $cid . "'>" . $name . '</option>';
+            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 "<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';
+        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);
+                                        'category='.$category_id);
             $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+            echo "<tr align='right'><td colspan='6'>".$pagenav.'</td></tr>';
         }
         echo '</table></form>';
         echo "</fieldset><br style='clear:both;'>";
@@ -384,7 +384,7 @@ 
             $button_tray->addElement($butt_cancel);
             $form_add->addElement($button_tray);
 
-            echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+            echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._ADD.'</legend>';
             echo '<br>';
             $form->display();
             $form_add->display();

admin/header.php

Indentation +2 added lines, -2 removed lines

@@ -32,9 +32,9 @@
 
 // include the default language file for the admin interface
 if (!@include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/'
-                   . $xoopsConfig['language'] . '/main.php'
+				   . $xoopsConfig['language'] . '/main.php'
 ) {
-    include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/main.php';
+	include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/main.php';
 }
 
 planet_define_url_delimiter();

Spacing +7 added lines, -7 removed lines

@@ -25,16 +25,16 @@
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
-require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/functions.php';
-include_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/functions.php';
+include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
 
 // include the default language file for the admin interface
-if (!@include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/'
-                   . $xoopsConfig['language'] . '/main.php'
+if (!@include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'
+                   . $xoopsConfig['language'].'/main.php'
 ) {
-    include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/main.php';
+    include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/main.php';
 }
 
 planet_define_url_delimiter();