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

Spacing +19 added lines, -19 removed lines

@@ -92,7 +92,7 @@ 
     public function __construct(\XoopsDatabase $db, $type)
     {
         $type = ('forum' === $type) ? 'forum' : 'topic';
-        parent::__construct($db, 'newbb_reads_' . $type, Read::class . $type, 'read_id', 'post_id');
+        parent::__construct($db, 'newbb_reads_'.$type, Read::class.$type, 'read_id', 'post_id');
         $this->type  = $type;
         $newbbConfig = newbbLoadConfig();
         // irmtfan if read_expire = 0 dont clean
@@ -113,7 +113,7 @@ 
             return false;
         }
 
-        $sql = 'DELETE bb FROM ' . $this->table . ' AS bb' . ' LEFT JOIN ' . $this->table . ' AS aa ON bb.read_item = aa.read_item ' . ' WHERE aa.post_id > bb.post_id';
+        $sql = 'DELETE bb FROM '.$this->table.' AS bb'.' LEFT JOIN '.$this->table.' AS aa ON bb.read_item = aa.read_item '.' WHERE aa.post_id > bb.post_id';
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
             return false;
@@ -124,7 +124,7 @@ 
         }
         // irmtfan move here and rephrase
         $expire = time() - (int)$this->lifetime;
-        $sql    = 'DELETE FROM ' . $this->table . ' WHERE read_time < ' . $expire;
+        $sql    = 'DELETE FROM '.$this->table.' WHERE read_time < '.$expire;
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
             return false;
@@ -180,7 +180,7 @@ 
                 return false;
             }
         }
-        $sql = 'SELECT post_id ' . ' FROM ' . $this->table . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
+        $sql = 'SELECT post_id '.' FROM '.$this->table.' WHERE read_item = '.(int)$read_item.'     AND uid = '.(int)$uid;
         if (!$result = $this->db->queryF($sql, 1)) {
             return null;
         }
@@ -235,7 +235,7 @@ 
             }
         }
 
-        $sql = 'UPDATE ' . $this->table . ' SET post_id = ' . (int)$post_id . ',' . '     read_time =' . time() . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
+        $sql = 'UPDATE '.$this->table.' SET post_id = '.(int)$post_id.','.'     read_time ='.time().' WHERE read_item = '.(int)$read_item.'     AND uid = '.(int)$uid;
         if ($this->db->queryF($sql) && $this->db->getAffectedRows()) {
             return true;
         }
@@ -307,7 +307,7 @@ 
         }
 
         $criteria = new \CriteriaCompo(new \Criteria('uid', $uid));
-        $criteria->add(new \Criteria('read_item', '(' . implode(', ', array_map('intval', array_keys($items))) . ')', 'IN'));
+        $criteria->add(new \Criteria('read_item', '('.implode(', ', array_map('intval', array_keys($items))).')', 'IN'));
         $itemsObject = $this->getAll($criteria, ['read_item', 'post_id']);
 
         $items_list = [];
@@ -339,43 +339,43 @@ 
         $sql = "SET sql_mode=(SELECT REPLACE(@@sql_mode, 'ONLY_FULL_GROUP_BY', ''))";
         $this->db->queryF($sql);
 
-        $sql = 'CREATE TABLE ' . $this->table . '_duplicate LIKE ' . $this->table . '; ';
+        $sql = 'CREATE TABLE '.$this->table.'_duplicate LIKE '.$this->table.'; ';
         if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
+            xoops_error($this->db->error().'<br>'.$sql);
 
             return false;
         }
-        $sql = 'INSERT ' . $this->table . '_duplicate SELECT * FROM ' . $this->table . ' GROUP BY read_item, uid; ';
+        $sql = 'INSERT '.$this->table.'_duplicate SELECT * FROM '.$this->table.' GROUP BY read_item, uid; ';
         if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
+            xoops_error($this->db->error().'<br>'.$sql);
 
             return false;
         }
-        $sql = 'RENAME TABLE ' . $this->table . ' TO ' . $this->table . '_with_duplicate; ';
+        $sql = 'RENAME TABLE '.$this->table.' TO '.$this->table.'_with_duplicate; ';
         if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
+            xoops_error($this->db->error().'<br>'.$sql);
 
             return false;
         }
-        $sql = 'RENAME TABLE ' . $this->table . '_duplicate TO ' . $this->table . '; ';
+        $sql = 'RENAME TABLE '.$this->table.'_duplicate TO '.$this->table.'; ';
         if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
+            xoops_error($this->db->error().'<br>'.$sql);
 
             return false;
         }
-        $sql    = 'SHOW INDEX FROM ' . $this->table . " WHERE KEY_NAME = 'read_item_uid'";
+        $sql    = 'SHOW INDEX FROM '.$this->table." WHERE KEY_NAME = 'read_item_uid'";
         $result = $this->db->queryF($sql);
         if (empty($result)) {
-            $sql .= 'ALTER TABLE ' . $this->table . ' ADD INDEX read_item_uid ( read_item, uid ); ';
+            $sql .= 'ALTER TABLE '.$this->table.' ADD INDEX read_item_uid ( read_item, uid ); ';
             if (!$result = $this->db->queryF($sql)) {
-                xoops_error($this->db->error() . '<br>' . $sql);
+                xoops_error($this->db->error().'<br>'.$sql);
 
                 return false;
             }
         }
