mambax7 / newbb5

class/Common/Configurator.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  *
  */
 
-require_once __DIR__ . '/../../include/common.php';
+require_once __DIR__.'/../../include/common.php';
 
 /**
  * Class Configurator
@@ -45,7 +45,7 @@ 
         $moduleDirName = basename(dirname(__DIR__));
         $capsDirName   = strtoupper($moduleDirName);
 
-        require_once __DIR__ . '/../../include/config.php';
+        require_once __DIR__.'/../../include/config.php';
         $config = getConfig();
 
         $this->name            = $config->name;

class/StatsHandler.php

Spacing +16 added lines, -16 removed lines

@@ -12,7 +12,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 
 define('NEWBB_STATS_TYPE_TOPIC', 1);
 define('NEWBB_STATS_TYPE_POST', 2);
@@ -78,7 +78,7 @@ 
             return false;
         }
 
-        $sql    = "    UPDATE {$this->table}"
+        $sql = "    UPDATE {$this->table}"
                   . '    SET stats_value = CASE '
                   . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
                   . "                    ELSE '{$increment}' "
@@ -90,7 +90,7 @@ 
         $result = $this->db->queryF($sql);
         $rows   = $this->db->getAffectedRows();
         if (0 == $rows) {
-            $sql    = "    INSERT INTO {$this->table}"
+            $sql = "    INSERT INTO {$this->table}"
                       . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
                       . '    VALUES '
                       . "        ('0', '{$increment}', '{$type}', '"
@@ -147,7 +147,7 @@ 
         foreach ($periods as $period) {
             $_periods[] = array_search($period, $this->param['period']);
         }
-        $sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
+        $sql = '    SELECT stats_id, stats_value, stats_type, stats_period '
                   . "    FROM {$this->table} "
                   . '    WHERE '
                   . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
@@ -156,9 +156,9 @@ 
                                         . implode(', ', array_map('intval', $ids))
                                         . ')')
                   . '        '
-                  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
+                  . (empty($_types) ? '' : 'AND stats_type IN ('.implode(', ', $_types).')')
                   . '        '
-                  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
+                  . (empty($_periods) ? '' : 'AND stats_period IN ('.implode(', ', $_periods).')');
         $result = $this->db->query($sql);
 
         while (false !== ($row = $this->db->fetchArray($result))) {
@@ -170,36 +170,36 @@ 
 
     public function reset()
     {
-        $this->db->queryF('TRUNCATE TABLE ' . $this->table);
+        $this->db->queryF('TRUNCATE TABLE '.$this->table);
         $now        = time();
         $time_start = [
             'day'   => '%Y%j',
             'week'  => '%Y%u',
             'month' => '%Y%m'
         ];
-        $counts     = [];
+        $counts = [];
 
-        $sql = '    SELECT forum_id' . '    FROM ' . $this->db->prefix('newbb_forums');
+        $sql = '    SELECT forum_id'.'    FROM '.$this->db->prefix('newbb_forums');
         $ret = $this->db->query($sql);
         while (false !== (list($forum_id) = $this->db->fetchRow($ret))) {
-            $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*), SUM(topic_views)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($topics, $views) = $this->db->fetchRow($result);
             $this->update($forum_id, 'topic', $topics);
             $this->update($forum_id, 'view', $views);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($digests) = $this->db->fetchRow($result);
             $this->update($forum_id, 'digest', $digests);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_posts')."    WHERE approved=1 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($posts) = $this->db->fetchRow($result);
             $this->update($forum_id, 'post', $posts);
 
             foreach ($time_start as $period => $format) {
-                $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*), SUM(topic_views)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($topics, $views) = $this->db->fetchRow($result);
                 $views = empty($views) ? 0 : $views; // null check
@@ -222,7 +222,7 @@ 
                 @$counts['topic'][$period] += $topics;
                 @$counts['view'][$period] += $views;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($digests) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
@@ -235,7 +235,7 @@ 
                                   . "', NOW(), '{$format}')");
                 @$counts['digest'][$period] += $digests;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_posts')."    WHERE approved=1 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($posts) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
@@ -250,7 +250,7 @@ 
             }
         }
 
-        $this->db->queryF("    DELETE FROM {$this->table}" . "    WHERE stats_id = '0' AND stats_period <> " . array_search('total', $this->param['period'], true));
+        $this->db->queryF("    DELETE FROM {$this->table}"."    WHERE stats_id = '0' AND stats_period <> ".array_search('total', $this->param['period'], true));
         foreach ($time_start as $period => $format) {
             foreach (array_keys($counts) as $type) {
                 $this->db->queryF("    INSERT INTO {$this->table}"

class/ForumHandler.php

Spacing +56 added lines, -56 removed lines

@@ -100,11 +100,11 @@ 
             return $_cachedForums;
         }
 
-        $criteria = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $valid_ids) . ')', 'IN'));
+        $criteria = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(', ', $valid_ids).')', 'IN'));
         if (is_numeric($cat) && $cat > 0) {
             $criteria->add(new \Criteria('cat_id', (int)$cat));
         } elseif (is_array($cat) && count($cat) > 0) {
-            $criteria->add(new \Criteria('cat_id', '(' . implode(', ', $cat) . ')', 'IN'));
+            $criteria->add(new \Criteria('cat_id', '('.implode(', ', $cat).')', 'IN'));
         }
         $criteria->setSort('forum_order');
         $criteria->setOrder('ASC');
@@ -181,23 +181,23 @@ 
         $topic_lastread = newbbGetCookie('LT', true);
         $criteria_forum = '';
         if (is_object($forum)) {
-            $criteria_forum = ' AND t.forum_id = ' . $forum->getVar('forum_id');
+            $criteria_forum = ' AND t.forum_id = '.$forum->getVar('forum_id');
             $hot_threshold  = $forum->getVar('hot_threshold');
         } else {
             $hot_threshold = 10;
             if (is_array($forum) && count($forum) > 0) {
-                $criteria_forum = ' AND t.forum_id IN (' . implode(',', array_keys($forum)) . ')';
+                $criteria_forum = ' AND t.forum_id IN ('.implode(',', array_keys($forum)).')';
             } elseif (!empty($forum)) {
-                $criteria_forum = ' AND t.forum_id =' . (int)$forum;
+                $criteria_forum = ' AND t.forum_id ='.(int)$forum;
             }
         }
 
-        $criteria_post    = $startdate ? ' p.post_time > ' . $startdate : ' 1 = 1 ';
+        $criteria_post    = $startdate ? ' p.post_time > '.$startdate : ' 1 = 1 ';
         $criteria_topic   = empty($type) ? '' : " AND t.type_id={$type}";
         $criteria_extra   = '';
         $criteria_approve = ' AND t.approved = 1';
         $post_on          = ' p.post_id = t.topic_last_post_id';
-        $leftjoin         = ' LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.post_id = t.topic_last_post_id';
+        $leftjoin         = ' LEFT JOIN '.$this->db->prefix('newbb_posts').' p ON p.post_id = t.topic_last_post_id';
         $sort_array       = [];
         switch ($status) {
             case 'digest':
@@ -214,7 +214,7 @@ 
                     // START irmtfan use read_uid to find the unread posts when the user is logged in
                     $read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
                     if (!empty($read_uid)) {
-                        $leftjoin      .= ' LEFT JOIN ' . $this->db->prefix('newbb_reads_topic') . ' r ON r.read_item = t.topic_id AND r.uid = ' . $read_uid . ' ';
+                        $leftjoin      .= ' LEFT JOIN '.$this->db->prefix('newbb_reads_topic').' r ON r.read_item = t.topic_id AND r.uid = '.$read_uid.' ';
                         $criteria_post .= ' AND (r.read_id IS NULL OR r.post_id < t.topic_last_post_id)';
                     } else {
                     }
@@ -222,7 +222,7 @@ 
                 } elseif (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
                     // START irmtfan fix read_mode = 1 bugs - for all users (member and anon)
                     if ($time_criterion = max($GLOBALS['last_visit'], $startdate)) {
-                        $criteria_post  = ' p.post_time > ' . $time_criterion; // for all users
+                        $criteria_post  = ' p.post_time > '.$time_criterion; // for all users
                         $topics         = [];
                         $topic_lastread = newbbGetCookie('LT', true);
                         if (count($topic_lastread) > 0) {
@@ -233,7 +233,7 @@ 
                             }
                         }
                         if (count($topics) > 0) {
-                            $criteria_extra = ' AND t.topic_id NOT IN (' . implode(',', $topics) . ')';
+                            $criteria_extra = ' AND t.topic_id NOT IN ('.implode(',', $topics).')';
                         }
                     }
                     // END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
@@ -241,7 +241,7 @@ 
                 break;
             case 'pending':
                 $post_on          = ' p.topic_id = t.topic_id';
-                $criteria_post    .= ' AND p.pid = 0';
+                $criteria_post .= ' AND p.pid = 0';
                 $criteria_approve = ' AND t.approved = 0';
                 break;
 
@@ -255,31 +255,31 @@ 
 
             default:
                 if ($startdate > 0) {
-                    $criteria_post = ' (p.post_time > ' . $startdate . ' OR t.topic_sticky=1)';
+                    $criteria_post = ' (p.post_time > '.$startdate.' OR t.topic_sticky=1)';
                 }
                 $sort_array[] = 't.topic_sticky DESC';
                 break;
         }
 
-        $select = 't.*, ' . ' p.post_time as last_post_time, p.poster_name as last_poster_name, p.icon, p.post_id, p.uid';
-        $from   = $this->db->prefix('newbb_topics') . ' t ' . $leftjoin;
-        $where  = $criteria_post . $criteria_topic . $criteria_forum . $criteria_extra . $criteria_approve;
+        $select = 't.*, '.' p.post_time as last_post_time, p.poster_name as last_poster_name, p.icon, p.post_id, p.uid';
+        $from   = $this->db->prefix('newbb_topics').' t '.$leftjoin;
+        $where  = $criteria_post.$criteria_topic.$criteria_forum.$criteria_extra.$criteria_approve;
 
         if ($excerpt) {
             $select .= ', p.post_karma, p.require_reply, pt.post_text';
-            $from   .= ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' pt ON pt.post_id = t.topic_last_post_id';
+            $from   .= ' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' pt ON pt.post_id = t.topic_last_post_id';
         }
         if ('u.uname' === $sort) {
             $sort = 't.topic_poster';
         }
 
-        $sort_array[] = trim($sort . ' ' . $order);
+        $sort_array[] = trim($sort.' '.$order);
         $sortby       = implode(', ', array_filter($sort_array));
         if (empty($sortby)) {
             $sortby = 't.topic_last_post_id DESC';
         }
 
-        $sql = 'SELECT ' . $select . ' FROM ' . $from . ' WHERE ' . $where . ' ORDER BY ' . $sortby;
+        $sql = 'SELECT '.$select.' FROM '.$from.' WHERE '.$where.' ORDER BY '.$sortby;
 
         if (!$result = $this->db->query($sql, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start)) {
             redirect_header('index.php', 2, _MD_NEWBB_ERROROCCURED);
@@ -304,16 +304,16 @@ 
 
             if ($myrow['topic_haspoll']) {
                 if ($myrow['topic_sticky']) {
-                    $topic_icon = newbbDisplayImage('topic_sticky', _MD_NEWBB_TOPICSTICKY) . '<br>' . newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL);
+                    $topic_icon = newbbDisplayImage('topic_sticky', _MD_NEWBB_TOPICSTICKY).'<br>'.newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL);
                 } else {
                     $topic_icon = newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL);
                 }
             } elseif ($myrow['topic_sticky']) {
                 $topic_icon = newbbDisplayImage('topic_sticky', _MD_NEWBB_TOPICSTICKY);
             } elseif (!empty($myrow['icon'])) {
-                $topic_icon = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($myrow['icon']) . '" alt="" />';
+                $topic_icon = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($myrow['icon']).'" alt="" />';
             } else {
-                $topic_icon = '<img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />';
+                $topic_icon = '<img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" />';
             }
 
             // ------------------------------------------------------
@@ -323,7 +323,7 @@ 
             if ($rating < 1) {
                 $rating_img = newbbDisplayImage('blank');
             } else {
-                $rating_img = newbbDisplayImage('rate' . $rating, constant('_MD_NEWBB_RATE' . $rating));
+                $rating_img = newbbDisplayImage('rate'.$rating, constant('_MD_NEWBB_RATE'.$rating));
             }
             // ------------------------------------------------------
             // topic_page_jump
@@ -332,28 +332,28 @@ 
             $totalpages           = ceil(($myrow['topic_replies'] + 1) / $GLOBALS['xoopsModuleConfig']['posts_per_page']);
             if ($totalpages > 1) {
                 $topic_page_jump .= '&nbsp;&nbsp;';
-                $append          = false;
+                $append = false;
                 for ($i = 1; $i <= $totalpages; ++$i) {
                     if ($i > 3 && $i < $totalpages) {
                         if (!$append) {
                             $topic_page_jump .= '...';
-                            $append          = true;
+                            $append = true;
                         }
                     } else {
-                        $topic_page_jump .= '[<a href="' . XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'] . '&amp;start=' . (($i - 1) * $GLOBALS['xoopsModuleConfig']['posts_per_page']) . '">' . $i . '</a>]';
+                        $topic_page_jump .= '[<a href="'.XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.$myrow['topic_id'].'&amp;start='.(($i - 1) * $GLOBALS['xoopsModuleConfig']['posts_per_page']).'">'.$i.'</a>]';
                         // irmtfan remove here and move
                         //$topic_page_jump_icon = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $myrow['post_id'] . "&amp;start=" . (($i - 1) * $GLOBALS['xoopsModuleConfig']['posts_per_page']) . "'>" . newbbDisplayImage('lastposticon',_MD_NEWBB_GOTOLASTPOST) . '</a>';
                     }
                 }
             }
             // irmtfan - move here for both topics with and without pages
-            $topic_page_jump_icon = "<a href='" . XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $myrow['post_id'] . "'>" . newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST) . '</a>';
+            $topic_page_jump_icon = "<a href='".XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$myrow['post_id']."'>".newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST).'</a>';
 
             // ------------------------------------------------------
             // => topic array
             $forum_link = '';
             if (!empty($viewAllForums[$myrow['forum_id']])) {
-                $forum_link = '<a href="' . XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $myrow['forum_id'] . '">' . $viewAllForums[$myrow['forum_id']]['forum_name'] . '</a>';
+                $forum_link = '<a href="'.XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$myrow['forum_id'].'">'.$viewAllForums[$myrow['forum_id']]['forum_name'].'</a>';
             }
 
             $topic_title = $myts->htmlSpecialChars($myrow['topic_title']);
@@ -362,7 +362,7 @@ 
             //$topic_title = '<span style="color:'.$typen[$myrow["type_id"]]["type_color"].'">['.$typen[$myrow["type_id"]]["type_name"].']</span> '.$topic_title.'';
             //}
             if ($myrow['topic_digest']) {
-                $topic_title = "<span class='digest'>" . $topic_title . '</span>';
+                $topic_title = "<span class='digest'>".$topic_title.'</span>';
             }
 
             if (0 == $excerpt) {
@@ -381,7 +381,7 @@ 
                 //'type_text'                 => $topic_prefix,/*irmtfan remove here and move to for loop*/
                 'topic_title'          => $topic_title,
                 //'topic_link'                => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'],
