mambax7 / newbb5

class/Digest.php

Spacing +6 added lines, -6 removed lines

@@ -67,7 +67,7 @@ 
         global $myts;
 
         $clean = stripslashes($text);
-        $clean =& $myts->displayTarea($clean, 1, 0, 1);
+        $clean = & $myts->displayTarea($clean, 1, 0, 1);
         $clean = strip_tags($clean);
         $clean = htmlspecialchars($clean, ENT_QUOTES);
 
@@ -87,16 +87,16 @@ 
             $linebreak = $isHtml ? '<br>' : "\n";
             for ($i = 0; $i < $digest_count; ++$i) {
                 if ($isHtml) {
-                    $content .= ($i + 1) . '. <a href=' . $this->items[$i]['link'] . '>' . $this->items[$i]['title'] . '</a>';
+                    $content .= ($i + 1).'. <a href='.$this->items[$i]['link'].'>'.$this->items[$i]['title'].'</a>';
                 } else {
-                    $content .= ($i + 1) . '. ' . $this->items[$i]['title'] . $linebreak . $this->items[$i]['link'];
+                    $content .= ($i + 1).'. '.$this->items[$i]['title'].$linebreak.$this->items[$i]['link'];
                 }
 
-                $content .= $linebreak . $this->items[$i]['author'];
+                $content .= $linebreak.$this->items[$i]['author'];
                 if ($isSummary) {
-                    $content .= $linebreak . $this->items[$i]['summary'];
+                    $content .= $linebreak.$this->items[$i]['summary'];
                 }
-                $content .= $linebreak . $linebreak;
+                $content .= $linebreak.$linebreak;
             }
         }
         $this->setVar('digest_content', $content);

Indentation +80 added lines, -80 removed lines

@@ -12,96 +12,96 @@
 
 class Digest extends \XoopsObject
 {
-    public $digest_id;
-    public $digest_time;
-    public $digest_content;
+	public $digest_id;
+	public $digest_time;
+	public $digest_content;
 
-    public $items;
-    public $isHtml    = false;
-    public $isSummary = true;
+	public $items;
+	public $isHtml    = false;
+	public $isSummary = true;
 
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->initVar('digest_id', XOBJ_DTYPE_INT);
-        $this->initVar('digest_time', XOBJ_DTYPE_INT);
-        $this->initVar('digest_content', XOBJ_DTYPE_TXTAREA);
-        $this->items = [];
-    }
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->initVar('digest_id', XOBJ_DTYPE_INT);
+		$this->initVar('digest_time', XOBJ_DTYPE_INT);
+		$this->initVar('digest_content', XOBJ_DTYPE_TXTAREA);
+		$this->items = [];
+	}
 
-    public function setHtml()
-    {
-        $this->isHtml = true;
-    }
+	public function setHtml()
+	{
+		$this->isHtml = true;
+	}
 
-    public function setSummary()
-    {
-        $this->isSummary = true;
-    }
+	public function setSummary()
+	{
+		$this->isSummary = true;
+	}
 
-    /**
-     * @param        $title
-     * @param        $link
-     * @param        $author
-     * @param string $summary
-     */
-    public function addItem($title, $link, $author, $summary = '')
-    {
-        $title  = $this->cleanup($title);
-        $author = $this->cleanup($author);
-        if (!empty($summary)) {
-            $summary = $this->cleanup($summary);
-        }
-        $this->items[] = ['title' => $title, 'link' => $link, 'author' => $author, 'summary' => $summary];
-    }
+	/**
+	 * @param        $title
+	 * @param        $link
+	 * @param        $author
+	 * @param string $summary
+	 */
+	public function addItem($title, $link, $author, $summary = '')
+	{
+		$title  = $this->cleanup($title);
+		$author = $this->cleanup($author);
+		if (!empty($summary)) {
+			$summary = $this->cleanup($summary);
+		}
+		$this->items[] = ['title' => $title, 'link' => $link, 'author' => $author, 'summary' => $summary];
+	}
 
-    /**
-     * @param $text
-     * @return mixed|string
-     */
-    public function cleanup($text)
-    {
-        global $myts;
+	/**
+	 * @param $text
+	 * @return mixed|string
+	 */
+	public function cleanup($text)
+	{
+		global $myts;
 
-        $clean = stripslashes($text);
-        $clean =& $myts->displayTarea($clean, 1, 0, 1);
-        $clean = strip_tags($clean);
-        $clean = htmlspecialchars($clean, ENT_QUOTES);
+		$clean = stripslashes($text);
+		$clean =& $myts->displayTarea($clean, 1, 0, 1);
+		$clean = strip_tags($clean);
+		$clean = htmlspecialchars($clean, ENT_QUOTES);
 
 
-        return $clean;
-    }
+		return $clean;
+	}
 
-    /**
-     * @param  bool $isSummary
-     * @param  bool $isHtml
-     * @return bool
-     */
-    public function buildContent($isSummary = true, $isHtml = false)
-    {
-        $digest_count = count($this->items);
-        $content      = '';
-        if ($digest_count > 0) {
-            $linebreak = $isHtml ? '<br>' : "\n";
-            for ($i = 0; $i < $digest_count; ++$i) {
-                if ($isHtml) {
-                    $content .= ($i + 1) . '. <a href=' . $this->items[$i]['link'] . '>' . $this->items[$i]['title'] . '</a>';
-                } else {
-                    $content .= ($i + 1) . '. ' . $this->items[$i]['title'] . $linebreak . $this->items[$i]['link'];
-                }
+	/**
+	 * @param  bool $isSummary
+	 * @param  bool $isHtml
+	 * @return bool
+	 */
+	public function buildContent($isSummary = true, $isHtml = false)
+	{
+		$digest_count = count($this->items);
+		$content      = '';
+		if ($digest_count > 0) {
+			$linebreak = $isHtml ? '<br>' : "\n";
+			for ($i = 0; $i < $digest_count; ++$i) {
+				if ($isHtml) {
+					$content .= ($i + 1) . '. <a href=' . $this->items[$i]['link'] . '>' . $this->items[$i]['title'] . '</a>';
+				} else {
+					$content .= ($i + 1) . '. ' . $this->items[$i]['title'] . $linebreak . $this->items[$i]['link'];
+				}
 
-                $content .= $linebreak . $this->items[$i]['author'];
-                if ($isSummary) {
-                    $content .= $linebreak . $this->items[$i]['summary'];
-                }
-                $content .= $linebreak . $linebreak;
-            }
-        }
-        $this->setVar('digest_content', $content);
+				$content .= $linebreak . $this->items[$i]['author'];
+				if ($isSummary) {
+					$content .= $linebreak . $this->items[$i]['summary'];
+				}
+				$content .= $linebreak . $linebreak;
+			}
+		}
+		$this->setVar('digest_content', $content);
 
-        return true;
-    }
+		return true;
+	}
 }

