mambax7 / planet

include/action.module.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-include __DIR__ . '/vars.php';
+include __DIR__.'/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 PlanetUtility::planetParseFunction('

view.article.php

Indentation +29 added lines, -29 removed lines

@@ -34,17 +34,17 @@ 
  *
  */
 if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {//$_SERVER['REQUEST_URI']
-    header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
-    exit();
+	header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
+	exit();
 }
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $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['article'] = @$args_num[0];
-    $args['blog']    = @$args['blog'];
+	$args['article'] = @$args_num[0];
+	$args['blog']    = @$args['blog'];
 }
 
 $article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
@@ -57,7 +57,7 @@ 
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
+	$_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
 }
 
 $xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title');
@@ -66,29 +66,29 @@ 
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
 
 $article_data = [
-    'id'       => $article_id,
-    'title'    => $article_obj->getVar('art_title'),
-    'content'  => $article_obj->getVar('art_content'),
-    'author'   => $article_obj->getVar('art_author'),
-    'time'     => $article_obj->getTime(),
-    'link'     => $article_obj->getVar('art_link'),
-    'views'    => $article_obj->getVar('art_views'),
-    'comments' => $article_obj->getVar('art_comments'),
-    'star'     => $article_obj->getStar(),
-    'rates'    => $article_obj->getVar('art_rates'),
-    'blog'     => ['id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title')]
+	'id'       => $article_id,
+	'title'    => $article_obj->getVar('art_title'),
+	'content'  => $article_obj->getVar('art_content'),
+	'author'   => $article_obj->getVar('art_author'),
+	'time'     => $article_obj->getTime(),
+	'link'     => $article_obj->getVar('art_link'),
+	'views'    => $article_obj->getVar('art_views'),
+	'comments' => $article_obj->getVar('art_comments'),
+	'star'     => $article_obj->getStar(),
+	'rates'    => $article_obj->getVar('art_rates'),
+	'blog'     => ['id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title')]
 ];
 
 if (!empty($xoopsModuleConfig['do_sibling'])) {
-    $articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
-    if (!empty($articles_sibling['previous'])) {
-        $articles_sibling['previous']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
-        $articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
-    }
-    if (!empty($articles_sibling['next'])) {
-        $articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
-        $articles_sibling['next']['title'] = $articles_sibling['next']['title'];
-    }
+	$articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
+	if (!empty($articles_sibling['previous'])) {
+		$articles_sibling['previous']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
+		$articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
+	}
+	if (!empty($articles_sibling['next'])) {
+		$articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
+		$articles_sibling['next']['title'] = $articles_sibling['next']['title'];
+	}
 }
 
 $xoopsTpl->assign('modulename', $xoopsModule->getVar('name'));
@@ -99,11 +99,11 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
 } else {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') {
-    $xoopsTpl->assign('transfer', $transferbar);
+	$xoopsTpl->assign('transfer', $transferbar);
 }
 
 // Loading module meta data, NOT THE RIGHT WAY DOING IT

Spacing +15 added lines, -15 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 /**
  * The comment detection scripts should be removed once absolute url is used in comment_view.php
@@ -34,11 +34,11 @@ 
  *
  */
 if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {//$_SERVER['REQUEST_URI']
-    header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
+    header('location: '.XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].$matches[1]);
     exit();
 }
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
+    include XOOPS_ROOT_PATH.'/include/notification_update.php';
     exit();
 }
 
@@ -47,8 +47,8 @@ 
     $args['blog']    = @$args['blog'];
 }
 
-$article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
-$blog_id    = Request::getInt('blog', @$args['blog'], 'POST');//(int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
+$article_id = Request::getInt('article', @$args['article'], 'POST'); //(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+$blog_id    = Request::getInt('blog', @$args['blog'], 'POST'); //(int)(empty($_GET['blog']) ? @$args['blog'] : $_GET['blog']);
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $blogHandler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
@@ -57,13 +57,13 @@ 
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . (empty($article_id) ? '' : '?article=' . $article_id);
+    $_SERVER['REQUEST_URI'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.(empty($article_id) ? '' : '?article='.$article_id);
 }
 
-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title');
+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.$article_obj->getVar('art_title');
 $xoopsOption['template_main']   = PlanetUtility::planetGetTemplate('article');
-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';
 
 $article_data = [
     'id'       => $article_id,
@@ -82,11 +82,11 @@ 
 if (!empty($xoopsModuleConfig['do_sibling'])) {
     $articles_sibling = $articleHandler->getSibling($article_obj, $blog_id);
     if (!empty($articles_sibling['previous'])) {
-        $articles_sibling['previous']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b' . $blog_id;
+        $articles_sibling['previous']['url']   = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_sibling['previous']['id'].'/b'.$blog_id;
         $articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
     }
     if (!empty($articles_sibling['next'])) {
-        $articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
+        $articles_sibling['next']['url']   = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_sibling['next']['id'].'/b'.$blog_id;
         $articles_sibling['next']['title'] = $articles_sibling['next']['title'];
     }
 }
@@ -98,11 +98,11 @@ 
 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
-} else {
+}else {
     $xoopsTpl->assign('canrate', 1);
 }
 
-if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') {
+if ($transferbar = @include XOOPS_ROOT_PATH.'/Frameworks/transfer/bar.transfer.php') {
     $xoopsTpl->assign('transfer', $transferbar);
 }
 
@@ -112,6 +112,6 @@ 
 // for comment and notification
 //$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/view.article.php";
 $_GET['article'] = $article_id;
-include XOOPS_ROOT_PATH . '/include/comment_view.php';
+include XOOPS_ROOT_PATH.'/include/comment_view.php';
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

action.blog.php

Indentation +107 added lines, -107 removed lines

