mambax7 / newbb5

newtopic.php

Spacing +7 added lines, -7 removed lines

@@ -11,17 +11,17 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!$forum = Request::getString('forum', '', 'GET')) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _NOPERM);
+    redirect_header(XOOPS_URL.'/index.php', 2, _NOPERM);
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
@@ -36,12 +36,12 @@ 
     $query_array = [];
     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)), ENT_QUOTES | ENT_HTML5);
     unset($query_array);
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOPOST);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOPOST);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
@@ -70,7 +70,7 @@ 
 $attachsig     = (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->getVar('attachsig')) ? 1 : 0;
 $post_id       = 0;
 $topic_id      = 0;
-include __DIR__ . '/include/form.post.php';
+include __DIR__.'/include/form.post.php';
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

viewtopic.php

Spacing +65 added lines, -65 removed lines

@@ -34,10 +34,10 @@ 
 use XoopsModules\Newbb;
 use XoopsModules\Xoopspoll;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $xoopsLogger->startTime('newBB_viewtopic');
-require_once __DIR__ . '/include/functions.read.php';
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.read.php';
+require_once __DIR__.'/include/functions.render.php';
 xoops_loadLanguage('user');
 
 /*Build the page query*/
@@ -45,7 +45,7 @@ 
 $query_array = [];
 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)), ENT_QUOTES | ENT_HTML5);
@@ -73,7 +73,7 @@ 
 }
 
 if (!$topic_id && !$post_id) {
-    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
+    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/'.$xoopsModule->getVar('dirname').'/index.php' : XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/viewforum.php?forum={$forum_id}";
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
@@ -90,7 +90,7 @@ 
 }
 
 if (!is_object($topicObject) || !$topic_id = $topicObject->getVar('topic_id')) {
-    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
+    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/'.$xoopsModule->getVar('dirname').'/index.php' : XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/viewforum.php?forum={$forum_id}";
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 $forum_id = $topicObject->getVar('forum_id');
@@ -102,7 +102,7 @@ 
 
 if ((!$isAdmin && $topicObject->getVar('approved') < 0) || (!$forumHandler->getPermission($forumObject))
     || (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view'))) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?forum='.$forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
 }
 
 // START irmtfan - find if topic is read or unread - for all users (member and anon)
@@ -128,7 +128,7 @@ 
         // hack jump to last post read if post_id is empty - is there any better way?
         if (empty($post_id) && $topic_is_unread
             && !empty($GLOBALS['xoopsModuleConfig']['jump_to_topic_last_post_read_enabled'])) {
-            header('Location: ' . Request::getString('REQUEST_URI', '', 'SERVER') . '&post_id=' . $topic_last_post_time_or_id_read);
+            header('Location: '.Request::getString('REQUEST_URI', '', 'SERVER').'&post_id='.$topic_last_post_time_or_id_read);
         }
     }
 }
@@ -167,7 +167,7 @@ 
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forumObject->getVar('forum_id') . '" />
+    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name').'-'.$forumObject->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forumObject->getVar('forum_id').'" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 
@@ -195,11 +195,11 @@ 
         'collapse' => $iconHandler->getImageSource('more')
     ];
     if (1 == $infobox['show']) {
-        $infobox['style'] = 'none';        //irmtfan move semicolon
+        $infobox['style'] = 'none'; //irmtfan move semicolon
         $infobox['alt']   = _MD_NEWBB_SEEUSERDATA;
         $infobox['src']   = 'more';
     } else {
-        $infobox['style'] = 'block';        //irmtfan move semicolon
+        $infobox['style'] = 'block'; //irmtfan move semicolon
         $infobox['alt']   = _MD_NEWBB_HIDEUSERDATA;
         $infobox['src']   = 'less';
     }
@@ -209,7 +209,7 @@ 
 // END irmtfan improve infobox
 
 $xoopsTpl->assign([
-                      'topic_title'    => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?topic_id=' . $topic_id . '">' . $topicObject->getFullTitle() . '</a>',
+                      'topic_title'    => '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?topic_id='.$topic_id.'">'.$topicObject->getFullTitle().'</a>',
                       'forum_name'     => $forumObject->getVar('forum_name'),
                       'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC,
                       'lang_prevtopic' => _MD_NEWBB_PREVTOPIC,
@@ -231,20 +231,20 @@ 
 $t_reply = newbbDisplayImage('t_reply', _MD_NEWBB_REPLY);
 // irmtfan show topic status if show reg is 0 and revise forum_post_or_register
 if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'post')) {
-    $xoopsTpl->assign('forum_post', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/newtopic.php?forum=' . $forum_id . '"> ' . $t_new . '</a>');
+    $xoopsTpl->assign('forum_post', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/newtopic.php?forum='.$forum_id.'"> '.$t_new.'</a>');
 } else {
     if ($topicObject->getVar('topic_status')) {
         $xoopsTpl->assign('topic_lock', _MD_NEWBB_TOPICLOCKED);
     }
     if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
-        $xoopsTpl->assign('forum_register', '<a href="' . XOOPS_URL . '/user.php?xoops_redirect=' . htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5) . '">' . _MD_NEWBB_REGTOPOST . '</a>');
+        $xoopsTpl->assign('forum_register', '<a href="'.XOOPS_URL.'/user.php?xoops_redirect='.htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5).'">'._MD_NEWBB_REGTOPOST.'</a>');
     }
 }
 // irmtfan for backward compatibility assign forum_post_or_register smarty again.
