mambax7 / newbb5

update_type.php

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
  * @since          4.00
  * @package        module::newbb
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin()) {
     exit(_NOPERM);
@@ -22,11 +22,11 @@ 
     exit('No need for update');
 }
 
-$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+$GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+$GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
 
 if (!$GLOBALS['xoopsDB']->queryF('
-        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . " (
+        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp')." (
           `type_id`             SMALLINT(4)         UNSIGNED NOT NULL AUTO_INCREMENT,
           `type_name`             VARCHAR(64)         NOT NULL DEFAULT '',
           `type_color`             VARCHAR(10)         NOT NULL DEFAULT '',
@@ -39,7 +39,7 @@ 
 }
 
 if (!$GLOBALS['xoopsDB']->queryF('
-        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . " (
+        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp')." (
           `tf_id`                 MEDIUMINT(4)         UNSIGNED NOT NULL AUTO_INCREMENT,
           `type_id`             SMALLINT(4)         UNSIGNED NOT NULL DEFAULT '0',
           `forum_id`             SMALLINT(4)         UNSIGNED NOT NULL DEFAULT '0',
@@ -50,7 +50,7 @@ 
           KEY `type_order`        (`type_order`)
         ) ENGINE=MyISAM;
     ")) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
     exit('Can not create tmp table for `bb_type_forum_tmp`');
 }
 
@@ -61,10 +61,10 @@ 
 foreach ($subjectpres as $subjectpre) {
     if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) {
         if (!$GLOBALS['xoopsDB']->queryF('
-                INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . '
+                INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp').'
                     (`type_name`, `type_color`)
                 VALUES
-                    (' . $GLOBALS['xoopsDB']->quoteString($matches[2]) . ', ' . $GLOBALS['xoopsDB']->quoteString($matches[1]) . ')
+                    (' . $GLOBALS['xoopsDB']->quoteString($matches[2]).', '.$GLOBALS['xoopsDB']->quoteString($matches[1]).')
             ')) {
             xoops_error("Can not add type of `{$matches[2]}`");
             continue;
@@ -73,8 +73,8 @@ 
     }
 }
 if (0 === count($types)) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
     exit('No type item created');
 }
 
@@ -87,14 +87,14 @@ 
             $type_query[] = "({$key}, {$forum_id}, {$order})";
         }
 
-        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
+        $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp').' (type_id, forum_id, type_order) '.' VALUES '.implode(', ', $type_query);
         if (false === ($result = $GLOBALS['xoopsDB']->queryF($sql))) {
             xoops_error($GLOBALS['xoopsDB']->error());
         }
     }
 } else {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
     exit('No type item to update');
 }
 

votepolls.php

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
 use Xmf\Request;
 use XoopsModules\Xoopspoll;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $poll_id  = Request::getInt('poll_id', Request::getInt('poll_id', 0, 'POST'), 'GET');
 $topic_id = Request::getInt('topic_id', Request::getInt('topic_id', 0, 'POST'), 'GET');
 $forum    = Request::getInt('forum', Request::getInt('forum', 0, 'POST'), 'GET');
@@ -42,7 +42,7 @@ 
 
 if (!Request::getInt('option_id', 0, 'POST')) {
     // irmtfan - add error message - simple url
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_NOOPTION);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_NOOPTION);
 }
 // poll module
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
@@ -60,7 +60,7 @@ 
         $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
         // old xoopspoll or umfrage or any clone from them
     } else {
-        include $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+        include $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/include/constants.php');
         $classPoll  = $topicObject->loadOldPoll();
         $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
     }
