mambax7 / newbb5

include/functions.read.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_READ_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_READ')) {

include/functions.php

Spacing +7 added lines, -7 removed lines

@@ -11,16 +11,16 @@
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__   . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS')) {
     define('NEWBB_FUNCTIONS', 1);
 
-    require_once __DIR__ . '/functions.image.php';
-    require_once __DIR__ . '/functions.user.php';
-    require_once __DIR__ . '/functions.render.php';
-    require_once __DIR__ . '/functions.forum.php';
-    require_once __DIR__ . '/functions.session.php';
-    require_once __DIR__ . '/functions.stats.php';
+    require_once __DIR__.'/functions.image.php';
+    require_once __DIR__.'/functions.user.php';
+    require_once __DIR__.'/functions.render.php';
+    require_once __DIR__.'/functions.forum.php';
+    require_once __DIR__.'/functions.session.php';
+    require_once __DIR__.'/functions.stats.php';
 }

include/functions.recon.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__   . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_RECON_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RECON')) {

include/module.php

Spacing +13 added lines, -13 removed lines

@@ -54,34 +54,34 @@ 
     // remove old html template files
     // create an array with all folders, and then run this once
 
-    $templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/');
+    $templateDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/templates/');
     $template_list     = array_diff(scandir($templateDirectory, SCANDIR_SORT_NONE), ['..', '.']);
     foreach ($template_list as $k => $v) {
-        $fileinfo = new \SplFileInfo($templateDirectory . $v);
+        $fileinfo = new \SplFileInfo($templateDirectory.$v);
         if ('html' === $fileinfo->getExtension() && 'index.html' !== $fileinfo->getFilename()) {
-            @unlink($templateDirectory . $v);
+            @unlink($templateDirectory.$v);
         }
     }
-    $templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/blocks');
+    $templateDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/templates/blocks');
     $template_list     = array_diff(scandir($templateDirectory, SCANDIR_SORT_NONE), ['..', '.']);
     foreach ($template_list as $k => $v) {
-        $fileinfo = new \SplFileInfo($templateDirectory . $v);
+        $fileinfo = new \SplFileInfo($templateDirectory.$v);
         if ('html' === $fileinfo->getExtension() && 'index.html' !== $fileinfo->getFilename()) {
-            @unlink($templateDirectory . $v);
+            @unlink($templateDirectory.$v);
         }
     }
     // Load class XoopsFile
     xoops_load('xoopsfile');
     //remove /images directory
-    $imagesDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/images/');
+    $imagesDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/images/');
     $folderHandler   = \XoopsFile::getHandler('folder', $imagesDirectory);
     $folderHandler->delete($imagesDirectory);
 
     //remove old changelogs
-    array_map('unlink', glob(dirname(__DIR__) . '/docs/changelog-rev*.txt'));
+    array_map('unlink', glob(dirname(__DIR__).'/docs/changelog-rev*.txt'));
 
     if (!empty($newbbConfig['syncOnUpdate'])) {
-        require_once  dirname(__DIR__) . '/include/functions.recon.php';
+        require_once  dirname(__DIR__).'/include/functions.recon.php';
         newbbSynchronization();
     }
 
@@ -107,9 +107,9 @@ 
  */
 function xoops_module_pre_install_newbb(\XoopsModule $module)
 {
-    $mod_tables =& $module->getInfo('tables');
+    $mod_tables = & $module->getInfo('tables');
     foreach ($mod_tables as $table) {
-        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
     }
 
     return true;
@@ -176,12 +176,12 @@ 
     }
     foreach ($groups_post as $group_id) {
         foreach ($post_items as $item) {
-            $grouppermHandler->addRight('forum_' . $item, $forum_id, $group_id, $module_id);
+            $grouppermHandler->addRight('forum_'.$item, $forum_id, $group_id, $module_id);
         }
     }
 
     /* Create a test post */
-    require_once __DIR__ . '/functions.user.php';
+    require_once __DIR__.'/functions.user.php';
     /** @var Newbb\PostHandler $postHandler */
     $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
     /** @var  $forumpost */

include/functions.rpc.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__   . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_RPC_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RPC')) {
@@ -32,16 +32,16 @@ 
         } else {
             $charset = _CHARSET;
         }
