mambax7 / planet

class/xml.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once __DIR__ . '/../include/vars.php';
+require_once __DIR__.'/../include/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 /*** GENERAL USAGE *********************************************************
@@ -64,14 +64,14 @@ 
  */
 
 // your local timezone, set to "" to disable or for GMT
-$server_TZ = abs((int)($GLOBALS['xoopsConfig']['server_TZ'] * 3600.0));
-$prefix    = ($GLOBALS['xoopsConfig']['server_TZ'] < 0) ? '-' : '+';
-$TIME_ZONE = $prefix . date('H:i', $server_TZ);
+$server_TZ = abs((int) ($GLOBALS['xoopsConfig']['server_TZ']*3600.0));
+$prefix    = ($GLOBALS['xoopsConfig']['server_TZ']<0) ? '-' : '+';
+$TIME_ZONE = $prefix.date('H:i', $server_TZ);
 define('TIME_ZONE', $TIME_ZONE);
 // Version string.
 define('FEEDCREATOR_VERSION', 'ARTICLE @ XOOPS powered by FeedCreator');
 
-require_once __DIR__ . '/feedcreator.class.php';
+require_once __DIR__.'/feedcreator.class.php';
 
 /**
  * Description
@@ -95,7 +95,7 @@ 
          */
         public function __construct($version)
         {
-            $this->filename = XOOPS_CACHE_PATH . '/feed.xml';
+            $this->filename = XOOPS_CACHE_PATH.'/feed.xml';
             $this->version  = $version;
         }
 
@@ -122,7 +122,7 @@ 
                 foreach (array_keys($val) as $key) {
                     $val[$key] = $this->convert_encoding($val[$key]);
                 }
-            } else {
+            }else {
                 $val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
             }
 

Indentation +94 added lines, -94 removed lines

@@ -81,100 +81,100 @@
  * @link
  */
 if (!class_exists('Xmlfeed')) {
-    /**
-     * Class Bxmlfeed
-     */
-    class Bxmlfeed extends UniversalFeedCreator
-    {
-        public $version;
-        public $filename = '';
-
-        /**
-         * Bxmlfeed constructor.
-         * @param $version
-         */
-        public function __construct($version)
-        {
-            $this->filename = XOOPS_CACHE_PATH . '/feed.xml';
-            $this->version  = $version;
-        }
-
-        /**
-         * @param      $var
-         * @param      $val
-         * @param bool $encoding
-         */
-        public function setVar($var, $val, $encoding = false)
-        {
-            if (!empty($encoding)) {
-                $val = $this->convert_encoding($val);
-            }
-            $this->$var = $val;
-        }
-
-        /**
-         * @param $val
-         * @return array|mixed|string
-         */
-        public function convert_encoding($val)
-        {
-            if (is_array($val)) {
-                foreach (array_keys($val) as $key) {
-                    $val[$key] = $this->convert_encoding($val[$key]);
-                }
-            } else {
-                $val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
-            }
-
-            return $val;
-        }
-
-        /**
-         * @param $var
-         * @return mixed
-         */
-        public function getVar($var)
-        {
-            return $this->$var;
-        }
-
-        /**
-         * @param $img
-         */
-        public function setImage(&$img)
-        {
-            $image = new FeedImage();
-            foreach ($img as $key => $val) {
-                $image->$key = $this->convert_encoding($val);
-            }
-            $this->setVar('image', $image);
-        }
-
-        /**
-         * @param $itm
-         */
-        public function _addItem(&$itm)
-        {
-            $item = new FeedItem();
-            foreach ($itm as $key => $val) {
-                $item->$key = $this->convert_encoding($val);
-            }
-            $this->addItem($item);
-        }
-
-        /**
-         * @param $items
-         */
-        public function addItems(&$items)
-        {
-            if (!is_array($items) || 0 == count($items)) {
-                return;
-            }
-            foreach ($items as $item) {
-                $this->_addItem($item);
-            }
-        }
-    }
+	/**
+	 * Class Bxmlfeed
+	 */
+	class Bxmlfeed extends UniversalFeedCreator
+	{
+		public $version;
+		public $filename = '';
+
+		/**
+		 * Bxmlfeed constructor.
+		 * @param $version
+		 */
+		public function __construct($version)
+		{
+			$this->filename = XOOPS_CACHE_PATH . '/feed.xml';
+			$this->version  = $version;
+		}
+
+		/**
+		 * @param      $var
+		 * @param      $val
+		 * @param bool $encoding
+		 */
+		public function setVar($var, $val, $encoding = false)
+		{
+			if (!empty($encoding)) {
+				$val = $this->convert_encoding($val);
+			}
+			$this->$var = $val;
+		}
+
+		/**
+		 * @param $val
+		 * @return array|mixed|string
+		 */
+		public function convert_encoding($val)
+		{
+			if (is_array($val)) {
+				foreach (array_keys($val) as $key) {
+					$val[$key] = $this->convert_encoding($val[$key]);
+				}
+			} else {
+				$val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
+			}
+
+			return $val;
+		}
+
+		/**
+		 * @param $var
+		 * @return mixed
+		 */
+		public function getVar($var)
+		{
+			return $this->$var;
+		}
+
+		/**
+		 * @param $img
+		 */
+		public function setImage(&$img)
+		{
+			$image = new FeedImage();
+			foreach ($img as $key => $val) {
+				$image->$key = $this->convert_encoding($val);
+			}
+			$this->setVar('image', $image);
+		}
+
+		/**
+		 * @param $itm
+		 */
+		public function _addItem(&$itm)
+		{
+			$item = new FeedItem();
+			foreach ($itm as $key => $val) {
+				$item->$key = $this->convert_encoding($val);
+			}
+			$this->addItem($item);
+		}
+
+		/**
+		 * @param $items
+		 */
+		public function addItems(&$items)
+		{
+			if (!is_array($items) || 0 == count($items)) {
+				return;
+			}
+			foreach ($items as $item) {
+				$this->_addItem($item);
+			}
+		}
+	}
 }
 
 PlanetUtility::planetParseClass('

admin/admin.category.php

Indentation +129 added lines, -129 removed lines

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

Spacing +23 added lines, -23 removed lines

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

xml.php

Spacing +20 added lines, -20 removed lines

@@ -27,7 +27,7 @@ 
 use Xmf\Request;
 
 ob_start();
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
     $args['article'] = @$args_num[0];
@@ -86,16 +86,16 @@ 
     }
 } elseif (!empty($uid)) {
     $source = 'bookmark';
-} else {
+}else {
     $source = '';
 }
 
 $xml_charset = 'UTF-8';
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 $tpl = new XoopsTpl();
 $tpl->xoops_setCaching(2);
 $tpl->xoops_setCacheTime(3600);
