mambax7 / newbb5

include/functions.user.php

Indentation +12 added lines, -12 removed lines

@@ -184,18 +184,18 @@
     $mid = $xoopsModule->getVar('mid');
 
     $sql = 'SELECT COUNT(l.groupid) AS count, l.uid FROM '
-           . $xoopsMembershipTable
-           . ' AS l'
-           . ' LEFT JOIN '
-           . $xoopsGroupPermTable
-           . ' AS p ON p.gperm_groupid=l.groupid'
-           . ' WHERE l.uid IN ('
-           . implode(', ', array_map('intval', $uid))
-           . ')'
-           . "    AND p.gperm_modid = '1' AND p.gperm_name = 'module_admin' AND p.gperm_itemid = '"
-           . (int)$mid
-           . "'"
-           . ' GROUP BY l.uid';
+            . $xoopsMembershipTable
+            . ' AS l'
+            . ' LEFT JOIN '
+            . $xoopsGroupPermTable
+            . ' AS p ON p.gperm_groupid=l.groupid'
+            . ' WHERE l.uid IN ('
+            . implode(', ', array_map('intval', $uid))
+            . ')'
+            . "    AND p.gperm_modid = '1' AND p.gperm_name = 'module_admin' AND p.gperm_itemid = '"
+            . (int)$mid
+            . "'"
+            . ' GROUP BY l.uid';
 
     if ($result = $GLOBALS['xoopsDB']->query($sql)) {
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {

Spacing +1 added lines, -1 removed lines

@@ -222,7 +222,7 @@
         return $forum_moderators;
     }
 
-    $sql = 'SELECT forum_moderator FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums');
+    $sql = 'SELECT forum_moderator FROM '.$GLOBALS['xoopsDB']->prefix('newbb_forums');
     if ($result = $GLOBALS['xoopsDB']->query($sql)) {
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
             if (empty($myrow['forum_moderator'])) {

include/images.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 $forumImage['facebook'] = $forumImage['twitter'] = $forumImage['linkedin'] = $forumImage['googleplus'] = $forumImage['stumbleupon'] = $forumImage['friendfeed'] = $forumImage['digg'] = $forumImage['reddit'] = $forumImage['delicious'] = $forumImage['technorati'] = $forumImage['wong'] = $forumImage['anonym'] = $forumImage['more'] = $forumImage['less'] = 'icon';
 
 for ($i = 1; $i <= 5; ++$i) {
-    $forumImage['rate' . $i] = 'icon';
+    $forumImage['rate'.$i] = 'icon';
 }
 
 $forumImage['p_delete'] = $forumImage['p_reply'] = $forumImage['p_quote'] = $forumImage['p_edit'] = $forumImage['p_report'] =

topicmanager.php

Indentation +61 added lines, -61 removed lines

@@ -148,23 +148,23 @@ 
         $restoretopic_id = $topicObject->getVar('topic_id');
         // irmtfan / missing in URL
         echo $action[$mode]['msg']
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$restoretopic_id'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNTOTHEFORUM
-             . '</a></p>'
-             . "<p><a href='index.php'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewtopic.php?topic_id=$restoretopic_id'>"
+                . _MD_NEWBB_VIEWTHETOPIC
+                . '</a></p>'
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewforum.php?forum=$forum'>"
+                . _MD_NEWBB_RETURNTOTHEFORUM
+                . '</a></p>'
+                . "<p><a href='index.php'>"
+                . _MD_NEWBB_RETURNFORUMINDEX
+                . '</a></p>';
     } elseif ('merge' === $mode) {
         //        /** @var PostHandler $postHandler */
         //        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
@@ -222,28 +222,28 @@ 
             // END irmtfan poll_module and rewrite the method
         }
         echo $action[$mode]['msg']
-             . // irmtfan full URL
-             "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$newtopic'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNTOTHEFORUM
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/index.php'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
+                . // irmtfan full URL
+                "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewtopic.php?topic_id=$newtopic'>"
+                . _MD_NEWBB_VIEWTHETOPIC
+                . '</a></p>'
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewforum.php?forum=$forum'>"
+                . _MD_NEWBB_RETURNTOTHEFORUM
+                . '</a></p>'
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/index.php'>"
+                . _MD_NEWBB_RETURNFORUMINDEX
+                . '</a></p>';
     } elseif ('move' === $mode) {
         if ($newforum > 0) {
             $topic_id    = $topic_id[0];
@@ -261,17 +261,17 @@ 
             $forumHandler->synchronization($newforum);
             // irmtfan full URL
             echo $action[$mode]['msg']
-                 . "<p><a href='"
-                 . XOOPS_URL
-                 . '/modules/'
-                 . $xoopsModule->getVar('dirname')
-                 . "/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"
-                 . _MD_NEWBB_GOTONEWFORUM
-                 . "</a></p><p><a href='"
-                 . XOOPS_URL
-                 . "/modules/newbb/index.php'>"
-                 . _MD_NEWBB_RETURNFORUMINDEX
-                 . '</a></p>';
+                    . "<p><a href='"
+                    . XOOPS_URL
+                    . '/modules/'
+                    . $xoopsModule->getVar('dirname')
+                    . "/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"
+                    . _MD_NEWBB_GOTONEWFORUM
+                    . "</a></p><p><a href='"
+                    . XOOPS_URL
+                    . "/modules/newbb/index.php'>"
+                    . _MD_NEWBB_RETURNFORUMINDEX
+                    . '</a></p>';
         } else {
             // irmtfan - issue with javascript:history.go(-1)
             redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERRORFORUM);
@@ -312,17 +312,17 @@ 
         }
         // irmtfan full URL
         echo $action[$mode]['msg']
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . "</a></p><p><a href='"
-             . XOOPS_URL
-             . "/modules/newbb/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"
+                . _MD_NEWBB_VIEWTHETOPIC
+                . "</a></p><p><a href='"
+                . XOOPS_URL
+                . "/modules/newbb/viewforum.php?forum=$forum'>"
+                . _MD_NEWBB_RETURNFORUMINDEX
+                . '</a></p>';
     }
 } else {  // No submit
     $mode = Request::getString('mode', '', 'GET'); //$_GET['mode'];

Spacing +32 added lines, -32 removed lines

@@ -32,27 +32,27 @@ 
 //  URL: https://xoops.org                                                    //
 //  Project: Article Project                                                 //
 //  ------------------------------------------------------------------------ //
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (Request::getString('submit', '', 'POST')) {
     foreach (['forum', 'newforum', 'newtopic'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
+        ${$getint} = Request::getInt($getint, 0, 'POST'); // (int)(@$_POST[$getint]);
     }
     foreach (['topic_id'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
+        ${$getint} = Request::getInt($getint, 0, 'POST'); // (int)(@$_POST[$getint]);
     }
     if (!is_array($topic_id)) {
         $topic_id = [$topic_id];
     }
 } else {
     foreach (['forum', 'topic_id'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'GET');// (int)(@$_GET[$getint]);
+        ${$getint} = Request::getInt($getint, 0, 'GET'); // (int)(@$_GET[$getint]);
     }
 }
 
 if (empty($topic_id)) {
     $redirect = empty($forum_id) ? 'index.php' : 'viewforum.php?forum={$forum}';
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+    $redirect = XOOPS_URL.'/modules/newbb/'.$redirect;
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
@@ -67,7 +67,7 @@ 
     if (is_object($topicObject)) {
         $forum = $topicObject->getVar('forum_id');
     } else {
-        $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $topic_id;
+        $redirect = XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.$topic_id;
         redirect_header($redirect, 2, _MD_NEWBB_FORUMNOEXIST);
     }
     unset($topicObject);
@@ -104,7 +104,7 @@ 
 $action['unlock']['sql']   = 'topic_status = 0';
 $action['unsticky']['sql'] = 'topic_sticky = 0';
 $action['undigest']['sql'] = 'topic_digest = 0';
-$action['digest']['sql']   = 'topic_digest = 1, digest_time = ' . time();
+$action['digest']['sql']   = 'topic_digest = 1, digest_time = '.time();
 
 // Disable cache
 $GLOBALS['xoopsConfig']['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -112,7 +112,7 @@ 
 require_once $GLOBALS['xoops']->path('header.php');
 
 if (Request::getString('submit', '', 'POST')) {
-    $mode = Request::getString('mode', '', 'POST');// $_POST['mode'];
+    $mode = Request::getString('mode', '', 'POST'); // $_POST['mode'];
 
     if ('delete' === $mode) {
         foreach ($topic_id as $tid) {
@@ -126,11 +126,11 @@ 
             //xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
         }
         // irmtfan full URL
-        echo $action[$mode]['msg'] . "<p><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum=$forum'>" . _MD_NEWBB_RETURNTOTHEFORUM . "</a></p><p><a href='index.php'>" . _MD_NEWBB_RETURNFORUMINDEX . '</a></p>';
+        echo $action[$mode]['msg']."<p><a href='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/viewforum.php?forum=$forum'>"._MD_NEWBB_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_NEWBB_RETURNFORUMINDEX.'</a></p>';
     } elseif ('restore' === $mode) {
         //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
         $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             $topicObject = $topicsObject[$id];
             $topicHandler->approve($topicObject);
@@ -138,7 +138,7 @@ 
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
         //irmtfan remove - no need to approve posts manually - see class/post.php approve function
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -178,7 +178,7 @@ 
             /* return false if destination topic is not existing */
             // irmtfan bug fix: the old topic will be deleted if user input a not exist new topic
             if (!is_object($newtopicObject)) {
-                $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $tid;
+                $redirect = XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.$tid;
                 redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
             }
             $criteria_topic = new \Criteria('topic_id', $tid);
@@ -202,9 +202,9 @@ 
             if ($poll_id > 0 && (0 == $newtopicObject->getVar('poll_id'))) {
                 $newtopicObject->setVar('topic_haspoll', 1);
                 $newtopicObject->setVar('poll_id', $poll_id);
-                $poll_id = 0;// set to not delete the poll
+                $poll_id = 0; // set to not delete the poll
                 $topicObject->setVar('topic_haspoll', 0); // set to not delete the poll
-                $topicObject->setVar('poll_id', 0);// set to not delete the poll
+                $topicObject->setVar('poll_id', 0); // set to not delete the poll
             }
             //update and sync newtopic after merge
             //$topicHandler->insert($newtopicObject, true);
@@ -286,16 +286,16 @@ 
                 && !$forumHandler->getPermission($forum_new, 'reply'))        // The forum for the topic to be merged to
             || (!empty($newforum) && !$forumHandler->getPermission($newforum, 'post')) // The forum to be moved to
         ) {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _NOPERM);
+            redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _NOPERM);
         }
 
         if (!empty($action[$mode]['sql'])) {
-            $sql = sprintf('UPDATE `%s` SET ' . $action[$mode]['sql'] . ' WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $topic_id);
+            $sql = sprintf('UPDATE `%s` SET '.$action[$mode]['sql'].' WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $topic_id);
             if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
-                redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_NEWBB_ERROR_BACK . '<br>sql: ' . $sql);
+                redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_NEWBB_ERROR_BACK.'<br>sql: '.$sql);
             }
         } else {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_NEWBB_ERROR_BACK);
+            redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_NEWBB_ERROR_BACK);
         }
         if ('digest' === $mode && $GLOBALS['xoopsDB']->getAffectedRows()) {
             $topicObject = $topicHandler->get($topic_id);
@@ -326,15 +326,15 @@ 
     }
 } else {  // No submit
     $mode = Request::getString('mode', '', 'GET'); //$_GET['mode'];
-    echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
+    echo "<form action='".Request::getString('PHP_SELF', '', 'SERVER')."' method='post'>";
     echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
     echo "<tr><td class='bg2'>";
     echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
     echo "<tr class='bg3' align='left'>";
-    echo "<td colspan='2' align='center'>" . $action[$mode]['desc'] . '</td></tr>';
+    echo "<td colspan='2' align='center'>".$action[$mode]['desc'].'</td></tr>';
 
     if ('move' === $mode) {
-        echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+        echo '<tr><td class="bg3">'._MD_NEWBB_MOVETOPICTO.'</td><td class="bg1">';
         $box = '<select name="newforum" size="1">';
 
         //        /** @var Newbb\CategoryHandler $categoryHandler */
@@ -345,19 +345,19 @@ 
         if (count($categories) > 0 && count($forums) > 0) {
             foreach (array_keys($forums) as $key) {
                 /** @var Newbb\Category[] $categories */
-                $box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
+                $box .= "<option value='-1'>[".$categories[$key]->getVar('cat_title').']</option>';
                 foreach ($forums[$key] as $forumid => $_forum) {
-                    $box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
+                    $box .= "<option value='".$forumid."'>-- ".$_forum['title'].'</option>';
                     if (!isset($_forum['sub'])) {
                         continue;
                     }
                     foreach (array_keys($_forum['sub']) as $fid) {
-                        $box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
+                        $box .= "<option value='".$fid."'>---- ".$_forum['sub'][$fid]['title'].'</option>';
                     }
                 }
             }
         } else {
-            $box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
+            $box .= "<option value='-1'>"._MD_NEWBB_NOFORUMINDB.'</option>';
         }
         unset($forums, $categories);
 
@@ -365,17 +365,17 @@ 
         echo '</select></td></tr>';
     }
     if ('merge' === $mode) {
-        echo '<tr><td class="bg3">' . _MD_NEWBB_MERGETOPICTO . '</td><td class="bg1">';
-        echo _MD_NEWBB_TOPIC . "&nbsp;ID-$topic_id -> ID: <input name='newtopic' value='' />";
+        echo '<tr><td class="bg3">'._MD_NEWBB_MERGETOPICTO.'</td><td class="bg1">';
+        echo _MD_NEWBB_TOPIC."&nbsp;ID-$topic_id -> ID: <input name='newtopic' value='' />";
         echo '</td></tr>';
     }
     echo '<tr class="bg3"><td colspan="2" align="center">';
-    echo "<input type='hidden' name='mode' value='" . $action[$mode]['name'] . "' />";
-    echo "<input type='hidden' name='topic_id' value='" . $topic_id . "' />";
-    echo "<input type='hidden' name='forum' value='" . $forum . "' />";
-    echo "<input type='submit' name='submit' value='" . $action[$mode]['submit'] . "' />";
+    echo "<input type='hidden' name='mode' value='".$action[$mode]['name']."' />";
+    echo "<input type='hidden' name='topic_id' value='".$topic_id."' />";
+    echo "<input type='hidden' name='forum' value='".$forum."' />";
+    echo "<input type='submit' name='submit' value='".$action[$mode]['submit']."' />";
     echo '</td></tr></form></table></td></tr></table>';
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

xoops_version.php

Spacing +30 added lines, -30 removed lines

@@ -9,7 +9,7 @@ 
  * @package        module::newbb
  */
 
-include __DIR__ . '/preloads/autoloader.php';
+include __DIR__.'/preloads/autoloader.php';
 
 $moduleDirName = basename(__DIR__);
 $modversion    = [
@@ -45,24 +45,24 @@ 
     'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
     // ------------------- Tables ----------------------------
     'tables'              => [
-        $moduleDirName . '_' . 'archive',
-        $moduleDirName . '_' . 'categories',
-        $moduleDirName . '_' . 'votedata',
-        $moduleDirName . '_' . 'forums',
-        $moduleDirName . '_' . 'posts',
-        $moduleDirName . '_' . 'posts_text',
-        $moduleDirName . '_' . 'topics',
-        $moduleDirName . '_' . 'online',
-        $moduleDirName . '_' . 'digest',
-        $moduleDirName . '_' . 'report',
-        $moduleDirName . '_' . 'attachments',
-        $moduleDirName . '_' . 'moderates',
-        $moduleDirName . '_' . 'reads_forum',
-        $moduleDirName . '_' . 'reads_topic',
-        $moduleDirName . '_' . 'type',
-        $moduleDirName . '_' . 'type_forum',
-        $moduleDirName . '_' . 'stats',
-        $moduleDirName . '_' . 'user_stats'
+        $moduleDirName.'_'.'archive',
+        $moduleDirName.'_'.'categories',
+        $moduleDirName.'_'.'votedata',
+        $moduleDirName.'_'.'forums',
+        $moduleDirName.'_'.'posts',
+        $moduleDirName.'_'.'posts_text',
+        $moduleDirName.'_'.'topics',
+        $moduleDirName.'_'.'online',
+        $moduleDirName.'_'.'digest',
+        $moduleDirName.'_'.'report',
+        $moduleDirName.'_'.'attachments',
+        $moduleDirName.'_'.'moderates',
+        $moduleDirName.'_'.'reads_forum',
+        $moduleDirName.'_'.'reads_topic',
+        $moduleDirName.'_'.'type',
+        $moduleDirName.'_'.'type_forum',
+        $moduleDirName.'_'.'stats',
+        $moduleDirName.'_'.'user_stats'
     ],
     // ------------------- Admin Menu -------------------
     'system_menu'         => 1,
@@ -603,7 +603,7 @@ 
     'description' => '_MI_NEWBB_ANONYMOUS_PRE_DESC',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => $GLOBALS['xoopsConfig']['anonymous'] . '-'
+    'default'     => $GLOBALS['xoopsConfig']['anonymous'].'-'
 ];
 $modversion['config'][] = [
     'name'        => 'allow_require_reply',
@@ -730,7 +730,7 @@ 
     'item_name'      => 'topic_id',
     'allow_bookmark' => 1,
 ];
-$modversion['notification']['category'][]  = [
+$modversion['notification']['category'][] = [
     'name'           => 'forum',
     'title'          => _MI_NEWBB_FORUM_NOTIFY,
     'description'    => _MI_NEWBB_FORUM_NOTIFYDSC,
@@ -738,13 +738,13 @@ 
     'item_name'      => 'forum',
     'allow_bookmark' => 1,
 ];
-$modversion['notification']['category'][]  = [
+$modversion['notification']['category'][] = [
     'name'           => 'global',
     'title'          => _MI_NEWBB_GLOBAL_NOTIFY,
     'description'    => _MI_NEWBB_GLOBAL_NOTIFYDSC,
     'subscribe_from' => 'index.php',
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_post',
     'category'      => 'thread',
     'title'         => _MI_NEWBB_THREAD_NEWPOST_NOTIFY,
@@ -753,7 +753,7 @@ 
     'mail_template' => 'thread_newpost_notify',
     'mail_subject'  => _MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_thread',
     'category'      => 'forum',
     'title'         => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFY,
@@ -762,7 +762,7 @@ 
     'mail_template' => 'forum_newthread_notify',
     'mail_subject'  => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_forum',
     'category'      => 'global',
     'title'         => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY,
@@ -771,7 +771,7 @@ 
     'mail_template' => 'global_newforum_notify',
     'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_post',
     'category'      => 'global',
     'title'         => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFY,
@@ -780,7 +780,7 @@ 
     'mail_template' => 'global_newpost_notify',
     'mail_subject'  => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_post',
     'category'      => 'forum',
     'title'         => _MI_NEWBB_FORUM_NEWPOST_NOTIFY,
@@ -789,7 +789,7 @@ 
     'mail_template' => 'forum_newpost_notify',
     'mail_subject'  => _MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_fullpost',
     'category'      => 'global',
     'admin_only'    => 1,
@@ -799,7 +799,7 @@ 
     'mail_template' => 'global_newfullpost_notify',
     'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'digest',
     'category'      => 'global',
     'title'         => _MI_NEWBB_GLOBAL_DIGEST_NOTIFY,
@@ -808,7 +808,7 @@ 
     'mail_template' => 'global_digest_notify',
     'mail_subject'  => _MI_NEWBB_GLOBAL_DIGEST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_fullpost',
     'category'      => 'forum',
     'admin_only'    => 1,

preloads/core.php

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args)
     {
-        include __DIR__ . '/autoloader.php';
+        include __DIR__.'/autoloader.php';
     }
 }

preloads/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -3,12 +3,12 @@ 
 /**
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     // project-specific namespace prefix
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+    $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
 
     // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/../class/';
+    $base_dir = __DIR__.'/../class/';
 
     // does the class use the namespace prefix?
     $len = strlen($prefix);
@@ -23,7 +23,7 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+    $file = $base_dir.str_replace('\\', '/', $relative_class).'.php';
 
     // if the file exists, require it
     if (file_exists($file)) {

admin/admin_cat_manager.php

Switch Indentation +88 added lines, -88 removed lines

@@ -115,99 +115,99 @@
 }
 
 switch ($op) {
-    case 'mod':
-        $categoryObject = ($cat_id > 0) ? $categoryHandler->get($cat_id) : $categoryHandler->create();
-        //        if (!$newXoopsModuleGui) {
-        //            //loadModuleAdminMenu(1, ( $cat_id > 0) ? _AM_NEWBB_EDITCATEGORY . $categoryObject->getVar('cat_title') : _AM_NEWBB_CREATENEWCATEGORY);
-        //            echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_EDITCATEGORY . '</legend>';
-        //        } else {
-        $adminObject->displayNavigation(basename(__FILE__));
-        //        }
-        echo '<br>';
-        editCategory($categoryObject);
-        break;
-
-    case 'del':
-        if (!Request::getBool('confirm', '', 'POST')) {
-            xoops_confirm(['op' => 'del', 'cat_id' => Request::getInt('cat_id', 0, 'GET'), 'confirm' => 1], 'admin_cat_manager.php', _AM_NEWBB_WAYSYWTDTTAL);
+        case 'mod':
+            $categoryObject = ($cat_id > 0) ? $categoryHandler->get($cat_id) : $categoryHandler->create();
+            //        if (!$newXoopsModuleGui) {
+            //            //loadModuleAdminMenu(1, ( $cat_id > 0) ? _AM_NEWBB_EDITCATEGORY . $categoryObject->getVar('cat_title') : _AM_NEWBB_CREATENEWCATEGORY);
+            //            echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_EDITCATEGORY . '</legend>';
+            //        } else {
+            $adminObject->displayNavigation(basename(__FILE__));
+            //        }
+            echo '<br>';
+            editCategory($categoryObject);
+            break;
+
+        case 'del':
+            if (!Request::getBool('confirm', '', 'POST')) {
+                xoops_confirm(['op' => 'del', 'cat_id' => Request::getInt('cat_id', 0, 'GET'), 'confirm' => 1], 'admin_cat_manager.php', _AM_NEWBB_WAYSYWTDTTAL);
+                break;
+            } else {
+                $categoryObject = $categoryHandler->create(false);
+                $categoryObject->setVar('cat_id', Request::getInt('cat_id', 0, 'POST'));
+                $categoryHandler->delete($categoryObject);
+
+                redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CATEGORYDELETED);
+            }
             break;
-        } else {
-            $categoryObject = $categoryHandler->create(false);
-            $categoryObject->setVar('cat_id', Request::getInt('cat_id', 0, 'POST'));
-            $categoryHandler->delete($categoryObject);
-
-            redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CATEGORYDELETED);
-        }
-        break;
-
-    case 'save':
-        $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-        $cacheHelper->delete('permission_category');
-        if ($cat_id) {
-            $categoryObject = $categoryHandler->get($cat_id);
-            $message        = _AM_NEWBB_CATEGORYUPDATED;
-        } else {
-            $categoryObject = $categoryHandler->create();
-            $message        = _AM_NEWBB_CATEGORYCREATED;
-        }
-
-        $categoryObject->setVar('cat_title', Request::getString('title', '', 'POST'));
-        $categoryObject->setVar('cat_image', Request::getString('cat_image', '', 'POST'));
-        $categoryObject->setVar('cat_order', Request::getInt('cat_order', 0, 'POST'));
-        $categoryObject->setVar('cat_description', Request::getText('cat_description', '', 'POST'));
-        $categoryObject->setVar('cat_url', Request::getString('cat_url', '', 'POST'));
-
-        $cat_isNew = $categoryObject->isNew();
-        if (!$categoryHandler->insert($categoryObject)) {
-            $message = _AM_NEWBB_DATABASEERROR;
-        }
-        if (($cat_id = $categoryObject->getVar('cat_id')) && $cat_isNew) {
-            $categoryHandler->applyPermissionTemplate($categoryObject);
-        }
-        redirect_header('admin_cat_manager.php', 2, $message);
-        break;
-
-    default:
-        if (!$categories = $categoryHandler->getByPermission('all')) {
+
+        case 'save':
+            $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+            $cacheHelper->delete('permission_category');
+            if ($cat_id) {
+                $categoryObject = $categoryHandler->get($cat_id);
+                $message        = _AM_NEWBB_CATEGORYUPDATED;
+            } else {
+                $categoryObject = $categoryHandler->create();
+                $message        = _AM_NEWBB_CATEGORYCREATED;
+            }
+
+            $categoryObject->setVar('cat_title', Request::getString('title', '', 'POST'));
+            $categoryObject->setVar('cat_image', Request::getString('cat_image', '', 'POST'));
+            $categoryObject->setVar('cat_order', Request::getInt('cat_order', 0, 'POST'));
+            $categoryObject->setVar('cat_description', Request::getText('cat_description', '', 'POST'));
+            $categoryObject->setVar('cat_url', Request::getString('cat_url', '', 'POST'));
+
+            $cat_isNew = $categoryObject->isNew();
+            if (!$categoryHandler->insert($categoryObject)) {
+                $message = _AM_NEWBB_DATABASEERROR;
+            }
+            if (($cat_id = $categoryObject->getVar('cat_id')) && $cat_isNew) {
+                $categoryHandler->applyPermissionTemplate($categoryObject);
+            }
+            redirect_header('admin_cat_manager.php', 2, $message);
+            break;
+
+        default:
+            if (!$categories = $categoryHandler->getByPermission('all')) {
+                $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
+                $adminObject->displayButton('left');
+
+                echo '<br>';
+                newCategory();
+                break;
+            }
+            $adminObject->displayNavigation(basename(__FILE__));
             $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
             $adminObject->displayButton('left');
 
-            echo '<br>';
-            newCategory();
-            break;
-        }
-        $adminObject->displayNavigation(basename(__FILE__));
-        $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
-        $adminObject->displayButton('left');
-
-        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 align='left' class='bg3'>" . _AM_NEWBB_CATEGORY1 . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_EDIT . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_DELETE . '</th>';
-        echo '</tr>';
-
-        foreach ($categories as $key => $onecat) {
-            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
-            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
-            $cat_title_link = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . '">' . $onecat->getVar('cat_title') . '</a>';
-
-            echo "<tr class='odd' align='left'>";
-            echo '<td>' . $cat_title_link . '</td>';
-            echo "<td align='center'>" . $cat_edit_link . '</td>';
-            echo "<td align='center'>" . $cat_del_link . '</td>';
+            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 align='left' class='bg3'>" . _AM_NEWBB_CATEGORY1 . '</th>';
+            echo "<th class='bg3' width='10%'>" . _AM_NEWBB_EDIT . '</th>';
+            echo "<th class='bg3' width='10%'>" . _AM_NEWBB_DELETE . '</th>';
             echo '</tr>';
-        }
-        echo '</table>';
-        echo '</td></tr></table>';
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_CATEGORY_TAB;
-        echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
-        echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
-        echo '</fieldset>';
-        break;
+
+            foreach ($categories as $key => $onecat) {
+                $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
+                $cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
+                $cat_title_link = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . '">' . $onecat->getVar('cat_title') . '</a>';
+
+                echo "<tr class='odd' align='left'>";
+                echo '<td>' . $cat_title_link . '</td>';
+                echo "<td align='center'>" . $cat_edit_link . '</td>';
+                echo "<td align='center'>" . $cat_del_link . '</td>';
+                echo '</tr>';
+            }
+            echo '</table>';
+            echo '</td></tr></table>';
+            echo '<fieldset>';
+            echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
+            echo _AM_NEWBB_HELP_CATEGORY_TAB;
+            echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
+            echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
+            echo '</fieldset>';
+            break;
 }
 
 $cacheHelper = Newbb\Utility::cleanCache();

Spacing +21 added lines, -21 removed lines

@@ -32,8 +32,8 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/admin_header.php';
-require_once __DIR__ . '/../include/functions.render.php';
+require_once __DIR__.'/admin_header.php';
+require_once __DIR__.'/../include/functions.render.php';
 
 xoops_cp_header();
 
@@ -69,7 +69,7 @@ 
     require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
     if (!$categoryObject->isNew()) {
-        $sform = new \XoopsThemeForm(_AM_NEWBB_EDITCATEGORY . ' ' . $categoryObject->getVar('cat_title'), 'op', xoops_getenv('PHP_SELF'));
+        $sform = new \XoopsThemeForm(_AM_NEWBB_EDITCATEGORY.' '.$categoryObject->getVar('cat_title'), 'op', xoops_getenv('PHP_SELF'));
     } else {
         $sform = new \XoopsThemeForm(_AM_NEWBB_CREATENEWCATEGORY, 'op', xoops_getenv('PHP_SELF'));
         $categoryObject->setVar('cat_title', '');
@@ -83,17 +83,17 @@ 
     $sform->addElement(new \XoopsFormText(_AM_NEWBB_CATEGORY, 'title', 50, 80, $categoryObject->getVar('cat_title', 'E')), true);
     $sform->addElement(new \XoopsFormDhtmlTextArea(_AM_NEWBB_CATEGORYDESC, 'cat_description', $categoryObject->getVar('cat_description', 'E'), 10, 60), false);
 
-    $imgdir      = '/modules/' . $xoopsModule->getVar('dirname') . '/assets/images/category';
+    $imgdir      = '/modules/'.$xoopsModule->getVar('dirname').'/assets/images/category';
     $cat_image   = $categoryObject->getVar('cat_image');
     $cat_image   = empty($cat_image) ? 'blank.gif' : $cat_image;
-    $graph_array = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $imgdir . '/');
+    $graph_array = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH.$imgdir.'/');
     array_unshift($graph_array, _NONE);
     $cat_image_select = new \XoopsFormSelect('', 'cat_image', $categoryObject->getVar('cat_image'));
     $cat_image_select->addOptionArray($graph_array);
-    $cat_image_select->setExtra("onchange=\"showImgSelected('img', 'cat_image', '/" . $imgdir . "/', '', '" . XOOPS_URL . "')\"");
+    $cat_image_select->setExtra("onchange=\"showImgSelected('img', 'cat_image', '/".$imgdir."/', '', '".XOOPS_URL."')\"");
     $cat_image_tray = new \XoopsFormElementTray(_AM_NEWBB_IMAGE, ' ');
     $cat_image_tray->addElement($cat_image_select);
-    $cat_image_tray->addElement(new \XoopsFormLabel('', "<br><img src='" . XOOPS_URL . $imgdir . '/' . $cat_image . " 'name='img' id='img' alt='' />"));
+    $cat_image_tray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL.$imgdir.'/'.$cat_image." 'name='img' id='img' alt='' />"));
     $sform->addElement($cat_image_tray);
 
     $sform->addElement(new \XoopsFormText(_AM_NEWBB_SPONSORLINK, 'cat_url', 50, 80, $categoryObject->getVar('cat_url', 'E')), false);
@@ -180,32 +180,32 @@ 
         $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $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 align='left' class='bg3'>" . _AM_NEWBB_CATEGORY1 . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_EDIT . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_DELETE . '</th>';
+        echo "<th align='left' class='bg3'>"._AM_NEWBB_CATEGORY1.'</th>';
+        echo "<th class='bg3' width='10%'>"._AM_NEWBB_EDIT.'</th>';
+        echo "<th class='bg3' width='10%'>"._AM_NEWBB_DELETE.'</th>';
         echo '</tr>';
 
         foreach ($categories as $key => $onecat) {
-            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
-            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
-            $cat_title_link = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . '">' . $onecat->getVar('cat_title') . '</a>';
+            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id='.$onecat->getVar('cat_id').'">'.newbbDisplayImage('admin_edit', _EDIT).'</a>';
+            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id='.$onecat->getVar('cat_id').'">'.newbbDisplayImage('admin_delete', _DELETE).'</a>';
+            $cat_title_link = '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php?cat='.$onecat->getVar('cat_id').'">'.$onecat->getVar('cat_title').'</a>';
 
             echo "<tr class='odd' align='left'>";
-            echo '<td>' . $cat_title_link . '</td>';
-            echo "<td align='center'>" . $cat_edit_link . '</td>';
-            echo "<td align='center'>" . $cat_del_link . '</td>';
+            echo '<td>'.$cat_title_link.'</td>';
+            echo "<td align='center'>".$cat_edit_link.'</td>';
+            echo "<td align='center'>".$cat_del_link.'</td>';
             echo '</tr>';
         }
         echo '</table>';
         echo '</td></tr></table>';
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_CATEGORY.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_CATEGORY_TAB;
-        echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
-        echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
+        echo '<br>'.newbbDisplayImage('admin_edit', _EDIT).'&nbsp;-&nbsp;'._EDIT;
+        echo '<br>'.newbbDisplayImage('admin_delete', _DELETE).'&nbsp;-&nbsp;'._DELETE;
         echo '</fieldset>';
         break;
 }
@@ -213,4 +213,4 @@ 
 $cacheHelper = Newbb\Utility::cleanCache();
 //$cacheHelper->delete('permission_category');
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/menu.php

Spacing +13 added lines, -13 removed lines

@@ -41,77 +41,77 @@
 $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_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . 'about.png'
+    'icon'  => $pathIcon32.'about.png'
 ];

admin/admin_permissions.php

Indentation +28 added lines, -28 removed lines

@@ -174,20 +174,20 @@ 
                 $tree .= ' checked';
             }
             $tree .= ' />'
-                     . $option['name']
-                     . '<input type="hidden" name="'
-                     . $this->getName()
-                     . '[parents]['
-                     . $option['id']
-                     . ']" value="'
-                     . implode(':', $parentIds)
-                     . '" /><input type="hidden" name="'
-                     . $this->getName()
-                     . '[itemname]['
-                     . $option['id']
-                     . ']" value="'
-                     . htmlspecialchars($option['name'])
-                     . "\" /><br>\n";
+                        . $option['name']
+                        . '<input type="hidden" name="'
+                        . $this->getName()
+                        . '[parents]['
+                        . $option['id']
+                        . ']" value="'
+                        . implode(':', $parentIds)
+                        . '" /><input type="hidden" name="'
+                        . $this->getName()
+                        . '[itemname]['
+                        . $option['id']
+                        . ']" value="'
+                        . htmlspecialchars($option['name'])
+                        . "\" /><br>\n";
         } else {
             $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
         }
@@ -219,11 +219,11 @@ 
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
         $op_select->addOptionArray([
-                                       'no'       => _SELECT,
-                                       'template' => _AM_NEWBB_PERM_TEMPLATE,
-                                       'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP,
-                                       'default'  => _AM_NEWBB_PERM_SETBYGROUP
-                                   ]);
+                                        'no'       => _SELECT,
+                                        'template' => _AM_NEWBB_PERM_TEMPLATE,
+                                        'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP,
+                                        'default'  => _AM_NEWBB_PERM_SETBYGROUP
+                                    ]);
         $opform->addElement($op_select);
         $opform->display();
 
@@ -292,10 +292,10 @@ 
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
         $op_select->addOptionArray([
-                                       'no'       => _SELECT,
-                                       'template' => _AM_NEWBB_PERM_TEMPLATE,
-                                       'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP
-                                   ]);
+                                        'no'       => _SELECT,
+                                        'template' => _AM_NEWBB_PERM_TEMPLATE,
+                                        'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP
+                                    ]);
         $opform->addElement($op_select);
         $opform->display();
 
@@ -370,11 +370,11 @@ 
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
         $op_select->addOptionArray([
-                                       'no'       => _SELECT,
-                                       'template' => _AM_NEWBB_PERM_TEMPLATE,
-                                       'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP,
-                                       'default'  => _AM_NEWBB_PERM_SETBYGROUP
-                                   ]);
+                                        'no'       => _SELECT,
+                                        'template' => _AM_NEWBB_PERM_TEMPLATE,
+                                        'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP,
+                                        'default'  => _AM_NEWBB_PERM_SETBYGROUP
+                                    ]);
         $opform->addElement($op_select);
         $opform->display();
 

Spacing +34 added lines, -34 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 if (!class_exists('XoopsGroupPermForm')) {
     require_once $GLOBALS['xoops']->path('class/xoopsform/grouppermform.php');
@@ -99,7 +99,7 @@ 
         foreach (array_keys($glist) as $i) {
             // get selected item id(s) for each group
             $selected = $gpermHandler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele      = new NewbbXoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+            $ele      = new NewbbXoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
             $ele->setOptionTree($this->_itemTree);
             $this->addElement($ele);
             unset($ele);
@@ -108,19 +108,19 @@ 
         $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
         $this->addElement($tray);
-        $ret      = '<br><strong>' . $this->getTitle() . '</strong><br>' . $this->_permDesc . '<br>';
-        $ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
+        $ret      = '<br><strong>'.$this->getTitle().'</strong><br>'.$this->_permDesc.'<br>';
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
         $elements = $this->getElements();
         $hidden   = '';
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
             } elseif (!$elements[$i]->isHidden()) {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
+                $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
                 if ('' !== $elements[$i]->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+                    $ret .= '<br><br><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
                 }
-                $ret .= "</td>\n<td class='even' style='text-align:center;'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+                $ret .= "</td>\n<td class='even' style='text-align:center;'>\n".$elements[$i]->render()."\n</td></tr>\n";
             } else {
                 $hidden .= $elements[$i]->render();
             }
@@ -157,17 +157,17 @@ 
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
     {
         if ($option['id'] > 0) {
-            $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+            $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
             foreach ($parentIds as $pid) {
                 if ($pid <= 0) {
                     continue;
                 }
-                $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-                $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
+                $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
+                $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked !== true) {ele.checked = this.checked;}";
             }
             foreach ($option['allchild'] as $cid) {
-                $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-                $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
+                $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
+                $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked !== true) {ele.checked = false;}";
             }
             $tree .= '" value="1"';
             if (in_array($option['id'], $this->_value)) {
@@ -189,7 +189,7 @@ 
                      . htmlspecialchars($option['name'])
                      . "\" /><br>\n";
         } else {
-            $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
+            $tree .= $prefix.$option['name'].'<input type="hidden" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" /><br>\n";
         }
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
@@ -197,7 +197,7 @@ 
                     //                  array_push($parentIds, $option['id']);
                     $parentIds[] = $option['id'];
                 }
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
             }
         }
     }
@@ -214,7 +214,7 @@ 
     case 'template':
         xoops_cp_header();
         $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+        echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
         $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_TEMPLAT, 'actionform', 'admin_permissions.php', 'get');
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -233,7 +233,7 @@ 
         $perm_template = $newbbpermHandler->getTemplate();
         foreach (array_keys($glist) as $i) {
             $selected   = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
-            $ret_ele    = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
+            $ret_ele    = '<tr align="left" valign="top"><td class="head">'.$glist[$i].'</td>';
             $ret_ele    .= '<td class="even">';
             $ret_ele    .= '<table class="outer"><tr><td class="odd"><table><tr>';
             $ii         = 0;
@@ -243,13 +243,13 @@ 
                 if (0 == $ii % 5) {
                     $ret_ele .= '</tr><tr>';
                 }
-                $checked      = in_array('forum_' . $perm, $selected) ? ' checked' : '';
-                $option_id    = $perm . '_' . $i;
+                $checked      = in_array('forum_'.$perm, $selected) ? ' checked' : '';
+                $option_id    = $perm.'_'.$i;
                 $option_ids[] = $option_id;
-                $ret_ele      .= '<td><input name="perms[' . $i . '][' . 'forum_' . $perm . ']" id="' . $option_id . '" onclick="" value="1" type="checkbox"' . $checked . '>' . constant('_AM_NEWBB_CAN_' . strtoupper($perm)) . '<br></td>';
+                $ret_ele .= '<td><input name="perms['.$i.']['.'forum_'.$perm.']" id="'.$option_id.'" onclick="" value="1" type="checkbox"'.$checked.'>'.constant('_AM_NEWBB_CAN_'.strtoupper($perm)).'<br></td>';
             }
             $ret_ele    .= '</tr></table></td><td class="even">';
-            $ret_ele    .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')" />';
+            $ret_ele    .= _ALL.' <input id="checkall['.$i.']" type="checkbox" value="" onclick="var optionids = new Array('.implode(', ', $option_ids).'); xoopsCheckAllElements(optionids, \'checkall['.$i.']\')" />';
             $ret_ele    .= '</td></tr></table>';
             $ret_ele    .= '</td></tr>';
             $elements[] = $ret_ele;
@@ -258,7 +258,7 @@ 
         $tray->addElement(new \XoopsFormHidden('action', 'template_save'));
         $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $ret = '<br><strong>' . _AM_NEWBB_PERM_TEMPLATE . '</strong><br>' . _AM_NEWBB_PERM_TEMPLATE_DESC . '<br>';
+        $ret = '<br><strong>'._AM_NEWBB_PERM_TEMPLATE.'</strong><br>'._AM_NEWBB_PERM_TEMPLATE_DESC.'<br>';
         $ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
         $ret .= implode("\n", $elements);
         $ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even" style="text-align:center;">';
@@ -266,7 +266,7 @@ 
         $ret .= '</td></tr>';
         $ret .= '</table></form>';
         echo $ret;
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 
     case 'template_save':
@@ -287,7 +287,7 @@ 
         }
         xoops_cp_header();
         $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+        echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
         $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_APPLY, 'actionform', 'admin_permissions.php', 'get');
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -310,9 +310,9 @@ 
         $forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
         foreach (array_keys($forums) as $c) {
             $fm_options[-1 * $c - 1000] = ' ';
-            $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);
@@ -327,7 +327,7 @@ 
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
         $fmform->addElement($tray);
         $fmform->display();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 
     case 'apply_save':
@@ -365,7 +365,7 @@ 
         }
 
         $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+        echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
         $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP, 'actionform', 'admin_permissions.php', 'get');
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -388,10 +388,10 @@ 
             ]
         ];
         foreach ($perms as $perm) {
-            $op_options[$perm] = constant('_AM_NEWBB_CAN_' . strtoupper($perm));
+            $op_options[$perm] = constant('_AM_NEWBB_CAN_'.strtoupper($perm));
             $fm_options[$perm] = [
-                'title'     => constant('_AM_NEWBB_CAN_' . strtoupper($perm)),
-                'item'      => 'forum_' . $perm,
+                'title'     => constant('_AM_NEWBB_CAN_'.strtoupper($perm)),
+                'item'      => 'forum_'.$perm,
                 'desc'      => '',
                 'anonymous' => true
             ];
@@ -432,10 +432,10 @@ 
             if (count($forums) > 0) {
                 foreach (array_keys($forums) as $c) {
                     $key_c = -1 * $c;
-                    $form->addItem($key_c, '<strong>[' . $categories[$c] . ']</strong>');
+                    $form->addItem($key_c, '<strong>['.$categories[$c].']</strong>');
                     foreach (array_keys($forums[$c]) as $f) {
                         $pid = $forums[$c][$f]['parent_forum'] ?: $key_c;
-                        $form->addItem($f, $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'], $pid);
+                        $form->addItem($f, $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'], $pid);
                     }
                 }
             }
@@ -443,7 +443,7 @@ 
         }
         $form->display();
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_PERMISSION . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_PERMISSION.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_PERMISSION_TAB;
         echo '</fieldset>';
         // Since we can not control the permission update, a trick is used here
@@ -452,6 +452,6 @@ 
         $permissionHandler->createPermData();
         $cacheHelper = Newbb\Utility::cleanCache();
         //$cacheHelper->delete('permission');
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 }