mambax7 / newbb5

class/KarmaHandler.php

Indentation +32 added lines, -32 removed lines

@@ -11,42 +11,42 @@
  */
 class KarmaHandler
 {
-    /**
-     * @param  null $user
-     * @return int
-     */
-    public function getUserKarma($user = null)
-    {
-        $user = (null === $user) ? $GLOBALS['xoopsUser'] : $user;
+	/**
+	 * @param  null $user
+	 * @return int
+	 */
+	public function getUserKarma($user = null)
+	{
+		$user = (null === $user) ? $GLOBALS['xoopsUser'] : $user;
 
-        return $this->calculateUserKarma($user);
-    }
+		return $this->calculateUserKarma($user);
+	}
 
-    /**
-     * Placeholder for calculating user karma
-     * @param \XoopsUser $user
-     * @return int
-     */
-    public function calculateUserKarma($user)
-    {
-        if (!is_object($user)) {
-            $user_karma = 0;
-        } else {
-            $user_karma = $user->getVar('posts') * 50;
-        }
+	/**
+	 * Placeholder for calculating user karma
+	 * @param \XoopsUser $user
+	 * @return int
+	 */
+	public function calculateUserKarma($user)
+	{
+		if (!is_object($user)) {
+			$user_karma = 0;
+		} else {
+			$user_karma = $user->getVar('posts') * 50;
+		}
 
-        return $user_karma;
-    }
+		return $user_karma;
+	}
 
-    public function updateUserKarma()
-    {
-    }
+	public function updateUserKarma()
+	{
+	}
 
-    public function writeUserKarma()
-    {
-    }
+	public function writeUserKarma()
+	{
+	}
 
-    public function readUserKarma()
-    {
-    }
+	public function readUserKarma()
+	{
+	}
 }

class/Helper.php

Indentation +60 added lines, -60 removed lines

@@ -26,72 +26,72 @@
  */
 class Helper extends \Xmf\Module\Helper
 {
-    public $debug;
+	public $debug;
 
-    /**
-     *
-     * @param bool $debug
-     */
-    public function __construct($debug = false)
-    {
-        $this->debug   = $debug;
-        $moduleDirName = basename(dirname(__DIR__));
-        parent::__construct($moduleDirName);
-    }
+	/**
+	 *
+	 * @param bool $debug
+	 */
+	public function __construct($debug = false)
+	{
+		$this->debug   = $debug;
+		$moduleDirName = basename(dirname(__DIR__));
+		parent::__construct($moduleDirName);
+	}
 
-    /**
-     * @param bool $debug
-     *
-     * @return \XoopsModules\Newbb\Helper
-     */
-    public static function getInstance($debug = false)
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($debug);
-        }
+	/**
+	 * @param bool $debug
+	 *
+	 * @return \XoopsModules\Newbb\Helper
+	 */
+	public static function getInstance($debug = false)
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($debug);
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * @param null|string $name
-     * @param null|string $value
-     *
-     * @return mixed
-     */
-    public function setConfig($name = null, $value = null)
-    {
-        if (null === $this->configs) {
-            $this->initConfig();
-        }
-        $this->configs[$name] = $value;
-        $this->addLog("Setting config '{$name}' : " . $this->configs[$name]);
+	/**
+	 * @param null|string $name
+	 * @param null|string $value
+	 *
+	 * @return mixed
+	 */
+	public function setConfig($name = null, $value = null)
+	{
+		if (null === $this->configs) {
+			$this->initConfig();
+		}
+		$this->configs[$name] = $value;
+		$this->addLog("Setting config '{$name}' : " . $this->configs[$name]);
 
-        return $this->configs[$name];
-    }
+		return $this->configs[$name];
+	}
 
