mambax7 / planet

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') || die('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

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', '/');
             }
         }

Indentation +72 added lines, -72 removed lines

@@ -32,88 +32,88 @@
 
 // defined('XOOPS_ROOT_PATH') || die('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;

class/xml.php

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('

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 
 // defined('XOOPS_ROOT_PATH') || die('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);
             }
 

class/Utility.php

Doc Comments +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
          * @var mixed  $pattern
          * @var mixed  $replacement
          *
-         * @return bool true on success
+         * @return null|boolean true on success
          */
         public static function planetParseClass($class_string, $pattern = '', $replacement = '')
         {
@@ -153,7 +153,7 @@ 
          * @var mixed  $pattern
          * @var mixed  $replacement
          *
-         * @return bool true on success
+         * @return null|boolean true on success
          */
         public static function planetParseFunction($function_string, $pattern = '', $replacement = '')
         {
@@ -520,7 +520,7 @@ 
 
         /**
          * @param $url
-         * @return bool|string
+         * @return false|string
          */
         public static function planetFetchFopen($url)
         {

Indentation +522 added lines, -522 removed lines

@@ -34,535 +34,535 @@
 
 $current_path = __FILE__;
 if (DIRECTORY_SEPARATOR !== '/') {
-    $current_path = str_replace(strpos($current_path, '\\\\', 2) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
+	$current_path = str_replace(strpos($current_path, '\\\\', 2) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $url_arr               = explode('/', strstr($current_path, '/modules/'));
 $GLOBALS['moddirname'] = $url_arr[2];
 
 if (!defined('planet_FUNCTIONS')):
-    define('planet_FUNCTIONS', 1);
-
-    require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php';
-    require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-    require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php';
-
-    /**
-     * Class Utility
-     */
-    class Utility
-    {
-
-        /**
-         * Function to display messages
-         *
-         * @var mixed $messages
-         * @return bool
-         */
-        public static function planetDisplayMessage($message)
-        {
-            return mod_message($message);
-        }
-
-        /**
-         * Function to parse arguments for a page according to $_SERVER['REQUEST_URI']
-         *
-         * @var array $args_numeric array of numeric variable values
-         * @var array $args         array of indexed variables: name and value
-         * @var array $args_string  array of string variable values
-         *
-         * @return bool true on args parsed
-         */
-
-        /* known issues:
+	define('planet_FUNCTIONS', 1);
+
+	require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php';
+	require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+	require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php';
+
+	/**
+	 * Class Utility
+	 */
+	class Utility
+	{
+
+		/**
+		 * Function to display messages
+		 *
+		 * @var mixed $messages
+		 * @return bool
+		 */
+		public static function planetDisplayMessage($message)
+		{
+			return mod_message($message);
+		}
+
+		/**
+		 * Function to parse arguments for a page according to $_SERVER['REQUEST_URI']
+		 *
+		 * @var array $args_numeric array of numeric variable values
+		 * @var array $args         array of indexed variables: name and value
+		 * @var array $args_string  array of string variable values
+		 *
+		 * @return bool true on args parsed
+		 */
+
+		/* known issues:
          * - "/" in a string
          * - "&" in a string
         */
-        public static function planetParseArguments(&$args_numeric, &$args, &$args_string)
-        {
-            $args_abb     = [
-                'a' => 'article',
-                'b' => 'blog',
-                'c' => 'category',
-                'l' => 'list',
-                'o' => 'sort',
-                's' => 'start',
-                'u' => 'uid'
-            ];
-            $args         = [];
-            $args_numeric = [];
-            $args_string  = [];
-            if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
-                $vars = preg_split("/[\/|&]/", $matches[1]);
-                $vars = array_map('trim', $vars);
-                if (count($vars) > 0) {
-                    foreach ($vars as $var) {
-                        if (is_numeric($var)) {
-                            $args_numeric[] = $var;
-                        } elseif (false === strpos($var, '=')) {
-                            if (is_numeric(substr($var, 1))) {
-                                $args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1);
-                            } else {
-                                $args_string[] = urldecode($var);
-                            }
-                        } else {
-                            parse_str($var, $args);
-                        }
-                    }
-                }
-            }
-
-            return (0 == count($args) + count($args_numeric) + count($args_string)) ? null : true;
-        }
-
-        /**
-         * Function to parse class prefix
-         *
-         * @var string $class_string string to be parsed
-         * @var mixed  $pattern
-         * @var mixed  $replacement
-         *
-         * @return bool true on success
-         */
-        public static function planetParseClass($class_string, $pattern = '', $replacement = '')
-        {
-            if (empty($class_string)) {
-                return;
-            }
-            $patterns     = ["/\[CLASS_PREFIX\]/"];
-            $replacements = [ucfirst(strtolower($GLOBALS['moddirname']))];
-            if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
-                $pattern     = [$pattern];
-                $replacement = [$replacement];
-            }
-            if (is_array($pattern) && count($pattern) > 0) {
-                $ii = 0;
-                foreach ($pattern as $pat) {
-                    if (!in_array($pat, $patterns)) {
-                        $patterns[]     = $pat;
-                        $replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
-                    }
-                    ++$ii;
-                }
-            }
-            $class_string = preg_replace($patterns, $replacements, $class_string);
-            eval($class_string);
-
-            return true;
-        }
-
-        /**
-         * Function to parse function prefix
-         *
-         * @var string $function_string string to be parsed
-         * @var mixed  $pattern
-         * @var mixed  $replacement
-         *
-         * @return bool true on success
-         */
-        public static function planetParseFunction($function_string, $pattern = '', $replacement = '')
-        {
-            if (empty($function_string)) {
-                return;
-            }
-            $patterns     = ["/\[DIRNAME\]/", "/\[VAR_PREFIX\]/"];
-            $replacements = [$GLOBALS['moddirname'], $GLOBALS['VAR_PREFIX']];
-            if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
-                $pattern     = [$pattern];
-                $replacement = [$replacement];
-            }
-            if (is_array($pattern) && count($pattern) > 0) {
-                $ii = 0;
-                foreach ($pattern as $pat) {
-                    if (!in_array($pat, $patterns)) {
-                        $patterns[]     = $pat;
-                        $replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
-                    }
-                    ++$ii;
-                }
-            }
-            $function_string = preg_replace($patterns, $replacements, $function_string);
-            if (is_array($function_string)) {
-                eval($function_string);
-            }
-
-            return true;
-        }
-
-        /**
-         * Function to convert UNIX time to formatted time string
-         * @param        $time
-         * @param string $format
-         * @return string
-         */
-        public static function planetFormatTimestamp($time, $format = '')
-        {
-            if (empty($time)) {
-                return '';
-            }
-
-            return formatTimestamp($time, $format);
-        }
-
-        /**
-         * Function to a list of user names associated with their user IDs
-         * @param int  $userid
-         * @param int  $usereal
-         * @param bool $linked
-         * @return array
-         */
-        public static function &planetGetUnameFromId($userid, $usereal = 0, $linked = false)
-        {
-            if (!is_array($userid)) {
-                $userid = [$userid];
-            }
-            $users =& mod_getUnameFromIds($userid, $usereal, $linked);
-
-            return $users;
-        }
-
-        /**
-         * Function to parse links, links are delimited by link break, URL and title of a link are delimited by space
-         *
-         * @var string $text raw content
-         *
-         * @return array associative array of link url and title
-         */
-        public static function &planetParseLinks($text)
-        {
-            $myts       = \MyTextSanitizer::getInstance();
-            $link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
-            $links      = [];
-            if (count($link_array) > 0) {
-                foreach ($link_array as $link) {
-                    @list($url, $title) = array_map('trim', preg_split('/ /', $link, 2));
-                    if (empty($url)) {
-                        continue;
-                    }
-                    //if(empty($title)) $title = $url;
-                    $links[] = ['url' => $url, 'title' => $myts->htmlSpecialChars($title)];
-                }
-            }
-
-            return $links;
-        }
-
-        /**
-         * @param $pagename
-         * @return string
-         */
-        public static function planetGetTemplate($pagename)
-        {
-            return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl';
-        }
-
-        /**
-         * @param int $currentoption
-         */
-        //public static function planet_adminmenu($currentoption = -1)
-        //{
-        //    loadModuleAdminMenu($currentoption, '');
-        //
-        //    return;
-        //}
-
-        /**
-         * Function to send a trackback
-         *
-         * @param $article
-         * @param $comment
-         * @return bool
-         */
-        public static function planetSendTrackback(&$article, &$comment)
-        {
-            $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
-            $blog_obj    = $blogHandler->get($article->getVar('blog_id'));
-            if (!$pattern = $blog_obj->getVar('blog_trackback')) {
-                return false;
-            }
-
-            @list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern));
-            $trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link'));
-
-            return static::planetTrackback($trackback_url, $article);
-        }
-
-        /**
-         * @param $trackback_url
-         * @param $article
-         * @return bool
-         */
-        public static function planetTrackback($trackback_url, $article)
-        {
-            global $myts, $xoopsConfig, $xoopsModule;
-            /** @var Planet\Helper $helper */
-            $helper = Planet\Helper::getInstance();
-
-            $title         = $article->getVar('art_title');
-            $excerpt       = $article->getVar('art_content');
-            $blog_name     = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name');
-            $title         = xoops_utf8_encode($title);
-            $excerpt       = xoops_utf8_encode($excerpt);
-            $blog_name     = xoops_utf8_encode($blog_name);
-            $charset       = 'utf-8';
-            $title1        = urlencode($title);
-            $excerpt1      = urlencode($excerpt);
-            $name1         = urlencode($blog_name);
-            $url           = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article->getVar('art_id'));
-            $query_string  = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset";
-            $trackback_url = parse_url($trackback_url);
-
-            $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?' . $trackback_url['query'] : '') . " HTTP/1.0\r\n";
-            $http_request .= 'Host: ' . $trackback_url['host'] . "\r\n";
-            $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n";
-            $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
-            $http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION;
-            $http_request .= "\r\n\r\n";
-            $http_request .= $query_string;
-            if ('' == $trackback_url['port']) {
-                $trackback_url['port'] = 80;
-            }
-            $fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
-            @fwrite($fs, $http_request);
-            if ($helper->getConfig('do_debug')) {
-                $debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log';
-                $fr         = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n";
-                $fr         .= "CHARSET:$charset\n";
-                $fr         .= "NAME:$blog_name\n";
-                $fr         .= 'TITLE:' . $title . "\n";
-                $fr         .= "EXCERPT:$excerpt\n\n";
-                while (!@feof($fs)) {
-                    $fr .= @fgets($fs, 4096);
-                }
-                $fr .= "\n\n";
-
-                if ($fp = fopen($debug_file, 'a')) {
-                    fwrite($fp, $fr);
-                    fclose($fp);
-                } else {
-                }
-            }
-            @fclose($fs);
-
-            return true;
-        }
-
-        /**
-         * Function to ping servers
-         * @param $server
-         * @param $id
-         */
-        public static function planetGetPing($server, $id)
-        {
-            if (is_array($server)) {
-                foreach ($server as $serv) {
-                    PlanetUtility::planetGetPing($serv, $id);
-                }
-            }
-            require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php';
-
-            // using a timeout of 3 seconds should be enough to cover slow servers
-            $client            = new IXR_Client($server, false);
-            $client->timeout   = 3;
-            $client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION;
-
-            // when set to true, this outputs debug messages by itself
-            $client->debug = false;
-
-            $blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name'));
-            $home     = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/';
-            $rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id;
-
-            if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping
-                $client->query('weblogUpdates.ping', $blogname, $home);
-            }
-        }
-
-        /**
-         * Function to respond to a trackback
-         * @param int    $error
-         * @param string $error_message
-         */
-        public static function planetRespondToTrackback($error = 0, $error_message = '')
-        {
-            $charset       = 'utf-8';
-            $error_message = xoops_utf8_encode($error_message);
-            header('Content-Type: text/xml; charset="' . $charset . '"');
-            if ($error) {
-                echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
-                echo "<response>\n";
-                echo "<error>1</error>\n";
-                echo "<message>$error_message</message>\n";
-                echo '</response>';
-                die();
-            } else {
-                echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
-                echo "<response>\n";
-                echo "<error>0</error>\n";
-                echo '</response>';
-            }
-        }
-
-        /**
-         * Function to set a cookie with module-specified name
-         *
-         * using customized serialization method
-         * @param        $name
-         * @param string $string
-         * @param int    $expire
-         */
-        public static function planetSetCookie($name, $string = '', $expire = 0)
-        {
-            if (is_array($string)) {
-                $value = [];
-                foreach ($string as $key => $val) {
-                    $value[] = $key . '|' . $val;
-                }
-                $string = implode(',', $value);
-            }
-            setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/');
-        }
-
-        /**
-         * @param      $name
-         * @param bool $isArray
-         * @return array|null
-         */
-        public static function planetGetCookie($name, $isArray = false)
-        {
-            $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null;
-            if ($isArray) {
-                $_value = $value ? explode(',', $value) : [];
-                $value  = [];
-                if (count($_value) > 0) {
-                    foreach ($_value as $string) {
-                        $key         = substr($string, 0, strpos($string, '|'));
-                        $val         = substr($string, strpos($string, '|') + 1);
-                        $value[$key] = $val;
-                    }
-                }
-                unset($_value);
-            }
-
-            return $value;
-        }
-
-        /**
-         * Function to filter text
-         *
-         * @param $document
-         * @return string filtered text
-         */
-        public static function &planetHtml2text(&$document)
-        {
-            $document = strip_tags($document);
-
-            return $document;
-        }
-
-        // Adapted from PMA_getIp() [phpmyadmin project]
-
-        /**
-         * @param bool $asString
-         * @return mixed
-         */
-        public static function planetGetIP($asString = false)
-        {
-            return mod_getIP($asString);
-        }
-
-        /**
-         * @param $url
-         * @return bool|mixed|string
-         */
-        public static function planetGetRemoteContent($url)
-        {
-            if ($data = static::planetFetchSnoopy($url)) {
-                return $data;
-            }
-            if ($data = static::planetFetchCURL($url)) {
-                return $data;
-            }
-            if ($data = static::planetFetchFopen($url)) {
-                return $data;
-            }
-
-            return false;
-        }
-
-        /**
-         * @param $url
-         * @return string
-         */
-        public static function planetFetchSnoopy($url)
-        {
-            require_once XOOPS_ROOT_PATH . '/class/snoopy.php';
-            $snoopy = new Snoopy;
-            $data   = '';
-            if (@$snoopy->fetch($url)) {
-                $data = is_array($snoopy->results) ? implode("\n", $snoopy->results) : $snoopy->results;
-            }
-
-            return $data;
-        }
-
-        /**
-         * @param $url
-         * @return bool|mixed
-         */
-        public static function planetFetchCURL($url)
-        {
-            if (!function_exists('curl_init')) {
-                return false;
-            }
-            $ch = curl_init();    // initialize curl handle
-            curl_setopt($ch, CURLOPT_URL, $url); // set url to post to
-            curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable
-            curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s
-            $data = curl_exec($ch); // run the whole process
-            curl_close($ch);
-
-            return $data;
-        }
-
-        /**
-         * @param $url
-         * @return bool|string
-         */
-        public static function planetFetchFopen($url)
-        {
-            if (!$fp = @fopen($url, 'r')) {
-                return false;
-            }
-            $data = '';
-            while (!feof($fp)) {
-                $data .= fgets($fp, 1024);
-            }
-            fclose($fp);
-
-            return $data;
-        }
-
-        /**
-         * @param     $haystack
-         * @param     $needle
-         * @param int $offset
-         * @return bool|int
-         */
-        public static function planetStrrPos($haystack, $needle, $offset = 0)
-        {
-            if (5 == substr(PHP_VERSION, 0, 1)) {
-                return strrpos($haystack, $needle, $offset);
-            }
-            $index = strpos(strrev($haystack), strrev($needle));
-            if (false === $index) {
-                return false;
-            }
-            $index = strlen($haystack) - strlen($needle) - $index;
-
-            return $index;
-        }
-    }
+		public static function planetParseArguments(&$args_numeric, &$args, &$args_string)
+		{
+			$args_abb     = [
+				'a' => 'article',
+				'b' => 'blog',
+				'c' => 'category',
+				'l' => 'list',
+				'o' => 'sort',
+				's' => 'start',
+				'u' => 'uid'
+			];
+			$args         = [];
+			$args_numeric = [];
+			$args_string  = [];
+			if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
+				$vars = preg_split("/[\/|&]/", $matches[1]);
+				$vars = array_map('trim', $vars);
+				if (count($vars) > 0) {
+					foreach ($vars as $var) {
+						if (is_numeric($var)) {
+							$args_numeric[] = $var;
+						} elseif (false === strpos($var, '=')) {
+							if (is_numeric(substr($var, 1))) {
+								$args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1);
+							} else {
+								$args_string[] = urldecode($var);
+							}
+						} else {
+							parse_str($var, $args);
+						}
+					}
+				}
+			}
+
+			return (0 == count($args) + count($args_numeric) + count($args_string)) ? null : true;
+		}
+
+		/**
+		 * Function to parse class prefix
+		 *
+		 * @var string $class_string string to be parsed
+		 * @var mixed  $pattern
+		 * @var mixed  $replacement
+		 *
+		 * @return bool true on success
+		 */
+		public static function planetParseClass($class_string, $pattern = '', $replacement = '')
+		{
+			if (empty($class_string)) {
+				return;
+			}
+			$patterns     = ["/\[CLASS_PREFIX\]/"];
+			$replacements = [ucfirst(strtolower($GLOBALS['moddirname']))];
+			if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
+				$pattern     = [$pattern];
+				$replacement = [$replacement];
+			}
+			if (is_array($pattern) && count($pattern) > 0) {
+				$ii = 0;
+				foreach ($pattern as $pat) {
+					if (!in_array($pat, $patterns)) {
+						$patterns[]     = $pat;
+						$replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
+					}
+					++$ii;
+				}
+			}
+			$class_string = preg_replace($patterns, $replacements, $class_string);
+			eval($class_string);
+
+			return true;
+		}
+
+		/**
+		 * Function to parse function prefix
+		 *
+		 * @var string $function_string string to be parsed
+		 * @var mixed  $pattern
+		 * @var mixed  $replacement
+		 *
+		 * @return bool true on success
+		 */
+		public static function planetParseFunction($function_string, $pattern = '', $replacement = '')
+		{
+			if (empty($function_string)) {
+				return;
+			}
+			$patterns     = ["/\[DIRNAME\]/", "/\[VAR_PREFIX\]/"];
+			$replacements = [$GLOBALS['moddirname'], $GLOBALS['VAR_PREFIX']];
+			if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
+				$pattern     = [$pattern];
+				$replacement = [$replacement];
+			}
+			if (is_array($pattern) && count($pattern) > 0) {
+				$ii = 0;
+				foreach ($pattern as $pat) {
+					if (!in_array($pat, $patterns)) {
+						$patterns[]     = $pat;
+						$replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
+					}
+					++$ii;
+				}
+			}
+			$function_string = preg_replace($patterns, $replacements, $function_string);
+			if (is_array($function_string)) {
+				eval($function_string);
+			}
+
+			return true;
+		}
+
+		/**
+		 * Function to convert UNIX time to formatted time string
+		 * @param        $time
+		 * @param string $format
+		 * @return string
+		 */
+		public static function planetFormatTimestamp($time, $format = '')
+		{
+			if (empty($time)) {
+				return '';
+			}
+
+			return formatTimestamp($time, $format);
+		}
+
+		/**
+		 * Function to a list of user names associated with their user IDs
+		 * @param int  $userid
+		 * @param int  $usereal
+		 * @param bool $linked
+		 * @return array
+		 */
+		public static function &planetGetUnameFromId($userid, $usereal = 0, $linked = false)
+		{
+			if (!is_array($userid)) {
+				$userid = [$userid];
+			}
+			$users =& mod_getUnameFromIds($userid, $usereal, $linked);
+
+			return $users;
+		}
+
+		/**
+		 * Function to parse links, links are delimited by link break, URL and title of a link are delimited by space
+		 *
+		 * @var string $text raw content
+		 *
+		 * @return array associative array of link url and title
+		 */
+		public static function &planetParseLinks($text)
+		{
+			$myts       = \MyTextSanitizer::getInstance();
+			$link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
+			$links      = [];
+			if (count($link_array) > 0) {
+				foreach ($link_array as $link) {
+					@list($url, $title) = array_map('trim', preg_split('/ /', $link, 2));
+					if (empty($url)) {
+						continue;
+					}
+					//if(empty($title)) $title = $url;
+					$links[] = ['url' => $url, 'title' => $myts->htmlSpecialChars($title)];
+				}
+			}
+
+			return $links;
+		}
+
+		/**
+		 * @param $pagename
+		 * @return string
+		 */
+		public static function planetGetTemplate($pagename)
+		{
+			return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl';
+		}
+
+		/**
+		 * @param int $currentoption
+		 */
+		//public static function planet_adminmenu($currentoption = -1)
+		//{
+		//    loadModuleAdminMenu($currentoption, '');
+		//
+		//    return;
+		//}
+
+		/**
+		 * Function to send a trackback
+		 *
+		 * @param $article
+		 * @param $comment
+		 * @return bool
+		 */
+		public static function planetSendTrackback(&$article, &$comment)
+		{
+			$blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
+			$blog_obj    = $blogHandler->get($article->getVar('blog_id'));
+			if (!$pattern = $blog_obj->getVar('blog_trackback')) {
+				return false;
+			}
+
+			@list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern));
+			$trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link'));
+
+			return static::planetTrackback($trackback_url, $article);
+		}
+
+		/**
+		 * @param $trackback_url
+		 * @param $article
+		 * @return bool
+		 */
+		public static function planetTrackback($trackback_url, $article)
+		{
+			global $myts, $xoopsConfig, $xoopsModule;
+			/** @var Planet\Helper $helper */
+			$helper = Planet\Helper::getInstance();
+
+			$title         = $article->getVar('art_title');
+			$excerpt       = $article->getVar('art_content');
+			$blog_name     = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name');
+			$title         = xoops_utf8_encode($title);
+			$excerpt       = xoops_utf8_encode($excerpt);
+			$blog_name     = xoops_utf8_encode($blog_name);
+			$charset       = 'utf-8';
+			$title1        = urlencode($title);
+			$excerpt1      = urlencode($excerpt);
+			$name1         = urlencode($blog_name);
+			$url           = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article->getVar('art_id'));
+			$query_string  = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset";
+			$trackback_url = parse_url($trackback_url);
+
+			$http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?' . $trackback_url['query'] : '') . " HTTP/1.0\r\n";
+			$http_request .= 'Host: ' . $trackback_url['host'] . "\r\n";
+			$http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n";
+			$http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
+			$http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION;
+			$http_request .= "\r\n\r\n";
+			$http_request .= $query_string;
+			if ('' == $trackback_url['port']) {
+				$trackback_url['port'] = 80;
+			}
+			$fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
+			@fwrite($fs, $http_request);
+			if ($helper->getConfig('do_debug')) {
+				$debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log';
+				$fr         = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n";
+				$fr         .= "CHARSET:$charset\n";
+				$fr         .= "NAME:$blog_name\n";
+				$fr         .= 'TITLE:' . $title . "\n";
+				$fr         .= "EXCERPT:$excerpt\n\n";
+				while (!@feof($fs)) {
+					$fr .= @fgets($fs, 4096);
+				}
+				$fr .= "\n\n";
+
+				if ($fp = fopen($debug_file, 'a')) {
+					fwrite($fp, $fr);
+					fclose($fp);
+				} else {
+				}
+			}
+			@fclose($fs);
+
+			return true;
+		}
+
+		/**
+		 * Function to ping servers
+		 * @param $server
+		 * @param $id
+		 */
+		public static function planetGetPing($server, $id)
+		{
+			if (is_array($server)) {
+				foreach ($server as $serv) {
+					PlanetUtility::planetGetPing($serv, $id);
+				}
+			}
+			require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php';
+
+			// using a timeout of 3 seconds should be enough to cover slow servers
+			$client            = new IXR_Client($server, false);
+			$client->timeout   = 3;
+			$client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION;
+
+			// when set to true, this outputs debug messages by itself
+			$client->debug = false;
+
+			$blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name'));
+			$home     = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/';
+			$rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id;
+
+			if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping
+				$client->query('weblogUpdates.ping', $blogname, $home);
+			}
+		}
+
+		/**
+		 * Function to respond to a trackback
+		 * @param int    $error
+		 * @param string $error_message
+		 */
+		public static function planetRespondToTrackback($error = 0, $error_message = '')
+		{
+			$charset       = 'utf-8';
+			$error_message = xoops_utf8_encode($error_message);
+			header('Content-Type: text/xml; charset="' . $charset . '"');
+			if ($error) {
+				echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+				echo "<response>\n";
+				echo "<error>1</error>\n";
+				echo "<message>$error_message</message>\n";
+				echo '</response>';
+				die();
+			} else {
+				echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+				echo "<response>\n";
+				echo "<error>0</error>\n";
+				echo '</response>';
+			}
+		}
+
+		/**
+		 * Function to set a cookie with module-specified name
+		 *
+		 * using customized serialization method
+		 * @param        $name
+		 * @param string $string
+		 * @param int    $expire
+		 */
+		public static function planetSetCookie($name, $string = '', $expire = 0)
+		{
+			if (is_array($string)) {
+				$value = [];
+				foreach ($string as $key => $val) {
+					$value[] = $key . '|' . $val;
+				}
+				$string = implode(',', $value);
+			}
+			setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/');
+		}
+
+		/**
+		 * @param      $name
+		 * @param bool $isArray
+		 * @return array|null
+		 */
+		public static function planetGetCookie($name, $isArray = false)
+		{
+			$value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null;
+			if ($isArray) {
+				$_value = $value ? explode(',', $value) : [];
+				$value  = [];
+				if (count($_value) > 0) {
+					foreach ($_value as $string) {
+						$key         = substr($string, 0, strpos($string, '|'));
+						$val         = substr($string, strpos($string, '|') + 1);
+						$value[$key] = $val;
+					}
+				}
+				unset($_value);
+			}
+
+			return $value;
+		}
+
+		/**
+		 * Function to filter text
+		 *
+		 * @param $document
+		 * @return string filtered text
+		 */
+		public static function &planetHtml2text(&$document)
+		{
+			$document = strip_tags($document);
+
+			return $document;
+		}
+
+		// Adapted from PMA_getIp() [phpmyadmin project]
+
+		/**
+		 * @param bool $asString
+		 * @return mixed
+		 */
+		public static function planetGetIP($asString = false)
+		{
+			return mod_getIP($asString);
+		}
+
+		/**
+		 * @param $url
+		 * @return bool|mixed|string
+		 */
+		public static function planetGetRemoteContent($url)
+		{
+			if ($data = static::planetFetchSnoopy($url)) {
+				return $data;
+			}
+			if ($data = static::planetFetchCURL($url)) {
+				return $data;
+			}
+			if ($data = static::planetFetchFopen($url)) {
+				return $data;
+			}
+
+			return false;
+		}
+
+		/**
+		 * @param $url
+		 * @return string
+		 */
+		public static function planetFetchSnoopy($url)
+		{
+			require_once XOOPS_ROOT_PATH . '/class/snoopy.php';
+			$snoopy = new Snoopy;
+			$data   = '';
+			if (@$snoopy->fetch($url)) {
+				$data = is_array($snoopy->results) ? implode("\n", $snoopy->results) : $snoopy->results;
+			}
+
+			return $data;
+		}
+
+		/**
+		 * @param $url
+		 * @return bool|mixed
+		 */
+		public static function planetFetchCURL($url)
+		{
+			if (!function_exists('curl_init')) {
+				return false;
+			}
+			$ch = curl_init();    // initialize curl handle
+			curl_setopt($ch, CURLOPT_URL, $url); // set url to post to
+			curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable
+			curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s
+			$data = curl_exec($ch); // run the whole process
+			curl_close($ch);
+
+			return $data;
+		}
+
+		/**
+		 * @param $url
+		 * @return bool|string
+		 */
+		public static function planetFetchFopen($url)
+		{
+			if (!$fp = @fopen($url, 'r')) {
+				return false;
+			}
+			$data = '';
+			while (!feof($fp)) {
+				$data .= fgets($fp, 1024);
+			}
+			fclose($fp);
+
+			return $data;
+		}
+
+		/**
+		 * @param     $haystack
+		 * @param     $needle
+		 * @param int $offset
+		 * @return bool|int
+		 */
+		public static function planetStrrPos($haystack, $needle, $offset = 0)
+		{
+			if (5 == substr(PHP_VERSION, 0, 1)) {
+				return strrpos($haystack, $needle, $offset);
+			}
+			$index = strpos(strrev($haystack), strrev($needle));
+			if (false === $index) {
+				return false;
+			}
+			$index = strlen($haystack) - strlen($needle) - $index;
+
+			return $index;
+		}
+	}
 
 endif;

