mambax7 / newbb5

class/OnlineHandler.php

Indentation +13 added lines, -13 removed lines

@@ -252,18 +252,18 @@ 
         $xoopsOnlineTable    = $xoops_onlineHandler->table;
 
         $sql = 'DELETE FROM '
-               . $this->db->prefix('newbb_online')
-               . ' WHERE'
-               . ' ( online_uid > 0 AND online_uid NOT IN ( SELECT online_uid FROM '
-               . $xoopsOnlineTable
-               . ' WHERE online_module ='
-               . $xoopsModule->getVar('mid')
-               . ' ) )'
-               . ' OR ( online_uid = 0 AND online_ip NOT IN ( SELECT online_ip FROM '
-               . $xoopsOnlineTable
-               . ' WHERE online_module ='
-               . $xoopsModule->getVar('mid')
-               . ' AND online_uid = 0 ) )';
+                . $this->db->prefix('newbb_online')
+                . ' WHERE'
+                . ' ( online_uid > 0 AND online_uid NOT IN ( SELECT online_uid FROM '
+                . $xoopsOnlineTable
+                . ' WHERE online_module ='
+                . $xoopsModule->getVar('mid')
+                . ' ) )'
+                . ' OR ( online_uid = 0 AND online_ip NOT IN ( SELECT online_ip FROM '
+                . $xoopsOnlineTable
+                . ' WHERE online_module ='
+                . $xoopsModule->getVar('mid')
+                . ' AND online_uid = 0 ) )';
 
         if ($result = $this->db->queryF($sql)) {
             return true;
@@ -310,7 +310,7 @@ 
         if (!$result) {
             return $ret;
         }
-       while (false !== ($myrow = $this->db->fetchArray($result))) {
+        while (false !== ($myrow = $this->db->fetchArray($result))) {
             $ret[] = $myrow;
             if ($myrow['online_uid'] > 0) {
                 $this->user_ids[] = $myrow['online_uid'];

Spacing +18 added lines, -18 removed lines

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

class/Utility.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     public function addField($field, $table)
     {
         global $xoopsDB;
-        $result = $xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field");
+        $result = $xoopsDB->queryF('ALTER TABLE '.$table." ADD $field");
 
         return $result;
     }
@@ -83,7 +83,7 @@ 
             if (!@mkdir($folder) && !is_dir($folder)) {
                 throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
             } else {
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
             }
         } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -98,7 +98,7 @@ 
             return;
         }
         // for 2.5 systems, clear everything
-        require_once XOOPS_ROOT_PATH . '/modules/system/class/maintenance.php';
+        require_once XOOPS_ROOT_PATH.'/modules/system/class/maintenance.php';
         $maintenance = new \SystemMaintenance();
         $cacheList   = [
             3, // xoops_cache

class/Post.php

Spacing +51 added lines, -51 removed lines

@@ -122,7 +122,7 @@ 
             $attachmentSave = base64_encode(serialize($this->attachmentArray));
         }
         $this->setVar('attachment', $attachmentSave);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachmentSave) . ' WHERE post_id = ' . $this->getVar('post_id');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' SET attachment='.$GLOBALS['xoopsDB']->quoteString($attachmentSave).' WHERE post_id = '.$this->getVar('post_id');
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             //xoops_error($GLOBALS['xoopsDB']->error());
             return false;
@@ -152,8 +152,8 @@ 
 
         foreach ($attachOld as $key => $attach) {
             if (in_array($key, $attachArray)) {
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']));
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/thumbs/' . $attach['name_saved'])); // delete thumbnails
+                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']));
+                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/thumbs/'.$attach['name_saved'])); // delete thumbnails
                 continue;
             }
             $this->attachmentArray[$key] = $attach;
@@ -210,25 +210,25 @@ 
         if (is_array($attachments) && count($attachments) > 0) {
             $iconHandler = newbbGetIconHandler();
             $mime_path   = $iconHandler->getPath('mime');
-            include_once dirname(__DIR__) . '/include/functions.image.php';
+            include_once dirname(__DIR__).'/include/functions.image.php';
             $image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_NEWBB_ATTACHMENT . '</strong>:';
+            $post_attachment  .= '<br><strong>'._MD_NEWBB_ATTACHMENT.'</strong>:';
             $post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
             foreach ($attachments as $key => $att) {
                 $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
                 $filetype       = $file_extension;
-                if (file_exists($GLOBALS['xoops']->path($mime_path . '/' . $filetype . '.gif'))) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+                if (file_exists($GLOBALS['xoops']->path($mime_path.'/'.$filetype.'.gif'))) {
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/'.$filetype.'.gif';
                 } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/unknown.gif';
                 }
-                $file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $att['name_saved']));
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
+                $file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$att['name_saved']));
+                $file_size = number_format($file_size / 1024, 2).' KB';
                 if (in_array(strtolower($file_extension), $image_extensions)
                     && $GLOBALS['xoopsModuleConfig']['media_allowed']) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['nameDisplay'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . newbbAttachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
+                    $post_attachment .= '<br><img src="'.$icon_filetype.'" alt="'.$filetype.'" /><strong>&nbsp; '.$att['nameDisplay'].'</strong> <small>('.$file_size.')</small>';
+                    $post_attachment .= '<br>'.newbbAttachmentImage($att['name_saved']);
+                    $isDisplayed = true;
                 } else {
                     if (empty($GLOBALS['xoopsModuleConfig']['show_userattach'])) {
                         $post_attachment .= '<a href="'
@@ -362,10 +362,10 @@ 
                 // End irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
                 // START hacked by irmtfan
                 // display/save all edit records.
-                $post_edit .= _MD_NEWBB_EDITEDBY . ' ' . $edit_user . ' ' . _MD_NEWBB_ON . ' ' . formatTimestamp($edit_time) . '<br>';
+                $post_edit .= _MD_NEWBB_EDITEDBY.' '.$edit_user.' '._MD_NEWBB_ON.' '.formatTimestamp($edit_time).'<br>';
                 // if reason is not empty
                 if ('' !== $edit_msg) {
-                    $post_edit .= _MD_NEWBB_EDITEDMSG . ' ' . $edit_msg . '<br>';
+                    $post_edit .= _MD_NEWBB_EDITEDMSG.' '.$edit_msg.'<br>';
                 }
                 // START hacked by irmtfan
             }
@@ -381,8 +381,8 @@ 
     {
         global $viewtopic_users;
         $newbbConfig = newbbLoadConfig();
-        include_once __DIR__ . '/../include/functions.user.php';
-        include_once __DIR__ . '/../include/functions.render.php';
+        include_once __DIR__.'/../include/functions.user.php';
+        include_once __DIR__.'/../include/functions.render.php';
 
         $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
         /** @var KarmaHandler $karmaHandler */
@@ -393,14 +393,14 @@ 
         $post['attachment'] = false;
         $post_text          = newbbDisplayTarea($this->vars['post_text']['value'], $this->getVar('dohtml'), $this->getVar('dosmiley'), $this->getVar('doxcode'), $this->getVar('doimage'), $this->getVar('dobr'));
         if (newbbIsAdmin($this->getVar('forum_id')) || $this->checkIdentity()) {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
+            $post['text'] = $post_text.'<br>'.$this->displayAttachment();
         } elseif ($newbbConfig['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
             $post['text'] = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma'));
         } elseif ($newbbConfig['allow_require_reply'] && $this->getVar('require_reply')
                   && (!$uid || !isset($viewtopic_users[$uid]))) {
             $post['text'] = _MD_NEWBB_REPLY_REQUIREMENT;
         } else {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
+            $post['text'] = $post_text.'<br>'.$this->displayAttachment();
         }
         /** @var \XoopsMemberHandler $memberHandler */
         $memberHandler = xoops_getHandler('member');
@@ -485,8 +485,8 @@ 
             $name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
         }
 
-        include_once __DIR__ . '/../include/functions.time.php';
-        include_once __DIR__ . '/../include/functions.render.php';
+        include_once __DIR__.'/../include/functions.time.php';
+        include_once __DIR__.'/../include/functions.render.php';
 
         $post_id  = $this->getVar('post_id');
         $topic_id = $this->getVar('topic_id');
@@ -497,7 +497,7 @@ 
         $query_array['topic_id'] = "topic_id={$topic_id}";
         foreach ($query_vars as $var) {
             if (Request::getString($var, '', 'GET')) {
-                $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+                $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
             }
         }
         $page_query = htmlspecialchars(implode('&', array_values($query_array)));
@@ -515,11 +515,11 @@ 
             $post_text       = $this->getVar('post_text');
             $post_attachment = $this->displayAttachment();
         } elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
-            $post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')) . '</div>';
+            $post_text       = "<div class='karma'>".sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')).'</div>';
             $post_attachment = '';
         } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $this->getVar('require_reply')
                   && (!$uid || !in_array($uid, $viewtopic_posters))) {
-            $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       = $this->getVar('post_text');
@@ -546,9 +546,9 @@ 
         }
 
         if ($posticon = $this->getVar('icon')) {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/subject/' . $posticon . '" alt="" /></a>';
+            $post_image = '<a name="'.$post_id.'"><img src="'.XOOPS_URL.'/images/subject/'.$posticon.'" alt="" /></a>';
         } else {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/icons/posticon.gif" alt="" /></a>';
+            $post_image = '<a name="'.$post_id.'"><img src="'.XOOPS_URL.'/images/icons/posticon.gif" alt="" /></a>';
         }
 
         $thread_buttons = [];