@@ -33,15 +33,15 @@ 
 $blog_id = is_array($blog_id) ? array_map('intval', $blog_id) : (int)$blog_id;
 
 if (empty($xoopsModuleConfig['newblog_submit']) && (!is_object($xoopsUser) || !$xoopsUser->isAdmin())) {
-    redirect_header('index.php', 2, _NOPERM);
+	redirect_header('index.php', 2, _NOPERM);
 }
 
 if ('save' === $op && !empty(Request::getString('fetch', '', 'POST'))) {//!empty($_POST['fetch'])) {
-    $op = 'edit';
+	$op = 'edit';
 }
 
 if ('save' === $op && !$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
 }
 include XOOPS_ROOT_PATH . '/header.php';
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
@@ -50,110 +50,110 @@ 
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 switch ($op) {
-    /* save a single blog */
-    case 'save':
-
-        if ($blog_id) {
-            $blog_obj = $blogHandler->get($blog_id);
-            if ($xoopsUser->isAdmin()) {
-                $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST'));// @$_POST['blog_status']);
-            }
-        } else {
-            if ($blog_exists = $blogHandler->getCount(new Criteria('blog_feed', $myts->addSlashes(trim(Request::getText('blog_feed', '', 'POST')))))  //$_POST['blog_feed']))))
-            ) {
-                redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
-            }
-
-            $blog_obj = $blogHandler->create();
-            $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
-
-            switch ($xoopsModuleConfig['newblog_submit']) {
-                case 2:
-                    if (!is_object($xoopsUser)) {
-                        $status = 0;
-                    } else {
-                        $status = 1;
-                    }
-                    break;
-                case 0:
-                case 3:
-                    $status = 1;
-                    break;
-                case 1:
-                default:
-                    if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
-                        $status = 0;
-                    } else {
-                        $status = 1;
-                    }
-                    break;
-            }
-
-            $blog_obj->setVar('blog_status', $status);
-        }
-
-        $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::getText('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']);
-        if ($blog_obj->isNew()) {
-            $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
-        }
-
-        if (!$blogHandler->insert($blog_obj)) {
-        } elseif (0 !== count(Request::getArray('categories', [], 'POST'))) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, $_POST['categories'])) {
-                $_POST['categories'] = [];
-            }
-            $blogHandler->setCategories($blog_id, Request::getString('andor', '', 'POST'));//$_POST['categories']);
-        }
-        $message = planet_constant('MD_DBUPDATED');
-        redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
-
-    /* edit a single blog */
-    // no break
-    case 'edit':
-    default:
-        if (!empty(Request::getString('fetch', '', 'POST'))) {
-            $blog_obj = $blogHandler->fetch(Request::getText('blog_feed', '', 'POST'));
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj = $blogHandler->get($blog_id);
-        }
-        $categories = Request::getArray('categories', [], 'POST');//isset($_POST['categories']) ? $_POST['categories'] : array();
-        if (in_array('-1', $categories)) {
-            $categories = [];
-        }
-        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('MD_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;
+	/* save a single blog */
+	case 'save':
+
+		if ($blog_id) {
+			$blog_obj = $blogHandler->get($blog_id);
+			if ($xoopsUser->isAdmin()) {
+				$blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST'));// @$_POST['blog_status']);
+			}
+		} else {
+			if ($blog_exists = $blogHandler->getCount(new Criteria('blog_feed', $myts->addSlashes(trim(Request::getText('blog_feed', '', 'POST')))))  //$_POST['blog_feed']))))
+			) {
+				redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
+			}
+
+			$blog_obj = $blogHandler->create();
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
+
+			switch ($xoopsModuleConfig['newblog_submit']) {
+				case 2:
+					if (!is_object($xoopsUser)) {
+						$status = 0;
+					} else {
+						$status = 1;
+					}
+					break;
+				case 0:
+				case 3:
+					$status = 1;
+					break;
+				case 1:
+				default:
+					if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
+						$status = 0;
+					} else {
+						$status = 1;
+					}
+					break;
+			}
+
+			$blog_obj->setVar('blog_status', $status);
+		}
+
+		$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::getText('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']);
+		if ($blog_obj->isNew()) {
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
+		}
+
+		if (!$blogHandler->insert($blog_obj)) {
+		} elseif (0 !== count(Request::getArray('categories', [], 'POST'))) {
+			$blog_id = $blog_obj->getVar('blog_id');
+			if (in_array(0, $_POST['categories'])) {
+				$_POST['categories'] = [];
+			}
+			$blogHandler->setCategories($blog_id, Request::getString('andor', '', 'POST'));//$_POST['categories']);
+		}
+		$message = planet_constant('MD_DBUPDATED');
+		redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+
+	/* edit a single blog */
+	// no break
+	case 'edit':
+	default:
+		if (!empty(Request::getString('fetch', '', 'POST'))) {
+			$blog_obj = $blogHandler->fetch(Request::getText('blog_feed', '', 'POST'));
+			$blog_obj->setVar('blog_id', $blog_id);
+		} else {
+			$blog_obj = $blogHandler->get($blog_id);
+		}
+		$categories = Request::getArray('categories', [], 'POST');//isset($_POST['categories']) ? $_POST['categories'] : array();
+		if (in_array('-1', $categories)) {
+			$categories = [];
+		}
+		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('MD_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;
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +30 added lines, -30 removed lines

@@ -26,11 +26,11 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
-$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;
+$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;
 
 if (empty($xoopsModuleConfig['newblog_submit']) && (!is_object($xoopsUser) || !$xoopsUser->isAdmin())) {
     redirect_header('index.php', 2, _NOPERM);
@@ -41,10 +41,10 @@ 
 }
 
 if ('save' === $op && !$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
+    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID').': security check failed');
 }
-include XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+include XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 $blogHandler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -56,9 +56,9 @@ 
         if ($blog_id) {
             $blog_obj = $blogHandler->get($blog_id);
             if ($xoopsUser->isAdmin()) {
-                $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST'));// @$_POST['blog_status']);
+                $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); // @$_POST['blog_status']);
             }
-        } else {
+        }else {
             if ($blog_exists = $blogHandler->getCount(new Criteria('blog_feed', $myts->addSlashes(trim(Request::getText('blog_feed', '', 'POST')))))  //$_POST['blog_feed']))))
             ) {
                 redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
@@ -71,7 +71,7 @@ 
                 case 2:
                     if (!is_object($xoopsUser)) {
                         $status = 0;
-                    } else {
+                    }else {
                         $status = 1;
                     }
                     break;
@@ -83,7 +83,7 @@ 
                 default:
                     if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
                         $status = 0;
-                    } else {
+                    }else {
                         $status = 1;
                     }
                     break;
@@ -92,14 +92,14 @@ 
             $blog_obj->setVar('blog_status', $status);
         }
 
-        $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::getText('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_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::getText('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']);
         if ($blog_obj->isNew()) {
             $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
         }
@@ -110,10 +110,10 @@ 
             if (in_array(0, $_POST['categories'])) {
                 $_POST['categories'] = [];
             }
-            $blogHandler->setCategories($blog_id, Request::getString('andor', '', 'POST'));//$_POST['categories']);
+            $blogHandler->setCategories($blog_id, Request::getString('andor', '', 'POST')); //$_POST['categories']);
         }
         $message = planet_constant('MD_DBUPDATED');
-        redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+        redirect_header('index.php'.URL_DELIMITER.'b'.$blog_id, 2, $message);
 
     /* edit a single blog */
     // no break
@@ -122,14 +122,14 @@ 
         if (!empty(Request::getString('fetch', '', 'POST'))) {
             $blog_obj = $blogHandler->fetch(Request::getText('blog_feed', '', 'POST'));
             $blog_obj->setVar('blog_id', $blog_id);
-        } else {
+        }else {
             $blog_obj = $blogHandler->get($blog_id);
         }
-        $categories = Request::getArray('categories', [], 'POST');//isset($_POST['categories']) ? $_POST['categories'] : array();
+        $categories = Request::getArray('categories', [], 'POST'); //isset($_POST['categories']) ? $_POST['categories'] : array();
         if (in_array('-1', $categories)) {
             $categories = [];
         }
-        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));
         }
@@ -137,23 +137,23 @@ 
             $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('MD_BLOGEXISTS');
