mambax7 / newbb5

admin/admin_type_manager.php

Spacing +64 added lines, -64 removed lines

@@ -12,7 +12,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 echo '<br>';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
@@ -85,7 +85,7 @@ 
             }
         }
         if (count($type_del) > 0) {
-            $type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', $type_del) . ')', 'IN'));
+            $type_list = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', $type_del).')', 'IN'));
             xoops_confirm(['op' => 'delete', 'type_del' => serialize($type_del)], xoops_getenv('PHP_SELF'), sprintf(_AM_NEWBB_TODEL_TYPE, implode(', ', array_values($type_list))), '', false);
         } else {
             redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
@@ -115,14 +115,14 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_ORDER_DESC.'</legend>';
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='template' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
         if ($templates = $cacheHelper->read('type_template')) {
@@ -133,9 +133,9 @@ 
                 }
                 $typeObject = $typesObject[$key];
                 echo "<tr class='even' align='left'>";
-                echo "<td><input type='text' name='type_order[{$key}]' value='" . $order . "' size='10' /></td>";
-                echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-                echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+                echo "<td><input type='text' name='type_order[{$key}]' value='".$order."' size='10' /></td>";
+                echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+                echo '<td>'.$typeObject->getVar('type_description').'</td>';
                 echo '</tr>';
                 unset($typesObject[$key]);
             }
@@ -144,15 +144,15 @@ 
         foreach ($typesObject as $key => $typeObject) {
             echo "<tr class='odd' align='left'>";
             echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
         }
 
         echo "<tr><td colspan='3' style='text-align:center;'>";
         echo "<input type='hidden' name='op' value='save_template' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
@@ -161,12 +161,12 @@ 
     case 'save_template':
         $templates = array_flip(array_filter(Request::getArray('type_order', [], 'POST')));
         $cacheHelper->write('type_template', $templates);
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _MD_NEWBB_DBUPDATED);
+        redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _MD_NEWBB_DBUPDATED);
         break;
 
     case 'apply':
         if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
         }
 
         //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
@@ -176,9 +176,9 @@ 
         //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
         $forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
         foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+            $fm_options[-1 * $c] = '['.$categories[$c].']';
             foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+                $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
             }
         }
         unset($forums, $categories);
@@ -199,15 +199,15 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
 
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
-        $typesObject = $typeHandler->getAll(new \Criteria('type_id', '(' . implode(', ', array_values($templates)) . ')', 'IN'));
+        $typesObject = $typeHandler->getAll(new \Criteria('type_id', '('.implode(', ', array_values($templates)).')', 'IN'));
         arsort($templates);
         foreach ($templates as $order => $key) {
             if (!isset($typesObject[$key])) {
@@ -215,9 +215,9 @@ 
             }
             $typeObject = $typesObject[$key];
             echo "<tr class='even' align='left'>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $order . '</td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$order.'</td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
             unset($typesObject[$key]);
         }
@@ -229,7 +229,7 @@ 
 
     case 'save_apply':
         if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
         }
         foreach (Request::getArray('forums', [], 'POST') as $forum) {
             if ($forum < 1) {
@@ -255,9 +255,9 @@ 
         }
 
         foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+            $fm_options[-1 * $c] = '['.$categories[$c].']';
             foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+                $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
             }
         }
         unset($forums, $categories);
@@ -282,12 +282,12 @@ 
 
     case 'edit_forum':
         if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
         }
 
         //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
         if (!$forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'))) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
         }
 
         $typesObject = $typeHandler->getAll();
@@ -299,14 +299,14 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_ORDER_DESC.'</legend>';
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='template' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
         $types       = $typeHandler->getByForum(Request::getInt('forum', 0, 'POST'));
@@ -321,9 +321,9 @@ 
             }
             $typeObject = $typesObject[$type['type_id']];
             echo "<tr class='even' align='left'>";
-            echo "<td><input type='text' name='type_order[" . $type['type_id'] . "]' value='" . $type['type_order'] . "' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><input type='text' name='type_order[".$type['type_id']."]' value='".$type['type_order']."' size='10' /></td>";
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
             unset($typesObject[$type['type_id']]);
         }