Spacing +42 added lines, -42 removed lines

@@ -42,9 +42,9 @@ 
 if (!defined('planet_FUNCTIONS')):
     define('planet_FUNCTIONS', 1);
 
-    require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php';
-    require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-    require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php';
+    require XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/vars.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+    require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.php';
 
     /**
      * Class Utility
@@ -79,7 +79,7 @@ 
         */
         public static function planetParseArguments(&$args_numeric, &$args, &$args_string)
         {
-            $args_abb     = [
+            $args_abb = [
                 'a' => 'article',
                 'b' => 'blog',
                 'c' => 'category',
@@ -94,24 +94,24 @@ 
             if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) {
                 $vars = preg_split("/[\/|&]/", $matches[1]);
                 $vars = array_map('trim', $vars);
-                if (count($vars) > 0) {
+                if (count($vars)>0) {
                     foreach ($vars as $var) {
                         if (is_numeric($var)) {
                             $args_numeric[] = $var;
                         } elseif (false === strpos($var, '=')) {
                             if (is_numeric(substr($var, 1))) {
-                                $args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1);
-                            } else {
+                                $args[$args_abb[strtolower($var{0})]] = (int) substr($var, 1);
+                            }else {
                                 $args_string[] = urldecode($var);
                             }
-                        } else {
+                        }else {
                             parse_str($var, $args);
                         }
                     }
                 }
             }
 
-            return (0 == count($args) + count($args_numeric) + count($args_string)) ? null : true;
+            return (0 == count($args)+count($args_numeric)+count($args_string)) ? null : true;
         }
 
         /**
@@ -134,7 +134,7 @@ 
                 $pattern     = [$pattern];
                 $replacement = [$replacement];
             }
-            if (is_array($pattern) && count($pattern) > 0) {
+            if (is_array($pattern) && count($pattern)>0) {
                 $ii = 0;
                 foreach ($pattern as $pat) {
                     if (!in_array($pat, $patterns)) {
@@ -170,7 +170,7 @@ 
                 $pattern     = [$pattern];
                 $replacement = [$replacement];
             }
-            if (is_array($pattern) && count($pattern) > 0) {
+            if (is_array($pattern) && count($pattern)>0) {
                 $ii = 0;
                 foreach ($pattern as $pat) {
                     if (!in_array($pat, $patterns)) {
@@ -215,7 +215,7 @@ 
             if (!is_array($userid)) {
                 $userid = [$userid];
             }
-            $users =& mod_getUnameFromIds($userid, $usereal, $linked);
+            $users = & mod_getUnameFromIds($userid, $usereal, $linked);
 
             return $users;
         }
@@ -232,7 +232,7 @@ 
             $myts       = \MyTextSanitizer::getInstance();
             $link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
             $links      = [];
-            if (count($link_array) > 0) {
+            if (count($link_array)>0) {
                 foreach ($link_array as $link) {
                     @list($url, $title) = array_map('trim', preg_split('/ /', $link, 2));
                     if (empty($url)) {
@@ -252,7 +252,7 @@ 
          */
         public static function planetGetTemplate($pagename)
         {
-            return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl';
+            return $GLOBALS['VAR_PREFIX'].'_'.$pagename.'.tpl';
         }
 
         /**
@@ -281,7 +281,7 @@ 
             }
 
             @list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern));
-            $trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link'));
+            $trackback_url = preg_replace('#'.$pat.'#', $rep, $article_obj->getVar('art_link'));
 
             return static::planetTrackback($trackback_url, $article);
         }
@@ -299,7 +299,7 @@ 
 
             $title         = $article->getVar('art_title');
             $excerpt       = $article->getVar('art_content');
-            $blog_name     = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name');
+            $blog_name     = $xoopsConfig['sitename'].'-'.$xoopsModule->getVar('name');
             $title         = xoops_utf8_encode($title);
             $excerpt       = xoops_utf8_encode($excerpt);
             $blog_name     = xoops_utf8_encode($blog_name);
@@ -307,15 +307,15 @@ 
             $title1        = urlencode($title);
             $excerpt1      = urlencode($excerpt);
             $name1         = urlencode($blog_name);
-            $url           = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article->getVar('art_id'));
+            $url           = urlencode(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article->getVar('art_id'));
             $query_string  = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset";
             $trackback_url = parse_url($trackback_url);
 
-            $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?' . $trackback_url['query'] : '') . " HTTP/1.0\r\n";
-            $http_request .= 'Host: ' . $trackback_url['host'] . "\r\n";
-            $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n";
-            $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
-            $http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION;
+            $http_request = 'POST '.$trackback_url['path'].($trackback_url['query'] ? '?'.$trackback_url['query'] : '')." HTTP/1.0\r\n";
+            $http_request .= 'Host: '.$trackback_url['host']."\r\n";
+            $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.$charset."\r\n";
+            $http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
+            $http_request .= 'User-Agent: XOOPS Blogs/'.XOOPS_VERSION;
             $http_request .= "\r\n\r\n";
             $http_request .= $query_string;
             if ('' == $trackback_url['port']) {
@@ -324,11 +324,11 @@ 
             $fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
             @fwrite($fs, $http_request);
             if ($helper->getConfig('do_debug')) {
-                $debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log';
+                $debug_file = XOOPS_CACHE_PATH.'/'.$GLOBALS['moddirname'].'_trackback.log';
                 $fr         = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n";
                 $fr         .= "CHARSET:$charset\n";
                 $fr         .= "NAME:$blog_name\n";
-                $fr         .= 'TITLE:' . $title . "\n";
+                $fr         .= 'TITLE:'.$title."\n";
                 $fr         .= "EXCERPT:$excerpt\n\n";
                 while (!@feof($fs)) {
                     $fr .= @fgets($fs, 4096);
@@ -338,7 +338,7 @@ 
                 if ($fp = fopen($debug_file, 'a')) {
                     fwrite($fp, $fr);
                     fclose($fp);
-                } else {
+                }else {
                 }
             }
             @fclose($fs);
@@ -358,19 +358,19 @@ 
                     PlanetUtility::planetGetPing($serv, $id);
                 }
             }
-            require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/class-IXR.php';
 
             // using a timeout of 3 seconds should be enough to cover slow servers
             $client            = new IXR_Client($server, false);
             $client->timeout   = 3;
-            $client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION;
+            $client->useragent .= ' -- XOOPS Article/'.XOOPS_VERSION;
 
             // when set to true, this outputs debug messages by itself
             $client->debug = false;
 
             $blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name'));
-            $home     = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/';
-            $rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id;
+            $home     = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/';
+            $rss2_url = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php'.URL_DELIMITER.'rss2.0/'.$id;
 
             if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping
                 $client->query('weblogUpdates.ping', $blogname, $home);
@@ -386,16 +386,16 @@ 
         {
             $charset       = 'utf-8';
             $error_message = xoops_utf8_encode($error_message);
-            header('Content-Type: text/xml; charset="' . $charset . '"');
+            header('Content-Type: text/xml; charset="'.$charset.'"');
             if ($error) {
-                echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+                echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
                 echo "<response>\n";
                 echo "<error>1</error>\n";
                 echo "<message>$error_message</message>\n";
                 echo '</response>';
                 die();
-            } else {
-                echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+            }else {
+                echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
                 echo "<response>\n";
                 echo "<error>0</error>\n";
                 echo '</response>';
@@ -415,11 +415,11 @@ 
             if (is_array($string)) {
                 $value = [];
                 foreach ($string as $key => $val) {
-                    $value[] = $key . '|' . $val;
+                    $value[] = $key.'|'.$val;
                 }
                 $string = implode(',', $value);
             }
-            setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/');
+            setcookie($GLOBALS['VAR_PREFIX'].$name, $string, (int) $expire, '/');
         }
 
         /**
@@ -429,14 +429,14 @@ 
          */
         public static function planetGetCookie($name, $isArray = false)
         {
-            $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null;
+            $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'].$name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'].$name] : null;
             if ($isArray) {
                 $_value = $value ? explode(',', $value) : [];
                 $value  = [];
-                if (count($_value) > 0) {
+                if (count($_value)>0) {
                     foreach ($_value as $string) {
                         $key         = substr($string, 0, strpos($string, '|'));
-                        $val         = substr($string, strpos($string, '|') + 1);
+                        $val         = substr($string, strpos($string, '|')+1);
                         $value[$key] = $val;
                     }
                 }
@@ -495,7 +495,7 @@ 
          */
         public static function planetFetchSnoopy($url)
         {
-            require_once XOOPS_ROOT_PATH . '/class/snoopy.php';
+            require_once XOOPS_ROOT_PATH.'/class/snoopy.php';
             $snoopy = new Snoopy;
             $data   = '';
             if (@$snoopy->fetch($url)) {
@@ -514,10 +514,10 @@ 
             if (!function_exists('curl_init')) {
                 return false;
             }
-            $ch = curl_init();    // initialize curl handle
+            $ch = curl_init(); // initialize curl handle
             curl_setopt($ch, CURLOPT_URL, $url); // set url to post to
             curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); // allow redirects
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable
             curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s
             $data = curl_exec($ch); // run the whole process
@@ -559,7 +559,7 @@ 
             if (false === $index) {
                 return false;
             }
-            $index = strlen($haystack) - strlen($needle) - $index;
+            $index = strlen($haystack)-strlen($needle)-$index;
 
             return $index;
         }

action.article.php

Indentation +47 added lines, -47 removed lines

@@ -30,10 +30,10 @@ 
 
 $art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET');//(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
 if (empty($art_id)) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 if (!$xoopsUser->isAdmin()) {
-    redirect_header('javascript:history.go(-1);', 2, _NOPERM);
+	redirect_header('javascript:history.go(-1);', 2, _NOPERM);
 }
 include XOOPS_ROOT_PATH . '/header.php';
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
@@ -44,58 +44,58 @@ 
 $op = Request::getCmd('op', 'check', 'POST');//isset($_POST['op']) ? $_POST['op'] : '';
 
 if ('del' === $op || !empty(Request::getString('del', '', 'POST'))) {
-    $articleHandler->delete($article_obj);
-    $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-    $message  = planet_constant('MD_SAVED');
-    redirect_header($redirect, 2, $message);
+	$articleHandler->delete($article_obj);
+	$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+	$message  = planet_constant('MD_SAVED');
+	redirect_header($redirect, 2, $message);
 } elseif ('save' === $op) {
-    if (empty($_POST['art_content'])) {
-        redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_TEXTEMPTY'));
-    }
+	if (empty($_POST['art_content'])) {
+		redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_TEXTEMPTY'));
+	}
 
-    foreach ([
-                 'art_title',
-                 'art_link',
-                 'art_author',
-                 'art_content'
-             ] as $tag) {
-        if (@Request::getString('tag', '', 'POST') != $article_obj->getVar($tag)) {
-            $article_obj->setVar($tag, @Request::getString('tag', '', 'POST'));
-        }
-    }
+	foreach ([
+				 'art_title',
+				 'art_link',
+				 'art_author',
+				 'art_content'
+			 ] as $tag) {
+		if (@Request::getString('tag', '', 'POST') != $article_obj->getVar($tag)) {
+			$article_obj->setVar($tag, @Request::getString('tag', '', 'POST'));
+		}
+	}
 
-    $art_id_new = $articleHandler->insert($article_obj);
-    if (!$article_obj->getVar('art_id')) {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-        $message  = planet_constant('MD_INSERTERROR');
-    } else {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-        $message  = planet_constant('MD_SAVED');
-    }
-    redirect_header($redirect, 2, $message);
+	$art_id_new = $articleHandler->insert($article_obj);
+	if (!$article_obj->getVar('art_id')) {
+		$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+		$message  = planet_constant('MD_INSERTERROR');
+	} else {
+		$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+		$message  = planet_constant('MD_SAVED');
+	}
+	redirect_header($redirect, 2, $message);
 } else {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+	require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
 
-    $form = new \XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
+	$form = new \XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
 
-    $form->addElement(new \XoopsFormText(planet_constant('MD_TITLE'), 'art_title', 50, 255, $article_obj->getVar('art_title', 'E')), true);
-    $form->addElement(new \XoopsFormText(planet_constant('MD_LINK'), 'art_link', 50, 255, $article_obj->getVar('art_link', 'E')), true);
-    $form->addElement(new \XoopsFormText(planet_constant('MD_AUTHOR'), 'art_author', 80, 255, $article_obj->getVar('art_author', 'E')));
-    $form->addElement(new \XoopsFormTextArea(planet_constant('MD_CONTENT'), 'art_content', $article_obj->getVar('art_content', 'E')), true);
+	$form->addElement(new \XoopsFormText(planet_constant('MD_TITLE'), 'art_title', 50, 255, $article_obj->getVar('art_title', 'E')), true);
+	$form->addElement(new \XoopsFormText(planet_constant('MD_LINK'), 'art_link', 50, 255, $article_obj->getVar('art_link', 'E')), true);
+	$form->addElement(new \XoopsFormText(planet_constant('MD_AUTHOR'), 'art_author', 80, 255, $article_obj->getVar('art_author', 'E')));
+	$form->addElement(new \XoopsFormTextArea(planet_constant('MD_CONTENT'), 'art_content', $article_obj->getVar('art_content', 'E')), true);
 
-    $form->addElement(new \XoopsFormHidden('article', $art_id));
-    $form->addElement(new \XoopsFormHidden('op', 'save'));
+	$form->addElement(new \XoopsFormHidden('article', $art_id));
+	$form->addElement(new \XoopsFormHidden('op', 'save'));
 
-    $button_tray = new \XoopsFormElementTray('', '');
-    $butt_save   = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-    $button_tray->addElement($butt_save);
-    $butt_del = new \XoopsFormButton('', 'del', _DELETE, 'submit');
-    $butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
-    $button_tray->addElement($butt_del);
-    $butt_cancel = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
-    $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $art_id . "\"'");
-    $button_tray->addElement($butt_cancel);
-    $form->addElement($button_tray);
-    $form->display();
+	$button_tray = new \XoopsFormElementTray('', '');
+	$butt_save   = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+	$button_tray->addElement($butt_save);
+	$butt_del = new \XoopsFormButton('', 'del', _DELETE, 'submit');
+	$butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
+	$button_tray->addElement($butt_del);
+	$butt_cancel = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
+	$butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $art_id . "\"'");
+	$button_tray->addElement($butt_cancel);
+	$form->addElement($button_tray);
+	$form->display();
 }
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +13 added lines, -13 removed lines