-$xoopsCachedTemplateId = md5($xoopsModule->getVar('mid') . ',' . $article_id . ',' . $category_id . ',' . $blog_id . ',' . $uid . ',' . $type);
+$xoopsCachedTemplateId = md5($xoopsModule->getVar('mid').','.$article_id.','.$category_id.','.$blog_id.','.$uid.','.$type);
 if (!$tpl->is_cached('db:system_dummy.tpl', $xoopsCachedTemplateId)) {
     $criteria = new CriteriaCompo();
     $criteria->setLimit($xoopsModuleConfig['articles_perpage']);
@@ -107,7 +107,7 @@ 
 
             $articles_obj[$article_id] = $article_obj;
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id');
             break;
 
         case 'category':
@@ -117,7 +117,7 @@ 
             $criteria->add(new Criteria('bc.cat_id', $category_id));
             $articles_obj = $articleHandler->getByCategory($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'c'.$category_id;
             break;
 
         case 'blog':
@@ -127,7 +127,7 @@ 
             $criteria->add(new Criteria('blog_id', $blog_id));
             $articles_obj = $articleHandler->getAll($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id;
             break;
 
         case 'bookmark':
@@ -138,7 +138,7 @@ 
             $criteria->add(new Criteria('bm.bm_uid', $uid));
             $articles_obj = $articleHandler->getByBookmark($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$uid;
 
             break;
 
@@ -148,20 +148,20 @@ 
 
             $articles_obj = $articleHandler->getAll($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
             break;
     }
     $items = [];
     foreach (array_keys($articles_obj) as $id) {
         $content = $articles_obj[$id]->getVar('art_content');
-        $content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
+        $content .= '<br>'.planet_constant('MD_SOURCE').': '.$articles_obj[$id]->getVar('art_link').' '.$articles_obj[$id]->getVar('art_author');
         $items[] = [
             'title'                     => $articles_obj[$id]->getVar('art_title'),
-            'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
+            'link'                      => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_obj[$id]->getVar('art_id'),
             'description'               => $content,
             'descriptionHtmlSyndicated' => true,
             'date'                      => $articles_obj[$id]->getTime('rss'),
-            'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+            'source'                    => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/',
             'author'                    => $articles_obj[$id]->getVar('art_author')
         ];
     }
@@ -170,24 +170,24 @@ 
     $xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
     $xml        = $xmlHandler->create($type);
     $xml->setVar('encoding', $xml_charset);
-    $xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
+    $xml->setVar('title', $xoopsConfig['sitename'].' :: '.$pagetitle, 'UTF-8', $xml_charset, true);
     $xml->setVar('description', $rssdesc, true);
     $xml->setVar('descriptionHtmlSyndicated', true);
     $xml->setVar('link', $xml_link);
-    $xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
+    $xml->setVar('syndicationURL', XOOPS_URL.'/'.xoops_getenv('PHP_SELF'), 'post', true);
     $xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
     $xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
     $xml->setVar('category', $xoopsModule->getVar('name'), true);
     $xml->setVar('generator', $xoopsModule->getInfo('version'));
     $xml->setVar('language', _LANGCODE);
 
-    $dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
+    $dimention = @getimagesize(XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/'.$xoopsModule->getInfo('image'));
     $image     = [
         'width'       => $dimention[0],
         'height'      => $dimention[1],
-        'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
-        'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
-        'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+        'title'       => $xoopsConfig['sitename'].' :: '.$pagetitle,
+        'url'         => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/'.$xoopsModule->getInfo('image'),
+        'link'        => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/',
         'description' => $rssdesc
     ];
     $xml->setImage($image);
@@ -205,11 +205,11 @@ 
     */
     $xml->addItems($items);
 
-    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
+    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH.'/'.$GLOBALS['moddirname'].'.xml.tmp');
 
     $tpl->assign_by_ref('dummy_content', $dummy_content);
 }
 //$content = ob_get_contents();
 ob_end_clean();
-header('Content-Type:text/xml; charset=' . $xml_charset);
+header('Content-Type:text/xml; charset='.$xml_charset);
 $tpl->display('db:system_dummy.tpl', $xoopsCachedTemplateId);

Indentation +125 added lines, -125 removed lines

@@ -30,8 +30,8 @@ 
 include __DIR__ . '/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['type']    = @$args_str[0];
+	$args['article'] = @$args_num[0];
+	$args['type']    = @$args_str[0];
 }
 
 /* Specified Article */
@@ -48,14 +48,14 @@ 
 
 $valid_format = ['RSS0.91', 'RSS1.0', 'RSS2.0', 'PIE0.1', 'MBOX', 'OPML', 'ATOM', 'ATOM0.3', 'HTML', 'JS'];
 if ('RDF' === $type) {
-    $type = 'RSS1.0';
+	$type = 'RSS1.0';
 }
 if ('RSS' === $type) {
-    $type = 'RSS0.91';
+	$type = 'RSS0.91';
 }
 if (empty($type) || !in_array($type, $valid_format)) {
-    PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-    exit();
+	PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+	exit();
 }
 
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -64,30 +64,30 @@ 
 $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
 
 if (!empty($article_id)) {
-    $article_obj = $articleHandler->get($article_id);
-    if (!$article_obj->getVar('art_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_EXPIRED'));
-        exit();
-    }
-    $source = 'article';
+	$article_obj = $articleHandler->get($article_id);
+	if (!$article_obj->getVar('art_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_EXPIRED'));
+		exit();
+	}
+	$source = 'article';
 } elseif (!empty($blog_id)) {
-    $blog_obj = $blogHandler->get($blog_id);
-    if (!$blog_obj->getVar('blog_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-        exit();
-    }
-    $source = 'blog';
+	$blog_obj = $blogHandler->get($blog_id);
+	if (!$blog_obj->getVar('blog_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+		exit();
+	}
+	$source = 'blog';
 } elseif (!empty($category_id)) {
-    $source       = 'category';
-    $category_obj = $categoryHandler->get($category_id);
-    if (!$category_obj->getVar('cat_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-        exit();
-    }
+	$source       = 'category';
+	$category_obj = $categoryHandler->get($category_id);
+	if (!$category_obj->getVar('cat_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+		exit();
+	}
 } elseif (!empty($uid)) {
-    $source = 'bookmark';
+	$source = 'bookmark';
 } else {
-    $source = '';
+	$source = '';
 }
 
 $xml_charset = 'UTF-8';
@@ -97,102 +97,102 @@ 
 $tpl->xoops_setCacheTime(3600);
 $xoopsCachedTemplateId = md5($xoopsModule->getVar('mid') . ',' . $article_id . ',' . $category_id . ',' . $blog_id . ',' . $uid . ',' . $type);
 if (!$tpl->is_cached('db:system_dummy.tpl', $xoopsCachedTemplateId)) {
-    $criteria = new CriteriaCompo();
-    $criteria->setLimit($xoopsModuleConfig['articles_perpage']);
-    $articles_obj = [];
-    switch ($source) {
-        case 'article':
-            $pagetitle = planet_constant('MD_ARTICLE');
-            $rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
-
-            $articles_obj[$article_id] = $article_obj;
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-            break;
-
-        case 'category':
-            $pagetitle = planet_constant('MD_CATEGORY');
-            $rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
-
-            $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $articles_obj = $articleHandler->getByCategory($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
-            break;
-
-        case 'blog':
-            $pagetitle = planet_constant('MD_BLOG');
-            $rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
-
-            $criteria->add(new Criteria('blog_id', $blog_id));
-            $articles_obj = $articleHandler->getAll($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
-            break;
-
-        case 'bookmark':
-            $author_name = XoopsUser::getUnameFromId($uid);
-            $pagetitle   = planet_constant('MD_BOOKMARKS');
-            $rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
-
-            $criteria->add(new Criteria('bm.bm_uid', $uid));
-            $articles_obj = $articleHandler->getByBookmark($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
-
-            break;
-
-        default:
-            $pagetitle = planet_constant('MD_INDEX');
-            $rssdesc   = planet_constant('MD_XMLDESC_INDEX');
-
-            $articles_obj = $articleHandler->getAll($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-            break;
-    }
-    $items = [];
-    foreach (array_keys($articles_obj) as $id) {
-        $content = $articles_obj[$id]->getVar('art_content');
-        $content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
-        $items[] = [
-            'title'                     => $articles_obj[$id]->getVar('art_title'),
-            'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
-            'description'               => $content,
-            'descriptionHtmlSyndicated' => true,
-            'date'                      => $articles_obj[$id]->getTime('rss'),
-            'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
-            'author'                    => $articles_obj[$id]->getVar('art_author')
-        ];
-    }
-    unset($articles_obj, $criteria);
-
-    $xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
-    $xml        = $xmlHandler->create($type);
-    $xml->setVar('encoding', $xml_charset);
-    $xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
-    $xml->setVar('description', $rssdesc, true);
-    $xml->setVar('descriptionHtmlSyndicated', true);
-    $xml->setVar('link', $xml_link);
-    $xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
-    $xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
-    $xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
-    $xml->setVar('category', $xoopsModule->getVar('name'), true);
-    $xml->setVar('generator', $xoopsModule->getInfo('version'));
-    $xml->setVar('language', _LANGCODE);
-
-    $dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
-    $image     = [
-        'width'       => $dimention[0],
-        'height'      => $dimention[1],
-        'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
-        'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
-        'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
-        'description' => $rssdesc
-    ];
-    $xml->setImage($image);
-
-    /*
+	$criteria = new CriteriaCompo();
+	$criteria->setLimit($xoopsModuleConfig['articles_perpage']);
+	$articles_obj = [];
+	switch ($source) {
+		case 'article':
+			$pagetitle = planet_constant('MD_ARTICLE');
+			$rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
+
+			$articles_obj[$article_id] = $article_obj;
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+			break;
+
+		case 'category':
+			$pagetitle = planet_constant('MD_CATEGORY');
+			$rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
+
+			$criteria->add(new Criteria('bc.cat_id', $category_id));
+			$articles_obj = $articleHandler->getByCategory($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
+			break;
+
+		case 'blog':
+			$pagetitle = planet_constant('MD_BLOG');
+			$rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
+
+			$criteria->add(new Criteria('blog_id', $blog_id));
+			$articles_obj = $articleHandler->getAll($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
+			break;
+
+		case 'bookmark':
+			$author_name = XoopsUser::getUnameFromId($uid);
+			$pagetitle   = planet_constant('MD_BOOKMARKS');
+			$rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
+
+			$criteria->add(new Criteria('bm.bm_uid', $uid));
+			$articles_obj = $articleHandler->getByBookmark($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
+
+			break;
+
+		default:
+			$pagetitle = planet_constant('MD_INDEX');
+			$rssdesc   = planet_constant('MD_XMLDESC_INDEX');
+
+			$articles_obj = $articleHandler->getAll($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+			break;
+	}
+	$items = [];
+	foreach (array_keys($articles_obj) as $id) {
+		$content = $articles_obj[$id]->getVar('art_content');
+		$content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
+		$items[] = [
+			'title'                     => $articles_obj[$id]->getVar('art_title'),
+			'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
+			'description'               => $content,
+			'descriptionHtmlSyndicated' => true,
+			'date'                      => $articles_obj[$id]->getTime('rss'),
+			'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+			'author'                    => $articles_obj[$id]->getVar('art_author')
+		];
+	}
+	unset($articles_obj, $criteria);
+
+	$xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
+	$xml        = $xmlHandler->create($type);
+	$xml->setVar('encoding', $xml_charset);
+	$xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
+	$xml->setVar('description', $rssdesc, true);
+	$xml->setVar('descriptionHtmlSyndicated', true);
+	$xml->setVar('link', $xml_link);
+	$xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
+	$xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
+	$xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
+	$xml->setVar('category', $xoopsModule->getVar('name'), true);
+	$xml->setVar('generator', $xoopsModule->getInfo('version'));
+	$xml->setVar('language', _LANGCODE);
+
+	$dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
+	$image     = [
+		'width'       => $dimention[0],
+		'height'      => $dimention[1],
+		'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
+		'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
+		'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+		'description' => $rssdesc
+	];
+	$xml->setImage($image);
+
+	/*
     $item = array(
         "title" => $datatitle,
         "link" => $dataurl,
@@ -203,11 +203,11 @@ 
         "author" => $dataauthor
         );
     */
-    $xml->addItems($items);
+	$xml->addItems($items);
 
-    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
+	$dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
 
-    $tpl->assign_by_ref('dummy_content', $dummy_content);
+	$tpl->assign_by_ref('dummy_content', $dummy_content);
 }
 //$content = ob_get_contents();
 ob_end_clean();

transfer.php

Indentation +56 added lines, -56 removed lines

@@ -17,8 +17,8 @@ 
 include __DIR__ . '/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['op']      = @$args_str[0];
+	$args['article'] = @$args_num[0];
+	$args['op']      = @$args_str[0];
 }
 
 $article_id = Request::getInt('article', Request::getInt('article', @$args['article'], 'POST'), 'GET');//(int)(empty($_GET['article']) ? (empty($_POST['article']) ? @$args['article'] : $_POST['article']) : $_GET['article']);
@@ -27,33 +27,33 @@ 
 $op = strtolower(trim($op));
 
 if (empty($article_id)) {
-    if (empty(Request::getUrl('HTTP_REFERER', '', 'SERVER'))) {
-        //$_SERVER['HTTP_REFERER']))
+	if (empty(Request::getUrl('HTTP_REFERER', '', 'SERVER'))) {
+		//$_SERVER['HTTP_REFERER']))
 
-        include XOOPS_ROOT_PATH . '/header.php';
-        xoops_error(_NOPERM);
-        $xoopsOption['output_type'] = 'plain';
-        include XOOPS_ROOT_PATH . '/footer.php';
-        exit();
-    } else {
-        $ref_parser = parse_url(Request::getUrl('HTTP_REFERER', '', 'SERVER')); //$_SERVER['HTTP_REFERER']);
-        $uri_parser = parse_url(Request::getUrl('REQUEST_URI', '', 'SERVER'));// $_SERVER['REQUEST_URI']);
-        if ((!empty($ref_parser['host']) && !empty($uri_parser['host']) && $uri_parser['host'] != $ref_parser['host'])
-            || ($ref_parser['path'] != $uri_parser['path'])) {
-            include XOOPS_ROOT_PATH . '/header.php';
-            include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
-            xoops_confirm([], 'javascript: window.close();', sprintf(planet_constant('MD_TRANSFER_DONE'), ''), _CLOSE, Request::getUrl('HTTP_REFERER', '', 'SERVER'));
-            $xoopsOption['output_type'] = 'plain';
-            include XOOPS_ROOT_PATH . '/footer.php';
-            exit();
-        } else {
-            include XOOPS_ROOT_PATH . '/header.php';
-            xoops_error(_NOPERM);
-            $xoopsOption['output_type'] = 'plain';
-            include XOOPS_ROOT_PATH . '/footer.php';
-            exit();
-        }
-    }
+		include XOOPS_ROOT_PATH . '/header.php';
+		xoops_error(_NOPERM);
+		$xoopsOption['output_type'] = 'plain';
+		include XOOPS_ROOT_PATH . '/footer.php';
+		exit();
+	} else {
+		$ref_parser = parse_url(Request::getUrl('HTTP_REFERER', '', 'SERVER')); //$_SERVER['HTTP_REFERER']);
+		$uri_parser = parse_url(Request::getUrl('REQUEST_URI', '', 'SERVER'));// $_SERVER['REQUEST_URI']);
+		if ((!empty($ref_parser['host']) && !empty($uri_parser['host']) && $uri_parser['host'] != $ref_parser['host'])
+			|| ($ref_parser['path'] != $uri_parser['path'])) {
+			include XOOPS_ROOT_PATH . '/header.php';
+			include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+			xoops_confirm([], 'javascript: window.close();', sprintf(planet_constant('MD_TRANSFER_DONE'), ''), _CLOSE, Request::getUrl('HTTP_REFERER', '', 'SERVER'));
+			$xoopsOption['output_type'] = 'plain';
+			include XOOPS_ROOT_PATH . '/footer.php';
+			exit();
+		} else {
+			include XOOPS_ROOT_PATH . '/header.php';
+			xoops_error(_NOPERM);
+			$xoopsOption['output_type'] = 'plain';
+			include XOOPS_ROOT_PATH . '/footer.php';
+			exit();
+		}
+	}
 }
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
@@ -61,37 +61,37 @@ 
 
 // Display option form
 if (empty($op)) {
-    $module_variables .= "<input type=\"hidden\" name=\"article\" id=\"article\" value=\"{$article_id}\">";
-    include XOOPS_ROOT_PATH . '/Frameworks/transfer/option.transfer.php';
-    exit();
+	$module_variables .= "<input type=\"hidden\" name=\"article\" id=\"article\" value=\"{$article_id}\">";
+	include XOOPS_ROOT_PATH . '/Frameworks/transfer/option.transfer.php';
+	exit();
 } else {
-    $data           = [];
-    $data['id']     = $article_id;
-    $data['title']  = $article_obj->getVar('art_title');
-    $data['time']   = $article_obj->getTime('l');
-    $data['image']  = '';
-    $data['source'] = $article_obj->getVar('art_link');
-    $data['url']    = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-    $data['author'] = $article_obj->getVar('art_author');
+	$data           = [];
+	$data['id']     = $article_id;
+	$data['title']  = $article_obj->getVar('art_title');
+	$data['time']   = $article_obj->getTime('l');
+	$data['image']  = '';
+	$data['source'] = $article_obj->getVar('art_link');
+	$data['url']    = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+	$data['author'] = $article_obj->getVar('art_author');
 
-    switch ($op) {
+	switch ($op) {
 
-        // Use title
-        case 'bookmark':
-            break;
+		// Use title
+		case 'bookmark':
+			break;
 
-        case 'print':
-        case 'pdf':
-            ${"{$op}_data"}            =& $data;
-            ${"{$op}_data"}['date']    = $pdf_data['time'];
-            ${"{$op}_data"}['content'] = $article_obj->getVar('art_content');
-            break;
+		case 'print':
+		case 'pdf':
+			${"{$op}_data"}            =& $data;
+			${"{$op}_data"}['date']    = $pdf_data['time'];
+			${"{$op}_data"}['content'] = $article_obj->getVar('art_content');
+			break;
 
-        case 'newbb':
-        default:
-            $data['content'] = $article_obj->getSummary();
-            break;
-    }
-    include XOOPS_ROOT_PATH . '/Frameworks/transfer/action.transfer.php';
-    exit();
+		case 'newbb':
+		default:
+			$data['content'] = $article_obj->getSummary();
+			break;
+	}
+	include XOOPS_ROOT_PATH . '/Frameworks/transfer/action.transfer.php';
+	exit();
 }

Spacing +18 added lines, -18 removed lines

@@ -14,43 +14,43 @@ 
 
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
     $args['article'] = @$args_num[0];
     $args['op']      = @$args_str[0];
 }
 
-$article_id = Request::getInt('article', Request::getInt('article', @$args['article'], 'POST'), 'GET');//(int)(empty($_GET['article']) ? (empty($_POST['article']) ? @$args['article'] : $_POST['article']) : $_GET['article']);
+$article_id = Request::getInt('article', Request::getInt('article', @$args['article'], 'POST'), 'GET'); //(int)(empty($_GET['article']) ? (empty($_POST['article']) ? @$args['article'] : $_POST['article']) : $_GET['article']);
 
-$op = Request::getString('op', Request::getString('op', @$args['op'], 'POST'), 'GET');//empty($_GET['op']) ? (empty($_POST['op']) ? @$args['op'] : $_POST['op']) : $_GET['op'];
+$op = Request::getString('op', Request::getString('op', @$args['op'], 'POST'), 'GET'); //empty($_GET['op']) ? (empty($_POST['op']) ? @$args['op'] : $_POST['op']) : $_GET['op'];
 $op = strtolower(trim($op));
 
 if (empty($article_id)) {
     if (empty(Request::getUrl('HTTP_REFERER', '', 'SERVER'))) {
         //$_SERVER['HTTP_REFERER']))
 
-        include XOOPS_ROOT_PATH . '/header.php';
+        include XOOPS_ROOT_PATH.'/header.php';
         xoops_error(_NOPERM);
         $xoopsOption['output_type'] = 'plain';
-        include XOOPS_ROOT_PATH . '/footer.php';
+        include XOOPS_ROOT_PATH.'/footer.php';
         exit();
-    } else {
+    }else {
         $ref_parser = parse_url(Request::getUrl('HTTP_REFERER', '', 'SERVER')); //$_SERVER['HTTP_REFERER']);
-        $uri_parser = parse_url(Request::getUrl('REQUEST_URI', '', 'SERVER'));// $_SERVER['REQUEST_URI']);
+        $uri_parser = parse_url(Request::getUrl('REQUEST_URI', '', 'SERVER')); // $_SERVER['REQUEST_URI']);
         if ((!empty($ref_parser['host']) && !empty($uri_parser['host']) && $uri_parser['host'] != $ref_parser['host'])
             || ($ref_parser['path'] != $uri_parser['path'])) {
-            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';
             xoops_confirm([], 'javascript: window.close();', sprintf(planet_constant('MD_TRANSFER_DONE'), ''), _CLOSE, Request::getUrl('HTTP_REFERER', '', 'SERVER'));
             $xoopsOption['output_type'] = 'plain';
-            include XOOPS_ROOT_PATH . '/footer.php';
+            include XOOPS_ROOT_PATH.'/footer.php';
             exit();
-        } else {
-            include XOOPS_ROOT_PATH . '/header.php';
+        }else {
+            include XOOPS_ROOT_PATH.'/header.php';
             xoops_error(_NOPERM);
             $xoopsOption['output_type'] = 'plain';
-            include XOOPS_ROOT_PATH . '/footer.php';
+            include XOOPS_ROOT_PATH.'/footer.php';
             exit();
         }
     }
@@ -62,16 +62,16 @@ 
 // Display option form
 if (empty($op)) {
     $module_variables .= "<input type=\"hidden\" name=\"article\" id=\"article\" value=\"{$article_id}\">";
-    include XOOPS_ROOT_PATH . '/Frameworks/transfer/option.transfer.php';
+    include XOOPS_ROOT_PATH.'/Frameworks/transfer/option.transfer.php';
     exit();
-} else {
+}else {
     $data           = [];
     $data['id']     = $article_id;
     $data['title']  = $article_obj->getVar('art_title');
     $data['time']   = $article_obj->getTime('l');
     $data['image']  = '';
     $data['source'] = $article_obj->getVar('art_link');
-    $data['url']    = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+    $data['url']    = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id');
     $data['author'] = $article_obj->getVar('art_author');
 
     switch ($op) {
@@ -82,7 +82,7 @@ 
 
         case 'print':
         case 'pdf':
-            ${"{$op}_data"}            =& $data;
+            ${"{$op}_data"}            = & $data;
             ${"{$op}_data"}['date']    = $pdf_data['time'];
             ${"{$op}_data"}['content'] = $article_obj->getVar('art_content');
             break;
@@ -92,6 +92,6 @@ 
             $data['content'] = $article_obj->getSummary();
             break;
     }
-    include XOOPS_ROOT_PATH . '/Frameworks/transfer/action.transfer.php';
+    include XOOPS_ROOT_PATH.'/Frameworks/transfer/action.transfer.php';
     exit();
 }

xoops_version.php

Indentation +127 added lines, -127 removed lines

@@ -30,16 +30,16 @@ 
 include __DIR__ . '/include/vars.php';
 
 $modversion                 = [
-    'name'          => planet_constant('MI_NAME'),
-    'version'       => 2.10,
-    'module_status' => 'Final',
-    'release_date'  => '2016/08/01',
-    'description'   => planet_constant('MI_DESC'),
-    'author'        => 'D.J. (phppp)',
-    'credits'       => 'XOOPS Project',
-    'image'         => 'assets/images/logoModule.png',
-    'dirname'       => $GLOBALS['moddirname'],
-    'help'          => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/readme.html'
+	'name'          => planet_constant('MI_NAME'),
+	'version'       => 2.10,
+	'module_status' => 'Final',
+	'release_date'  => '2016/08/01',
+	'description'   => planet_constant('MI_DESC'),
+	'author'        => 'D.J. (phppp)',
+	'credits'       => 'XOOPS Project',
+	'image'         => 'assets/images/logoModule.png',
+	'dirname'       => $GLOBALS['moddirname'],
+	'help'          => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/readme.html'
 ];
 $modversion['help']         = 'page=help';
 $modversion['license']      = 'GNU see LICENSE';
@@ -62,12 +62,12 @@ 
 // database tables
 $modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
 $modversion['tables']           = [
-    $GLOBALS['MOD_DB_PREFIX'] . '_category',
-    $GLOBALS['MOD_DB_PREFIX'] . '_article',
-    $GLOBALS['MOD_DB_PREFIX'] . '_blog',
-    $GLOBALS['MOD_DB_PREFIX'] . '_blogcat',
-    $GLOBALS['MOD_DB_PREFIX'] . '_bookmark',
-    $GLOBALS['MOD_DB_PREFIX'] . '_rate'
+	$GLOBALS['MOD_DB_PREFIX'] . '_category',
+	$GLOBALS['MOD_DB_PREFIX'] . '_article',
+	$GLOBALS['MOD_DB_PREFIX'] . '_blog',
+	$GLOBALS['MOD_DB_PREFIX'] . '_blogcat',
+	$GLOBALS['MOD_DB_PREFIX'] . '_bookmark',
+	$GLOBALS['MOD_DB_PREFIX'] . '_rate'
 ];
 
 // Admin things
@@ -149,162 +149,162 @@ 
 // Configs
 // Config items
 $modversion['config'][] = [
-    'name'        => 'do_debug',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
+	'name'        => 'do_debug',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
 ];
 
 $modversion['config'][] = [
-    'name'        => 'do_urw',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => in_array(php_sapi_name(), ['apache', 'apache2handler'])
+	'name'        => 'do_urw',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => in_array(php_sapi_name(), ['apache', 'apache2handler'])
 ];
 
 $modversion['config'][] = [
-    'name'        => 'theme_set',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'options'     => [_NONE => '0'],
-    'default'     => ''
+	'name'        => 'theme_set',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'options'     => [_NONE => '0'],
+	'default'     => ''
 ];
 
 $modversion['config'][] = [
-    'name'        => 'timeformat',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'options'     => [
-        _DATESTRING                                       => 'l',
-        _MEDIUMDATESTRING                                 => 'm',
-        _SHORTDATESTRING                                  => 's',
-        $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM' => 'c'
-    ],
-    'default'     => 'c'
+	'name'        => 'timeformat',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'options'     => [
+		_DATESTRING                                       => 'l',
+		_MEDIUMDATESTRING                                 => 'm',
+		_SHORTDATESTRING                                  => 's',
+		$GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM' => 'c'
+	],
+	'default'     => 'c'
 ];
 
 $modversion['config'][] = [
-    'name'        => 'articles_perpage',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 10
+	'name'        => 'articles_perpage',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 10
 ];
 
 $modversion['config'][] = [
-    'name'        => 'list_perpage',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 20
+	'name'        => 'list_perpage',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 20
 ];
 
 $modversion['config'][] = [
-    'name'        => 'blogs_perupdate',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 10
+	'name'        => 'blogs_perupdate',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 10
 ];
 
 $modversion['config'][] = [
-    'name'        => 'article_expire',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 30
+	'name'        => 'article_expire',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 30
 ];
 
 $modversion['config'][] = [
-    'name'        => 'display_summary',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 0
+	'name'        => 'display_summary',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 0
 ];
 
 $modversion['config'][] = [
-    'name'        => 'do_sibling',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
+	'name'        => 'do_sibling',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
 ];
 
 $modversion['config'][] = [
-    'name'        => 'pings',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PING',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => ''
+	'name'        => 'pings',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PING',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => ''
 ];
 
 $modversion['config'][] = [
-    'name'        => 'trackback_option',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 0,
-    'options'     => [planet_constant('MI_MODERATION') => 0, _ALL => 1, _NONE => 2]
+	'name'        => 'trackback_option',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 0,
+	'options'     => [planet_constant('MI_MODERATION') => 0, _ALL => 1, _NONE => 2]
 ];
 
 $modversion['config'][] = [
-    'name'        => 'copyright',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => 'Copyright© %s & ' . $xoopsConfig['sitename']
+	'name'        => 'copyright',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => 'Copyright© %s & ' . $xoopsConfig['sitename']
 ];
 
 $modversion['config'][] = [
-    'name'        => 'newblog_submit',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 2,
-    'options'     => [
-        _NONE                            => 0,
-        planet_constant('MI_MODERATION') => 1,
-        planet_constant('MI_MEMBER')     => 2,
-        _ALL                             => 3
-    ]
-    // 0 - Only admin; 1 - all but need approval; 2 - members auto approved; 3 - all
+	'name'        => 'newblog_submit',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 2,
+	'options'     => [
+		_NONE                            => 0,
+		planet_constant('MI_MODERATION') => 1,
+		planet_constant('MI_MEMBER')     => 2,
+		_ALL                             => 3
+	]
+	// 0 - Only admin; 1 - all but need approval; 2 - members auto approved; 3 - all
 ];
 
 $modversion['config'][] = [
-    'name'        => 'anonymous_rate',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
+	'name'        => 'anonymous_rate',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
 ];
 
 $modversion['config'][] = [
-    'name'        => 'do_pseudocron',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
+	'name'        => 'do_pseudocron',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
 ];
 
 // Notification

Spacing +61 added lines, -61 removed lines

@@ -27,9 +27,9 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-include __DIR__ . '/include/vars.php';
+include __DIR__.'/include/vars.php';
 
-$modversion                 = [
+$modversion = [
     'name'          => planet_constant('MI_NAME'),
     'version'       => 2.10,
     'module_status' => 'Final',
@@ -39,11 +39,11 @@ 
     'credits'       => 'XOOPS Project',
     'image'         => 'assets/images/logoModule.png',
     'dirname'       => $GLOBALS['moddirname'],
-    'help'          => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/readme.html'
+    'help'          => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/readme.html'
 ];
 $modversion['help']         = 'page=help';
 $modversion['license']      = 'GNU see LICENSE';
-$modversion['license_file'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/gpl.txt';
+$modversion['license_file'] = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/gpl.txt';
 $modversion['author_word']  = '';
 $modversion['module_team']  = '';
 
@@ -62,12 +62,12 @@ 
 // database tables
 $modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
 $modversion['tables']           = [
-    $GLOBALS['MOD_DB_PREFIX'] . '_category',
-    $GLOBALS['MOD_DB_PREFIX'] . '_article',
-    $GLOBALS['MOD_DB_PREFIX'] . '_blog',
-    $GLOBALS['MOD_DB_PREFIX'] . '_blogcat',
-    $GLOBALS['MOD_DB_PREFIX'] . '_bookmark',
-    $GLOBALS['MOD_DB_PREFIX'] . '_rate'
+    $GLOBALS['MOD_DB_PREFIX'].'_category',
+    $GLOBALS['MOD_DB_PREFIX'].'_article',
+    $GLOBALS['MOD_DB_PREFIX'].'_blog',
+    $GLOBALS['MOD_DB_PREFIX'].'_blogcat',
+    $GLOBALS['MOD_DB_PREFIX'].'_bookmark',
+    $GLOBALS['MOD_DB_PREFIX'].'_rate'
 ];
 
 // Admin things
@@ -93,11 +93,11 @@ 
 /**
  * Templates
  */
-$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'] . '_index.tpl', 'description' => ''];
-$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'] . '_article.tpl', 'description' => ''];
-$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'] . '_archive.tpl', 'description' => ''];
-$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'] . '_blogs.tpl', 'description' => ''];
-$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'] . '_search.tpl', 'description' => ''];
+$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'].'_index.tpl', 'description' => ''];
+$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'].'_article.tpl', 'description' => ''];
+$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'].'_archive.tpl', 'description' => ''];
+$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'].'_blogs.tpl', 'description' => ''];
+$modversion['templates'][] = ['file' => $GLOBALS['VAR_PREFIX'].'_search.tpl', 'description' => ''];
 
 //module css
 $modversion['css'] = 'templates/style.css';
@@ -109,31 +109,31 @@ 
 $modversion['blocks'][$i]['file']        = 'block.php';
 $modversion['blocks'][$i]['name']        = planet_constant('MI_ARTICLE');
 $modversion['blocks'][$i]['description'] = planet_constant('MI_ARTICLE_DESC');
-$modversion['blocks'][$i]['show_func']   = $GLOBALS['VAR_PREFIX'] . '_article_show';
+$modversion['blocks'][$i]['show_func']   = $GLOBALS['VAR_PREFIX'].'_article_show';
 $modversion['blocks'][$i]['options']     = 'time|10|0|0'; // type|MaxItems|TitleLength|SummaryLength
-$modversion['blocks'][$i]['edit_func']   = $GLOBALS['VAR_PREFIX'] . '_article_edit';
-$modversion['blocks'][$i]['template']    = $GLOBALS['VAR_PREFIX'] . '_block_article.tpl';
+$modversion['blocks'][$i]['edit_func']   = $GLOBALS['VAR_PREFIX'].'_article_edit';
+$modversion['blocks'][$i]['template']    = $GLOBALS['VAR_PREFIX'].'_block_article.tpl';
 
 ++$i;
 $modversion['blocks'][$i]['file']        = 'block.php';
 $modversion['blocks'][$i]['name']        = planet_constant('MI_CATEGORY');
 $modversion['blocks'][$i]['description'] = planet_constant('MI_CATEGORY_DESC');
-$modversion['blocks'][$i]['show_func']   = $GLOBALS['VAR_PREFIX'] . '_category_show';
-$modversion['blocks'][$i]['template']    = $GLOBALS['VAR_PREFIX'] . '_block_category.tpl';
+$modversion['blocks'][$i]['show_func']   = $GLOBALS['VAR_PREFIX'].'_category_show';
+$modversion['blocks'][$i]['template']    = $GLOBALS['VAR_PREFIX'].'_block_category.tpl';
 
 ++$i;
 $modversion['blocks'][$i]['file']        = 'block.php';
 $modversion['blocks'][$i]['name']        = planet_constant('MI_BLOG');
 $modversion['blocks'][$i]['description'] = planet_constant('MI_BLOG_DESC');
-$modversion['blocks'][$i]['show_func']   = $GLOBALS['VAR_PREFIX'] . '_blog_show';
+$modversion['blocks'][$i]['show_func']   = $GLOBALS['VAR_PREFIX'].'_blog_show';
 $modversion['blocks'][$i]['options']     = 'feature|10|0|1'; // type|MaxItems|TitleLength|ShowDesc
-$modversion['blocks'][$i]['edit_func']   = $GLOBALS['VAR_PREFIX'] . '_blog_edit';
-$modversion['blocks'][$i]['template']    = $GLOBALS['VAR_PREFIX'] . '_block_blog.tpl';
+$modversion['blocks'][$i]['edit_func']   = $GLOBALS['VAR_PREFIX'].'_blog_edit';
+$modversion['blocks'][$i]['template']    = $GLOBALS['VAR_PREFIX'].'_block_blog.tpl';
 
 // Search
 $modversion['hasSearch']      = 1;
 $modversion['search']['file'] = 'include/search.inc.php';
-$modversion['search']['func'] = $GLOBALS['VAR_PREFIX'] . '_search';
+$modversion['search']['func'] = $GLOBALS['VAR_PREFIX'].'_search';
 
 // Comments
 $modversion['hasComments'] = 1;
@@ -143,15 +143,15 @@ 
 
 // Comment callback functions
 $modversion['comments']['callbackFile']        = 'include/comment.inc.php';
-$modversion['comments']['callback']['approve'] = $GLOBALS['VAR_PREFIX'] . '_com_approve';
-$modversion['comments']['callback']['update']  = $GLOBALS['VAR_PREFIX'] . '_com_update';
+$modversion['comments']['callback']['approve'] = $GLOBALS['VAR_PREFIX'].'_com_approve';
+$modversion['comments']['callback']['update']  = $GLOBALS['VAR_PREFIX'].'_com_update';
 
 // Configs
 // Config items
 $modversion['config'][] = [
     'name'        => 'do_debug',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_DODEBUG',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_DODEBUG_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1
@@ -159,8 +159,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'do_urw',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_DOURLREWRITE',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_DOURLREWRITE_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => in_array(php_sapi_name(), ['apache', 'apache2handler'])
@@ -168,8 +168,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'theme_set',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_THEMESET',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_THEMESET_DESC',
     'formtype'    => 'select',
     'valuetype'   => 'text',
     'options'     => [_NONE => '0'],
@@ -178,23 +178,23 @@ 
 
 $modversion['config'][] = [
     'name'        => 'timeformat',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT_DESC',
     'formtype'    => 'select',
     'valuetype'   => 'text',
     'options'     => [
         _DATESTRING                                       => 'l',
         _MEDIUMDATESTRING                                 => 'm',
         _SHORTDATESTRING                                  => 's',
-        $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM' => 'c'
+        $GLOBALS['VAR_PREFIXU'].'_MI_TIMEFORMAT_CUSTOM' => 'c'
     ],
     'default'     => 'c'
 ];
 
 $modversion['config'][] = [
     'name'        => 'articles_perpage',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_ARTICLESPERPAGE',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_ARTICLESPERPAGE_DESC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 10
@@ -202,8 +202,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'list_perpage',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_LISTPERPAGE',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_LISTPERPAGE_DESC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 20
@@ -211,8 +211,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'blogs_perupdate',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_BLOGSPERUPDATE',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_BLOGSPERUPDATE_DESC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 10
@@ -220,8 +220,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'article_expire',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_EXPIRE',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_ARTICLE_EXPIRE_DESC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 30
@@ -229,8 +229,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'display_summary',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_DISPLAY_SUMMARY',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_DISPLAY_SUMMARY_DESC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 0
@@ -238,8 +238,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'do_sibling',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_DOSIBLING',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_DOSIBLING_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1
@@ -247,8 +247,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'pings',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PING',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_PING',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_PING_DESC',
     'formtype'    => 'textarea',
     'valuetype'   => 'text',
     'default'     => ''
@@ -256,8 +256,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'trackback_option',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_TRACKBACK_OPTION',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_TRACKBACK_OPTION_DESC',
     'formtype'    => 'select',
     'valuetype'   => 'int',
     'default'     => 0,
@@ -266,17 +266,17 @@ 
 
 $modversion['config'][] = [
     'name'        => 'copyright',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_COPYRIGHT',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_COPYRIGHT_DESC',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => 'Copyright© %s & ' . $xoopsConfig['sitename']
+    'default'     => 'Copyright© %s & '.$xoopsConfig['sitename']
 ];
 
 $modversion['config'][] = [
     'name'        => 'newblog_submit',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_NEWBLOG_SUBMIT',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_NEWBLOG_SUBMIT_DESC',
     'formtype'    => 'select',
     'valuetype'   => 'int',
     'default'     => 2,
@@ -291,8 +291,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'anonymous_rate',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_ANONYMOUSRATE',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_ANONYMOUSRATE_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 0
@@ -300,8 +300,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'do_pseudocron',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC',
+    'title'       => $GLOBALS['VAR_PREFIXU'].'_MI_PSEUDOCRON',
+    'description' => $GLOBALS['VAR_PREFIXU'].'_MI_PSEUDOCRON_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1
@@ -311,7 +311,7 @@ 
 
 $modversion['hasNotification']             = 1;
 $modversion['notification']['lookup_file'] = 'include/notification.inc.php';
-$modversion['notification']['lookup_func'] = $GLOBALS['VAR_PREFIX'] . '_notify_iteminfo';
+$modversion['notification']['lookup_func'] = $GLOBALS['VAR_PREFIX'].'_notify_iteminfo';
 
 $i = 0;
 ++$i;

include/config.php

Indentation +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
 
 $moduleDirName = basename(dirname(__DIR__));
 $uploadFolders = [
-    NEWBB_UPLOAD_PATH,
-    NEWBB_UPLOAD_PATH . '/thumbs'
+	NEWBB_UPLOAD_PATH,
+	NEWBB_UPLOAD_PATH . '/thumbs'
 ];
 
 //$copyFiles = array(

Spacing +2 added lines, -2 removed lines

@@ -20,12 +20,12 @@
  */
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once __DIR__ . '/common.php';
+require_once __DIR__.'/common.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $uploadFolders = [
     NEWBB_UPLOAD_PATH,
-    NEWBB_UPLOAD_PATH . '/thumbs'
+    NEWBB_UPLOAD_PATH.'/thumbs'
 ];
 
 //$copyFiles = array(

include/functions.ini.php

Indentation +72 added lines, -72 removed lines

@@ -32,88 +32,88 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 if (!defined('PLANET_INI')) {
-    exit();
+	exit();
 }
 
 if (!defined('PLANET_FUNCTIONS_INI')):
-    define('PLANET_FUNCTIONS_INI', 1);
+	define('PLANET_FUNCTIONS_INI', 1);
 
-    /**
-     * @param $name
-     * @return mixed
-     */
-    function planet_constant($name)
-    {
-        return mod_constant($name);
-    }
+	/**
+	 * @param $name
+	 * @return mixed
+	 */
+	function planet_constant($name)
+	{
+		return mod_constant($name);
+	}
 
-    /**
-     * @param      $name
-     * @param bool $isRel
-     * @return string
-     */
-    function planet_DB_prefix($name, $isRel = false)
-    {
-        return mod_DB_prefix($name, $isRel);
-    }
+	/**
+	 * @param      $name
+	 * @param bool $isRel
+	 * @return string
+	 */
+	function planet_DB_prefix($name, $isRel = false)
+	{
+		return mod_DB_prefix($name, $isRel);
+	}
 
-    /**
-     * @return bool
-     */
-    function planet_load_object()
-    {
-        return load_object();
-    }
+	/**
+	 * @return bool
+	 */
+	function planet_load_object()
+	{
+		return load_object();
+	}
 
-    /**
-     * @return array|mixed
-     */
-    function planet_load_config()
-    {
-        static $moduleConfig;
-        if (isset($moduleConfig)) {
-            return $moduleConfig;
-        }
+	/**
+	 * @return array|mixed
+	 */
+	function planet_load_config()
+	{
+		static $moduleConfig;
+		if (isset($moduleConfig)) {
+			return $moduleConfig;
+		}
 
-        if (is_object($GLOBALS['xoopsModule'])
-            && $GLOBALS['xoopsModule']->getVar('dirname') == $GLOBALS['moddirname']) {
-            if (isset($GLOBALS['xoopsModuleConfig'])) {
-                $moduleConfig = $GLOBALS['xoopsModuleConfig'];
-            }
-        } else {
-            /** @var XoopsModuleHandler $moduleHandler */
-            $moduleHandler = xoops_getHandler('module');
-            $module        = $moduleHandler->getByDirname($GLOBALS['moddirname']);
+		if (is_object($GLOBALS['xoopsModule'])
+			&& $GLOBALS['xoopsModule']->getVar('dirname') == $GLOBALS['moddirname']) {
+			if (isset($GLOBALS['xoopsModuleConfig'])) {
+				$moduleConfig = $GLOBALS['xoopsModuleConfig'];
+			}
+		} else {
+			/** @var XoopsModuleHandler $moduleHandler */
+			$moduleHandler = xoops_getHandler('module');
+			$module        = $moduleHandler->getByDirname($GLOBALS['moddirname']);
 
-            $configHandler = xoops_getHandler('config');
-            $criteria      = new CriteriaCompo(new Criteria('conf_modid', $module->getVar('mid')));
-            $configs       = $configHandler->getConfigs($criteria);
-            foreach (array_keys($configs) as $i) {
-                $moduleConfig[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
-            }
-            unset($configs);
-        }
-        if ($customConfig = @include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/plugin.php') {
-            $moduleConfig = array_merge($moduleConfig, $customConfig);
-        }
+			$configHandler = xoops_getHandler('config');
+			$criteria      = new CriteriaCompo(new Criteria('conf_modid', $module->getVar('mid')));
+			$configs       = $configHandler->getConfigs($criteria);
+			foreach (array_keys($configs) as $i) {
+				$moduleConfig[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
+			}
+			unset($configs);
+		}
+		if ($customConfig = @include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/plugin.php') {
+			$moduleConfig = array_merge($moduleConfig, $customConfig);
+		}
 
-        return $moduleConfig;
-    }
+		return $moduleConfig;
+	}
 
-    function planet_define_url_delimiter()
-    {
-        if (defined('URL_DELIMITER')) {
-            if (!in_array(URL_DELIMITER, ['?', '/'])) {
-                die('Exit on security');
-            }
-        } else {
-            $moduleConfig = planet_load_config();
-            if (empty($moduleConfig['do_urw'])) {
-                define('URL_DELIMITER', '?');
-            } else {
-                define('URL_DELIMITER', '/');
-            }
-        }
-    }
+	function planet_define_url_delimiter()
+	{
+		if (defined('URL_DELIMITER')) {
+			if (!in_array(URL_DELIMITER, ['?', '/'])) {
+				die('Exit on security');
+			}
+		} else {
+			$moduleConfig = planet_load_config();
+			if (empty($moduleConfig['do_urw'])) {
+				define('URL_DELIMITER', '?');
+			} else {
+				define('URL_DELIMITER', '/');
+			}
+		}
+	}
 
 endif;

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
             if (isset($GLOBALS['xoopsModuleConfig'])) {
                 $moduleConfig = $GLOBALS['xoopsModuleConfig'];
             }
-        } else {
+        }else {
             /** @var XoopsModuleHandler $moduleHandler */
             $moduleHandler = xoops_getHandler('module');
             $module        = $moduleHandler->getByDirname($GLOBALS['moddirname']);
@@ -93,7 +93,7 @@ 
             }
             unset($configs);
         }
-        if ($customConfig = @include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/plugin.php') {
+        if ($customConfig = @include XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/plugin.php') {
             $moduleConfig = array_merge($moduleConfig, $customConfig);
         }
 
@@ -106,11 +106,11 @@ 
             if (!in_array(URL_DELIMITER, ['?', '/'])) {
                 die('Exit on security');
             }
-        } else {
+        }else {
             $moduleConfig = planet_load_config();
             if (empty($moduleConfig['do_urw'])) {
                 define('URL_DELIMITER', '?');
-            } else {
+            }else {
                 define('URL_DELIMITER', '/');
             }
         }

include/common.php

Spacing +10 added lines, -10 removed lines

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

include/form.blog.php

Indentation +18 added lines, -18 removed lines

@@ -43,28 +43,28 @@
 $categories_option = $categoryHandler->getList();
 natsort($categories_option);
 if (count($categories_option)) {
-    $cat_option_tray = new XoopsFormElementTray(planet_constant('MD_CATEGORY'), '<br>');
-    $options         = [0 => _NONE];
-    foreach ($categories_option as $id => $title) {
-        $options[$id] = $title;
-    }
-    $cat_select = new XoopsFormSelect('', 'categories', $categories, 3, true);
-    $cat_select->addOptionArray($options);
-    $cat_option_tray->addElement($cat_select);
-    $form->addElement($cat_option_tray);
+	$cat_option_tray = new XoopsFormElementTray(planet_constant('MD_CATEGORY'), '<br>');
+	$options         = [0 => _NONE];
+	foreach ($categories_option as $id => $title) {
+		$options[$id] = $title;
+	}
+	$cat_select = new XoopsFormSelect('', 'categories', $categories, 3, true);
+	$cat_select->addOptionArray($options);
+	$cat_option_tray->addElement($cat_select);
+	$form->addElement($cat_option_tray);
 }
 
 /* For admin only */
 if (is_object($xoopsUser) && $xoopsUser->isAdmin()) {
-    $status_option_tray = new XoopsFormElementTray(planet_constant('MD_STATUS'), '<br>');
-    $status_select      = new XoopsFormSelect('', 'blog_status', $blog_obj->getVar('blog_status'));
-    $status_select->addOptionArray([
-                                       '0' => planet_constant('MD_PENDING'),
-                                       '1' => planet_constant('MD_ACTIVE'),
-                                       '2' => planet_constant('MD_FEATURED')
-                                   ]);
-    $status_option_tray->addElement($status_select);
-    $form->addElement($status_option_tray);
+	$status_option_tray = new XoopsFormElementTray(planet_constant('MD_STATUS'), '<br>');
+	$status_select      = new XoopsFormSelect('', 'blog_status', $blog_obj->getVar('blog_status'));
+	$status_select->addOptionArray([
+									   '0' => planet_constant('MD_PENDING'),
+									   '1' => planet_constant('MD_ACTIVE'),
+									   '2' => planet_constant('MD_FEATURED')
+								   ]);
+	$status_option_tray->addElement($status_select);
+	$form->addElement($status_option_tray);
 }
 
 $form->addElement(new XoopsFormHidden('blog', $blog_id));

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 $form = new XoopsThemeForm(_EDIT, 'formblog', xoops_getenv('PHP_SELF'), 'POST', true);
@@ -76,7 +76,7 @@ 
 $butt_save = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 $button_tray->addElement($butt_save);
 $butt_cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button');
-$butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . (int)$blog_id . "\"'");
+$butt_cancel->setExtra("onclick='window.document.location=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.(int) $blog_id."\"'");
 $button_tray->addElement($butt_cancel);
 $form->addElement($button_tray);
 $form->display();