+            if (count($blogs_obj)>0) {
+                echo "<div class=\"errorMsg\">".planet_constant('MD_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;
 }
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

trackback.php

Indentation +142 added lines, -142 removed lines

@@ -38,159 +38,159 @@
 $charset    = trim(Request::getString('charset', '', 'POST'));//trim($_POST['charset']);
 
 if (empty($xoopsModuleConfig['trackback_option'])) {
-    PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
+	PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
 }
 if (!strlen($title . $url . $blog_name)) {
-    PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+	PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
 }
 
 if (!empty($article_id) && !empty($url)) {
-    $trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
-    $criteria         = new CriteriaCompo(new Criteria('art_id', $article_id));
-    $criteria->add(new Criteria('tb_url', $url));
-    if ($trackbackHandler->getCount($criteria) > 0) {
-        PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
-    }
+	$trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
+	$criteria         = new CriteriaCompo(new Criteria('art_id', $article_id));
+	$criteria->add(new Criteria('tb_url', $url));
+	if ($trackbackHandler->getCount($criteria) > 0) {
+		PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
+	}
 
-    $charset   = empty($charset) ? 'utf-8' : $charset;
-    $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
-    $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
-    $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$xoopsModuleConfig['trackback_option'];
+	$charset   = empty($charset) ? 'utf-8' : $charset;
+	$title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
+	$excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
+	$blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
+	$tb_status = (int)$xoopsModuleConfig['trackback_option'];
 
-    $com_pid    = 0;
-    $com_itemid = $article_id;
-    $com_rootid = 0;
-    $com_title  = $title;
-    $com_text   = $excerpt;
-    $com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
-    if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
-        $com_text .= $blog_name;
-    }
-    $com_modid = $xoopsModule->getVar('mid');
+	$com_pid    = 0;
+	$com_itemid = $article_id;
+	$com_rootid = 0;
+	$com_title  = $title;
+	$com_text   = $excerpt;
+	$com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+	if (!empty($url)) {
+		$com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
+	} else {
+		$com_text .= $blog_name;
+	}
+	$com_modid = $xoopsModule->getVar('mid');
 
-    $commentHandler = xoops_getHandler('comment');
-    $comment        = $commentHandler->create();
-    $comment->setVar('com_created', time());
-    $comment->setVar('com_pid', $com_pid);
-    $comment->setVar('com_itemid', $com_itemid);
-    $comment->setVar('com_rootid', $com_rootid);
-    $comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
-    switch ($tb_status) {
-        case 2:
-            $comment->setVar('com_status', 2);
-            $call_approvefunc = true;
-            $call_updatefunc  = true;
-            $notify_event     = 'comment';
-            break;
-        case 1:
-        default:
-            $comment->setVar('com_status', 1);
-            $notify_event = 'comment_submit';
-            break;
-    }
-    $comment->setVar('com_uid', 0);
-    $com_title = xoops_trim($com_title);
-    $com_title = empty($com_title) ? _NOTITLE : $com_title;
-    $comment->setVar('com_title', $com_title);
-    $comment->setVar('com_text', $com_text);
-    $comment->setVar('dohtml', 0);
-    $comment->setVar('dosmiley', 0);
-    $comment->setVar('doxcode', 1);
-    $comment->setVar('doimage', 0);
-    $comment->setVar('dobr', 1);
-    $comment->setVar('com_icon', '');
-    $comment->setVar('com_modified', time());
-    $comment->setVar('com_modid', $com_modid);
-    if (false != $commentHandler->insert($comment)) {
-        $newcid = $comment->getVar('com_id');
+	$commentHandler = xoops_getHandler('comment');
+	$comment        = $commentHandler->create();
+	$comment->setVar('com_created', time());
+	$comment->setVar('com_pid', $com_pid);
+	$comment->setVar('com_itemid', $com_itemid);
+	$comment->setVar('com_rootid', $com_rootid);
+	$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
+	switch ($tb_status) {
+		case 2:
+			$comment->setVar('com_status', 2);
+			$call_approvefunc = true;
+			$call_updatefunc  = true;
+			$notify_event     = 'comment';
+			break;
+		case 1:
+		default:
+			$comment->setVar('com_status', 1);
+			$notify_event = 'comment_submit';
+			break;
+	}
+	$comment->setVar('com_uid', 0);
+	$com_title = xoops_trim($com_title);
+	$com_title = empty($com_title) ? _NOTITLE : $com_title;
+	$comment->setVar('com_title', $com_title);
+	$comment->setVar('com_text', $com_text);
+	$comment->setVar('dohtml', 0);
+	$comment->setVar('dosmiley', 0);
+	$comment->setVar('doxcode', 1);
+	$comment->setVar('doimage', 0);
+	$comment->setVar('dobr', 1);
+	$comment->setVar('com_icon', '');
+	$comment->setVar('com_modified', time());
+	$comment->setVar('com_modid', $com_modid);
+	if (false != $commentHandler->insert($comment)) {
+		$newcid = $comment->getVar('com_id');
 
-        // set own id as root id
-        $com_rootid = $newcid;
-        if (!$commentHandler->updateByField($comment, 'com_rootid', $com_rootid)) {
-            $commentHandler->delete($comment);
-            PlanetUtility::planetRespondToTrackback(1, xoops_error());
-        }
+		// set own id as root id
+		$com_rootid = $newcid;
+		if (!$commentHandler->updateByField($comment, 'com_rootid', $com_rootid)) {
+			$commentHandler->delete($comment);
+			PlanetUtility::planetRespondToTrackback(1, xoops_error());
+		}
 
-        // call custom approve function if any
-        if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
-            && '' != trim($comment_config['callback']['approve'])) {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['approve'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ('' != $callbackfile
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['approve'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $comment_config['callback']['approve']($comment);
-            }
-        }
+		// call custom approve function if any
+		if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
+			&& '' != trim($comment_config['callback']['approve'])) {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['approve'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ('' != $callbackfile
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
+						require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['approve'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$comment_config['callback']['approve']($comment);
+			}
+		}
 
-        // call custom update function if any
-        if (false != $call_updatefunc && isset($comment_config['callback']['update'])
-            && '' != trim($comment_config['callback']['update'])) {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['update'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ('' != $callbackfile
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['update'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
-                $criteria->add(new Criteria('com_itemid', $com_itemid));
-                $criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
-                $comment_count = $commentHandler->getCount($criteria);
-                $func          = $comment_config['callback']['update'];
-                call_user_func_array($func, [$com_itemid, $comment_count, $comment->getVar('com_id')]);
-            }
-        }
+		// call custom update function if any
+		if (false != $call_updatefunc && isset($comment_config['callback']['update'])
+			&& '' != trim($comment_config['callback']['update'])) {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['update'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ('' != $callbackfile
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
+						require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['update'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
+				$criteria->add(new Criteria('com_itemid', $com_itemid));
+				$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+				$comment_count = $commentHandler->getCount($criteria);
+				$func          = $comment_config['callback']['update'];
+				call_user_func_array($func, [$com_itemid, $comment_count, $comment->getVar('com_id')]);
+			}
+		}
 
-        // RMV-NOTIFY
-        // trigger notification event if necessary
-        if ($notify_event) {
-            $not_modid = $com_modid;
-            //            require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-            $not_catinfo  = notificationCommentCategoryInfo($not_modid);
-            $not_category = $not_catinfo['name'];
-            $not_itemid   = $com_itemid;
-            $not_event    = $notify_event;
-            // Build an ABSOLUTE URL to view the comment.  Make sure we
-            // point to a viewable page (i.e. not the system administration
-            // module).
-            $comment_tags = [];
-            $not_module   = $xoopsModule;
-            if (!isset($comment_url)) {
-                $com_config  = $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
-                $comment_url .= $com_config['itemName'];
-            }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
-            $notificationHandler           = xoops_getHandler('notification');
-            $notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
-        }
+		// RMV-NOTIFY
+		// trigger notification event if necessary
+		if ($notify_event) {
+			$not_modid = $com_modid;
+			//            require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+			$not_catinfo  = notificationCommentCategoryInfo($not_modid);
+			$not_category = $not_catinfo['name'];
+			$not_itemid   = $com_itemid;
+			$not_event    = $notify_event;
+			// Build an ABSOLUTE URL to view the comment.  Make sure we
+			// point to a viewable page (i.e. not the system administration
+			// module).
+			$comment_tags = [];
+			$not_module   = $xoopsModule;
+			if (!isset($comment_url)) {
+				$com_config  = $not_module->getInfo('comments');
+				$comment_url = $com_config['pageName'] . '?';
+				$comment_url .= $com_config['itemName'];
+			}
+			$comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
+			$notificationHandler           = xoops_getHandler('notification');
+			$notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
+		}
 
-        PlanetUtility::planetRespondToTrackback(0);
-    } else {
-        PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
-    }
+		PlanetUtility::planetRespondToTrackback(0);
+	} else {
+		PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -26,21 +26,21 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // trackback is done by a POST
 $art_id     = explode('/', Request::getString('REQUEST_URI', '', 'SERVER'));
-$article_id = (int)$art_id[count($art_id) - 1];
-$url        = Request::getString('url', '', 'POST');//$_POST['url'];
-$title      = Request::getString('title', '', 'POST');//$_POST['title'];
-$excerpt    = Request::getString('excerpt', '', 'POST');//$_POST['excerpt'];
-$blog_name  = Request::getString('blog_name', '', 'POST');//$_POST['blog_name'];
-$charset    = trim(Request::getString('charset', '', 'POST'));//trim($_POST['charset']);
+$article_id = (int) $art_id[count($art_id)-1];
+$url        = Request::getString('url', '', 'POST'); //$_POST['url'];
+$title      = Request::getString('title', '', 'POST'); //$_POST['title'];
+$excerpt    = Request::getString('excerpt', '', 'POST'); //$_POST['excerpt'];
+$blog_name  = Request::getString('blog_name', '', 'POST'); //$_POST['blog_name'];
+$charset    = trim(Request::getString('charset', '', 'POST')); //trim($_POST['charset']);
 
 if (empty($xoopsModuleConfig['trackback_option'])) {
     PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
 }
-if (!strlen($title . $url . $blog_name)) {
+if (!strlen($title.$url.$blog_name)) {
     PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
 }
 
@@ -48,7 +48,7 @@ 
     $trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
     $criteria         = new CriteriaCompo(new Criteria('art_id', $article_id));
     $criteria->add(new Criteria('tb_url', $url));
-    if ($trackbackHandler->getCount($criteria) > 0) {
+    if ($trackbackHandler->getCount($criteria)>0) {
         PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
     }
 
@@ -56,17 +56,17 @@ 
     $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
     $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
     $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$xoopsModuleConfig['trackback_option'];
+    $tb_status = (int) $xoopsModuleConfig['trackback_option'];
 
     $com_pid    = 0;
     $com_itemid = $article_id;
     $com_rootid = 0;
     $com_title  = $title;
     $com_text   = $excerpt;
-    $com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+    $com_text .= "\n\n[TRACKBACK]"._POSTEDBY.': ';
     if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
+        $com_text .= '[url='.$url.']'.$blog_name.'[/url]';
+    }else {
         $com_text .= $blog_name;
     }
     $com_modid = $xoopsModule->getVar('mid');
@@ -122,13 +122,13 @@ 
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
                     if ('' != $callbackfile
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+                        && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+                        require_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
                     }
                     if (!function_exists($comment_config['callback']['approve'])) {
                         $skip = true;
                     }
-                } else {
+                }else {
                     $skip = true;
                 }
             }
@@ -145,13 +145,13 @@ 
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
                     if ('' != $callbackfile
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+                        && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+                        require_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
                     }
                     if (!function_exists($comment_config['callback']['update'])) {
                         $skip = true;
                     }
-                } else {
+                }else {
                     $skip = true;
                 }
             }
@@ -181,16 +181,16 @@ 
             $not_module   = $xoopsModule;
             if (!isset($comment_url)) {
                 $com_config  = $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
+                $comment_url = $com_config['pageName'].'?';
                 $comment_url .= $com_config['itemName'];
             }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
+            $comment_tags['X_COMMENT_URL'] = XOOPS_URL.'/modules/'.$not_module->getVar('dirname').'/'.$comment_url.'='.$com_itemid.'&com_id='.$newcid.'&com_rootid='.$com_rootid.'&com_mode='.$com_mode.'&com_order='.$com_order.'#comment'.$newcid;
             $notificationHandler           = xoops_getHandler('notification');
             $notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
         }
 
         PlanetUtility::planetRespondToTrackback(0);
-    } else {
+    }else {
         PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
     }
 }

view.blogs.php

Indentation +110 added lines, -110 removed lines

@@ -29,13 +29,13 @@ 
 include __DIR__ . '/header.php';
 
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $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 */
@@ -82,28 +82,28 @@ 
 $blog_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';
-    $blog_prefix   = 'b.';
+	$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';
+	$blog_prefix   = 'b.';
 }
 
 /* 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';
-    $blog_prefix     = 'b.';
+	$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';
+	$blog_prefix     = 'b.';
 }
 
 $criteria->add(new Criteria($blog_prefix . 'blog_status', 0, '>'));
@@ -112,20 +112,20 @@ 
 $order = 'DESC';
 $sort  = empty($sort) ? 'default' : $sort;
 switch ($sort) {
-    case 'marks':
-        $sortby = $blog_prefix . 'blog_marks';
-        break;
-    case 'rating':
-        $sortby = $blog_prefix . 'blog_rating';
-        break;
-    case 'time':
-        $sortby = $blog_prefix . 'blog_time';
-        break;
-    case 'default':
-    default:
-        $sort   = 'default';
-        $sortby = $blog_prefix . 'blog_id';
-        break;
+	case 'marks':
+		$sortby = $blog_prefix . 'blog_marks';
+		break;
+	case 'rating':
+		$sortby = $blog_prefix . 'blog_rating';
+		break;
+	case 'time':
+		$sortby = $blog_prefix . 'blog_time';
+		break;
+	case 'default':
+	default:
+		$sort   = 'default';
+		$sortby = $blog_prefix . 'blog_id';
+		break;
 }
 $criteria->setSort($sortby);
 $criteria->setOrder($order);
@@ -134,93 +134,93 @@ 
 
 $tags = empty($list) ? '' : [$blog_prefix . 'blog_title', $blog_prefix . 'blog_time'];
 switch ($query_type) {
-    case 'category':
-        $blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
-        $count_blog = $blogHandler->getCountByCategory($criteria);
-        break;
-    case 'bookmark':
-        $blogs_obj  = $blogHandler->getByBookmark($criteria, $tags);
-        $count_blog = $blogHandler->getCountByBookmark($criteria);
-        break;
-    default:
-        $blogs_obj  = $blogHandler->getAll($criteria, $tags);
-        $count_blog = $blogHandler->getCount($criteria);
-        break;
+	case 'category':
+		$blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
+		$count_blog = $blogHandler->getCountByCategory($criteria);
+		break;
+	case 'bookmark':
+		$blogs_obj  = $blogHandler->getByBookmark($criteria, $tags);
+		$count_blog = $blogHandler->getCountByBookmark($criteria);
+		break;
+	default:
+		$blogs_obj  = $blogHandler->getAll($criteria, $tags);
+		$count_blog = $blogHandler->getCount($criteria);
+		break;
 }
 
 /* Objects to array */
 $blogs = [];
 foreach (array_keys($blogs_obj) as $id) {
-    $_blog = [
-        'id'    => $id,
-        'title' => $blogs_obj[$id]->getVar('blog_title'),
-        'time'  => $blogs_obj[$id]->getTime()
-    ];
-    if (empty($list)) {
-        $_blog = array_merge($_blog, [
-            'image' => $blogs_obj[$id]->getImage(),
-            'feed'  => $blogs_obj[$id]->getVar('blog_feed'),
-            'link'  => $blogs_obj[$id]->getVar('blog_link'),
-            'desc'  => $blogs_obj[$id]->getVar('blog_desc'),
-            'star'  => $blogs_obj[$id]->getStar(),
-            'rates' => $blogs_obj[$id]->getVar('blog_rates'),
-            'marks' => $blogs_obj[$id]->getVar('blog_marks')
-        ]);
-    }
-    $blogs[] = $_blog;
-    unset($_blog);
+	$_blog = [
+		'id'    => $id,
+		'title' => $blogs_obj[$id]->getVar('blog_title'),
+		'time'  => $blogs_obj[$id]->getTime()
+	];
+	if (empty($list)) {
+		$_blog = array_merge($_blog, [
+			'image' => $blogs_obj[$id]->getImage(),
+			'feed'  => $blogs_obj[$id]->getVar('blog_feed'),
+			'link'  => $blogs_obj[$id]->getVar('blog_link'),
+			'desc'  => $blogs_obj[$id]->getVar('blog_desc'),
+			'star'  => $blogs_obj[$id]->getStar(),
+			'rates' => $blogs_obj[$id]->getVar('blog_rates'),
+			'marks' => $blogs_obj[$id]->getVar('blog_marks')
+		]);
+	}
+	$blogs[] = $_blog;
+	unset($_blog);
 }
 unset($blogs_obj);
 
 if ($count_blog > $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 ($list) {
-        $start_link[] = 'list=' . $list;
-    }
-    $nav     = new XoopsPageNav($count_blog, $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 ($list) {
+		$start_link[] = 'list=' . $list;
+	}
+	$nav     = new XoopsPageNav($count_blog, $limit, $start, 'start', implode('&', $start_link));
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
 $xoopsTpl->assign('link_home', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\"" . planet_constant('MD_HOME') . "\" target=\"_self\">" . planet_constant('MD_HOME') . '</a>');
 
 if ($category_id || $uid) {
-    $xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/view.blogs.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
+	$xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/view.blogs.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
 
-    $link_articles = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_ARTICLES') . "\">" . planet_constant('MD_ARTICLES') . '</a>';
-    $xoopsTpl->assign('link_articles', $link_articles);
+	$link_articles = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_ARTICLES') . "\">" . planet_constant('MD_ARTICLES') . '</a>';
+	$xoopsTpl->assign('link_articles', $link_articles);
 }
 
 $link_switch = "<a href=\""
-               . XOOPS_URL
-               . '/modules/'
-               . $GLOBALS['moddirname']
-               . '/view.blogs.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
-               . (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']
+			   . '/view.blogs.php'
+			   . (empty($category_id) ? '' : '/c' . $category_id)
+			   . (empty($uid) ? '' : '/u' . $uid)
+			   . (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);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.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'] . '/view.blogs.php' . URL_DELIMITER . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS') . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
 }
 
 if (1 == $xoopsModuleConfig['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_BLOGS'));
@@ -234,35 +234,35 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
 } elseif (!$list) {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 $sort_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER;
 $vars      = [];
 if (!empty($category_id)) {
-    $vars[] = 'c' . $category_id;
+	$vars[] = 'c' . $category_id;
 }
 if (!empty($uid)) {
-    $vars[] = 'u' . $uid;
+	$vars[] = 'u' . $uid;
 }
 if (!empty($list)) {
-    $vars[] = 'li';
+	$vars[] = 'li';
 }
 if (!empty($vars)) {
-    $sort_link .= implode('/', $vars) . '/';
+	$sort_link .= implode('/', $vars) . '/';
 }
 $sortlinks   = [];
 $valid_sorts = [
-    'marks'   => planet_constant('MD_BOOKMARKS'),
-    'rating'  => planet_constant('MD_RATING'),
-    'time'    => planet_constant('MD_TIME'),
-    'default' => planet_constant('MD_DEFAULT')
+	'marks'   => planet_constant('MD_BOOKMARKS'),
+	'rating'  => planet_constant('MD_RATING'),
+	'time'    => planet_constant('MD_TIME'),
+	'default' => planet_constant('MD_DEFAULT')
 ];
 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));
 