@@ -331,17 +331,17 @@ 
         foreach ($typesObject as $key => $typeObject) {
             echo "<tr class='odd' align='left'>";
             echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
         }
 
         echo "<tr><td colspan='3' style='text-align:center;'>";
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_EDITFORUM_DESC . '</legend>';
-        echo "<input type='hidden' name='forum' value='" . Request::getInt('forum', 0, 'POST') . "' />";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_EDITFORUM_DESC.'</legend>';
+        echo "<input type='hidden' name='forum' value='".Request::getInt('forum', 0, 'POST')."' />";
         echo "<input type='hidden' name='op' value='save_forum' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
@@ -349,10 +349,10 @@ 
 
     case 'save_forum':
         if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
         }
         $typeHandler->updateByForum(Request::getInt('forum', 0, 'POST'), Request::getArray('type_order', null, 'POST'));
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _MD_NEWBB_DBUPDATED);
+        redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _MD_NEWBB_DBUPDATED);
         break;
 
     case 'add':
@@ -372,16 +372,16 @@ 
             $adminObject->displayButton('left');
         }
         echo _AM_NEWBB_TYPE_HELP;
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='list' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
         if ('add' !== $op) {
-            echo "<th class='bg3' width='5%'>" . _DELETE . '</th>';
+            echo "<th class='bg3' width='5%'>"._DELETE.'</th>';
         }
-        echo "<th align='left' class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='15%'>" . _AM_NEWBB_TYPE_COLOR . '</th>';
-        echo "<th align='left' class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th align='left' class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3' width='15%'>"._AM_NEWBB_TYPE_COLOR.'</th>';
+        echo "<th align='left' class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
 //        $isColorpicker = require_once $GLOBALS['xoops']->path('class/xoopsform/formcolorpicker.php');
@@ -391,14 +391,14 @@ 
             foreach ($typesObject as $key => $typeObject) {
                 echo "<tr class='odd' align='left'>";
                 echo "<td><input type='checkbox' name='type_del[{$key}]' /></td>";
-                echo "<td><input type='text' name='type_name[{$key}]' value='" . $typeObject->getVar('type_name') . "' size='10' /></td>";
+                echo "<td><input type='text' name='type_name[{$key}]' value='".$typeObject->getVar('type_name')."' size='10' /></td>";
                 if ($isColorpicker) {
                     $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$key}]", $typeObject->getVar('type_color'));
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
+                    echo '<td>'.$form_colorpicker->render().'</td>';
                 } else {
-                    echo "<td><input type='text' name='type_color[{$key}]' value='" . $typeObject->getVar('type_color') . "' size='10' /></td>";
+                    echo "<td><input type='text' name='type_color[{$key}]' value='".$typeObject->getVar('type_color')."' size='10' /></td>";
                 }
-                echo "<td><input type='text' name='type_description[{$key}]' value='" . $typeObject->getVar('type_description') . "' size='30' /></td>";
+                echo "<td><input type='text' name='type_description[{$key}]' value='".$typeObject->getVar('type_description')."' size='30' /></td>";
                 echo '</tr>';
             }
             echo "<tr><td colspan='4' style='text-align:center;'>";
@@ -411,7 +411,7 @@ 
                 echo "<td><input type='text' name='type_name[{$i}]' value='' size='10' /></td>";
                 if ($isColorpicker) {
                     $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$i}]", '');
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
+                    echo '<td>'.$form_colorpicker->render().'</td>';
                 } else {
                     echo "<td><input type='text' name='type_color[{$i}]' value='' size='10' /></td>";
                 }
@@ -422,16 +422,16 @@ 
             echo "<input type='hidden' name='isnew' value='1' />";
         }
         echo "<input type='hidden' name='op' value='save_type' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_TYPE . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_TYPE.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_TYPE_TAB;
         echo '</fieldset>';
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/menu.php

Spacing +14 added lines, -14 removed lines

@@ -41,82 +41,82 @@
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_INDEX,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . 'home.png'
+    'icon'  => $pathIcon32.'home.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_CATEGORY,
     'link'  => 'admin/admin_cat_manager.php',
-    'icon'  => $pathIcon32 . 'category.png'
+    'icon'  => $pathIcon32.'category.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_FORUM,
     'link'  => 'admin/admin_forum_manager.php',
-    'icon'  => $pathIcon32 . 'forums.png'
+    'icon'  => $pathIcon32.'forums.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_PERMISSION,
     'link'  => 'admin/admin_permissions.php',
-    'icon'  => $pathIcon32 . 'permissions.png'
+    'icon'  => $pathIcon32.'permissions.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_ORDER,
     'link'  => 'admin/admin_forum_reorder.php',