-$xoopsTpl->assign('forum_post_or_register', @$xoopsTpl->get_template_vars('forum_post') . @$xoopsTpl->get_template_vars('forum_register') . @$xoopsTpl->get_template_vars('topic_lock'));
+$xoopsTpl->assign('forum_post_or_register', @$xoopsTpl->get_template_vars('forum_post').@$xoopsTpl->get_template_vars('forum_register').@$xoopsTpl->get_template_vars('topic_lock'));
 
 if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')) {
-    $xoopsTpl->assign('forum_reply', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/reply.php?topic_id=' . $topic_id . '"> ' . $t_reply . '</a>');
+    $xoopsTpl->assign('forum_reply', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/reply.php?topic_id='.$topic_id.'"> '.$t_reply.'</a>');
 }
 
 $poster_array  = [];
@@ -265,7 +265,7 @@ 
     /** @var \XoopsMemberHandler $memberHandler */
     $memberHandler = xoops_getHandler('member');
     $userid_array  = array_keys($poster_array);
-    $user_criteria = '(' . implode(',', $userid_array) . ')';
+    $user_criteria = '('.implode(',', $userid_array).')';
     $users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
 } else {
     $users = [];
@@ -283,10 +283,10 @@ 
 
 if ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $require_reply) {
     if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) {
-        $viewtopic_posters = newbbGetSession('t' . $topic_id, true);
+        $viewtopic_posters = newbbGetSession('t'.$topic_id, true);
         if (!is_array($viewtopic_posters) || 0 === count($viewtopic_posters)) {
             $viewtopic_posters = $topicHandler->getAllPosters($topicObject);
-            newbbSetSession('t' . $topic_id, $viewtopic_posters);
+            newbbSetSession('t'.$topic_id, $viewtopic_posters);
         }
     } else {
         $viewtopic_posters = $topicHandler->getAllPosters($topicObject);
@@ -302,7 +302,7 @@ 
         'post_date'       => 0,
         'post_image'      => '',
         'post_title'      => '',
-        'post_text'       => '<div style="text-align: center;vertical-align: middle;"><br>' . xoops_getbanner() . '</div>',
+        'post_text'       => '<div style="text-align: center;vertical-align: middle;"><br>'.xoops_getbanner().'</div>',
         'post_attachment' => '',
         'post_edit'       => 0,
         'post_no'         => 0,
@@ -339,7 +339,7 @@ 
 if ($total_posts > $GLOBALS['xoopsModuleConfig']['posts_per_page']) {
     include $GLOBALS['xoops']->path('class/pagenav.php');
 
-    $nav = new \XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id=' . $topic_id . '&amp;order=' . $order . '&amp;status=' . $status . '&amp;mode=' . $mode);
+    $nav = new \XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id='.$topic_id.'&amp;order='.$order.'&amp;status='.$status.'&amp;mode='.$mode);
     //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite']) && $GLOBALS['xoopsModuleConfig']['do_rewrite'] === 1) $nav->url = XOOPS_URL . $nav->url;
     if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
         $navi = $nav->renderSelect();
@@ -359,7 +359,7 @@ 
 }
 
 if (!empty($postsArray[$post_id])) {
-    $xoops_pagetitle = $postsArray[$post_id]->getVar('subject') . ' [' . $forumObject->getVar('forum_name') . ']';
+    $xoops_pagetitle = $postsArray[$post_id]->getVar('subject').' ['.$forumObject->getVar('forum_name').']';
     $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
     $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
     $kw                             = array_unique(explode(' ', strip_tags($postsArray[$post_id]->getVar('post_text')), 150));
@@ -368,7 +368,7 @@ 
     $z     = 0;
     foreach ($kw as $k) {
         if ($z < 30 && strlen(trim($k)) > 5) {
-            $kwort .= trim($k) . ' ';
+            $kwort .= trim($k).' ';
             ++$z;
         }
     }
@@ -395,56 +395,56 @@ 
 // START irmtfan add restore to viewtopic
 // if the topic is active
 if ($topicObject->getVar('approved') > 0) {
-    $admin_actions['merge']  = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=merge&amp;topic_id=' . $topic_id,
+    $admin_actions['merge'] = [
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=merge&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_MERGETOPIC,
         'image' => $ad_merge
     ];
-    $admin_actions['move']   = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=move&amp;topic_id=' . $topic_id,
+    $admin_actions['move'] = [
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=move&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_MOVETOPIC,
         'image' => $ad_move
     ];
     $admin_actions['delete'] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=delete&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=delete&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_DELETETOPIC,
         'image' => $ad_delete
     ];
     if (!$topicObject->getVar('topic_status')) {
         $admin_actions['lock'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=lock&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=lock&amp;topic_id='.$topic_id,
             'image' => $ad_lock,
             'name'  => _MD_NEWBB_LOCKTOPIC
         ];
     } else {
         $admin_actions['unlock'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unlock&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=unlock&amp;topic_id='.$topic_id,
             'image' => $ad_unlock,
             'name'  => _MD_NEWBB_UNLOCKTOPIC
         ];
     }
     if (!$topicObject->getVar('topic_sticky')) {
         $admin_actions['sticky'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=sticky&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=sticky&amp;topic_id='.$topic_id,
             'image' => $ad_sticky,
             'name'  => _MD_NEWBB_STICKYTOPIC
         ];
     } else {
         $admin_actions['unsticky'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unsticky&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=unsticky&amp;topic_id='.$topic_id,
             'image' => $ad_unsticky,
             'name'  => _MD_NEWBB_UNSTICKYTOPIC
         ];
     }
     if (!$topicObject->getVar('topic_digest')) {
         $admin_actions['digest'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=digest&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=digest&amp;topic_id='.$topic_id,
             'image' => $ad_digest,
             'name'  => _MD_NEWBB_DIGESTTOPIC
         ];
     } else {
         $admin_actions['undigest'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=undigest&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=undigest&amp;topic_id='.$topic_id,
             'image' => $ad_undigest,
             'name'  => _MD_NEWBB_UNDIGESTTOPIC
         ];
@@ -452,7 +452,7 @@ 
     // if the topic is pending/deleted then restore/approve
 } else {
     $admin_actions['restore'] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=restore&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=restore&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_RESTORETOPIC,
         'image' => $ad_restore
     ];
@@ -531,11 +531,11 @@ 
                                                  'is_visible'      => $isVisible,
                                                  'visible_message' => $visibleMsg,
                                                  'disp_votes'      => $xp_config['disp_vote_nums'],
-                                                 'lang_vote'       => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'),
-                                                 'lang_results'    => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'),
+                                                 'lang_vote'       => constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_VOTE'),
+                                                 'lang_results'    => constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_RESULTS'),
                                                  'back_link'       => ''
                                              ]);