-        $sql = 'DROP TABLE ' . $this->table . '_with_duplicate; ';
+        $sql = 'DROP TABLE '.$this->table.'_with_duplicate; ';
         if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
+            xoops_error($this->db->error().'<br>'.$sql);
 
             return false;
         }

Indentation +336 added lines, -336 removed lines

@@ -48,340 +48,340 @@
  */
 class ReadHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * Object type.
-     * <ul>
-     *  <li>forum</li>
-     *  <li>topic</li>
-     * </ul>
-     *
-     * @var string
-     */
-    public $type;
-
-    /**
-     * seconds records will persist.
-     * assigned from $GLOBALS['xoopsModuleConfig']["read_expire"]
-     * <ul>
-     *  <li>positive days = delete all read records exist in the tables before expire time // irmtfan add comment</li>
-     *  <li>0 = never expires // irmtfan change comment</li>
-     *  <li>-1 or any negative days = never records // irmtfan change comment</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $lifetime;
-
-    /**
-     * storage mode for records.
-     * assigned from $GLOBALS['xoopsModuleConfig']["read_mode"]
-     * <ul>
-     *  <li>0 = never records</li>
-     *  <li>1 = uses cookie</li>
-     *  <li>2 = stores in database</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    public $mode;
-
-    /**
-     * @param \XoopsDatabase     $db
-     * @param                    $type
-     */
-    public function __construct(\XoopsDatabase $db, $type)
-    {
-        $type = ('forum' === $type) ? 'forum' : 'topic';
-        parent::__construct($db, 'newbb_reads_' . $type, Read::class . $type, 'read_id', 'post_id');
-        $this->type  = $type;
-        $newbbConfig = newbbLoadConfig();
-        // irmtfan if read_expire = 0 dont clean
-        $this->lifetime = isset($newbbConfig['read_expire']) ? (int)$newbbConfig['read_expire'] * 24 * 3600 : 30 * 24 * 3600;
-        $this->mode     = isset($newbbConfig['read_mode']) ? $newbbConfig['read_mode'] : 2;
-    }
-
-    /**
-     * Clear garbage
-     *
-     * Delete all expired and duplicated records
-     */
-    // START irmtfan rephrase function to 1- add clearDuplicate and 2- dont clean when read_expire = 0
-    public function clearGarbage()
-    {
-        // irmtfan clear duplicaed rows
-        if (!$result = $this->clearDuplicate()) {
-            return false;
-        }
-
-        $sql = 'DELETE bb FROM ' . $this->table . ' AS bb' . ' LEFT JOIN ' . $this->table . ' AS aa ON bb.read_item = aa.read_item ' . ' WHERE aa.post_id > bb.post_id';
-        if (!$result = $this->db->queryF($sql)) {
-            //xoops_error($this->db->error());
-            return false;
-        }
-        // irmtfan if read_expire = 0 dont clean
-        if (empty($this->lifetime)) {
-            return true;
-        }
-        // irmtfan move here and rephrase
-        $expire = time() - (int)$this->lifetime;
-        $sql    = 'DELETE FROM ' . $this->table . ' WHERE read_time < ' . $expire;
-        if (!$result = $this->db->queryF($sql)) {
-            //xoops_error($this->db->error());
-            return false;
-        }
-
-        return true;
-    }
-
-    // END irmtfan rephrase function to 1- add clearDuplicate and 2- dont clean when read_expire = 0
-
-    /**
-     * @param                  $read_item
-     * @param  null            $uid
-     * @return bool|mixed|null
-     */
-    public function getRead($read_item, $uid = null)
-    {
-        if (empty($this->mode)) {
-            return null;
-        }
-        if (1 == $this->mode) {
-            return $this->getReadCookie($read_item);
-        }
-
-        return $this->getReadDb($read_item, $uid);
-    }
-
-    /**
-     * @param $item_id
-     * @return mixed
-     */
-    public function getReadCookie($item_id)
-    {
-        $cookie_name = ('forum' === $this->type) ? 'LF' : 'LT';
-        $cookie_var  = $item_id;
-        // irmtfan set true to return array
-        $lastview = newbbGetCookie($cookie_name, true);
-
-        return @$lastview[$cookie_var];
-    }
-
-    /**
-     * @param $read_item
-     * @param $uid
-     * @return bool|null
-     */
-    public function getReadDb($read_item, $uid)
-    {
-        if (empty($uid)) {
-            if (is_object($GLOBALS['xoopsUser'])) {
-                $uid = $GLOBALS['xoopsUser']->getVar('uid');
-            } else {
-                return false;
-            }
-        }
-        $sql = 'SELECT post_id ' . ' FROM ' . $this->table . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
-        if (!$result = $this->db->queryF($sql, 1)) {
-            return null;
-        }
-        list($post_id) = $this->db->fetchRow($result);
-
-        return $post_id;
-    }
-
-    /**
-     * @param                  $read_item
-     * @param                  $post_id
-     * @param  null            $uid
-     * @return bool|mixed|void
-     */
-    public function setRead($read_item, $post_id, $uid = null)
-    {
-        if (empty($this->mode)) {
-            return true;
-        }
-
-        if (1 == $this->mode) {
-            return $this->setReadCookie($read_item, $post_id);
-        }
-
-        return $this->setReadDb($read_item, $post_id, $uid);
-    }
-
-    /**
-     * @param $read_item
-     * @param $post_id
-     */
-    public function setReadCookie($read_item, $post_id)
-    {
-        $cookie_name          = ('forum' === $this->type) ? 'LF' : 'LT';
-        $lastview             = newbbGetCookie($cookie_name, true);
-        $lastview[$read_item] = time();
-        newbbSetCookie($cookie_name, $lastview);
-    }
-
-    /**
-     * @param $read_item
-     * @param $post_id
-     * @param $uid
-     * @return bool|mixed
-     */
-    public function setReadDb($read_item, $post_id, $uid)
-    {
-        if (empty($uid)) {
-            if (is_object($GLOBALS['xoopsUser'])) {
-                $uid = $GLOBALS['xoopsUser']->getVar('uid');
-            } else {
-                return false;
-            }
-        }
-
-        $sql = 'UPDATE ' . $this->table . ' SET post_id = ' . (int)$post_id . ',' . '     read_time =' . time() . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
-        if ($this->db->queryF($sql) && $this->db->getAffectedRows()) {
-            return true;
-        }
-        $object = $this->create();
-        $object->setVar('read_item', $read_item);
-        $object->setVar('post_id', $post_id);
-        $object->setVar('uid', $uid);
-        $object->setVar('read_time', time());
-
-        return parent::insert($object);
-    }
-
-    /**
-     * @param             $items
-     * @param  null       $uid
-     * @return array|null
-     */
-    public function isReadItems(&$items, $uid = null)
-    {
-        $ret = null;
-        if (empty($this->mode)) {
-            return $ret;
-        }
-
-        if (1 == $this->mode) {
-            $ret = $this->isReadItemsCookie($items);
-        } else {
-            $ret = $this->isReadItemsDb($items, $uid);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $items
-     * @return array
-     */
-    public function isReadItemsCookie(&$items)
-    {
-        $cookie_name = ('forum' === $this->type) ? 'LF' : 'LT';
-        $cookie_vars = newbbGetCookie($cookie_name, true);
-
-        $ret = [];
-        foreach ($items as $key => $last_update) {
-            $ret[$key] = (max(@$GLOBALS['last_visit'], @$cookie_vars[$key]) >= $last_update);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $items
-     * @param $uid
-     * @return array
-     */
-    public function isReadItemsDb(&$items, $uid)
-    {
-        $ret = [];
-        if (empty($items)) {
-            return $ret;
-        }
-
-        if (empty($uid)) {
-            if (is_object($GLOBALS['xoopsUser'])) {
-                $uid = $GLOBALS['xoopsUser']->getVar('uid');
-            } else {
-                return $ret;
-            }
-        }
-
-        $criteria = new \CriteriaCompo(new \Criteria('uid', $uid));
-        $criteria->add(new \Criteria('read_item', '(' . implode(', ', array_map('intval', array_keys($items))) . ')', 'IN'));
-        $itemsObject = $this->getAll($criteria, ['read_item', 'post_id']);
-
-        $items_list = [];
-        foreach (array_keys($itemsObject) as $key) {
-            $items_list[$itemsObject[$key]->getVar('read_item')] = $itemsObject[$key]->getVar('post_id');
-        }
-        unset($itemsObject);
-
-        foreach ($items as $key => $last_update) {
-            $ret[$key] = (@$items_list[$key] >= $last_update);
-        }
-
-        return $ret;
-    }
-
-    // START irmtfan add clear duplicated rows function
-
-    /**
-     * @return bool
-     */
-    public function clearDuplicate()
-    {
-        /**
-         * This is needed for the following query GROUP BY clauses to work in MySQL 5.7.
-         * This is a TEMPORARY fix. Needing this function is bad in the first place, but
-         * needing sloppy SQL to make it work is worse.
-         * @todo The schema itself should preclude the duplicates
-         */
-        $sql = "SET sql_mode=(SELECT REPLACE(@@sql_mode, 'ONLY_FULL_GROUP_BY', ''))";
-        $this->db->queryF($sql);
-
-        $sql = 'CREATE TABLE ' . $this->table . '_duplicate LIKE ' . $this->table . '; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-        $sql = 'INSERT ' . $this->table . '_duplicate SELECT * FROM ' . $this->table . ' GROUP BY read_item, uid; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-        $sql = 'RENAME TABLE ' . $this->table . ' TO ' . $this->table . '_with_duplicate; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-        $sql = 'RENAME TABLE ' . $this->table . '_duplicate TO ' . $this->table . '; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-        $sql    = 'SHOW INDEX FROM ' . $this->table . " WHERE KEY_NAME = 'read_item_uid'";
-        $result = $this->db->queryF($sql);
-        if (empty($result)) {
-            $sql .= 'ALTER TABLE ' . $this->table . ' ADD INDEX read_item_uid ( read_item, uid ); ';
-            if (!$result = $this->db->queryF($sql)) {
-                xoops_error($this->db->error() . '<br>' . $sql);
-
-                return false;
-            }
-        }
-        $sql = 'DROP TABLE ' . $this->table . '_with_duplicate; ';
-        if (!$result = $this->db->queryF($sql)) {
-            xoops_error($this->db->error() . '<br>' . $sql);
-
-            return false;
-        }
-
-        return true;
-    }
-    // END irmtfan add clear duplicated rows function
+	/**
+	 * Object type.
+	 * <ul>
+	 *  <li>forum</li>
+	 *  <li>topic</li>
+	 * </ul>
+	 *
+	 * @var string
+	 */
+	public $type;
+
+	/**
+	 * seconds records will persist.
+	 * assigned from $GLOBALS['xoopsModuleConfig']["read_expire"]
+	 * <ul>
+	 *  <li>positive days = delete all read records exist in the tables before expire time // irmtfan add comment</li>
+	 *  <li>0 = never expires // irmtfan change comment</li>
+	 *  <li>-1 or any negative days = never records // irmtfan change comment</li>
+	 * </ul>
+	 *
+	 * @var integer
+	 */
+	public $lifetime;
+
+	/**
+	 * storage mode for records.
+	 * assigned from $GLOBALS['xoopsModuleConfig']["read_mode"]
+	 * <ul>
+	 *  <li>0 = never records</li>
+	 *  <li>1 = uses cookie</li>
+	 *  <li>2 = stores in database</li>
+	 * </ul>
+	 *
+	 * @var integer
+	 */
+	public $mode;
+
+	/**
+	 * @param \XoopsDatabase     $db
+	 * @param                    $type
+	 */
+	public function __construct(\XoopsDatabase $db, $type)
+	{
+		$type = ('forum' === $type) ? 'forum' : 'topic';
+		parent::__construct($db, 'newbb_reads_' . $type, Read::class . $type, 'read_id', 'post_id');
+		$this->type  = $type;
+		$newbbConfig = newbbLoadConfig();
+		// irmtfan if read_expire = 0 dont clean
+		$this->lifetime = isset($newbbConfig['read_expire']) ? (int)$newbbConfig['read_expire'] * 24 * 3600 : 30 * 24 * 3600;
+		$this->mode     = isset($newbbConfig['read_mode']) ? $newbbConfig['read_mode'] : 2;
+	}
+
+	/**
+	 * Clear garbage
+	 *
+	 * Delete all expired and duplicated records
+	 */
+	// START irmtfan rephrase function to 1- add clearDuplicate and 2- dont clean when read_expire = 0
+	public function clearGarbage()
+	{
+		// irmtfan clear duplicaed rows
+		if (!$result = $this->clearDuplicate()) {
+			return false;
+		}
+
+		$sql = 'DELETE bb FROM ' . $this->table . ' AS bb' . ' LEFT JOIN ' . $this->table . ' AS aa ON bb.read_item = aa.read_item ' . ' WHERE aa.post_id > bb.post_id';
+		if (!$result = $this->db->queryF($sql)) {
+			//xoops_error($this->db->error());
+			return false;
+		}
+		// irmtfan if read_expire = 0 dont clean
+		if (empty($this->lifetime)) {
+			return true;
+		}
+		// irmtfan move here and rephrase
+		$expire = time() - (int)$this->lifetime;
+		$sql    = 'DELETE FROM ' . $this->table . ' WHERE read_time < ' . $expire;
+		if (!$result = $this->db->queryF($sql)) {
+			//xoops_error($this->db->error());
+			return false;
+		}
+
+		return true;
+	}
+
+	// END irmtfan rephrase function to 1- add clearDuplicate and 2- dont clean when read_expire = 0
+
+	/**
+	 * @param                  $read_item
+	 * @param  null            $uid
+	 * @return bool|mixed|null
+	 */
+	public function getRead($read_item, $uid = null)
+	{
+		if (empty($this->mode)) {
+			return null;
+		}
+		if (1 == $this->mode) {
+			return $this->getReadCookie($read_item);
+		}
+
+		return $this->getReadDb($read_item, $uid);
+	}
+
+	/**
+	 * @param $item_id
+	 * @return mixed
+	 */
+	public function getReadCookie($item_id)
+	{
+		$cookie_name = ('forum' === $this->type) ? 'LF' : 'LT';
+		$cookie_var  = $item_id;
+		// irmtfan set true to return array
+		$lastview = newbbGetCookie($cookie_name, true);
+
+		return @$lastview[$cookie_var];
+	}
+
+	/**
+	 * @param $read_item
+	 * @param $uid
+	 * @return bool|null
+	 */
+	public function getReadDb($read_item, $uid)
+	{
+		if (empty($uid)) {
+			if (is_object($GLOBALS['xoopsUser'])) {
+				$uid = $GLOBALS['xoopsUser']->getVar('uid');
+			} else {
+				return false;
+			}
+		}
+		$sql = 'SELECT post_id ' . ' FROM ' . $this->table . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
+		if (!$result = $this->db->queryF($sql, 1)) {
+			return null;
+		}
+		list($post_id) = $this->db->fetchRow($result);
+
+		return $post_id;
+	}
+
+	/**
+	 * @param                  $read_item
+	 * @param                  $post_id
+	 * @param  null            $uid
+	 * @return bool|mixed|void
+	 */
+	public function setRead($read_item, $post_id, $uid = null)
+	{
+		if (empty($this->mode)) {
+			return true;
+		}
+
+		if (1 == $this->mode) {
+			return $this->setReadCookie($read_item, $post_id);
+		}
+
+		return $this->setReadDb($read_item, $post_id, $uid);
+	}
+
+	/**
+	 * @param $read_item
+	 * @param $post_id
+	 */
+	public function setReadCookie($read_item, $post_id)
+	{
+		$cookie_name          = ('forum' === $this->type) ? 'LF' : 'LT';
+		$lastview             = newbbGetCookie($cookie_name, true);
+		$lastview[$read_item] = time();
+		newbbSetCookie($cookie_name, $lastview);
+	}
+
+	/**
+	 * @param $read_item
+	 * @param $post_id
+	 * @param $uid
+	 * @return bool|mixed
+	 */
+	public function setReadDb($read_item, $post_id, $uid)
+	{
+		if (empty($uid)) {
+			if (is_object($GLOBALS['xoopsUser'])) {
+				$uid = $GLOBALS['xoopsUser']->getVar('uid');
+			} else {
+				return false;
+			}
+		}
+
+		$sql = 'UPDATE ' . $this->table . ' SET post_id = ' . (int)$post_id . ',' . '     read_time =' . time() . ' WHERE read_item = ' . (int)$read_item . '     AND uid = ' . (int)$uid;
+		if ($this->db->queryF($sql) && $this->db->getAffectedRows()) {
+			return true;
+		}
+		$object = $this->create();
+		$object->setVar('read_item', $read_item);
+		$object->setVar('post_id', $post_id);
+		$object->setVar('uid', $uid);
+		$object->setVar('read_time', time());
+
+		return parent::insert($object);
+	}
+
+	/**
+	 * @param             $items
+	 * @param  null       $uid
+	 * @return array|null
+	 */
+	public function isReadItems(&$items, $uid = null)
+	{
+		$ret = null;
+		if (empty($this->mode)) {
+			return $ret;
+		}
+
+		if (1 == $this->mode) {
+			$ret = $this->isReadItemsCookie($items);
+		} else {
+			$ret = $this->isReadItemsDb($items, $uid);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $items
+	 * @return array
+	 */
+	public function isReadItemsCookie(&$items)
+	{
+		$cookie_name = ('forum' === $this->type) ? 'LF' : 'LT';
+		$cookie_vars = newbbGetCookie($cookie_name, true);
+
+		$ret = [];
+		foreach ($items as $key => $last_update) {
+			$ret[$key] = (max(@$GLOBALS['last_visit'], @$cookie_vars[$key]) >= $last_update);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $items
+	 * @param $uid
+	 * @return array
+	 */
+	public function isReadItemsDb(&$items, $uid)
+	{
+		$ret = [];
+		if (empty($items)) {
+			return $ret;
+		}
+
+		if (empty($uid)) {
+			if (is_object($GLOBALS['xoopsUser'])) {
+				$uid = $GLOBALS['xoopsUser']->getVar('uid');
+			} else {
+				return $ret;
+			}
+		}
+
+		$criteria = new \CriteriaCompo(new \Criteria('uid', $uid));
+		$criteria->add(new \Criteria('read_item', '(' . implode(', ', array_map('intval', array_keys($items))) . ')', 'IN'));
+		$itemsObject = $this->getAll($criteria, ['read_item', 'post_id']);
+
+		$items_list = [];
+		foreach (array_keys($itemsObject) as $key) {
+			$items_list[$itemsObject[$key]->getVar('read_item')] = $itemsObject[$key]->getVar('post_id');
+		}
+		unset($itemsObject);
+
+		foreach ($items as $key => $last_update) {
+			$ret[$key] = (@$items_list[$key] >= $last_update);
+		}
+
+		return $ret;
+	}
+
+	// START irmtfan add clear duplicated rows function
+
+	/**
+	 * @return bool
+	 */
+	public function clearDuplicate()
+	{
+		/**
+		 * This is needed for the following query GROUP BY clauses to work in MySQL 5.7.
+		 * This is a TEMPORARY fix. Needing this function is bad in the first place, but
+		 * needing sloppy SQL to make it work is worse.
+		 * @todo The schema itself should preclude the duplicates
+		 */
+		$sql = "SET sql_mode=(SELECT REPLACE(@@sql_mode, 'ONLY_FULL_GROUP_BY', ''))";
+		$this->db->queryF($sql);
+
+		$sql = 'CREATE TABLE ' . $this->table . '_duplicate LIKE ' . $this->table . '; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+		$sql = 'INSERT ' . $this->table . '_duplicate SELECT * FROM ' . $this->table . ' GROUP BY read_item, uid; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+		$sql = 'RENAME TABLE ' . $this->table . ' TO ' . $this->table . '_with_duplicate; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+		$sql = 'RENAME TABLE ' . $this->table . '_duplicate TO ' . $this->table . '; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+		$sql    = 'SHOW INDEX FROM ' . $this->table . " WHERE KEY_NAME = 'read_item_uid'";
+		$result = $this->db->queryF($sql);
+		if (empty($result)) {
+			$sql .= 'ALTER TABLE ' . $this->table . ' ADD INDEX read_item_uid ( read_item, uid ); ';
+			if (!$result = $this->db->queryF($sql)) {
+				xoops_error($this->db->error() . '<br>' . $sql);
+
+				return false;
+			}
+		}
+		$sql = 'DROP TABLE ' . $this->table . '_with_duplicate; ';
+		if (!$result = $this->db->queryF($sql)) {
+			xoops_error($this->db->error() . '<br>' . $sql);
+
+			return false;
+		}
+
+		return true;
+	}
+	// END irmtfan add clear duplicated rows function
 }

class/Xmlrss.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
     {
         if (count($this->items) < $this->max_items) {
             if (!empty($label)) {
-                $label = '[' . $this->cleanup($label) . ']';
+                $label = '['.$this->cleanup($label).']';
             }
             if (!empty($description)) {
                 $description = $this->cleanup($description, $this->max_item_description);
@@ -94,7 +94,7 @@ 
                 //$description = $label;
             }
 
-            $title         = $this->cleanup($title) . ' ' . $label;
+            $title         = $this->cleanup($title).' '.$label;
             $pubdate       = $this->cleanup($pubdate);
             $this->items[] = [
                 'title'       => $title,

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

Spacing +4 added lines, -4 removed lines

@@ -112,16 +112,16 @@ 
     {
         $ips = [];
         if ($isUid) {
-            $criteria = 'uid =' . (int)$item;
+            $criteria = 'uid ='.(int)$item;
         } else {
             $ip_segs = explode('.', $item);
             $segs    = min(count($ip_segs), 4);
             for ($i = 1; $i <= $segs; ++$i) {
                 $ips[] = $this->db->quoteString(implode('.', array_slice($ip_segs, 0, $i)));
             }
-            $criteria = 'ip IN(' . implode(',', $ips) . ')';
+            $criteria = 'ip IN('.implode(',', $ips).')';
         }
-        $sql = 'SELECT MAX(mod_end) AS expire FROM ' . $this->db->prefix('newbb_moderates') . ' WHERE ' . $criteria;
+        $sql = 'SELECT MAX(mod_end) AS expire FROM '.$this->db->prefix('newbb_moderates').' WHERE '.$criteria;
         if (!$result = $this->db->query($sql)) {
             return -1;
         }
@@ -140,7 +140,7 @@ 
      */
     public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
     {
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE (forum_id >0 AND forum_id NOT IN ( SELECT DISTINCT forum_id FROM ' . $this->db->prefix('newbb_forums') . ') )';
+        $sql = 'DELETE FROM '.$this->table.' WHERE (forum_id >0 AND forum_id NOT IN ( SELECT DISTINCT forum_id FROM '.$this->db->prefix('newbb_forums').') )';
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
             return false;

Indentation +129 added lines, -129 removed lines

@@ -19,133 +19,133 @@
  */
 class ModerateHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param null|\XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_moderates', Moderate::class, 'mod_id', 'uid');
-    }
-
-    /**
-     * Clear garbage
-     *
-     * Delete all moderation information that has expired
-     *
-     * @param int $expire Expiration time in UNIX, 0 for time()
-     */
-    public function clearGarbage($expire = 0)
-    {
-        $expire = time() - (int)$expire;
-        $sql    = sprintf('DELETE FROM `%s` WHERE mod_end < %u', $this->db->prefix('newbb_moderates'), $expire);
-        $this->db->queryF($sql);
-    }
-
-    /**
-     * Check if a user is moderated, according to his uid and ip
-     *
-     *
-     * @param  int    $uid user id
-     * @param  string|bool $ip  user ip
-     * @param  int    $forum
-     * @return bool true if IP is banned
-     */
-    public function verifyUser($uid = -1, $ip = '', $forum = 0)
-    {
-        error_reporting(E_ALL);
-        // if user is admin do not suspend
-        if (newbbIsAdmin($forum)) {
-            return true;
-        }
-
-        $uid = ($uid < 0) ? (is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0) : (int)$uid;
-
-        $criteria      = new \CriteriaCompo(new \Criteria('uid', (int)$uid));
-        $forumCriteria = new \CriteriaCompo(new \Criteria('forum_id', 0), 'OR');
-        if (!empty($forum)) {
-            $forumCriteria->add(new \Criteria('forum_id', (int)$forum), 'OR');
-        }
-        $criteria->add($forumCriteria);
-        $criteria->add(new \Criteria('mod_end', time(), '>'));
-
-        $matches = $this->getAll($criteria);
-
-        if (0 === count($matches)) {
-            return true; // no matches
-        }
-
-        if (count($matches) > 0 && $uid > 0) {
-            return false; // user is banned
-        }
-        // verify possible matches against IP address
-        $ip = empty($ip) ? IPAddress::fromRequest()->asReadable() : $ip;
-
-        foreach ($matches as $modMatch) {
-            $rawModIp = trim($modMatch->getVar('ip', 'n'));
-            if (empty($rawModIp)) {
-                return false; // banned without IP
-            }
-            $parts   = explode('/', $rawModIp);
-            $modIp   = $parts[0];
-            $checkIp = new IPAddress($modIp);
-            if (false !== $checkIp->asReadable()) {
-                $defaultMask = (6 === $checkIp->ipVersion()) ? 128 : 32;
-                $netMask     = isset($parts[1]) ? (int)$parts[1] : $defaultMask;
-                if ($checkIp->sameSubnet($ip, $netMask, $netMask)) {
-                    return false; // IP is banned
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Get latest expiration for a user moderation
-     *
-     *
-     * @param  mixed  $item user id or ip
-     * @param  bool $isUid
-     * @return int
-     */
-    public function getLatest($item, $isUid = true)
-    {
-        $ips = [];
-        if ($isUid) {
-            $criteria = 'uid =' . (int)$item;
-        } else {
-            $ip_segs = explode('.', $item);
-            $segs    = min(count($ip_segs), 4);
-            for ($i = 1; $i <= $segs; ++$i) {
-                $ips[] = $this->db->quoteString(implode('.', array_slice($ip_segs, 0, $i)));
-            }
-            $criteria = 'ip IN(' . implode(',', $ips) . ')';
-        }
-        $sql = 'SELECT MAX(mod_end) AS expire FROM ' . $this->db->prefix('newbb_moderates') . ' WHERE ' . $criteria;
-        if (!$result = $this->db->query($sql)) {
-            return -1;
-        }
-        $row = $this->db->fetchArray($result);
-
-        return $row['expire'];
-    }
-
-    /**
-     * clean orphan items from database
-     *
-     * @param  string $table_link
-     * @param  string $field_link
-     * @param  string $field_object
-     * @return bool   true on success
-     */
-    public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
-    {
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE (forum_id >0 AND forum_id NOT IN ( SELECT DISTINCT forum_id FROM ' . $this->db->prefix('newbb_forums') . ') )';
-        if (!$result = $this->db->queryF($sql)) {
-            //xoops_error($this->db->error());
-            return false;
-        }
-
-        return true;
-    }
+	/**
+	 * @param null|\XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_moderates', Moderate::class, 'mod_id', 'uid');
+	}
+
+	/**
+	 * Clear garbage
+	 *
+	 * Delete all moderation information that has expired
+	 *
+	 * @param int $expire Expiration time in UNIX, 0 for time()
+	 */
+	public function clearGarbage($expire = 0)
+	{
+		$expire = time() - (int)$expire;
+		$sql    = sprintf('DELETE FROM `%s` WHERE mod_end < %u', $this->db->prefix('newbb_moderates'), $expire);
+		$this->db->queryF($sql);
+	}
+
+	/**
+	 * Check if a user is moderated, according to his uid and ip
+	 *
+	 *
+	 * @param  int    $uid user id
+	 * @param  string|bool $ip  user ip
+	 * @param  int    $forum
+	 * @return bool true if IP is banned
+	 */
+	public function verifyUser($uid = -1, $ip = '', $forum = 0)
+	{
+		error_reporting(E_ALL);
+		// if user is admin do not suspend
+		if (newbbIsAdmin($forum)) {
+			return true;
+		}
+
+		$uid = ($uid < 0) ? (is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0) : (int)$uid;
+
+		$criteria      = new \CriteriaCompo(new \Criteria('uid', (int)$uid));
+		$forumCriteria = new \CriteriaCompo(new \Criteria('forum_id', 0), 'OR');
+		if (!empty($forum)) {
+			$forumCriteria->add(new \Criteria('forum_id', (int)$forum), 'OR');
+		}
+		$criteria->add($forumCriteria);
+		$criteria->add(new \Criteria('mod_end', time(), '>'));
+
+		$matches = $this->getAll($criteria);
+
+		if (0 === count($matches)) {
+			return true; // no matches
+		}
+
+		if (count($matches) > 0 && $uid > 0) {
+			return false; // user is banned
+		}
+		// verify possible matches against IP address
+		$ip = empty($ip) ? IPAddress::fromRequest()->asReadable() : $ip;
+
+		foreach ($matches as $modMatch) {
+			$rawModIp = trim($modMatch->getVar('ip', 'n'));
+			if (empty($rawModIp)) {
+				return false; // banned without IP
+			}
+			$parts   = explode('/', $rawModIp);
+			$modIp   = $parts[0];
+			$checkIp = new IPAddress($modIp);
+			if (false !== $checkIp->asReadable()) {
+				$defaultMask = (6 === $checkIp->ipVersion()) ? 128 : 32;
+				$netMask     = isset($parts[1]) ? (int)$parts[1] : $defaultMask;
+				if ($checkIp->sameSubnet($ip, $netMask, $netMask)) {
+					return false; // IP is banned
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get latest expiration for a user moderation
+	 *
+	 *
+	 * @param  mixed  $item user id or ip
+	 * @param  bool $isUid
+	 * @return int
+	 */
+	public function getLatest($item, $isUid = true)
+	{
+		$ips = [];
+		if ($isUid) {
+			$criteria = 'uid =' . (int)$item;
+		} else {
+			$ip_segs = explode('.', $item);
+			$segs    = min(count($ip_segs), 4);
+			for ($i = 1; $i <= $segs; ++$i) {
+				$ips[] = $this->db->quoteString(implode('.', array_slice($ip_segs, 0, $i)));
+			}
+			$criteria = 'ip IN(' . implode(',', $ips) . ')';
+		}
+		$sql = 'SELECT MAX(mod_end) AS expire FROM ' . $this->db->prefix('newbb_moderates') . ' WHERE ' . $criteria;
+		if (!$result = $this->db->query($sql)) {
+			return -1;
+		}
+		$row = $this->db->fetchArray($result);
+
+		return $row['expire'];
+	}
+
+	/**
+	 * clean orphan items from database
+	 *
+	 * @param  string $table_link
+	 * @param  string $field_link
+	 * @param  string $field_object
+	 * @return bool   true on success
+	 */
+	public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
+	{
+		$sql = 'DELETE FROM ' . $this->table . ' WHERE (forum_id >0 AND forum_id NOT IN ( SELECT DISTINCT forum_id FROM ' . $this->db->prefix('newbb_forums') . ') )';
+		if (!$result = $this->db->queryF($sql)) {
+			//xoops_error($this->db->error());
+			return false;
+		}
+
+		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/plugins/plugin.tag.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     /** @var TopicHandler $itemHandler */
     $itemHandler = Newbb\Helper::getInstance()->getHandler('Topic');
     /** @var \XoopsObject $itemsObject */
-    $itemsObject = $itemHandler->getObjects(new \Criteria('topic_id', '(' . implode(', ', $items_id) . ')', 'IN'), true);
+    $itemsObject = $itemHandler->getObjects(new \Criteria('topic_id', '('.implode(', ', $items_id).')', 'IN'), true);
 
     foreach (array_keys($items) as $cat_id) {
         foreach (array_keys($items[$cat_id]) as $item_id) {

Indentation +50 added lines, -50 removed lines

@@ -32,43 +32,43 @@ 
  */
 function newbb_tag_iteminfo(&$items)
 {
-    if (0 === count($items) || !is_array($items)) {
-        return false;
-    }
+	if (0 === count($items) || !is_array($items)) {
+		return false;
+	}
 
-    $items_id = [];
-    foreach (array_keys($items) as $cat_id) {
-        // Some handling here to build the link upon catid
-        // catid is not used in newbb, so just skip it
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            // In newbb, the item_id is "topic_id"
-            $items_id[] = (int)$item_id;
-        }
-    }
-    /** @var TopicHandler $itemHandler */
-    $itemHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-    /** @var \XoopsObject $itemsObject */
-    $itemsObject = $itemHandler->getObjects(new \Criteria('topic_id', '(' . implode(', ', $items_id) . ')', 'IN'), true);
+	$items_id = [];
+	foreach (array_keys($items) as $cat_id) {
+		// Some handling here to build the link upon catid
+		// catid is not used in newbb, so just skip it
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			// In newbb, the item_id is "topic_id"
+			$items_id[] = (int)$item_id;
+		}
+	}
+	/** @var TopicHandler $itemHandler */
+	$itemHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+	/** @var \XoopsObject $itemsObject */
+	$itemsObject = $itemHandler->getObjects(new \Criteria('topic_id', '(' . implode(', ', $items_id) . ')', 'IN'), true);
 
-    foreach (array_keys($items) as $cat_id) {
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            /** @var \XoopsObject $itemObject */
-            if (!$itemObject = $itemsObject[$item_id]) {
-                continue;
-            }
-            $items[$cat_id][$item_id] = [
-                'title'   => $itemObject->getVar('topic_title'),
-                'uid'     => $itemObject->getVar('topic_poster'),
-                'link'    => "viewtopic.php?topic_id={$item_id}",
-                'time'    => $itemObject->getVar('topic_time'),
-                'tags'    => tag_parse_tag($itemObject->getVar('topic_tags', 'n')),
-                'content' => ''
-            ];
-        }
-    }
-    unset($itemsObject);
+	foreach (array_keys($items) as $cat_id) {
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			/** @var \XoopsObject $itemObject */
+			if (!$itemObject = $itemsObject[$item_id]) {
+				continue;
+			}
+			$items[$cat_id][$item_id] = [
+				'title'   => $itemObject->getVar('topic_title'),
+				'uid'     => $itemObject->getVar('topic_poster'),
+				'link'    => "viewtopic.php?topic_id={$item_id}",
+				'time'    => $itemObject->getVar('topic_time'),
+				'tags'    => tag_parse_tag($itemObject->getVar('topic_tags', 'n')),
+				'content' => ''
+			];
+		}
+	}
+	unset($itemsObject);
 
-    return true;
+	return true;
 }
 
 /**
@@ -78,21 +78,21 @@ 
  */
 function newbb_tag_synchronization($mid)
 {
-    /** @var TopicHandler $itemHandler */
-    $itemHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-    /** @var \XoopsPersistableObjectHandler $linkHandler */
-    $linkHandler = Tag\Helper::getInstance()->getHandler('Link');
+	/** @var TopicHandler $itemHandler */
+	$itemHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+	/** @var \XoopsPersistableObjectHandler $linkHandler */
+	$linkHandler = Tag\Helper::getInstance()->getHandler('Link');
 
-    /* clear tag-item links */
-    $sql = "    DELETE FROM {$linkHandler->table}"
-           . '    WHERE '
-           . "        tag_modid = {$mid}"
-           . '        AND '
-           . '        ( tag_itemid NOT IN '
-           . "            ( SELECT DISTINCT {$itemHandler->keyName} "
-           . "                FROM {$itemHandler->table} "
-           . "                WHERE {$itemHandler->table}.approved > 0"
-           . '            ) '
-           . '        )';
-    $linkHandler->db->queryF($sql);
+	/* clear tag-item links */
+	$sql = "    DELETE FROM {$linkHandler->table}"
+		   . '    WHERE '
+		   . "        tag_modid = {$mid}"
+		   . '        AND '
+		   . '        ( tag_itemid NOT IN '
+		   . "            ( SELECT DISTINCT {$itemHandler->keyName} "
+		   . "                FROM {$itemHandler->table} "
+		   . "                WHERE {$itemHandler->table}.approved > 0"
+		   . '            ) '
+		   . '        )';
+	$linkHandler->db->queryF($sql);
 }