-                'topic_link'           => 'viewtopic.php?topic_id=' . $myrow['topic_id'],
+                'topic_link'           => 'viewtopic.php?topic_id='.$myrow['topic_id'],
                 'rating_img'           => $rating_img,
                 'topic_page_jump'      => $topic_page_jump,
                 'topic_page_jump_icon' => $topic_page_jump_icon,
@@ -456,10 +456,10 @@ 
         } // irmtfan end for loop
         // END irmtfan move to a for loop
         if (count($topics) > 0) {
-            $sql = ' SELECT DISTINCT topic_id FROM ' . $this->db->prefix('newbb_posts') . " WHERE attachment != ''" . ' AND topic_id IN (' . implode(',', array_keys($topics)) . ')';
+            $sql = ' SELECT DISTINCT topic_id FROM '.$this->db->prefix('newbb_posts')." WHERE attachment != ''".' AND topic_id IN ('.implode(',', array_keys($topics)).')';
             if ($result = $this->db->query($sql)) {
                 while (false !== (list($topic_id) = $this->db->fetchRow($result))) {
-                    $topics[$topic_id]['attachment'] = '&nbsp;' . newbbDisplayImage('attachment', _MD_NEWBB_TOPICSHASATT);
+                    $topics[$topic_id]['attachment'] = '&nbsp;'.newbbDisplayImage('attachment', _MD_NEWBB_TOPICSHASATT);
                 }
             }
         }
@@ -479,8 +479,8 @@ 
 
         $criteria_extra   = '';
         $criteria_approve = ' AND t.approved = 1'; // any others?
-        $leftjoin         = ' LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.post_id = t.topic_last_post_id';
-        $criteria_post    = ' p.post_time > ' . $startdate;
+        $leftjoin         = ' LEFT JOIN '.$this->db->prefix('newbb_posts').' p ON p.post_id = t.topic_last_post_id';
+        $criteria_post    = ' p.post_time > '.$startdate;
         switch ($type) {
             case 'digest':
                 $criteria_extra = ' AND topic_digest = 1';
@@ -495,7 +495,7 @@ 
 
                     $read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
                     if (!empty($read_uid)) {
-                        $leftjoin      .= ' LEFT JOIN ' . $this->db->prefix('newbb_reads_topic') . ' r ON r.read_item = t.topic_id AND r.uid = ' . $read_uid . ' ';
+                        $leftjoin      .= ' LEFT JOIN '.$this->db->prefix('newbb_reads_topic').' r ON r.read_item = t.topic_id AND r.uid = '.$read_uid.' ';
                         $criteria_post .= ' AND (r.read_id IS NULL OR r.post_id < t.topic_last_post_id)';
                     } else {
                     }
@@ -503,7 +503,7 @@ 
                 } elseif (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
                     // START irmtfan fix read_mode = 1 bugs - for all users (member and anon)
                     if ($time_criterion = max($GLOBALS['last_visit'], $startdate)) {
-                        $criteria_post  = ' p.post_time > ' . $time_criterion; // for all users
+                        $criteria_post  = ' p.post_time > '.$time_criterion; // for all users
                         $topics         = [];
                         $topic_lastread = newbbGetCookie('LT', true);
                         if (count($topic_lastread) > 0) {
@@ -514,7 +514,7 @@ 
                             }
                         }
                         if (count($topics) > 0) {
-                            $criteria_extra = ' AND t.topic_id NOT IN (' . implode(',', $topics) . ')';
+                            $criteria_extra = ' AND t.topic_id NOT IN ('.implode(',', $topics).')';
                         }
                     }
                     // END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