-                $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Renderer';
+                $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Renderer';
                 /** @var Xoopspoll\Renderer $renderer */
                 $renderer = new $classRenderer($pollObject);
                 // check to see if user has voted, show form if not, otherwise get results for form
@@ -547,7 +547,7 @@ 
                     $myTpl = new \XoopsTpl();
                     $renderer->assignForm($myTpl);
                     $myTpl->assign('action', $GLOBALS['xoops']->url("modules/newbb/votepolls.php?topic_id={$topic_id}&amp;poll_id={$poll_id}"));
-                    $topic_pollform = $myTpl->fetch($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/templates/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '_view.tpl'));
+                    $topic_pollform = $myTpl->fetch($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/templates/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'_view.tpl'));
                     $GLOBALS['xoopsTpl']->assign('topic_pollform', $topic_pollform);
                 } else {
                     $GLOBALS['xoopsTpl']->assign('can_vote', false);
@@ -558,7 +558,7 @@ 
             // old xoopspoll or umfrage or any clone from them
         } else {
             $pollObject    = new $classPoll($poll_id);
-            $classRenderer = $classPoll . 'Renderer';
+            $classRenderer = $classPoll.'Renderer';
             $renderer      = new $classRenderer($pollObject);
             $xoopsTpl->assign('lang_alreadyvoted2', _PL_ALREADYVOTED2);
             $xoopsTpl->assign('has_ended', $pollObject->getVar('end_time') < time() ? 1 : 0);
@@ -579,7 +579,7 @@ 
 
                 }
             }