@@ -81,7 +81,7 @@ 
             $optionId = Request::getInt('option_id', 0, 'POST');
         }
         if (!$pollObject->hasExpired()) {
-            $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_MUSTLOGIN');
+            $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_MUSTLOGIN');
             //@todo:: add $url to all redirects
             //            $url = $GLOBALS['xoops']->buildUrl("index.php", array('poll_id' => $poll_id));
             if ($pollObject->isAllowedToVote()) {
@@ -95,13 +95,13 @@ 
                             echo $pollObject->getHtmlErrors();
                             exit();
                         }
-                        $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_THANKSFORVOTE');
+                        $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_THANKSFORVOTE');
                     } else {
                         /* there was a problem registering the vote */
-                        redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE_ERROR'));
+                        redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_VOTE_ERROR'));
                     }
                 } else {
-                    $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ALREADYVOTED');
+                    $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_ALREADYVOTED');
                 }
                 /* set anon user vote (and the time they voted) */
                 if (!is_object($GLOBALS['xoopsUser'])) {
@@ -111,14 +111,14 @@ 
                     $classPollUtility::setVoteCookie($poll_id, $voteTime, 0);
                 }
             } else {
-                $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_CANNOTVOTE');
+                $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_CANNOTVOTE');
             }
         } else {
             /* poll has expired so just show the results */
-            $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . 'SORRYEXPIRED');
+            $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'SORRYEXPIRED');
         }
     } else {
-        $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ERROR_INVALID_POLLID');
+        $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_ERROR_INVALID_POLLID');
     }
     if (null !== $url) {
         redirect_header($url, $classConstants::REDIRECT_DELAY_MEDIUM, $msg);
@@ -127,7 +127,7 @@ 
     }
     // old xoopspoll or umfrage or any clone from them
 } else {
-    $classLog = $classPoll . 'Log';
+    $classLog = $classPoll.'Log';
     if (is_object($GLOBALS['xoopsUser'])) {
         if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $GLOBALS['xoopsUser']->getVar('uid'))) {
             $msg = _PL_ALREADYVOTED;

footer.php

Spacing +6 added lines, -6 removed lines

@@ -25,23 +25,23 @@
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.render.php');
 $iconHandler = newbbGetIconHandler();
 //  get css rel path from setted language
-$css_rel_path = $iconHandler->getPath('language/' . $GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'css');
+$css_rel_path = $iconHandler->getPath('language/'.$GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'css');
 // add local stylesheet
 /** @var xos_opal_Theme $xoTheme */
-$xoTheme->addStylesheet($css_rel_path . '/style.css');
+$xoTheme->addStylesheet($css_rel_path.'/style.css');
 
 //  get js rel path from setted language
-$js_rel_path = $iconHandler->getPath('language/' . $GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'js');
+$js_rel_path = $iconHandler->getPath('language/'.$GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'js');
 // add all local js files inside js directory
 xoops_load('XoopsLists');
 $allfiles = \XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($js_rel_path));
 foreach ($allfiles as $jsfile) {
     if ('js' === strtolower(pathinfo($jsfile, PATHINFO_EXTENSION))) {
-        $xoTheme->addScript($js_rel_path . '/' . $jsfile);
+        $xoTheme->addScript($js_rel_path.'/'.$jsfile);
     }
 }
-global $forumCookie;  // for $forumCookie["prefix"] revert last change - use global instead of include_once
+global $forumCookie; // for $forumCookie["prefix"] revert last change - use global instead of include_once
 // add toggle script
 //$toggle_script = "var toggle_cookie=\"" . $forumCookie['prefix'] . 'G' . '\';';
-$toggle_script = 'var toggle_cookie="' . $forumCookie['prefix'] . 'G";';
+$toggle_script = 'var toggle_cookie="'.$forumCookie['prefix'].'G";';
 $xoTheme->addScript(null, ['type' => 'text/javascript'], $toggle_script);

viewforum.php

Spacing +42 added lines, -42 removed lines