@@ -529,22 +529,22 @@ 
             case 'all':
                 break;
             default:
-                $criteria_post = ' (p.post_time > ' . $startdate . ' OR t.topic_sticky=1)';
+                $criteria_post = ' (p.post_time > '.$startdate.' OR t.topic_sticky=1)';
                 break;
         }
         $criteria_forum = '';
         if (is_object($forum)) {
-            $criteria_forum = ' AND t.forum_id = ' . $forum->getVar('forum_id');
+            $criteria_forum = ' AND t.forum_id = '.$forum->getVar('forum_id');
         } else {
             if (is_array($forum) && count($forum) > 0) {
-                $criteria_forum = ' AND t.forum_id IN (' . implode(',', array_keys($forum)) . ')';
+                $criteria_forum = ' AND t.forum_id IN ('.implode(',', array_keys($forum)).')';
             } elseif (!empty($forum)) {
-                $criteria_forum = ' AND t.forum_id =' . (int)$forum;
+                $criteria_forum = ' AND t.forum_id ='.(int)$forum;
             }
         }
 
-        $sql = 'SELECT COUNT(*) AS count FROM ' . $this->db->prefix('newbb_topics') . ' t ' . $leftjoin;
-        $sql .= ' WHERE ' . $criteria_post . $criteria_forum . $criteria_extra . $criteria_approve;
+        $sql = 'SELECT COUNT(*) AS count FROM '.$this->db->prefix('newbb_topics').' t '.$leftjoin;
+        $sql .= ' WHERE '.$criteria_post.$criteria_forum.$criteria_extra.$criteria_approve;
         if (!$result = $this->db->query($sql)) {
             //xoops_error($this->db->error().'<br>'.$sql);
             return null;
@@ -572,7 +572,7 @@ 
             return true;
         }
 
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.user.php';
         if (newbbIsAdmin($forum)) {
             return true;
         }
@@ -673,7 +673,7 @@ 
                     "        OR parent_forum = forum_id";
         */
         $criteria = new \CriteriaCompo();
-        $criteria->add(new \Criteria('parent_forum', '(' . implode(', ', $forum_ids) . ')', 'NOT IN'), 'AND');
+        $criteria->add(new \Criteria('parent_forum', '('.implode(', ', $forum_ids).')', 'NOT IN'), 'AND');
         $criteria->add(new \Criteria('parent_forum', '`forum_id`', '='), 'OR');
         $b1 = $this->updateAll('parent_forum', 0, $criteria, true);
         // check cat_id orphan forums
@@ -683,7 +683,7 @@ 
             return false;
         }
         $criteria = new \CriteriaCompo();
-        $criteria->add(new \Criteria('cat_id', '(' . implode(', ', $cat_ids) . ')', 'NOT IN'), 'AND');
+        $criteria->add(new \Criteria('cat_id', '('.implode(', ', $cat_ids).')', 'NOT IN'), 'AND');
         $b2 = $this->updateAll('cat_id', $cat_ids[0], $criteria, true);
 
         return ($b1 && $b2);
@@ -717,7 +717,7 @@ 
         if (!$object->getVar('forum_id')) {
             return false;
         }
-        $sql = 'SELECT MAX(post_id) AS last_post, COUNT(*) AS total FROM ' . $this->db->prefix('newbb_posts') . ' AS p LEFT JOIN  ' . $this->db->prefix('newbb_topics') . ' AS t ON p.topic_id=t.topic_id WHERE p.approved=1 AND t.approved=1 AND p.forum_id = ' . $object->getVar('forum_id');
+        $sql = 'SELECT MAX(post_id) AS last_post, COUNT(*) AS total FROM '.$this->db->prefix('newbb_posts').' AS p LEFT JOIN  '.$this->db->prefix('newbb_topics').' AS t ON p.topic_id=t.topic_id WHERE p.approved=1 AND t.approved=1 AND p.forum_id = '.$object->getVar('forum_id');
 
         if ($result = $this->db->query($sql)) {
             $last_post = 0;
@@ -734,7 +734,7 @@ 
             }
         }
 
