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/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

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');

action.post.php

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $topic_id = Request::getInt('topic_id', 0, 'POST');
 $post_id  = Request::getArray('post_id', Request::getArray('post_id', [], 'POST'), 'GET');
@@ -42,7 +42,7 @@ 
 $isAdmin = newbbIsAdmin($forumObject);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 switch ($op) {
@@ -74,7 +74,7 @@ 
         sort($post_id);
         $topics      = [];
         $forums      = [];
-        $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
+        $criteria    = new \Criteria('post_id', '('.implode(',', $post_id).')', 'IN');
         $postsObject = $postHandler->getObjects($criteria, true);
         foreach ($post_id as $post) {
             /** @var Newbb\Post $postObject */
@@ -97,23 +97,23 @@ 
             break;
         }
 
-        $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
+        $criteria_topic = new \Criteria('topic_id', '('.implode(',', array_keys($topics)).')', 'IN');
         $topic_list     = $topicHandler->getList($criteria_topic, true);
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forum_list     = $forumHandler->getList($criteria_forum);
 
-        require_once __DIR__ . '/include/notification.inc.php';
+        require_once __DIR__.'/include/notification.inc.php';
         /** @var \XoopsNotificationHandler $notificationHandler */
         $notificationHandler = xoops_getHandler('notification');
         foreach ($post_id as $post) {
             $tags = [];
             /** @var Newbb\Post[] $postsObject [$post] */
             $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&forum=' . $postsObject[$post]->getVar('forum_id');
+            $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$postsObject[$post]->getVar('topic_id').'&forum='.$postsObject[$post]->getVar('forum_id');
             $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
-            $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
+            $tags['FORUM_URL']   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?forum='.$postsObject[$post]->getVar('forum_id');
+            $tags['POST_URL']    = $tags['THREAD_URL'].'#forumpost'.$post;
             $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
@@ -180,7 +180,7 @@ 
             $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
             $posts  = $mytree->getAllChildId($post_id);
             if (count($posts) > 0) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
+                $criteria = new \Criteria('post_id', '('.implode(',', $posts).')', 'IN');
                 $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
             }
             /* split a post and all posts coming after */
@@ -207,7 +207,7 @@ 
                 }
             }
             if (count($post_update)) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
+                $criteria = new \Criteria('post_id', '('.implode(',', $post_update).')', 'IN');
                 $postHandler->updateAll('pid', $post_id, $criteria, true);
             }
         }
@@ -221,12 +221,12 @@ 
         break;
 }
 if (!empty($topic_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
 } elseif (!empty($forum_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

ratethread.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $ratinguser   = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 $anonwaitdays = 1;
@@ -51,7 +51,7 @@ 
 }
 
 if (empty($rate)) {
-    redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_NOVOTERATE);
+    redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_NOVOTERATE);
 }
 ///** @var Newbb\RateHandler $rateHandler */
 //$rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
@@ -62,13 +62,13 @@ 
     //    /** @var Newbb\PostHandler $postHandler */
     //    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
     if ($postHandler->getCount($crit_post)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_CANTVOTEOWN);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_CANTVOTEOWN);
     }
     // Check if REG user is trying to vote twice.
     $crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
     $crit_rate->add(new \Criteria('ratinguser', $ratinguser));
     if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_VOTEONCE);
     }
 } else {
     // Check if ANONYMOUS user is trying to vote more than once per day.
@@ -77,7 +77,7 @@ 
     $crit_rate->add(new \Criteria('ratinghostname', $ip));
     $crit_rate->add(new \Criteria('ratingtimestamp', time() - (86400 * $anonwaitdays), '>'));
     if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_VOTEONCE);
     }
 }
 $rateObject = $rateHandler->create();
@@ -89,7 +89,7 @@ 
 
 $ratingid = $rateHandler->insert($rateObject);
 
-$query       = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' WHERE topic_id = ' . $topic_id . ' ';
+$query       = 'SELECT rating FROM '.$GLOBALS['xoopsDB']->prefix('newbb_votedata').' WHERE topic_id = '.$topic_id.' ';
 $voteresult  = $GLOBALS['xoopsDB']->query($query);
 $votesDB     = $GLOBALS['xoopsDB']->getRowsNum($voteresult);
 $totalrating = 0;
