mambax7 / newbb5

class/TypeHandler.php

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
     {
         $ret = [];
 
-        $forums = (is_array($forums) ? array_filter(array_map('intval', array_map('trim', $forums))) : (empty($forums) ? 0 : [(int)$forums]));
+        $forums = (is_array($forums) ? array_filter(array_map('intval', array_map('trim', $forums))) : (empty($forums) ? 0 : [(int) $forums]));
 
         $sql = '    SELECT o.type_id, o.type_name, o.type_color, l.type_order'
                . '     FROM '
@@ -48,7 +48,7 @@ 
                . "         LEFT JOIN {$this->table} AS o ON o.{$this->keyName} = l.{$this->keyName} "
                . '     WHERE '
                . '        l.forum_id '
-               . (empty($forums) ? 'IS NOT NULL' : 'IN (' . implode(', ', $forums) . ')')
+               . (empty($forums) ? 'IS NOT NULL' : 'IN ('.implode(', ', $forums).')')
                . '         ORDER BY l.type_order ASC';
         if (false === ($result = $this->db->query($sql))) {
             //xoops_error($this->db->error());
@@ -76,7 +76,7 @@ 
      */
     public function updateByForum($forum_id, $types)
     {
-        $forum_id = (int)$forum_id;
+        $forum_id = (int) $forum_id;
         if (empty($forum_id)) {
             return false;
         }
@@ -104,8 +104,8 @@ 
         $types_update = array_filter($types_update);
 
         if (!empty($types_valid)) {
-            $sql = 'DELETE FROM ' . $this->db->prefix('newbb_type_forum') . ' WHERE ' . ' forum_id = ' . $forum_id . ' AND ' . // irmtfan bug fix: delete other forums types when update the type for a specific forum
-                   "     {$this->keyName} NOT IN (" . implode(', ', $types_valid) . ')';
+            $sql = 'DELETE FROM '.$this->db->prefix('newbb_type_forum').' WHERE '.' forum_id = '.$forum_id.' AND '.// irmtfan bug fix: delete other forums types when update the type for a specific forum
+                   "     {$this->keyName} NOT IN (".implode(', ', $types_valid).')';
             if (false === ($result = $this->db->queryF($sql))) {
             }
         }
@@ -117,7 +117,7 @@ 
                 if ($types_existing[$key]['type_order'] == $order) {
                     continue;
                 }
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_type_forum') . " SET type_order = {$order}" . " WHERE  {$this->keyName} = {$key} AND forum_id = {$forum_id}";
+                $sql = 'UPDATE '.$this->db->prefix('newbb_type_forum')." SET type_order = {$order}"." WHERE  {$this->keyName} = {$key} AND forum_id = {$forum_id}";
                 if (false === ($result = $this->db->queryF($sql))) {
                 }
             }
@@ -130,7 +130,7 @@ 
                 //if (!in_array($key, $types_add)) continue;
                 $type_query[] = "({$key}, {$forum_id}, {$order})";
             }
-            $sql = 'INSERT INTO ' . $this->db->prefix('newbb_type_forum') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
+            $sql = 'INSERT INTO '.$this->db->prefix('newbb_type_forum').' (type_id, forum_id, type_order) '.' VALUES '.implode(', ', $type_query);
             if (false === ($result = $this->db->queryF($sql))) {
                 //xoops_error($this->db->error());
             }
@@ -156,7 +156,7 @@ 
         /*
          * Remove forum-type links
          */
-        $sql = 'DELETE' . ' FROM ' . $this->db->prefix('newbb_type_forum') . ' WHERE  ' . $this->keyName . ' = ' . $object->getVar($this->keyName);
+        $sql = 'DELETE'.' FROM '.$this->db->prefix('newbb_type_forum').' WHERE  '.$this->keyName.' = '.$object->getVar($this->keyName);
         if (false === ($result = $this->db->{$queryFunc}($sql))) {
             // xoops_error($this->db->error());
         }
@@ -164,7 +164,7 @@ 
         /*
          * Reset topic type linked to this type
          */
-        $sql = 'UPATE' . ' ' . $this->db->prefix('newbb_topics') . ' SET ' . $this->keyName . '=0' . ' WHERE  ' . $this->keyName . ' = ' . $object->getVar($this->keyName);
+        $sql = 'UPATE'.' '.$this->db->prefix('newbb_topics').' SET '.$this->keyName.'=0'.' WHERE  '.$this->keyName.' = '.$object->getVar($this->keyName);
         if (false === ($result = $this->db->{$queryFunc}($sql))) {
             //xoops_error($this->db->error());
         }
@@ -183,11 +183,11 @@ 
     public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
     {
         /* clear forum-type links */
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_type_forum') . " WHERE ({$this->keyName} NOT IN ( SELECT DISTINCT {$this->keyName} FROM {$this->table}) )";
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_type_forum')." WHERE ({$this->keyName} NOT IN ( SELECT DISTINCT {$this->keyName} FROM {$this->table}) )";
         $this->db->queryF($sql);
 
         /* reconcile topic-type link */
-        $sql = 'UPATE ' . $this->db->prefix('newbb_topics') . " SET {$this->keyName} = 0" . " WHERE ({$this->keyName} NOT IN ( SELECT DISTINCT {$this->keyName} FROM {$this->table}) )";
+        $sql = 'UPATE '.$this->db->prefix('newbb_topics')." SET {$this->keyName} = 0"." WHERE ({$this->keyName} NOT IN ( SELECT DISTINCT {$this->keyName} FROM {$this->table}) )";
         $this->db->queryF($sql);
 
         return true;

class/TopicRenderer.php

Spacing +65 added lines, -65 removed lines

@@ -108,7 +108,7 @@ 
         switch ($var) {
             case 'forum':
                 if (is_numeric($val)) {
-                    $val = (int)$val;
+                    $val = (int) $val;
                 // START irmtfan - if the forum is array
                 } elseif (is_array($val)) {
                     $val = implode('|', $val);
@@ -123,7 +123,7 @@ 
             case 'order':
             case 'start':
             case 'since':
-                $val = (int)$val;
+                $val = (int) $val;
                 break;
 
             case 'uid': // irmtfan add multi topic poster
@@ -232,7 +232,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 {
                     }
@@ -244,7 +244,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);
@@ -256,9 +256,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;
                     }
@@ -274,7 +274,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 {
                     }
@@ -285,7 +285,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);
@@ -297,7 +297,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)
@@ -356,20 +356,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;
 