-        header('Content-Type: text/xml; charset="' . $charset . '"');
+        header('Content-Type: text/xml; charset="'.$charset.'"');
         if ($error) {
-            echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+            echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
             echo '<response>\n';
             echo '<error>1</error>\n';
             echo '<message>$error_message</message>\n';
             echo '</response>';
             exit();
         } else {
-            echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+            echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
             echo '<response>\n';
             echo '<error>0</error>\n';
             echo '</response>';

include/onupdate.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)
     || !$GLOBALS['xoopsUser']->IsAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -82,14 +82,14 @@ 
         //delete old HTML templates
         if (count($configurator->templateFolders) > 0) {
             foreach ($configurator->templateFolders as $folder) {
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
+                $templateFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$folder);
                 if (is_dir($templateFolder)) {
                     $templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
                     foreach ($templateList as $k => $v) {
-                        $fileInfo = new \SplFileInfo($templateFolder . $v);
+                        $fileInfo = new \SplFileInfo($templateFolder.$v);
                         if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
-                            if (file_exists($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
+                            if (file_exists($templateFolder.$v)) {
+                                unlink($templateFolder.$v);
                             }
                         }
                     }
@@ -101,7 +101,7 @@ 
         if (count($configurator->oldFiles) > 0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->oldFiles) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
+                $tempFile = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFiles[$i]);
                 if (is_file($tempFile)) {
                     unlink($tempFile);
                 }
@@ -113,7 +113,7 @@ 
         if (count($configurator->oldFolders) > 0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->oldFolders) as $i) {
-                $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
+                $tempFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFolders[$i]);
                 /* @var $folderHandler XoopsObjectHandler */
                 $folderHandler = \XoopsFile::getHandler('folder', $tempFolder);
                 $folderHandler->delete($tempFolder);
@@ -130,15 +130,15 @@ 
 
         //  ---  COPY blank.png FILES ---------------
         if (count($configurator->copyBlankFiles) > 0) {
-            $file =  dirname(__DIR__) . '/assets/images/blank.png';
+            $file = dirname(__DIR__).'/assets/images/blank.png';
             foreach (array_keys($configurator->copyBlankFiles) as $i) {
-                $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+                $dest = $configurator->copyBlankFiles[$i].'/blank.png';
                 $utility::copyFile($file, $dest);
             }
         }
 
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.html%\'';
+        $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname', 'n').'\' AND `tpl_file` LIKE \'%.html%\'';
         $GLOBALS['xoopsDB']->queryF($sql);
 
         /** @var XoopsGroupPermHandler $grouppermHandler */

action.post.php

Spacing +15 added lines, -15 removed lines

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

search.php

Spacing +30 added lines, -30 removed lines

@@ -34,22 +34,22 @@ 
 //  Project: Article Project                                                 //
 //  ------------------------------------------------------------------------ //
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 xoops_loadLanguage('search');
 /** @var \XoopsConfigHandler $configHandler */
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (1 !== $xoopsConfigSearch['enable_search']) {
-    redirect_header(XOOPS_URL . '/modules/newbb/index.php', 2, _MD_NEWBB_SEARCHDISABLED);
+    redirect_header(XOOPS_URL.'/modules/newbb/index.php', 2, _MD_NEWBB_SEARCHDISABLED);
 }
 
 $GLOBALS['xoopsConfig']['module_cache'][$xoopsModule->getVar('mid')] = 0;
 $xoopsOption['template_main']                                        = 'newbb_search.tpl';
 require_once $GLOBALS['xoops']->path('header.php');
 
-require_once __DIR__ . '/include/functions.render.php';
-require_once __DIR__ . '/include/functions.forum.php';
-require_once __DIR__ . '/include/functions.time.php';
+require_once __DIR__.'/include/functions.render.php';
+require_once __DIR__.'/include/functions.forum.php';
+require_once __DIR__.'/include/functions.time.php';
 
 require_once $GLOBALS['xoops']->path('modules/newbb/include/search.inc.php');
 $limit = $GLOBALS['xoopsModuleConfig']['topics_per_page'];
@@ -118,8 +118,8 @@ 
     if (!empty($search_username)) {
         $uname_required  = true;
         $search_username = $GLOBALS['xoopsDB']->escape($search_username);
-        if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM ' . $GLOBALS['xoopsDB']->prefix('users') . " WHERE uname LIKE '%$search_username%'")) {
-            redirect_header(XOOPS_URL . '/search.php', 1, _MD_NEWBB_ERROROCCURED);
+        if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM '.$GLOBALS['xoopsDB']->prefix('users')." WHERE uname LIKE '%$search_username%'")) {
+            redirect_header(XOOPS_URL.'/search.php', 1, _MD_NEWBB_ERROROCCURED);
         }
         $uid = [];
         while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -144,12 +144,12 @@ 
             }
         }
         if (!$uname_required && 0 === count($queries)) {
-            redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            redirect_header(XOOPS_URL.'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
     } else {
         //$query = trim($query);
         if (!$uname_required && (strlen($query) < $xoopsConfigSearch['keyword_min'])) {
-            redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            redirect_header(XOOPS_URL.'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
         $queries = [$query];
     }
@@ -212,14 +212,14 @@ 
         if (count($next_search) > 0) {
             $items = [];
             foreach ($next_search as $para => $val) {
-                $items[] = "{$para}=" . urlencode($val);
+                $items[] = "{$para}=".urlencode($val);
             }
             if (count($items) > 0) {
                 $paras = implode('&', $items);
             }
             unset($next_search, $items);
         }
-        $search_url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/search.php?' . $paras;
+        $search_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/search.php?'.$paras;
         // irmtfan remove to have just one query and appropriate next and prev links
         //$next_results = newbb_search($queries, $andor, 1, $start + $limit, $uid, $forum, $sortby, $searchin, $subquery);
         //$next_count = count($next_results);
@@ -231,15 +231,15 @@ 
         if ($num_results == $limit) {
             $next            = $start + $limit;
             $queries         = implode(',', $queries);
-            $search_url_next = htmlspecialchars($search_url . "&direction=next&start={$next}", ENT_QUOTES | ENT_HTML5);
-            $search_next     = '<a href="' . $search_url_next . '">' . _SR_NEXT . '</a>';
+            $search_url_next = htmlspecialchars($search_url."&direction=next&start={$next}", ENT_QUOTES | ENT_HTML5);
+            $search_next     = '<a href="'.$search_url_next.'">'._SR_NEXT.'</a>';
             $xoopsTpl->assign('search_next', $search_next);
             $xoopsTpl->assign('search_next_url', $search_url_next);
         }
         if ($start > 0) {
             $prev            = $start - $limit;
-            $search_url_prev = htmlspecialchars($search_url . "&direction=previous&start={$prev}", ENT_QUOTES | ENT_HTML5);
-            $search_prev     = '<a href="' . $search_url_prev . '">' . _SR_PREVIOUS . '</a>';
+            $search_url_prev = htmlspecialchars($search_url."&direction=previous&start={$prev}", ENT_QUOTES | ENT_HTML5);
+            $search_prev     = '<a href="'.$search_url_prev.'">'._SR_PREVIOUS.'</a>';
             $xoopsTpl->assign('search_prev', $search_prev);
             $xoopsTpl->assign('search_prev_url', $search_url_prev);
         }
@@ -250,18 +250,18 @@ 
             redirect_header($search_url_redirect, 1, constant(strtoupper("_SR_{$direction}")));
         }
     }
-    $search_info = _SR_KEYWORDS . ': ' . $search_info_keywords;
+    $search_info = _SR_KEYWORDS.': '.$search_info_keywords;
     if ($uname_required) {
         if ($search_info) {
             $search_info .= '<br>';
         }
-        $search_info .= _MD_NEWBB_USERNAME . ': ' . $myts->htmlSpecialChars($search_username);
+        $search_info .= _MD_NEWBB_USERNAME.': '.$myts->htmlSpecialChars($search_username);
     }
     // add num_results
-    $search_info .= '<br>' . sprintf(_SR_SHOWING, $start + 1, $start + $num_results);
+    $search_info .= '<br>'.sprintf(_SR_SHOWING, $start + 1, $start + $num_results);
     // if any result skip show the counter
     if (!empty($skipresults)) {
-        $search_info .= ' - ' . sprintf(_SR_FOUND, $num_results - $skipresults);
+        $search_info .= ' - '.sprintf(_SR_FOUND, $num_results - $skipresults);
     }
     $xoopsTpl->assign('search_info', $search_info);
 }