@@ -557,10 +557,10 @@ 
         if ($isAdmin && ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->getVar('uid') !== $this->getVar('uid'))
             && $this->getVar('uid') > 0) {
             $mod_buttons['bann']['image']    = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $mod_buttons['bann']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+            $mod_buttons['bann']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/moderate.php?forum='.$forum_id.'&amp;uid='.$this->getVar('uid');
             $mod_buttons['bann']['name']     = _MD_NEWBB_SUSPEND_MANAGEMENT;
             $thread_buttons['bann']['image'] = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $thread_buttons['bann']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+            $thread_buttons['bann']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/moderate.php?forum='.$forum_id.'&amp;uid='.$this->getVar('uid');
             $thread_buttons['bann']['name']  = _MD_NEWBB_SUSPEND_MANAGEMENT;
         }
 
@@ -573,10 +573,10 @@ 
 
                 if ($edit_ok) {
                     $thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-                    $thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+                    $thread_buttons['edit']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
                     $thread_buttons['edit']['name']  = _EDIT;
                     $mod_buttons['edit']['image']    = newbbDisplayImage('p_edit', _EDIT);
-                    $mod_buttons['edit']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+                    $mod_buttons['edit']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
                     $mod_buttons['edit']['name']     = _EDIT;
                 }
             }