-    'icon'  => $pathIcon32 . 'compfile.png'
+    'icon'  => $pathIcon32.'compfile.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_PRUNE,
     'link'  => 'admin/admin_forum_prune.php',
-    'icon'  => $pathIcon32 . 'update.png'
+    'icon'  => $pathIcon32.'update.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_REPORT,
     'link'  => 'admin/admin_report.php',
-    'icon'  => $pathIcon32 . 'content.png'
+    'icon'  => $pathIcon32.'content.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_DIGEST,
     'link'  => 'admin/admin_digest.php',
-    'icon'  => $pathIcon32 . 'digest.png'
+    'icon'  => $pathIcon32.'digest.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_VOTE,
     'link'  => 'admin/admin_votedata.php',
-    'icon'  => $pathIcon32 . 'button_ok.png'
+    'icon'  => $pathIcon32.'button_ok.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_TYPE,
     'link'  => 'admin/admin_type_manager.php',
-    'icon'  => $pathIcon32 . 'type.png'
+    'icon'  => $pathIcon32.'type.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_GROUPMOD,
     'link'  => 'admin/admin_groupmod.php',
-    'icon'  => $pathIcon32 . 'groupmod.png'
+    'icon'  => $pathIcon32.'groupmod.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_SYNC,
     'link'  => 'admin/admin_synchronization.php',
-    'icon'  => $pathIcon32 . 'synchronized.png'
+    'icon'  => $pathIcon32.'synchronized.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_MIGRATE,
     'link'  => 'admin/migrate.php',
-    'icon'  => $pathIcon32 . 'database_go.png'
+    'icon'  => $pathIcon32.'database_go.png'
 ];
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . 'about.png'
+    'icon'  => $pathIcon32.'about.png'
 ];

class/Common/Configurator.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $moduleDirName = basename(dirname(dirname(__DIR__)));
         $capsDirName   = strtoupper($moduleDirName);
 
-        require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+        require_once  dirname(dirname(__DIR__)).'/include/config.php';
         $config = getConfig();
 
         $this->name            = $config->name;