Spacing +33 added lines, -33 removed lines

@@ -26,10 +26,10 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (preg_match("/\/notification_update\.php/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
+    include XOOPS_ROOT_PATH.'/include/notification_update.php';
     exit();
 }
 
@@ -66,10 +66,10 @@ 
 }
 */
 
-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . planet_constant('MD_BLOGS');
+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.planet_constant('MD_BLOGS');
 $xoopsOption['template_main']   = PlanetUtility::planetGetTemplate('blogs');
-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']);
@@ -81,7 +81,7 @@ 
 $criteria    = new CriteriaCompo();
 $blog_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;
@@ -92,7 +92,7 @@ 
 }
 
 /* User bookmarks(favorites) */
-if ($uid > 0) {
+if ($uid>0) {
     $criteria->add(new Criteria('bm.bm_uid', $uid));
     $category_id     = 0;
     $blog_id         = 0;
@@ -106,25 +106,25 @@ 
     $blog_prefix     = 'b.';
 }
 
-$criteria->add(new Criteria($blog_prefix . 'blog_status', 0, '>'));
+$criteria->add(new Criteria($blog_prefix.'blog_status', 0, '>'));
 
 /* Sort */
 $order = 'DESC';
 $sort  = empty($sort) ? 'default' : $sort;
 switch ($sort) {
     case 'marks':
-        $sortby = $blog_prefix . 'blog_marks';
+        $sortby = $blog_prefix.'blog_marks';
         break;
     case 'rating':
-        $sortby = $blog_prefix . 'blog_rating';
+        $sortby = $blog_prefix.'blog_rating';
         break;
     case 'time':
-        $sortby = $blog_prefix . 'blog_time';
+        $sortby = $blog_prefix.'blog_time';
         break;
     case 'default':
     default:
         $sort   = 'default';
-        $sortby = $blog_prefix . 'blog_id';
+        $sortby = $blog_prefix.'blog_id';
         break;
 }
 $criteria->setSort($sortby);
@@ -132,7 +132,7 @@ 
 $criteria->setStart($start);
 $criteria->setLimit($limit);
 
-$tags = empty($list) ? '' : [$blog_prefix . 'blog_title', $blog_prefix . 'blog_time'];
+$tags = empty($list) ? '' : [$blog_prefix.'blog_title', $blog_prefix.'blog_time'];
 switch ($query_type) {
     case 'category':
         $blogs_obj  = $blogHandler->getByCategory($criteria, $tags);
@@ -172,31 +172,31 @@ 
 }
 unset($blogs_obj);
 
-if ($count_blog > $limit) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
+if ($count_blog>$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 ($list) {
-        $start_link[] = 'list=' . $list;
+        $start_link[] = 'list='.$list;
     }
     $nav     = new XoopsPageNav($count_blog, $limit, $start, 'start', implode('&', $start_link));
     $pagenav = $nav->renderNav(4);
-} else {
+}else {
     $pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_pagetitle', $xoopsOption['xoops_pagetitle']);
-$xoopsTpl->assign('link_home', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\"" . planet_constant('MD_HOME') . "\" target=\"_self\">" . planet_constant('MD_HOME') . '</a>');
+$xoopsTpl->assign('link_home', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/index.php\" title=\"".planet_constant('MD_HOME')."\" target=\"_self\">".planet_constant('MD_HOME').'</a>');
 
 if ($category_id || $uid) {
-    $xoopsTpl->assign('link_index', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/view.blogs.php\" title=\"" . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
+    $xoopsTpl->assign('link_index', "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/view.blogs.php\" title=\"".planet_constant('MD_INDEX')."\" target=\"_self\">".planet_constant('MD_INDEX').'</a>');
 
-    $link_articles = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\"" . planet_constant('MD_ARTICLES') . "\">" . planet_constant('MD_ARTICLES') . '</a>';
+    $link_articles = "<a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.(empty($category_id) ? '' : '/c'.$category_id).(empty($uid) ? '' : '/u'.$uid)."\" title=\"".planet_constant('MD_ARTICLES')."\">".planet_constant('MD_ARTICLES').'</a>';
     $xoopsTpl->assign('link_articles', $link_articles);
 }
 
@@ -205,8 +205,8 @@ 
                . '/modules/'
                . $GLOBALS['moddirname']
                . '/view.blogs.php'
-               . (empty($category_id) ? '' : '/c' . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid)
+               . (empty($category_id) ? '' : '/c'.$category_id)
+               . (empty($uid) ? '' : '/u'.$uid)
                . (empty($list) ? '/l1' : '')
                . "\" title=\""
                . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW'))
@@ -216,14 +216,14 @@ 
 $xoopsTpl->assign('link_switch', $link_switch);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark', "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.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'].'/view.blogs.php'.URL_DELIMITER.'u'.$xoopsUser->getVar('uid')."\" title=\"".planet_constant('MD_BOOKMARKS')."\" target=\"_self\">".planet_constant('MD_BOOKMARKS').'</a>');
 }
 
 if (1 == $xoopsModuleConfig['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_BLOGS'));