@@ -586,55 +586,55 @@ 
 
                 if ($delete_ok) {
                     $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-                    $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+                    $thread_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
                     $thread_buttons['delete']['name']  = _DELETE;
                     $mod_buttons['delete']['image']    = newbbDisplayImage('p_delete', _DELETE);
-                    $mod_buttons['delete']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+                    $mod_buttons['delete']['link']     = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
                     $mod_buttons['delete']['name']     = _DELETE;
                 }
             }
             if ($topicHandler->getPermission($forum_id, $topic_status, 'reply')) {
                 $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-                $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+                $thread_buttons['reply']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}";
                 $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?{$page_query}&amp;quotedac=1";
+                $thread_buttons['quote']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}&amp;quotedac=1";
                 $thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
             }
         } else {
             $mod_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-            $mod_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+            $mod_buttons['edit']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/edit.php?{$page_query}";
             $mod_buttons['edit']['name']  = _EDIT;
 
             $mod_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-            $mod_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+            $mod_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/delete.php?{$page_query}";
             $mod_buttons['delete']['name']  = _DELETE;
 
             $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-            $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+            $thread_buttons['reply']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/reply.php?{$page_query}";
             $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?{$page_query}";
+            $thread_buttons['report']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/report.php?{$page_query}";
             $thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
         }
 
         $thread_action = [];
         // irmtfan add pdf permission