@@ -11,12 +11,12 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!Request::getInt('forum', 0, 'GET')) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
-require_once __DIR__ . '/include/functions.read.php';
+require_once __DIR__.'/include/functions.read.php';
 
 /*
  * Build the page query
@@ -25,7 +25,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 = implode('&', array_values($query_array));
@@ -39,8 +39,8 @@ 
         $markresult = _MD_NEWBB_MARK_UNREAD;
     }
     newbbSetReadTopic($markvalue, Request::getInt('forum', 0, 'GET'));
-    $url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?' . $page_query;
-    redirect_header($url, 2, _MD_NEWBB_ALL_TOPIC_MARKED . ' ' . $markresult);
+    $url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?'.$page_query;
+    redirect_header($url, 2, _MD_NEWBB_ALL_TOPIC_MARKED.' '.$markresult);
 }
 
 $forum_id = Request::getInt('forum', 0, 'GET');
@@ -67,25 +67,25 @@ 
 $forumObject = $forumHandler->get($forum_id);
 
 if (!$forumObject) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _NOPERM);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php', 2, _NOPERM);
 }
 newbbSetRead('forum', $forum_id, $forumObject->getVar('forum_last_post_id'));
 
-$xoops_pagetitle = $forumObject->getVar('forum_name') . ' [' . $xoopsModule->getVar('name') . ']';
+$xoops_pagetitle = $forumObject->getVar('forum_name').' ['.$xoopsModule->getVar('name').']';
 
 $xoopsOption['template_main']   = 'newbb_viewforum.tpl';
 $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
 
 require_once $GLOBALS['xoops']->path('header.php');
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.render.php';
 
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forum_id . '" />
+    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'-'.$forumObject->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_id.'" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 $forumDescription = $forumObject->getVar('forum_desc');
@@ -119,16 +119,16 @@ 
 
 if ($forumHandler->getPermission($forumObject, 'post')) {
     $xoopsTpl->assign('viewer_level', $isAdmin ? 2 : 1);
-    $xoopsTpl->assign('forum_post_or_register', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/newtopic.php?forum={$forum_id}\">" . newbbDisplayImage('t_new', _MD_NEWBB_POSTNEW) . '</a>');
+    $xoopsTpl->assign('forum_post_or_register', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/newtopic.php?forum={$forum_id}\">".newbbDisplayImage('t_new', _MD_NEWBB_POSTNEW).'</a>');
     if ($pollmodules && $forumHandler->getPermission($forumObject, 'addpoll')) {
         $t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
-        $xoopsTpl->assign('forum_addpoll', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
+        $xoopsTpl->assign('forum_addpoll', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
     }
 } else {
     $xoopsTpl->assign('viewer_level', 0);
     if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
-        $redirect = preg_replace("|(.*)\/modules\/Newbb\/(.*)|", "\\1/modules/newbb/newtopic.php?forum=" . $forum_id, htmlspecialchars($xoopsRequestUri));
-        $xoopsTpl->assign('forum_post_or_register', "<a href='" . XOOPS_URL . "/user.php?xoops_redirect={$redirect}'>" . _MD_NEWBB_REGTOPOST . '</a>');
+        $redirect = preg_replace("|(.*)\/modules\/Newbb\/(.*)|", "\\1/modules/newbb/newtopic.php?forum=".$forum_id, htmlspecialchars($xoopsRequestUri));
+        $xoopsTpl->assign('forum_post_or_register', "<a href='".XOOPS_URL."/user.php?xoops_redirect={$redirect}'>"._MD_NEWBB_REGTOPOST.'</a>');
         $xoopsTpl->assign('forum_addpoll', '');
     } else {
         $xoopsTpl->assign('forum_post_or_register', '');
@@ -139,7 +139,7 @@ 
 $xoopsTpl->assign_by_ref('parentforum', $parentforum);
 
 $criteria = new \CriteriaCompo(new \Criteria('parent_forum', $forum_id));
-$criteria->add(new \Criteria('forum_id', '(' . implode(', ', $forumHandler->getIdsByPermission('access')) . ')', 'IN'));
+$criteria->add(new \Criteria('forum_id', '('.implode(', ', $forumHandler->getIdsByPermission('access')).')', 'IN'));
 $criteria->setSort('forum_order');
 
 if ($forums = $forumHandler->getAll($criteria, null, false)) {
@@ -175,7 +175,7 @@ 
 
 $forum_selection_sort = '<select name="sort">';
 foreach ($sel_sort_array as $sort_k => $sort_v) {
-    $forum_selection_sort .= '<option value="' . $sort_k . '"' . (($sort == $sort_k) ? ' selected="selected"' : '') . '>' . $sort_v . '</option>';
+    $forum_selection_sort .= '<option value="'.$sort_k.'"'.(($sort == $sort_k) ? ' selected="selected"' : '').'>'.$sort_v.'</option>';
 }
 $forum_selection_sort .= '</select>';
 
@@ -184,14 +184,14 @@ 
 $order                 = (!Request::getString('order', '', 'GET')
                           || 'ASC' !== Request::getString('order', '', 'GET')) ? 'DESC' : 'ASC';
 $forum_selection_order = '<select name="order">';
-$forum_selection_order .= '<option value="ASC"' . (('ASC' === $order) ? ' selected' : '') . '>' . _MD_NEWBB_ASCENDING . '</option>';
-$forum_selection_order .= '<option value="DESC"' . (('DESC' === $order) ? ' selected' : '') . '>' . _MD_NEWBB_DESCENDING . '</option>';
+$forum_selection_order .= '<option value="ASC"'.(('ASC' === $order) ? ' selected' : '').'>'._MD_NEWBB_ASCENDING.'</option>';
+$forum_selection_order .= '<option value="DESC"'.(('DESC' === $order) ? ' selected' : '').'>'._MD_NEWBB_DESCENDING.'</option>';
 $forum_selection_order .= '</select>';
 
 $xoopsTpl->assign_by_ref('forum_selection_order', $forum_selection_order);
 
 $since = Request::getInt('since', $GLOBALS['xoopsModuleConfig']['since_default'], 'GET');
-require_once __DIR__ . '/include/functions.time.php';
+require_once __DIR__.'/include/functions.time.php';
 $forum_selection_since = newbbSinceSelectBox($since);
 $xoopsTpl->assign_by_ref('forum_selection_since', $forum_selection_since);
 
@@ -200,14 +200,14 @@ 
 $page_query_sort = implode('&amp;', array_values($query_sort));
 unset($query_sort);
 // irmtfan - edit: u.uname => t.topic_poster | t.topic_time => t.topic_id | p.post_time => t.topic_last_post_id
-$xoopsTpl->assign('h_topic_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_title&amp;order=" . (('t.topic_title' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_reply_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_replies&amp;order=" . (('t.topic_replies' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_poster_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_poster&amp;order=" . (('t.topic_poster' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_views_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_views&amp;order=" . (('t.topic_views' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_rating_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.rating&amp;order=" . (('t.rating' === $sort
+$xoopsTpl->assign('h_topic_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_title&amp;order=".(('t.topic_title' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_reply_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_replies&amp;order=".(('t.topic_replies' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_poster_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_poster&amp;order=".(('t.topic_poster' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_views_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_views&amp;order=".(('t.topic_views' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_rating_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.rating&amp;order=".(('t.rating' === $sort
                                                                                                                                   && 'DESC' === $order) ? 'ASC' : 'DESC')); // irmtfan t.topic_ratings to t.rating
-$xoopsTpl->assign('h_date_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_last_post_id&amp;order=" . (('t.topic_last_post_id' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_publish_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_id&amp;order=" . (('t.topic_id' === $sort
+$xoopsTpl->assign('h_date_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_last_post_id&amp;order=".(('t.topic_last_post_id' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_publish_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_id&amp;order=".(('t.topic_id' === $sort
                                                                                                                                      && 'DESC' === $order) ? 'ASC' : 'DESC'));
 $xoopsTpl->assign('forum_since', $since); // For $since in search.php
 
@@ -237,11 +237,11 @@ 
 $xoopsTpl->assign('img_digest', newbbDisplayImage('topic_digest', _MD_NEWBB_TOPICDIGEST));
 $xoopsTpl->assign('img_poll', newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL));
 
-$xoopsTpl->assign('mark_read', XOOPS_URL . "/modules/newbb/viewforum.php?mark=1&amp;{$page_query}");
-$xoopsTpl->assign('mark_unread', XOOPS_URL . "/modules/newbb/viewforum.php?mark=2&amp;{$page_query}");
+$xoopsTpl->assign('mark_read', XOOPS_URL."/modules/newbb/viewforum.php?mark=1&amp;{$page_query}");
+$xoopsTpl->assign('mark_unread', XOOPS_URL."/modules/newbb/viewforum.php?mark=2&amp;{$page_query}");
 
-$xoopsTpl->assign('post_link', XOOPS_URL . '/modules/newbb/viewpost.php?forum=' . $forum_id);
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/newbb/viewpost.php?status=new&amp;forum=' . $forum_id);
+$xoopsTpl->assign('post_link', XOOPS_URL.'/modules/newbb/viewpost.php?forum='.$forum_id);
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/newbb/viewpost.php?status=new&amp;forum='.$forum_id);
 
 $query_type = $query_array;
 unset($query_type['type']);
@@ -252,16 +252,16 @@ 
 $typeOptions = null;
 $types       = [];
 if ($types = $typeHandler->getByForum($forum_id)) {
-    $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}"];
+    $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_type}"];
     foreach ($types as $key => $item) {
         $typeOptions[] = [
             'title' => $item['type_name'],
-            'link'  => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}&amp;type={$key}"
+            'link'  => XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_type}&amp;type={$key}"
         ];
     }
 }
 if ($type > 0) {
-    require_once __DIR__ . '/include/functions.topic.php';
+    require_once __DIR__.'/include/functions.topic.php';
     $xoopsTpl->assign('forum_topictype', getTopicTitle('', $types[$type]['type_name'], $types[$type]['type_color']));
 }
 $xoopsTpl->assign_by_ref('typeOptions', $typeOptions);
@@ -270,11 +270,11 @@ 
 unset($query_status['status']);
 $page_query_status = implode('&amp;', array_values($query_status));
 unset($query_status);
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/newbb/viewpost.php?status=new&amp;forum=' . $forumObject->getVar('forum_id'));
-$xoopsTpl->assign('all_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}");
-$xoopsTpl->assign('digest_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=digest");
-$xoopsTpl->assign('unreplied_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unreplied");
-$xoopsTpl->assign('unread_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unread");
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/newbb/viewpost.php?status=new&amp;forum='.$forumObject->getVar('forum_id'));
+$xoopsTpl->assign('all_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}");
+$xoopsTpl->assign('digest_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=digest");
+$xoopsTpl->assign('unreplied_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unreplied");
+$xoopsTpl->assign('unread_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unread");
 switch ($status) {
     case 'digest':
         $current_status = _MD_NEWBB_DIGEST;
@@ -322,7 +322,7 @@ 
 }
 
 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));
 }
 
@@ -335,8 +335,8 @@ 
 }
 
 if (1 == $GLOBALS['xoopsModuleConfig']['rss_enable']) {
-    $xoopsTpl->assign('rss_button', "<div align='right'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/rss.php?f=' . $forum_id . "' title='RSS feed' target='_blank'>" . newbbDisplayImage('rss', 'RSS feed') . '</a></div>');
+    $xoopsTpl->assign('rss_button', "<div align='right'><a href='".XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/rss.php?f='.$forum_id."' title='RSS feed' target='_blank'>".newbbDisplayImage('rss', 'RSS feed').'</a></div>');
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

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

dl_attachment.php

Spacing +7 added lines, -7 removed lines

@@ -13,14 +13,14 @@ 
 use XoopsModules\Newbb;
 
 ob_start();
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 include $GLOBALS['xoops']->path('header.php');
 
 $attach_id = Request::getInt('attachid', 0, 'GET');
 $post_id   = Request::getInt('post_id', 0, 'GET');
 
 if (!$post_id || !$attach_id) {
-    exit(_MD_NEWBB_NO_SUCH_FILE . ': post_id:' . $post_id . '; attachid' . $attachid);
+    exit(_MD_NEWBB_NO_SUCH_FILE.': post_id:'.$post_id.'; attachid'.$attachid);
 }
 
 ///** @var Newbb\PostHandler $postHandler */