class/Common/VersionChecks.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
     public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
     {
         $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
+        $moduleDirNameUpper = strtoupper($moduleDirName);
         if (null === $module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
@@ -38,13 +38,13 @@ 
         //check for minimum XOOPS version
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
         if (version_compare($currentVer, $requiredVer, '<')) {
             $success = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -61,7 +61,7 @@ 
     public static function checkVerPhp(\XoopsModule $module)
     {
         $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
+        $moduleDirNameUpper = strtoupper($moduleDirName);
         xoops_loadLanguage('admin', $module->dirname());
         // check for minimum PHP version
         $success = true;
@@ -69,7 +69,7 @@ 
         $reqVer  = $module->getInfo('min_php');
         if (false !== $reqVer && '' !== $reqVer) {
             if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }

class/Common/Migrate.php

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
      * @throws \InvalidArgumentException
      */
     public function __construct()
-    {   require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+    {   require_once  dirname(dirname(__DIR__)).'/include/config.php';
         $config = getConfig();
-        $this->renameTables            = $config->renameTables;
+        $this->renameTables = $config->renameTables;
 
         $moduleDirName = basename(dirname(dirname(__DIR__)));
         parent::__construct($moduleDirName);
@@ -89,7 +89,7 @@ 
                 $this->synchronizeTable($tableName);
                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
                 $this->tableHandler->addToQueue($sql);
             }
         }

class/Readtopic.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/Read.php';
+require_once __DIR__.'/Read.php';
 
 /**
  * A handler for read/unread handling

class/ReadForum.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/Read.php';
+require_once __DIR__.'/Read.php';
 
 /**
  * A handler for read/unread handling

include/functions.config.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 use XoopsModules\Newbb;
 
-defined('NEWBB_FUNCTIONS_INI') || require __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_CONFIG_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_CONFIG')) {
@@ -37,7 +37,7 @@ 
         }
 
         $configs = is_object($helper) ? $helper->getConfig() : [];
-        $plugins = require __DIR__   . '/plugin.php';
+        $plugins = require __DIR__.'/plugin.php';
         if (is_array($configs) && is_array($plugins)) {
             $configs = array_merge($configs, $plugins);
         }

class/StatsHandler.php

Spacing +19 added lines, -19 removed lines

@@ -12,7 +12,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_STATS_TYPE_TOPIC', 1);
 define('NEWBB_STATS_TYPE_POST', 2);
@@ -71,14 +71,14 @@ 
      */
     public function update($id, $type, $increment = 1)
     {
-        $id        = (int)$id;
-        $increment = (int)$increment;
+        $id        = (int) $id;
+        $increment = (int) $increment;
 
         if (empty($increment) || false === ($type = array_search($type, $this->param['type']))) {
             return false;
         }
 
-        $sql    = "    UPDATE {$this->table}"
+        $sql = "    UPDATE {$this->table}"
                   . '    SET stats_value = CASE '
                   . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
                   . "                    ELSE '{$increment}' "
@@ -90,7 +90,7 @@ 
         $result = $this->db->queryF($sql);
         $rows   = $this->db->getAffectedRows();
         if (0 == $rows) {
-            $sql    = "    INSERT INTO {$this->table}"
+            $sql = "    INSERT INTO {$this->table}"
                       . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
                       . '    VALUES '
                       . "        ('0', '{$increment}', '{$type}', '"
@@ -147,7 +147,7 @@ 
         foreach ($periods as $period) {
             $_periods[] = array_search($period, $this->param['period']);
         }
-        $sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
+        $sql = '    SELECT stats_id, stats_value, stats_type, stats_period '
                   . "    FROM {$this->table} "
                   . '    WHERE '
                   . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
@@ -156,13 +156,13 @@ 
                                         . implode(', ', array_map('intval', $ids))
                                         . ')')
                   . '        '
-                  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
+                  . (empty($_types) ? '' : 'AND stats_type IN ('.implode(', ', $_types).')')
                   . '        '
-                  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
+                  . (empty($_periods) ? '' : 'AND stats_period IN ('.implode(', ', $_periods).')');
         $result = $this->db->query($sql);
 
         while (false !== ($row = $this->db->fetchArray($result))) {
-            $ret[(string)$row['stats_id']][$this->param['type'][$row['stats_type']]][$this->param['period'][$row['stats_period']]] = $row['stats_value'];
+            $ret[(string) $row['stats_id']][$this->param['type'][$row['stats_type']]][$this->param['period'][$row['stats_period']]] = $row['stats_value'];
         }
 
         return $ret;
@@ -170,36 +170,36 @@ 
 
     public function reset()
     {
-        $this->db->queryF('TRUNCATE TABLE ' . $this->table);
+        $this->db->queryF('TRUNCATE TABLE '.$this->table);
         $now        = time();
         $time_start = [
             'day'   => '%Y%j',
             'week'  => '%Y%u',
             'month' => '%Y%m'
         ];
-        $counts     = [];
+        $counts = [];
 
-        $sql = '    SELECT forum_id' . '    FROM ' . $this->db->prefix('newbb_forums');
+        $sql = '    SELECT forum_id'.'    FROM '.$this->db->prefix('newbb_forums');
         $ret = $this->db->query($sql);
         while (false !== (list($forum_id) = $this->db->fetchRow($ret))) {
-            $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*), SUM(topic_views)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($topics, $views) = $this->db->fetchRow($result);
             $this->update($forum_id, 'topic', $topics);
             $this->update($forum_id, 'view', $views);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($digests) = $this->db->fetchRow($result);
             $this->update($forum_id, 'digest', $digests);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_posts')."    WHERE approved=1 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($posts) = $this->db->fetchRow($result);
             $this->update($forum_id, 'post', $posts);
 
             foreach ($time_start as $period => $format) {
-                $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*), SUM(topic_views)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($topics, $views) = $this->db->fetchRow($result);
                 $views = empty($views) ? 0 : $views; // null check
@@ -222,7 +222,7 @@ 
                 @$counts['topic'][$period] += $topics;
                 @$counts['view'][$period] += $views;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($digests) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
@@ -235,7 +235,7 @@ 
                                   . "', NOW(), '{$format}')");
                 @$counts['digest'][$period] += $digests;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_posts')."    WHERE approved=1 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($posts) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
@@ -250,7 +250,7 @@ 
             }
         }
 
-        $this->db->queryF("    DELETE FROM {$this->table}" . "    WHERE stats_id = '0' AND stats_period <> " . array_search('total', $this->param['period'], true));
+        $this->db->queryF("    DELETE FROM {$this->table}"."    WHERE stats_id = '0' AND stats_period <> ".array_search('total', $this->param['period'], true));
         foreach ($time_start as $period => $format) {
             foreach (array_keys($counts) as $type) {
                 $this->db->queryF("    INSERT INTO {$this->table}"