-        if (file_exists(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
+        if (file_exists(XOOPS_ROOT_PATH.'/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
             && $topicHandler->getPermission($forum_id, $topic_status, 'pdf')) {
             $thread_action['pdf']['image']  = newbbDisplayImage('pdf', _MD_NEWBB_PDF);
-            $thread_action['pdf']['link']   = XOOPS_URL . '/modules/newbb/makepdf.php?type=post&amp;pageid=0';
+            $thread_action['pdf']['link']   = XOOPS_URL.'/modules/newbb/makepdf.php?type=post&amp;pageid=0';
             $thread_action['pdf']['name']   = _MD_NEWBB_PDF;
             $thread_action['pdf']['target'] = '_blank';
         }
         // irmtfan add print permission
         if ($topicHandler->getPermission($forum_id, $topic_status, 'print')) {
             $thread_action['print']['image']  = newbbDisplayImage('printer', _MD_NEWBB_PRINT);
-            $thread_action['print']['link']   = XOOPS_URL . '/modules/newbb/print.php?form=2&amp;forum=' . $forum_id . '&amp;topic_id=' . $topic_id;
+            $thread_action['print']['link']   = XOOPS_URL.'/modules/newbb/print.php?form=2&amp;forum='.$forum_id.'&amp;topic_id='.$topic_id;
             $thread_action['print']['name']   = _MD_NEWBB_PRINT;
             $thread_action['print']['target'] = '_blank';
         }
@@ -642,45 +642,45 @@ 
         if ($GLOBALS['xoopsModuleConfig']['show_sociallinks']) {
             $full_title  = $this->getVar('subject');
             $clean_title = preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
-            $full_link   = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+            $full_link   = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post_id;
 
             $thread_action['social_twitter']['image']  = newbbDisplayImage('twitter', _MD_NEWBB_SHARE_TWITTER);
-            $thread_action['social_twitter']['link']   = 'http://twitter.com/share?text=' . $clean_title . '&amp;url=' . $full_link;
+            $thread_action['social_twitter']['link']   = 'http://twitter.com/share?text='.$clean_title.'&amp;url='.$full_link;
             $thread_action['social_twitter']['name']   = _MD_NEWBB_SHARE_TWITTER;
             $thread_action['social_twitter']['target'] = '_blank';
 
             $thread_action['social_facebook']['image']  = newbbDisplayImage('facebook', _MD_NEWBB_SHARE_FACEBOOK);
-            $thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u=' . $full_link;
+            $thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u='.$full_link;
             $thread_action['social_facebook']['name']   = _MD_NEWBB_SHARE_FACEBOOK;
             $thread_action['social_facebook']['target'] = '_blank';
 
             $thread_action['social_gplus']['image']  = newbbDisplayImage('googleplus', _MD_NEWBB_SHARE_GOOGLEPLUS);
-            $thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url=' . $full_link;
+            $thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url='.$full_link;
             $thread_action['social_gplus']['name']   = _MD_NEWBB_SHARE_GOOGLEPLUS;
             $thread_action['social_gplus']['target'] = '_blank';
 
             $thread_action['social_linkedin']['image']  = newbbDisplayImage('linkedin', _MD_NEWBB_SHARE_LINKEDIN);
-            $thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_linkedin']['name']   = _MD_NEWBB_SHARE_LINKEDIN;
             $thread_action['social_linkedin']['target'] = '_blank';
 
             $thread_action['social_delicious']['image']  = newbbDisplayImage('delicious', _MD_NEWBB_SHARE_DELICIOUS);
-            $thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_delicious']['name']   = _MD_NEWBB_SHARE_DELICIOUS;
             $thread_action['social_delicious']['target'] = '_blank';
 
             $thread_action['social_digg']['image']  = newbbDisplayImage('digg', _MD_NEWBB_SHARE_DIGG);
-            $thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_digg']['name']   = _MD_NEWBB_SHARE_DIGG;
             $thread_action['social_digg']['target'] = '_blank';
 
             $thread_action['social_reddit']['image']  = newbbDisplayImage('reddit', _MD_NEWBB_SHARE_REDDIT);
-            $thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title=' . $full_title . '&amp;url=' . $full_link;
+            $thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title='.$full_title.'&amp;url='.$full_link;
             $thread_action['social_reddit']['name']   = _MD_NEWBB_SHARE_REDDIT;
             $thread_action['social_reddit']['target'] = '_blank';
 
             $thread_action['social_wong']['image']  = newbbDisplayImage('wong', _MD_NEWBB_SHARE_MRWONG);
-            $thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url=' . $full_link;
+            $thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url='.$full_link;
             $thread_action['social_wong']['name']   = _MD_NEWBB_SHARE_MRWONG;
             $thread_action['social_wong']['target'] = '_blank';
         }
@@ -704,7 +704,7 @@ 
             'thread_buttons'  => $thread_buttons,
             'mod_buttons'     => $mod_buttons,
             'poster'          => $poster,
-            'post_permalink'  => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '"></a>'
+            'post_permalink'  => '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?post_id='.$post_id.'"></a>'
         ];
 
         unset($thread_buttons, $mod_buttons, $eachposter);

class/ReadHandler.php

Spacing +19 added lines, -19 removed lines

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

class/StatsHandler.php

Indentation +80 added lines, -80 removed lines

@@ -79,50 +79,50 @@ 
         }
 
         $sql    = "    UPDATE {$this->table}"
-                  . '    SET stats_value = CASE '
-                  . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
-                  . "                    ELSE '{$increment}' "
-                  . '                END, '
-                  . '        time_update = NOW()'
-                  . '    WHERE '
-                  . "        (stats_id = '0' OR stats_id = '{$id}') "
-                  . "        AND stats_type='{$type}' ";
+                    . '    SET stats_value = CASE '
+                    . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
+                    . "                    ELSE '{$increment}' "
+                    . '                END, '
+                    . '        time_update = NOW()'
+                    . '    WHERE '
+                    . "        (stats_id = '0' OR stats_id = '{$id}') "
+                    . "        AND stats_type='{$type}' ";
         $result = $this->db->queryF($sql);
         $rows   = $this->db->getAffectedRows();
         if (0 == $rows) {
             $sql    = "    INSERT INTO {$this->table}"
-                      . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                      . '    VALUES '
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('total', $this->param['period'], true)
-                      . "', NOW(), ''), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('day', $this->param['period'], true)
-                      . "', NOW(), '%Y%j'), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('week', $this->param['period'], true)
-                      . "', NOW(), '%Y%u'), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('month', $this->param['period'], true)
-                      . "', NOW(), '%Y%m')";
+                        . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+                        . '    VALUES '
+                        . "        ('0', '{$increment}', '{$type}', '"
+                        . array_search('total', $this->param['period'], true)
+                        . "', NOW(), ''), "
+                        . "        ('0', '{$increment}', '{$type}', '"
+                        . array_search('day', $this->param['period'], true)
+                        . "', NOW(), '%Y%j'), "
+                        . "        ('0', '{$increment}', '{$type}', '"
+                        . array_search('week', $this->param['period'], true)
+                        . "', NOW(), '%Y%u'), "
+                        . "        ('0', '{$increment}', '{$type}', '"
+                        . array_search('month', $this->param['period'], true)
+                        . "', NOW(), '%Y%m')";
             $result = $this->db->queryF($sql);
         }
         if ($rows < 2 * count($this->param['period']) && !empty($id)) {
             $sql    = "    INSERT INTO {$this->table}"
-                      . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                      . '    VALUES '
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('total', $this->param['period'], true)
-                      . "', NOW(), ''), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('day', $this->param['period'], true)
-                      . "', NOW(), '%Y%j'), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('week', $this->param['period'], true)
-                      . "', NOW(), '%Y%u'), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('month', $this->param['period'], true)
-                      . "', NOW(), '%Y%m')";
+                        . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+                        . '    VALUES '
+                        . "        ('{$id}', '{$increment}', '{$type}', '"
+                        . array_search('total', $this->param['period'], true)
+                        . "', NOW(), ''), "
+                        . "        ('{$id}', '{$increment}', '{$type}', '"
+                        . array_search('day', $this->param['period'], true)
+                        . "', NOW(), '%Y%j'), "
+                        . "        ('{$id}', '{$increment}', '{$type}', '"
+                        . array_search('week', $this->param['period'], true)
+                        . "', NOW(), '%Y%u'), "
+                        . "        ('{$id}', '{$increment}', '{$type}', '"
+                        . array_search('month', $this->param['period'], true)
+                        . "', NOW(), '%Y%m')";
             $result = $this->db->queryF($sql);
         }
     }