+$xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name').'::'.planet_constant('MD_BLOGS'));
 $xoopsTpl->assign('category', @$category_data);
 $xoopsTpl->assign('user', @$user_data);
 $xoopsTpl->assign('blogs', $blogs);
@@ -237,19 +237,19 @@ 
     $xoopsTpl->assign('canrate', 1);
 }
 
-$sort_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php' . URL_DELIMITER;
+$sort_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.blogs.php'.URL_DELIMITER;
 $vars      = [];
 if (!empty($category_id)) {
-    $vars[] = 'c' . $category_id;
+    $vars[] = 'c'.$category_id;
 }
 if (!empty($uid)) {
-    $vars[] = 'u' . $uid;
+    $vars[] = 'u'.$uid;
 }
 if (!empty($list)) {
     $vars[] = 'li';
 }
 if (!empty($vars)) {
-    $sort_link .= implode('/', $vars) . '/';
+    $sort_link .= implode('/', $vars).'/';
 }
 $sortlinks   = [];
 $valid_sorts = [
@@ -262,8 +262,8 @@ 
     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));
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

index.php

Indentation +164 added lines, -164 removed lines

@@ -27,13 +27,13 @@ 
 include __DIR__ . '/header.php';
 
 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 */
@@ -51,20 +51,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');
@@ -89,73 +89,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);
@@ -163,120 +163,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($xoopsModuleConfig['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($xoopsModuleConfig['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 == $xoopsModuleConfig['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'));
@@ -290,22 +290,22 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['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'));
@@ -314,8 +314,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,10 +24,10 @@ 
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 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();
 }
 