class/Utility.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     public function addField($field, $table)
     {
         global $xoopsDB;
-        $result = $xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field");
+        $result = $xoopsDB->queryF('ALTER TABLE '.$table." ADD $field");
 
         return $result;
     }
@@ -83,7 +83,7 @@ 
             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>');
+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
             }
         } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -98,7 +98,7 @@ 
             return;
         }
         // for 2.5 systems, clear everything
-        require_once XOOPS_ROOT_PATH . '/modules/system/class/maintenance.php';
+        require_once XOOPS_ROOT_PATH.'/modules/system/class/maintenance.php';
         $maintenance = new \SystemMaintenance();
         $cacheList   = [
             3, // xoops_cache

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/Tree.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
         }
 
         $newPostArray = [];
-        $prefix       .= $this->increment;
+        $prefix .= $this->increment;
         foreach ($this->postArray as $post) {
             if ($post->getVar('pid') == $pid) {
                 $postTree_array[] = [

Indentation +73 added lines, -73 removed lines

@@ -38,87 +38,87 @@
  */
 class Tree extends \XoopsTree
 {
-    /** @var string */
-    private $prefix = '  ';
+	/** @var string */
+	private $prefix = '  ';
 
-    /** @var string */
-    private $increment = '  ';
+	/** @var string */
+	private $increment = '  ';
 
-    /** @var array */
-    private $postArray = [];
+	/** @var array */
+	private $postArray = [];
 
-    /**
-     * @param string $table_name
-     * @param string $id_name
-     * @param string $pid_name
-     */
-    public function __construct($table_name, $id_name = 'post_id', $pid_name = 'pid')
-    {
-        parent::__construct($table_name, $id_name, $pid_name);
-    }
+	/**
+	 * @param string $table_name
+	 * @param string $id_name
+	 * @param string $pid_name
+	 */
+	public function __construct($table_name, $id_name = 'post_id', $pid_name = 'pid')
+	{
+		parent::__construct($table_name, $id_name, $pid_name);
+	}
 
-    /**
-     * @param string $val
-     */
-    public function setPrefix($val = '')
-    {
-        $this->prefix    = $val;
-        $this->increment = $val;
-    }
+	/**
+	 * @param string $val
+	 */
+	public function setPrefix($val = '')
+	{
+		$this->prefix    = $val;
+		$this->increment = $val;
+	}
 
-    /**
-     * @param        $sel_id
-     * @param string $order
-     */
-    public function getAllPostArray($sel_id, $order = '')
-    {
-        $this->postArray = $this->getAllChild($sel_id, $order);
-    }
+	/**
+	 * @param        $sel_id
+	 * @param string $order
+	 */
+	public function getAllPostArray($sel_id, $order = '')
+	{
+		$this->postArray = $this->getAllChild($sel_id, $order);
+	}
 
-    /**
-     * @param $postArray
-     */
-    public function setPostArray($postArray)
-    {
-        $this->postArray = $postArray;
-    }
+	/**
+	 * @param $postArray
+	 */
+	public function setPostArray($postArray)
+	{
+		$this->postArray = $postArray;
+	}
 
-    // returns an array of first child objects for a given id($sel_id)
+	// returns an array of first child objects for a given id($sel_id)
 
-    /**
-     * @param         $postTree_array
-     * @param  int    $pid
-     * @param  string $prefix
-     * @return bool
-     */
-    public function getPostTree(&$postTree_array, $pid = 0, $prefix = '  ')
-    {
-        if (!is_array($postTree_array)) {
-            $postTree_array = [];
-        }
+	/**
+	 * @param         $postTree_array
+	 * @param  int    $pid
+	 * @param  string $prefix
+	 * @return bool
+	 */
+	public function getPostTree(&$postTree_array, $pid = 0, $prefix = '  ')
+	{
+		if (!is_array($postTree_array)) {
+			$postTree_array = [];
+		}
 
-        $newPostArray = [];
-        $prefix       .= $this->increment;
-        foreach ($this->postArray as $post) {
-            if ($post->getVar('pid') == $pid) {
-                $postTree_array[] = [
-                    'prefix'      => $prefix,
-                    'icon'        => $post->getVar('icon'),
-                    'post_time'   => $post->getVar('post_time'),
-                    'post_id'     => $post->getVar('post_id'),
-                    'forum_id'    => $post->getVar('forum_id'),
-                    'subject'     => $post->getVar('subject'),
-                    'poster_name' => $post->getVar('poster_name'),
-                    'uid'         => $post->getVar('uid')
-                ];
-                $this->getPostTree($postTree_array, $post->getVar('post_id'), $prefix);
-            } else {
-                $newPostArray[] = $post;
-            }
-        }
-        $this->postArray = $newPostArray;
-        unset($newPostArray);
+		$newPostArray = [];
+		$prefix       .= $this->increment;
+		foreach ($this->postArray as $post) {
+			if ($post->getVar('pid') == $pid) {
+				$postTree_array[] = [
+					'prefix'      => $prefix,
+					'icon'        => $post->getVar('icon'),
+					'post_time'   => $post->getVar('post_time'),
+					'post_id'     => $post->getVar('post_id'),
+					'forum_id'    => $post->getVar('forum_id'),
+					'subject'     => $post->getVar('subject'),
+					'poster_name' => $post->getVar('poster_name'),
+					'uid'         => $post->getVar('uid')
+				];
+				$this->getPostTree($postTree_array, $post->getVar('post_id'), $prefix);
+			} else {
+				$newPostArray[] = $post;
+			}
+		}
+		$this->postArray = $newPostArray;
+		unset($newPostArray);
 
-        return true;
-    }
+		return true;
+	}
 }

class/ObjectTree.php

Spacing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
                     $ret[$key]['forum_name'] = $this->tree[$key]['obj']->getVar('forum_name');
                 }
                 $ret[$key]['prefix'] = $prefix_curr;
-                $prefix_curr         .= $prefix_orig;
+                $prefix_curr .= $prefix_orig;
             }
             if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
                 foreach ($this->tree[$key]['child'] as $childkey) {
@@ -126,9 +126,9 @@ 
             $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 . '>';
+            $ret = '<select name='.$name.'>';
             if (!empty($addEmptyOption)) {
-                $ret .= '<option value="0">' . (is_string($EmptyOption) ? $EmptyOption : '') . '</option>';
+                $ret .= '<option value="0">'.(is_string($EmptyOption) ? $EmptyOption : '').'</option>';
             }
             $this->_makeSelBoxOptions('forum_name', $selected, $key, $ret, $prefix);
             $ret .= '</select>';

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/Plugin/userlog.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
             case 'viewtopic.php':
                 /** @var Newbb\TopicHandler $topicHandler */
                 $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-                $post_id      = Request::getInt('post_id', 0);// !empty($_REQUEST["post_id"]) ? (int)($_REQUEST["post_id"]) : 0;
+                $post_id      = Request::getInt('post_id', 0); // !empty($_REQUEST["post_id"]) ? (int)($_REQUEST["post_id"]) : 0;
                 $move         = strtolower(Request::getString('move', '', 'GET')); // isset($_GET['move'])? strtolower($_GET['move']) : '';
                 $topic_id     = Request::getInt('topic_id', 0); // !empty($_REQUEST["topic_id"]) ? (int)($_REQUEST["topic_id"]) : 0;
                 if (!empty($post_id)) {

Indentation +56 added lines, -56 removed lines

@@ -28,65 +28,65 @@
 
 class Plugin extends Userlog\Plugin\PluginAbstract implements Userlog\Plugin\PluginInterface
 {
-    /**
-     * @param string $subscribe_from Name of the script
-     *
-     * 'name' => 'thread';
-     * 'title' => _MI_NEWBB_THREAD_NOTIFY;
-     * 'description' => _MI_NEWBB_THREAD_NOTIFYDSC;
-     * 'subscribe_from' => 'viewtopic.php';
-     * 'item_name' => 'topic_id';
-     * 'allow_bookmark' => 1;
-     *
-     * publisher:
-     * 'name' = 'category_item';
-     * 'title' = _MI_PUBLISHER_CATEGORY_ITEM_NOTIFY;
-     * 'description' = _MI_PUBLISHER_CATEGORY_ITEM_NOTIFY_DSC;
-     * 'subscribe_from' = array('index.php', 'category.php', 'item.php');
-     * 'item_name' = 'categoryid';
-     * 'allow_bookmark' = 1;
-     *
-     * empty($subscribe_from):
-     * @return bool|array $script_arr["item_name"] name of the item = array("subscribe_from1", "subscribe_from2") Name of the script
-     *
-     * !empty($subscribe_from):
-     * @return bool|array $item["item_name"] name of the item, $item["item_id"] id of the item
-     */
-    public function item($subscribe_from)
-    {
-        if (empty($subscribe_from)) {
-            $script_arr             = [];
-            $script_arr['topic_id'] = ['viewtopic.php'];
-            $script_arr['forum']    = ['viewforum.php'];
+	/**
+	 * @param string $subscribe_from Name of the script
+	 *
+	 * 'name' => 'thread';
+	 * 'title' => _MI_NEWBB_THREAD_NOTIFY;
+	 * 'description' => _MI_NEWBB_THREAD_NOTIFYDSC;
+	 * 'subscribe_from' => 'viewtopic.php';
+	 * 'item_name' => 'topic_id';
+	 * 'allow_bookmark' => 1;
+	 *
+	 * publisher:
+	 * 'name' = 'category_item';
+	 * 'title' = _MI_PUBLISHER_CATEGORY_ITEM_NOTIFY;
+	 * 'description' = _MI_PUBLISHER_CATEGORY_ITEM_NOTIFY_DSC;
+	 * 'subscribe_from' = array('index.php', 'category.php', 'item.php');
+	 * 'item_name' = 'categoryid';
+	 * 'allow_bookmark' = 1;
+	 *
+	 * empty($subscribe_from):
+	 * @return bool|array $script_arr["item_name"] name of the item = array("subscribe_from1", "subscribe_from2") Name of the script
+	 *
+	 * !empty($subscribe_from):
+	 * @return bool|array $item["item_name"] name of the item, $item["item_id"] id of the item
+	 */
+	public function item($subscribe_from)
+	{
+		if (empty($subscribe_from)) {
+			$script_arr             = [];
+			$script_arr['topic_id'] = ['viewtopic.php'];
+			$script_arr['forum']    = ['viewforum.php'];
 
-            return $script_arr;
-        }
+			return $script_arr;
+		}
 
-        switch ($subscribe_from) {
-            case 'viewtopic.php':
-                /** @var Newbb\TopicHandler $topicHandler */
-                $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-                $post_id      = Request::getInt('post_id', 0);// !empty($_REQUEST["post_id"]) ? (int)($_REQUEST["post_id"]) : 0;
-                $move         = strtolower(Request::getString('move', '', 'GET')); // isset($_GET['move'])? strtolower($_GET['move']) : '';
-                $topic_id     = Request::getInt('topic_id', 0); // !empty($_REQUEST["topic_id"]) ? (int)($_REQUEST["topic_id"]) : 0;
-                if (!empty($post_id)) {
-                    $topicObject = $topicHandler->getByPost($post_id);
-                    $topic_id    = $topicObject->getVar('topic_id');
-                } elseif (!empty($move)) {
-                    $forum_id    = Request::getInt('forum_id', 0); //!empty($_REQUEST["forum_id"]) ? (int)($_REQUEST["forum_id"]) : 0;
-                    $topicObject = $topicHandler->getByMove($topic_id, ('prev' === $move) ? -1 : 1, $forum_id);
-                    $topic_id    = $topicObject->getVar('topic_id');
-                }
+		switch ($subscribe_from) {
+			case 'viewtopic.php':
+				/** @var Newbb\TopicHandler $topicHandler */
+				$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+				$post_id      = Request::getInt('post_id', 0);// !empty($_REQUEST["post_id"]) ? (int)($_REQUEST["post_id"]) : 0;
+				$move         = strtolower(Request::getString('move', '', 'GET')); // isset($_GET['move'])? strtolower($_GET['move']) : '';
+				$topic_id     = Request::getInt('topic_id', 0); // !empty($_REQUEST["topic_id"]) ? (int)($_REQUEST["topic_id"]) : 0;
+				if (!empty($post_id)) {
+					$topicObject = $topicHandler->getByPost($post_id);
+					$topic_id    = $topicObject->getVar('topic_id');
+				} elseif (!empty($move)) {
+					$forum_id    = Request::getInt('forum_id', 0); //!empty($_REQUEST["forum_id"]) ? (int)($_REQUEST["forum_id"]) : 0;
+					$topicObject = $topicHandler->getByMove($topic_id, ('prev' === $move) ? -1 : 1, $forum_id);
+					$topic_id    = $topicObject->getVar('topic_id');
+				}
 
-                return ['item_name' => 'topic_id', 'item_id' => $topic_id];
-                break;
-            case 'viewforum.php':
-                $forum_id = Request::getInt('forum', 0); // !empty($_REQUEST["forum"]) ? (int)($_REQUEST["forum"]) : 0;
+				return ['item_name' => 'topic_id', 'item_id' => $topic_id];
+				break;
+			case 'viewforum.php':
+				$forum_id = Request::getInt('forum', 0); // !empty($_REQUEST["forum"]) ? (int)($_REQUEST["forum"]) : 0;
 
-                return ['item_name' => 'forum', 'item_id' => $forum_id];
-                break;
-        }
+				return ['item_name' => 'forum', 'item_id' => $forum_id];
+				break;
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

class/Common/Breadcrumb.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         require_once $GLOBALS['xoops']->path('class/template.php');
         $breadcrumbTpl = new \XoopsTpl();
         $breadcrumbTpl->assign('breadcrumb', $this->bread);
-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
+        $html = $breadcrumbTpl->fetch('db:'.$this->dirname.'_common_breadcrumb.tpl');
         unset($breadcrumbTpl);
 
         return $html;

Indentation +39 added lines, -39 removed lines

@@ -31,49 +31,49 @@
  */
 class Breadcrumb
 {
-    /** @var string */
-    private $dirname;
+	/** @var string */
+	private $dirname;
 
-    /** @var array */
-    private $bread = [];
+	/** @var array */
+	private $bread = [];
 
-    public function __construct()
-    {
-        $this->dirname = basename(dirname(dirname(__DIR__)));
-    }
+	public function __construct()
+	{
+		$this->dirname = basename(dirname(dirname(__DIR__)));
+	}
 
-    /**
-     * Add link to breadcrumb
-     *
-     * @param string $title
-     * @param string $link
-     */
-    public function addLink($title = '', $link = '')
-    {
-        $this->bread[] = [
-            'link'  => $link,
-            'title' => $title
-        ];
-    }
+	/**
+	 * Add link to breadcrumb
+	 *
+	 * @param string $title
+	 * @param string $link
+	 */
+	public function addLink($title = '', $link = '')
+	{
+		$this->bread[] = [
+			'link'  => $link,
+			'title' => $title
+		];
+	}
 
-    /**
-     * Render Pedigree BreadCrumb
-     *
-     * @return string
-     */
-    public function render()
-    {
-        if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
-            require_once $GLOBALS['xoops']->path('class/theme.php');
-            $GLOBALS['xoTheme'] = new \xos_opal_Theme();
-        }
+	/**
+	 * Render Pedigree BreadCrumb
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
+			require_once $GLOBALS['xoops']->path('class/theme.php');
+			$GLOBALS['xoTheme'] = new \xos_opal_Theme();
+		}
 
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        $breadcrumbTpl = new \XoopsTpl();
-        $breadcrumbTpl->assign('breadcrumb', $this->bread);
-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
-        unset($breadcrumbTpl);
+		require_once $GLOBALS['xoops']->path('class/template.php');
+		$breadcrumbTpl = new \XoopsTpl();
+		$breadcrumbTpl->assign('breadcrumb', $this->bread);
+		$html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
+		unset($breadcrumbTpl);
 
-        return $html;
-    }
+		return $html;
+	}
 }

class/DigestHandler.php

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
         //            $start = 0;
         //        }
 
-        $sql    = 'SELECT * FROM ' . $this->db->prefix('newbb_digest') . ' ORDER BY digest_id DESC';
+        $sql    = 'SELECT * FROM '.$this->db->prefix('newbb_digest').' ORDER BY digest_id DESC';
         $result = $this->db->query($sql, $perpage, $start);
         $ret    = [];
         //        $reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
@@ -102,7 +102,7 @@ 
      */
     public function getDigestCount()
     {
-        $sql    = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_digest');
+        $sql    = 'SELECT COUNT(*) AS count FROM '.$this->db->prefix('newbb_digest');
         $result = $this->db->query($sql);
         if (!$result) {
             return 0;
@@ -115,7 +115,7 @@ 
 
     public function getLastDigest()
     {
-        $sql    = 'SELECT MAX(digest_time) AS last_digest FROM ' . $this->db->prefix('newbb_digest');
+        $sql    = 'SELECT MAX(digest_time) AS last_digest FROM '.$this->db->prefix('newbb_digest');
         $result = $this->db->query($sql);
         if (!$result) {
             $this->last_digest = 0;
@@ -206,9 +206,9 @@ 
         $GLOBALS['xoopsUser'] = $thisUser;
 
         $accessForums    = $forumHandler->getIdsByPermission(); // get all accessible forums
-        $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $accessForums) . ')';
+        $forumCriteria   = ' AND t.forum_id IN ('.implode(',', $accessForums).')';
         $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
-        $time_criteria   = ' AND t.digest_time > ' . $this->last_digest;
+        $time_criteria   = ' AND t.digest_time > '.$this->last_digest;
 
         $karma_criteria = $GLOBALS['xoopsModuleConfig']['enable_karma'] ? ' AND p.post_karma=0' : '';
         $reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
@@ -243,7 +243,7 @@ 
         if (count($uids) > 0) {
             /** @var \XoopsMemberHandler $memberHandler */
             $memberHandler = xoops_getHandler('member');
-            $user_criteria = new \Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
+            $user_criteria = new \Criteria('uid', '('.implode(',', $uids).')', 'IN');
             $users         = $memberHandler->getUsers($user_criteria, true);
         } else {
             $users = [];
@@ -261,8 +261,8 @@ 
                 $topic['uname'] = $topic['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous'];
             }
             $summary = \Xmf\Metagen::generateDescription($topic['post_text'], SUMMARY_LENGTH);
-            $author  = $topic['uname'] . ' (' . formatTimestamp($topic['topic_time']) . ')';
-            $link    = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/viewtopic.php?topic_id=' . $topic['topic_id'] . '&forum=' . $topic['forum_id'];
+            $author  = $topic['uname'].' ('.formatTimestamp($topic['topic_time']).')';
+            $link    = XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/viewtopic.php?topic_id='.$topic['topic_id'].'&forum='.$topic['forum_id'];
             $title   = $topic['topic_title'];
             $digest->addItem($title, $link, $author, $summary);
         }

Indentation +212 added lines, -212 removed lines

@@ -17,139 +17,139 @@ 
  */
 class DigestHandler extends \XoopsPersistableObjectHandler
 {
-    public $last_digest;
+	public $last_digest;
 
-    /**
-     * Constructor
-     *
-     * @param null|\XoopsDatabase $db database connection
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_digest', Digest::class, 'digest_id');
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param null|\XoopsDatabase $db database connection
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_digest', Digest::class, 'digest_id');
+	}
 
-    /**
-     * @param  bool $isForced
-     * @return int
-     */
-    public function process($isForced = false)
-    {
-        $this->getLastDigest();
-        if (!$isForced) {
-            $status = $this->checkStatus();
-            if ($status < 1) {
-                return 1;
-            }
-        }
-        $digest = $this->create();
-        $status = $this->buildDigest($digest);
-        if (!$status) {
-            return 2;
-        }
-        $status = $this->insert($digest);
-        if (!$status) {
-            return 3;
-        }
-        $status = $this->notify($digest);
-        if (!$status) {
-            return 4;
-        }
+	/**
+	 * @param  bool $isForced
+	 * @return int
+	 */
+	public function process($isForced = false)
+	{
+		$this->getLastDigest();
+		if (!$isForced) {
+			$status = $this->checkStatus();
+			if ($status < 1) {
+				return 1;
+			}
+		}
+		$digest = $this->create();
+		$status = $this->buildDigest($digest);
+		if (!$status) {
+			return 2;
+		}
+		$status = $this->insert($digest);
+		if (!$status) {
+			return 3;
+		}
+		$status = $this->notify($digest);
+		if (!$status) {
+			return 4;
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * @param \XoopsObject $digest
-     * @return bool
-     */
-    public function notify(\XoopsObject $digest)
-    {
-        //$content                = $digest->getVar('digest_content');
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler    = xoops_getHandler('notification');
-        $tags['DIGEST_ID']      = $digest->getVar('digest_id');
-        $tags['DIGEST_CONTENT'] = $digest->getVar('digest_content', 'E');
-        $notificationHandler->triggerEvent('global', 0, 'digest', $tags);
+	/**
+	 * @param \XoopsObject $digest
+	 * @return bool
+	 */
+	public function notify(\XoopsObject $digest)
+	{
+		//$content                = $digest->getVar('digest_content');
+		/** @var \XoopsNotificationHandler $notificationHandler */
+		$notificationHandler    = xoops_getHandler('notification');
+		$tags['DIGEST_ID']      = $digest->getVar('digest_id');
+		$tags['DIGEST_CONTENT'] = $digest->getVar('digest_content', 'E');
+		$notificationHandler->triggerEvent('global', 0, 'digest', $tags);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * @param        $start
-     * @param  int   $perpage
-     * @return array
-     */
-    public function getAllDigests($start = 0, $perpage = 5)
-    {
-        //        if (empty($start)) {
-        //            $start = 0;
-        //        }
+	/**
+	 * @param        $start
+	 * @param  int   $perpage
+	 * @return array
+	 */
+	public function getAllDigests($start = 0, $perpage = 5)
+	{
+		//        if (empty($start)) {
+		//            $start = 0;
+		//        }
 
-        $sql    = 'SELECT * FROM ' . $this->db->prefix('newbb_digest') . ' ORDER BY digest_id DESC';
-        $result = $this->db->query($sql, $perpage, $start);
-        $ret    = [];
-        //        $reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $ret[] = $myrow; // return as array
-        }
+		$sql    = 'SELECT * FROM ' . $this->db->prefix('newbb_digest') . ' ORDER BY digest_id DESC';
+		$result = $this->db->query($sql, $perpage, $start);
+		$ret    = [];
+		//        $reportHandler =  Newbb\Helper::getInstance()->getHandler('Report');
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$ret[] = $myrow; // return as array
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @return int
-     */
-    public function getDigestCount()
-    {
-        $sql    = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_digest');
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        } else {
-            $array = $this->db->fetchArray($result);
+	/**
+	 * @return int
+	 */
+	public function getDigestCount()
+	{
+		$sql    = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_digest');
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		} else {
+			$array = $this->db->fetchArray($result);
 
-            return $array['count'];
-        }
-    }
+			return $array['count'];
+		}
+	}
 
-    public function getLastDigest()
-    {
-        $sql    = 'SELECT MAX(digest_time) AS last_digest FROM ' . $this->db->prefix('newbb_digest');
-        $result = $this->db->query($sql);
-        if (!$result) {
-            $this->last_digest = 0;
-        // echo "<br>no data:".$query;
-        } else {
-            $array             = $this->db->fetchArray($result);
-            $this->last_digest = isset($array['last_digest']) ? $array['last_digest'] : 0;
-        }
-    }
+	public function getLastDigest()
+	{
+		$sql    = 'SELECT MAX(digest_time) AS last_digest FROM ' . $this->db->prefix('newbb_digest');
+		$result = $this->db->query($sql);
+		if (!$result) {
+			$this->last_digest = 0;
+		// echo "<br>no data:".$query;
+		} else {
+			$array             = $this->db->fetchArray($result);
+			$this->last_digest = isset($array['last_digest']) ? $array['last_digest'] : 0;
+		}
+	}
 
-    /**
-     * @return int
-     */
-    public function checkStatus()
-    {
-        if (!isset($this->last_digest)) {
-            $this->getLastDigest();
-        }
-        $deadline  = (1 == $GLOBALS['xoopsModuleConfig']['email_digest']) ? 60 * 60 * 24 : 60 * 60 * 24 * 7;
-        $time_diff = time() - $this->last_digest;
+	/**
+	 * @return int
+	 */
+	public function checkStatus()
+	{
+		if (!isset($this->last_digest)) {
+			$this->getLastDigest();
+		}
+		$deadline  = (1 == $GLOBALS['xoopsModuleConfig']['email_digest']) ? 60 * 60 * 24 : 60 * 60 * 24 * 7;
+		$time_diff = time() - $this->last_digest;
 
-        return $time_diff - $deadline;
-    }
+		return $time_diff - $deadline;
+	}
 
-    /**
-     * @param  \XoopsObject $digest
-     * @param  bool         $force flag to force the query execution despite security settings
-     * @return mixed       object ID or false
-     */
-    public function insert(\XoopsObject $digest, $force = true)
-    {
-        $digest->setVar('digest_time', time());
-        return parent::insert($digest, $force);
-        /*
+	/**
+	 * @param  \XoopsObject $digest
+	 * @param  bool         $force flag to force the query execution despite security settings
+	 * @return mixed       object ID or false
+	 */
+	public function insert(\XoopsObject $digest, $force = true)
+	{
+		$digest->setVar('digest_time', time());
+		return parent::insert($digest, $force);
+		/*
         $content = $digest->getVar('digest_content', 'E');
 
         $id  = $this->db->genId($digest->table . '_digest_id_seq');
@@ -166,108 +166,108 @@ 
 
         return true;
         */
-    }
+	}
 
-    /**
-     * @param \XoopsObject $digest
-     * @param  bool        $force (ignored)
-     * @return bool        FALSE if failed.
-     */
-    public function delete(\XoopsObject $digest, $force = false)
-    {
-        $digest_id = $digest->getVar('digest_id');
+	/**
+	 * @param \XoopsObject $digest
+	 * @param  bool        $force (ignored)
+	 * @return bool        FALSE if failed.
+	 */
+	public function delete(\XoopsObject $digest, $force = false)
+	{
+		$digest_id = $digest->getVar('digest_id');
 
-        if (!isset($this->last_digest)) {
-            $this->getLastDigest();
-        }
-        if ($this->last_digest == $digest_id) {
-            return false;
-        } // It is not allowed to delete the last digest
+		if (!isset($this->last_digest)) {
+			$this->getLastDigest();
+		}
+		if ($this->last_digest == $digest_id) {
+			return false;
+		} // It is not allowed to delete the last digest
 
-        return parent::delete($digest, true);
-    }
+		return parent::delete($digest, true);
+	}
 
-    /**
-     * @param \XoopsObject $digest
-     * @return bool
-     */
-    public function buildDigest(\XoopsObject $digest)
-    {
-        global $xoopsModule;
+	/**
+	 * @param \XoopsObject $digest
+	 * @return bool
+	 */
+	public function buildDigest(\XoopsObject $digest)
+	{
+		global $xoopsModule;
 
-        if (!defined('SUMMARY_LENGTH')) {
-            define('SUMMARY_LENGTH', 100);
-        }
+		if (!defined('SUMMARY_LENGTH')) {
+			define('SUMMARY_LENGTH', 100);
+		}
 
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler         = Newbb\Helper::getInstance()->getHandler('Forum');
-        $thisUser             = $GLOBALS['xoopsUser'];
-        $GLOBALS['xoopsUser'] = null; // To get posts accessible by anonymous
-        $GLOBALS['xoopsUser'] = $thisUser;
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler         = Newbb\Helper::getInstance()->getHandler('Forum');
+		$thisUser             = $GLOBALS['xoopsUser'];
+		$GLOBALS['xoopsUser'] = null; // To get posts accessible by anonymous
+		$GLOBALS['xoopsUser'] = $thisUser;
 
-        $accessForums    = $forumHandler->getIdsByPermission(); // get all accessible forums
-        $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $accessForums) . ')';
-        $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
-        $time_criteria   = ' AND t.digest_time > ' . $this->last_digest;
+		$accessForums    = $forumHandler->getIdsByPermission(); // get all accessible forums
+		$forumCriteria   = ' AND t.forum_id IN (' . implode(',', $accessForums) . ')';
+		$approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
+		$time_criteria   = ' AND t.digest_time > ' . $this->last_digest;
 
-        $karma_criteria = $GLOBALS['xoopsModuleConfig']['enable_karma'] ? ' AND p.post_karma=0' : '';
-        $reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
+		$karma_criteria = $GLOBALS['xoopsModuleConfig']['enable_karma'] ? ' AND p.post_karma=0' : '';
+		$reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
 
-        $query = 'SELECT t.topic_id, t.forum_id, t.topic_title, t.topic_time, t.digest_time, p.uid, p.poster_name, pt.post_text FROM '
-                 . $this->db->prefix('newbb_topics')
-                 . ' t, '
-                 . $this->db->prefix('newbb_posts_text')
-                 . ' pt, '
-                 . $this->db->prefix('newbb_posts')
-                 . ' p WHERE t.topic_digest = 1 AND p.topic_id=t.topic_id AND p.pid=0 '
-                 . $forumCriteria
-                 . $approveCriteria
-                 . $time_criteria
-                 . $karma_criteria
-                 . $reply_criteria
-                 . ' AND pt.post_id=p.post_id ORDER BY t.digest_time DESC';
-        if (!$result = $this->db->query($query)) {
-            //echo "<br>No result:<br>$query";
-            return false;
-        }
-        $rows  = [];
-        $users = [];
-        while (false !== ($row = $this->db->fetchArray($result))) {
-            $users[$row['uid']] = 1;
-            $rows[]             = $row;
-        }
-        if (count($rows) < 1) {
-            return false;
-        }
-        $uids = array_keys($users);
-        if (count($uids) > 0) {
-            /** @var \XoopsMemberHandler $memberHandler */
-            $memberHandler = xoops_getHandler('member');
-            $user_criteria = new \Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
-            $users         = $memberHandler->getUsers($user_criteria, true);
-        } else {
-            $users = [];
-        }
+		$query = 'SELECT t.topic_id, t.forum_id, t.topic_title, t.topic_time, t.digest_time, p.uid, p.poster_name, pt.post_text FROM '
+				 . $this->db->prefix('newbb_topics')
+				 . ' t, '
+				 . $this->db->prefix('newbb_posts_text')
+				 . ' pt, '
+				 . $this->db->prefix('newbb_posts')
+				 . ' p WHERE t.topic_digest = 1 AND p.topic_id=t.topic_id AND p.pid=0 '
+				 . $forumCriteria
+				 . $approveCriteria
+				 . $time_criteria
+				 . $karma_criteria
+				 . $reply_criteria
+				 . ' AND pt.post_id=p.post_id ORDER BY t.digest_time DESC';
+		if (!$result = $this->db->query($query)) {
+			//echo "<br>No result:<br>$query";
+			return false;
+		}
+		$rows  = [];
+		$users = [];
+		while (false !== ($row = $this->db->fetchArray($result))) {
+			$users[$row['uid']] = 1;
+			$rows[]             = $row;
+		}
+		if (count($rows) < 1) {
+			return false;
+		}
+		$uids = array_keys($users);
+		if (count($uids) > 0) {
+			/** @var \XoopsMemberHandler $memberHandler */
+			$memberHandler = xoops_getHandler('member');
+			$user_criteria = new \Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
+			$users         = $memberHandler->getUsers($user_criteria, true);
+		} else {
+			$users = [];
+		}
 
-        foreach ($rows as $topic) {
-            if ($topic['uid'] > 0) {
-                if (isset($users[$topic['uid']]) && is_object($users[$topic['uid']])
-                    && $users[$topic['uid']]->isActive()) {
-                    $topic['uname'] = $users[$topic['uid']]->getVar('uname');
-                } else {
-                    $topic['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
-                }
-            } else {
-                $topic['uname'] = $topic['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous'];
-            }
-            $summary = \Xmf\Metagen::generateDescription($topic['post_text'], SUMMARY_LENGTH);
-            $author  = $topic['uname'] . ' (' . formatTimestamp($topic['topic_time']) . ')';
-            $link    = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/viewtopic.php?topic_id=' . $topic['topic_id'] . '&amp;forum=' . $topic['forum_id'];
-            $title   = $topic['topic_title'];
-            $digest->addItem($title, $link, $author, $summary);
-        }
-        $digest->buildContent();
+		foreach ($rows as $topic) {
+			if ($topic['uid'] > 0) {
+				if (isset($users[$topic['uid']]) && is_object($users[$topic['uid']])
+					&& $users[$topic['uid']]->isActive()) {
+					$topic['uname'] = $users[$topic['uid']]->getVar('uname');
+				} else {
+					$topic['uname'] = $GLOBALS['xoopsConfig']['anonymous'];
+				}
+			} else {
+				$topic['uname'] = $topic['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous'];
+			}
+			$summary = \Xmf\Metagen::generateDescription($topic['post_text'], SUMMARY_LENGTH);
+			$author  = $topic['uname'] . ' (' . formatTimestamp($topic['topic_time']) . ')';
+			$link    = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/viewtopic.php?topic_id=' . $topic['topic_id'] . '&amp;forum=' . $topic['forum_id'];
+			$title   = $topic['topic_title'];
+			$digest->addItem($title, $link, $author, $summary);
+		}
+		$digest->buildContent();
 
-        return true;
-    }
+		return true;
+	}
 }

language/english/common.php

Spacing +35 added lines, -35 removed lines

@@ -21,49 +21,49 @@
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
 
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
 
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
 
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 //Help
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');

language/english/admin.php

Spacing +2 added lines, -2 removed lines

@@ -178,8 +178,8 @@
 define('_AM_NEWBB_CAN_ATTACH', 'Can use attachment');
 define('_AM_NEWBB_CAN_NOAPPROVE', 'Can post directly');
 define('_AM_NEWBB_CAN_TYPE', 'Can use topic type');
-define('_AM_NEWBB_CAN_HTML', 'Can use and disable/enable HTML in posts');//irmtfan revised
-define('_AM_NEWBB_CAN_SIGNATURE', 'Can use and disable/enable signature. Default is set in profile module.');//irmtfan revised
+define('_AM_NEWBB_CAN_HTML', 'Can use and disable/enable HTML in posts'); //irmtfan revised
+define('_AM_NEWBB_CAN_SIGNATURE', 'Can use and disable/enable signature. Default is set in profile module.'); //irmtfan revised
 define('_AM_NEWBB_ACTION', 'Action');
 define('_AM_NEWBB_PERM_TEMPLATE', 'Set default permission template');
 define('_AM_NEWBB_PERM_TEMPLATE_DESC', 'Edit the following permission template so that it can be applied to a forum or a couple of forums');

Indentation +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 //
 if (defined('NEWBB_ADMIN_DEFINED')) {
-    return;
+	return;
 } else {
-    define('NEWBB_ADMIN_DEFINED', true);
+	define('NEWBB_ADMIN_DEFINED', true);
 }
 //%%%%%%    File Name  index.php       %%%%%
 define('_AM_NEWBB_FORUMCONF', 'Forum Configuration');
@@ -75,8 +75,8 @@ 
 define('_AM_NEWBB_DIGEST_HELP_3', 'The dispatch is made only to users signed up for notification of digest topics.');
 define('_AM_NEWBB_DIGEST_HELP_4', 'After creating and sending, do not delete the created messages. Otherwise they will be generated again.');
 define(
-    '_AM_NEWBB_DIGEST_HELP_AUTO_DIGEST',
-       'To configure the automatic creation and distribution of Digest topics, you need to create a cron task on your server.<br>For example: * NIX systems: <strong>0 6 * * * wget --post-data \'foo=bar\' https://example.com/modules/newbb/digest.php</strong><br>In this example, the script will run every day at 6.00 and check if there are any new Digest topics. If they are not found, mailing will not be done.<br>If for any reason you do not have the opportunity to create a task, then it is possible to create and make the dispatch on this page manually by clicking on the button above.<br>Please note that it is not recommended to delete created mailings, otherwise they will be created and sent again.'
+	'_AM_NEWBB_DIGEST_HELP_AUTO_DIGEST',
+	   'To configure the automatic creation and distribution of Digest topics, you need to create a cron task on your server.<br>For example: * NIX systems: <strong>0 6 * * * wget --post-data \'foo=bar\' https://example.com/modules/newbb/digest.php</strong><br>In this example, the script will run every day at 6.00 and check if there are any new Digest topics. If they are not found, mailing will not be done.<br>If for any reason you do not have the opportunity to create a task, then it is possible to create and make the dispatch on this page manually by clicking on the button above.<br>Please note that it is not recommended to delete created mailings, otherwise they will be created and sent again.'
 );
 //define('_AM_NEWBB_DIGEST_PAST', '<span style="color:red;">Should be sent out %d minutes ago</span>');
 //define('_AM_NEWBB_DIGEST_NEXT', 'Need to send out in %d minutes');
@@ -324,31 +324,31 @@ 
 
 // Help tab
 define(
-    '_AM_NEWBB_HELP_CATEGORY_TAB',
-       'To create a category, use the button above and fill in all the fields on the form.<br>By default, category images are located: /modules/newbb/assets/images/category/<br>Sponsor link should be written in the following format: https://xoops.org/modules/newbb/ newBB Support. First the link, then the sponsor\'s name or other text.'
+	'_AM_NEWBB_HELP_CATEGORY_TAB',
+	   'To create a category, use the button above and fill in all the fields on the form.<br>By default, category images are located: /modules/newbb/assets/images/category/<br>Sponsor link should be written in the following format: https://xoops.org/modules/newbb/ newBB Support. First the link, then the sponsor\'s name or other text.'
 );
 define(
-    '_AM_NEWBB_HELP_FORUM_TAB',
-       'To create and manage the forums use the buttons with the right<br>To create the forum, use the \'Create forum\' button. Then fill in all the fields of the form. You can also create a subforum.<br>To move the forum between categories, use the \'Move\' button. Follow the further instructions.<br>To merge forums, use the \'Merge\' button. Follow the further instructions.<br>If you have an access rights template, then you can apply it to the forum you are creating.'
+	'_AM_NEWBB_HELP_FORUM_TAB',
+	   'To create and manage the forums use the buttons with the right<br>To create the forum, use the \'Create forum\' button. Then fill in all the fields of the form. You can also create a subforum.<br>To move the forum between categories, use the \'Move\' button. Follow the further instructions.<br>To merge forums, use the \'Merge\' button. Follow the further instructions.<br>If you have an access rights template, then you can apply it to the forum you are creating.'
 );
 define(
-    '_AM_NEWBB_HELP_PERMISSION_TAB',
-       '<strong>When setting permissions, be careful.</strong><br>After you install and apply the settings, you will automatically go to the next permissions tab.<br>Also here it is possible to create a default access rights template and apply it either to one forum or to all forums.'
+	'_AM_NEWBB_HELP_PERMISSION_TAB',
+	   '<strong>When setting permissions, be careful.</strong><br>After you install and apply the settings, you will automatically go to the next permissions tab.<br>Also here it is possible to create a default access rights template and apply it either to one forum or to all forums.'
 );
 define('_AM_NEWBB_HELP_ORDER_TAB', 'Allows you to set the order of categories and forums relative to each other.<br>The order (Weight) is set to 0 - top, 99 (and further) - bottom.');
 define('_AM_NEWBB_HELP_PRUNE_TAB', 'Allows you to clear forums from empty themes, obsolete themes, etc.<br>Also you can not delete topics that you want to clear, but transfer them to a specially created category \'Archive\' or any other.');
 define(
-    '_AM_NEWBB_HELP_REPORT_TAB',
-       'Allows you to process reports that users send to you if they believe that the message on the forum does not comply with forum rules or ethical rules.<br>You can review the report and take action in relation to the message, the author, etc.<br>When a user sends a message, moderators and administrators are notified by e-mail.'
+	'_AM_NEWBB_HELP_REPORT_TAB',
+	   'Allows you to process reports that users send to you if they believe that the message on the forum does not comply with forum rules or ethical rules.<br>You can review the report and take action in relation to the message, the author, etc.<br>When a user sends a message, moderators and administrators are notified by e-mail.'
 );
 define('_AM_NEWBB_HELP_VOTE_TAB', 'If you have the voting function enabled, here you can see the results of the voting.<br>This vote is not associated with other XOOPS modules.');
 define(
-    '_AM_NEWBB_HELP_TYPE_TAB',
-       'Allows you to create tags for highlighting themes. For example:<br><strong style="color:blue;">[Important]</strong> <strong>Topic Title</strong><br><strong style="color:red;">[ATTENTION]</strong> <strong>Topic Title</strong><br>You can set theme types when creating a theme on the user side.'
+	'_AM_NEWBB_HELP_TYPE_TAB',
+	   'Allows you to create tags for highlighting themes. For example:<br><strong style="color:blue;">[Important]</strong> <strong>Topic Title</strong><br><strong style="color:red;">[ATTENTION]</strong> <strong>Topic Title</strong><br>You can set theme types when creating a theme on the user side.'
 );
 define(
-    '_AM_NEWBB_HELP_GROUPMOD_TAB',
-       'Allows you to install users of certain groups as moderators for the entire module, and for individual categories and forums.<br>It is recommended to create separate groups of moderators, for more convenient management of moderators.<br>You can also assign specific users to moderators when creating a forum.'
+	'_AM_NEWBB_HELP_GROUPMOD_TAB',
+	   'Allows you to install users of certain groups as moderators for the entire module, and for individual categories and forums.<br>It is recommended to create separate groups of moderators, for more convenient management of moderators.<br>You can also assign specific users to moderators when creating a forum.'
 );
 define('_AM_NEWBB_HELP_SYNC_TAB', 'If you notice a problem with the message dates, the appearance of blank messages, etc. Here you can synchronize and correct forum data and topics');