@@ -383,17 +383,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;
 
@@ -412,9 +412,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;
 
@@ -485,23 +485,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,
@@ -532,7 +532,7 @@ 
                 'sort'  => 't.poll_id'
             ]
         ];
-        $types   = $this->getTypes();
+        $types = $this->getTypes();
         if (!empty($types)) {
             $headers['type'] = [
                 'title' => _MD_NEWBB_TYPE,
@@ -575,7 +575,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?
         ]);
 
@@ -591,7 +591,7 @@ 
      */
     public function getStatus($type = null, $status = null)
     {
-        $links       = [
+        $links = [
             //""            => "", /* irmtfan remove empty array */
             'all'       => _ALL,
             'digest'    => _MD_NEWBB_DIGEST,
@@ -619,7 +619,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
@@ -633,10 +633,10 @@ 
     {
         $selection         = ['action' => $this->page];
         $selection['vars'] = $this->vars;
-        require_once  dirname(__DIR__) . '/include/functions.forum.php';
+        require_once  dirname(__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>';
 
@@ -647,13 +647,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'];
@@ -696,10 +696,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);
     }
@@ -723,7 +723,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);
     }
@@ -771,7 +771,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);
     }
@@ -794,7 +794,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);
     }
@@ -816,7 +816,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();
@@ -848,12 +848,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;
@@ -894,18 +894,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)) {
@@ -917,11 +917,11 @@ 
             return $ret;
         }
 
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-        require_once  dirname(__DIR__) . '/include/functions.session.php';
-        require_once  dirname(__DIR__) . '/include/functions.time.php';
-        require_once  dirname(__DIR__) . '/include/functions.read.php';
-        require_once  dirname(__DIR__) . '/include/functions.topic.php';
+        require_once  dirname(__DIR__).'/include/functions.render.php';
+        require_once  dirname(__DIR__).'/include/functions.session.php';
+        require_once  dirname(__DIR__).'/include/functions.time.php';
+        require_once  dirname(__DIR__).'/include/functions.read.php';
+        require_once  dirname(__DIR__).'/include/functions.topic.php';
 
         $sticky    = 0;
         $topics    = [];