-        $sql = 'SELECT COUNT(*) AS total FROM ' . $this->db->prefix('newbb_topics') . ' WHERE approved=1 AND forum_id = ' . $object->getVar('forum_id');
+        $sql = 'SELECT COUNT(*) AS total FROM '.$this->db->prefix('newbb_topics').' WHERE approved=1 AND forum_id = '.$object->getVar('forum_id');
         if ($result = $this->db->query($sql)) {
             if ($row = $this->db->fetchArray($result)) {
                 if ($object->getVar('forum_topics') !== $row['total']) {
@@ -776,7 +776,7 @@ 
         if (!$forums_id) {
             return $stats;
         }
-        $sql = '    SELECT forum_posts AS posts, forum_topics AS topics, forum_id AS id' . '    FROM ' . $this->table . '    WHERE forum_id IN (' . implode(', ', $forums_id) . ')';
+        $sql = '    SELECT forum_posts AS posts, forum_topics AS topics, forum_id AS id'.'    FROM '.$this->table.'    WHERE forum_id IN ('.implode(', ', $forums_id).')';
         if (!$result = $this->db->query($sql)) {
             return $stats;
         }
@@ -821,7 +821,7 @@ 
             if (!empty($length_title_index)) {
                 $tags_post[] = 'subject';
             }
-            $posts = $postHandler->getAll(new \Criteria('post_id', '(' . implode(', ', $posts) . ')', 'IN'), $tags_post, false);
+            $posts = $postHandler->getAll(new \Criteria('post_id', '('.implode(', ', $posts).')', 'IN'), $tags_post, false);
         }
 
         // Get topic/post stats per forum
@@ -836,7 +836,7 @@ 
         $topics = [];
 
         foreach (array_keys($forums) as $id) {
-            $forum =& $forums[$id];
+            $forum = & $forums[$id];
 
             if (!$forum['forum_last_post_id']) {
                 continue;
@@ -868,7 +868,7 @@ 
         $name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
 
         foreach (array_keys($forums) as $id) {
-            $forum =& $forums[$id];
+            $forum = & $forums[$id];
 
             $_forum_data                 = [];
             $_forum_data['forum_order']  = $forum['forum_order'];
@@ -891,7 +891,7 @@ 
 
             // irmtfan change if/endif to if{} method
             if ($post_id = $forum['forum_last_post_id']) {
-                $post                               =& $posts[$post_id];
+                $post                               = & $posts[$post_id];
                 $_forum_data['forum_lastpost_id']   = $post_id;
                 $_forum_data['forum_lastpost_time'] = newbbFormatTimestamp($post['post_time']);
                 if (!empty($users_linked[$post['uid']])) {
@@ -947,7 +947,7 @@ 
         }
         $forumsObject = $this->getByPermission($cat_id, $perm_string, $tags);
 
-        require_once __DIR__ . '/tree.php';
+        require_once __DIR__.'/tree.php';
         $forums_structured = [];
         foreach (array_keys($forumsObject) as $key) {
             $forums_structured[$forumsObject[$key]->getVar('cat_id')][$key] = $forumsObject[$key];
@@ -983,10 +983,10 @@ 
         }
         $forumsObject = $this->getByPermission($cat_id, $perm_string, $tags);
 
-        require_once __DIR__ . '/tree.php';
+        require_once __DIR__.'/tree.php';
         $forums_structured = [];
         foreach (array_keys($forumsObject) as $key) {
-            $forumObject                                             =& $forumsObject[$key];
+            $forumObject                                             = & $forumsObject[$key];
             $forums_structured[$forumObject->getVar('cat_id')][$key] = $forumsObject[$key];
         }
         foreach (array_keys($forums_structured) as $cid) {
@@ -1013,7 +1013,7 @@ 
         if (!$parents = newbbGetParentForum($object->getVar('forum_id'))) {
             return $ret;
         }
-        $parents_list = $this->getList(new \Criteria('forum_id', '(' . implode(', ', $parents) . ')', 'IN'));
+        $parents_list = $this->getList(new \Criteria('forum_id', '('.implode(', ', $parents).')', 'IN'));
         foreach ($parents as $key => $id) {
             $ret[] = ['forum_id' => $id, 'forum_name' => $parents_list[$id]];
         }

class/Topic.php

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
     // irmtfan add LAST_INSERT_ID to enhance the mysql performances
     public function incrementCounter()
     {
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' SET topic_views = LAST_INSERT_ID(topic_views + 1) WHERE topic_id =' . $this->getVar('topic_id');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' SET topic_views = LAST_INSERT_ID(topic_views + 1) WHERE topic_id ='.$this->getVar('topic_id');
         $GLOBALS['xoopsDB']->queryF($sql);
     }
 
@@ -74,7 +74,7 @@ 
             return $topic_title;
         }
 
-        require_once __DIR__ . '/../include/functions.topic.php';
+        require_once __DIR__.'/../include/functions.topic.php';
 
         return getTopicTitle($topic_title, $typeObject->getVar('type_name'), $typeObject->getVar('type_color'));
     }
@@ -154,9 +154,9 @@ 
             /** @var \XoopsPoll $poll */
             $poll = new $classPoll($poll_id);
             if (false !== $poll->delete()) {
-                $classOption = $classPoll . 'Option';
+                $classOption = $classPoll.'Option';
                 $classOption::deleteByPollId($poll->getVar('poll_id'));
-                $classLog = $classPoll . 'Log';
+                $classLog = $classPoll.'Log';
                 $classLog::deleteByPollId($poll->getVar('poll_id'));
                 xoops_comment_delete($GLOBALS['xoopsModule']->getVar('mid'), $poll->getVar('poll_id'));
             }

class/OnlineHandler.php

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once __DIR__ . '/../include/functions.config.php';
+require_once __DIR__.'/../include/functions.config.php';
 
 /**
  * Class OnlineHandler
@@ -96,8 +96,8 @@ 
      */
     public function render(\Smarty $xoopsTpl)
     {
-        require_once __DIR__ . '/../include/functions.render.php';
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.user.php';
         $criteria = null;
         if ($this->topic_id) {
             $criteria = new \Criteria('online_topic', $this->topic_id);
@@ -116,7 +116,7 @@ 
             }
             $users_id[]                             = $users[$i]['online_uid'];
             $users_online[$users[$i]['online_uid']] = [
-                'link'  => XOOPS_URL . '/userinfo.php?uid=' . $users[$i]['online_uid'],
+                'link'  => XOOPS_URL.'/userinfo.php?uid='.$users[$i]['online_uid'],
                 'uname' => $users[$i]['online_uname']
             ];
             ++$num_user;
@@ -155,8 +155,8 @@ 
      */
     public function showOnline()
     {
-        require_once __DIR__ . '/../include/functions.render.php';
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.user.php';
         $criteria = null;
         if ($this->topic_id) {
             $criteria = new \Criteria('online_topic', $this->topic_id);
@@ -175,7 +175,7 @@ 
             }
             $users_id[]                             = $users[$i]['online_uid'];
             $users_online[$users[$i]['online_uid']] = [
-                'link'  => XOOPS_URL . '/userinfo.php?uid=' . $users[$i]['online_uid'],
+                'link'  => XOOPS_URL.'/userinfo.php?uid='.$users[$i]['online_uid'],
                 'uname' => $users[$i]['online_uname']
             ];
             ++$num_user;
@@ -229,15 +229,15 @@ 
 
         $uid = (int)$uid;
         if ($uid > 0) {
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_uid=' . $uid;
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('newbb_online').' WHERE online_uid='.$uid;
         } else {
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_uid=' . $uid . " AND online_ip='" . $ip . "'";
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('newbb_online').' WHERE online_uid='.$uid." AND online_ip='".$ip."'";
         }
         list($count) = $this->db->fetchRow($this->db->queryF($sql));
         if ($count > 0) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_online') . " SET online_updated= '" . $time . "', online_forum = '" . $forum_id . "', online_topic = '" . $topic_id . "' WHERE online_uid = " . $uid;
+            $sql = 'UPDATE '.$this->db->prefix('newbb_online')." SET online_updated= '".$time."', online_forum = '".$forum_id."', online_topic = '".$topic_id."' WHERE online_uid = ".$uid;
             if (0 == $uid) {
-                $sql .= " AND online_ip='" . $ip . "'";
+                $sql .= " AND online_ip='".$ip."'";
             }
         } else {
             $sql = sprintf('INSERT INTO `%s` (online_uid, online_uname, online_updated, online_ip, online_forum, online_topic) VALUES (%u, %s, %u, %s, %u, %u)', $this->db->prefix('newbb_online'), $uid, $this->db->quote($uname), $time, $this->db->quote($ip), $forum_id, $topic_id);
@@ -283,7 +283,7 @@ 
     public function gc($expire)
     {
         global $xoopsModule;
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_online') . ' WHERE online_updated < ' . (time() - (int)$expire);
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_online').' WHERE online_updated < '.(time() - (int)$expire);
         $this->db->queryF($sql);
 
         $xoops_onlineHandler = xoops_getHandler('online');
@@ -300,9 +300,9 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('newbb_online');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('newbb_online');
         if (is_object($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql   .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
@@ -333,9 +333,9 @@ 
         if (!empty($this->user_ids)) {
             $online_users = $this->user_ids;
         } else {
-            $sql = 'SELECT online_uid FROM ' . $this->db->prefix('newbb_online');
+            $sql = 'SELECT online_uid FROM '.$this->db->prefix('newbb_online');
             if (!empty($uids)) {
-                $sql .= ' WHERE online_uid IN (' . implode(', ', array_map('intval', $uids)) . ')';
+                $sql .= ' WHERE online_uid IN ('.implode(', ', array_map('intval', $uids)).')';
             }
 
             $result = $this->db->query($sql);
@@ -363,9 +363,9 @@ 
      */
     public function getCount(\CriteriaElement $criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_online');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('newbb_online');
         if (is_object($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             return false;

class/ReadForumHandler.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/read.php';
+require_once __DIR__.'/read.php';
 
 /**
  * A handler for read/unread handling

class/TopicRenderer.php

Spacing +63 added lines, -63 removed lines

@@ -234,7 +234,7 @@ 
                     // START irmtfan use read_uid to find the unread posts when the user is logged in
                     $read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
                     if (!empty($read_uid)) {
-                        $this->query['join'][]  = 'LEFT JOIN ' . $this->handler->db->prefix('newbb_reads_topic') . ' AS r ON r.read_item = t.topic_id AND r.uid = ' . $read_uid . ' ';
+                        $this->query['join'][]  = 'LEFT JOIN '.$this->handler->db->prefix('newbb_reads_topic').' AS r ON r.read_item = t.topic_id AND r.uid = '.$read_uid.' ';
                         $this->query['where'][] = 'r.post_id = t.topic_last_post_id';
                     } else {
                     }
@@ -246,7 +246,7 @@ 
                     if ($lastvisit = max($GLOBALS['last_visit'], $startdate)) {
                         $readmode1query = '';
                         if ($lastvisit > $startdate) {
-                            $readmode1query = 'p.post_time < ' . $lastvisit;
+                            $readmode1query = 'p.post_time < '.$lastvisit;
                         }
                         $topics         = [];
                         $topic_lastread = newbbGetCookie('LT', true);
@@ -258,9 +258,9 @@ 
                             }
                         }
                         if (count($topics) > 0) {
-                            $topicquery = ' t.topic_id IN (' . implode(',', $topics) . ')';
+                            $topicquery = ' t.topic_id IN ('.implode(',', $topics).')';
                             // because it should be OR
-                            $readmode1query = !empty($readmode1query) ? '(' . $readmode1query . ' OR ' . $topicquery . ')' : $topicquery;
+                            $readmode1query = !empty($readmode1query) ? '('.$readmode1query.' OR '.$topicquery.')' : $topicquery;
                         }
                         $this->query['where'][] = $readmode1query;
                     }
@@ -276,7 +276,7 @@ 
                     // START irmtfan use read_uid to find the unread posts when the user is logged in
                     $read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
                     if (!empty($read_uid)) {
-                        $this->query['join'][]  = 'LEFT JOIN ' . $this->handler->db->prefix('newbb_reads_topic') . ' AS r ON r.read_item = t.topic_id AND r.uid = ' . $read_uid . ' ';
+                        $this->query['join'][]  = 'LEFT JOIN '.$this->handler->db->prefix('newbb_reads_topic').' AS r ON r.read_item = t.topic_id AND r.uid = '.$read_uid.' ';
                         $this->query['where'][] = '(r.read_id IS NULL OR r.post_id < t.topic_last_post_id)';
                     } else {
                     }
@@ -287,7 +287,7 @@ 
                     $startdate = !empty($this->vars['since']) ? (time() - newbbGetSinceTime($this->vars['since'])) : 0;
                     if ($lastvisit = max($GLOBALS['last_visit'], $startdate)) {
                         if ($lastvisit > $startdate) {
-                            $this->query['where'][] = 'p.post_time > ' . $lastvisit;
+                            $this->query['where'][] = 'p.post_time > '.$lastvisit;
                         }
                         $topics         = [];
                         $topic_lastread = newbbGetCookie('LT', true);
@@ -299,7 +299,7 @@ 
                             }
                         }
                         if (count($topics) > 0) {
-                            $this->query['where'][] = ' t.topic_id NOT IN (' . implode(',', $topics) . ')';
+                            $this->query['where'][] = ' t.topic_id NOT IN ('.implode(',', $topics).')';
                         }
                     }
                     // END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
@@ -358,20 +358,20 @@ 
                     //} elseif (count($accessForums) === 1) {
                     //$this->query["where"][] = "t.forum_id = " . $accessForums[0];
                 } else {
-                    $this->query['where'][] = 't.forum_id IN ( ' . implode(', ', $accessForums) . ' )';
+                    $this->query['where'][] = 't.forum_id IN ( '.implode(', ', $accessForums).' )';
                 }
                 break;
 
             case 'uid': // irmtfan add multi topic poster
                 if (-1 !== $val) {
                     $val                    = implode(',', array_map('intval', explode(',', $val)));
-                    $this->query['where'][] = 't.topic_poster IN ( ' . $val . ' )';
+                    $this->query['where'][] = 't.topic_poster IN ( '.$val.' )';
                 }
                 break;
             case 'lastposter': // irmtfan add multi lastposter
                 if (-1 !== $val) {
                     $val                    = implode(',', array_map('intval', explode(',', $val)));
-                    $this->query['where'][] = 'p.uid IN ( ' . $val . ' )';
+                    $this->query['where'][] = 'p.uid IN ( '.$val.' )';
                 }
                 break;
 
@@ -385,17 +385,17 @@ 
                     }
                     // irmtfan digest_time | to accept multiple status
                     if (in_array('digest', explode(',', $this->vars['status'], true))) {
-                        $this->query['where'][] = 't.digest_time > ' . $startdate;
+                        $this->query['where'][] = 't.digest_time > '.$startdate;
                     }
                     // irmtfan - should be >= instead of =
-                    $this->query['where'][] = 'p.post_time >= ' . $startdate;
+                    $this->query['where'][] = 'p.post_time >= '.$startdate;
                     // END irmtfan if unread && read_mode = 1 and last_visit > startdate do not add where query
                 }
                 break;
 
             case 'type':
                 if (!empty($val)) {
-                    $this->query['where'][] = 't.type_id = ' . $val;
+                    $this->query['where'][] = 't.type_id = '.$val;
                 }
                 break;
 
@@ -414,9 +414,9 @@ 
 
             case 'sort':
                 if ($sort = $this->getSort($val, 'sort')) {
-                    $this->query['sort'][] = $sort . (empty($this->vars['order']) ? ' DESC' : ' ASC');
+                    $this->query['sort'][] = $sort.(empty($this->vars['order']) ? ' DESC' : ' ASC');
                 } else { // irmtfan if sort is not in the list
-                    $this->query['sort'][] = 't.topic_last_post_id' . (empty($this->vars['order']) ? ' DESC' : ' ASC');
+                    $this->query['sort'][] = 't.topic_last_post_id'.(empty($this->vars['order']) ? ' DESC' : ' ASC');
                 }
                 break;
 
@@ -487,23 +487,23 @@ 
                 'title' => _MD_NEWBB_VIEWS,
                 'sort'  => 't.topic_views'
             ],
-            'lastpost'        => [ // irmtfan show topic_page_jump_icon smarty
+            'lastpost'        => [// irmtfan show topic_page_jump_icon smarty
                                    'title' => _MD_NEWBB_LASTPOST,
                                    /*irmtfan _MD_NEWBB_DATE to _MD_NEWBB_LASTPOSTTIME again change to _MD_LASTPOST*/
                                    'sort'  => 't.topic_last_post_id'
             ],
             // START irmtfan add more sorts
-            'lastposttime'    => [ // irmtfan same as lastpost
+            'lastposttime'    => [// irmtfan same as lastpost
                                    'title' => _MD_NEWBB_LASTPOSTTIME,
                                    'sort'  => 't.topic_last_post_id'
             ],
-            'lastposter'      => [ // irmtfan
+            'lastposter'      => [// irmtfan
                                    'title' => _MD_NEWBB_POSTER,
-                                   'sort'  => 'p.uid',// poster uid
+                                   'sort'  => 'p.uid', // poster uid
             ],
-            'lastpostmsgicon' => [ // irmtfan
+            'lastpostmsgicon' => [// irmtfan
                                    'title' => _MD_NEWBB_MESSAGEICON,
-                                   'sort'  => 'p.icon',// post message icon
+                                   'sort'  => 'p.icon', // post message icon
             ],
             'ratings'         => [
                 'title' => _MD_NEWBB_RATINGS,
@@ -534,7 +534,7 @@ 
                 'sort'  => 't.poll_id'
             ]
         ];
-        $types   = $this->getTypes();
+        $types = $this->getTypes();
         if (!empty($types)) {
             $headers['type'] = [
                 'title' => _MD_NEWBB_TYPE,
@@ -577,7 +577,7 @@ 
         // additional headers - important: those cannot be in sort anyway
         $headers = array_merge($headersSort, [
             'attachment' => _MD_NEWBB_TOPICSHASATT, // show attachment smarty
-            'read'       => _MD_NEWBB_MARK_UNREAD . '|' . _MD_NEWBB_MARK_READ, // read/unread show topic_folder smarty
+            'read'       => _MD_NEWBB_MARK_UNREAD.'|'._MD_NEWBB_MARK_READ, // read/unread show topic_folder smarty
             'pagenav'    => _MD_NEWBB_PAGENAV_DISPLAY, // show topic_page_jump smarty - sort by topic_replies?
         ]);
 
@@ -593,7 +593,7 @@ 
      */
     public function getStatus($type = null, $status = null)
     {
-        $links       = [
+        $links = [
             //""            => "", /* irmtfan remove empty array */
             'all'       => _ALL,
             'digest'    => _MD_NEWBB_DIGEST,
@@ -621,7 +621,7 @@ 
 
         // all status, for admin
         if ($type > 1) {
-            $links = array_merge($links, $links_admin);// irmtfan to accept multiple status
+            $links = array_merge($links, $links_admin); // irmtfan to accept multiple status
         }
 
         return $this->getFromKeys($links, $status); // irmtfan to accept multiple status
@@ -635,10 +635,10 @@ 
     {
         $selection         = ['action' => $this->page];
         $selection['vars'] = $this->vars;
-        require_once __DIR__ . '/../include/functions.forum.php';
+        require_once __DIR__.'/../include/functions.forum.php';
         $forum_selected     = empty($this->vars['forum']) ? null : explode('|', @$this->vars['forum']);
         $selection['forum'] = '<select name="forum[]" multiple="multiple">';
-        $selection['forum'] .= '<option value="0">' . _MD_NEWBB_ALL . '</option>';
+        $selection['forum'] .= '<option value="0">'._MD_NEWBB_ALL.'</option>';
         $selection['forum'] .= newbbForumSelectBox($forum_selected);
         $selection['forum'] .= '</select>';
 
@@ -649,13 +649,13 @@ 
             throw new \RuntimeException('$sorts must be an array.');
         }
         foreach ($sorts as $sort => $title) {
-            $selection['sort'] .= "<option value='" . $sort . "' " . (($sort == $sort_selected) ? " selected='selected'" : '') . '>' . $title . '</option>';
+            $selection['sort'] .= "<option value='".$sort."' ".(($sort == $sort_selected) ? " selected='selected'" : '').'>'.$title.'</option>';
         }
         $selection['sort'] .= '</select>';
 
         $selection['order'] = "<select name='order'>";
-        $selection['order'] .= "<option value='0' " . (empty($this->vars['order']) ? " selected='selected'" : '') . '>' . _DESCENDING . '</option>';
-        $selection['order'] .= "<option value='1' " . (!empty($this->vars['order']) ? " selected='selected'" : '') . '>' . _ASCENDING . '</option>';
+        $selection['order'] .= "<option value='0' ".(empty($this->vars['order']) ? " selected='selected'" : '').'>'._DESCENDING.'</option>';
+        $selection['order'] .= "<option value='1' ".(!empty($this->vars['order']) ? " selected='selected'" : '').'>'._ASCENDING.'</option>';
         $selection['order'] .= '</select>';
 
         $since              = isset($this->vars['since']) ? $this->vars['since'] : $this->config['since_default'];
@@ -698,10 +698,10 @@ 
         foreach ($headers as $header => $title) {
             $_args = ["sort={$header}"];
             if (@$this->vars['sort'] == $header) {
-                $_args[] = 'order=' . ((@$this->vars['order'] + 1) % 2);
+                $_args[] = 'order='.((@$this->vars['order'] + 1) % 2);
             }
             $headers_data[$header]['title'] = $title;
-            $headers_data[$header]['link']  = $this->page . '?' . implode('&amp;', array_merge($args, $_args));
+            $headers_data[$header]['link']  = $this->page.'?'.implode('&amp;', array_merge($args, $_args));
         }
         $xoopsTpl->assign_by_ref('headers', $headers_data);
     }
@@ -725,7 +725,7 @@ 
         foreach ($links as $link => $title) {
             $_args                  = ["status={$link}"];
             $status[$link]['title'] = $title;
-            $status[$link]['link']  = $this->page . '?' . implode('&amp;', array_merge($args, $_args));
+            $status[$link]['link']  = $this->page.'?'.implode('&amp;', array_merge($args, $_args));
         }
         $xoopsTpl->assign_by_ref('filters', $status);
     }
@@ -773,7 +773,7 @@ 
         foreach ($types as $id => $type) {
             $_args                = ["type={$id}"];
             $status[$id]['title'] = $type['type_name'];
-            $status[$id]['link']  = $this->page . '?' . implode('&amp;', array_merge($args, $_args));
+            $status[$id]['link']  = $this->page.'?'.implode('&amp;', array_merge($args, $_args));
         }
         $xoopsTpl->assign_by_ref('types', $status);
     }
@@ -796,7 +796,7 @@ 
         $status          = [];
         $status['title'] = implode(',', $this->getStatus($this->userlevel, $this->vars['status'])); // irmtfan to accept multiple status
         //$status['link'] = $this->page.(empty($this->vars['status']) ? '' : '?status='.$this->vars['status']);
-        $status['link'] = $this->page . (empty($args) ? '' : '?' . implode('&amp;', $args));
+        $status['link'] = $this->page.(empty($args) ? '' : '?'.implode('&amp;', $args));
 
         $xoopsTpl->assign_by_ref('current', $status);
     }
@@ -818,7 +818,7 @@ 
             require_once $GLOBALS['xoops']->path('class/pagenav.php');
             $nav = new \XoopsPageNav($count_topic, $this->config['topics_per_page'], @$this->vars['start'], 'start', implode('&amp;', $args));
             if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-                $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . ' /' . $nav->url;
+                $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')).' /'.$nav->url;
             }
             if ('select' === $this->config['pagenav_display']) {
                 $navi = $nav->renderSelect();
@@ -850,12 +850,12 @@ 
         // topic fields
         $selects[] = 'COUNT(*)';
 
-        $froms[]  = $this->handler->db->prefix('newbb_topics') . ' AS t ';
-        $joins[]  = 'LEFT JOIN ' . $this->handler->db->prefix('newbb_posts') . ' AS p ON p.post_id = t.topic_last_post_id';
+        $froms[]  = $this->handler->db->prefix('newbb_topics').' AS t ';
+        $joins[]  = 'LEFT JOIN '.$this->handler->db->prefix('newbb_posts').' AS p ON p.post_id = t.topic_last_post_id';
         $wheres[] = '1 = 1';
 
-        $sql = '    SELECT ' . implode(', ', $selects) . '     FROM ' . implode(', ', $froms) . '        ' . implode(' ', $joins) . (!empty($this->query['join']) ? '        ' . implode(' ', $this->query['join']) : '') . // irmtfan bug fix: Undefined index: join when post_excerpt = 0
-               '     WHERE ' . implode(' AND ', $wheres) . '        AND ' . @implode(' AND ', @$this->query['where']);
+        $sql = '    SELECT '.implode(', ', $selects).'     FROM '.implode(', ', $froms).'        '.implode(' ', $joins).(!empty($this->query['join']) ? '        '.implode(' ', $this->query['join']) : '').// irmtfan bug fix: Undefined index: join when post_excerpt = 0
+               '     WHERE '.implode(' AND ', $wheres).'        AND '.@implode(' AND ', @$this->query['where']);
 
         if (!$result = $this->handler->db->query($sql)) {
             return 0;
@@ -896,18 +896,18 @@ 
         // post fields
         $selects[] = 'p.post_time as last_post_time, p.poster_name as last_poster_name, p.icon, p.post_id, p.uid';
 
-        $froms[]  = $this->handler->db->prefix('newbb_topics') . ' AS t ';
-        $joins[]  = 'LEFT JOIN ' . $this->handler->db->prefix('newbb_posts') . ' AS p ON p.post_id = t.topic_last_post_id';
+        $froms[]  = $this->handler->db->prefix('newbb_topics').' AS t ';
+        $joins[]  = 'LEFT JOIN '.$this->handler->db->prefix('newbb_posts').' AS p ON p.post_id = t.topic_last_post_id';
         $wheres[] = '1 = 1';
 
         if (!empty($this->config['post_excerpt'])) {
             $selects[]             = 'p.post_karma, p.require_reply, pt.post_text';
-            $this->query['join'][] = 'LEFT JOIN ' . $this->handler->db->prefix('newbb_posts_text') . ' AS pt ON pt.post_id = t.topic_last_post_id';
+            $this->query['join'][] = 'LEFT JOIN '.$this->handler->db->prefix('newbb_posts_text').' AS pt ON pt.post_id = t.topic_last_post_id';
         }
         //if (empty($this->query["sort"])) $this->query["sort"][] = 't.topic_last_post_id DESC'; // irmtfan commented no need
 
-        $sql = '    SELECT ' . implode(', ', $selects) . '     FROM ' . implode(', ', $froms) . '        ' . implode(' ', $joins) . (!empty($this->query['join']) ? '        ' . implode(' ', $this->query['join']) : '') . // irmtfan bug fix: Undefined index join when post_excerpt = 0
-               '     WHERE ' . implode(' AND ', $wheres) . '        AND ' . @implode(' AND ', @$this->query['where']) . '     ORDER BY ' . implode(', ', $this->query['sort']);
+        $sql = '    SELECT '.implode(', ', $selects).'     FROM '.implode(', ', $froms).'        '.implode(' ', $joins).(!empty($this->query['join']) ? '        '.implode(' ', $this->query['join']) : '').// irmtfan bug fix: Undefined index join when post_excerpt = 0
+               '     WHERE '.implode(' AND ', $wheres).'        AND '.@implode(' AND ', @$this->query['where']).'     ORDER BY '.implode(', ', $this->query['sort']);
 
         if (!$result = $this->handler->db->query($sql, $this->config['topics_per_page'], @$this->vars['start'])) {
             if (is_object($xoopsTpl)) {
@@ -919,11 +919,11 @@ 
             return $ret;
         }
 
-        require_once __DIR__ . '/../include/functions.render.php';
-        require_once __DIR__ . '/../include/functions.session.php';
-        require_once __DIR__ . '/../include/functions.time.php';
-        require_once __DIR__ . '/../include/functions.read.php';
-        require_once __DIR__ . '/../include/functions.topic.php';
+        require_once __DIR__.'/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.session.php';
+        require_once __DIR__.'/../include/functions.time.php';
+        require_once __DIR__.'/../include/functions.read.php';
+        require_once __DIR__.'/../include/functions.topic.php';
 
         $sticky    = 0;
         $topics    = [];
@@ -942,9 +942,9 @@ 
             // START irmtfan remove topic_icon hardcode smarty
             // topic_icon: just regular topic_icon
             if (!empty($myrow['icon'])) {
-                $topic_icon = '<img align="middle" src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($myrow['icon']) . '" alt="" />';
+                $topic_icon = '<img align="middle" src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($myrow['icon']).'" alt="" />';
             } else {
-                $topic_icon = '<img align="middle" src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" />';
+                $topic_icon = '<img align="middle" src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" />';
             }
             // END irmtfan remove topic_icon hardcode smarty
 
@@ -955,7 +955,7 @@ 
             if ($rating < 1) {
                 $rating_img = newbbDisplayImage('blank');
             } else {
-                $rating_img = newbbDisplayImage('rate' . $rating, constant('_MD_NEWBB_RATE' . $rating));
+                $rating_img = newbbDisplayImage('rate'.$rating, constant('_MD_NEWBB_RATE'.$rating));
             }
 
             // ------------------------------------------------------
@@ -965,22 +965,22 @@ 
             $totalpages           = ceil(($myrow['topic_replies'] + 1) / $this->config['posts_per_page']);
             if ($totalpages > 1) {
                 $topic_page_jump .= '&nbsp;&nbsp;';
-                $append          = false;
+                $append = false;
                 for ($i = 1; $i <= $totalpages; ++$i) {
                     if ($i > 3 && $i < $totalpages) {
                         if (!$append) {
                             $topic_page_jump .= '...';
-                            $append          = true;
+                            $append = true;
                         }
                     } else {
-                        $topic_page_jump .= '[<a href="' . XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'] . '&amp;start=' . (($i - 1) * $this->config['posts_per_page']) . '">' . $i . '</a>]';
+                        $topic_page_jump .= '[<a href="'.XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.$myrow['topic_id'].'&amp;start='.(($i - 1) * $this->config['posts_per_page']).'">'.$i.'</a>]';
                         // irmtfan remove here and move
                         //$topic_page_jump_icon = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=" . $myrow['topic_id'] . "&amp;start=" . (($i - 1) * $this->config['posts_per_page']) . "" . "'>" . newbbDisplayImage('document',_MD_NEWBB_GOTOLASTPOST) . '</a>';
                     }
                 }
             }
             // irmtfan - move here for both topics with and without pages - change topic_id to post_id
-            $topic_page_jump_icon = "<a href='" . XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $myrow['topic_last_post_id'] . '' . "'>" . newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST) . '</a>';
+            $topic_page_jump_icon = "<a href='".XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$myrow['topic_last_post_id'].''."'>".newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST).'</a>';
 
             // ------------------------------------------------------
             // => topic array
@@ -1012,7 +1012,7 @@ 
                 'topic_title_excerpt'    => $topic_title_excerpt,
                 //irmtfan use topic_title_excerpt
                 //'topic_link'    => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'], // . '&amp;forum=' . $myrow['forum_id'], // irmtfan comment
-                'topic_link'             => 'viewtopic.php?topic_id=' . $myrow['topic_id'],
+                'topic_link'             => 'viewtopic.php?topic_id='.$myrow['topic_id'],
                 // irmtfan remove hardcode link
                 'rating_img'             => $rating_img,
                 'votes'                  => $myrow['votes'],
@@ -1071,14 +1071,14 @@ 
         $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 
         if (count($forums) > 0) {
-            $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', array_keys($forums)) . ')', 'IN'), ['forum_name', 'hot_threshold'], false);
+            $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '('.implode(', ', array_keys($forums)).')', 'IN'), ['forum_name', 'hot_threshold'], false);
         } else {
             $forum_list = $forumHandler->getAll();
         }
 
         foreach (array_keys($topics) as $id) {
             $topics[$id]['topic_read']       = empty($topic_isRead[$id]) ? 0 : 1; // add topic-read/topic-new smarty variable
-            $topics[$id]['topic_forum_link'] = '<a href="' . XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $topics[$id]['topic_forum'] . '">' . $forum_list[$topics[$id]['topic_forum']]['forum_name'] . '</a>';
+            $topics[$id]['topic_forum_link'] = '<a href="'.XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$topics[$id]['topic_forum'].'">'.$forum_list[$topics[$id]['topic_forum']]['forum_name'].'</a>';
 
             //irmtfan use topic_title_excerpt -- add else
             if (!empty($topics[$id]['type_id']) && isset($type_list[$topics[$id]['type_id']])) {
@@ -1112,14 +1112,14 @@ 
             $topics[$id]['topic_folder'] = newbbDisplayImage($topic_folder, $topic_folder_text);
             // END irmtfan - add topic_folder_text for alt
 
-            unset($topics[$id]['topic_poster_name'], $topics[$id]['topic_last_poster_name']);// irmtfan remove $topics[$id]["stats"] because it is not exist now
+            unset($topics[$id]['topic_poster_name'], $topics[$id]['topic_last_poster_name']); // irmtfan remove $topics[$id]["stats"] because it is not exist now
         }
 
         if (count($topics) > 0) {
-            $sql = ' SELECT DISTINCT topic_id FROM ' . $this->handler->db->prefix('newbb_posts') . " WHERE attachment != ''" . ' AND topic_id IN (' . implode(',', array_keys($topics)) . ')';
+            $sql = ' SELECT DISTINCT topic_id FROM '.$this->handler->db->prefix('newbb_posts')." WHERE attachment != ''".' AND topic_id IN ('.implode(',', array_keys($topics)).')';
             if ($result = $this->handler->db->query($sql)) {
                 while (false !== (list($topic_id) = $this->handler->db->fetchRow($result))) {
-                    $topics[$topic_id]['attachment'] = '&nbsp;' . newbbDisplayImage('attachment', _MD_NEWBB_TOPICSHASATT);
+                    $topics[$topic_id]['attachment'] = '&nbsp;'.newbbDisplayImage('attachment', _MD_NEWBB_TOPICSHASATT);
                 }
             }
         }

polls.php

Spacing +48 added lines, -48 removed lines

@@ -21,7 +21,7 @@ 
 
 // rewrite by irmtfan and zyspec to accept xoopspoll 1.4 and all old xoopspoll and umfrage versions and all clones
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 require_once $GLOBALS['xoops']->path('class/xoopslists.php');
 require_once $GLOBALS['xoops']->path('class/xoopsblock.php');
@@ -54,18 +54,18 @@ 
 if (is_object($topicObject)) {
     $forum_id = $topicObject->getVar('forum_id');
 } else {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_POLLMODULE_ERROR . ': ' . _MD_NEWBB_FORUMNOEXIST);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_POLLMODULE_ERROR.': '._MD_NEWBB_FORUMNOEXIST);
 }
 // forum access permission
 /** @var Newbb\ForumHandler $forumHandler */
 $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject  = $forumHandler->get($forum_id);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 // topic view permission
 if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
-    redirect_header('viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
+    redirect_header('viewforum.php?forum='.$forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
 }
 // poll module
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
@@ -82,7 +82,7 @@ 
         $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
         // old xoopspoll or umfrage or any clone from them
     } else {
-        include $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+        include $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/include/constants.php');
         $classPoll  = $topicObject->loadOldPoll();
         $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
     }
@@ -112,11 +112,11 @@ 
     case 'add':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_CREATNEWPOLL."</h4>\n";
             $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
         // old xoopspoll or umfrage or any clone from them
         } else {
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
             $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
                                                                                                           . XOOPS_URL
@@ -132,7 +132,7 @@ 
             $poll_form->addElement($desc_tarea);
             $currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
             $endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
-            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
+            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime).'</small>', 'end_time', 30, 19, $endtime);
             $poll_form->addElement($expire_text);
 
             $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
@@ -145,14 +145,14 @@ 
             $poll_form->addElement($notify_yn);
 
             $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars/'));
             for ($i = 0; $i < 10; ++$i) {
                 $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
                 $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
                 $option_tray->addElement($option_text);
                 $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/".$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars", "", "'.XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
                                                       . XOOPS_URL
                                                       . '/modules/'
@@ -174,7 +174,7 @@ 
             $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
             $poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
             $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
+            echo '<h4>'._MD_NEWBB_POLL_POLLCONF.'</h4>';
             $poll_form->display();
         }
         break; // op: add
@@ -182,13 +182,13 @@ 
     case 'edit':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_EDITPOLL."</h4>\n";
             $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
         // old xoopspoll or umfrage or any clone from them
         } else {
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
+            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='".XOOPS_URL.'/userinfo.php?uid='.$pollObject->getVar('user_id')."'>".newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']).'</a>');
             $poll_form->addElement($author_label);
             $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
             $poll_form->addElement($question_text);
@@ -196,13 +196,13 @@ 
             $poll_form->addElement($desc_tarea);
             $date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
             if (!$pollObject->hasExpired()) {
-                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
+                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')).'</small>', 'end_time', 20, 19, $date);
                 $poll_form->addElement($expire_text);
             } else {
                 // irmtfan full URL - add topic_id
                 $restart_label = new \XoopsFormLabel(
                     _MD_NEWBB_POLL_EXPIRATION,
-                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
+                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date)."<br><a href='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>"._MD_NEWBB_POLL_RESTART.'</a>'
                 );
                 $poll_form->addElement($restart_label);
             }
@@ -210,7 +210,7 @@ 
             $poll_form->addElement($weight_text);
             $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
             $poll_form->addElement($multi_yn);
-            $options_arr  =& $classOption::getAllByPollId($poll_id);
+            $options_arr  = & $classOption::getAllByPollId($poll_id);
             $notify_value = 1;
             if (0 !== $pollObject->getVar('mail_status')) {
                 $notify_value = 0;
@@ -226,9 +226,9 @@ 
                 $option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
                 $color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[".$i."]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"".XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
+                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/".$option->getVar('option_color', 'E'))
                                                       . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
@@ -236,7 +236,7 @@ 
                 ++$i;
             }
             // irmtfan full URL
-            $more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
+            $more_label = new \XoopsFormLabel('', "<br><a href='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>"._MD_NEWBB_POLL_ADDMORE.'</a>');
             $option_tray->addElement($more_label);
             $poll_form->addElement($option_tray);
             $poll_form->addElement(new \XoopsFormHidden('op', 'update'));
@@ -244,7 +244,7 @@ 
             $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
             $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
 
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
             $poll_form->display();
         }
         break; // op: edit
@@ -262,7 +262,7 @@ 
             $option_empty = true;
             if (!Request::getString('option_text', '', 'POST')) {
                 // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
             }
             $option_text = Request::getArray('option_text', '', 'POST');
             foreach ($option_text as $optxt) {
@@ -273,7 +273,7 @@ 
             }
             if ($option_empty) {
                 // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
             }
             $pollObject->setVar('question', Request::getString('question', '', 'POST'));
             $pollObject->setVar('description', Request::getString('description', '', 'POST'));
@@ -304,7 +304,7 @@ 
             }
             $i            = 0;
             $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             foreach ($option_text as $optxt) {
                 $optxt = trim($optxt);
                 /** @var XoopspollOption $optionObject */
@@ -331,7 +331,7 @@ 
             } else {
                 redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
             }
-            break;// op: save
+            break; // op: save
         }
     // no break
     case 'update':
@@ -344,7 +344,7 @@ 
         $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
         $option_string = trim($option_string);
         if ('' === $option_string) {
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
         }
 
         // new xoopspoll module
@@ -354,7 +354,7 @@ 
             /** @var \XoopspollLogHandler $xpLogHandler */
             $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
             //            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
-            $classConstants   = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+            $classConstants   = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Constants';
             $notify           = Request::getInt('notify', $classConstants::NOTIFICATION_ENABLED, 'POST');
             $currentTimestamp = time();
             //$xuEndTimestamp   = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_end_time', null, 'POST'))
@@ -463,8 +463,8 @@ 
             $i            = 0;
             $option_id    = Request::getArray('option_id', null, 'POST');
             $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            $classLog     = $classPoll . 'Log';
+            $classOption  = $classPoll.'Option';
+            $classLog     = $classPoll.'Log';
             foreach ($option_id as $opid) {
                 $optionObject    = new $classOption($opid);
                 $option_text[$i] = trim($option_text[$i]);
@@ -495,7 +495,7 @@ 
         } else {
             redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
         }
-        break;// op: save | update
+        break; // op: save | update
 
     case 'addmore':
         $question = $pollObject->getVar('question');
@@ -509,14 +509,14 @@ 
         // old xoopspoll or umfrage or any clone from them
         } else {
             $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars/'));
             for ($i = 0; $i < 10; ++$i) {
                 $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
                 $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
                 $option_tray->addElement($option_text);
                 $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"".XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
                                                       . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
                                                       . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
@@ -534,7 +534,7 @@ 
         $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
         $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
 
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         $poll_form->display();
         break;
 
@@ -549,7 +549,7 @@ 
         $option_string = trim($option_string);
         if ('' === $option_string) {
             // irmtfan - issue with javascript:history.go(-1)
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
         }
         $i            = 0;
         $option_color = Request::getArray('option_color', null, 'POST');
@@ -566,7 +566,7 @@ 
                     $xpOptHandler->insert($optionObject);
                 // old xoopspoll or umfrage or any clone from them
                 } else {
-                    $classOption  = $classPoll . 'Option';
+                    $classOption  = $classPoll.'Option';
                     $optionObject = new $classOption();
                     $optionObject->setVar('option_text', $optxt);
                     $optionObject->setVar('poll_id', $poll_id);
@@ -584,7 +584,7 @@ 
         break;
 
     case 'delete':
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
         break;
 
@@ -608,8 +608,8 @@ 
             // old xoopspoll or umfrage or any clone from them
         } else {
             $status      = $pollObject->delete();
-            $classOption = $classPoll . 'Option';
-            $classLog    = $classPoll . 'Log';
+            $classOption = $classPoll.'Option';
+            $classLog    = $classPoll.'Log';
             if (false !== $status) {
                 $classOption::deleteByPollId($poll_id);
                 $classLog::deleteByPollId($poll_id);
@@ -636,13 +636,13 @@ 
             xoops_error($msg);
             break;
         }
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
         break;
 
     case 'restart':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Constants';
             $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
         // old xoopspoll or umfrage or any clone from them
         } else {
@@ -650,10 +650,10 @@ 
         }
         $poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
         $expire_text = new \XoopsFormText(
-            _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
+            _MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')).'<br>'.sprintf(
             _MD_NEWBB_POLL_EXPIREDAT,
                                                                                                                                                                                                                      formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
-        ) . '</small>',
+        ).'</small>',
                                          'end_time',
             20,
             19,
@@ -667,7 +667,7 @@ 
         $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
         $poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
 
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         $poll_form->display();
         break;
 
@@ -679,7 +679,7 @@ 
 
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Constants';
+            $classConstants        = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Constants';
             $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
             $poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
             $poll_mailed           = $classConstants::POLL_MAILED;
@@ -729,8 +729,8 @@ 
                 exit();
             }
             if (Request::getInt('reset', 0, 'POST')) { // reset all logs
-                $classOption = $classPoll . 'Option';
-                $classLog    = $classPoll . 'Log';
+                $classOption = $classPoll.'Option';
+                $classLog    = $classPoll.'Log';
                 $classLog::deleteByPollId($poll_id);
                 $classOption::resetCountByPollId($poll_id);
                 $pollObject->updateCount();
@@ -739,7 +739,7 @@ 
         require_once $GLOBALS['xoops']->path('class/template.php');
         xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
         xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
         break;
 
     case 'log':
@@ -754,5 +754,5 @@ 
 } // switch
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

index.php

Spacing +28 added lines, -28 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* deal with marks */
 if (Request::getInt('mark_read', 0)) {
@@ -23,13 +23,13 @@ 
         $markvalue  = 0;
         $markresult = _MD_NEWBB_MARK_UNREAD;
     }
-    require_once __DIR__ . '/include/functions.read.php';
+    require_once __DIR__.'/include/functions.read.php';
     newbbSetReadForum($markvalue);
-    $url = XOOPS_URL . '/modules/newbb/index.php';
-    redirect_header($url, 2, _MD_NEWBB_ALL_FORUM_MARKED . ' ' . $markresult);
+    $url = XOOPS_URL.'/modules/newbb/index.php';
+    redirect_header($url, 2, _MD_NEWBB_ALL_FORUM_MARKED.' '.$markresult);
 }
 
-$viewcat = Request::getInt('cat', 0, 'GET');//TODO mb check if this is GET or POST?
+$viewcat = Request::getInt('cat', 0, 'GET'); //TODO mb check if this is GET or POST?
 ///** @var Newbb\CategoryHandler $categoryHandler */
 //$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
 
@@ -44,7 +44,7 @@ 
         $categories[$viewcat] = $categoryObject->getValues();
     }
     $forum_index_title = sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES));