@@ -53,7 +53,7 @@ 
 if (!$attach) {
     exit(_MD_NEWBB_NO_SUCH_FILE);
 }
-$file_saved = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
+$file_saved = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']);
 if (!file_exists($file_saved)) {
     exit(_MD_NEWBB_NO_SUCH_FILE);
 }
@@ -70,8 +70,8 @@ 
     header('Cache-Control: post-check=0, pre-check=0', false);
     header('Pragma: no-cache');
     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('location: ' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+    header('location: '.XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']);
 } else {
     $file_display = $attach['nameDisplay'];
     //$mimetype = $attach['mimetype'];
@@ -87,11 +87,11 @@ 
     //header('Content-Type: '.$mimetype);
     header('Content-Type: application/octet-stream');
     if (preg_match("/MSIE (\d\.\d{1,2})/", Request::getString('HTTP_USER_AGENT', '', 'SERVER'))) {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
+        header('Content-Disposition: attachment; filename="'.$file_display.'"');
         header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
         header('Pragma: public');
     } else {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
+        header('Content-Disposition: attachment; filename="'.$file_display.'"');
         header('Pragma: no-cache');
     }
     header('Content-Type: application/force-download');

delete.php

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $ok = Request::getInt('ok', 0, 'POST');
 
@@ -43,15 +43,15 @@ 
 }
 $topic_id = $topic->getVar('topic_id');
 if (!$topic_id) {
-    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum=' . $forum;
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum='.$forum;
+    $redirect = XOOPS_URL.'/modules/newbb/'.$redirect;
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 $forum       = $topic->getVar('forum_id');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $isAdmin = newbbIsAdmin($forumObject);
@@ -62,11 +62,11 @@ 
 $topic_status = $topic->getVar('topic_status');
 if (($postObject->checkIdentity() || $isAdmin) && $topicHandler->getPermission($topic->getVar('forum_id'), $topic_status, 'delete')) {
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
 }
 
 if (!$isAdmin && !$postObject->checkTimelimit('delete_timelimit')) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
@@ -82,7 +82,7 @@ 
     }
     if ($isDeleteOne && $postObject->isTopic() && $topic->getVar('topic_replies') > 0) {
         //$postHandler->emptyTopic($postObject);
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
     } else {
         if (Request::getString('post_text', '', 'POST')) {
             //send a message
@@ -101,11 +101,11 @@ 
                 $xoopsMailer->setToUsers($senduser);
                 $xoopsMailer->setFromName($GLOBALS['xoopsUser']->getVar('uname'));
                 $xoopsMailer->setSubject(_MD_NEWBB_DELEDEDMSG_SUBJECT);
-                $forenurl = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postObject->getVar('topic_id') . '">' . $postObject->getVar('subject') . '</a>';
+                $forenurl = '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$postObject->getVar('topic_id').'">'.$postObject->getVar('subject').'</a>';
                 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
                     $forenurl = seo_urls($forenurl);
                 }
-                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL . '/');
+                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL.'/');
                 $body = $myts->nl2Br($body);
                 $xoopsMailer->setBody($body);
                 $xoopsMailer->send();