@@ -940,9 +940,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'], ENT_QUOTES | ENT_HTML5) . '" alt="" />';
+                $topic_icon = '<img align="middle" src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($myrow['icon'], ENT_QUOTES | ENT_HTML5).'" 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
 
@@ -953,7 +953,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));
             }
 
             // ------------------------------------------------------
@@ -963,22 +963,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
@@ -1010,7 +1010,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'],
@@ -1069,14 +1069,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']])) {
@@ -1110,14 +1110,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);
                 }
             }
         }

class/ReadtopicHandler.php

Spacing +4 added lines, -4 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
@@ -63,7 +63,7 @@ 
     {
         parent::__construct($db, 'topic');
         $newbbConfig           = newbbLoadConfig();
-        $this->items_per_forum = isset($newbbConfig['read_items']) ? (int)$newbbConfig['read_items'] : 100;
+        $this->items_per_forum = isset($newbbConfig['read_items']) ? (int) $newbbConfig['read_items'] : 100;
     }
 
     /**
@@ -176,7 +176,7 @@ 
             $sticky_id = $itemHandler->getIds($criteria_sticky);
             $items     = $items_id + $sticky_id;
             $criteria  = new \CriteriaCompo(new \Criteria('uid', $uid));
-            $criteria->add(new \Criteria('read_item', '(' . implode(', ', $items) . ')', 'IN'));
+            $criteria->add(new \Criteria('read_item', '('.implode(', ', $items).')', 'IN'));
             $this->deleteAll($criteria, true);
 
             return true;
@@ -184,7 +184,7 @@ 
 
         $itemsObject  = $itemHandler->getAll($criteria_topic, ['topic_last_post_id']);
         $stickyObject = $itemHandler->getAll($criteria_sticky, ['topic_last_post_id']);
-        $itemsObject  += $stickyObject;
+        $itemsObject += $stickyObject;
         $items        = [];
         foreach (array_keys($itemsObject) as $key) {
             $items[$key] = $itemsObject[$key]->getVar('topic_last_post_id');

class/ReadHandler.php

Spacing +21 added lines, -21 removed lines

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

class/PostHandler.php

Spacing +20 added lines, -20 removed lines

@@ -56,9 +56,9 @@ 
      */
     public function get($id = null, $var = null) //get($id)
     {
-        $id   = (int)$id;
+        $id   = (int) $id;
         $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
+        $sql  = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p LEFT JOIN '.$this->db->prefix('newbb_posts_text').' t ON p.post_id=t.post_id WHERE p.post_id='.$id;
         if ($array = $this->db->fetchArray($this->db->query($sql))) {
             $post = $this->create(false);
             $post->assignVars($array);
@@ -87,7 +87,7 @@ 
         $topic_id = 0,
         $approved = 1
     ) {
-        $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
+        $sql = 'SELECT p.*, t.*, tp.topic_status FROM '
                   . $this->db->prefix('newbb_posts')
                   . ' p LEFT JOIN '
                   . $this->db->prefix('newbb_posts_text')
@@ -379,14 +379,14 @@ 
 
         /* Set active post as deleted */
         if ($post->getVar('approved') > 0 && empty($force)) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
+            $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET approved = -1 WHERE post_id = '.$post->getVar('post_id');
             if (!$result = $this->db->queryF($sql)) {
             }
             /* delete pending post directly */
         } else {
             $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('delete post error: ' . $sql);
+                $post->setErrors('delete post error: '.$sql);
 
                 return false;
             }
@@ -394,7 +394,7 @@ 
 
             $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('Could not remove post text: ' . $sql);
+                $post->setErrors('Could not remove post text: '.$sql);
 
                 return false;
             }
@@ -431,11 +431,11 @@ 
                 }
             }
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
-                            LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.topic_id = t.topic_id
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics').' t
+                            LEFT JOIN ' . $this->db->prefix('newbb_posts').' p ON p.topic_id = t.topic_id
                             SET t.topic_last_post_id = p.post_id
-                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id') . '
-                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id=t.topic_id)';
+                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id').'
+                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts').' WHERE topic_id=t.topic_id)';
             if (!$result = $this->db->queryF($sql)) {
             }
         }