-    $xoops_pagetitle   = $categoryObject->getVar('cat_title') . ' [' . $xoopsModule->getVar('name') . ']';
+    $xoops_pagetitle   = $categoryObject->getVar('cat_title').' ['.$xoopsModule->getVar('name').']';
 }
 
 if (0 === count($categories)) {
@@ -57,12 +57,12 @@ 
 //$xoopsOption['xoops_module_header'] = $xoops_module_header;
 // irmtfan include header.php after defining $xoopsOption['template_main']
 require_once $GLOBALS['xoops']->path('header.php');
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.render.php';
 /* rss feed */
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/rss.php" />
+    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
@@ -89,8 +89,8 @@ 
 
 if (!empty($forums_allowed)) {
     $crit_top = new \CriteriaCompo(new \Criteria('parent_forum', 0));
-    $crit_top->add(new \Criteria('cat_id', '(' . implode(', ', array_keys($categories)) . ')', 'IN'));
-    $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+    $crit_top->add(new \Criteria('cat_id', '('.implode(', ', array_keys($categories)).')', 'IN'));
+    $crit_top->add(new \Criteria('forum_id', '('.implode(', ', $forums_allowed).')', 'IN'));
     $forums_top = $forumHandler->getIds($crit_top);
 }
 
@@ -98,8 +98,8 @@ 
 if ('hidden' === $GLOBALS['xoopsModuleConfig']['subforum_display'] || 0 === count($forums_top)) {
     $forums_sub = [];
 } else {
-    $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '(' . implode(', ', $forums_top) . ')', 'IN'));
-    $crit_sub->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+    $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '('.implode(', ', $forums_top).')', 'IN'));
+    $crit_sub->add(new \Criteria('forum_id', '('.implode(', ', $forums_allowed).')', 'IN'));
     $forums_sub = $forumHandler->getIds($crit_sub);
 }
 