@@ -121,25 +121,25 @@ 
 
     //$postObject->loadFilters('delete');
     if ($isDeleteOne) {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
     } else {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
     }
 } else {
     include $GLOBALS['xoops']->path('header.php');
     //xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_NEWBB_DEL_ONE);
-    echo '<div class="confirmMsg">' . _MD_NEWBB_DEL_ONE . '<br>
-          <form method="post" action="' . XOOPS_URL . '/modules/newbb/delete.php">';
-    echo _MD_NEWBB_DELEDEDMSG . '<br>';
+    echo '<div class="confirmMsg">'._MD_NEWBB_DEL_ONE.'<br>
+          <form method="post" action="' . XOOPS_URL.'/modules/newbb/delete.php">';
+    echo _MD_NEWBB_DELEDEDMSG.'<br>';
     echo '<textarea name="post_text" cols="50" rows="5"></textarea><br>';
-    echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id) . '" />';
-    echo '<input type="hidden" name="order" value="' . htmlspecialchars($order) . '" />';
-    echo '<input type="hidden" name="forum" value="' . htmlspecialchars($forum) . '" />';
-    echo '<input type="hidden" name="topic_id" value="' . htmlspecialchars($topic_id) . '" />';
+    echo '<input type="hidden" name="post_id" value="'.htmlspecialchars($post_id).'" />';
+    echo '<input type="hidden" name="order" value="'.htmlspecialchars($order).'" />';
+    echo '<input type="hidden" name="forum" value="'.htmlspecialchars($forum).'" />';
+    echo '<input type="hidden" name="topic_id" value="'.htmlspecialchars($topic_id).'" />';
     echo '<input type="hidden" name="ok" value="1" />';
     echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-    echo '<input type="submit" name="confirm_submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '"/>