@@ -37,17 +37,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)) {
@@ -55,28 +55,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']);
@@ -88,7 +88,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;
@@ -98,7 +98,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)
@@ -125,7 +125,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;
@@ -144,13 +144,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:
@@ -163,9 +163,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':
@@ -184,12 +184,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);
 }
 
@@ -215,7 +215,7 @@ 
         ]);
         if (!empty($xoopsModuleConfig['display_summary'])) {
             $_article['content'] = $articles_obj[$id]->getSummary();
-        } else {
+        }else {
             $_article['content'] = $articles_obj[$id]->getVar('art_content');
         }
     }
@@ -224,24 +224,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 = '';
 }
 
@@ -249,7 +249,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=\""
@@ -257,9 +257,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'))
@@ -268,18 +268,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 == $xoopsModuleConfig['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);
@@ -289,23 +289,23 @@ 
 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['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'));
@@ -318,4 +318,4 @@ 
     $_GET['blog'] = $blog_id;
 }
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';

search.php

Indentation +97 added lines, -97 removed lines

@@ -32,7 +32,7 @@ 
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch['enable_search'])) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
 }
 
 $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -50,93 +50,93 @@ 
 $blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST');//(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
 $uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST');//(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
 $searchin = Request::getArray(
-    'searchin',
-    0 !== count(Request::getArray('searchin', [], 'GET')) ? explode('|', Request::getArray('searchin', [], 'GET')) : [],
-                              'POST'
+	'searchin',
+	0 !== count(Request::getArray('searchin', [], 'GET')) ? explode('|', Request::getArray('searchin', [], 'GET')) : [],
+							  'POST'
 ); //isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', $_GET['searchin']) : array());
 $sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST');//isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
 $term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST');//isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
 
 $andor  = in_array(strtoupper($andor), ['OR', 'AND', 'EXACT']) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), [
-    'a.art_id desc',
-    'a.art_time desc',
-    'a.art_title',
-    'a.blog_id',
-    'b.blog_id',
-    'b.blog_feed',
-    'b.blog_title',
-    'b.blog_time'
+	'a.art_id desc',
+	'a.art_time desc',
+	'a.art_title',
+	'a.blog_id',
+	'b.blog_id',
+	'b.blog_feed',
+	'b.blog_title',
+	'b.blog_time'
 ]) ? strtolower($sortby) : '';
 
 if (!(empty(Request::getString('submit', '', 'POST')) && empty(Request::getString('term', '', 'GET')))) {
-    $next_search['category'] = $category;
-    $next_search['blog']     = $blog;
-    $next_search['uid']      = $uid;
-    $next_search['andor']    = $andor;
+	$next_search['category'] = $category;
+	$next_search['blog']     = $blog;
+	$next_search['uid']      = $uid;
+	$next_search['andor']    = $andor;
 
-    $next_search['term'] = $term;
-    $query               = trim($term);
+	$next_search['term'] = $term;
+	$query               = trim($term);
 
-    if ('EXACT' !== $andor) {
-        $ignored_queries = []; // holds kewords that are shorter than allowed minmum length
-        $temp_queries    = preg_split("/[\s,]+/", $query);
-        foreach ($temp_queries as $q) {
-            $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
-                $queries[] = $myts->addSlashes($q);
-            } else {
-                $ignored_queries[] = $myts->addSlashes($q);
-            }
-        }
-        if (0 == count($queries)) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-        $queries = [$myts->addSlashes($query)];
-    }
+	if ('EXACT' !== $andor) {
+		$ignored_queries = []; // holds kewords that are shorter than allowed minmum length
+		$temp_queries    = preg_split("/[\s,]+/", $query);
+		foreach ($temp_queries as $q) {
+			$q = trim($q);
+			if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+				$queries[] = $myts->addSlashes($q);
+			} else {
+				$ignored_queries[] = $myts->addSlashes($q);
+			}
+		}
+		if (0 == count($queries)) {
+			redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+	} else {
+		if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
+			redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+		$queries = [$myts->addSlashes($query)];
+	}
 
-    $next_search['sortby']   = $sortby;
-    $next_search['searchin'] = implode('|', $searchin);
+	$next_search['sortby']   = $sortby;
+	$next_search['searchin'] = implode('|', $searchin);
 
-    /* To be added: year-month
+	/* To be added: year-month
      * see view.archive.php
      */
-    if (!empty($time)) {
-        $extra = '';
-    } else {
-        $extra = '';
-    }
+	if (!empty($time)) {
+		$extra = '';
+	} else {
+		$extra = '';
+	}
 
-    $results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra);
+	$results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra);
 
-    /*
+	/*
     if ( count($results) < 1 ) {
         redirect_header("javascript:history.go(-1);", 2, _SR_NOMATCH);
     } else
     */
-    {
-        $xoopsTpl->assign('results', $results);
+	{
+		$xoopsTpl->assign('results', $results);
 
-        if (count($next_search) > 0) {
-            $items = [];
-            foreach ($next_search as $para => $val) {
-                if (!empty($val)) {
-                    $items[] = "$para=$val";
-                }
-            }
-            if (count($items) > 0) {
-                $paras = implode('&', $items);
-            }
-            unset($next_search);
-            unset($items);
-        }
-        $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
+		if (count($next_search) > 0) {
+			$items = [];
+			foreach ($next_search as $para => $val) {
+				if (!empty($val)) {
+					$items[] = "$para=$val";
+				}
+			}
+			if (count($items) > 0) {
+				$paras = implode('&', $items);
+			}
+			unset($next_search);
+			unset($items);
+		}
+		$search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
 
-        /*
+		/*
          $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra);
       $next_count = count($next_results);
       $has_next = false;
@@ -145,41 +145,41 @@ 
       }
       if (false != $has_next)
       */
-        if (count($results)) {
-            $next            = $start + $limit;
-            $queries         = implode(',', $queries);
-            $search_url_next = $search_url . "&start=$next";
-            $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
-            $xoopsTpl->assign('search_next', $search_next);
-        }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = $search_url . "&start=$prev";
-            $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
-            $xoopsTpl->assign('search_prev', $search_prev);
-        }
-    }
+		if (count($results)) {
+			$next            = $start + $limit;
+			$queries         = implode(',', $queries);
+			$search_url_next = $search_url . "&start=$next";
+			$search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
+			$xoopsTpl->assign('search_next', $search_next);
+		}
+		if ($start > 0) {
+			$prev            = $start - $limit;
+			$search_url_prev = $search_url . "&start=$prev";
+			$search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
+			$xoopsTpl->assign('search_prev', $search_prev);
+		}
+	}
 