@@ -111,17 +111,17 @@ 
 $newposts         = 0;
 $deleteposts      = 0;
 if (0 !== count($forums_available)) {
-    $crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
+    $crit_forum = new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN');
     $crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
     $crit_forum->setOrder('ASC');
     $forums       = $forumHandler->getAll($crit_forum, null, false);
     $newtopics    = $forumHandler->getTopicCount($forums, 0, 'pending');
     $deletetopics = $forumHandler->getTopicCount($forums, 0, 'deleted');
     $forums_array = $forumHandler->display($forums, $GLOBALS['xoopsModuleConfig']['length_title_index'], $GLOBALS['xoopsModuleConfig']['count_subforum']);
-    $crit         = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
+    $crit         = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN'));
     $crit->add(new \Criteria('approved', '-1'));
     $deleteposts = $postHandler->getCount($crit);
-    $crit        = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
+    $crit        = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN'));
     $crit->add(new \Criteria('approved', '0'));
     $newposts = $postHandler->getCount($crit);
 }
@@ -168,15 +168,15 @@ 
     $forums = [];
     $onecat = $categories[$id];
 
-    $cat_element_id = 'cat_' . $onecat['cat_id'];
+    $cat_element_id = 'cat_'.$onecat['cat_id'];
     $expand         = (count($toggles) > 0) ? (in_array($cat_element_id, $toggles) ? false : true) : true;
     // START irmtfan to improve newbbDisplayImage
     if ($expand) {
-        $cat_display      = 'block';        //irmtfan move semicolon
+        $cat_display      = 'block'; //irmtfan move semicolon
         $cat_icon_display = 'minus';
         $cat_alt          = _MD_NEWBB_HIDE;
     } else {
-        $cat_display      = 'none';        //irmtfan move semicolon
+        $cat_display      = 'none'; //irmtfan move semicolon
         $cat_icon_display = 'plus';
         $cat_alt          = _MD_NEWBB_SEE;
     }