@@ -457,7 +457,7 @@ 
             }
             // irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
             if (!$post->isTopic()) {
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
+                $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET pid = '.$post->getVar('pid').' WHERE approved=1 AND pid='.$post->getVar('post_id');
                 if (!$result = $this->db->queryF($sql)) {
                     //xoops_error($this->db->error());
                 }
@@ -481,12 +481,12 @@ 
             return parent::getCount($criteria);
         }
 
-        $sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT COUNT(*) as count'.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         // LEFT JOIN
         $sql .= $join;
         // WHERE
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             //xoops_error($this->db->error().'<br>'.$sql);
@@ -511,17 +511,17 @@ 
     public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
     {
         $ret = [];
-        $sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT p.*, t.* '.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         if (!empty($join)) {
             $sql .= $join;
         }
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
         }
-        $result = $this->db->query($sql, (int)$limit, (int)$start);
+        $result = $this->db->query($sql, (int) $limit, (int) $start);
         if (!$result) {
             //xoops_error($this->db->error());
             return $ret;
@@ -559,7 +559,7 @@ 
         parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
         parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
 
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_posts_text').' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM '.$this->table.') )';
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
             return false;
@@ -579,7 +579,7 @@ 
         // irmtfan if 0 no cleanup look include/plugin.php
         if (!func_num_args()) {
             $newbbConfig = newbbLoadConfig();
-            $expire      = isset($newbbConfig['pending_expire']) ? (int)$newbbConfig['pending_expire'] : 7;
+            $expire      = isset($newbbConfig['pending_expire']) ? (int) $newbbConfig['pending_expire'] : 7;
             $expire      = $expire * 24 * 3600; // days to seconds
         }
         if (empty($expire)) {
@@ -587,7 +587,7 @@ 
         }
         $crit_expire = new \CriteriaCompo(new \Criteria('approved', 0, '<='));
         //if (!empty($expire)) {
-        $crit_expire->add(new \Criteria('post_time', time() - (int)$expire, '<'));
+        $crit_expire->add(new \Criteria('post_time', time() - (int) $expire, '<'));
 
         //}
         return $this->deleteAll($crit_expire, true/*, true*/);

class/OnlineHandler.php

Spacing +22 added lines, -22 removed lines