@@ -26,26 +26,26 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
-$art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET');//(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
+$art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET'); //(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
 if (empty($art_id)) {
     redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 if (!$xoopsUser->isAdmin()) {
     redirect_header('javascript:history.go(-1);', 2, _NOPERM);
 }
-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';
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $article_obj    = $articleHandler->get($art_id);
 
-$op = Request::getCmd('op', 'check', 'POST');//isset($_POST['op']) ? $_POST['op'] : '';
+$op = Request::getCmd('op', 'check', 'POST'); //isset($_POST['op']) ? $_POST['op'] : '';
 
 if ('del' === $op || !empty(Request::getString('del', '', 'POST'))) {
     $articleHandler->delete($article_obj);
-    $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+    $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
     $message  = planet_constant('MD_SAVED');
     redirect_header($redirect, 2, $message);
 } elseif ('save' === $op) {
@@ -66,15 +66,15 @@ 
 
     $art_id_new = $articleHandler->insert($article_obj);
     if (!$article_obj->getVar('art_id')) {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+        $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
         $message  = planet_constant('MD_INSERTERROR');
-    } else {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+    }else {
+        $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id');
         $message  = planet_constant('MD_SAVED');
     }
     redirect_header($redirect, 2, $message);
-} else {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+}else {
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     $form = new \XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
 
@@ -93,9 +93,9 @@ 
     $butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
     $button_tray->addElement($butt_del);
     $butt_cancel = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
-    $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $art_id . "\"'");
+    $butt_cancel->setExtra("onclick='window.document.location=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$art_id."\"'");
     $button_tray->addElement($butt_cancel);
     $form->addElement($button_tray);
     $form->display();
 }
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

