mambax7 / planet

action.bookmark.php

Indentation +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 $blog_id = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(isset($_GET['blog']) ? $_GET['blog'] : (isset($_POST['blog']) ? $_POST['blog'] : 0));
 
 if (!is_object($xoopsUser) || empty($blog_id)) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 
 $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
@@ -39,14 +39,14 @@ 
 $criteria        = new CriteriaCompo(new Criteria('blog_id', $blog_id));
 $criteria->add(new Criteria('bm_uid', $uid));
 if ($count = $bookmarkHandler->getCount($criteria)) {
-    $message = planet_constant('MD_ALREADYBOOKMARKED');
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
+	$message = planet_constant('MD_ALREADYBOOKMARKED');
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
 }
 $bookmark_obj = $bookmarkHandler->create();
 $bookmark_obj->setVar('blog_id', $blog_id);
 $bookmark_obj->setVar('bm_uid', $uid);
 if (!$bookmark_id = $bookmarkHandler->insert($bookmark_obj, true)) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
 }
 $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $blog_obj    = $blogHandler->get($blog_id);

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $blog_id = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(isset($_GET['blog']) ? $_GET['blog'] : (isset($_POST['blog']) ? $_POST['blog'] : 0));
 
@@ -40,19 +40,19 @@ 
 $criteria->add(new Criteria('bm_uid', $uid));
 if ($count = $bookmarkHandler->getCount($criteria)) {
     $message = planet_constant('MD_ALREADYBOOKMARKED');
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$uid, 2, $message);
 }
 $bookmark_obj = $bookmarkHandler->create();
 $bookmark_obj->setVar('blog_id', $blog_id);
 $bookmark_obj->setVar('bm_uid', $uid);
 if (!$bookmark_id = $bookmarkHandler->insert($bookmark_obj, true)) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2, planet_constant('MD_NOTSAVED'));
 }
 $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $blog_obj    = $blogHandler->get($blog_id);
-$marks       = $blog_obj->getVar('blog_marks') + 1;
-$blog_obj->setVar('blog_marks', $blog_obj->getVar('blog_marks') + 1);
+$marks       = $blog_obj->getVar('blog_marks')+1;
+$blog_obj->setVar('blog_marks', $blog_obj->getVar('blog_marks')+1);
 $blogHandler->insert($blog_obj, true);
 $message = planet_constant('MD_ACTIONDONE');
-redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
-include __DIR__ . '/footer.php';
+redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2, $message);
+include __DIR__.'/footer.php';

search.php

Indentation +95 added lines, -95 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,90 +50,90 @@ 
 $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', array(), 'GET')) ? explode('|', Request::getArray('searchin', array(), 'GET')) : array(),
-                              'POST'); //isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|', $_GET['searchin']) : array());
+							  '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), array('OR', 'AND', 'EXACT')) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), array(
-    '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 ($andor !== 'EXACT') {
-        $ignored_queries = array(); // 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 (count($queries) == 0) {
-            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 = array($myts->addSlashes($query));
-    }
+	if ($andor !== 'EXACT') {
+		$ignored_queries = array(); // 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 (count($queries) == 0) {
+			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 = array($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 = array();
-            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 = array();
+			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;
@@ -142,41 +142,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>';
@@ -185,32 +185,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;';
 
@@ -218,28 +218,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>';
@@ -256,7 +256,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,32 +27,32 @@ 
 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  = array();
-$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', array(), 'GET')) ? explode('|', Request::getArray('searchin', array(), 'GET')) : array(),
                               '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), array('OR', 'AND', 'EXACT')) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), array(
@@ -80,18 +80,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 (count($queries) == 0) {
-            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 = array($myts->addSlashes($query));
     }
@@ -104,7 +104,7 @@ 
      */
     if (!empty($time)) {
         $extra = '';
-    } else {
+    }else {
         $extra = '';
     }
 
@@ -118,20 +118,20 @@ 
     {
         $xoopsTpl->assign('results', $results);
 
-        if (count($next_search) > 0) {
+        if (count($next_search)>0) {
             $items = array();
             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);
@@ -143,22 +143,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);
 }
 
@@ -168,17 +168,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 */
@@ -187,32 +187,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\">";
@@ -220,28 +220,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);
@@ -255,8 +255,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';

pdf.php

Indentation +32 added lines, -32 removed lines

@@ -32,51 +32,51 @@
 include __DIR__ . '/header.php';
 global $pdf_data;
 if (!empty($_POST['pdf_data'])) {
-    $pdf_data = unserialize(base64_decode(Request::getText('pdf_data', '', 'POST')));
+	$pdf_data = unserialize(base64_decode(Request::getText('pdf_data', '', 'POST')));
 } elseif (!empty($pdf_data)) {
 } else {
-    error_reporting(0);
-    include __DIR__ . '/header.php';
-    error_reporting(0);
+	error_reporting(0);
+	include __DIR__ . '/header.php';
+	error_reporting(0);
 
-    if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-        $args['article'] = @$args_num[0];
-    }
+	if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
+		$args['article'] = @$args_num[0];
+	}
 