-          <input type="button" name="confirm_back" value="' . _CANCEL . '" onclick="history.go(-1);" title="' . _CANCEL . '" />
+    echo '<input type="submit" name="confirm_submit" value="'._SUBMIT.'" title="'._SUBMIT.'"/>
+          <input type="button" name="confirm_back" value="' . _CANCEL.'" onclick="history.go(-1);" title="'._CANCEL.'" />
           </form>
           </div>';
     if ($isAdmin) {

moderate.php

Spacing +19 added lines, -19 removed lines

@@ -11,7 +11,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoTheme, $xoopsTpl;
 $GLOBALS['xoopsOption']['template_main'] = 'newbb_moderate.tpl';
@@ -21,7 +21,7 @@ 
 $forum_id     = Request::getInt('forum', 0);
 $isAdmin      = newbbIsAdmin($forum_id);
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 $is_administrator = $GLOBALS['xoopsUserIsAdmin'];
 ///** @var Newbb\ModerateHandler $moderateHandler */
@@ -40,7 +40,7 @@ 
             $ipWithMask = $ip->asReadable();
             $mask       = empty($ipParts[1]) ? 0 : (int)$ipParts[1];
             $mask       = ($mask > ((4 === $ip->ipVersion()) ? 32 : 128) || $mask < 8) ? '' : $mask;
-            $ipWithMask .= empty($mask) ? '' : '/' . $mask;
+            $ipWithMask .= empty($mask) ? '' : '/'.$mask;
         }
     }
 