@@ -15,7 +15,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once  dirname(__DIR__) . '/include/functions.config.php';
+require_once  dirname(__DIR__).'/include/functions.config.php';
 
 /**
  * Class OnlineHandler
@@ -47,7 +47,7 @@ 
             $this->forum_id    = $forum->getVar('forum_id');
             $this->forumObject = $forum;
         } else {
-            $this->forum_id    = (int)$forum;
+            $this->forum_id    = (int) $forum;
             $this->forumObject = $forum;
         }
         if (is_object($forumtopic)) {
@@ -56,7 +56,7 @@ 
                 $this->forum_id = $forumtopic->getVar('forum_id');
             }
         } else {
-            $this->topic_id = (int)$forumtopic;
+            $this->topic_id = (int) $forumtopic;
         }
 
         $this->update();
@@ -66,7 +66,7 @@ 
     {
         global $xoopsModule;
 
-        mt_srand((double)microtime() * 1000000);
+        mt_srand((double) microtime() * 1000000);
         // set gc probabillity to 10% for now..
         if (mt_rand(1, 100) < 60) {
             $this->gc(150);
@@ -96,8 +96,8 @@ 
      */
     public function render(\Smarty $xoopsTpl)
     {
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
+        require_once  dirname(__DIR__).'/include/functions.render.php';
+        require_once  dirname(__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  dirname(__DIR__) . '/include/functions.render.php';
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
+        require_once  dirname(__DIR__).'/include/functions.render.php';
+        require_once  dirname(__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;
@@ -227,17 +227,17 @@ 
     {
         global $xoopsModule, $xoopsDB;
 
-        $uid = (int)$uid;
+        $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/PermissionCategoryHandler.php

Spacing +2 added lines, -2 removed lines

@@ -55,13 +55,13 @@
      */
     public function deleteByCategory($cat_id)
     {
-        $cat_id = (int)$cat_id;
+        $cat_id = (int) $cat_id;
         if (empty($cat_id)) {
             return false;
         }
         /** @var \XoopsGroupPermHandler $grouppermHandler */
         $grouppermHandler = xoops_getHandler('groupperm');
-        $criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
+        $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
         $criteria->add(new \Criteria('gperm_name', 'category_access'));
         $criteria->add(new \Criteria('gperm_itemid', $cat_id));
 

class/ForumHandler.php

Spacing +62 added lines, -62 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));
+            $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'], ENT_QUOTES | ENT_HTML5) . '" alt="" />';
+                $topic_icon = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($myrow['icon'], ENT_QUOTES | ENT_HTML5).'" 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  dirname(__DIR__) . '/include/functions.user.php';
+        require_once  dirname(__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);
@@ -711,20 +711,20 @@ 
         }
 
         if (!is_object($object)) {
-            $object = $this->get((int)$object);
+            $object = $this->get((int) $object);
         }
 
         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;
             $posts     = 0;
             if ($row = $this->db->fetchArray($result)) {
-                $last_post = (int)$row['last_post'];
-                $posts     = (int)$row['total'];
+                $last_post = (int) $row['last_post'];
+                $posts     = (int) $row['total'];
             }
             if ($object->getVar('forum_last_post_id') !== $last_post) {
                 $object->setVar('forum_last_post_id', $last_post);
@@ -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']])) {
@@ -940,14 +940,14 @@ 
      */
     public function &getTree($cat_id = 0, $pid = 0, $permission = 'access', $prefix = '--', $tags = null)
     {
-        $pid         = (int)$pid;
+        $pid         = (int) $pid;
         $perm_string = $permission;
         if (!is_array($tags) || 0 === count($tags)) {
             $tags = ['forum_id', 'parent_forum', 'forum_name', 'forum_order', 'cat_id'];
         }
         $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];
@@ -976,17 +976,17 @@ 
      */
     public function &getArrayTree($cat_id = 0, $pid = 0, $permission = 'access', $tags = null, $depth = 0)
     {
-        $pid         = (int)$pid;
+        $pid         = (int) $pid;
         $perm_string = $permission;
         if (!is_array($tags) || 0 === count($tags)) {
             $tags = ['forum_id', 'parent_forum', 'forum_name', 'forum_order', 'cat_id'];
         }
         $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]];
         }

viewpost.php

Spacing +49 added lines, -49 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $start    = Request::getInt('start', 0, 'GET');
 $forum_id = Request::getInt('forum', 0, 'GET');
@@ -72,8 +72,8 @@ 
 //echo $mode.' - '.$status;
 $post_perpage = $GLOBALS['xoopsModuleConfig']['posts_per_page'];
 
-$criteria_count = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(',', $accessForums) . ')', 'IN'));
-$criteria_post  = new \CriteriaCompo(new \Criteria('p.forum_id', '(' . implode(',', $accessForums) . ')', 'IN'));
+$criteria_count = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(',', $accessForums).')', 'IN'));
+$criteria_post  = new \CriteriaCompo(new \Criteria('p.forum_id', '('.implode(',', $accessForums).')', 'IN'));
 $criteria_post->setSort('p.post_id');
 $criteria_post->setOrder($order);
 
@@ -106,33 +106,33 @@ 
             // 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)) {
-                $join                 = ' LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_reads_topic') . ' AS r ON r.read_item = p.topic_id AND r.uid = ' . $read_uid . ' '; // irmtfan corrected add AS
-                $criteria_status_post = new \CriteriaCompo();// irmtfan new \Criteria
+                $join                 = ' LEFT JOIN '.$GLOBALS['xoopsDB']->prefix('newbb_reads_topic').' AS r ON r.read_item = p.topic_id AND r.uid = '.$read_uid.' '; // irmtfan corrected add AS
+                $criteria_status_post = new \CriteriaCompo(); // irmtfan new \Criteria
                 $criteria_status_post->add(new \Criteria('p.post_id', 'r.`post_id`', '>')); // irmtfan corrected - should use $value='r.``' to render in XOOPS/class/criteria.php
-                $criteria_status_post->add(new \Criteria('r.read_id', null, 'IS NULL'), 'OR');// irmtfan corrected - should use "IS NULL" to render in XOOPS/class/criteria.php
+                $criteria_status_post->add(new \Criteria('r.read_id', null, 'IS NULL'), 'OR'); // irmtfan corrected - should use "IS NULL" to render in XOOPS/class/criteria.php
                 $criteria_post->add($criteria_status_post); // irmtfan add the status criteria to post criteria - move here