@@ -148,17 +148,17 @@ 
             $_periods[] = array_search($period, $this->param['period']);
         }
         $sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
-                  . "    FROM {$this->table} "
-                  . '    WHERE '
-                  . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
-                  . '        '
-                  . (empty($ids) ? '' : 'AND stats_id IN ('
+                    . "    FROM {$this->table} "
+                    . '    WHERE '
+                    . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
+                    . '        '
+                    . (empty($ids) ? '' : 'AND stats_id IN ('
                                         . implode(', ', array_map('intval', $ids))
                                         . ')')
-                  . '        '
-                  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
-                  . '        '
-                  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
+                    . '        '
+                    . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
+                    . '        '
+                    . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
         $result = $this->db->query($sql);
 
         while (false !== ($row = $this->db->fetchArray($result))) {
@@ -204,21 +204,21 @@ 
                 list($topics, $views) = $this->db->fetchRow($result);
                 $views = empty($views) ? 0 : $views; // null check
                 $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$topics}', '"
-                                  . array_search('topic', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
+                                    . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+                                    . '    VALUES '
+                                    . "        ('{$forum_id}', '{$topics}', '"
+                                    . array_search('topic', $this->param['type'], true)
+                                    . "', '"
+                                    . array_search($period, $this->param['period'])
+                                    . "', NOW(), '{$format}')");
                 $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$views}', '"
