mambax7 / planet

admin/menu.php

Indentation +18 added lines, -18 removed lines

@@ -35,33 +35,33 @@ 
 $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $adminmenu[] = [
-    'title' => planet_constant('MI_ADMENU_HOME'),
-    'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+	'title' => planet_constant('MI_ADMENU_HOME'),
+	'link'  => 'admin/index.php',
+	'icon'  => $pathIcon32 . '/home.png',
 ];
 
 $adminmenu[] = [
-    'title' => planet_constant('MI_ADMENU_INDEX'),
-    'link'  => 'admin/main.php',
-    'icon'  => $pathIcon32 . '/manage.png',
+	'title' => planet_constant('MI_ADMENU_INDEX'),
+	'link'  => 'admin/main.php',
+	'icon'  => $pathIcon32 . '/manage.png',
 ];
 
 $adminmenu[] = [
-    'title' => planet_constant('MI_ADMENU_CATEGORY'),
-    'link'  => 'admin/admin.category.php',
-    'icon'  => $pathIcon32 . '/category.png',
+	'title' => planet_constant('MI_ADMENU_CATEGORY'),
+	'link'  => 'admin/admin.category.php',
+	'icon'  => $pathIcon32 . '/category.png',
 ];
 
 $adminmenu[] = [
-    'title' => planet_constant('MI_ADMENU_BLOG'),
-    'link'  => 'admin/admin.blog.php',
-    'icon'  => $pathIcon32 . '/translations.png',
+	'title' => planet_constant('MI_ADMENU_BLOG'),
+	'link'  => 'admin/admin.blog.php',
+	'icon'  => $pathIcon32 . '/translations.png',
 ];
 
 $adminmenu[] = [
-    'title' => planet_constant('MI_ADMENU_ARTICLE'),
-    'link'  => 'admin/admin.article.php',
-    'icon'  => $pathIcon32 . '/content.png',
+	'title' => planet_constant('MI_ADMENU_ARTICLE'),
+	'link'  => 'admin/admin.article.php',
+	'icon'  => $pathIcon32 . '/content.png',
 ];
 
 //$adminmenu[] = [
@@ -71,7 +71,7 @@ 
 //];
 
 $adminmenu[] = [
-    'title' => planet_constant('MI_ADMENU_ABOUT'),
-    'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+	'title' => planet_constant('MI_ADMENU_ABOUT'),
+	'link'  => 'admin/about.php',
+	'icon'  => $pathIcon32 . '/about.png',
 ];

Spacing +6 added lines, -6 removed lines

@@ -37,31 +37,31 @@ 
 $adminmenu[] = [
     'title' => planet_constant('MI_ADMENU_HOME'),
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
 ];
 
 $adminmenu[] = [
     'title' => planet_constant('MI_ADMENU_INDEX'),
     'link'  => 'admin/main.php',
-    'icon'  => $pathIcon32 . '/manage.png',
+    'icon'  => $pathIcon32.'/manage.png',
 ];
 
 $adminmenu[] = [
     'title' => planet_constant('MI_ADMENU_CATEGORY'),
     'link'  => 'admin/admin.category.php',
-    'icon'  => $pathIcon32 . '/category.png',
+    'icon'  => $pathIcon32.'/category.png',
 ];
 
 $adminmenu[] = [
     'title' => planet_constant('MI_ADMENU_BLOG'),
     'link'  => 'admin/admin.blog.php',
-    'icon'  => $pathIcon32 . '/translations.png',
+    'icon'  => $pathIcon32.'/translations.png',
 ];
 
 $adminmenu[] = [
     'title' => planet_constant('MI_ADMENU_ARTICLE'),
     'link'  => 'admin/admin.article.php',
-    'icon'  => $pathIcon32 . '/content.png',
+    'icon'  => $pathIcon32.'/content.png',
 ];
 
 //$adminmenu[] = [
@@ -73,5 +73,5 @@ 
 $adminmenu[] = [
     'title' => planet_constant('MI_ADMENU_ABOUT'),
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
 ];

admin/admin.blog.php

Indentation +341 added lines, -341 removed lines