-            $classLog = $classPoll . 'Log';
+            $classLog = $classPoll.'Log';
             $hasvoted = 0;
             if ($GLOBALS['xoopsUser']) {
                 if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $uid)) {
@@ -595,12 +595,12 @@ 
             if ($hasvoted || $pollObject->hasExpired()) {
                 $renderer->assignResults($xoopsTpl);
                 $xoopsTpl->assign('topic_pollresult', 1);
-                setcookie('newbb_polls[' . $poll_id . ']', 1);
+                setcookie('newbb_polls['.$poll_id.']', 1);
             } else {
                 $renderer->assignForm($xoopsTpl);
                 $xoopsTpl->assign('lang_vote', _PL_VOTE);
                 $xoopsTpl->assign('lang_results', _PL_RESULTS);
-                setcookie('newbb_polls[' . $poll_id . ']', 1);
+                setcookie('newbb_polls['.$poll_id.']', 1);
             }
         }
     }
@@ -611,7 +611,7 @@ 
             if (is_object($GLOBALS['xoopsUser'])
                 && $GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster')) {
                 $t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
-                $xoopsTpl->assign('forum_addpoll', '<a href=\'' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=add&amp;topic_id=' . $topic_id . '\'>' . $t_poll . '</a>');
+                $xoopsTpl->assign('forum_addpoll', '<a href=\''.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=add&amp;topic_id='.$topic_id.'\'>'.$t_poll.'</a>');
             }
         } elseif ($isAdmin
                   || (is_object($pollObject) && is_object($GLOBALS['xoopsUser'])
@@ -623,22 +623,22 @@ 
 
             $adminpoll_actions                = [];
             $adminpoll_actions['editpoll']    = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=edit&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=edit&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id,
                 'image' => $poll_edit,
                 'name'  => _MD_NEWBB_EDITPOLL
             ];
-            $adminpoll_actions['deletepoll']  = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=delete&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
+            $adminpoll_actions['deletepoll'] = [
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=delete&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id,
                 'image' => $poll_delete,
                 'name'  => _MD_NEWBB_DELETEPOLL
             ];
             $adminpoll_actions['restartpoll'] = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=restart&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=restart&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id.'&amp;forum='.$forum_id,
                 'image' => $poll_restart,
                 'name'  => _MD_NEWBB_RESTARTPOLL
             ];
-            $adminpoll_actions['logpoll']     = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=log&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
+            $adminpoll_actions['logpoll'] = [
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=log&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id.'&amp;forum='.$forum_id,
                 'image' => $poll_log,
                 'name'  => _MD_NEWBB_POLL_VIEWLOG
             ];
@@ -670,7 +670,7 @@ 
         $rating_img = newbbDisplayImage('blank');
     } else {
         // irmtfan - add alt key for rating
-        $rating_img = newbbDisplayImage('rate' . $rating, constant('_MD_NEWBB_RATE' . $rating));
+        $rating_img = newbbDisplayImage('rate'.$rating, constant('_MD_NEWBB_RATE'.$rating));
     }
     $xoopsTpl->assign('rating_img', $rating_img);
     $xoopsTpl->assign('rate1', newbbDisplayImage('rate1', _MD_NEWBB_RATE1));
@@ -682,7 +682,7 @@ 
 
 // create jump box
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
+    require_once __DIR__.'/include/functions.forum.php';
     $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