-                                  . array_search('view', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
+                                    . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+                                    . '    VALUES '
+                                    . "        ('{$forum_id}', '{$views}', '"
+                                    . array_search('view', $this->param['type'], true)
+                                    . "', '"
+                                    . array_search($period, $this->param['period'])
+                                    . "', NOW(), '{$format}')");
                 @$counts['topic'][$period] += $topics;
                 @$counts['view'][$period] += $views;
 
@@ -226,26 +226,26 @@ 
                 $result = $this->db->query($sql);
                 list($digests) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$digests}', '"
-                                  . array_search('digest', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
+                                    . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+                                    . '    VALUES '
+                                    . "        ('{$forum_id}', '{$digests}', '"
+                                    . array_search('digest', $this->param['type'], true)
+                                    . "', '"
+                                    . array_search($period, $this->param['period'])
+                                    . "', NOW(), '{$format}')");
                 @$counts['digest'][$period] += $digests;
 
                 $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($posts) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$posts}', '"
-                                  . array_search('post', $this->param['type'])
-                                  . "', '"
-                                  . array_search($period, $this->param['period'], true)
-                                  . "', NOW(), '{$format}')");
+                                    . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+                                    . '    VALUES '
+                                    . "        ('{$forum_id}', '{$posts}', '"
+                                    . array_search('post', $this->param['type'])
+                                    . "', '"
+                                    . array_search($period, $this->param['period'], true)
+                                    . "', NOW(), '{$format}')");
                 @$counts['post'][$period] += $posts;
             }
         }
@@ -254,13 +254,13 @@ 
         foreach ($time_start as $period => $format) {
             foreach (array_keys($counts) as $type) {
                 $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('0', '{$counts[$type][$period]}', '"
-                                  . array_search($type, $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'], true)
-                                  . "', NOW(), '{$format}')");
+                                    . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+                                    . '    VALUES '
+                                    . "        ('0', '{$counts[$type][$period]}', '"
+                                    . array_search($type, $this->param['type'], true)
+                                    . "', '"
+                                    . array_search($period, $this->param['period'], true)
+                                    . "', NOW(), '{$format}')");
             }
         }
     }

Spacing +16 added lines, -16 removed lines

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

class/Topic.php

Spacing +4 added lines, -4 removed lines

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

class/User.php

Indentation +6 added lines, -6 removed lines

@@ -188,12 +188,12 @@
             }
             // irmtfan hardcore removed align="left"
             $table = "<table class='userlevel'><tr><td class='end'><img src='"
-                     . $rpg_images['img_left']
-                     . "' alt='' /></td><td class='center' background='"
-                     . $rpg_images['img_backing']
-                     . "'><img src='%s' width='%d' alt='' class='icon_left' /></td><td><img src='"
-                     . $rpg_images['img_right']
-                     . "' alt='' /></td></tr></table>";
+                        . $rpg_images['img_left']
+                        . "' alt='' /></td><td class='center' background='"
+                        . $rpg_images['img_backing']
+                        . "'><img src='%s' width='%d' alt='' class='icon_left' /></td><td><img src='"
+                        . $rpg_images['img_right']
+                        . "' alt='' /></td></tr></table>";
 
             $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '<br><span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>' . sprintf($table, $rpg_images['orange'], $level['hp_width']);
             $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span><br>' . sprintf($table, $rpg_images['green'], $level['mp_width']);

Spacing +20 added lines, -20 removed lines

@@ -81,13 +81,13 @@ 
     $level              = [];
     $level['level']     = $showlevel;
     $level['exp']       = $ep;