@@ -275,18 +275,18 @@ 
 if ('OR' === $andor) {
     $andor_select .= ' selected="selected"';
 }
-$andor_select .= '>' . _SR_ANY . '</option>';
+$andor_select .= '>'._SR_ANY.'</option>';
 $andor_select .= '<option value="AND"';
 if ('AND' === $andor || empty($andor)) {
     $andor_select .= ' selected="selected"';
 }
-$andor_select .= '>' . _SR_ALL . '</option>';
+$andor_select .= '>'._SR_ALL.'</option>';
 $andor_select .= '</select>';
 $xoopsTpl->assign('andor_selection_box', $andor_select);
 
 /* forum */
 $select_forum = '<select class="form-control" name="forum[]" id="forum" size="5" multiple="multiple">';
-$select_forum .= '<option value="all">' . _MD_NEWBB_SEARCHALLFORUMS . '</option>';
+$select_forum .= '<option value="all">'._MD_NEWBB_SEARCHALLFORUMS.'</option>';
 $select_forum .= newbbForumSelectBox($forum);
 $select_forum .= '</select>';
 $xoopsTpl->assign_by_ref('forum_selection_box', $select_forum);
@@ -297,17 +297,17 @@ 
 if ('title' === $searchin) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= ' />' . _MD_NEWBB_SUBJECT . ' </label>';
+$searchin_select .= ' />'._MD_NEWBB_SUBJECT.' </label>';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="text"';
 if ('text' === $searchin) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= ' />' . _MD_NEWBB_BODY . ' </label>';