@@ -703,25 +703,25 @@ 
 $viewmode_options = [];
 if ('DESC' === $order) {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=ASC&amp;status=$status&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?order=ASC&amp;status=$status&amp;topic_id='.$topic_id,
         'title' => _OLDESTFIRST
     ];
 } else {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=DESC&amp;status=$status&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?order=DESC&amp;status=$status&amp;topic_id='.$topic_id,
         'title' => _NEWESTFIRST
     ];
 }
 
 switch ($status) {
     case 'active':
-        $current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
+        $current_status = '['._MD_NEWBB_TYPE_ADMIN.']';
         break;
     case 'pending':
-        $current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
+        $current_status = '['._MD_NEWBB_TYPE_PENDING.']';
         break;
     case 'deleted':
-        $current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
+        $current_status = '['._MD_NEWBB_TYPE_DELETED.']';
         break;
     default:
         $current_status = '';
@@ -744,7 +744,7 @@ 
     && $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')
     && $moderateHandler->verifyUser(-1, '', $forumObject->getVar('forum_id'))) {
     // END irmtfan add verifyUser to quick reply
-    $forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/post.php', 'post', true);
+    $forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/post.php', 'post', true);
     if (!is_object($GLOBALS['xoopsUser'])) {
         //$configHandler = xoops_getHandler('config');
         $user_tray = new \XoopsFormElementTray(_MD_NEWBB_ACCOUNT);
@@ -779,7 +779,7 @@ 
 
     $forum_form->addElement(new \XoopsFormHidden('isreply', 1));
 
-    $forum_form->addElement(new \XoopsFormHidden('subject', _MD_NEWBB_RE . ': ' . $topicObject->getVar('topic_title', 'e')));
+    $forum_form->addElement(new \XoopsFormHidden('subject', _MD_NEWBB_RE.': '.$topicObject->getVar('topic_title', 'e')));
     $forum_form->addElement(new \XoopsFormHidden('pid', empty($post_id) ? $topicHandler->getTopPostId($topic_id) : $post_id));
     $forum_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
     $forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
@@ -791,7 +791,7 @@ 
     $forum_form->addElement(new \XoopsFormHidden('contents_submit', 1));
 
     $submit_button = new \XoopsFormButton('', 'quick_submit', _SUBMIT, 'submit');
-    $submit_button->setExtra('onclick="if (document.forms.quick_reply.message.value === \'RE\' || document.forms.quick_reply.message.value === \'\') { alert(\'' . _MD_NEWBB_QUICKREPLY_EMPTY . '\'); return false;} else { return true;}"');
+    $submit_button->setExtra('onclick="if (document.forms.quick_reply.message.value === \'RE\' || document.forms.quick_reply.message.value === \'\') { alert(\''._MD_NEWBB_QUICKREPLY_EMPTY.'\'); return false;} else { return true;}"');
     $forum_form->addElement($submit_button);
 
     $toggles = newbbGetCookie('G', true);
@@ -806,13 +806,13 @@ 
     $quickreply['show']   = 1; // = !empty($GLOBALS['xoopsModuleConfig']['quickreply_enabled']
     $quickreply['expand'] = (count($toggles) > 0) ? (in_array('qr', $toggles, true) ? false : true) : true;
     if ($quickreply['expand']) {
-        $quickreply['style']     = 'block';        //irmtfan move semicolon
+        $quickreply['style']     = 'block'; //irmtfan move semicolon
         $quickreply_icon_display = $qr_expand;
-        $quickreply_alt          = _MD_NEWBB_HIDE . ' ' . _MD_NEWBB_QUICKREPLY;
+        $quickreply_alt          = _MD_NEWBB_HIDE.' '._MD_NEWBB_QUICKREPLY;
     } else {
-        $quickreply['style']     = 'none';        //irmtfan move semicolon
+        $quickreply['style']     = 'none'; //irmtfan move semicolon
         $quickreply_icon_display = $qr_collapse;
-        $quickreply_alt          = _MD_NEWBB_SEE . ' ' . _MD_NEWBB_QUICKREPLY;
+        $quickreply_alt          = _MD_NEWBB_SEE.' '._MD_NEWBB_QUICKREPLY;
     }
     $quickreply['displayImage'] = newbbDisplayImage($quickreply_icon_display, $quickreply_alt);
     $quickreply['form']         = $forum_form->render();
@@ -828,6 +828,6 @@ 
     $xoopsTpl->assign('tagbar', tagBar($topicObject->getVar('topic_tags', 'n')));
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');
 $xoopsLogger->stopTime('newBB_viewtopic');

class/GroupFormCheckBox.php

Indentation +14 added lines, -14 removed lines

@@ -59,20 +59,20 @@
                 $tree .= ' checked';
             }
             $tree .= ' />'
-                     . $option['name']
-                     . '<input type="hidden" name="'
-                     . $this->getName()
-                     . '[parents]['
-                     . $option['id']
-                     . ']" value="'
-                     . implode(':', $parentIds)
-                     . '" /><input type="hidden" name="'
-                     . $this->getName()
-                     . '[itemname]['
-                     . $option['id']
-                     . ']" value="'
-                     . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5)
-                     . "\" /><br>\n";
+                        . $option['name']
+                        . '<input type="hidden" name="'
+                        . $this->getName()
+                        . '[parents]['
+                        . $option['id']
+                        . ']" value="'
+                        . implode(':', $parentIds)
+                        . '" /><input type="hidden" name="'
+                        . $this->getName()
+                        . '[itemname]['
+                        . $option['id']
+                        . ']" value="'
+                        . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5)
+                        . "\" /><br>\n";
         } else {
             $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
         }

Spacing +7 added lines, -7 removed lines

@@ -42,17 +42,17 @@ 
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
     {
         if ($option['id'] > 0) {
-            $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+            $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
             foreach ($parentIds as $pid) {
                 if ($pid <= 0) {
                     continue;
                 }
-                $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-                $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
+                $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
+                $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked !== true) {ele.checked = this.checked;}";
             }
             foreach ($option['allchild'] as $cid) {
-                $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-                $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
+                $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
+                $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked !== true) {ele.checked = false;}";
             }
             $tree .= '" value="1"';
             if (in_array($option['id'], $this->_value)) {
@@ -74,7 +74,7 @@ 
                      . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5)
                      . "\" /><br>\n";
         } else {
-            $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
+            $tree .= $prefix.$option['name'].'<input type="hidden" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" /><br>\n";
         }
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
@@ -82,7 +82,7 @@ 
                     //                  array_push($parentIds, $option['id']);
                     $parentIds[] = $option['id'];
                 }
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
             }
         }
     }

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');
-            require_once dirname(__DIR__) . '/include/functions.image.php';
+            require_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();
-        require_once __DIR__ . '/../include/functions.user.php';
-        require_once __DIR__ . '/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.user.php';
+        require_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']);
         }
 