@@ -100,7 +100,7 @@ 
 
 $url = 'moderate.php';
 if ($forum_id) {
-    $url .= '?forum=' . $forum_id;
+    $url .= '?forum='.$forum_id;
 }
 $xoopsTpl->assign('moderate_url', $url);
 
@@ -111,27 +111,27 @@ 
     }
     $users = newbbGetUnameFromIds(array_keys($_users), $GLOBALS['xoopsModuleConfig']['show_realname'], true);
 
-    $columnHeaders ['uid']    = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=uid',
+    $columnHeaders ['uid'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=uid',
         'header' => _MD_NEWBB_SUSPEND_UID,
         'title'  => _MD_NEWBB_SUSPEND_UID,
     ];
-    $columnHeaders ['start']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=start',
+    $columnHeaders ['start'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=start',
         'header' => _MD_NEWBB_SUSPEND_START,
         'title'  => _MD_NEWBB_SUSPEND_START,
     ];
-    $columnHeaders['expire']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=expire',
+    $columnHeaders['expire'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=expire',
         'header' => _MD_NEWBB_SUSPEND_EXPIRE,
         'title'  => _MD_NEWBB_SUSPEND_EXPIRE,
     ];
-    $columnHeaders['forum']   = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=forum',
+    $columnHeaders['forum'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=forum',
         'header' => _MD_NEWBB_SUSPEND_SCOPE,
         'title'  => _MD_NEWBB_SUSPEND_SCOPE,
     ];