tests/testdata/index.php

Indentation +9 added lines, -9 removed lines

@@ -21,21 +21,21 @@
 $op = \Xmf\Request::getCmd('op', '');
 
 switch ($op) {
-    case 'load':
-        loadSampleData();
-        break;
+	case 'load':
+		loadSampleData();
+		break;
 }
 
 // XMF TableLoad for SAMPLE data
 
 function loadSampleData()
 {
-    //    $moduleDirName = basename(dirname(__DIR__));
-    xoops_loadLanguage('comment');
-    $items = \Xmf\Yaml::readWrapped('quotes_data.yml');
+	//    $moduleDirName = basename(dirname(__DIR__));
+	xoops_loadLanguage('comment');
+	$items = \Xmf\Yaml::readWrapped('quotes_data.yml');
 
-    \Xmf\Database\TableLoad::truncateTable('randomquote_quotes');
-    \Xmf\Database\TableLoad::loadTableFromArray('randomquote_quotes', $items);
+	\Xmf\Database\TableLoad::truncateTable('randomquote_quotes');
+	\Xmf\Database\TableLoad::loadTableFromArray('randomquote_quotes', $items);
 
-    redirect_header('../admin/index.php', 1, _CM_ACTIVE);
+	redirect_header('../admin/index.php', 1, _CM_ACTIVE);
 }

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  * @author          Michael Beck (aka Mamba)
  */
 