-    /**
-     * @return string
-     */
-    public function getDirname()
-    {
-        return $this->dirname;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDirname()
+	{
+		return $this->dirname;
+	}
 
-    /**
-     * Get an Object Handler
-     *
-     * @param string $name name of handler to load
-     *
-     * @return bool|\XoopsObjectHandler|\XoopsPersistableObjectHandler
-     */
-    public function getHandler($name)
-    {
-        $db    = \XoopsDatabaseFactory::getDatabaseConnection();
-        $class = '\\XoopsModules\\' . ucfirst(strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler';
-        $ret   = new $class($db);
+	/**
+	 * Get an Object Handler
+	 *
+	 * @param string $name name of handler to load
+	 *
+	 * @return bool|\XoopsObjectHandler|\XoopsPersistableObjectHandler
+	 */
+	public function getHandler($name)
+	{
+		$db    = \XoopsDatabaseFactory::getDatabaseConnection();
+		$class = '\\XoopsModules\\' . ucfirst(strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler';
+		$ret   = new $class($db);
 
-        return $ret;
-    }
+		return $ret;
+	}
 }

class/ObjectTree.php

Indentation +228 added lines, -228 removed lines

@@ -30,208 +30,208 @@ 
 require_once $GLOBALS['xoops']->path('class/tree.php');
 
 if (!class_exists('ObjectTree')) {
-    /**
-     * Class ObjectTree
-     */
-    class ObjectTree extends \XoopsObjectTree
-    {
-        /**
-         * @param      $objectArr
-         * @param null $rootId
-         */
-        public function __construct(&$objectArr, $rootId = null)
-        {
-            parent::__construct($objectArr, 'forum_id', 'parent_forum', $rootId);
-        }
+	/**
+	 * Class ObjectTree
+	 */
+	class ObjectTree extends \XoopsObjectTree
+	{
+		/**
+		 * @param      $objectArr
+		 * @param null $rootId
+		 */
+		public function __construct(&$objectArr, $rootId = null)
+		{
+			parent::__construct($objectArr, 'forum_id', 'parent_forum', $rootId);
+		}
 
-        /**
-         * Make options for a select box from
-         *
-         * @param int        $key         ID of the object to display as the root of select options
-         * @param string     $ret         (reference to a string when called from outside) Result from previous recursions
-         * @param string     $prefix_orig String to indent items at deeper levels
-         * @param string     $prefix_curr String to indent the current item
-         * @param null|array $tags
-         * @internal  param string $fieldName Name of the member variable from the
-         *                                node objects that should be used as the title for the options.
-         * @internal  param string $selected Value to display as selected
-         * @access    private
-         */
-        protected function makeTreeItems($key, &$ret, $prefix_orig, $prefix_curr = '', $tags = null)
-        {
-            if ($key > 0) {
-                if (count($tags) > 0) {
-                    foreach ($tags as $tag) {
-                        $ret[$key][$tag] = $this->tree[$key]['obj']->getVar($tag);
-                    }
-                } else {
-                    $ret[$key]['forum_name'] = $this->tree[$key]['obj']->getVar('forum_name');
-                }
-                $ret[$key]['prefix'] = $prefix_curr;
-                $prefix_curr         .= $prefix_orig;
-            }
-            if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
-                foreach ($this->tree[$key]['child'] as $childkey) {
-                    $this->makeTreeItems($childkey, $ret, $prefix_orig, $prefix_curr, $tags);
-                }
-            }
-        }
+		/**
+		 * Make options for a select box from
+		 *
+		 * @param int        $key         ID of the object to display as the root of select options
+		 * @param string     $ret         (reference to a string when called from outside) Result from previous recursions
+		 * @param string     $prefix_orig String to indent items at deeper levels
+		 * @param string     $prefix_curr String to indent the current item
+		 * @param null|array $tags
+		 * @internal  param string $fieldName Name of the member variable from the
+		 *                                node objects that should be used as the title for the options.
+		 * @internal  param string $selected Value to display as selected
+		 * @access    private
+		 */
+		protected function makeTreeItems($key, &$ret, $prefix_orig, $prefix_curr = '', $tags = null)
+		{
+			if ($key > 0) {
+				if (count($tags) > 0) {
+					foreach ($tags as $tag) {
+						$ret[$key][$tag] = $this->tree[$key]['obj']->getVar($tag);
+					}
+				} else {
+					$ret[$key]['forum_name'] = $this->tree[$key]['obj']->getVar('forum_name');
+				}
+				$ret[$key]['prefix'] = $prefix_curr;
+				$prefix_curr         .= $prefix_orig;
+			}
+			if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
+				foreach ($this->tree[$key]['child'] as $childkey) {
+					$this->makeTreeItems($childkey, $ret, $prefix_orig, $prefix_curr, $tags);
+				}
+			}
+		}
 
-        /**
-         * Make a select box with options from the tree
-         *
-         * @param  string  $prefix         String to indent deeper levels
-         * @param  integer $key            ID of the object to display as the root of select options
-         * @param  null    $tags
-         * @return array|string  HTML select box
-         * @internal param string $name Name of the select box
-         * @internal param string $fieldName Name of the member variable from the
-         *                                 node objects that should be used as the title for the options.
-         * @internal param string $selected Value to display as selected
-         * @internal param bool $addEmptyOption Set TRUE to add an empty option with value "0" at the top of the hierarchy
-         */
-        public function &makeTree($prefix = '-', $key = 0, $tags = null)
-        {
-            $ret = [];
-            $this->makeTreeItems($key, $ret, $prefix, '', $tags);
+		/**
+		 * Make a select box with options from the tree
+		 *
+		 * @param  string  $prefix         String to indent deeper levels
+		 * @param  integer $key            ID of the object to display as the root of select options
+		 * @param  null    $tags
+		 * @return array|string  HTML select box
+		 * @internal param string $name Name of the select box
+		 * @internal param string $fieldName Name of the member variable from the
+		 *                                 node objects that should be used as the title for the options.
+		 * @internal param string $selected Value to display as selected
+		 * @internal param bool $addEmptyOption Set TRUE to add an empty option with value "0" at the top of the hierarchy
+		 */
+		public function &makeTree($prefix = '-', $key = 0, $tags = null)
+		{
+			$ret = [];
+			$this->makeTreeItems($key, $ret, $prefix, '', $tags);
 
-            return $ret;
-        }
+			return $ret;
+		}
 
-        /**
-         * Make a select box with options from the tree
-         *
-         * @param  string  $name           Name of the select box
-         * @param  string  $fieldName      Name of the member variable from the
-         *                                 node objects that should be used as the title for the options.
-         * @param  string  $prefix         String to indent deeper levels
-         * @param  string  $selected       Value to display as selected
-         * @param  bool    $addEmptyOption Set TRUE to add an empty option with value "0" at the top of the hierarchy
-         * @param  integer $key            ID of the object to display as the root of select options
-         * @param  string  $extra
-         * @return string  HTML select box
-         *
-         * @deprecated since 2.5.9, please use makeSelectElement()
-         */
-        public function makeSelBox(
-            $name,
-            $fieldName,
-            $prefix = '-',
-            $selected = '',
-            $addEmptyOption = false,
-            $key = 0,
-            $extra = ''
-        ) //makeSelBox($name, $prefix = '-', $selected = '', $EmptyOption = false, $key = 0)
-        {
-            $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-            trigger_error("makeSelBox() is deprecated since 2.5.9, please use makeSelectElement(), accessed from {$trace[0]['file']} line {$trace[0]['line']},");
+		/**
+		 * Make a select box with options from the tree
+		 *
+		 * @param  string  $name           Name of the select box
+		 * @param  string  $fieldName      Name of the member variable from the
+		 *                                 node objects that should be used as the title for the options.
+		 * @param  string  $prefix         String to indent deeper levels
+		 * @param  string  $selected       Value to display as selected
+		 * @param  bool    $addEmptyOption Set TRUE to add an empty option with value "0" at the top of the hierarchy
+		 * @param  integer $key            ID of the object to display as the root of select options
+		 * @param  string  $extra
+		 * @return string  HTML select box
+		 *
+		 * @deprecated since 2.5.9, please use makeSelectElement()
+		 */
+		public function makeSelBox(
+			$name,
+			$fieldName,
+			$prefix = '-',
+			$selected = '',
+			$addEmptyOption = false,
+			$key = 0,
+			$extra = ''
+		) //makeSelBox($name, $prefix = '-', $selected = '', $EmptyOption = false, $key = 0)
+		{
+			$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+			trigger_error("makeSelBox() is deprecated since 2.5.9, please use makeSelectElement(), accessed from {$trace[0]['file']} line {$trace[0]['line']},");
 
-            $ret = '<select name=' . $name . '>';
-            if (!empty($addEmptyOption)) {
-                $ret .= '<option value="0">' . (is_string($EmptyOption) ? $EmptyOption : '') . '</option>';
-            }
-            $this->_makeSelBoxOptions('forum_name', $selected, $key, $ret, $prefix);
-            $ret .= '</select>';
+			$ret = '<select name=' . $name . '>';
+			if (!empty($addEmptyOption)) {
+				$ret .= '<option value="0">' . (is_string($EmptyOption) ? $EmptyOption : '') . '</option>';
+			}
+			$this->_makeSelBoxOptions('forum_name', $selected, $key, $ret, $prefix);
+			$ret .= '</select>';
 
-            return $ret;
-        }
+			return $ret;
+		}
 
-        /**
-         * Make a tree for the array of a given category
-         *
-         * @param  string  $key   top key of the tree
-         * @param  array   $ret   the tree
-         * @param  integer $depth level of subcategories
-         * @return void
-         * @internal param array $tags fields to be used
-         */
-        public function getAllChildObject($key, &$ret, $depth = 0)
-        {
-            if (0 == --$depth) {
-                return;
-            }
+		/**
+		 * Make a tree for the array of a given category
+		 *
+		 * @param  string  $key   top key of the tree
+		 * @param  array   $ret   the tree
+		 * @param  integer $depth level of subcategories
+		 * @return void
+		 * @internal param array $tags fields to be used
+		 */
+		public function getAllChildObject($key, &$ret, $depth = 0)
+		{
+			if (0 == --$depth) {
+				return;
+			}
 
-            if (isset($this->tree[$key]['child'])) {
-                foreach ($this->tree[$key]['child'] as $childkey) {
-                    if (isset($this->tree[$childkey]['obj'])) {
-                        $ret['child'][$childkey] = $this->tree[$childkey]['obj'];
-                    }
-                    $this->getAllChild_object($childkey, $ret['child'][$childkey], $depth);
-                }
-            }
-        }
+			if (isset($this->tree[$key]['child'])) {
+				foreach ($this->tree[$key]['child'] as $childkey) {
+					if (isset($this->tree[$childkey]['obj'])) {
+						$ret['child'][$childkey] = $this->tree[$childkey]['obj'];
+					}
+					$this->getAllChild_object($childkey, $ret['child'][$childkey], $depth);
+				}
+			}
+		}
 
-        /**
-         * Make a tree for the array
-         *
-         * @param  int|string $key   top key of the tree
-         * @param  integer    $depth level of subcategories
-         * @return array
-         * @internal param array $tags fields to be used
-         */
-        public function &makeObjectTree($key = 0, $depth = 0)
-        {
-            $ret = [];
-            if ($depth > 0) {
-                ++$depth;
-            }
-            $this->getAllChild_object($key, $ret, $depth);
+		/**
+		 * Make a tree for the array
+		 *
+		 * @param  int|string $key   top key of the tree
+		 * @param  integer    $depth level of subcategories
+		 * @return array
+		 * @internal param array $tags fields to be used
+		 */
+		public function &makeObjectTree($key = 0, $depth = 0)
+		{
+			$ret = [];
+			if ($depth > 0) {
+				++$depth;
+			}
+			$this->getAllChild_object($key, $ret, $depth);
 
-            return $ret;
-        }
+			return $ret;
+		}
 
-        /**
-         * Make a tree for the array of a given category
-         *
-         * @param  string  $key   top key of the tree
-         * @param  array   $ret   the tree
-         * @param  array   $tags  fields to be used
-         * @param  integer $depth level of subcategories
-         * @return void
-         */
-        public function getAllChildArray($key, &$ret, array $tags = [], $depth = 0)
-        {
-            if (0 == --$depth) {
-                return;
-            }
+		/**
+		 * Make a tree for the array of a given category
+		 *
+		 * @param  string  $key   top key of the tree
+		 * @param  array   $ret   the tree
+		 * @param  array   $tags  fields to be used
+		 * @param  integer $depth level of subcategories
+		 * @return void
+		 */
+		public function getAllChildArray($key, &$ret, array $tags = [], $depth = 0)
+		{
+			if (0 == --$depth) {
+				return;
+			}
 
-            if (isset($this->tree[$key]['child'])) {
-                foreach ($this->tree[$key]['child'] as $childkey) {
-                    if (isset($this->tree[$childkey]['obj'])) {
-                        if (count($tags) > 0) {
-                            foreach ($tags as $tag) {
-                                $ret['child'][$childkey][$tag] = $this->tree[$childkey]['obj']->getVar($tag);
-                            }
-                        } else {
-                            $ret['child'][$childkey]['forum_name'] = $this->tree[$childkey]['obj']->getVar('forum_name');
-                        }
-                    }
+			if (isset($this->tree[$key]['child'])) {
+				foreach ($this->tree[$key]['child'] as $childkey) {
+					if (isset($this->tree[$childkey]['obj'])) {
+						if (count($tags) > 0) {
+							foreach ($tags as $tag) {
+								$ret['child'][$childkey][$tag] = $this->tree[$childkey]['obj']->getVar($tag);
+							}
+						} else {
+							$ret['child'][$childkey]['forum_name'] = $this->tree[$childkey]['obj']->getVar('forum_name');
+						}
+					}
 
-                    $this->getAllChildArray($childkey, $ret['child'][$childkey], $tags, $depth);
-                }
-            }
-        }
+					$this->getAllChildArray($childkey, $ret['child'][$childkey], $tags, $depth);
+				}
+			}
+		}
 
-        /**
-         * Make a tree for the array
-         *
-         * @param  int|string $key   top key of the tree
-         * @param  array      $tags  fields to be used
-         * @param  integer    $depth level of subcategories
-         * @return array
-         */
-        public function &makeArrayTree($key = 0, $tags = null, $depth = 0)
-        {
-            $ret = [];
-            if ($depth > 0) {
-                ++$depth;
-            }
-            $this->getAllChildArray($key, $ret, $tags, $depth);
+		/**
+		 * Make a tree for the array
+		 *
+		 * @param  int|string $key   top key of the tree
+		 * @param  array      $tags  fields to be used
+		 * @param  integer    $depth level of subcategories
+		 * @return array
+		 */
+		public function &makeArrayTree($key = 0, $tags = null, $depth = 0)
+		{
+			$ret = [];
+			if ($depth > 0) {
+				++$depth;
+			}
+			$this->getAllChildArray($key, $ret, $tags, $depth);
 
-            return $ret;
-        }
+			return $ret;
+		}
 
-        /**#@+
+		/**#@+
          * get all parent forums
          *
          * @param  string $key     ID of the child object
@@ -239,49 +239,49 @@ 
          * @param  int    $uplevel (empty when called from outside) level of recursion
          * @return array  Array of parent nodes.
          */
-        public function &myGetParentForums($key, array $ret = [], $uplevel = 0)
-        {
-            if (isset($this->tree[$key]['parent']) && isset($this->tree[$this->tree[$key]['parent']]['obj'])) {
-                $ret[$uplevel] = $this->tree[$this->tree[$key]['parent']]['obj'];
-                if ($this->tree[$key]['parent'] !== $key) {
-                    //$parents = $this->getParentForums($this->tree[$key]['parent'], $ret, $uplevel+1);
-                    $parents = $this->getParentForums($this->tree[$key]['parent']);
-                    foreach (array_keys($parents) as $newkey) {
-                        $ret[$newkey] = $parents[$newkey];
-                    }
-                }
-            }
+		public function &myGetParentForums($key, array $ret = [], $uplevel = 0)
+		{
+			if (isset($this->tree[$key]['parent']) && isset($this->tree[$this->tree[$key]['parent']]['obj'])) {
+				$ret[$uplevel] = $this->tree[$this->tree[$key]['parent']]['obj'];
+				if ($this->tree[$key]['parent'] !== $key) {
+					//$parents = $this->getParentForums($this->tree[$key]['parent'], $ret, $uplevel+1);
+					$parents = $this->getParentForums($this->tree[$key]['parent']);
+					foreach (array_keys($parents) as $newkey) {
+						$ret[$newkey] = $parents[$newkey];
+					}
+				}
+			}
 
-            return $ret;
-        }
+			return $ret;
+		}
 
-        /**
-         * @param        $key
-         * @param  bool  $reverse
-         * @return array
-         */
-        public function &getParentForums($key, $reverse = true)
-        {
-            $ret  = [];
-            $pids = [];
-            if (isset($this->tree[$key]['parent']) && isset($this->tree[$this->tree[$key]['parent']]['obj'])) {
-                $pids[]  = $this->tree[$this->tree[$key]['parent']]['obj']->getVar($this->myId);
-                $parents = $this->myGetParentForums($this->tree[$key]['parent'], $ret);
-                foreach (array_keys($parents) as $newkey) {
-                    if (!is_object($newkey)) {
-                        continue;
-                    }
-                    $ret[] = $parents[$newkey]->getVar($this->myId);
-                }
-            }
-            if ($reverse) {
-                $pids = array_reverse($ret) + $pids;
-            } else {
-                $pids += $ret;
-            }
+		/**
+		 * @param        $key
+		 * @param  bool  $reverse
+		 * @return array
+		 */
+		public function &getParentForums($key, $reverse = true)
+		{
+			$ret  = [];
+			$pids = [];
+			if (isset($this->tree[$key]['parent']) && isset($this->tree[$this->tree[$key]['parent']]['obj'])) {
+				$pids[]  = $this->tree[$this->tree[$key]['parent']]['obj']->getVar($this->myId);
+				$parents = $this->myGetParentForums($this->tree[$key]['parent'], $ret);
+				foreach (array_keys($parents) as $newkey) {
+					if (!is_object($newkey)) {
+						continue;
+					}
+					$ret[] = $parents[$newkey]->getVar($this->myId);
+				}
+			}
+			if ($reverse) {
+				$pids = array_reverse($ret) + $pids;
+			} else {
+				$pids += $ret;
+			}
 
-            return $pids;
-        }
-        /**#@-*/
-    }
+			return $pids;
+		}
+		/**#@-*/
+	}
 }