@@ -55,353 +55,353 @@
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 if ('save' === $op && !empty(Request::getString('fetch', '', 'POST'))) {
-    $op = 'edit';
+	$op = 'edit';
 }
 
 switch ($op) {
-    /* save a single blog */
-    case 'save':
-
-        if ($blog_id) {
-            $blog_obj = $blogHandler->get($blog_id);
-        } else {
-            if ($blog_exists = $blogHandler->getCount(new \Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
-                redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
-            }
-            $blog_obj = $blogHandler->create();
-            $blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
-        }
-
-        $blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', Request::getString('blog_feed', '', 'POST')); //$_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
-        $blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
-        $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); //$_POST['blog_status']);
-
-        if (!$blogHandler->insert($blog_obj)) {
-        } elseif (!empty(Request::getArray('categories', [], 'POST'))) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, Request::getArray('categories', [], 'POST'))) {
-                $_POST['categories'] = [];
-            }
-            $blogHandler->setCategories($blog_id, Request::getArray('categories', [], 'POST'));
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* fetch and add a list of blogs to a category */
-    // no break
-    case 'add':
-        $links = PlanetUtility::planetParseLinks(Request::getArray('links', [], 'POST'));
-        $blogs = [];
-        foreach ($links as $link) {
-            if ($blog_exist = $blogHandler->getCount(new \Criteria('blog_feed', $link['url']))) {
-                continue;
-            }
-            $blog_obj = $blogHandler->fetch($link['url']);
-            if (!empty($link['title'])) {
-                $blog_obj->setVar('blog_title', $link['title']);
-            }
-            $blogHandler->insert($blog_obj);
-            $blogs[] = $blog_obj->getVar('blog_id');
-            unset($blog_obj);
-        }
-        if (!empty(Request::getArray('categories', [], 'POST'))) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            foreach (Request::getArray('categories', [], 'POST') as $cat_id) {
-                $categoryHandler->addBlogs($cat_id, $blogs);
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* update a list of blogs */
-    // no break
-    case 'update':
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->fetch($bid);
-            if (!$blogHandler->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 */
-    // no break
-    case 'register':
-        if (!empty(Request::getArray('category_dest', [], 'POST'))) {
-            if (!is_array($blog_id)) {
-                $blog_id = [$blog_id];
-            }
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&start=' . $start, 2, $message);
-
-    /* remove a list of blogs from a category */
-    // no break
-    case 'remove':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        if (!empty($category_id)) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->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 */
-    // no break
-    case 'del':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->get($bid);
-            if (!$blogHandler->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 */
-    // no break
-    case 'empty':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->get($bid);
-            if (!$blogHandler->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 */
-    // no break
-    case 'approve':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        $criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blogHandler->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 */
-    // no break
-    case 'feature':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        $criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blogHandler->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 */
-    // no break
-    case 'edit':
-        if (!empty(Request::getString('fetch', '', 'POST'))) {
-            $blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj = $blogHandler->get($blog_id);
-        }
-        $categories = Request::getArray('categories', [], 'POST');
-        if (empty($categories) && $blog_id > 0) {
-            $crit       = new \Criteria('bc.blog_id', $blog_id);
-            $categories = array_keys($categoryHandler->getByBlog($crit));
-        }
-        if (empty($categories)) {
-            $categories = [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 = $blogHandler->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:
-
-        $crit = new \Criteria('1', 1);
-        $crit->setSort('cat_order');
-        $crit->setOrder('ASC');
-        $categories = $categoryHandler->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 = [
-            '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 = $blogHandler->getCountByCategory($criteria);
-            $criteria->setStart($start);
-            $criteria->setLimit($helper->getConfig('list_perpage'));
-            $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
-            /* All active blogs */
-            if (0 == $category_id) {
-                $criteria = new \Criteria('1', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($helper->getConfig('list_perpage'));
-            /* Active blogs */
-            } elseif (-1 == $category_id) {
-                $criteria = new \Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($helper->getConfig('list_perpage'));
-            /* Featured blogs */
-            } elseif (-2 == $category_id) {
-                $criteria = new \Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($helper->getConfig('list_perpage'));
-            /* Pending blogs */
-            } else {
-                $criteria = new \Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($helper->getConfig('list_perpage'));
-            }
-            $blog_count = $blogHandler->getCount($criteria);
-            $blog_objs  = $blogHandler->getAll($criteria);
-        }
-
-        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>';
-
-        $status = [
-            '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>
+	/* save a single blog */
+	case 'save':
+
+		if ($blog_id) {
+			$blog_obj = $blogHandler->get($blog_id);
+		} else {
+			if ($blog_exists = $blogHandler->getCount(new \Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
+				redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
+			}
+			$blog_obj = $blogHandler->create();
+			$blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
+		}
+
+		$blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
+		$blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
+		$blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
+		$blog_obj->setVar('blog_feed', Request::getString('blog_feed', '', 'POST')); //$_POST['blog_feed']);
+		$blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
+		$blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
+		$blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
+		$blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
+		$blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); //$_POST['blog_status']);
+
+		if (!$blogHandler->insert($blog_obj)) {
+		} elseif (!empty(Request::getArray('categories', [], 'POST'))) {
+			$blog_id = $blog_obj->getVar('blog_id');
+			if (in_array(0, Request::getArray('categories', [], 'POST'))) {
+				$_POST['categories'] = [];
+			}
+			$blogHandler->setCategories($blog_id, Request::getArray('categories', [], 'POST'));
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php', 2, $message);
+
+	/* fetch and add a list of blogs to a category */
+	// no break
+	case 'add':
+		$links = PlanetUtility::planetParseLinks(Request::getArray('links', [], 'POST'));
+		$blogs = [];
+		foreach ($links as $link) {
+			if ($blog_exist = $blogHandler->getCount(new \Criteria('blog_feed', $link['url']))) {
+				continue;
+			}
+			$blog_obj = $blogHandler->fetch($link['url']);
+			if (!empty($link['title'])) {
+				$blog_obj->setVar('blog_title', $link['title']);
+			}
+			$blogHandler->insert($blog_obj);
+			$blogs[] = $blog_obj->getVar('blog_id');
+			unset($blog_obj);
+		}
+		if (!empty(Request::getArray('categories', [], 'POST'))) {
+			$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+			foreach (Request::getArray('categories', [], 'POST') as $cat_id) {
+				$categoryHandler->addBlogs($cat_id, $blogs);
+			}
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php', 2, $message);
+
+	/* update a list of blogs */
+	// no break
+	case 'update':
+		foreach ($blog_id as $bid) {
+			$blog_obj = $blogHandler->fetch($bid);
+			if (!$blogHandler->insert($blog_obj)) {
+			}
+			unset($blog_obj);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* add a list of blogs to a category */
+	// no break
+	case 'register':
+		if (!empty(Request::getArray('category_dest', [], 'POST'))) {
+			if (!is_array($blog_id)) {
+				$blog_id = [$blog_id];
+			}
+			$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+			$categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&amp;start=' . $start, 2, $message);
+
+	/* remove a list of blogs from a category */
+	// no break
+	case 'remove':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		if (!empty($category_id)) {
+			$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+			$categoryHandler->removeBlogs($category_id, $blog_id);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* delete a single blog or a list blogs */
+	// no break
+	case 'del':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		foreach ($blog_id as $bid) {
+			$blog_obj = $blogHandler->get($bid);
+			if (!$blogHandler->delete($blog_obj, true)) {
+			}
+			unset($blog_obj);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* empty a single blog or a list blogs */
+	// no break
+	case 'empty':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		foreach ($blog_id as $bid) {
+			$blog_obj = $blogHandler->get($bid);
+			if (!$blogHandler->do_empty($blog_obj)) {
+			}
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* approve a single blog or a list blogs */
+	// no break
+	case 'approve':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		$criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+		$blogHandler->updateAll('blog_status', 1, $criteria, true);
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* mark a single blog or a list blogs as featured */
+	// no break
+	case 'feature':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		$criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+		$blogHandler->updateAll('blog_status', 2, $criteria, true);
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* edit a single blog */
+	// no break
+	case 'edit':
+		if (!empty(Request::getString('fetch', '', 'POST'))) {
+			$blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
+			$blog_obj->setVar('blog_id', $blog_id);
+		} else {
+			$blog_obj = $blogHandler->get($blog_id);
+		}
+		$categories = Request::getArray('categories', [], 'POST');
+		if (empty($categories) && $blog_id > 0) {
+			$crit       = new \Criteria('bc.blog_id', $blog_id);
+			$categories = array_keys($categoryHandler->getByBlog($crit));
+		}
+		if (empty($categories)) {
+			$categories = [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 = $blogHandler->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:
+
+		$crit = new \Criteria('1', 1);
+		$crit->setSort('cat_order');
+		$crit->setOrder('ASC');
+		$categories = $categoryHandler->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 = [
+			'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 = $blogHandler->getCountByCategory($criteria);
+			$criteria->setStart($start);
+			$criteria->setLimit($helper->getConfig('list_perpage'));
+			$blog_objs = $blogHandler->getByCategory($criteria);
+		} else {
+			/* All active blogs */
+			if (0 == $category_id) {
+				$criteria = new \Criteria('1', 1);
+				$criteria->setStart($start);
+				$criteria->setLimit($helper->getConfig('list_perpage'));
+			/* Active blogs */
+			} elseif (-1 == $category_id) {
+				$criteria = new \Criteria('blog_status', 1);
+				$criteria->setStart($start);
+				$criteria->setLimit($helper->getConfig('list_perpage'));
+			/* Featured blogs */
+			} elseif (-2 == $category_id) {
+				$criteria = new \Criteria('blog_status', 2);
+				$criteria->setStart($start);
+				$criteria->setLimit($helper->getConfig('list_perpage'));
+			/* Pending blogs */
+			} else {
+				$criteria = new \Criteria('blog_status', 0);
+				$criteria->setStart($start);
+				$criteria->setLimit($helper->getConfig('list_perpage'));
+			}
+			$blog_count = $blogHandler->getCount($criteria);
+			$blog_objs  = $blogHandler->getAll($criteria);
+		}
+
+		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>';
+
+		$status = [
+			'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;
                       <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='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='pending'>" . planet_constant('AM_PENDING') . '</option>';
-        echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</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 > $helper->getConfig('list_perpage')) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new \XoopsPageNav($blog_count, $helper->getConfig('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'), 'post', true);
-            $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'), 'post', true);
-            $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 '</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 "<option value='pending'>" . planet_constant('AM_PENDING') . '</option>';
+		echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</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 > $helper->getConfig('list_perpage')) {
+			include XOOPS_ROOT_PATH . '/class/pagenav.php';
+			$nav     = new \XoopsPageNav($blog_count, $helper->getConfig('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'), 'post', true);
+			$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'), 'post', true);
+			$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;
 }
 
 xoops_cp_footer();

Switch Indentation +339 added lines, -339 removed lines

@@ -60,348 +60,348 @@
 
 switch ($op) {
     /* save a single blog */
-    case 'save':
-
-        if ($blog_id) {
-            $blog_obj = $blogHandler->get($blog_id);
-        } else {
-            if ($blog_exists = $blogHandler->getCount(new \Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
-                redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
-            }
-            $blog_obj = $blogHandler->create();
-            $blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
-        }
-
-        $blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', Request::getString('blog_feed', '', 'POST')); //$_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
-        $blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
-        $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); //$_POST['blog_status']);
-
-        if (!$blogHandler->insert($blog_obj)) {
-        } elseif (!empty(Request::getArray('categories', [], 'POST'))) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, Request::getArray('categories', [], 'POST'))) {
-                $_POST['categories'] = [];
-            }
-            $blogHandler->setCategories($blog_id, Request::getArray('categories', [], 'POST'));
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* fetch and add a list of blogs to a category */
-    // no break
-    case 'add':
-        $links = PlanetUtility::planetParseLinks(Request::getArray('links', [], 'POST'));
-        $blogs = [];
-        foreach ($links as $link) {
-            if ($blog_exist = $blogHandler->getCount(new \Criteria('blog_feed', $link['url']))) {
-                continue;
-            }
-            $blog_obj = $blogHandler->fetch($link['url']);
-            if (!empty($link['title'])) {
-                $blog_obj->setVar('blog_title', $link['title']);
-            }
-            $blogHandler->insert($blog_obj);
-            $blogs[] = $blog_obj->getVar('blog_id');
-            unset($blog_obj);
-        }
-        if (!empty(Request::getArray('categories', [], 'POST'))) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            foreach (Request::getArray('categories', [], 'POST') as $cat_id) {
-                $categoryHandler->addBlogs($cat_id, $blogs);
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* update a list of blogs */
-    // no break
-    case 'update':
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->fetch($bid);
-            if (!$blogHandler->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 */
-    // no break
-    case 'register':
-        if (!empty(Request::getArray('category_dest', [], 'POST'))) {
-            if (!is_array($blog_id)) {
-                $blog_id = [$blog_id];
-            }
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&start=' . $start, 2, $message);
-
-    /* remove a list of blogs from a category */
-    // no break
-    case 'remove':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        if (!empty($category_id)) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->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 */
-    // no break
-    case 'del':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->get($bid);
-            if (!$blogHandler->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 */
-    // no break
-    case 'empty':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->get($bid);
-            if (!$blogHandler->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 */
-    // no break
-    case 'approve':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        $criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blogHandler->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 */
-    // no break
-    case 'feature':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        $criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blogHandler->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 */
-    // no break
-    case 'edit':
-        if (!empty(Request::getString('fetch', '', 'POST'))) {
-            $blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj = $blogHandler->get($blog_id);
-        }
-        $categories = Request::getArray('categories', [], 'POST');
-        if (empty($categories) && $blog_id > 0) {
-            $crit       = new \Criteria('bc.blog_id', $blog_id);
-            $categories = array_keys($categoryHandler->getByBlog($crit));
-        }
-        if (empty($categories)) {
-            $categories = [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 = $blogHandler->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:
-
-        $crit = new \Criteria('1', 1);
-        $crit->setSort('cat_order');
-        $crit->setOrder('ASC');
-        $categories = $categoryHandler->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 = [
-            '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 = $blogHandler->getCountByCategory($criteria);
-            $criteria->setStart($start);
-            $criteria->setLimit($helper->getConfig('list_perpage'));
-            $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
-            /* All active blogs */
-            if (0 == $category_id) {
-                $criteria = new \Criteria('1', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($helper->getConfig('list_perpage'));
-            /* Active blogs */
-            } elseif (-1 == $category_id) {
-                $criteria = new \Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($helper->getConfig('list_perpage'));
-            /* Featured blogs */
-            } elseif (-2 == $category_id) {
-                $criteria = new \Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($helper->getConfig('list_perpage'));
-            /* Pending blogs */
-            } else {
-                $criteria = new \Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($helper->getConfig('list_perpage'));
-            }
-            $blog_count = $blogHandler->getCount($criteria);
-            $blog_objs  = $blogHandler->getAll($criteria);
-        }
-
-        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>';
-
-        $status = [
-            '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>
+    	case 'save':
+
+        	if ($blog_id) {
+            	$blog_obj = $blogHandler->get($blog_id);
+        	} else {
+            	if ($blog_exists = $blogHandler->getCount(new \Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
+                	redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
+            	}
+            	$blog_obj = $blogHandler->create();
+            	$blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
+        	}
+
+        	$blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
+        	$blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
+        	$blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
+        	$blog_obj->setVar('blog_feed', Request::getString('blog_feed', '', 'POST')); //$_POST['blog_feed']);
+        	$blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
+        	$blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
+        	$blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
+        	$blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
+        	$blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); //$_POST['blog_status']);
+
+        	if (!$blogHandler->insert($blog_obj)) {
+        	} elseif (!empty(Request::getArray('categories', [], 'POST'))) {
+            	$blog_id = $blog_obj->getVar('blog_id');
+            	if (in_array(0, Request::getArray('categories', [], 'POST'))) {
+                	$_POST['categories'] = [];
+            	}
+            	$blogHandler->setCategories($blog_id, Request::getArray('categories', [], 'POST'));
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php', 2, $message);
+
+    	/* fetch and add a list of blogs to a category */
+    	// no break
+    	case 'add':
+        	$links = PlanetUtility::planetParseLinks(Request::getArray('links', [], 'POST'));
+        	$blogs = [];
+        	foreach ($links as $link) {
+            	if ($blog_exist = $blogHandler->getCount(new \Criteria('blog_feed', $link['url']))) {
+                	continue;
+            	}
+            	$blog_obj = $blogHandler->fetch($link['url']);
+            	if (!empty($link['title'])) {
+                	$blog_obj->setVar('blog_title', $link['title']);
+            	}
+            	$blogHandler->insert($blog_obj);
+            	$blogs[] = $blog_obj->getVar('blog_id');
+            	unset($blog_obj);
+        	}
+        	if (!empty(Request::getArray('categories', [], 'POST'))) {
+            	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	foreach (Request::getArray('categories', [], 'POST') as $cat_id) {
+                	$categoryHandler->addBlogs($cat_id, $blogs);
+            	}
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php', 2, $message);
+
+    	/* update a list of blogs */
+    	// no break
+    	case 'update':
+        	foreach ($blog_id as $bid) {
+            	$blog_obj = $blogHandler->fetch($bid);
+            	if (!$blogHandler->insert($blog_obj)) {
+            	}
+            	unset($blog_obj);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* add a list of blogs to a category */
+    	// no break
+    	case 'register':
+        	if (!empty(Request::getArray('category_dest', [], 'POST'))) {
+            	if (!is_array($blog_id)) {
+                	$blog_id = [$blog_id];
+            	}
+            	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	$categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&amp;start=' . $start, 2, $message);
+
+    	/* remove a list of blogs from a category */
+    	// no break
+    	case 'remove':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	if (!empty($category_id)) {
+            	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	$categoryHandler->removeBlogs($category_id, $blog_id);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* delete a single blog or a list blogs */
+    	// no break
+    	case 'del':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	foreach ($blog_id as $bid) {
+            	$blog_obj = $blogHandler->get($bid);
+            	if (!$blogHandler->delete($blog_obj, true)) {
+            	}
+            	unset($blog_obj);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* empty a single blog or a list blogs */
+    	// no break
+    	case 'empty':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	foreach ($blog_id as $bid) {
+            	$blog_obj = $blogHandler->get($bid);
+            	if (!$blogHandler->do_empty($blog_obj)) {
+            	}
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* approve a single blog or a list blogs */
+    	// no break
+    	case 'approve':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	$criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        	$blogHandler->updateAll('blog_status', 1, $criteria, true);
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* mark a single blog or a list blogs as featured */
+    	// no break
+    	case 'feature':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	$criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        	$blogHandler->updateAll('blog_status', 2, $criteria, true);
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* edit a single blog */
+    	// no break
+    	case 'edit':
+        	if (!empty(Request::getString('fetch', '', 'POST'))) {
+            	$blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
+            	$blog_obj->setVar('blog_id', $blog_id);
+        	} else {
+            	$blog_obj = $blogHandler->get($blog_id);
+        	}
+        	$categories = Request::getArray('categories', [], 'POST');
+        	if (empty($categories) && $blog_id > 0) {
+            	$crit       = new \Criteria('bc.blog_id', $blog_id);
+            	$categories = array_keys($categoryHandler->getByBlog($crit));
+        	}
+        	if (empty($categories)) {
+            	$categories = [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 = $blogHandler->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:
+
+        	$crit = new \Criteria('1', 1);
+        	$crit->setSort('cat_order');
+        	$crit->setOrder('ASC');
+        	$categories = $categoryHandler->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 = [
+            	'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 = $blogHandler->getCountByCategory($criteria);
+            	$criteria->setStart($start);
+            	$criteria->setLimit($helper->getConfig('list_perpage'));
+            	$blog_objs = $blogHandler->getByCategory($criteria);
+        	} else {
+            	/* All active blogs */
+            	if (0 == $category_id) {
+                	$criteria = new \Criteria('1', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($helper->getConfig('list_perpage'));
+            	/* Active blogs */
+            	} elseif (-1 == $category_id) {
+                	$criteria = new \Criteria('blog_status', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($helper->getConfig('list_perpage'));
+            	/* Featured blogs */
+            	} elseif (-2 == $category_id) {
+                	$criteria = new \Criteria('blog_status', 2);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($helper->getConfig('list_perpage'));
+            	/* Pending blogs */
+            	} else {
+                	$criteria = new \Criteria('blog_status', 0);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($helper->getConfig('list_perpage'));
+            	}
+            	$blog_count = $blogHandler->getCount($criteria);
+            	$blog_objs  = $blogHandler->getAll($criteria);
+        	}
+
+        	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>';
+
+        	$status = [
+            	'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;
                       <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='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='pending'>" . planet_constant('AM_PENDING') . '</option>';
-        echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</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 > $helper->getConfig('list_perpage')) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new \XoopsPageNav($blog_count, $helper->getConfig('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'), 'post', true);
-            $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'), 'post', true);
-            $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 '</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 "<option value='pending'>" . planet_constant('AM_PENDING') . '</option>';
+        	echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</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 > $helper->getConfig('list_perpage')) {
+            	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+            	$nav     = new \XoopsPageNav($blog_count, $helper->getConfig('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'), 'post', true);
+            	$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'), 'post', true);
+            	$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;
 }
 
 xoops_cp_footer();

Spacing +63 added lines, -63 removed lines

@@ -29,8 +29,8 @@ 
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
-require_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -42,14 +42,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          = Request::getString('op', Request::getString('op', '', 'POST'), 'GET');//!empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
-$blog_id     = Request::getArray('blog', Request::getArray('blog', [], 'POST'), 'GET');//!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 = Request::getInt('category', Request::getInt('category', 0, 'POST'), 'GET');//(int)(!empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0));
-$start       = Request::getInt('start', Request::getInt('start', 0, 'POST'), 'GET');//(int)(!empty($_POST['start']) ? $_POST['start'] : (!empty($_GET['start']) ? $_GET['start'] : 0));
+$op          = Request::getString('op', Request::getString('op', '', 'POST'), 'GET'); //!empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
+$blog_id     = Request::getArray('blog', Request::getArray('blog', [], 'POST'), 'GET'); //!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 = Request::getInt('category', Request::getInt('category', 0, 'POST'), 'GET'); //(int)(!empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0));
+$start       = Request::getInt('start', Request::getInt('start', 0, 'POST'), 'GET'); //(int)(!empty($_POST['start']) ? $_POST['start'] : (!empty($_GET['start']) ? $_GET['start'] : 0));
 
 $blogHandler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -64,7 +64,7 @@ 
 
         if ($blog_id) {
             $blog_obj = $blogHandler->get($blog_id);
-        } else {
+        }else {
             if ($blog_exists = $blogHandler->getCount(new \Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
                 redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
             }
@@ -129,7 +129,7 @@ 
             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 */
     // no break
@@ -142,7 +142,7 @@ 
             $categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.Request::getArray('category_dest', [], 'POST').'&start='.$start, 2, $message);
 
     /* remove a list of blogs from a category */
     // no break
@@ -155,7 +155,7 @@ 
             $categoryHandler->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 */
     // no break
@@ -170,7 +170,7 @@ 
             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 */
     // no break
@@ -184,7 +184,7 @@ 
             }
         }
         $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 */
     // no break
@@ -192,10 +192,10 @@ 
         if (!is_array($blog_id)) {
             $blog_id = [$blog_id];
         }
-        $criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        $criteria = new \Criteria('blog_id', '('.implode(',', $blog_id).')', 'IN');
         $blogHandler->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 */
     // no break
@@ -203,10 +203,10 @@ 
         if (!is_array($blog_id)) {
             $blog_id = [$blog_id];
         }
-        $criteria = new \Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        $criteria = new \Criteria('blog_id', '('.implode(',', $blog_id).')', 'IN');
         $blogHandler->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 */
     // no break
@@ -214,11 +214,11 @@ 
         if (!empty(Request::getString('fetch', '', 'POST'))) {
             $blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
             $blog_obj->setVar('blog_id', $blog_id);
-        } else {
+        }else {
             $blog_obj = $blogHandler->get($blog_id);
         }
         $categories = Request::getArray('categories', [], 'POST');
-        if (empty($categories) && $blog_id > 0) {
+        if (empty($categories) && $blog_id>0) {
             $crit       = new \Criteria('bc.blog_id', $blog_id);
             $categories = array_keys($categoryHandler->getByBlog($crit));
         }
@@ -226,21 +226,21 @@ 
             $categories = [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 = $blogHandler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo '<div class="errorMsg">' . planet_constant('AM_BLOGEXISTS');
+            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;
 
@@ -268,14 +268,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 = $blogHandler->getCountByCategory($criteria);
             $criteria->setStart($start);
             $criteria->setLimit($helper->getConfig('list_perpage'));
             $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
+        }else {
             /* All active blogs */
             if (0 == $category_id) {
                 $criteria = new \Criteria('1', 1);
@@ -292,7 +292,7 @@ 
                 $criteria->setStart($start);
                 $criteria->setLimit($helper->getConfig('list_perpage'));
             /* Pending blogs */
-            } else {
+            }else {
                 $criteria = new \Criteria('blog_status', 0);
                 $criteria->setStart($start);
                 $criteria->setLimit($helper->getConfig('list_perpage'));
@@ -301,19 +301,19 @@ 
             $blog_objs  = $blogHandler->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 = [
@@ -323,53 +323,53 @@ 
         ];
         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 "<option value='pending'>" . planet_constant('AM_PENDING') . '</option>';
-        echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</option>';
+        echo "<option value='pending'>".planet_constant('AM_PENDING').'</option>';
+        echo "<option value='active'>".planet_constant('AM_ACTIVE').'</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 > $helper->getConfig('list_perpage')) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new \XoopsPageNav($blog_count, $helper->getConfig('list_perpage'), $start, 'start', 'category=' . $category_id);
+        if ($blog_count>$helper->getConfig('list_perpage')) {
+            include XOOPS_ROOT_PATH.'/class/pagenav.php';
+            $nav     = new \XoopsPageNav($blog_count, $helper->getConfig('list_perpage'), $start, 'start', '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;'>";
@@ -395,7 +395,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/admin.category.php

Indentation +129 added lines, -129 removed lines

@@ -41,136 +41,136 @@
 $blogHandler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 
 switch ($op) {
-    case 'save':
-        if ($cat_id) {
-            $category_obj = $categoryHandler->get($cat_id);
-        } else {
-            $category_obj = $categoryHandler->create();
-        }
-
-        $category_obj->setVar('cat_title', $_POST['cat_title']);
-        $category_obj->setVar('cat_order', $_POST['cat_order']);
-
-        if (!$categoryHandler->insert($category_obj)) {
-            $message = planet_constant('AM_ERROR');
-        } else {
-            $message = planet_constant('AM_DBUPDATED');
-        }
-        redirect_header('admin.category.php', 2, $message);
-
-        // no break
-    case 'del':
-        if (!is_array($cat_id)) {
-            $cat_id = [$cat_id];
-        }
-        foreach ($cat_id as $cid) {
-            $category_obj = $categoryHandler->get($cid);
-            if (!$categoryHandler->delete($category_obj)) {
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.category.php', 2, $message);
-
-        // no break
-    case 'order':
-        $count = count($_POST['cat_order']);
-        for ($i = 0; $i < $count; ++$i) {
-            $category_obj = $categoryHandler->get($_POST['cat'][$i]);
-            $category_obj->setVar('cat_order', $_POST['cat_order'][$i]);
-            $categoryHandler->insert($category_obj, true);
-            unset($category_obj);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.category.php', 2, $message);
-
-        // no break
-    case 'edit':
-        $category_obj = $categoryHandler->get($cat_id);
-        $form         = new \XoopsThemeForm(_EDIT, 'edit', xoops_getenv('PHP_SELF'), 'post', true);
-        $form->addElement(new \XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80, $category_obj->getVar('cat_title', 'E')), true);
-        $form->addElement(new \XoopsFormText(planet_constant('AM_ORDER'), 'cat_order', 5, 10, $category_obj->getVar('cat_order')), false);
-        $form->addElement(new \XoopsFormHidden('category', $cat_id));
-        $form->addElement(new \XoopsFormHidden('op', 'save'));
-
-        $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->addElement($button_tray);
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        $form->display();
-        echo '</fieldset>';
-        break;
-
-    default:
-        $crit = new \Criteria('1', 1);
-        $crit->setSort('cat_order');
-        $crit->setOrder('ASC');
-        $categories  = $categoryHandler->getList($crit);
-        $blog_counts = $blogHandler->getCountsByCategory();
-        foreach (array_keys($categories) as $cid) {
-            if (!empty($blog_counts[$cid])) {
-                $categories[$cid] .= ' (' . (int)$blog_counts[$cid] . ')';
-            }
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
-        echo '<br style="clear:both;">';
-
-        echo "<form name='list' method='post'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ORDER') . '</td>';
-        echo "<th align='left' class='bg3' width='80%'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_BLOGCOUNT') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ACTIONS') . '</td>';
-        //        echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
-
-        echo '</tr>';
-
-        $ii = 0;
-        foreach (array_keys($categories) as $cid) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td><input type='hidden' name='cat[]' value='" . $cid . "'>";
-            echo "<input type='text' name='cat_order[]' value='" . ($ii * 10) . "'></td>";
-            echo '<td>' . $categories[$cid] . '</td>';
-            echo "<td align='center'>" . @$blog_counts[$cid] . '</td>';
-
-            echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='" . $cid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . "' title='" . _EDIT . "' </a>&nbsp;
+	case 'save':
+		if ($cat_id) {
+			$category_obj = $categoryHandler->get($cat_id);
+		} else {
+			$category_obj = $categoryHandler->create();
+		}
+
+		$category_obj->setVar('cat_title', $_POST['cat_title']);
+		$category_obj->setVar('cat_order', $_POST['cat_order']);
+
+		if (!$categoryHandler->insert($category_obj)) {
+			$message = planet_constant('AM_ERROR');
+		} else {
+			$message = planet_constant('AM_DBUPDATED');
+		}
+		redirect_header('admin.category.php', 2, $message);
+
+		// no break
+	case 'del':
+		if (!is_array($cat_id)) {
+			$cat_id = [$cat_id];
+		}
+		foreach ($cat_id as $cid) {
+			$category_obj = $categoryHandler->get($cid);
+			if (!$categoryHandler->delete($category_obj)) {
+			}
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.category.php', 2, $message);
+
+		// no break
+	case 'order':
+		$count = count($_POST['cat_order']);
+		for ($i = 0; $i < $count; ++$i) {
+			$category_obj = $categoryHandler->get($_POST['cat'][$i]);
+			$category_obj->setVar('cat_order', $_POST['cat_order'][$i]);
+			$categoryHandler->insert($category_obj, true);
+			unset($category_obj);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.category.php', 2, $message);
+
+		// no break
+	case 'edit':
+		$category_obj = $categoryHandler->get($cat_id);
+		$form         = new \XoopsThemeForm(_EDIT, 'edit', xoops_getenv('PHP_SELF'), 'post', true);
+		$form->addElement(new \XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80, $category_obj->getVar('cat_title', 'E')), true);
+		$form->addElement(new \XoopsFormText(planet_constant('AM_ORDER'), 'cat_order', 5, 10, $category_obj->getVar('cat_order')), false);
+		$form->addElement(new \XoopsFormHidden('category', $cat_id));
+		$form->addElement(new \XoopsFormHidden('op', 'save'));
+
+		$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->addElement($button_tray);
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+		echo '<br>';
+		$form->display();
+		echo '</fieldset>';
+		break;
+
+	default:
+		$crit = new \Criteria('1', 1);
+		$crit->setSort('cat_order');
+		$crit->setOrder('ASC');
+		$categories  = $categoryHandler->getList($crit);
+		$blog_counts = $blogHandler->getCountsByCategory();
+		foreach (array_keys($categories) as $cid) {
+			if (!empty($blog_counts[$cid])) {
+				$categories[$cid] .= ' (' . (int)$blog_counts[$cid] . ')';
+			}
+		}
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+		echo '<br style="clear:both;">';
+
+		echo "<form name='list' method='post'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='5%'>" . planet_constant('AM_ORDER') . '</td>';
+		echo "<th align='left' class='bg3' width='80%'>" . planet_constant('AM_TITLE') . '</td>';
+		echo "<th class='bg3' width='5%'>" . planet_constant('AM_BLOGCOUNT') . '</td>';
+		echo "<th class='bg3' width='5%'>" . planet_constant('AM_ACTIONS') . '</td>';
+		//        echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
+
+		echo '</tr>';
+
+		$ii = 0;
+		foreach (array_keys($categories) as $cid) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td><input type='hidden' name='cat[]' value='" . $cid . "'>";
+			echo "<input type='text' name='cat_order[]' value='" . ($ii * 10) . "'></td>";
+			echo '<td>' . $categories[$cid] . '</td>';
+			echo "<td align='center'>" . @$blog_counts[$cid] . '</td>';
+
+			echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='" . $cid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . "' title='" . _EDIT . "' </a>&nbsp;
                   <a href='admin.category.php?op=del &amp;category='" . $cid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . "' title='" . _DELETE . "' </a></td>";
-            echo '</tr>';
-            ++$ii;
-        }
-        echo "<tr class='even' align='center'>";
-        echo "<td colspan='5'>";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
-        echo "<input name='' value='" . _CANCEL . "' type='reset'>";
-        echo "<input name='op' value='order' type='hidden'>";
-        echo '</td>';
-        echo '</tr>';
-        echo '</table></form>';
-        echo "</fieldset><br style='clear:both;'>";
-
-        $form = new \XoopsThemeForm(_ADD, 'mod', xoops_getenv('PHP_SELF'), 'post', true);
-        $form->addElement(new \XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80), true);
-        $form->addElement(new \XoopsFormText(planet_constant('AM_ORDER'), 'cat_order', 5, 10), false);
-        $form->addElement(new \XoopsFormHidden('op', 'save'));
-
-        $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->addElement($button_tray);
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
-        echo '<br>';
-        $form->display();
-        echo '</fieldset>';
-        break;
+			echo '</tr>';
+			++$ii;
+		}
+		echo "<tr class='even' align='center'>";
+		echo "<td colspan='5'>";
+		echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
+		echo "<input name='' value='" . _CANCEL . "' type='reset'>";
+		echo "<input name='op' value='order' type='hidden'>";
+		echo '</td>';
+		echo '</tr>';
+		echo '</table></form>';
+		echo "</fieldset><br style='clear:both;'>";
+
+		$form = new \XoopsThemeForm(_ADD, 'mod', xoops_getenv('PHP_SELF'), 'post', true);
+		$form->addElement(new \XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80), true);
+		$form->addElement(new \XoopsFormText(planet_constant('AM_ORDER'), 'cat_order', 5, 10), false);
+		$form->addElement(new \XoopsFormHidden('op', 'save'));
+
+		$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->addElement($button_tray);
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+		echo '<br>';
+		$form->display();
+		echo '</fieldset>';
+		break;
 }
 
 xoops_cp_footer();

Spacing +23 added lines, -23 removed lines

@@ -24,18 +24,18 @@ 
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-require_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
 $adminObject->displayNavigation(basename(__FILE__));
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //planet_adminmenu(1);
 
 $op     = !empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
 $cat_id = !empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0);
-$cat_id = is_array($cat_id) ? array_map('intval', $cat_id) : (int)$cat_id;
+$cat_id = is_array($cat_id) ? array_map('intval', $cat_id) : (int) $cat_id;
 
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 $blogHandler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
@@ -44,7 +44,7 @@ 
     case 'save':
         if ($cat_id) {
             $category_obj = $categoryHandler->get($cat_id);
-        } else {
+        }else {
             $category_obj = $categoryHandler->create();
         }
 
@@ -53,7 +53,7 @@ 
 
         if (!$categoryHandler->insert($category_obj)) {
             $message = planet_constant('AM_ERROR');
-        } else {
+        }else {
             $message = planet_constant('AM_DBUPDATED');
         }
         redirect_header('admin.category.php', 2, $message);
@@ -74,7 +74,7 @@ 
         // no break
     case 'order':
         $count = count($_POST['cat_order']);
-        for ($i = 0; $i < $count; ++$i) {
+        for ($i = 0; $i<$count; ++$i) {
             $category_obj = $categoryHandler->get($_POST['cat'][$i]);
             $category_obj->setVar('cat_order', $_POST['cat_order'][$i]);
             $categoryHandler->insert($category_obj, true);
@@ -99,7 +99,7 @@ 
         $button_tray->addElement($butt_cancel);
         $form->addElement($button_tray);
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._EDIT.'</legend>';
         echo '<br>';
         $form->display();
         echo '</fieldset>';
@@ -113,20 +113,20 @@ 
         $blog_counts = $blogHandler->getCountsByCategory();
         foreach (array_keys($categories) as $cid) {
             if (!empty($blog_counts[$cid])) {
-                $categories[$cid] .= ' (' . (int)$blog_counts[$cid] . ')';
+                $categories[$cid] .= ' ('.(int) $blog_counts[$cid].')';
             }
         }
 
-        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' method='post'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ORDER') . '</td>';
-        echo "<th align='left' class='bg3' width='80%'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_BLOGCOUNT') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ACTIONS') . '</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_ORDER').'</td>';
+        echo "<th align='left' class='bg3' width='80%'>".planet_constant('AM_TITLE').'</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_BLOGCOUNT').'</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_ACTIONS').'</td>';
         //        echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
 
         echo '</tr>';
@@ -134,20 +134,20 @@ 
         $ii = 0;
         foreach (array_keys($categories) as $cid) {
             echo "<tr class='odd' align='left'>";
-            echo "<td><input type='hidden' name='cat[]' value='" . $cid . "'>";
-            echo "<input type='text' name='cat_order[]' value='" . ($ii * 10) . "'></td>";
-            echo '<td>' . $categories[$cid] . '</td>';
-            echo "<td align='center'>" . @$blog_counts[$cid] . '</td>';
+            echo "<td><input type='hidden' name='cat[]' value='".$cid."'>";
+            echo "<input type='text' name='cat_order[]' value='".($ii*10)."'></td>";
+            echo '<td>'.$categories[$cid].'</td>';
+            echo "<td align='center'>".@$blog_counts[$cid].'</td>';
 
-            echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='" . $cid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . "' title='" . _EDIT . "' </a>&nbsp;
-                  <a href='admin.category.php?op=del &amp;category='" . $cid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . "' title='" . _DELETE . "' </a></td>";
+            echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='".$cid."' title='"._EDIT."'><img src='".$pathIcon16."/edit.png '"."alt='"._EDIT."' title='"._EDIT."' </a>&nbsp;
+                  <a href='admin.category.php?op=del &amp;category='" . $cid."' title='"._DELETE."'><img src='".$pathIcon16."/delete.png '"." alt='"._EDIT."' title='"._DELETE."' </a></td>";
             echo '</tr>';
             ++$ii;
         }
         echo "<tr class='even' align='center'>";
         echo "<td colspan='5'>";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
-        echo "<input name='' value='" . _CANCEL . "' type='reset'>";
+        echo "<input name='submit' value='"._SUBMIT."' type='submit'>";
+        echo "<input name='' value='"._CANCEL."' type='reset'>";
         echo "<input name='op' value='order' type='hidden'>";
         echo '</td>';
         echo '</tr>';
@@ -166,7 +166,7 @@ 
         $button_tray->addElement($butt_cancel);
         $form->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();
         echo '</fieldset>';

admin/admin_header.php

Indentation +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $xoopsTpl = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$xoopsTpl = new \XoopsTpl();
 }
 
 require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';

Spacing +5 added lines, -5 removed lines

@@ -20,9 +20,9 @@ 
 use XoopsModules\Planet;
 
 $path = dirname(dirname(dirname(__DIR__)));
-require_once $path . '/mainfile.php';
-require_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+require_once $path.'/mainfile.php';
+require_once $path.'/include/cp_functions.php';
+require_once $path.'/include/cp_header.php';
 // require_once __DIR__ . '/../class/Utility.php';
 
 // require_once __DIR__ . '/../class/Utility.php';
@@ -48,8 +48,8 @@ 
     $xoopsTpl = new \XoopsTpl();
 }
 
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/functions.php';
-require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php';
+require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
 
 planet_define_url_delimiter();

admin/admin.article.php

Indentation +13 added lines, -13 removed lines

@@ -46,18 +46,18 @@ 
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 if (!empty($helper->getConfig('article_expire'))) {
-    $criteria = new \Criteria('art_time', time() - $helper->getConfig('article_expire') * 60 * 60 * 24, '<');
-    if (!empty($_GET['purge'])) {
-        $crit = new \CriteriaCompo($criteria);
-        $crit->add(new \Criteria('art_comments', 0));
-        $article_expires = $articleHandler->getObjects($criteria);
-        foreach ($article_expires as $id => $article_obj) {
-            $articleHandler->delete($article_obj);
-        }
-    }
-    $article_count_expire = $articleHandler->getCount($criteria);
+	$criteria = new \Criteria('art_time', time() - $helper->getConfig('article_expire') * 60 * 60 * 24, '<');
+	if (!empty($_GET['purge'])) {
+		$crit = new \CriteriaCompo($criteria);
+		$crit->add(new \Criteria('art_comments', 0));
+		$article_expires = $articleHandler->getObjects($criteria);
+		foreach ($article_expires as $id => $article_obj) {
+			$articleHandler->delete($article_obj);
+		}
+	}
+	$article_count_expire = $articleHandler->getCount($criteria);
 } else {
-    $article_count_expire = 0;
+	$article_count_expire = 0;
 }
 $article_count = $articleHandler->getCount();
 
@@ -66,8 +66,8 @@ 
 echo '<br clear="all">' . planet_constant('AM_COUNT') . ': ' . $article_count;
 echo '<br clear="all">';
 if ($article_count_expire > 0) {
-    echo '<br clear="all"><a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/admin/admin.article.php?purge=1" >' . planet_constant('AM_EXPIRED') . ': ' . $article_count_expire . '</a>';
-    echo '<br clear="all">';
+	echo '<br clear="all"><a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/admin/admin.article.php?purge=1" >' . planet_constant('AM_EXPIRED') . ': ' . $article_count_expire . '</a>';
+	echo '<br clear="all">';
 }
 echo '</div>';
 echo '</fieldset><br clear="all">';

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -41,12 +41,12 @@ 
  * 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(3);
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 if (!empty($helper->getConfig('article_expire'))) {
-    $criteria = new \Criteria('art_time', time() - $helper->getConfig('article_expire') * 60 * 60 * 24, '<');
+    $criteria = new \Criteria('art_time', time()-$helper->getConfig('article_expire')*60*60*24, '<');
     if (!empty($_GET['purge'])) {
         $crit = new \CriteriaCompo($criteria);
         $crit->add(new \Criteria('art_comments', 0));
@@ -56,17 +56,17 @@ 
         }
     }
     $article_count_expire = $articleHandler->getCount($criteria);
-} else {
+}else {
     $article_count_expire = 0;
 }
 $article_count = $articleHandler->getCount();
 
-echo '<fieldset><legend style="font-weight: bold; color: #900;">' . planet_constant('AM_ARTICLES') . '</legend>';
+echo '<fieldset><legend style="font-weight: bold; color: #900;">'.planet_constant('AM_ARTICLES').'</legend>';
 echo '<div style="padding: 8px;">';
-echo '<br clear="all">' . planet_constant('AM_COUNT') . ': ' . $article_count;
+echo '<br clear="all">'.planet_constant('AM_COUNT').': '.$article_count;
 echo '<br clear="all">';
-if ($article_count_expire > 0) {
-    echo '<br clear="all"><a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/admin/admin.article.php?purge=1" >' . planet_constant('AM_EXPIRED') . ': ' . $article_count_expire . '</a>';
+if ($article_count_expire>0) {
+    echo '<br clear="all"><a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/admin/admin.article.php?purge=1" >'.planet_constant('AM_EXPIRED').': '.$article_count_expire.'</a>';
     echo '<br clear="all">';
 }
 echo '</div>';

admin/header.php

Spacing +3 added lines, -3 removed lines

@@ -25,10 +25,10 @@
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once __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';
-require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php';
+require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
 // require_once __DIR__ . '/../class/Utility.php';
 $moduleDirName = basename(dirname(__DIR__));
 // include the default language file for the admin interface

admin/about.php

Spacing +2 added lines, -2 removed lines

@@ -17,11 +17,11 @@
  * @author       XOOPS Development Team
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
 $adminObject::setPaypal('xoopsfoundation@gmail.com');
 $adminObject->displayAbout(false);
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

index.php

Indentation +164 added lines, -164 removed lines

@@ -30,13 +30,13 @@ 
 $helper = Planet\Helper::getInstance();
 
 if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['start'] = @$args_num[0];
-    $args['sort']  = @$args_str[0];
+	$args['start'] = @$args_num[0];
+	$args['sort']  = @$args_str[0];
 }
 
 /* Start */
@@ -54,20 +54,20 @@ 
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $args_REQUEST_URI = [];
-    $_args            = ['start', 'sort', 'uid', 'list'];
-    foreach ($_args as $arg) {
-        if (!empty(${$arg})) {
-            $args_REQUEST_URI[] = $arg . '=' . ${$arg};
-        }
-    }
-    if (!empty($blog_id)) {
-        $args_REQUEST_URI[] = 'blog=' . $blog_id;
-    }
-    if (!empty($category_id)) {
-        $args_REQUEST_URI[] = 'category=' . $category_id;
-    }
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($args_REQUEST_URI) ? '' : '?' . implode('&', $args_REQUEST_URI));
+	$args_REQUEST_URI = [];
+	$_args            = ['start', 'sort', 'uid', 'list'];
+	foreach ($_args as $arg) {
+		if (!empty(${$arg})) {
+			$args_REQUEST_URI[] = $arg . '=' . ${$arg};
+		}
+	}
+	if (!empty($blog_id)) {
+		$args_REQUEST_URI[] = 'blog=' . $blog_id;
+	}
+	if (!empty($category_id)) {
+		$args_REQUEST_URI[] = 'category=' . $category_id;
+	}
+	$_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($args_REQUEST_URI) ? '' : '?' . implode('&', $args_REQUEST_URI));
 }
 
 $GLOBALS['xoopsOption']['template_main'] = PlanetUtility::planetGetTemplate('index');
@@ -92,73 +92,73 @@ 
 $article_prefix = '';
 /* Specific category */
 if ($category_id > 0) {
-    $category_obj = $categoryHandler->get($category_id);
-    $criteria->add(new \Criteria('bc.cat_id', $category_id));
-    $uid            = 0;
-    $blog_id        = 0;
-    $category_data  = ['id' => $category_id, 'title' => $category_obj->getVar('cat_title')];
-    $query_type     = 'category';
-    $article_prefix = 'a.';
+	$category_obj = $categoryHandler->get($category_id);
+	$criteria->add(new \Criteria('bc.cat_id', $category_id));
+	$uid            = 0;
+	$blog_id        = 0;
+	$category_data  = ['id' => $category_id, 'title' => $category_obj->getVar('cat_title')];
+	$query_type     = 'category';
+	$article_prefix = 'a.';
 }
 /* Specific blog */
 if ($blog_id > 0) {
-    $blog_obj = $blogHandler->get($blog_id);
-    if ($blog_obj->getVar('blog_status')
-        || (is_object($xoopsUser)
-            && $xoopsUser->getVar('uid') == $blog_obj->getVar('blog_submitter'))) {
-        $criteria->add(new \Criteria('blog_id', $blog_id));
-        $category_id     = 0;
-        $uid             = 0;
-        $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-        $blog_data       = [
-            'id'    => $blog_id,
-            'title' => $blog_obj->getVar('blog_title'),
-            'image' => $blog_obj->getImage(),
-            'title' => $blog_obj->getVar('blog_title'),
-            'feed'  => $blog_obj->getVar('blog_feed'),
-            'link'  => $blog_obj->getVar('blog_link'),
-            'desc'  => $blog_obj->getVar('blog_desc'),
-            'time'  => $blog_obj->getTime(),
-            'star'  => $blog_obj->getStar(),
-            'rates' => $blog_obj->getVar('blog_rates'),
-            'marks' => $blog_obj->getVar('blog_marks')
-        ];
-    }
-    $query_type     = 'blog';
-    $article_prefix = '';
+	$blog_obj = $blogHandler->get($blog_id);
+	if ($blog_obj->getVar('blog_status')
+		|| (is_object($xoopsUser)
+			&& $xoopsUser->getVar('uid') == $blog_obj->getVar('blog_submitter'))) {
+		$criteria->add(new \Criteria('blog_id', $blog_id));
+		$category_id     = 0;
+		$uid             = 0;
+		$bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+		$blog_data       = [
+			'id'    => $blog_id,
+			'title' => $blog_obj->getVar('blog_title'),
+			'image' => $blog_obj->getImage(),
+			'title' => $blog_obj->getVar('blog_title'),
+			'feed'  => $blog_obj->getVar('blog_feed'),
+			'link'  => $blog_obj->getVar('blog_link'),
+			'desc'  => $blog_obj->getVar('blog_desc'),
+			'time'  => $blog_obj->getTime(),
+			'star'  => $blog_obj->getStar(),
+			'rates' => $blog_obj->getVar('blog_rates'),
+			'marks' => $blog_obj->getVar('blog_marks')
+		];
+	}
+	$query_type     = 'blog';
+	$article_prefix = '';
 }
 /* User bookmarks(favorites) */
 if ($uid > 0) {
-    $criteria->add(new \Criteria('bm.bm_uid', $uid));
-    $category_id     = 0;
-    $blog_id         = 0;
-    $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-    $user_data       = [
-        'uid'   => $uid,
-        'name'  => XoopsUser::getUnameFromId($uid),
-        'marks' => $bookmarkHandler->getCount(new \Criteria('bm_uid', $uid))
-    ];
-    $query_type      = 'bookmark';
-    $article_prefix  = 'a.';
+	$criteria->add(new \Criteria('bm.bm_uid', $uid));
+	$category_id     = 0;
+	$blog_id         = 0;
+	$bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+	$user_data       = [
+		'uid'   => $uid,
+		'name'  => XoopsUser::getUnameFromId($uid),
+		'marks' => $bookmarkHandler->getCount(new \Criteria('bm_uid', $uid))
+	];
+	$query_type      = 'bookmark';
+	$article_prefix  = 'a.';
 }
 
 /* Sort */
 $order = 'DESC';
 $sort  = empty($sort) ? 'time' : $sort;
 switch ($sort) {
-    case 'views':
-        $sortby = $article_prefix . 'art_views';
-        break;
-    case 'rating':
-        $sortby = $article_prefix . 'art_rating';
-        break;
-    case 'time':
-        $sortby = $article_prefix . 'art_time';
-        break;
-    case 'default':
-    default:
-        $sortby = '';
-        break;
+	case 'views':
+		$sortby = $article_prefix . 'art_views';
+		break;
+	case 'rating':
+		$sortby = $article_prefix . 'art_rating';
+		break;
+	case 'time':
+		$sortby = $article_prefix . 'art_time';
+		break;
+	case 'default':
+	default:
+		$sortby = '';
+		break;
 }
 $criteria->setSort($sortby);
 $criteria->setOrder($order);
@@ -166,120 +166,120 @@ 
 $criteria->setLimit($limit);
 
 $tags = empty($list) ? '' : [
-    $article_prefix . 'art_title',
-    $article_prefix . 'blog_id',
-    $article_prefix . 'art_time'
+	$article_prefix . 'art_title',
+	$article_prefix . 'blog_id',
+	$article_prefix . 'art_time'
 ];
 switch ($query_type) {
-    case 'category':
-        $articles_obj  = $articleHandler->getByCategory($criteria, $tags);
-        $count_article = $articleHandler->getCountByCategory($criteria);
-        break;
-    case 'bookmark':
-        $articles_obj  = $articleHandler->getByBookmark($criteria, $tags);
-        $count_article = $articleHandler->getCountByBookmark($criteria);
-        break;
-    default:
-        $articles_obj  = $articleHandler->getAll($criteria, $tags);
-        $count_article = $articleHandler->getCount($criteria);
-        break;
+	case 'category':
+		$articles_obj  = $articleHandler->getByCategory($criteria, $tags);
+		$count_article = $articleHandler->getCountByCategory($criteria);
+		break;
+	case 'bookmark':
+		$articles_obj  = $articleHandler->getByBookmark($criteria, $tags);
+		$count_article = $articleHandler->getCountByBookmark($criteria);
+		break;
+	default:
+		$articles_obj  = $articleHandler->getAll($criteria, $tags);
+		$count_article = $articleHandler->getCount($criteria);
+		break;
 }
 
 if (!empty($blog_data)) {
-    $blogs[$blog_data['id']] = $blog_data['title'];
+	$blogs[$blog_data['id']] = $blog_data['title'];
 } else {
-    $blog_array = [];
-    foreach (array_keys($articles_obj) as $id) {
-        $blog_array[$articles_obj[$id]->getVar('blog_id')] = 1;
-    }
-    $criteria_blog = new \Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
-    $blogs         = $blogHandler->getList($criteria_blog);
+	$blog_array = [];
+	foreach (array_keys($articles_obj) as $id) {
+		$blog_array[$articles_obj[$id]->getVar('blog_id')] = 1;
+	}
+	$criteria_blog = new \Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
+	$blogs         = $blogHandler->getList($criteria_blog);
 }
 
 /* Objects to array */
 $articles = [];
 foreach (array_keys($articles_obj) as $id) {
-    $_article = [
-        'id'    => $id,
-        'title' => $articles_obj[$id]->getVar('art_title'),
-        'time'  => $articles_obj[$id]->getTime(),
-        'blog'  => [
-            'id'    => $articles_obj[$id]->getVar('blog_id'),
-            'title' => $blogs[$articles_obj[$id]->getVar('blog_id')]
-        ]
-    ];
-    if (empty($list)) {
-        $_article = array_merge($_article, [
-            'author'   => $articles_obj[$id]->getVar('art_author'),
-            'views'    => $articles_obj[$id]->getVar('art_views'),
-            'comments' => $articles_obj[$id]->getVar('art_comments'),
-            'star'     => $articles_obj[$id]->getStar(),
-            'rates'    => $articles_obj[$id]->getVar('art_rates')
-        ]);
-        if (!empty($helper->getConfig('display_summary'))) {
-            $_article['content'] = $articles_obj[$id]->getSummary();
-        } else {
-            $_article['content'] = $articles_obj[$id]->getVar('art_content');
-        }
-    }
-    $articles[] = $_article;
-    unset($_article);
+	$_article = [
+		'id'    => $id,
+		'title' => $articles_obj[$id]->getVar('art_title'),
+		'time'  => $articles_obj[$id]->getTime(),
+		'blog'  => [
+			'id'    => $articles_obj[$id]->getVar('blog_id'),
+			'title' => $blogs[$articles_obj[$id]->getVar('blog_id')]
+		]
+	];
+	if (empty($list)) {
+		$_article = array_merge($_article, [
+			'author'   => $articles_obj[$id]->getVar('art_author'),
+			'views'    => $articles_obj[$id]->getVar('art_views'),
+			'comments' => $articles_obj[$id]->getVar('art_comments'),
+			'star'     => $articles_obj[$id]->getStar(),
+			'rates'    => $articles_obj[$id]->getVar('art_rates')
+		]);
+		if (!empty($helper->getConfig('display_summary'))) {
+			$_article['content'] = $articles_obj[$id]->getSummary();
+		} else {
+			$_article['content'] = $articles_obj[$id]->getVar('art_content');
+		}
+	}
+	$articles[] = $_article;
+	unset($_article);
 }
 unset($articles_obj);
 
 if ($count_article > $limit) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
-    $start_link = [];
-    if ($sort) {
-        $start_link[] = 'sort=' . $sort;
-    }
-    if ($category_id) {
-        $start_link[] = 'category=' . $category_id;
-    }
-    if ($blog_id) {
-        $start_link[] = 'blog=' . $blog_id;
-    }
-    if ($list) {
-        $start_link[] = 'list=' . $list;
-    }
-    $nav     = new \XoopsPageNav($count_article, $limit, $start, 'start', implode('&', $start_link));
-    $pagenav = $nav->renderNav(4);
+	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+	$start_link = [];
+	if ($sort) {
+		$start_link[] = 'sort=' . $sort;
+	}
+	if ($category_id) {
+		$start_link[] = 'category=' . $category_id;
+	}
+	if ($blog_id) {
+		$start_link[] = 'blog=' . $blog_id;
+	}
+	if ($list) {
+		$start_link[] = 'list=' . $list;
+	}
+	$nav     = new \XoopsPageNav($count_article, $limit, $start, 'start', implode('&', $start_link));
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 $xoopsTpl->assign('dirname', $GLOBALS['moddirname']);
 
 if ($category_id || $blog_id || $uid) {
-    $xoopsTpl->assign('link_index', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php" title="' . planet_constant('MD_INDEX') . '" target="_self">' . planet_constant('MD_INDEX') . '</a>');
+	$xoopsTpl->assign('link_index', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php" title="' . planet_constant('MD_INDEX') . '" target="_self">' . planet_constant('MD_INDEX') . '</a>');
 }
 
 $link_switch = '<a href="'
-               . XOOPS_URL
-               . '/modules/'
-               . $GLOBALS['moddirname']
-               . '/index.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
-               . (empty($blog_id) ? '' : '/b' . $blog_id)
-               . (empty($list) ? '/l1' : '')
-               . '" title="'
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . '">'
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
-               . '</a>';
+			   . XOOPS_URL
+			   . '/modules/'
+			   . $GLOBALS['moddirname']
+			   . '/index.php'
+			   . (empty($category_id) ? '' : '/c' . $category_id)
+			   . (empty($uid) ? '' : '/u' . $uid)
+			   . (empty($blog_id) ? '' : '/b' . $blog_id)
+			   . (empty($list) ? '/l1' : '')
+			   . '" title="'
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . '">'
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
+			   . '</a>';
 $xoopsTpl->assign('link_switch', $link_switch);
 
 $link_blogs = '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . '" title="' . planet_constant('MD_BLOGS') . '">' . planet_constant('MD_BLOGS') . '</a>';
 $xoopsTpl->assign('link_blogs', $link_blogs);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . '" title="' . planet_constant('MD_BOOKMARKS') . '" target="_self">' . planet_constant('MD_BOOKMARKS') . '</a>');
+	$xoopsTpl->assign('link_bookmark', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . '" title="' . planet_constant('MD_BOOKMARKS') . '" target="_self">' . planet_constant('MD_BOOKMARKS') . '</a>');
 }
 
 if (1 == $helper->getConfig('newblog_submit') || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/action.blog.php" title="' . _SUBMIT . '" target="_blank">' . _SUBMIT . '</a>');
+	$xoopsTpl->assign('link_submit', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/action.blog.php" title="' . _SUBMIT . '" target="_blank">' . _SUBMIT . '</a>');
 }
 
 $xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_ARTICLES'));
@@ -293,22 +293,22 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
 } elseif ($blog_id > 0) {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 $sort_link   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . (empty($blog_id) ? '' : '/b' . $blog_id) . (empty($list) ? '' : '/l1');
 $valid_sorts = [
-    'views'   => planet_constant('MD_VIEWS'),
-    'rating'  => planet_constant('MD_RATING'),
-    'time'    => planet_constant('MD_TIME'),
-    'default' => planet_constant('MD_DEFAULT')
+	'views'   => planet_constant('MD_VIEWS'),
+	'rating'  => planet_constant('MD_RATING'),
+	'time'    => planet_constant('MD_TIME'),
+	'default' => planet_constant('MD_DEFAULT')
 ];
 $sortlinks   = [];
 foreach ($valid_sorts as $val => $name) {
-    if ($val == $sort) {
-        continue;
-    }
-    $sortlinks[] = '<a href="' . $sort_link . '/' . $val . '">' . $name . '</a>';
+	if ($val == $sort) {
+		continue;
+	}
+	$sortlinks[] = '<a href="' . $sort_link . '/' . $val . '">' . $name . '</a>';
 }
 $xoopsTpl->assign('link_sort', implode(' | ', $sortlinks));
 $xoopsTpl->assign('version', $xoopsModule->getVar('version'));
@@ -317,8 +317,8 @@ 
 
 // for notification
 if (!empty($blog_id)) {
-    //$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php";
-    $_GET['blog'] = $blog_id;
+	//$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php";
+	$_GET['blog'] = $blog_id;
 }
 
 require_once __DIR__ . '/footer.php';

Spacing +48 added lines, -48 removed lines

@@ -24,13 +24,13 @@ 
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 use XoopsModules\Planet;
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
 if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
+    include XOOPS_ROOT_PATH.'/include/notification_update.php';
     exit();
 }
 
@@ -40,17 +40,17 @@ 
 }
 
 /* Start */
-$start = (int)(empty($_GET['start']) ? @$args['start'] : $_GET['start']);
+$start = (int) (empty($_GET['start']) ? @$args['start'] : $_GET['start']);
 /* Specified Category */
-$category_id = (int)(empty($_GET['category']) ? @$args['category'] : $_GET['category']);
+$category_id = (int) (empty($_GET['category']) ? @$args['category'] : $_GET['category']);
 /* Specified Blog */
-$blog_id = (int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
+$blog_id = (int) (empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
 /* Specified Bookmar(Favorite) UID */
-$uid = (int)(empty($_GET['uid']) ? @$args['uid'] : $_GET['uid']);
+$uid = (int) (empty($_GET['uid']) ? @$args['uid'] : $_GET['uid']);
 /* Sort by term */
 $sort = empty($_GET['sort']) ? @$args['sort'] : $_GET['sort'];
 /* Display as list */
-$list = (int)(empty($_GET['list']) ? @$args['list'] : $_GET['list']);
+$list = (int) (empty($_GET['list']) ? @$args['list'] : $_GET['list']);
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
@@ -58,28 +58,28 @@ 
     $_args            = ['start', 'sort', 'uid', 'list'];
     foreach ($_args as $arg) {
         if (!empty(${$arg})) {
-            $args_REQUEST_URI[] = $arg . '=' . ${$arg};
+            $args_REQUEST_URI[] = $arg.'='.${$arg};
         }
     }
     if (!empty($blog_id)) {
-        $args_REQUEST_URI[] = 'blog=' . $blog_id;
+        $args_REQUEST_URI[] = 'blog='.$blog_id;
     }
     if (!empty($category_id)) {
-        $args_REQUEST_URI[] = 'category=' . $category_id;
+        $args_REQUEST_URI[] = 'category='.$category_id;
     }
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($args_REQUEST_URI) ? '' : '?' . implode('&', $args_REQUEST_URI));
+    $_SERVER['REQUEST_URI'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.(empty($args_REQUEST_URI) ? '' : '?'.implode('&', $args_REQUEST_URI));
 }
 
 $GLOBALS['xoopsOption']['template_main'] = PlanetUtility::planetGetTemplate('index');
 $xoops_module_header                     = '
-    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . ' rss" href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."rss/c' . $category_id . '/b' . $blog_id . '/u' . $uid . '">
-    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . ' rdf" href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."rdf/c' . $category_id . '/b' . $blog_id . '/u' . $uid . '">
-    <link rel="alternate" type="application/atom+xml" title="' . $xoopsModule->getVar('name') . ' atom" href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."atom/c' . $category_id . '/b' . $blog_id . '/u' . $uid . '">
+    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name').' rss" href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php".URL_DELIMITER."rss/c'.$category_id.'/b'.$blog_id.'/u'.$uid.'">
+    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name').' rdf" href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php".URL_DELIMITER."rdf/c'.$category_id.'/b'.$blog_id.'/u'.$uid.'">
+    <link rel="alternate" type="application/atom+xml" title="' . $xoopsModule->getVar('name').' atom" href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php".URL_DELIMITER."atom/c'.$category_id.'/b'.$blog_id.'/u'.$uid.'">
     ';
 
 $xoopsOption['xoops_module_header'] = $xoops_module_header;
-require_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 // Following part will not be executed after cache
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -91,7 +91,7 @@ 
 $criteria       = new \CriteriaCompo();
 $article_prefix = '';
 /* Specific category */
-if ($category_id > 0) {
+if ($category_id>0) {
     $category_obj = $categoryHandler->get($category_id);
     $criteria->add(new \Criteria('bc.cat_id', $category_id));
     $uid            = 0;
@@ -101,7 +101,7 @@ 
     $article_prefix = 'a.';
 }
 /* Specific blog */
-if ($blog_id > 0) {
+if ($blog_id>0) {
     $blog_obj = $blogHandler->get($blog_id);
     if ($blog_obj->getVar('blog_status')
         || (is_object($xoopsUser)
@@ -128,7 +128,7 @@ 
     $article_prefix = '';
 }
 /* User bookmarks(favorites) */
-if ($uid > 0) {
+if ($uid>0) {
     $criteria->add(new \Criteria('bm.bm_uid', $uid));
     $category_id     = 0;
     $blog_id         = 0;
@@ -147,13 +147,13 @@ 
 $sort  = empty($sort) ? 'time' : $sort;
 switch ($sort) {
     case 'views':
-        $sortby = $article_prefix . 'art_views';
+        $sortby = $article_prefix.'art_views';
         break;
     case 'rating':
-        $sortby = $article_prefix . 'art_rating';
+        $sortby = $article_prefix.'art_rating';
         break;
     case 'time':
-        $sortby = $article_prefix . 'art_time';
+        $sortby = $article_prefix.'art_time';
         break;
     case 'default':
     default:
@@ -166,9 +166,9 @@ 
 $criteria->setLimit($limit);
 
 $tags = empty($list) ? '' : [
-    $article_prefix . 'art_title',
-    $article_prefix . 'blog_id',
-    $article_prefix . 'art_time'
+    $article_prefix.'art_title',
+    $article_prefix.'blog_id',
+    $article_prefix.'art_time'
 ];
 switch ($query_type) {
     case 'category':
@@ -187,12 +187,12 @@ 
 
 if (!empty($blog_data)) {
     $blogs[$blog_data['id']] = $blog_data['title'];
-} else {
+}else {
     $blog_array = [];
     foreach (array_keys($articles_obj) as $id) {
         $blog_array[$articles_obj[$id]->getVar('blog_id')] = 1;
     }
-    $criteria_blog = new \Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
+    $criteria_blog = new \Criteria('blog_id', '('.implode(',', array_keys($blog_array)).')', 'IN');
     $blogs         = $blogHandler->getList($criteria_blog);
 }
 
@@ -218,7 +218,7 @@ 
         ]);
         if (!empty($helper->getConfig('display_summary'))) {
             $_article['content'] = $articles_obj[$id]->getSummary();
-        } else {
+        }else {
             $_article['content'] = $articles_obj[$id]->getVar('art_content');
         }
     }
@@ -227,24 +227,24 @@ 
 }
 unset($articles_obj);
 
-if ($count_article > $limit) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
+if ($count_article>$limit) {
+    include XOOPS_ROOT_PATH.'/class/pagenav.php';
     $start_link = [];
     if ($sort) {
-        $start_link[] = 'sort=' . $sort;
+        $start_link[] = 'sort='.$sort;
     }
     if ($category_id) {
-        $start_link[] = 'category=' . $category_id;
+        $start_link[] = 'category='.$category_id;
     }
     if ($blog_id) {
-        $start_link[] = 'blog=' . $blog_id;
+        $start_link[] = 'blog='.$blog_id;
     }
     if ($list) {
-        $start_link[] = 'list=' . $list;
+        $start_link[] = 'list='.$list;
     }
     $nav     = new \XoopsPageNav($count_article, $limit, $start, 'start', implode('&amp;', $start_link));
     $pagenav = $nav->renderNav(4);
-} else {
+}else {
     $pagenav = '';
 }
 
@@ -252,7 +252,7 @@ 
 $xoopsTpl->assign('dirname', $GLOBALS['moddirname']);
 
 if ($category_id || $blog_id || $uid) {
-    $xoopsTpl->assign('link_index', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php" title="' . planet_constant('MD_INDEX') . '" target="_self">' . planet_constant('MD_INDEX') . '</a>');
+    $xoopsTpl->assign('link_index', '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php" title="'.planet_constant('MD_INDEX').'" target="_self">'.planet_constant('MD_INDEX').'</a>');
 }
 
 $link_switch = '<a href="'
@@ -260,9 +260,9 @@ 
                . '/modules/'
                . $GLOBALS['moddirname']
                . '/index.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
-               . (empty($blog_id) ? '' : '/b' . $blog_id)
+               . (empty($category_id) ? '' : '/c'.$category_id)
+               . (empty($uid) ? '' : '/u'.$uid)
+               . (empty($blog_id) ? '' : '/b'.$blog_id)
                . (empty($list) ? '/l1' : '')
                . '" title="'
                . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
@@ -271,18 +271,18 @@ 
                . '</a>';
 $xoopsTpl->assign('link_switch', $link_switch);
 
-$link_blogs = '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . '" title="' . planet_constant('MD_BLOGS') . '">' . planet_constant('MD_BLOGS') . '</a>';
+$link_blogs = '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.blogs.php'.(empty($category_id) ? '' : '/c'.$category_id).(empty($uid) ? '' : '/u'.$uid).'" title="'.planet_constant('MD_BLOGS').'">'.planet_constant('MD_BLOGS').'</a>';
 $xoopsTpl->assign('link_blogs', $link_blogs);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . '" title="' . planet_constant('MD_BOOKMARKS') . '" target="_self">' . planet_constant('MD_BOOKMARKS') . '</a>');
+    $xoopsTpl->assign('link_bookmark', '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$xoopsUser->getVar('uid').'" title="'.planet_constant('MD_BOOKMARKS').'" target="_self">'.planet_constant('MD_BOOKMARKS').'</a>');
 }
 
 if (1 == $helper->getConfig('newblog_submit') || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit', '<a href="' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/action.blog.php" title="' . _SUBMIT . '" target="_blank">' . _SUBMIT . '</a>');
+    $xoopsTpl->assign('link_submit', '<a href="'.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/action.blog.php" title="'._SUBMIT.'" target="_blank">'._SUBMIT.'</a>');
 }
 
-$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_ARTICLES'));
+$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name').'::'.planet_constant('MD_ARTICLES'));
 $xoopsTpl->assign('category', @$category_data);
 $xoopsTpl->assign('blog', @$blog_data);
 $xoopsTpl->assign('user', @$user_data);
@@ -292,23 +292,23 @@ 
 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
-} elseif ($blog_id > 0) {
+} elseif ($blog_id>0) {
     $xoopsTpl->assign('canrate', 1);
 }
 
-$sort_link   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . (empty($blog_id) ? '' : '/b' . $blog_id) . (empty($list) ? '' : '/l1');
+$sort_link   = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.(empty($category_id) ? '' : '/c'.$category_id).(empty($uid) ? '' : '/u'.$uid).(empty($blog_id) ? '' : '/b'.$blog_id).(empty($list) ? '' : '/l1');
 $valid_sorts = [
     'views'   => planet_constant('MD_VIEWS'),
     'rating'  => planet_constant('MD_RATING'),
     'time'    => planet_constant('MD_TIME'),
     'default' => planet_constant('MD_DEFAULT')
 ];
-$sortlinks   = [];
+$sortlinks = [];
 foreach ($valid_sorts as $val => $name) {
     if ($val == $sort) {
         continue;
     }
-    $sortlinks[] = '<a href="' . $sort_link . '/' . $val . '">' . $name . '</a>';
+    $sortlinks[] = '<a href="'.$sort_link.'/'.$val.'">'.$name.'</a>';
 }
 $xoopsTpl->assign('link_sort', implode(' | ', $sortlinks));
 $xoopsTpl->assign('version', $xoopsModule->getVar('version'));
@@ -321,4 +321,4 @@ 
     $_GET['blog'] = $blog_id;
 }
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

include/common.php

Spacing +10 added lines, -10 removed lines

@@ -22,19 +22,19 @@
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 define('NEWBB_DIRNAME', basename(dirname(__DIR__)));
-define('NEWBB_URL', XOOPS_URL . '/modules/' . NEWBB_DIRNAME);
-define('NEWBB_PATH', XOOPS_ROOT_PATH . '/modules/' . NEWBB_DIRNAME);
-define('NEWBB_IMAGES_URL', NEWBB_URL . '/assets/images');
-define('NEWBB_ADMIN_URL', NEWBB_URL . '/admin');
-define('NEWBB_ADMIN_PATH', NEWBB_PATH . '/admin/index.php');
-define('NEWBB_ROOT_PATH', $GLOBALS['xoops']->path('modules/' . NEWBB_DIRNAME));
-define('NEWBB_AUTHOR_LOGOIMG', NEWBB_URL . '/assets/images/logo_module.png');
-define('NEWBB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
-define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
+define('NEWBB_URL', XOOPS_URL.'/modules/'.NEWBB_DIRNAME);
+define('NEWBB_PATH', XOOPS_ROOT_PATH.'/modules/'.NEWBB_DIRNAME);
+define('NEWBB_IMAGES_URL', NEWBB_URL.'/assets/images');
+define('NEWBB_ADMIN_URL', NEWBB_URL.'/admin');
+define('NEWBB_ADMIN_PATH', NEWBB_PATH.'/admin/index.php');
+define('NEWBB_ROOT_PATH', $GLOBALS['xoops']->path('modules/'.NEWBB_DIRNAME));
+define('NEWBB_AUTHOR_LOGOIMG', NEWBB_URL.'/assets/images/logo_module.png');
+define('NEWBB_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.NEWBB_DIRNAME); // WITHOUT Trailing slash
+define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.NEWBB_DIRNAME); // WITHOUT Trailing slash
 
 // module information
 $mod_copyright = "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . NEWBB_AUTHOR_LOGOIMG . "' alt='XOOPS Project'></a>";
+                     <img src='" . NEWBB_AUTHOR_LOGOIMG."' alt='XOOPS Project'></a>";
 
 xoops_loadLanguage('common', NEWBB_DIRNAME);