-    $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+	$article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
-    $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj    = $articleHandler->get($article_id);
+	$articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj    = $articleHandler->get($article_id);
 
-    $article_data = array();
+	$article_data = array();
 
-    // title
-    $article_data['title'] = $article_obj->getVar('art_title');
+	// title
+	$article_data['title'] = $article_obj->getVar('art_title');
 
-    $article_data['author'] = $article_obj->getVar('art_author');
+	$article_data['author'] = $article_obj->getVar('art_author');
 
-    // source
-    $article_data['source'] = $article_obj->getVar('art_link');
+	// source
+	$article_data['source'] = $article_obj->getVar('art_link');
 
-    // publish time
-    $article_data['time'] = $article_obj->getTime();
+	// publish time
+	$article_data['time'] = $article_obj->getTime();
 
-    // summary
-    $article_data['summary'] = $article_obj->getSummary();
+	// summary
+	$article_data['summary'] = $article_obj->getSummary();
 
-    // text of page
-    $article_data['text'] = $article_obj->getVar('art_content');
+	// text of page
+	$article_data['text'] = $article_obj->getVar('art_content');
 
-    // Build the pdf_data array
-    $pdf_data['title']   = $article_data['title'];
-    $pdf_data['author']  = $article_data['author'];
-    $pdf_data['date']    = $article_data['time'];
-    $pdf_data['content'] = '';
-    if ($article_data['summary']) {
-        $pdf_data['content'] .= planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'] . '<br><br>';
-    }
-    $pdf_data['content'] .= $article_data['text'] . '<br>';
-    $pdf_data['url']     = XOOPS_URL . '/modules/' . $GLOBALS['artdirname'] . '/view.article.php' . URL_DELIMITER . $article_obj->getVar('art_id');
+	// Build the pdf_data array
+	$pdf_data['title']   = $article_data['title'];
+	$pdf_data['author']  = $article_data['author'];
+	$pdf_data['date']    = $article_data['time'];
+	$pdf_data['content'] = '';
+	if ($article_data['summary']) {
+		$pdf_data['content'] .= planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'] . '<br><br>';
+	}
+	$pdf_data['content'] .= $article_data['text'] . '<br>';
+	$pdf_data['url']     = XOOPS_URL . '/modules/' . $GLOBALS['artdirname'] . '/view.article.php' . URL_DELIMITER . $article_obj->getVar('art_id');
 }
 $pdf_data['filename'] = preg_replace("/[^0-9a-z\-_\.]/i", '', $pdf_data['title']);
 

Spacing +8 added lines, -8 removed lines

@@ -29,21 +29,21 @@ 
 
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 global $pdf_data;
 if (!empty($_POST['pdf_data'])) {
     $pdf_data = unserialize(base64_decode(Request::getText('pdf_data', '', 'POST')));
 } elseif (!empty($pdf_data)) {
-} else {
+}else {
     error_reporting(0);
-    include __DIR__ . '/header.php';
+    include __DIR__.'/header.php';
     error_reporting(0);
 
     if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
         $args['article'] = @$args_num[0];
     }
 