-    $level['exp_width'] = $ep . '%';
+    $level['exp_width'] = $ep.'%';
     $level['hp']        = $hp;
     $level['hp_max']    = $maxhp;
-    $level['hp_width']  = $hpf . '%';
+    $level['hp_width']  = $hpf.'%';
     $level['mp']        = $mp;
     $level['mp_max']    = $maxmp;
-    $level['mp_width']  = $mpf . '%';
+    $level['mp_width']  = $mpf.'%';
 
     return $level;
 }
@@ -117,49 +117,49 @@ 
 
         $user               = $this->user;
         $userbar['profile'] = [
-            'link' => XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid'),
+            'link' => XOOPS_URL.'/userinfo.php?uid='.$user->getVar('uid'),
             'name' => _PROFILE
         ];
 
         if (is_object($GLOBALS['xoopsUser'])) {
             $userbar['pm'] = [
-                'link' => "javascript:void openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $user->getVar('uid') . "', 'pmlite', 450, 380);",
+                'link' => "javascript:void openWithSelfMain('".XOOPS_URL.'/pmlite.php?send2=1&to_userid='.$user->getVar('uid')."', 'pmlite', 450, 380);",
                 'name' => _MD_NEWBB_PM
             ];
         }
         if ($user->getVar('user_viewemail') || $isAdmin) {
             $userbar['email'] = [
-                'link' => "javascript:void window.open('mailto:" . $user->getVar('email') . "', 'new');",
+                'link' => "javascript:void window.open('mailto:".$user->getVar('email')."', 'new');",
                 'name' => _MD_NEWBB_EMAIL
             ];
         }
         if ($url = $user->getVar('url')) {
             $userbar['url'] = [
-                'link' => "javascript:void window.open('" . $url . "', 'new');",
+                'link' => "javascript:void window.open('".$url."', 'new');",
                 'name' => _MD_NEWBB_WWW
             ];
         }
         if ($icq = $user->getVar('user_icq')) {
             $userbar['icq'] = [
-                'link' => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=" . $icq . "', 'new');",
+                'link' => "javascript:void window.open('http://wwp.icq.com/scripts/search.dll?to=".$icq."', 'new');",
                 'name' => _MD_NEWBB_ICQ
             ];
         }
         if ($aim = $user->getVar('user_aim')) {
             $userbar['aim'] = [
-                'link' => "javascript:void window.open('aim:goim?screenname=" . $aim . '&message=Hi+' . $aim . '+Are+you+there?' . "', 'new');",
+                'link' => "javascript:void window.open('aim:goim?screenname=".$aim.'&message=Hi+'.$aim.'+Are+you+there?'."', 'new');",
                 'name' => _MD_NEWBB_AIM
             ];
         }
         if ($yim = $user->getVar('user_yim')) {
             $userbar['yim'] = [
-                'link' => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=" . $yim . '&.src=pg' . "', 'new');",
+                'link' => "javascript:void window.open('http://edit.yahoo.com/config/send_webmesg?.target=".$yim.'&.src=pg'."', 'new');",
                 'name' => _MD_NEWBB_YIM
             ];
         }
         if ($msn = $user->getVar('user_msnm')) {
             $userbar['msnm'] = [
-                'link' => "javascript:void window.open('http://members.msn.com?mem=" . $msn . "', 'new');",
+                'link' => "javascript:void window.open('http://members.msn.com?mem=".$msn."', 'new');",
                 'name' => _MD_NEWBB_MSNM
             ];
         }
@@ -183,7 +183,7 @@ 
                 $rpg_path    = $iconHandler->getPath('rpg');
                 foreach (['img_left', 'img_backing', 'img_right', 'blue', 'green', 'orange'] as $img) {
                     // irmtfan fix: double "/" removed
-                    $rpg_images[$img] = XOOPS_URL . $rpg_path . '/' . $img . '.gif';
+                    $rpg_images[$img] = XOOPS_URL.$rpg_path.'/'.$img.'.gif';
                 }
             }
             // irmtfan hardcore removed align="left"
@@ -195,13 +195,13 @@ 
                      . $rpg_images['img_right']
                      . "' alt='' /></td></tr></table>";
 