-require_once __DIR__ . '/../../../mainfile.php';
+require_once __DIR__.'/../../../mainfile.php';
 
 
 $op = \Xmf\Request::getCmd('op', '');

action.bookmark.php

Indentation +4 added lines, -4 removed lines

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

Spacing +7 added lines, -7 removed lines

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

trackback.php

Indentation +142 added lines, -142 removed lines

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

Spacing +22 added lines, -22 removed lines

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

action.rate.php

Indentation +47 added lines, -47 removed lines

@@ -37,61 +37,61 @@
 $blog_id    = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0));
 
 if (empty($article_id) && empty($blog_id)) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $blogHandler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
-    $message = planet_constant('MD_NOACCESS');
+	$message = planet_constant('MD_NOACCESS');
 } else {
-    $uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
-    $ip  = PlanetUtility::planetGetIP();
-    if ($article_id > 0) {
-        $criteria = new \CriteriaCompo(new \Criteria('art_id', $article_id));
-    } else {
-        $criteria = new \CriteriaCompo(new \Criteria('blog_id', $blog_id));
-    }
-    if ($uid > 0) {
-        $criteria->add(new \Criteria('rate_uid', $uid));
-    } else {
-        $criteria->add(new \Criteria('rate_ip', $ip));
-        $criteria->add(new \Criteria('rate_time', time() - 24 * 3600, '>'));
-    }
-    $rateHandler = xoops_getModuleHandler('rate', $GLOBALS['moddirname']);
-    if ($count = $rateHandler->getCount($criteria)) {
-        $message = planet_constant('MD_ALREADYRATED');
-    } else {
-        $rate_obj = $rateHandler->create();
-        if ($article_id > 0) {
-            $rate_obj->setVar('art_id', $article_id);
-        } else {
-            $rate_obj->setVar('blog_id', $blog_id);
-        }
-        $rate_obj->setVar('rate_uid', $uid);
-        $rate_obj->setVar('rate_ip', $ip);
-        $rate_obj->setVar('rate_rating', $rate);
-        $rate_obj->setVar('rate_time', time());
-        if (!$rate_id = $rateHandler->insert($rate_obj, true)) {
-            redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_NOTSAVED'));
-        }
-        if ($article_id > 0) {
-            $article_obj = $articleHandler->get($article_id);
-            $article_obj->setVar('art_rating', $article_obj->getVar('art_rating') + $rate);
-            $article_obj->setVar('art_rates', $article_obj->getVar('art_rates') + 1);
-            $articleHandler->insert($article_obj, true);
-        } else {
-            $blog_obj = $blogHandler->get($blog_id);
-            $blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating') + $rate);
-            $blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates') + 1);
-            $blogHandler->insert($blog_obj, true);
-        }
-        $message = planet_constant('MD_ACTIONDONE');
-    }
+	$uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+	$ip  = PlanetUtility::planetGetIP();
+	if ($article_id > 0) {
+		$criteria = new \CriteriaCompo(new \Criteria('art_id', $article_id));
+	} else {
+		$criteria = new \CriteriaCompo(new \Criteria('blog_id', $blog_id));
+	}
+	if ($uid > 0) {
+		$criteria->add(new \Criteria('rate_uid', $uid));
+	} else {
+		$criteria->add(new \Criteria('rate_ip', $ip));
+		$criteria->add(new \Criteria('rate_time', time() - 24 * 3600, '>'));
+	}
+	$rateHandler = xoops_getModuleHandler('rate', $GLOBALS['moddirname']);
+	if ($count = $rateHandler->getCount($criteria)) {
+		$message = planet_constant('MD_ALREADYRATED');
+	} else {
+		$rate_obj = $rateHandler->create();
+		if ($article_id > 0) {
+			$rate_obj->setVar('art_id', $article_id);
+		} else {
+			$rate_obj->setVar('blog_id', $blog_id);
+		}
+		$rate_obj->setVar('rate_uid', $uid);
+		$rate_obj->setVar('rate_ip', $ip);
+		$rate_obj->setVar('rate_rating', $rate);
+		$rate_obj->setVar('rate_time', time());
+		if (!$rate_id = $rateHandler->insert($rate_obj, true)) {
+			redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_NOTSAVED'));
+		}
+		if ($article_id > 0) {
+			$article_obj = $articleHandler->get($article_id);
+			$article_obj->setVar('art_rating', $article_obj->getVar('art_rating') + $rate);
+			$article_obj->setVar('art_rates', $article_obj->getVar('art_rates') + 1);
+			$articleHandler->insert($article_obj, true);
+		} else {
+			$blog_obj = $blogHandler->get($blog_id);
+			$blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating') + $rate);
+			$blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates') + 1);
+			$blogHandler->insert($blog_obj, true);
+		}
+		$message = planet_constant('MD_ACTIONDONE');
+	}
 }
 if ($article_id > 0) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_id, 2, $message);
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_id, 2, $message);
 } else {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
 }
 include __DIR__ . '/footer.php';