-    $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+    $article_id = (int) (empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
     $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
     $article_obj    = $articleHandler->get($article_id);
@@ -73,14 +73,14 @@ 
     $pdf_data['date']    = $article_data['time'];
     $pdf_data['content'] = '';
     if ($article_data['summary']) {
-        $pdf_data['content'] .= planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'] . '<br><br>';
+        $pdf_data['content'] .= planet_constant('MD_SUMMARY').': '.$article_data['summary'].'<br><br>';
     }
-    $pdf_data['content'] .= $article_data['text'] . '<br>';
-    $pdf_data['url']     = XOOPS_URL . '/modules/' . $GLOBALS['artdirname'] . '/view.article.php' . URL_DELIMITER . $article_obj->getVar('art_id');
+    $pdf_data['content'] .= $article_data['text'].'<br>';
+    $pdf_data['url'] = XOOPS_URL.'/modules/'.$GLOBALS['artdirname'].'/view.article.php'.URL_DELIMITER.$article_obj->getVar('art_id');
 }
 $pdf_data['filename'] = preg_replace("/[^0-9a-z\-_\.]/i", '', $pdf_data['title']);
 
-include XOOPS_ROOT_PATH . '/Frameworks/fpdf/init.php';
+include XOOPS_ROOT_PATH.'/Frameworks/fpdf/init.php';
 error_reporting(0);
 ob_end_clean();
 

admin/admin_footer.php

Spacing +1 added lines, -1 removed lines

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

admin/admin_header.php

Indentation +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
 } else {
-    $moduleHelper = Xmf\Module\Helper::getHelper('system');
+	$moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 $adminObject = \Xmf\Module\Admin::getInstance();
 
@@ -46,8 +46,8 @@ 
 $myts = MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $xoopsTpl = new XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$xoopsTpl = new XoopsTpl();
 }
 
 require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';

Spacing +7 added lines, -7 removed lines

@@ -18,10 +18,10 @@ 
  */
 
 $path = dirname(dirname(dirname(__DIR__)));
-require_once $path . '/mainfile.php';
-require_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
-require_once __DIR__ . '/../class/utility.php';
+require_once $path.'/mainfile.php';
+require_once $path.'/include/cp_functions.php';
+require_once $path.'/include/cp_header.php';
+require_once __DIR__.'/../class/utility.php';
 
 //require_once __DIR__ . '/../class/utility.php';
 //require_once __DIR__ . '/../include/common.php';
@@ -29,7 +29,7 @@ 
 $moduleDirName = basename(dirname(__DIR__));
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
-} else {
+}else {
     $moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -50,8 +50,8 @@ 
     $xoopsTpl = new XoopsTpl();
 }
 
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/functions.php';
-require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php';
+require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
 
 planet_define_url_delimiter();

admin/admin.article.php

Indentation +13 added lines, -13 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -36,12 +36,12 @@ 
  * This is a tricky fix for incomplete solution of module cone
  * it is expected to have a better solution in article 1.0
  */
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //planet_adminmenu(3);
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 if (!empty($xoopsModuleConfig['article_expire'])) {
-    $criteria = new Criteria('art_time', time() - $xoopsModuleConfig['article_expire'] * 60 * 60 * 24, '<');
+    $criteria = new Criteria('art_time', time()-$xoopsModuleConfig['article_expire']*60*60*24, '<');
     if (!empty($_GET['purge'])) {
         $crit = new CriteriaCompo($criteria);
         $crit->add(new Criteria('art_comments', 0));
@@ -51,17 +51,17 @@ 
         }
     }
     $article_count_expire = $articleHandler->getCount($criteria);
-} else {
+}else {
     $article_count_expire = 0;
 }
 $article_count = $articleHandler->getCount();
 
-echo "<fieldset><legend style=\"font-weight: bold; color: #900;\">" . planet_constant('AM_ARTICLES') . '</legend>';
+echo "<fieldset><legend style=\"font-weight: bold; color: #900;\">".planet_constant('AM_ARTICLES').'</legend>';
 echo "<div style=\"padding: 8px;\">";
-echo "<br clear=\"all\">" . planet_constant('AM_COUNT') . ': ' . $article_count;
+echo "<br clear=\"all\">".planet_constant('AM_COUNT').': '.$article_count;
 echo "<br clear=\"all\">";