-                $criteria_count = $criteria_post;// irmtfan criteria count is equal to criteria post - move here
+                $criteria_count = $criteria_post; // irmtfan criteria count is equal to criteria post - move here
             } else {
             }
             // END irmtfan use read_uid to find the unread posts when the user is logged in
             //$criteria_status_post->add(new \Criteria("p.approved", 1)); // irmtfan commented and removed
             //$criteria_status_count =& $criteria_status_post;
         } elseif (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
-            $criteria_count->add(new \Criteria('post_time', (int)$last_visit, '>')); // irmtfan add new \Criteria
-            $criteria_post->add(new \Criteria('p.post_time', (int)$last_visit, '>')); // irmtfan add new \Criteria
+            $criteria_count->add(new \Criteria('post_time', (int) $last_visit, '>')); // irmtfan add new \Criteria
+            $criteria_post->add(new \Criteria('p.post_time', (int) $last_visit, '>')); // irmtfan add new \Criteria
             // START irmtfan fix read_mode = 1 bugs - for all users (member and anon)
             $topics         = [];
             $topic_lastread = newbbGetCookie('LT', true);
             if (count($topic_lastread) > 0) {
                 foreach ($topic_lastread as $id => $time) {
-                    if ($time > (int)$last_visit) {
+                    if ($time > (int) $last_visit) {
                         $topics[] = $id;
                     }
                 }
             }
             if (count($topics) > 0) {
-                $criteria_count->add(new \Criteria('topic_id', '(' . implode(',', $topics) . ')', 'NOT IN'));
-                $criteria_post->add(new \Criteria('p.topic_id', '(' . implode(',', $topics) . ')', 'NOT IN'));
+                $criteria_count->add(new \Criteria('topic_id', '('.implode(',', $topics).')', 'NOT IN'));
+                $criteria_post->add(new \Criteria('p.topic_id', '('.implode(',', $topics).')', 'NOT IN'));
             }
             // END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
             //$criteria_status_count->add(new \Criteria("approved", 1));// irmtfan commented and removed
@@ -161,8 +161,8 @@ 
 $viewmode = Request::getString('viewmode', (!empty($viewmode_cookie) ? $viewmode_cookie : (@$valid_modes[$GLOBALS['xoopsModuleConfig']['view_mode'] - 1])), 'GET');
 $viewmode = in_array($viewmode, $valid_modes) ? $viewmode : $valid_modes[0];
 
-$postCount = $postHandler->getPostCount($criteria_count, $join);// irmtfan add join for read_mode = 2
-$posts     = $postHandler->getPostsByLimit($criteria_post, $post_perpage, $start, $join);// irmtfan add join for read_mode = 2
+$postCount = $postHandler->getPostCount($criteria_count, $join); // irmtfan add join for read_mode = 2
+$posts     = $postHandler->getPostsByLimit($criteria_post, $post_perpage, $start, $join); // irmtfan add join for read_mode = 2
 
 $poster_array = [];
 if (count($posts) > 0) {
@@ -172,20 +172,20 @@ 
     }
 }
 
-$xoops_pagetitle                = $xoopsModule->getVar('name') . ' - ' . _MD_NEWBB_VIEWALLPOSTS;
+$xoops_pagetitle                = $xoopsModule->getVar('name').' - '._MD_NEWBB_VIEWALLPOSTS;
 $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
 $xoopsOption['template_main']   = 'newbb_viewpost.tpl';
 
 require_once $GLOBALS['xoops']->path('header.php');
-require_once __DIR__ . '/include/functions.time.php';
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.time.php';
+require_once __DIR__.'/include/functions.render.php';
 
 //global $xoTheme;
 //$xoTheme->addScript('/Frameworks/textsanitizer/xoops.js');
 
 if (!empty($forum_id)) {
     if (!$forumHandler->getPermission($forumObject, 'view')) {
-        redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+        redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
     }
     if ($forumObject->getVar('parent_forum')) {
         $parent_forumObject = $forumHandler->get($forumObject->getVar('parent_forum'), ['forum_name']);
@@ -199,17 +199,17 @@ 
     $xoopsTpl->assign('forum_name', $forumObject->getVar('forum_name'));
     $xoopsTpl->assign('forum_moderators', $forumObject->dispForumModerators());
 
-    $xoops_pagetitle = $forumObject->getVar('forum_name') . ' - ' . _MD_NEWBB_VIEWALLPOSTS . ' [' . $xoopsModule->getVar('name') . ']';
+    $xoops_pagetitle = $forumObject->getVar('forum_name').' - '._MD_NEWBB_VIEWALLPOSTS.' ['.$xoopsModule->getVar('name').']';
     $xoopsTpl->assign('forum_id', $forumObject->getVar('forum_id'));
     // 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') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forum_id . '" />
+            <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'-'.$forumObject->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_id.'" />
             ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
     }
 } elseif (!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') . '/rss.php" />
+        <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 // irmtfan remove and move to footer.php
@@ -222,7 +222,7 @@ 
     /** @var \XoopsMembershipHandler $memberHandler */
     $memberHandler = xoops_getHandler('member');
     $userid_array  = array_keys($poster_array);
-    $user_criteria = '(' . implode(',', $userid_array) . ')';
+    $user_criteria = '('.implode(',', $userid_array).')';
     $users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
 } else {
     $user_criteria = '';
@@ -260,9 +260,9 @@ 
     $post_title = $post->getVar('subject');
 
     if ($posticon = $post->getVar('icon')) {
-        $post_image = '<a name="' . $post->getVar('post_id') . '"><img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($posticon, ENT_QUOTES | ENT_HTML5) . '" alt="" /></a>';
+        $post_image = '<a name="'.$post->getVar('post_id').'"><img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($posticon, ENT_QUOTES | ENT_HTML5).'" alt="" /></a>';
     } else {
-        $post_image = '<a name="' . $post->getVar('post_id') . '"><img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" /></a>';
+        $post_image = '<a name="'.$post->getVar('post_id').'"><img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" /></a>';
     }
     $poster = [
         'uid'  => 0,
@@ -276,10 +276,10 @@ 
         $post_text       = $post->getVar('post_text');
         $post_attachment = $post->displayAttachment();
     } elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post->getVar('post_karma') > $user_karma) {
-        $post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $post->getVar('post_karma')) . '</div>';
+        $post_text       = "<div class='karma'>".sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $post->getVar('post_karma')).'</div>';
         $post_attachment = '';
     } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post->getVar('require_reply')) {
-        $post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
+        $post_text       = "<div class='karma'>"._MD_NEWBB_REPLY_REQUIREMENT.'</div>';
         $post_attachment = '';
     } else {
         $post_text       = $post->getVar('post_text');
@@ -299,40 +299,40 @@ 
             || (!$suspension[$post->getVar('forum_id')] && $post->checkIdentity()
                 && $post->checkTimelimit('delete_timelimit'))) {
             $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-            $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/delete.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+            $thread_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/delete.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
             $thread_buttons['delete']['name']  = _DELETE;
         }
         if ($isAdmin
             || !$suspension[$post->getVar('forum_id')] && $post->checkIdentity()
                && $post->checkTimelimit('edit_timelimit')) {
             $thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-            $thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/edit.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+            $thread_buttons['edit']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/edit.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
             $thread_buttons['edit']['name']  = _EDIT;
         }
         if (is_object($GLOBALS['xoopsUser']) && !$suspension[$post->getVar('forum_id')]) {
             $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-            $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+            $thread_buttons['reply']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/reply.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
             $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
 
             $thread_buttons['quote']['image'] = newbbDisplayImage('p_quote', _MD_NEWBB_QUOTE);
-            $thread_buttons['quote']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id') . '&amp;quotedac=1';
+            $thread_buttons['quote']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/reply.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id').'&amp;quotedac=1';
             $thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
         }
     } else {
         $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-        $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/delete.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+        $thread_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/delete.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
         $thread_buttons['delete']['name']  = _DELETE;
         $thread_buttons['edit']['image']   = newbbDisplayImage('p_edit', _EDIT);
-        $thread_buttons['edit']['link']    = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/edit.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+        $thread_buttons['edit']['link']    = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/edit.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
         $thread_buttons['edit']['name']    = _EDIT;
         $thread_buttons['reply']['image']  = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-        $thread_buttons['reply']['link']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+        $thread_buttons['reply']['link']   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/reply.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
         $thread_buttons['reply']['name']   = _MD_NEWBB_REPLY;
     }
 
     if (!$isAdmin && $GLOBALS['xoopsModuleConfig']['reportmod_enabled']) {
         $thread_buttons['report']['image'] = newbbDisplayImage('p_report', _MD_NEWBB_REPORT);
-        $thread_buttons['report']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/report.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+        $thread_buttons['report']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/report.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
         $thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
     }
     $thread_action = [];