-    unset($results);
-    $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
-    $xoopsTpl->assign('search_info', $search_info);
+	unset($results);
+	$search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
+	$xoopsTpl->assign('search_info', $search_info);
 }
 
 /* type */
 $type_select = "<select name=\"andor\">";
 $type_select .= "<option value=\"OR\"";
 if ('OR' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_ANY . '</option>';
 $type_select .= "<option value=\"AND\"";
 if ('AND' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_ALL . '</option>';
 $type_select .= "<option value=\"EXACT\"";
 if ('exact' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_EXACT . '</option>';
 $type_select .= '</select>';
@@ -188,32 +188,32 @@ 
 $searchin_select = '';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
 if (in_array('title', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_TITLE') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
 if (in_array('text', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_BODY') . '&nbsp;&nbsp;||&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
 if (in_array('blog', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_BLOG') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
 if (in_array('feed', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_FEED') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
 if (in_array('desc', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . planet_constant('MD_DESC') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
 if (empty($searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= '>' . _ALL . '&nbsp;&nbsp;';
 
@@ -221,28 +221,28 @@ 
 $sortby_select = "<select name=\"sortby\">";
 $sortby_select .= "<option value=\"\"";
 if (empty($sortby)) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . _NONE . '</option>';
 $sortby_select .= "<option value=\"a.art_time\"";
 if ('a.art_time' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_TIME') . '</option>';
 $sortby_select .= "<option value=\"a.art_title\"";
 if ('a.art_title' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>';
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
 if ('a.blog_title' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>';
 $sortby_select .= "<option value=\"a.blog_time\"";
 if ('b.blog_time' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>';
 $sortby_select .= '</select>';
@@ -259,7 +259,7 @@ 
 $xoopsTpl->assign('uid', $uid);
 
 if ($xoopsConfigSearch['keyword_min'] > 0) {
-    $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
+	$xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +45 added lines, -45 removed lines

@@ -27,35 +27,35 @@ 
 use Xmf\Request;
 
 $xoopsOption['pagetype'] = 'search';
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoopsModule->loadLanguage('main');
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch['enable_search'])) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php', 2, planet_constant('MD_NOACCESS'));
 }
 
 $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
 $xoopsOption['template_main']                             = PlanetUtility::planetGetTemplate('search');
-include XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+include XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
-require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/search.inc.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/search.inc.php';
 $limit = $xoopsModuleConfig['articles_perpage'];
 
 $queries  = [];
-$andor    = Request::getString('andor', Request::getString('andor', '', 'GET'), 'POST');//isset($_POST['andor']) ? $_POST['andor'] : (isset($_GET['andor']) ? $_GET['andor'] : '');
-$start    = Request::getInt('start', 0, 'GET');//isset($_GET['start']) ? $_GET['start'] : 0;
+$andor    = Request::getString('andor', Request::getString('andor', '', 'GET'), 'POST'); //isset($_POST['andor']) ? $_POST['andor'] : (isset($_GET['andor']) ? $_GET['andor'] : '');
+$start    = Request::getInt('start', 0, 'GET'); //isset($_GET['start']) ? $_GET['start'] : 0;
 $category = Request::getInt('category', Request::getInt('category', 0, 'GET'), 'POST'); //(int)(isset($_POST['category']) ? $_POST['category'] : (isset($_GET['category']) ? $_GET['category'] : null));
-$blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST');//(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
-$uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST');//(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
+$blog     = Request::getInt('blog', Request::getInt('blog', 0, 'GET'), 'POST'); //(int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
+$uid      = Request::getInt('uid', Request::getInt('uid', 0, 'GET'), 'POST'); //(int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
 $searchin = Request::getArray(
     'searchin',
     0 !== count(Request::getArray('searchin', [], 'GET')) ? explode('|', Request::getArray('searchin', [], 'GET')) : [],
                               'POST'
 ); //isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', $_GET['searchin']) : array());
-$sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST');//isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
-$term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST');//isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
+$sortby   = Request::getString('sortby', Request::getString('sortby', null, 'GET'), 'POST'); //isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
+$term     = Request::getString('term', Request::getString('term', '', 'GET'), 'POST'); //isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
 
 $andor  = in_array(strtoupper($andor), ['OR', 'AND', 'EXACT']) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), [
@@ -83,18 +83,18 @@ 
         $temp_queries    = preg_split("/[\s,]+/", $query);
         foreach ($temp_queries as $q) {
             $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+            if (strlen($q)>=$xoopsConfigSearch['keyword_min']) {
                 $queries[] = $myts->addSlashes($q);
-            } else {
+            }else {
                 $ignored_queries[] = $myts->addSlashes($q);
             }
         }
         if (0 == count($queries)) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+    }else {
+        if (strlen($query)<$xoopsConfigSearch['keyword_min']) {
+            redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
         $queries = [$myts->addSlashes($query)];
     }
@@ -107,7 +107,7 @@ 
      */
     if (!empty($time)) {
         $extra = '';
-    } else {
+    }else {
         $extra = '';
     }
 
@@ -121,20 +121,20 @@ 
     {
         $xoopsTpl->assign('results', $results);
 
-        if (count($next_search) > 0) {
+        if (count($next_search)>0) {
             $items = [];
             foreach ($next_search as $para => $val) {
                 if (!empty($val)) {
                     $items[] = "$para=$val";
                 }
             }
-            if (count($items) > 0) {
+            if (count($items)>0) {
                 $paras = implode('&', $items);
             }
             unset($next_search);
             unset($items);
         }
-        $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
+        $search_url = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/search.php?'.$paras;
 
         /*
          $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra);
@@ -146,22 +146,22 @@ 
       if (false != $has_next)
       */
         if (count($results)) {
-            $next            = $start + $limit;
+            $next            = $start+$limit;
             $queries         = implode(',', $queries);
-            $search_url_next = $search_url . "&start=$next";
-            $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
+            $search_url_next = $search_url."&start=$next";
+            $search_next     = "<a href=\"".htmlspecialchars($search_url_next)."\">"._SR_NEXT.'</a>';
             $xoopsTpl->assign('search_next', $search_next);
         }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = $search_url . "&start=$prev";
-            $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
+        if ($start>0) {
+            $prev            = $start-$limit;
+            $search_url_prev = $search_url."&start=$prev";
+            $search_prev     = "<a href=\"".htmlspecialchars($search_url_prev)."\">"._SR_PREVIOUS.'</a>';
             $xoopsTpl->assign('search_prev', $search_prev);
         }
     }
 
     unset($results);
-    $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
+    $search_info = _SR_KEYWORDS.': '.$myts->htmlSpecialChars($term);
     $xoopsTpl->assign('search_info', $search_info);
 }
 
@@ -171,17 +171,17 @@ 
 if ('OR' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_ANY . '</option>';
+$type_select .= '>'._SR_ANY.'</option>';
 $type_select .= "<option value=\"AND\"";
 if ('AND' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_ALL . '</option>';
+$type_select .= '>'._SR_ALL.'</option>';
 $type_select .= "<option value=\"EXACT\"";
 if ('exact' === $andor) {
     $type_select .= " selected=\"selected\"";
 }
-$type_select .= '>' . _SR_EXACT . '</option>';
+$type_select .= '>'._SR_EXACT.'</option>';
 $type_select .= '</select>';
 
 /* scope */
@@ -190,32 +190,32 @@ 
 if (in_array('title', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_TITLE') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_TITLE').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
 if (in_array('text', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_BODY') . '&nbsp;&nbsp;||&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_BODY').'&nbsp;&nbsp;||&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
 if (in_array('blog', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_BLOG') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_BLOG').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
 if (in_array('feed', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_FEED') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_FEED').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
 if (in_array('desc', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . planet_constant('MD_DESC') . '&nbsp;&nbsp;';
+$searchin_select .= '>'.planet_constant('MD_DESC').'&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
 if (empty($searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . _ALL . '&nbsp;&nbsp;';
+$searchin_select .= '>'._ALL.'&nbsp;&nbsp;';
 
 /* sortby */
 $sortby_select = "<select name=\"sortby\">";
@@ -223,28 +223,28 @@ 
 if (empty($sortby)) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . _NONE . '</option>';
+$sortby_select .= '>'._NONE.'</option>';
 $sortby_select .= "<option value=\"a.art_time\"";
 if ('a.art_time' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_TIME') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_TIME').'</option>';
 $sortby_select .= "<option value=\"a.art_title\"";
 if ('a.art_title' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_TITLE').'</option>';
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
 if ('a.blog_title' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_BLOG').'</option>';
 $sortby_select .= "<option value=\"a.blog_time\"";
 if ('b.blog_time' === $sortby) {
     $sortby_select .= " selected=\"selected\"";
 }
-$sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>';
+$sortby_select .= '>'.planet_constant('MD_UPDATE').'</option>';
 $sortby_select .= '</select>';
 
 $xoopsTpl->assign('type_select', $type_select);
@@ -258,8 +258,8 @@ 
 $xoopsTpl->assign('blog', $blog);
 $xoopsTpl->assign('uid', $uid);
 
-if ($xoopsConfigSearch['keyword_min'] > 0) {
+if ($xoopsConfigSearch['keyword_min']>0) {
     $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

admin/menu.php

Indentation +19 added lines, -19 removed lines

@@ -29,7 +29,7 @@ 
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
 } else {
-    $moduleHelper = Xmf\Module\Helper::getHelper('system');
+	$moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 
 $pathIcon32 = \Xmf\Module\Admin::menuIconPath('');
@@ -38,33 +38,33 @@ 
 $moduleHelper->loadLanguage('modinfo');
 
 $adminmenu[] = [
-    'title' => _AM_MODULEADMIN_HOME,
-    'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+	'title' => _AM_MODULEADMIN_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[] = [
@@ -74,7 +74,7 @@ 
 //];
 
 $adminmenu[] = [
-    'title' => _AM_MODULEADMIN_ABOUT,
-    'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+	'title' => _AM_MODULEADMIN_ABOUT,
+	'link'  => 'admin/about.php',
+	'icon'  => $pathIcon32 . '/about.png',
 ];

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
 $moduleDirName = basename(dirname(__DIR__));
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
-} else {
+}else {
     $moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 
@@ -40,31 +40,31 @@ 
 $adminmenu[] = [
     'title' => _AM_MODULEADMIN_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[] = [
@@ -76,5 +76,5 @@ 
 $adminmenu[] = [
     'title' => _AM_MODULEADMIN_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
 ];

admin/admin.blog.php

Indentation +341 added lines, -341 removed lines

@@ -52,353 +52,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($xoopsModuleConfig['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($xoopsModuleConfig['list_perpage']);
-                /* Active blogs */
-            } elseif ($category_id == -1) {
-                $criteria = new Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Featured blogs */
-            } elseif ($category_id == -2) {
-                $criteria = new Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Pending blogs */
-            } else {
-                $criteria = new Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            }
-            $blog_count = $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($xoopsModuleConfig['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($xoopsModuleConfig['list_perpage']);
+				/* Active blogs */
+			} elseif ($category_id == -1) {
+				$criteria = new Criteria('blog_status', 1);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+				/* Featured blogs */
+			} elseif ($category_id == -2) {
+				$criteria = new Criteria('blog_status', 2);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+				/* Pending blogs */
+			} else {
+				$criteria = new Criteria('blog_status', 0);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+			}
+			$blog_count = $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 > $xoopsModuleConfig['list_perpage']) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
-            $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
-        }
-        echo '</table></form>';
-        echo "</fieldset><br style='clear:both;'>";
-
-        if (empty($start) && empty($category_id)) {
-            $form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'), '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 > $xoopsModuleConfig['list_perpage']) {
+			include XOOPS_ROOT_PATH . '/class/pagenav.php';
+			$nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
+			$pagenav = $nav->renderNav(4);
+			echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+		}
+		echo '</table></form>';
+		echo "</fieldset><br style='clear:both;'>";
+
+		if (empty($start) && empty($category_id)) {
+			$form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'), '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

@@ -57,348 +57,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($xoopsModuleConfig['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($xoopsModuleConfig['list_perpage']);
-                /* Active blogs */
-            } elseif ($category_id == -1) {
-                $criteria = new Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Featured blogs */
-            } elseif ($category_id == -2) {
-                $criteria = new Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Pending blogs */
-            } else {
-                $criteria = new Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            }
-            $blog_count = $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($xoopsModuleConfig['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($xoopsModuleConfig['list_perpage']);
+                	/* Active blogs */
+            	} elseif ($category_id == -1) {
+                	$criteria = new Criteria('blog_status', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Featured blogs */
+            	} elseif ($category_id == -2) {
+                	$criteria = new Criteria('blog_status', 2);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Pending blogs */
+            	} else {
+                	$criteria = new Criteria('blog_status', 0);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+            	}
+            	$blog_count = $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 > $xoopsModuleConfig['list_perpage']) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
-            $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
-        }
-        echo '</table></form>';
-        echo "</fieldset><br style='clear:both;'>";
-
-        if (empty($start) && empty($category_id)) {
-            $form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'), '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 > $xoopsModuleConfig['list_perpage']) {
+            	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+            	$nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
+            	$pagenav = $nav->renderNav(4);
+            	echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+        	}
+        	echo '</table></form>';
+        	echo "</fieldset><br style='clear:both;'>";
+
+        	if (empty($start) && empty($category_id)) {
+            	$form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'), '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

@@ -26,8 +26,8 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-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();
@@ -39,14 +39,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']);
@@ -61,7 +61,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'));
             }
@@ -126,7 +126,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
@@ -139,7 +139,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
@@ -152,7 +152,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
@@ -167,7 +167,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
@@ -181,7 +181,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
@@ -189,10 +189,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
@@ -200,10 +200,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
@@ -211,11 +211,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));
         }
@@ -223,21 +223,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;
 
@@ -265,14 +265,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($xoopsModuleConfig['list_perpage']);
             $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
+        }else {
             /* All active blogs */
             if (0 == $category_id) {
                 $criteria = new Criteria('1', 1);
@@ -289,7 +289,7 @@ 
                 $criteria->setStart($start);
                 $criteria->setLimit($xoopsModuleConfig['list_perpage']);
                 /* Pending blogs */
-            } else {
+            }else {
                 $criteria = new Criteria('blog_status', 0);
                 $criteria->setStart($start);
                 $criteria->setLimit($xoopsModuleConfig['list_perpage']);
@@ -298,19 +298,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 = [
@@ -320,53 +320,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 > $xoopsModuleConfig['list_perpage']) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
+        if ($blog_count>$xoopsModuleConfig['list_perpage']) {
+            include XOOPS_ROOT_PATH.'/class/pagenav.php';
+            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category='.$category_id);
             $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+            echo "<tr align='right'><td colspan='6'>".$pagenav.'</td></tr>';
         }
         echo '</table></form>';
         echo "</fieldset><br style='clear:both;'>";
@@ -392,7 +392,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();