Spacing +21 added lines, -21 removed lines

@@ -27,7 +27,7 @@ 
 use Xmf\Request;
 use XoopsModules\Planet;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
@@ -44,28 +44,28 @@ 
 $blogHandler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
     $message = planet_constant('MD_NOACCESS');
-} else {
+}else {
     $uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
     $ip  = PlanetUtility::planetGetIP();
-    if ($article_id > 0) {
+    if ($article_id>0) {
         $criteria = new \CriteriaCompo(new \Criteria('art_id', $article_id));
-    } else {
+    }else {
         $criteria = new \CriteriaCompo(new \Criteria('blog_id', $blog_id));
     }
-    if ($uid > 0) {
+    if ($uid>0) {
         $criteria->add(new \Criteria('rate_uid', $uid));
-    } else {
+    }else {
         $criteria->add(new \Criteria('rate_ip', $ip));
-        $criteria->add(new \Criteria('rate_time', time() - 24 * 3600, '>'));
+        $criteria->add(new \Criteria('rate_time', time()-24*3600, '>'));
     }
     $rateHandler = xoops_getModuleHandler('rate', $GLOBALS['moddirname']);
     if ($count = $rateHandler->getCount($criteria)) {
         $message = planet_constant('MD_ALREADYRATED');
-    } else {
+    }else {
         $rate_obj = $rateHandler->create();
-        if ($article_id > 0) {
+        if ($article_id>0) {
             $rate_obj->setVar('art_id', $article_id);
-        } else {
+        }else {
             $rate_obj->setVar('blog_id', $blog_id);
         }
         $rate_obj->setVar('rate_uid', $uid);
@@ -75,23 +75,23 @@ 
         if (!$rate_id = $rateHandler->insert($rate_obj, true)) {
             redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_NOTSAVED'));
         }
-        if ($article_id > 0) {
+        if ($article_id>0) {
             $article_obj = $articleHandler->get($article_id);
-            $article_obj->setVar('art_rating', $article_obj->getVar('art_rating') + $rate);
-            $article_obj->setVar('art_rates', $article_obj->getVar('art_rates') + 1);
+            $article_obj->setVar('art_rating', $article_obj->getVar('art_rating')+$rate);
+            $article_obj->setVar('art_rates', $article_obj->getVar('art_rates')+1);
             $articleHandler->insert($article_obj, true);
-        } else {
+        }else {
             $blog_obj = $blogHandler->get($blog_id);
-            $blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating') + $rate);
-            $blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates') + 1);
+            $blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating')+$rate);
+            $blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates')+1);
             $blogHandler->insert($blog_obj, true);
         }
         $message = planet_constant('MD_ACTIONDONE');
     }
 }
-if ($article_id > 0) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_id, 2, $message);
-} else {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+if ($article_id>0) {
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_id, 2, $message);
+}else {
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2, $message);
 }
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';