-if ($article_count_expire > 0) {
-    echo "<br clear=\"all\"><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/admin/admin.article.php?purge=1\" >" . planet_constant('AM_EXPIRED') . ': ' . $article_count_expire . '</a>';
+if ($article_count_expire>0) {
+    echo "<br clear=\"all\"><a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname']."/admin/admin.article.php?purge=1\" >".planet_constant('AM_EXPIRED').': '.$article_count_expire.'</a>';
     echo "<br clear=\"all\">";
 }
 echo '</div>';

admin/admin.blog.php

Indentation +332 added lines, -332 removed lines

@@ -52,344 +52,344 @@
 $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', array(), 'POST'))) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, Request::getArray('categories', array(), 'POST'))) {
-                $_POST['categories'] = array();
-            }
-            $blogHandler->setCategories($blog_id, Request::getArray('categories', array(), 'POST'));
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* fetch and add a list of blogs to a category */
-    case 'add':
-        $links = PlanetUtility::planetParseLinks(Request::getArray('links', array(), 'POST'));
-        $blogs = array();
-        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', array(), 'POST'))) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            foreach (Request::getArray('categories', array(), '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 */
-    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 */
-    case 'register':
-        if (!empty(Request::getArray('category_dest', array(), 'POST'))) {
-            if (!is_array($blog_id)) {
-                $blog_id = array($blog_id);
-            }
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->addBlogs(Request::getArray('category_dest', array(), 'POST'), $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', array(), 'POST') . '&start=' . $start, 2, $message);
-
-    /* remove a list of blogs from a category */
-    case 'remove':
-        if (!is_array($blog_id)) {
-            $blog_id = array($blog_id);
-        }
-        if (!empty($category_id)) {
-            $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 */
-    case 'del':
-        if (!is_array($blog_id)) {
-            $blog_id = array($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 */
-    case 'empty':
-        if (!is_array($blog_id)) {
-            $blog_id = array($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 */
-    case 'approve':
-        if (!is_array($blog_id)) {
-            $blog_id = array($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 */
-    case 'feature':
-        if (!is_array($blog_id)) {
-            $blog_id = array($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 */
-    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', array(), '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 = array(0 => _NONE);
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
-            $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj = $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 = array(
-            '0'  => _ALL,
-            '-1' => planet_constant('MD_ACTIVE'),
-            '-2' => planet_constant('MD_FEATURED'),
-            '-3' => planet_constant('MD_PENDING')
-        );
-        foreach (array_keys($categories) as $key) {
-            $options[$key] = $categories[$key];
-        }
-        $op_select->addOptionArray($options);
-        $opform->addElement($op_select);
-        $opform->display();
-
-        if ($category_id > 0) {
-            $criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
-            $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $blog_count = $blogHandler->getCountByCategory($criteria);
-            $criteria->setStart($start);
-            $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
-            /* All active blogs */
-            if ($category_id == 0) {
-                $criteria = new Criteria('1', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Active blogs */
-            } elseif ($category_id == -1) {
-                $criteria = new Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Featured blogs */
-            } elseif ($category_id == -2) {
-                $criteria = new Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Pending blogs */
-            } else {
-                $criteria = new Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            }
-            $blog_count = $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 = array(
-            '0' => planet_constant('MD_PENDING'),
-            '1' => planet_constant('MD_ACTIVE'),
-            '2' => planet_constant('MD_FEATURED')
-        );
-        foreach (array_keys($blog_objs) as $bid) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
-            echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
-            echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
-            echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
-            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
+	/* 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', array(), 'POST'))) {
+			$blog_id = $blog_obj->getVar('blog_id');
+			if (in_array(0, Request::getArray('categories', array(), 'POST'))) {
+				$_POST['categories'] = array();
+			}
+			$blogHandler->setCategories($blog_id, Request::getArray('categories', array(), 'POST'));
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php', 2, $message);
+
+	/* fetch and add a list of blogs to a category */
+	case 'add':
+		$links = PlanetUtility::planetParseLinks(Request::getArray('links', array(), 'POST'));
+		$blogs = array();
+		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', array(), 'POST'))) {
+			$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+			foreach (Request::getArray('categories', array(), '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 */
+	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 */
+	case 'register':
+		if (!empty(Request::getArray('category_dest', array(), 'POST'))) {
+			if (!is_array($blog_id)) {
+				$blog_id = array($blog_id);
+			}
+			$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+			$categoryHandler->addBlogs(Request::getArray('category_dest', array(), 'POST'), $blog_id);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', array(), 'POST') . '&amp;start=' . $start, 2, $message);
+
+	/* remove a list of blogs from a category */
+	case 'remove':
+		if (!is_array($blog_id)) {
+			$blog_id = array($blog_id);
+		}
+		if (!empty($category_id)) {
+			$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 */
+	case 'del':
+		if (!is_array($blog_id)) {
+			$blog_id = array($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 */
+	case 'empty':
+		if (!is_array($blog_id)) {
+			$blog_id = array($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 */
+	case 'approve':
+		if (!is_array($blog_id)) {
+			$blog_id = array($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 */
+	case 'feature':
+		if (!is_array($blog_id)) {
+			$blog_id = array($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 */
+	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', array(), '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 = array(0 => _NONE);
+		}
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+		echo '<br>';
+		if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
+			$criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
+			$blogs_obj = $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 = array(
+			'0'  => _ALL,
+			'-1' => planet_constant('MD_ACTIVE'),
+			'-2' => planet_constant('MD_FEATURED'),
+			'-3' => planet_constant('MD_PENDING')
+		);
+		foreach (array_keys($categories) as $key) {
+			$options[$key] = $categories[$key];
+		}
+		$op_select->addOptionArray($options);
+		$opform->addElement($op_select);
+		$opform->display();
+
+		if ($category_id > 0) {
+			$criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
+			$criteria->add(new Criteria('bc.cat_id', $category_id));
+			$blog_count = $blogHandler->getCountByCategory($criteria);
+			$criteria->setStart($start);
+			$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+			$blog_objs = $blogHandler->getByCategory($criteria);
+		} else {
+			/* All active blogs */
+			if ($category_id == 0) {
+				$criteria = new Criteria('1', 1);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+				/* Active blogs */
+			} elseif ($category_id == -1) {
+				$criteria = new Criteria('blog_status', 1);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+				/* Featured blogs */
+			} elseif ($category_id == -2) {
+				$criteria = new Criteria('blog_status', 2);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+				/* Pending blogs */
+			} else {
+				$criteria = new Criteria('blog_status', 0);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+			}
+			$blog_count = $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 = array(
+			'0' => planet_constant('MD_PENDING'),
+			'1' => planet_constant('MD_ACTIVE'),
+			'2' => planet_constant('MD_FEATURED')
+		);
+		foreach (array_keys($blog_objs) as $bid) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
+			echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
+			echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
+			echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
+			echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
                       <a href='admin.blog.php?op=del&amp;blog=" . $bid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . " title='" . _DELETE . " </a>&nbsp;
                       <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 +330 added lines, -330 removed lines

@@ -57,339 +57,339 @@
 
 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', array(), 'POST'))) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, Request::getArray('categories', array(), 'POST'))) {
-                $_POST['categories'] = array();
-            }
-            $blogHandler->setCategories($blog_id, Request::getArray('categories', array(), 'POST'));
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* fetch and add a list of blogs to a category */
-    case 'add':
-        $links = PlanetUtility::planetParseLinks(Request::getArray('links', array(), 'POST'));
-        $blogs = array();
-        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', array(), 'POST'))) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            foreach (Request::getArray('categories', array(), '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 */
-    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 */
-    case 'register':
-        if (!empty(Request::getArray('category_dest', array(), 'POST'))) {
-            if (!is_array($blog_id)) {
-                $blog_id = array($blog_id);
-            }
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->addBlogs(Request::getArray('category_dest', array(), 'POST'), $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', array(), 'POST') . '&start=' . $start, 2, $message);
-
-    /* remove a list of blogs from a category */
-    case 'remove':
-        if (!is_array($blog_id)) {
-            $blog_id = array($blog_id);
-        }
-        if (!empty($category_id)) {
-            $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 */
-    case 'del':
-        if (!is_array($blog_id)) {
-            $blog_id = array($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 */
-    case 'empty':
-        if (!is_array($blog_id)) {
-            $blog_id = array($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 */
-    case 'approve':
-        if (!is_array($blog_id)) {
-            $blog_id = array($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 */
-    case 'feature':
-        if (!is_array($blog_id)) {
-            $blog_id = array($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 */
-    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', array(), '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 = array(0 => _NONE);
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
-            $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj = $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 = array(
-            '0'  => _ALL,
-            '-1' => planet_constant('MD_ACTIVE'),
-            '-2' => planet_constant('MD_FEATURED'),
-            '-3' => planet_constant('MD_PENDING')
-        );
-        foreach (array_keys($categories) as $key) {
-            $options[$key] = $categories[$key];
-        }
-        $op_select->addOptionArray($options);
-        $opform->addElement($op_select);
-        $opform->display();
-
-        if ($category_id > 0) {
-            $criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
-            $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $blog_count = $blogHandler->getCountByCategory($criteria);
-            $criteria->setStart($start);
-            $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
-            /* All active blogs */
-            if ($category_id == 0) {
-                $criteria = new Criteria('1', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Active blogs */
-            } elseif ($category_id == -1) {
-                $criteria = new Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Featured blogs */
-            } elseif ($category_id == -2) {
-                $criteria = new Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Pending blogs */
-            } else {
-                $criteria = new Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            }
-            $blog_count = $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 = array(
-            '0' => planet_constant('MD_PENDING'),
-            '1' => planet_constant('MD_ACTIVE'),
-            '2' => planet_constant('MD_FEATURED')
-        );
-        foreach (array_keys($blog_objs) as $bid) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
-            echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
-            echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
-            echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
-            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
+    	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', array(), 'POST'))) {
+            	$blog_id = $blog_obj->getVar('blog_id');
+            	if (in_array(0, Request::getArray('categories', array(), 'POST'))) {
+                	$_POST['categories'] = array();
+            	}
+            	$blogHandler->setCategories($blog_id, Request::getArray('categories', array(), 'POST'));
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php', 2, $message);
+
+    	/* fetch and add a list of blogs to a category */
+    	case 'add':
+        	$links = PlanetUtility::planetParseLinks(Request::getArray('links', array(), 'POST'));
+        	$blogs = array();
+        	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', array(), 'POST'))) {
+            	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	foreach (Request::getArray('categories', array(), '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 */
+    	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 */
+    	case 'register':
+        	if (!empty(Request::getArray('category_dest', array(), 'POST'))) {
+            	if (!is_array($blog_id)) {
+                	$blog_id = array($blog_id);
+            	}
+            	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	$categoryHandler->addBlogs(Request::getArray('category_dest', array(), 'POST'), $blog_id);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', array(), 'POST') . '&amp;start=' . $start, 2, $message);
+
+    	/* remove a list of blogs from a category */
+    	case 'remove':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($blog_id);
+        	}
+        	if (!empty($category_id)) {
+            	$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 */
+    	case 'del':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($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 */
+    	case 'empty':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($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 */
+    	case 'approve':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($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 */
+    	case 'feature':
+        	if (!is_array($blog_id)) {
+            	$blog_id = array($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 */
+    	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', array(), '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 = array(0 => _NONE);
+        	}
+
+        	echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        	echo '<br>';
+        	if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
+            	$criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
+            	$blogs_obj = $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 = array(
+            	'0'  => _ALL,
+            	'-1' => planet_constant('MD_ACTIVE'),
+            	'-2' => planet_constant('MD_FEATURED'),
+            	'-3' => planet_constant('MD_PENDING')
+        	);
+        	foreach (array_keys($categories) as $key) {
+            	$options[$key] = $categories[$key];
+        	}
+        	$op_select->addOptionArray($options);
+        	$opform->addElement($op_select);
+        	$opform->display();
+
+        	if ($category_id > 0) {
+            	$criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
+            	$criteria->add(new Criteria('bc.cat_id', $category_id));
+            	$blog_count = $blogHandler->getCountByCategory($criteria);
+            	$criteria->setStart($start);
+            	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+            	$blog_objs = $blogHandler->getByCategory($criteria);
+        	} else {
+            	/* All active blogs */
+            	if ($category_id == 0) {
+                	$criteria = new Criteria('1', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Active blogs */
+            	} elseif ($category_id == -1) {
+                	$criteria = new Criteria('blog_status', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Featured blogs */
+            	} elseif ($category_id == -2) {
+                	$criteria = new Criteria('blog_status', 2);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Pending blogs */
+            	} else {
+                	$criteria = new Criteria('blog_status', 0);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+            	}
+            	$blog_count = $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 = array(
+            	'0' => planet_constant('MD_PENDING'),
+            	'1' => planet_constant('MD_ACTIVE'),
+            	'2' => planet_constant('MD_FEATURED')
+        	);
+        	foreach (array_keys($blog_objs) as $bid) {
+            	echo "<tr class='odd' align='left'>";
+            	echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
+            	echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
+            	echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
+            	echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
+            	echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
                       <a href='admin.blog.php?op=del&amp;blog=" . $bid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . " title='" . _DELETE . " </a>&nbsp;
                       <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', array(), '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', array(), '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'));
             }
@@ -124,7 +124,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 */
     case 'register':
@@ -136,7 +136,7 @@ 
             $categoryHandler->addBlogs(Request::getArray('category_dest', array(), 'POST'), $blog_id);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', array(), 'POST') . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.Request::getArray('category_dest', array(), 'POST').'&start='.$start, 2, $message);
 
     /* remove a list of blogs from a category */
     case 'remove':
@@ -148,7 +148,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 */
     case 'del':
@@ -162,7 +162,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 */
     case 'empty':
@@ -175,38 +175,38 @@ 
             }
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* approve a single blog or a list blogs */
     case 'approve':
         if (!is_array($blog_id)) {
             $blog_id = array($blog_id);
         }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        $criteria = new Criteria('blog_id', '('.implode(',', $blog_id).')', 'IN');
         $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 */
     case 'feature':
         if (!is_array($blog_id)) {
             $blog_id = array($blog_id);
         }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        $criteria = new Criteria('blog_id', '('.implode(',', $blog_id).')', 'IN');
         $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 */
     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 {
+        }else {
             $blog_obj = $blogHandler->get($blog_id);
         }
         $categories = Request::getArray('categories', array(), '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));
         }
@@ -214,21 +214,21 @@ 
             $categories = array(0 => _NONE);
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._EDIT.'</legend>';
         echo '<br>';
         if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
             $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
             $blogs_obj = $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;
 
@@ -256,14 +256,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 ($category_id == 0) {
                 $criteria = new Criteria('1', 1);
@@ -280,7 +280,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']);
@@ -289,19 +289,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 = array(
@@ -311,53 +311,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;'>";
@@ -383,7 +383,7 @@ 
             $button_tray->addElement($butt_cancel);
             $form_add->addElement($button_tray);
 
-            echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+            echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._ADD.'</legend>';
             echo '<br>';
             $form->display();
             $form_add->display();

admin/main.php

Indentation +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 echo '</text><br>';
 echo '<label>' . planet_constant('AM_TOTAL_BLOGS') . ':</label><text>' . $blog_count;
 if ($blog_count_pending > 0) {
-    echo " (<font color=\"red\">" . $blog_count_pending . '</font>)';
+	echo " (<font color=\"red\">" . $blog_count_pending . '</font>)';
 }
 echo '</text><br>';
 echo '<label>' . planet_constant('AM_TOTAL_ARTICLES') . ':</label><text>' . $article_count;

Spacing +19 added lines, -19 removed lines

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

admin/header.php

Spacing +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/functions.php';
-require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.admin.php';
-require_once __DIR__ . '/../class/utility.php';
+require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
+require_once __DIR__.'/../class/utility.php';
 $moduleDirName = basename(dirname(__DIR__));
 // include the default language file for the admin interface
 xoops_loadLanguage('main', $moduleDirName);