@@ -101,7 +101,7 @@ 
 $sql         = sprintf('UPDATE "%s" SET rating = "%u", votes = "%u" WHERE topic_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $finalrating, $votesDB, $topic_id);
 $GLOBALS['xoopsDB']->queryF($sql);
 
-$ratemessage = _MD_NEWBB_VOTEAPPRE . '<br>' . sprintf(_MD_NEWBB_THANKYOU, $GLOBALS['xoopsConfig']['sitename']);
-redirect_header('viewtopic.php?topic_id=' . $topic_id . '&amp;forum=' . $forum . '', 2, $ratemessage);
+$ratemessage = _MD_NEWBB_VOTEAPPRE.'<br>'.sprintf(_MD_NEWBB_THANKYOU, $GLOBALS['xoopsConfig']['sitename']);
+redirect_header('viewtopic.php?topic_id='.$topic_id.'&amp;forum='.$forum.'', 2, $ratemessage);
 // irmtfan enhance include footer.php
 include $GLOBALS['xoops']->path('footer.php');

action.topic.php

Spacing +24 added lines, -24 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $forum_id = Request::getInt('forum_id', 0, 'POST');
 $topic_id = Request::getArray('topic_id', null, 'POST');
@@ -34,12 +34,12 @@ 
 $isAdmin = newbbIsAdmin($forum_id);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 switch ($op) {
     case 'restore':
         $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -47,7 +47,7 @@ 
             $topicHandler->synchronization($topicObject);
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -56,7 +56,7 @@ 
         break;
     case 'approve':
         $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -65,7 +65,7 @@ 
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -75,21 +75,21 @@ 
             break;
         }
 
-        require_once __DIR__ . '/include/notification.inc.php';
+        require_once __DIR__.'/include/notification.inc.php';
         /** @var \XoopsNotificationHandler $notificationHandler */
         $notificationHandler = xoops_getHandler('notification');
         foreach (array_keys($topicsObject) as $id) {
             $topicObject         = $topicsObject[$id];
             $tags                = [];
             $tags['THREAD_NAME'] = $topicObject->getVar('topic_title');
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewtopic.php?topic_id=' . $id . '&forum=' . $topicObject->getVar('forum_id');
+            $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$moduleDirName.'/viewtopic.php?topic_id='.$id.'&forum='.$topicObject->getVar('forum_id');
             /** @var Newbb\Forum[] $forumsObject */
             $tags['FORUM_NAME'] = $forumsObject[$topicObject->getVar('forum_id')]->getVar('forum_name');
-            $tags['FORUM_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewforum.php?forum=' . $topicObject->getVar('forum_id');
+            $tags['FORUM_URL']  = XOOPS_URL.'/modules/'.$moduleDirName.'/viewforum.php?forum='.$topicObject->getVar('forum_id');
             $notificationHandler->triggerEvent('global', 0, 'new_thread', $tags);
             $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_thread', $tags);
             $postObject       = $topicHandler->getTopPost($id);
-            $tags['POST_URL'] = $tags['THREAD_URL'] . '#forumpost' . $postObject->getVar('post_id');
+            $tags['POST_URL'] = $tags['THREAD_URL'].'#forumpost'.$postObject->getVar('post_id');
             $notificationHandler->triggerEvent('thread', $id, 'new_post', $tags);
             $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
@@ -104,7 +104,7 @@ 
     case 'delete':
         $forums = [];
         /** @var Newbb\TopicHandler|\XoopsPersistableObjectHandler $topicHandler */
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -114,7 +114,7 @@ 
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -125,7 +125,7 @@ 
         if (Request::getInt('newforum', 0, 'POST')
             && Request::getInt('newforum', 0, 'POST') !== $forum_id
             && $forumHandler->getPermission(Request::getInt('newforum', 0, 'POST'), 'post')) {
-            $criteria = new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN');
+            $criteria = new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN');
             //            /** @var Newbb\PostHandler $postHandler */
             //            $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
             $postHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
@@ -144,37 +144,37 @@ 
                 foreach (array_keys($forums) as $key) {
 
                     /** @var Newbb\Category[] $categories */
-                    $box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
+                    $box .= "<option value='-1'>[".$categories[$key]->getVar('cat_title').']</option>';
                     foreach ($forums[$key] as $forumid => $_forum) {
-                        $box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
+                        $box .= "<option value='".$forumid."'>-- ".$_forum['title'].'</option>';
                         if (!isset($_forum['sub'])) {
                             continue;
                         }
                         foreach (array_keys($_forum['sub']) as $fid) {
-                            $box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
+                            $box .= "<option value='".$fid."'>---- ".$_forum['sub'][$fid]['title'].'</option>';
                         }
                     }
                 }
             } else {
-                $box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
+                $box .= "<option value='-1'>"._MD_NEWBB_NOFORUMINDB.'</option>';
             }
             $box .= '</select>';
             unset($forums, $categories);
 
-            echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
+            echo "<form action='".Request::getString('PHP_SELF', '', 'SERVER')."' method='post'>";
             echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
             echo "<tr><td class='bg2'>";
             echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
-            echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+            echo '<tr><td class="bg3">'._MD_NEWBB_MOVETOPICTO.'</td><td class="bg1">';
             echo $box;
             echo '</td></tr>';
             echo '<tr class="bg3"><td colspan="2" align="center">';
             echo "<input type='hidden' name='op' value='move' />";
             echo "<input type='hidden' name='forum_id' value='{$forum_id}' />";
             foreach ($topic_id as $id) {
-                echo "<input type='hidden' name='topic_id[]' value='" . $id . "' />";
+                echo "<input type='hidden' name='topic_id[]' value='".$id."' />";
             }
-            echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
+            echo "<input type='submit' name='submit' value='"._SUBMIT."' />";
             echo '</td></tr></table></td></tr></table>';
             echo '</form>';
             include $GLOBALS['xoops']->path('footer.php');
@@ -186,10 +186,10 @@ 
 //$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
 $statsHandler->reset();
 if (empty($forum_id)) {
-    redirect_header(XOOPS_URL . '/modules/newbb/list.topic.php', 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL.'/modules/newbb/list.topic.php', 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');