mambax7 / newbb5

include/search.inc.php

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
     $criteriaPost = new \CriteriaCompo();
     $criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts
 
-    $forum_list = [];// get forum lists just for forum names
+    $forum_list = []; // get forum lists just for forum names
     if (count($validForums) > 0) {
         $criteriaPermissions = new \CriteriaCompo();
-        $criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND');
-        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false);
+        $criteriaPermissions->add(new \Criteria('p.forum_id', '('.implode(',', $validForums).')', 'IN'), 'AND');
+        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '('.implode(', ', $validForums).')', 'IN'), 'forum_name', false);
     }
 
     if (is_numeric($userid) && 0 !== $userid) {
@@ -68,7 +68,7 @@ 
     } elseif (is_array($userid) && count($userid) > 0) {
         $userid       = array_map('intval', $userid);
         $criteriaUser = new \CriteriaCompo();
-        $criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR');
+        $criteriaUser->add(new \Criteria('p.uid', '('.implode(',', $userid).')', 'IN'), 'OR');
     }
 
     $count = 0;
@@ -80,7 +80,7 @@ 
         $criteriaKeywords = new \CriteriaCompo();
         foreach ($queryarray as $queryTerm) {
             $termCriteria  = new \CriteriaCompo();
-            $queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%';
+            $queryTermLike = '%'.$xoopsDB->escape($queryTerm).'%';
             if ('title' === $searchin || 'both' === $searchin) {
                 $termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR');
             }
@@ -90,7 +90,7 @@ 
             $criteriaKeywords->add($termCriteria, $andor);
         }
         // add highlight keywords to post links
-        $highlightKey = '&keywords=' . implode(' ', $queryarray);
+        $highlightKey = '&keywords='.implode(' ', $queryarray);
         $highlightKey = str_replace(' ', '+', $highlightKey);
     }
     $criteria = new \CriteriaCompo();
@@ -131,14 +131,14 @@ 
         $post                  = $posts[$id];
         $post_data             = $post->getPostBody();
         $ret[$i]['topic_id']   = $post->getVar('topic_id');
-        $ret[$i]['link']       = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key
+        $ret[$i]['link']       = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post->getVar('post_id').$highlightKey; // add highlight key
         $ret[$i]['title']      = $post_data['subject'];
         $ret[$i]['time']       = $post_data['date'];
         $ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']);
-        $ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id');
+        $ret[$i]['forum_link'] = XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$post->getVar('forum_id');
         $ret[$i]['post_text']  = $post_data['text'];
         $ret[$i]['uid']        = $post->getVar('uid');
-        $ret[$i]['poster']     = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author'];
+        $ret[$i]['poster']     = $post->getVar('uid') ? '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$ret[$i]['uid'].'">'.$post_data['author'].'</a>' : $post_data['author'];
         ++$i;
     }
 

include/notification.inc.php

Spacing +9 added lines, -9 removed lines

@@ -54,42 +54,42 @@
 
         if ('forum' === $category) {
             // Assume we have a valid forum id
-            $sql = 'SELECT forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' WHERE forum_id = ' . $item_id;
+            $sql = 'SELECT forum_name FROM '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' WHERE forum_id = '.$item_id;
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERRORFORUM);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERRORFORUM);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['forum_name'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewforum.php?forum=' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewforum.php?forum='.$item_id;
 
             return $item;
         }
 
         if ('thread' === $category) {
             // Assume we have a valid topid id
-            $sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = ' . $item_id . ' LIMIT 1';
+            $sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' t, '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' f WHERE t.forum_id = f.forum_id AND t.topic_id = '.$item_id.' LIMIT 1';
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERROROCCURED);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['topic_title'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum=' . $result_array['forum_id'] . '&topic_id=' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewtopic.php?forum='.$result_array['forum_id'].'&topic_id='.$item_id;
 
             return $item;
         }
 
         if ('post' === $category) {
             // Assume we have a valid post id
-            $sql = 'SELECT subject,topic_id,forum_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
+            $sql = 'SELECT subject,topic_id,forum_id FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' WHERE post_id = '.$item_id.' LIMIT 1';
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERROROCCURED);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['subject'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum= ' . $result_array['forum_id'] . '&topic_id=' . $result_array['topic_id'] . '#forumpost' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewtopic.php?forum= '.$result_array['forum_id'].'&topic_id='.$result_array['topic_id'].'#forumpost'.$item_id;
 
             return $item;
         }

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') || include __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || include __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_READ_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_READ')) {

include/functions.recon.php

Spacing +1 added lines, -1 removed lines

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

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') || include __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || include __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 +11 added lines, -11 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);
 }
 
 /**
@@ -88,21 +88,21 @@ 
         if ($tables->useTable($table)) {
             $tables->alterColumn($table, $column, $attributes, $newName);
             if (!$tables->executeQueue()) {
-                echo '<br>' . _AM_XXXXX_UPGRADEFAILED0 . ' ' . $migrate->getLastError();
+                echo '<br>'._AM_XXXXX_UPGRADEFAILED0.' '.$migrate->getLastError();
             }
         }
 
         //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);
                             }
                         }
                     }
@@ -114,7 +114,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);
                 }
@@ -126,7 +126,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);
@@ -143,15 +143,15 @@ 
 
         //  ---  COPY blank.png FILES ---------------
         if (count($configurator->copyBlankFiles) > 0) {
-            $file = __DIR__ . '/../assets/images/blank.png';
+            $file = __DIR__.'/../assets/images/blank.png';
             foreach (array_keys($configurator->copyBlankFiles) as $i) {
-                $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+                $dest = $configurator->copyBlankFiles[$i].'/blank.png';
                 $utilityClass::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 $gpermHandler */