-        require_once __DIR__ . '/../include/functions.time.php';
-        require_once __DIR__ . '/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.time.php';
+        require_once __DIR__.'/../include/functions.render.php';
 
         $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)), ENT_QUOTES | ENT_HTML5);
@@ -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/TopicHandler.php

Spacing +18 added lines, -18 removed lines

@@ -88,9 +88,9 @@ 
     {
         $topic_id = $object->getVar('topic_id');
         if ($force) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . " SET approved = -1 WHERE topic_id = {$topic_id}";
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics')." SET approved = -1 WHERE topic_id = {$topic_id}";
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . " SET approved = 1 WHERE topic_id = {$topic_id}";
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics')." SET approved = 1 WHERE topic_id = {$topic_id}";
         }
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
@@ -130,7 +130,7 @@ 
     {
         $topic = null;
         if (!empty($action)) {
-            $sql = 'SELECT * FROM ' . $this->table . ' WHERE 1=1' . (($forum_id > 0) ? ' AND forum_id=' . (int)$forum_id : '') . ' AND topic_id ' . (($action > 0) ? '>' : '<') . (int)$topic_id . ' ORDER BY topic_id ' . (($action > 0) ? 'ASC' : 'DESC') . ' LIMIT 1';
+            $sql = 'SELECT * FROM '.$this->table.' WHERE 1=1'.(($forum_id > 0) ? ' AND forum_id='.(int)$forum_id : '').' AND topic_id '.(($action > 0) ? '>' : '<').(int)$topic_id.' ORDER BY topic_id '.(($action > 0) ? 'ASC' : 'DESC').' LIMIT 1';
             if ($result = $this->db->query($sql)) {
                 if ($row = $this->db->fetchArray($result)) {
                     $topic = $this->create(false);
@@ -152,7 +152,7 @@ 
     public function &getByPost($post_id)
     {
         $topic  = null;
-        $sql    = 'SELECT t.* FROM ' . $this->db->prefix('newbb_topics') . ' t, ' . $this->db->prefix('newbb_posts') . ' p
+        $sql    = 'SELECT t.* FROM '.$this->db->prefix('newbb_topics').' t, '.$this->db->prefix('newbb_posts').' p
                 WHERE t.topic_id = p.topic_id AND p.post_id = ' . (int)$post_id;
         $result = $this->db->query($sql);
         if (!$result) {
@@ -200,10 +200,10 @@ 
     public function &getTopPost($topic_id)
     {
         $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p,
-            ' . $this->db->prefix('newbb_posts_text') . ' t
+        $sql  = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p,
+            ' . $this->db->prefix('newbb_posts_text').' t
             WHERE
-            p.topic_id = ' . $topic_id . ' AND p.pid = 0
+            p.topic_id = ' . $topic_id.' AND p.pid = 0
             AND t.post_id = p.post_id';
 
         $result = $this->db->query($sql);
@@ -227,7 +227,7 @@ 
      */
     public function getTopPostId($topic_id)
     {
-        $sql    = 'SELECT MIN(post_id) AS post_id FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id = ' . $topic_id . ' AND pid = 0';
+        $sql    = 'SELECT MIN(post_id) AS post_id FROM '.$this->db->prefix('newbb_posts').' WHERE topic_id = '.$topic_id.' AND pid = 0';
         $result = $this->db->query($sql);
         if (!$result) {
             //xoops_error($this->db->error());
@@ -272,7 +272,7 @@ 
                 $operator_for_position = '<';
             }
             //$approveCriteria = ' AND approved = 1'; // any others?
-            $sql    = 'SELECT COUNT(*) FROM ' . $this->db->prefix('newbb_posts') . ' AS p WHERE p.topic_id=' . (int)$topic->getVar('topic_id') . $approveCriteria . " AND p.post_id $operator_for_position $post_id";
+            $sql    = 'SELECT COUNT(*) FROM '.$this->db->prefix('newbb_posts').' AS p WHERE p.topic_id='.(int)$topic->getVar('topic_id').$approveCriteria." AND p.post_id $operator_for_position $post_id";
             $result = $this->db->query($sql);
             if (!$result) {
                 //xoops_error($this->db->error());
@@ -282,7 +282,7 @@ 
             $start = (int)($position / $perpage) * $perpage;
         }
 
-        $sql    = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p, ' . $this->db->prefix('newbb_posts_text') . ' t WHERE p.topic_id=' . $topic->getVar('topic_id') . ' AND p.post_id = t.post_id' . $approveCriteria . " ORDER BY p.post_id $order";
+        $sql    = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p, '.$this->db->prefix('newbb_posts_text').' t WHERE p.topic_id='.$topic->getVar('topic_id').' AND p.post_id = t.post_id'.$approveCriteria." ORDER BY p.post_id $order";
         $result = $this->db->query($sql, $perpage, $start);
         if (!$result) {
             //xoops_error($this->db->error());
@@ -327,18 +327,18 @@ 
         $postArray['post_time'] = newbbFormatTimestamp($postArray['post_time']);
 
         if (!empty($postArray['icon'])) {
-            $postArray['icon'] = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($postArray['icon'], ENT_QUOTES | ENT_HTML5) . '" alt="" />';
+            $postArray['icon'] = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($postArray['icon'], ENT_QUOTES | ENT_HTML5).'" alt="" />';
         } else {
-            $postArray['icon'] = '<a name="' . $postArray['post_id'] . '"><img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" /></a>';
+            $postArray['icon'] = '<a name="'.$postArray['post_id'].'"><img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" /></a>';
         }
 
-        $postArray['subject'] = '<a href="viewtopic.php?viewmode=thread&amp;topic_id=' . $topic->getVar('topic_id') . '&amp;forum=' . $postArray['forum_id'] . '&amp;post_id=' . $postArray['post_id'] . '">' . $postArray['subject'] . '</a>';
+        $postArray['subject'] = '<a href="viewtopic.php?viewmode=thread&amp;topic_id='.$topic->getVar('topic_id').'&amp;forum='.$postArray['forum_id'].'&amp;post_id='.$postArray['post_id'].'">'.$postArray['subject'].'</a>';
 
         $isActiveUser = false;
         if (isset($viewtopic_users[$postArray['uid']]['name'])) {
             $postArray['poster'] = $viewtopic_users[$postArray['uid']]['name'];
             if ($postArray['uid'] > 0) {
-                $postArray['poster'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $postArray['uid'] . '">' . $viewtopic_users[$postArray['uid']]['name'] . '</a>';
+                $postArray['poster'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$postArray['uid'].'">'.$viewtopic_users[$postArray['uid']]['name'].'</a>';
             }
         } else {
             $postArray['poster'] = empty($postArray['poster_name']) ? $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']) : $postArray['poster_name'];
@@ -354,7 +354,7 @@ 
      */
     public function &getAllPosters(&$topic, $isApproved = true)
     {
-        $sql = 'SELECT DISTINCT uid FROM ' . $this->db->prefix('newbb_posts') . '  WHERE topic_id=' . $topic->getVar('topic_id') . ' AND uid>0';
+        $sql = 'SELECT DISTINCT uid FROM '.$this->db->prefix('newbb_posts').'  WHERE topic_id='.$topic->getVar('topic_id').' AND uid>0';
         if ($isApproved) {
             $sql .= ' AND approved = 1';
         }
@@ -408,7 +408,7 @@ 
     public function getPermission($forum, $topic_locked = 0, $type = 'view')
     {
         static $_cachedTopicPerms;
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.user.php';
         if (newbbIsAdmin($forum)) {
             return true;
         }
@@ -505,7 +505,7 @@ 
         }
         $b1 = $this->insert($object, $force);
         $criteria->add(new \Criteria('post_id', $top_post, '<>'), 'AND');
-        $criteria->add(new \Criteria('pid', '(' . implode(', ', $post_ids) . ')', 'NOT IN'), 'AND');
+        $criteria->add(new \Criteria('pid', '('.implode(', ', $post_ids).')', 'NOT IN'), 'AND');
         $b2       = $postHandler->updateAll('pid', $top_post, $criteria, $force);
         $criteria = new \CriteriaCompo();
         $criteria->add(new \Criteria('post_id', $top_post, '='), 'AND');
@@ -526,7 +526,7 @@ 
         $allDirs  = xoops_getActiveModules();
         foreach ($allDirs as $dirname) {
             // pollresults.php file is exist in all xoopspoll versions and umfrage versions
-            if (file_exists($GLOBALS['xoops']->path('modules/' . $dirname . '/pollresults.php'))) {
+            if (file_exists($GLOBALS['xoops']->path('modules/'.$dirname.'/pollresults.php'))) {
                 $pollDirs[$dirname] = $dirname;
             }
         }

class/ForumHandler.php

Spacing +56 added lines, -56 removed lines

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

class/TopicRenderer.php

Spacing +63 added lines, -63 removed lines

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

class/GroupPermForm.php

Spacing +6 added lines, -6 removed lines

@@ -54,7 +54,7 @@ 
         foreach (array_keys($glist) as $i) {
             // get selected item id(s) for each group
             $selected = $gpermHandler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele      = new Newbb\GroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+            $ele      = new Newbb\GroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
             $ele->setOptionTree($this->_itemTree);
             $this->addElement($ele);
             unset($ele);
@@ -63,19 +63,19 @@ 
         $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
         $this->addElement($tray);
-        $ret      = '<br><strong>' . $this->getTitle() . '</strong><br>' . $this->_permDesc . '<br>';
-        $ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
+        $ret      = '<br><strong>'.$this->getTitle().'</strong><br>'.$this->_permDesc.'<br>';
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
         $elements = $this->getElements();
         $hidden   = '';
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
             } elseif (!$elements[$i]->isHidden()) {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
+                $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
                 if ('' !== $elements[$i]->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+                    $ret .= '<br><br><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
                 }
-                $ret .= "</td>\n<td class='even' style='text-align:center;'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+                $ret .= "</td>\n<td class='even' style='text-align:center;'>\n".$elements[$i]->render()."\n</td></tr>\n";
             } else {
                 $hidden .= $elements[$i]->render();
             }

header.php

Spacing +12 added lines, -12 removed lines

@@ -11,8 +11,8 @@ 
 
 use Xmf\Request;
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/common.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/common.php';
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 /** @var \XoopsLogger $xoopsLogger */
@@ -23,7 +23,7 @@ 
 //require_once $GLOBALS['xoops']->path('header.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
+    require_once __DIR__.'/seo_url.php';
     /* for seo */
     $toseo_url = ['index.php', 'viewforum.php', 'viewtopic.php', 'rss.php'];
 
@@ -37,7 +37,7 @@ 
                 //rewrite only for files
 
                 if ('' !== trim(getenv('SCRIPT_NAME'))) {
-                    if (false === strpos(getenv('REQUEST_URI'), '/' . SEO_MODULE_NAME . '/')) {
+                    if (false === strpos(getenv('REQUEST_URI'), '/'.SEO_MODULE_NAME.'/')) {
                         $redir = true;
                     } elseif (getenv('QUERY_STRING')) {
                         $redir = true;
@@ -47,9 +47,9 @@ 
         }
 
         if (true === $redir) {
-            $s      = 'http://' . getenv('HTTP_HOST') . getenv('REQUEST_URI');
-            $s      = str_replace('/' . REAL_MODULE_NAME . '/', '/' . SEO_MODULE_NAME . '/', $s);
-            $newurl = seo_urls('<a href="' . $s . '"></a>');
+            $s      = 'http://'.getenv('HTTP_HOST').getenv('REQUEST_URI');
+            $s      = str_replace('/'.REAL_MODULE_NAME.'/', '/'.SEO_MODULE_NAME.'/', $s);
+            $newurl = seo_urls('<a href="'.$s.'"></a>');
             $newurl = str_replace('<a href="', '', $newurl);
             $newurl = str_replace('"></a>', '', $newurl);
             if (!headers_sent()) {
@@ -61,10 +61,10 @@ 
     }
 }
 
-require_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/vars.php');
+require_once $GLOBALS['xoops']->path('modules/'.$moduleDirName.'/include/vars.php');
 
-require_once __DIR__ . '/include/functions.user.php';
-require_once __DIR__ . '/include/functions.topic.php';
+require_once __DIR__.'/include/functions.user.php';
+require_once __DIR__.'/include/functions.topic.php';
 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 require_once $GLOBALS['xoops']->path('class/module.textsanitizer.php');
@@ -73,7 +73,7 @@ 
 $menumode       = 0;
 $menumode_other = [];
 $menu_url       = htmlspecialchars(preg_replace('/&menumode=[^&]/', '', Request::getString('REQUEST_URI', '', 'SERVER')), ENT_QUOTES | ENT_HTML5);
-$menu_url       .= (false === strpos($menu_url, '?')) ? '?menumode=' : '&amp;menumode=';
+$menu_url .= (false === strpos($menu_url, '?')) ? '?menumode=' : '&amp;menumode=';
 //foreach ($GLOBALS['xoopsModuleConfig']['valid_menumodes'] as $key => $val) {
 //    if ($key !== $menumode) {
 //        $menumode_other[] = array('title' => $val, 'link' => $menu_url . $key);
@@ -82,7 +82,7 @@ 
 
 if (is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['welcome_forum'])
     && !$GLOBALS['xoopsUser']->getVar('posts')) {
-    require_once __DIR__ . '/include/functions.welcome.php';
+    require_once __DIR__.'/include/functions.welcome.php';
 }
 // irmtfan for backward compatibility
 $pollmodules = $GLOBALS['xoopsModuleConfig']['poll_module'];