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

include/form.post.php

Indentation +18 added lines, -18 removed lines

@@ -51,9 +51,9 @@ 
 $xoopsTpl->assign('category', ['id' => $forumObject->getVar('cat_id'), 'title' => $categoryObject->getVar('cat_title')]);
 $xoopsTpl->assign('parentforum', $forumHandler->getParents($forumObject));
 $xoopsTpl->assign([
-                      'forum_id'   => $forumObject->getVar('forum_id'),
-                      'forum_name' => $forumObject->getVar('forum_name')
-                  ]);
+                        'forum_id'   => $forumObject->getVar('forum_id'),
+                        'forum_name' => $forumObject->getVar('forum_name')
+                    ]);
 
 if (!is_object($topicObject)) {
     $topicObject = $topicHandler->create();
@@ -74,24 +74,24 @@ 
 $xoopsTpl->assign('form_title', $form_title);
 
 foreach ([
-             'start',
-             'topic_id',
-             'post_id',
-             'pid',
-             'isreply',
-             'isedit',
-             'contents_preview'
-         ] as $getint) {
+                'start',
+                'topic_id',
+                'post_id',
+                'pid',
+                'isreply',
+                'isedit',
+                'contents_preview'
+            ] as $getint) {
     ${$getint} = Request::getInt($getint, (!empty(${$getint}) ? ${$getint} : 0), 'GET'); // isset($_GET[$getint]) ? (int)($_GET[$getint]) : ((!empty(${$getint})) ? ${$getint} : 0);
 }
 foreach ([
-             'order',
-             'viewmode',
-             'hidden',
-             'newbb_form',
-             'icon',
-             'op'
-         ] as $getstr) {
+                'order',
+                'viewmode',
+                'hidden',
+                'newbb_form',
+                'icon',
+                'op'
+            ] as $getstr) {
     ${$getstr} = Request::getString($getstr, (!empty(${$getstr}) ? ${$getstr} : ''), 'GET'); //isset($_GET[$getstr]) ? $_GET[$getstr] : ((!empty(${$getstr})) ? ${$getstr} : '');
 }
 

Spacing +14 added lines, -14 removed lines

@@ -66,9 +66,9 @@ 
     if (empty($postParentObject)) {
         $postParentObject = $postHandler->get($pid);
     }
-    $form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&amp;post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>';
+    $form_title = _MD_NEWBB_REPLY.': <a href="'.XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}&amp;post_id={$pid}\" rel=\"external\">".$postParentObject->getVar('subject').'</a>';
 } else {
-    $form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>';
+    $form_title = _EDIT.': <a href="'.XOOPS_URL."/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">".$postObject->getVar('subject').'</a>';
     $editby     = true;
 }
 $xoopsTpl->assign('form_title', $form_title);
@@ -101,7 +101,7 @@ 
 
 //$filname = XOOPS_URL.$_SERVER['REQUEST_URI'];
 
-$forum_form = new \XoopsThemeForm(htmlspecialchars(@$form_title), 'form_post', XOOPS_URL . '/modules/newbb/post.php', 'post', true);
+$forum_form = new \XoopsThemeForm(htmlspecialchars(@$form_title), 'form_post', XOOPS_URL.'/modules/newbb/post.php', 'post', true);
 $forum_form->setExtra('enctype="multipart/form-data"');
 
 if ($editby) {
@@ -143,7 +143,7 @@ 
 $icons_radio   = new \XoopsFormRadio(_MD_NEWBB_MESSAGEICON, 'icon', $icon);
 $subject_icons = \XoopsLists::getSubjectsList();
 foreach ($subject_icons as $iconfile) {
-    $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
+    $icons_radio->addOption($iconfile, '<img src="'.XOOPS_URL.'/images/subject/'.$iconfile.'" alt="" />');
 }
 $forum_form->addElement($icons_radio);
 
@@ -251,18 +251,18 @@ 
     $upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT);
     $upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024));
     $upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit'));
-    $upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; '));
+    $upload_tray->addElement(new \XoopsFormLabel('<br><br>'._MD_NEWBB_MAX_FILESIZE.':', $forumObject->getVar('attach_maxkb').'Kb; '));
     $extensions = trim(str_replace('|', ' ', $forumObject->getVar('attach_ext')));
     $extensions = (empty($extensions) || '*' === $extensions) ? _ALL : $extensions;
-    $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions));
-    $upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
+    $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS.':', $extensions));
+    $upload_tray->addElement(new \XoopsFormLabel('<br>'.sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
     $forum_form->addElement($upload_tray);
 }
 
 if (!empty($attachments) && is_array($attachments) && count($attachments)) {
     $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]');
     foreach ($attachments as $key => $attachment) {
-        $attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>';
+        $attach = ' '._DELETE.' <a href='.XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attachment['name_saved'].' rel="external">'.$attachment['nameDisplay'].'</a><br>';
         $delete_attach_checkbox->addOption($key, $attach);
     }
     $forum_form->addElement($delete_attach_checkbox);
@@ -273,7 +273,7 @@ 
     $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]');
     $url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
     foreach ($attachments_tmp as $key => $attachment) {
-        $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
+        $attach = ' <a href="'.$url_prefix.'/'.$attachment[0].'" rel="external">'.$attachment[1].'</a><br>';
         $delete_attach_checkbox->addOption($key, $attach);
     }
     $forum_form->addElement($delete_attach_checkbox);
@@ -296,7 +296,7 @@ 
             }
             $karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma);
             $karma_select->addOptionArray($karma_array);
-            $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render());
+            $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA.$karma_select->render());
         }
     }
     $radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL);
@@ -327,11 +327,11 @@ 
 
 $cancel_button = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
 if (!empty($topic_id)) {
-    $extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id;
+    $extra = XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.(int)$topic_id;
 } else {
-    $extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id');
+    $extra = XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$forumObject->getVar('forum_id');
 }
-$cancel_button->setExtra("onclick='location=\"" . $extra . "\"'");
+$cancel_button->setExtra("onclick='location=\"".$extra."\"'");
 $cancel_button->setExtra("tabindex='6'");
 
 if (!empty($isreply) && !empty($hidden)) {
@@ -345,7 +345,7 @@ 
 
 $preview_button = new \XoopsFormButton('', 'btn_preview', _PREVIEW, 'button');
 $preview_button->setExtra("tabindex='5'");
-$preview_button->setExtra('onclick="window.document.forms.' . $forum_form->getName() . '.contents_preview.value=1; window.document.forms.' . $forum_form->getName() . '.submit() ;"');
+$preview_button->setExtra('onclick="window.document.forms.'.$forum_form->getName().'.contents_preview.value=1; window.document.forms.'.$forum_form->getName().'.submit() ;"');
 $forum_form->addElement(new \XoopsFormHidden('contents_preview', 0));
 
 $button_tray->addElement($preview_button);

include/functions.topic.php

Spacing +3 added lines, -3 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_TOPIC_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TOPIC')) {
@@ -42,8 +42,8 @@ 
         if (empty($prefixName)) {
             return $topicTitle;
         }
-        $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] ';
+        $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: '.$prefixColor.';">['.$prefixName.']</em> ' : '['.$prefixName.'] ';
 
-        return $topicPrefix . $topicTitle;
+        return $topicPrefix.$topicTitle;
     }
 }