+$searchin_select .= ' />'._MD_NEWBB_BODY.' </label>';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="both"';
 if ('both' === $searchin || empty($searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= ' />' . _MD_NEWBB_SUBJECT . ' & ' . _MD_NEWBB_BODY . ' </label>';
+$searchin_select .= ' />'._MD_NEWBB_SUBJECT.' & '._MD_NEWBB_BODY.' </label>';
 $xoopsTpl->assign('searchin_radio', $searchin_select);
 
 /* show_search */
@@ -316,12 +316,12 @@ 
 if ('post' === $show_search) {
     $show_search_select .= ' checked';
 }
-$show_search_select .= ' />' . _MD_NEWBB_POSTS . ' </label>';
+$show_search_select .= ' />'._MD_NEWBB_POSTS.' </label>';
 $show_search_select .= '<label class="radio-inline"><input type="radio" name="show_search" value="post_text"';
 if ('post_text' === $show_search || empty($show_search)) {
     $show_search_select .= ' checked';
 }
-$show_search_select .= ' />' . _MD_NEWBB_SEARCHPOSTTEXT . ' </label>';
+$show_search_select .= ' />'._MD_NEWBB_SEARCHPOSTTEXT.' </label>';
 $xoopsTpl->assign('show_search_radio', $show_search_select);
 
 /* author */
@@ -333,12 +333,12 @@ 
 if ('p.post_time' === $sortby || empty($sortby)) {
     $sortby_select .= ' selected=\'selected\'';
 }
-$sortby_select .= '>' . _MD_NEWBB_DATE . '</option>';
+$sortby_select .= '>'._MD_NEWBB_DATE.'</option>';
 $sortby_select .= '<option value=\'p.subject\'';
 if ('p.subject' === $sortby) {
     $sortby_select .= ' selected="selected"';
 }
-$sortby_select .= '>' . _MD_NEWBB_TOPIC . '</option>';
+$sortby_select .= '>'._MD_NEWBB_TOPIC.'</option>';
 $sortby_select .= '</select>';
 $xoopsTpl->assign('sortby_selection_box', $sortby_select);
 
@@ -354,5 +354,5 @@ 
     $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

reply.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $forum    = Request::getInt('forum', 0, 'GET');
 $topic_id = Request::getInt('topic_id', 0, 'GET');
@@ -65,7 +65,7 @@ 
 
 $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);
 }
 
 $topicObject  = $topicHandler->get($topic_id);
@@ -78,7 +78,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);
@@ -133,8 +133,8 @@ 
 $r_subject = $postParentObject->getVar('subject', 'E');
 
 $subject = $r_subject;
-if (!preg_match('/^(Re|' . _MD_NEWBB_RE . '):/i', $r_subject)) {
-    $subject = _MD_NEWBB_RE . ': ' . $r_subject;
+if (!preg_match('/^(Re|'._MD_NEWBB_RE.'):/i', $r_subject)) {
+    $subject = _MD_NEWBB_RE.': '.$r_subject;
 }
 
 $q_message = $postParentObject->getVar('post_text', 'e');
@@ -143,12 +143,12 @@ 
     if (1 === Request::getInt('quotedac', 0, 'GET')) {
         $message = "[quote]\n";
         $message .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
-        $message .= "\n" . $q_message . '[/quote]';
+        $message .= "\n".$q_message.'[/quote]';
         $hidden  = '';
     } else {
         $hidden  = "[quote]\n";
         $hidden  .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
-        $hidden  .= "\n" . $q_message . '[/quote]';
+        $hidden  .= "\n".$q_message.'[/quote]';
         $message = '';
     }
 } else {
@@ -167,7 +167,7 @@ 
 $post_karma    = 0;
 $require_reply = 0;
 
-require_once __DIR__   . '/include/form.post.php';
+require_once __DIR__.'/include/form.post.php';
 
 ///** @var Newbb\KarmaHandler $karmaHandler */
 //$karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
@@ -180,7 +180,7 @@ 
 foreach ($posts_contextObject as $post_contextObject) {
     // Sorry, in order to save queries, we have to hide the non-open post_text even if you have replied or have adequate karma, even an admin.
     if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
-        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')) . '</div>';
+        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')).'</div>';
     } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post_contextObject->getVar('require_reply')) {
         $p_message = _MD_NEWBB_REPLY_REQUIREMENT;
     } else {
@@ -198,11 +198,11 @@ 
 
     $posts_context[] = [
         'subject' => $p_subject,
-        'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
+        'meta'    => _MD_NEWBB_BY.' '.$p_name.' '._MD_NEWBB_ON.' '.$p_date,
         'content' => $p_message
     ];
 }
 $xoopsTpl->assign_by_ref('posts_context', $posts_context);
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');