-            $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '<br><span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>' . sprintf($table, $rpg_images['orange'], $level['hp_width']);
-            $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span><br>' . sprintf($table, $rpg_images['green'], $level['mp_width']);
-            $info .= '<span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>' . sprintf($table, $rpg_images['blue'], $level['exp_width']);
+            $info = _MD_NEWBB_LEVEL.' '.$level['level'].'<br><span title="'._MD_NEWBB_HP_DESC.'">'._MD_NEWBB_HP.' '.$level['hp'].' / '.$level['hp_max'].'</span><br>'.sprintf($table, $rpg_images['orange'], $level['hp_width']);
+            $info .= '<span title="'._MD_NEWBB_MP_DESC.'">'._MD_NEWBB_MP.' '.$level['mp'].' / '.$level['mp_max'].'</span><br>'.sprintf($table, $rpg_images['green'], $level['mp_width']);
+            $info .= '<span title="'._MD_NEWBB_EXP_DESC.'">'._MD_NEWBB_EXP.' '.$level['exp'].'</span><br>'.sprintf($table, $rpg_images['blue'], $level['exp_width']);
         } else {
-            $info = _MD_NEWBB_LEVEL . ' ' . $level['level'] . '; <span title="' . _MD_NEWBB_EXP_DESC . '">' . _MD_NEWBB_EXP . ' ' . $level['exp'] . '</span><br>';
-            $info .= '<span title="' . _MD_NEWBB_HP_DESC . '">' . _MD_NEWBB_HP . ' ' . $level['hp'] . ' / ' . $level['hp_max'] . '</span><br>';
-            $info .= '<span title="' . _MD_NEWBB_MP_DESC . '">' . _MD_NEWBB_MP . ' ' . $level['mp'] . ' / ' . $level['mp_max'] . '</span>';
+            $info = _MD_NEWBB_LEVEL.' '.$level['level'].'; <span title="'._MD_NEWBB_EXP_DESC.'">'._MD_NEWBB_EXP.' '.$level['exp'].'</span><br>';
+            $info .= '<span title="'._MD_NEWBB_HP_DESC.'">'._MD_NEWBB_HP.' '.$level['hp'].' / '.$level['hp_max'].'</span><br>';
+            $info .= '<span title="'._MD_NEWBB_MP_DESC.'">'._MD_NEWBB_MP.' '.$level['mp'].' / '.$level['mp_max'].'</span>';
         }
 
         return $info;
@@ -231,7 +231,7 @@ 
         $name             = empty($GLOBALS['xoopsModuleConfig']['show_realname']) ? $user->getVar('uname') : $user->getVar('name');
         $userinfo['name'] = $name ?: $user->getVar('uname');
 
-        $userinfo['link'] = '<a href=\'' . XOOPS_URL . '/userinfo.php?uid=' . $user->getVar('uid') . '\'>' . $userinfo['name'] . '</a>';
+        $userinfo['link'] = '<a href=\''.XOOPS_URL.'/userinfo.php?uid='.$user->getVar('uid').'\'>'.$userinfo['name'].'</a>';
 
         $userinfo['avatar'] = $user->getVar('user_avatar');
         // START hacked by irmtfan - easier rank getting - consistency with previous version back rank.title and rank.image
@@ -254,7 +254,7 @@ 
         // END hacked by irmtfan - easier groups getting - can we use $_SESSION['xoopsUserGroups']???
         $userinfo['from'] = $user->getVar('user_from');
 
-        include_once __DIR__ . '/../include/functions.time.php';
+        include_once __DIR__.'/../include/functions.time.php';
         $userinfo['regdate']    = newbbFormatTimestamp($user->getVar('user_regdate'), 'reg');
         $userinfo['last_login'] = newbbFormatTimestamp($user->getVar('last_login')); // irmtfan add last_login
 

class/Xmlrss.php

Spacing +2 added lines, -2 removed lines

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

class/ForumHandler.php

Indentation +1 added lines, -1 removed lines

@@ -294,7 +294,7 @@
         /** @var Newbb\TypeHandler $typeHandler */
         $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
         $typen       = $typeHandler->getByForum($forum->getVar('forum_id'));
-       while (false !== ($myrow = $this->db->fetchArray($result))) {
+        while (false !== ($myrow = $this->db->fetchArray($result))) {
             if ($myrow['topic_sticky']) {
                 ++$sticky;
             }

Spacing +56 added lines, -56 removed lines

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