@@ -361,13 +361,13 @@ 
 unset($viewtopic_users, $forums);
 
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
+    require_once __DIR__.'/include/functions.forum.php';
     $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
 if ($postCount > $post_perpage) {
     require_once $GLOBALS['xoops']->path('class/pagenav.php');
-    $nav = new \XoopsPageNav($postCount, $post_perpage, $start, 'start', 'forum=' . $forum_id . '&amp;viewmode=' . $viewmode . '&amp;status=' . $status . '&amp;uid=' . $uid . '&amp;order=' . $order . '&amp;mode=' . $mode);
+    $nav = new \XoopsPageNav($postCount, $post_perpage, $start, 'start', 'forum='.$forum_id.'&amp;viewmode='.$viewmode.'&amp;status='.$status.'&amp;uid='.$uid.'&amp;order='.$order.'&amp;mode='.$mode);
     //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . $nav->url;
     if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
         $navi = $nav->renderSelect();
@@ -386,13 +386,13 @@ 
 
 switch ($status) {
     case 'active':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_ADMIN . ']';
+        $lang_title = _MD_NEWBB_VIEWALLPOSTS.' ['._MD_NEWBB_TYPE_ADMIN.']';
         break;
     case 'pending':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_PENDING . ']';
+        $lang_title = _MD_NEWBB_VIEWALLPOSTS.' ['._MD_NEWBB_TYPE_PENDING.']';
         break;
     case 'deleted':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_DELETED . ']';
+        $lang_title = _MD_NEWBB_VIEWALLPOSTS.' ['._MD_NEWBB_TYPE_DELETED.']';
         break;
     case 'new':
         $lang_title = _MD_NEWBB_NEWPOSTS;
@@ -402,7 +402,7 @@ 
         break;
 }
 if ($uid > 0) {
-    $lang_title .= ' (' . \XoopsUser::getUnameFromId($uid) . ')';
+    $lang_title .= ' ('.\XoopsUser::getUnameFromId($uid).')';
 }
 $xoopsTpl->assign('lang_title', $lang_title);
 // irmtfan up to p_up
@@ -411,12 +411,12 @@ 
 $xoopsTpl->assign('anonymous_prefix', $GLOBALS['xoopsModuleConfig']['anonymous_prefix']);
 $xoopsTpl->assign('down', newbbDisplayImage('down', _MD_NEWBB_BOTTOM));
 
-$all_link       = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . "&amp;start=$start";
-$post_link      = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id;
-$newpost_link   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . '&amp;status=new';
-$digest_link    = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . "&amp;start=$start&amp;status=digest";
-$unreplied_link = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . "&amp;start=$start&amp;status=unreplied";
-$unread_link    = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . "&amp;start=$start&amp;status=unread";
+$all_link       = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id."&amp;start=$start";
+$post_link      = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id;
+$newpost_link   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id.'&amp;status=new';
+$digest_link    = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id."&amp;start=$start&amp;status=digest";
+$unreplied_link = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id."&amp;start=$start&amp;status=unreplied";
+$unread_link    = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id."&amp;start=$start&amp;status=unread";
 
 $xoopsTpl->assign('all_link', $all_link);
 $xoopsTpl->assign('post_link', $post_link);
@@ -428,12 +428,12 @@ 
 $viewmode_options = [];
 if ('DESC' === $order) {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&amp;order=ASC&amp;forum=' . $forum_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?viewmode=flat&amp;order=ASC&amp;forum='.$forum_id,
         'title' => _OLDESTFIRST
     ];
 } else {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&amp;order=DESC&amp;forum=' . $forum_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?viewmode=flat&amp;order=DESC&amp;forum='.$forum_id,
         'title' => _NEWESTFIRST
     ];
 }
@@ -448,5 +448,5 @@ 
 $xoopsTpl->assign('mode', $mode);
 $xoopsTpl->assign('status', $status);
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');