@@ -199,7 +199,7 @@ 
     $cat_image = '';
     $cat_image = $onecat['cat_image'];
     if ('' !== $cat_image && 'blank.gif' !== $cat_image && $cat_image) {
-        $cat_image = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/assets/images/category/' . $cat_image;
+        $cat_image = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/assets/images/category/'.$cat_image;
     }
     $category_array[] = [
         'cat_id'           => $onecat['cat_id'],
@@ -250,15 +250,15 @@ 
 $stats = $statsHandler->getStats(array_merge([0], $forums_available));
 $xoopsTpl->assign_by_ref('stats', $stats);
 $xoopsTpl->assign('subforum_display', $GLOBALS['xoopsModuleConfig']['subforum_display']);
-$xoopsTpl->assign('mark_read', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?mark_read=1');
-$xoopsTpl->assign('mark_unread', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?mark_read=2');
+$xoopsTpl->assign('mark_read', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/index.php?mark_read=1');
+$xoopsTpl->assign('mark_unread', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/index.php?mark_read=2');
 
-$xoopsTpl->assign('all_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=all');
-$xoopsTpl->assign('post_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewpost.php?status=all');
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewpost.php?status=new');
-$xoopsTpl->assign('digest_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=digest');
-$xoopsTpl->assign('unreplied_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=unreplied');
-$xoopsTpl->assign('unread_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=unread');
+$xoopsTpl->assign('all_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=all');
+$xoopsTpl->assign('post_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewpost.php?status=all');
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewpost.php?status=new');
+$xoopsTpl->assign('digest_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=digest');
+$xoopsTpl->assign('unreplied_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=unreplied');
+$xoopsTpl->assign('unread_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=unread');
 $xoopsTpl->assign('menumode', $menumode);
 $xoopsTpl->assign('menumode_other', $menumode_other);
 
@@ -286,5 +286,5 @@ 
                   ]);
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');