class/Xmlrss.php

Indentation +91 added lines, -91 removed lines

@@ -24,105 +24,105 @@
  */
 class Xmlrss
 {
-    public $xml_version;
-    public $rss_version;
-    public $xml_encoding;
+	public $xml_version;
+	public $rss_version;
+	public $xml_encoding;
 
-    public $channel_title;
-    public $channel_link;
-    public $channel_desc;
-    public $channel_lastbuild;
-    public $channel_webmaster;
-    public $channel_editor;
-    public $channel_category;
-    public $channel_generator;
-    public $channel_language;
+	public $channel_title;
+	public $channel_link;
+	public $channel_desc;
+	public $channel_lastbuild;
+	public $channel_webmaster;
+	public $channel_editor;
+	public $channel_category;
+	public $channel_generator;
+	public $channel_language;
 
-    public $image_title;
-    public $image_url;
-    public $image_link;
-    public $image_description;
-    public $image_height;
-    public $image_width;
+	public $image_title;
+	public $image_url;
+	public $image_link;
+	public $image_description;
+	public $image_height;
+	public $image_width;
 
-    public $max_items;
-    public $max_item_description;
-    public $items = [];
+	public $max_items;
+	public $max_item_description;
+	public $items = [];
 
-    /**
-     *
-     */
-    public function __construct()
-    {
-        $this->xml_version          = '1.0';
-        $this->xml_encoding         = empty($GLOBALS['xoopsModuleConfig']['rss_utf8']) ? _CHARSET : 'UTF-8';
-        $this->rss_version          = '2.0';
-        $this->image_height         = 31;
-        $this->image_width          = 88;
-        $this->max_items            = 10;
-        $this->max_item_description = 0;
-        $this->items                = [];
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		$this->xml_version          = '1.0';
+		$this->xml_encoding         = empty($GLOBALS['xoopsModuleConfig']['rss_utf8']) ? _CHARSET : 'UTF-8';
+		$this->rss_version          = '2.0';
+		$this->image_height         = 31;
+		$this->image_width          = 88;
+		$this->max_items            = 10;
+		$this->max_item_description = 0;
+		$this->items                = [];
+	}
 
-    /**
-     * @param $var
-     * @param $val
-     */
-    public function setVarRss($var, $val)
-    {
-        $this->$var = $this->cleanup($val);
-    }
+	/**
+	 * @param $var
+	 * @param $val
+	 */
+	public function setVarRss($var, $val)
+	{
+		$this->$var = $this->cleanup($val);
+	}
 
-    /**
-     * @param         $title
-     * @param         $link
-     * @param  string $description
-     * @param  string $label
-     * @param  int|string    $pubdate
-     * @return bool
-     */
-    public function addItem($title, $link, $description = '', $label = '', $pubdate = 0)
-    {
-        if (count($this->items) < $this->max_items) {
-            if (!empty($label)) {
-                $label = '[' . $this->cleanup($label) . ']';
-            }
-            if (!empty($description)) {
-                $description = $this->cleanup($description, $this->max_item_description);
-            //$description .= ' ' . $label;
-            } else {
-                //$description = $label;
-            }
+	/**
+	 * @param         $title
+	 * @param         $link
+	 * @param  string $description
+	 * @param  string $label
+	 * @param  int|string    $pubdate
+	 * @return bool
+	 */
+	public function addItem($title, $link, $description = '', $label = '', $pubdate = 0)
+	{
+		if (count($this->items) < $this->max_items) {
+			if (!empty($label)) {
+				$label = '[' . $this->cleanup($label) . ']';
+			}
+			if (!empty($description)) {
+				$description = $this->cleanup($description, $this->max_item_description);
+			//$description .= ' ' . $label;
+			} else {
+				//$description = $label;
+			}
 
-            $title         = $this->cleanup($title) . ' ' . $label;
-            $pubdate       = $this->cleanup($pubdate);
-            $this->items[] = [
-                'title'       => $title,
-                'link'        => $link,
-                'guid'        => $link,
-                'description' => $description,
-                'pubdate'     => $pubdate
-            ];
-        }
+			$title         = $this->cleanup($title) . ' ' . $label;
+			$pubdate       = $this->cleanup($pubdate);
+			$this->items[] = [
+				'title'       => $title,
+				'link'        => $link,
+				'guid'        => $link,
+				'description' => $description,
+				'pubdate'     => $pubdate
+			];
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * @param               $text
-     * @param  int          $trim
-     * @return mixed|string
-     */
-    public function cleanup($text, $trim = 0)
-    {
-        if ('utf-8' === strtolower($this->xml_encoding) && strncasecmp(_CHARSET, $this->xml_encoding, 5)) {
-            $text = \XoopsLocal::convert_encoding($text, 'utf-8');
-        }
-        if (!empty($trim)) {
-            $text = xoops_substr($text, 0, (int)$trim);
-        }
-        $text = htmlspecialchars($text, ENT_QUOTES);
+	/**
+	 * @param               $text
+	 * @param  int          $trim
+	 * @return mixed|string
+	 */
+	public function cleanup($text, $trim = 0)
+	{
+		if ('utf-8' === strtolower($this->xml_encoding) && strncasecmp(_CHARSET, $this->xml_encoding, 5)) {
+			$text = \XoopsLocal::convert_encoding($text, 'utf-8');
+		}
+		if (!empty($trim)) {
+			$text = xoops_substr($text, 0, (int)$trim);
+		}
+		$text = htmlspecialchars($text, ENT_QUOTES);
 
-        return $text;
-    }
+		return $text;
+	}
 }

class/Utility.php

Indentation +123 added lines, -123 removed lines

@@ -8,127 +8,127 @@
  */
 class Utility
 {
-    use Common\VersionChecks; //checkVerXoops, checkVerPhp Traits
-
-    use Common\ServerStats; // getServerStats Trait
-
-    use Common\FilesManagement; // Files Management Trait
-
-    //--------------- Custom module methods -----------------------------
-
-    /**
-     * Verify that a mysql table exists
-     *
-     * @package       News
-     * @author        Hervé Thouzard (http://www.herve-thouzard.com)
-     * @copyright (c) Hervé Thouzard
-     * @param $tablename
-     * @return bool
-     */
-    public function tableExists($tablename)
-    {
-        global $xoopsDB;
-        /** @var \XoopsMySQLDatabase $xoopsDB */
-        $result = $xoopsDB->queryF("SHOW TABLES LIKE '$tablename'");
-
-        return ($xoopsDB->getRowsNum($result) > 0);
-    }
-
-    /**
-     * Verify that a field exists inside a mysql table
-     *
-     * @package       News
-     * @author        Hervé Thouzard (http://www.herve-thouzard.com)
-     * @copyright (c) Hervé Thouzard
-     * @param $fieldname
-     * @param $table
-     * @return bool
-     */
-    public function fieldExists($fieldname, $table)
-    {
-        global $xoopsDB;
-        $result = $xoopsDB->queryF("SHOW COLUMNS FROM   $table LIKE '$fieldname'");
-
-        return ($xoopsDB->getRowsNum($result) > 0);
-    }
-
-    /**
-     * Add a field to a mysql table
-     *
-     * @package       News
-     * @author        Hervé Thouzard (http://www.herve-thouzard.com)
-     * @copyright (c) Hervé Thouzard
-     * @param $field
-     * @param $table
-     * @return bool|\mysqli_result
-     */
-    public function addField($field, $table)
-    {
-        global $xoopsDB;
-        $result = $xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field");
-
-        return $result;
-    }
-
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder Le chemin complet du répertoire à vérifier
-     *
-     * @return void
-     */
-    public static function prepareFolder($folder)
-    {
-        try {
-            if (!@mkdir($folder) && !is_dir($folder)) {
-                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-            } else {
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-            }
-        } catch (\Exception $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
-
-    public static function cleanCache()
-    {
-        $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-        if (method_exists($cacheHelper, 'clear')) {
-            $cacheHelper->clear();
-            return;
-        }
-        // for 2.5 systems, clear everything
-        require_once XOOPS_ROOT_PATH . '/modules/system/class/maintenance.php';
-        $maintenance = new \SystemMaintenance();
-        $cacheList   = [
-            3, // xoops_cache
-        ];
-        $maintenance->CleanCache($cacheList);
-        xoops_setActiveModules();
-    }
-
-    /**
-     * Checks if a user is admin of NewBB
-     *
-     * @return boolean
-     */
-    public static function userIsAdmin()
-    {
-        /** @var Newbb\Helper $helper */
-        $helper = Newbb\Helper::getInstance();
-
-        static $newbbIsAdmin;
-
-        if (isset($newbbIsAdmin)) {
-            return $newbbIsAdmin;
-        }
-
-        if (!$GLOBALS['xoopsUser']) {
-            $newbbIsAdmin = false;
-        } else {
-            $newbbIsAdmin = $GLOBALS['xoopsUser']->isAdmin($helper->getModule()->getVar('mid'));
-        }
-
-        return $newbbIsAdmin;
-    }
+	use Common\VersionChecks; //checkVerXoops, checkVerPhp Traits
+
+	use Common\ServerStats; // getServerStats Trait
+
+	use Common\FilesManagement; // Files Management Trait
+
+	//--------------- Custom module methods -----------------------------
+
+	/**
+	 * Verify that a mysql table exists
+	 *
+	 * @package       News
+	 * @author        Hervé Thouzard (http://www.herve-thouzard.com)
+	 * @copyright (c) Hervé Thouzard
+	 * @param $tablename
+	 * @return bool
+	 */
+	public function tableExists($tablename)
+	{
+		global $xoopsDB;
+		/** @var \XoopsMySQLDatabase $xoopsDB */
+		$result = $xoopsDB->queryF("SHOW TABLES LIKE '$tablename'");
+
+		return ($xoopsDB->getRowsNum($result) > 0);
+	}
+
+	/**
+	 * Verify that a field exists inside a mysql table
+	 *
+	 * @package       News
+	 * @author        Hervé Thouzard (http://www.herve-thouzard.com)
+	 * @copyright (c) Hervé Thouzard
+	 * @param $fieldname
+	 * @param $table
+	 * @return bool
+	 */
+	public function fieldExists($fieldname, $table)
+	{
+		global $xoopsDB;
+		$result = $xoopsDB->queryF("SHOW COLUMNS FROM   $table LIKE '$fieldname'");
+
+		return ($xoopsDB->getRowsNum($result) > 0);
+	}
+
+	/**
+	 * Add a field to a mysql table
+	 *
+	 * @package       News
+	 * @author        Hervé Thouzard (http://www.herve-thouzard.com)
+	 * @copyright (c) Hervé Thouzard
+	 * @param $field
+	 * @param $table
+	 * @return bool|\mysqli_result
+	 */
+	public function addField($field, $table)
+	{
+		global $xoopsDB;
+		$result = $xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field");
+
+		return $result;
+	}
+
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder Le chemin complet du répertoire à vérifier
+	 *
+	 * @return void
+	 */
+	public static function prepareFolder($folder)
+	{
+		try {
+			if (!@mkdir($folder) && !is_dir($folder)) {
+				throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+			} else {
+				file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+			}
+		} catch (\Exception $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
+
+	public static function cleanCache()
+	{
+		$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+		if (method_exists($cacheHelper, 'clear')) {
+			$cacheHelper->clear();
+			return;
+		}
+		// for 2.5 systems, clear everything
+		require_once XOOPS_ROOT_PATH . '/modules/system/class/maintenance.php';
+		$maintenance = new \SystemMaintenance();
+		$cacheList   = [
+			3, // xoops_cache
+		];
+		$maintenance->CleanCache($cacheList);
+		xoops_setActiveModules();
+	}
+
+	/**
+	 * Checks if a user is admin of NewBB
+	 *
+	 * @return boolean
+	 */
+	public static function userIsAdmin()
+	{
+		/** @var Newbb\Helper $helper */
+		$helper = Newbb\Helper::getInstance();
+
+		static $newbbIsAdmin;
+
+		if (isset($newbbIsAdmin)) {
+			return $newbbIsAdmin;
+		}
+
+		if (!$GLOBALS['xoopsUser']) {
+			$newbbIsAdmin = false;
+		} else {
+			$newbbIsAdmin = $GLOBALS['xoopsUser']->isAdmin($helper->getModule()->getVar('mid'));
+		}
+
+		return $newbbIsAdmin;
+	}
 }

class/Type.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  **/
 class Type extends \XoopsObject
 {
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->initVar('type_id', XOBJ_DTYPE_INT);
-        $this->initVar('type_name', XOBJ_DTYPE_TXTBOX, '');
-        $this->initVar('type_color', XOBJ_DTYPE_SOURCE, '');
-        $this->initVar('type_description', XOBJ_DTYPE_TXTBOX, '');
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->initVar('type_id', XOBJ_DTYPE_INT);
+		$this->initVar('type_name', XOBJ_DTYPE_TXTBOX, '');
+		$this->initVar('type_color', XOBJ_DTYPE_SOURCE, '');
+		$this->initVar('type_description', XOBJ_DTYPE_TXTBOX, '');
+	}
 }

class/IpCheck.php

Indentation +58 added lines, -58 removed lines

@@ -7,73 +7,73 @@
  */
 class IpCheck
 {
-    /** @var string */
-    private $ipin;
+	/** @var string */
+	private $ipin;
 
-    /** @var string */
-    private $ipout;
+	/** @var string */
+	private $ipout;
 
-    /** @var int */
-    private $ipver;
+	/** @var int */
+	private $ipver;
 
-    // Return IP type.  4 for IPv4, 6 for IPv6, 0 for bad IP.
+	// Return IP type.  4 for IPv4, 6 for IPv6, 0 for bad IP.
 
-    /**
-     * @param $ipValue
-     */
-    public function addressType($ipValue)
-    {
-        $this->ipin  = $ipValue;
-        $this->ipver = 0;
+	/**
+	 * @param $ipValue
+	 */
+	public function addressType($ipValue)
+	{
+		$this->ipin  = $ipValue;
+		$this->ipver = 0;
 
-        // IPv4 addresses are easy-peasy
-        if (filter_var($this->ipin, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            $this->ipver = 4;
-            $this->ipout = $this->ipin;
-        }
+		// IPv4 addresses are easy-peasy
+		if (filter_var($this->ipin, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+			$this->ipver = 4;
+			$this->ipout = $this->ipin;
+		}
 
-        // IPv6 is at least a little more complex.
-        if (filter_var($this->ipin, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+		// IPv6 is at least a little more complex.
+		if (filter_var($this->ipin, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 
-            // Look for embedded IPv4 in an embedded IPv6 address, where FFFF is appended.
-            if (0 === strncmp($this->ipin, '::FFFF:', 7)) {
-                $ipv4addr = substr($this->ipin, 7);
-                if (filter_var($ipv4addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-                    $this->ipver = 4;
-                    $this->ipout = $ipv4addr;
-                }
+			// Look for embedded IPv4 in an embedded IPv6 address, where FFFF is appended.
+			if (0 === strncmp($this->ipin, '::FFFF:', 7)) {
+				$ipv4addr = substr($this->ipin, 7);
+				if (filter_var($ipv4addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					$this->ipver = 4;
+					$this->ipout = $ipv4addr;
+				}
 
-                // Look for an IPv4 address embedded as ::x.x.x.x
-            } elseif (0 === strpos($this->ipin, '::')) {
-                $ipv4addr = substr($this->ipin, 2);
-                if (filter_var($ipv4addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-                    $this->ipver = 4;
-                    $this->ipout = $ipv4addr;
-                }
+				// Look for an IPv4 address embedded as ::x.x.x.x
+			} elseif (0 === strpos($this->ipin, '::')) {
+				$ipv4addr = substr($this->ipin, 2);
+				if (filter_var($ipv4addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					$this->ipver = 4;
+					$this->ipout = $ipv4addr;
+				}
 
-                // Otherwise, assume this an IPv6 address.
-            } else {
-                $this->ipver = 6;
-                $this->ipout = $this->ipin;
-            }
-        }
-    }
+				// Otherwise, assume this an IPv6 address.
+			} else {
+				$this->ipver = 6;
+				$this->ipout = $this->ipin;
+			}
+		}
+	}
 
-    /** Check whether the given address is an IP address
-     *
-     * @param string $ip Given IP address
-     *
-     * @return string A if IPv4, AAAA if IPv6 or 0 if invalid
-     */
-    public function isValidIpAddress($ip)
-    {
-        $value = 0;
-        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            $value = 'A';
-        } elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            $value = 'AAAA';
-        }
+	/** Check whether the given address is an IP address
+	 *
+	 * @param string $ip Given IP address
+	 *
+	 * @return string A if IPv4, AAAA if IPv6 or 0 if invalid
+	 */
+	public function isValidIpAddress($ip)
+	{
+		$value = 0;
+		if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+			$value = 'A';
+		} elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+			$value = 'AAAA';
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 }

class/Constants.php

Indentation +3 added lines, -3 removed lines

@@ -24,12 +24,12 @@
  */
 class Constants
 {
-    /**#@+
+	/**#@+
      * Constant definition
      */
 
-    const DISALLOW = 0;
+	const DISALLOW = 0;
 
-    /**#@-*/
+	/**#@-*/
 }
 

class/Read.php

Indentation +13 added lines, -13 removed lines

@@ -44,17 +44,17 @@
  */
 class Read extends \XoopsObject
 {
-    /**
-     * @internal param $type
-     */
-    public function __construct()
-    {
-        // parent::__construct("newbb_reads_" . $type);
-        parent::__construct();
-        $this->initVar('read_id', XOBJ_DTYPE_INT);
-        $this->initVar('uid', XOBJ_DTYPE_INT);
-        $this->initVar('read_item', XOBJ_DTYPE_INT);
-        $this->initVar('post_id', XOBJ_DTYPE_INT);
-        $this->initVar('read_time', XOBJ_DTYPE_INT);
-    }
+	/**
+	 * @internal param $type
+	 */
+	public function __construct()
+	{
+		// parent::__construct("newbb_reads_" . $type);
+		parent::__construct();
+		$this->initVar('read_id', XOBJ_DTYPE_INT);
+		$this->initVar('uid', XOBJ_DTYPE_INT);
+		$this->initVar('read_item', XOBJ_DTYPE_INT);
+		$this->initVar('post_id', XOBJ_DTYPE_INT);
+		$this->initVar('read_time', XOBJ_DTYPE_INT);
+	}
 }