-    $columnHeaders['desc']    = [
+    $columnHeaders['desc'] = [
         'url'    => false,
         'header' => _MD_NEWBB_SUSPEND_DESC,
         'title'  => _MD_NEWBB_SUSPEND_DESC,
@@ -156,14 +156,14 @@ 
         $row['forum']   = ($moderateObjects[$id]->getVar('forum_id') ? $forum_list[$moderateObjects[$id]->getVar('forum_id')]['forum_name'] : _ALL);
         $row['desc']    = ($moderateObjects[$id]->getVar('mod_desc') ?: _NONE);
         $row['options'] = (($is_administrator
-                            || $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum=' . $forum_id . '&amp;del=' . $moderateObjects[$id]->getVar('mod_id') . '">' . _DELETE . '</a>' : '');
+                            || $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum='.$forum_id.'&amp;del='.$moderateObjects[$id]->getVar('mod_id').'">'._DELETE.'</a>' : '');
         $columnRows[]   = $row;
     }
     $xoopsTpl->assign('columnRows', $columnRows);
 
     if ($moderate_count > $GLOBALS['xoopsModuleConfig']['topics_per_page']) {
         include $GLOBALS['xoops']->path('class/pagenav.php');
-        $nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum=' . $forum_id . '&amp;sort=' . $sortname);
+        $nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum='.$forum_id.'&amp;sort='.$sortname);
         //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
         //    $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . ' /' . $nav->url;
         //}
@@ -177,14 +177,14 @@ 
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_IP, 'ip', 50, 50));
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_DURATION, 'expire', 20, 25, '5'), true);
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_DESC, 'desc', 50, 255));
-require_once __DIR__ . '/include/functions.forum.php';
+require_once __DIR__.'/include/functions.forum.php';
 if (newbbIsAdmin()) {
-    $forumSel = '<select name="forum">';// if user doesn't select, default is "0" all forums
+    $forumSel = '<select name="forum">'; // if user doesn't select, default is "0" all forums
     $forumSel .= '<option value="0"';
     if (0 == $forum_id) {
         $forumSel .= ' selected';
     }
-    $forumSel                         .= '>' . _ALL . '</option>';
+    $forumSel                         .= '>'._ALL.'</option>';
     $forumSel                         .= newbbForumSelectBox($forum_id, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = true
     $forumSel                         .= '</select>';
     $forumEle                         = new \XoopsFormLabel(_MD_NEWBB_SELFORUM, $forumSel);
@@ -196,5 +196,5 @@ 
 $forum_form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 $forum_form->assign($xoopsTpl);
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

print.php

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
  *
  */
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 error_reporting(0);
 $xoopsLogger->activated = false;
@@ -65,9 +65,9 @@ 
         $topic_id         = $post->getVar('topic_id');
         $post_data        = $postHandler->getPostForPrint($post);
         $isPost           = 1;
-        $post_data['url'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+        $post_data['url'] = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post_id;
         if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $post_data['url'] = seo_urls('<a href="' . $post_data['url'] . '"></a>');
+            $post_data['url'] = seo_urls('<a href="'.$post_data['url'].'"></a>');
             $post_data['url'] = str_replace('<a href="', '', $post_data['url']);
             $post_data['url'] = str_replace('"></a>', '', $post_data['url']);
         }
@@ -113,7 +113,7 @@ 
     echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
-            <img src='" . XOOPS_URL . "/modules/newbb/assets/images/xoopsbb_slogo.png' border='0' alt='' />
+            <img src='" . XOOPS_URL."/modules/newbb/assets/images/xoopsbb_slogo.png' border='0' alt='' />
             <br><br> ";
 
     $postsArray = $topicHandler->getAllPosts($topicObject);
@@ -122,25 +122,25 @@ 
             continue;
         }
         $post_data = $postHandler->getPostForPrint($post);
-        echo "<h2 style='margin: 0;'>" . $post_data['subject'] . "</h2>
-              <div align='center'>" . _POSTEDBY . '&nbsp;' . $post_data['author'] . '&nbsp;' . _ON . '&nbsp;' . formatTimestamp($post_data['date']) . "</div>
+        echo "<h2 style='margin: 0;'>".$post_data['subject']."</h2>
+              <div align='center'>" . _POSTEDBY.'&nbsp;'.$post_data['author'].'&nbsp;'._ON.'&nbsp;'.formatTimestamp($post_data['date'])."</div>
               <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
-               <div>" . $post_data['text'] . "</div>
+               <div>" . $post_data['text']."</div>
               <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div><br>";
     }
-    echo '<p>' . _MD_NEWBB_COMEFROM . '&nbsp;' . XOOPS_URL . '/newbb/viewtopic.php?forum=' . $forum_id . '&amp;topic_id=' . $topic_id . '</p>';
+    echo '<p>'._MD_NEWBB_COMEFROM.'&nbsp;'.XOOPS_URL.'/newbb/viewtopic.php?forum='.$forum_id.'&amp;topic_id='.$topic_id.'</p>';
     echo '</div></div>';
     echo '</body></html>';
 } else {
     echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
-            <h2 style='margin: 0;'>" . $post_data['subject'] . "</h2></div>
-            <div align='center'>" . _POSTEDBY . '&nbsp;' . $post_data['author'] . '&nbsp;' . _ON . '&nbsp;' . formatTimestamp($post_data['date']) . "</div>
+            <h2 style='margin: 0;'>" . $post_data['subject']."</h2></div>
+            <div align='center'>" . _POSTEDBY.'&nbsp;'.$post_data['author'].'&nbsp;'._ON.'&nbsp;'.formatTimestamp($post_data['date'])."</div>
             <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
-            <div>" . $post_data['text'] . "</div>
+            <div>" . $post_data['text']."</div>
             <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div>
-            <p>" . _MD_NEWBB_COMEFROM . '&nbsp;' . $post_data['url'] . '</p>
+            <p>" . _MD_NEWBB_COMEFROM.'&nbsp;'.$post_data['url'].'</p>
             </div>
             <br><br></body></html>';
 }