include/plugin.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 // MENU handler
 /* You could remove anyone by commenting out in order to disable it */
 $customConfig['valid_menumodes'] = [
-    0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
+    0 => _MD_NEWBB_MENU_SELECT, // for selectbox
     //1 => _MD_NEWBB_MENU_CLICK,    // for "click to expand"
     //2 => _MD_NEWBB_MENU_HOVER        // for "mouse hover to expand"
 ];

include/plugin.dist.php

Spacing +2 added lines, -2 removed lines

@@ -72,8 +72,8 @@
 // MENU handler
 /* You could remove anyone by commenting out in order to disable it */
 $valid_menumodes = [
-    0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
-    1 => _MD_NEWBB_MENU_CLICK,    // for 'click to expand'
+    0 => _MD_NEWBB_MENU_SELECT, // for selectbox
+    1 => _MD_NEWBB_MENU_CLICK, // for 'click to expand'
     2 => _MD_NEWBB_MENU_HOVER        // for 'mouse hover to expand'
 ];
 

include/functions.forum.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || include __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || include __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_FORUM_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_FORUM')) {
@@ -40,8 +40,8 @@ 
             $groups = $xoopsUser->getGroups();
         }
         sort($groups);
-        $groupKey = 'forumselect_' . $permission . '_' . md5(implode(',', $groups));
-        $forums   = $cacheHelper->cacheRead($groupKey, function () use ($categories, $permission) {
+        $groupKey = 'forumselect_'.$permission.'_'.md5(implode(',', $groups));
+        $forums   = $cacheHelper->cacheRead($groupKey, function() use ($categories, $permission) {
             /** @var Newbb\CategoryHandler $categoryHandler */
             $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
             $categories      = $categoryHandler->getByPermission($permission, ['cat_id', 'cat_order', 'cat_title'], false);
@@ -61,7 +61,7 @@ 
                 if ($categoryDelimiter) {
                     $box .= "<option value=0>&nbsp;</option>\n";
                 }
-                $box .= "<option value='" . (-1 * $key) . "'>[" . $categories[$key]['cat_title'] . "]</option>\n";
+                $box .= "<option value='".(-1 * $key)."'>[".$categories[$key]['cat_title']."]</option>\n";
                 if (empty($forums[$key])) {
                     continue;
                 }
@@ -69,11 +69,11 @@ 
                     if ($see && in_array($f, $value)) {
                         continue;
                     }
-                    $box .= "<option value='{$f}' " . (in_array($f, $value) ? ' selected' : '') . '>' . $forum['prefix'] . $forum['forum_name'] . "</option>\n";
+                    $box .= "<option value='{$f}' ".(in_array($f, $value) ? ' selected' : '').'>'.$forum['prefix'].$forum['forum_name']."</option>\n";
                 }
             }
         } else {
-            $box .= '<option value=0>' . _MD_NEWBB_NOFORUMINDB . "</option>\n";
+            $box .= '<option value=0>'._MD_NEWBB_NOFORUMINDB."</option>\n";
         }
         unset($forums, $categories);
 
@@ -86,11 +86,11 @@ 
      */
     function newbbMakeJumpbox($forum_id = 0)
     {
-        $box = '<form name="forum_jumpbox" method="get" action="' . XOOPS_URL . '/modules/newbb/viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value &lt; 1) {return false;}">';
+        $box = '<form name="forum_jumpbox" method="get" action="'.XOOPS_URL.'/modules/newbb/viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value &lt; 1) {return false;}">';
         $box .= '<select class="select" name="forum" onchange="if (this.options[this.selectedIndex].value >0) { document.forms.forum_jumpbox.submit();}">';
-        $box .= '<option value=0>-- ' . _MD_NEWBB_SELFORUM . ' --</option>';
+        $box .= '<option value=0>-- '._MD_NEWBB_SELFORUM.' --</option>';
         $box .= newbbForumSelectBox($forum_id);
-        $box .= "</select> <input type='submit' class='button' value='" . _GO . "' /></form>";
+        $box .= "</select> <input type='submit' class='button' value='"._GO."' /></form>";
         unset($forums, $categories);
 
         return $box;