mambax7 / newbb5

include/functions.ini.php

Spacing +2 added lines, -2 removed lines

@@ -38,5 +38,5 @@
 /**
  * @return array
  */
-require_once __DIR__ . '/functions.config.php';
-require_once __DIR__ . '/functions.session.php';
+require_once __DIR__.'/functions.config.php';
+require_once __DIR__.'/functions.session.php';

include/functions.welcome.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_WELCOME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_WELCOME')) {
@@ -40,7 +40,7 @@ 
             return false;
         }
 
-        include __DIR__ . '/functions.welcome.inc.php';
+        include __DIR__.'/functions.welcome.inc.php';
         unset($forumObject);
 
         return $ret;

report.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $GPC = '_GET';
 if (Request::getString('submit', '', 'POST')) {
@@ -44,7 +44,7 @@ 
 $viewmode = (isset(${$GPC}['viewmode']) && 'flat' !== ${$GPC}['viewmode']) ? 'thread' : 'flat';
 
 if (empty($post_id)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORPOST);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_ERRORPOST);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
@@ -139,7 +139,7 @@ 
 $submit_button = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 $cancel_button = new \XoopsFormButton('', 'cancel', _MD_NEWBB_CANCELPOST, 'button');
 $extra         = "viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&order=$order&viewmode=$viewmode";
-$cancel_button->setExtra("onclick='location=\"" . $extra . "\"'");
+$cancel_button->setExtra("onclick='location=\"".$extra."\"'");
 $button_tray->addElement($submit_button);
 $button_tray->addElement($cancel_button);
 $report_form->addElement($button_tray);
@@ -147,7 +147,7 @@ 
 
 $r_subject = $postObject->getVar('subject', 'E');
 if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $postObject->getVar('post_karma') > 0) {
-    $r_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $postObject->getVar('post_karma')) . '</div>';
+    $r_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $postObject->getVar('post_karma')).'</div>';
 } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $postObject->getVar('require_reply')) {
     $r_message = _MD_NEWBB_REPLY_REQUIREMENT;
 } else {
@@ -161,11 +161,11 @@ 
     $poster_name = $postObject->getVar('poster_name');
     $r_name      = empty($poster_name) ? $GLOBALS['xoopsConfig']['anonymous'] : $myts->htmlSpecialChars($poster_name);
 }
-$r_content = _MD_NEWBB_SUBJECTC . ' ' . $r_subject . '<br>';
-$r_content .= _MD_NEWBB_BY . ' ' . $r_name . ' ' . _MD_NEWBB_ON . ' ' . $r_date . '<br><br>';
+$r_content = _MD_NEWBB_SUBJECTC.' '.$r_subject.'<br>';
+$r_content .= _MD_NEWBB_BY.' '.$r_name.' '._MD_NEWBB_ON.' '.$r_date.'<br><br>';
 $r_content .= $r_message;
 
-echo "<br><table cellpadding='4' cellspacing='1' width='98%' class='outer'><tr><td class='head'>" . $r_subject . '</td></tr>';
-echo '<tr><td><br>' . $r_content . '<br></td></tr></table>';
+echo "<br><table cellpadding='4' cellspacing='1' width='98%' class='outer'><tr><td class='head'>".$r_subject.'</td></tr>';
+echo '<tr><td><br>'.$r_content.'<br></td></tr></table>';
 
 include $GLOBALS['xoops']->path('footer.php');

class/ReadForum.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 //  URL: https://xoops.org                                                    //
 //  Project: Article Project                                                 //
 //  ------------------------------------------------------------------------ //
-require_once __DIR__ . '/read.php';
+require_once __DIR__.'/read.php';
 
 /**
  * A handler for read/unread handling

class/ReadtopicHandler.php

Spacing +3 added lines, -3 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
@@ -176,7 +176,7 @@ 
             $sticky_id = $itemHandler->getIds($criteria_sticky);
             $items     = $items_id + $sticky_id;
             $criteria  = new \CriteriaCompo(new \Criteria('uid', $uid));
-            $criteria->add(new \Criteria('read_item', '(' . implode(', ', $items) . ')', 'IN'));
+            $criteria->add(new \Criteria('read_item', '('.implode(', ', $items).')', 'IN'));
             $this->deleteAll($criteria, true);
 
             return true;
@@ -184,7 +184,7 @@ 
 
         $itemsObject  = $itemHandler->getAll($criteria_topic, ['topic_last_post_id']);
         $stickyObject = $itemHandler->getAll($criteria_sticky, ['topic_last_post_id']);
-        $itemsObject  += $stickyObject;
+        $itemsObject += $stickyObject;
         $items        = [];
         foreach (array_keys($itemsObject) as $key) {
             $items[$key] = $itemsObject[$key]->getVar('topic_last_post_id');

class/UserHandler.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
         if (empty($this->users) || !$this->enableOnline) {
             return;
         }
-        require_once __DIR__ . '/../include/functions.render.php';
+        require_once __DIR__.'/../include/functions.render.php';
         $image_online  = newbbDisplayImage('online', _MD_NEWBB_ONLINE);
         $image_offline = newbbDisplayImage('offline', _MD_NEWBB_OFFLINE);
 
@@ -83,7 +83,7 @@ 
             return;
         }
 
-        $sql    = 'SELECT user_digests, uid FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . ' WHERE uid IN( ' . implode(', ', array_keys($this->users)) . ')';
+        $sql    = 'SELECT user_digests, uid FROM '.$GLOBALS['xoopsDB']->prefix('newbb_user_stats').' WHERE uid IN( '.implode(', ', array_keys($this->users)).')';
         $result = $GLOBALS['xoopsDB']->query($sql);
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
             $this->userlist[$myrow['uid']]['digests'] = (int)$myrow['user_digests'];

class/IconHandler.php

Indentation +2 added lines, -2 removed lines

@@ -110,8 +110,8 @@
             $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}" : (
                 is_dir($theme_path . "/{$rel_dir}/{$default}/") ? $theme_path . "/{$rel_dir}/{$default}" : (
                 is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
-                 . "/default/{$rel_dir}/{$type}" : (
-                     is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
+                    . "/default/{$rel_dir}/{$type}" : (
+                        is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
                     : (is_dir($GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}/")) ? $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}")
                     : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$default}")) // XOOPS_ROOT_PATH
             ) // XOOPS_THEME_PATH {$default}

Spacing +13 added lines, -13 removed lines

@@ -95,23 +95,23 @@ 
     public function getPath($type, $dirname = 'newbb', $default = '', $endDir = 'images')
     {
         static $paths;
-        if (isset($paths[$endDir . '/' . $type])) {
-            return $paths[$endDir . '/' . $type];
+        if (isset($paths[$endDir.'/'.$type])) {
+            return $paths[$endDir.'/'.$type];
         }
 
         $theme_path = $this->template->currentTheme->path;
         $rel_dir    = "modules/{$dirname}/{$endDir}";
         // START irmtfan add default for all pathes
         if (empty($default)) {
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}"
-                : (is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
+            $path = is_dir($theme_path."/{$rel_dir}/{$type}/") ? $theme_path."/{$rel_dir}/{$type}"
+                : (is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}"
                 : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}"));
         } else {
-            $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}" : (
-                is_dir($theme_path . "/{$rel_dir}/{$default}/") ? $theme_path . "/{$rel_dir}/{$default}" : (
-                is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
+            $path = is_dir($theme_path."/{$rel_dir}/{$type}/") ? $theme_path."/{$rel_dir}/{$type}" : (
+                is_dir($theme_path."/{$rel_dir}/{$default}/") ? $theme_path."/{$rel_dir}/{$default}" : (
+                is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
                  . "/default/{$rel_dir}/{$type}" : (
-                     is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
+                     is_dir(XOOPS_THEME_PATH."/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
                     : (is_dir($GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}/")) ? $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}")
                     : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$default}")) // XOOPS_ROOT_PATH
             ) // XOOPS_THEME_PATH {$default}
@@ -119,9 +119,9 @@ 
             ); // $theme_path {$default}
         }
         // END irmtfan add default for all pathes
-        $paths[$endDir . '/' . $type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
+        $paths[$endDir.'/'.$type] = str_replace(XOOPS_ROOT_PATH, '', str_replace('\\', '/', $path));
 
-        return $paths[$endDir . '/' . $type];
+        return $paths[$endDir.'/'.$type];
     }
 
     // END irmtfan - improve to get other "end dirnames" like "css" and "js" - change images with $endDir
@@ -136,8 +136,8 @@ 
     ) {
         $this->forumImage = include $GLOBALS['xoops']->path("modules/{$dirname}/include/images.php");
 
-        $this->forumImage['icon']     = XOOPS_URL . $this->getPath('icon', $dirname) . '/';
-        $this->forumImage['language'] = XOOPS_URL . $this->getPath("language/{$language}", $dirname, 'language/english') . '/';
+        $this->forumImage['icon']     = XOOPS_URL.$this->getPath('icon', $dirname).'/';
+        $this->forumImage['language'] = XOOPS_URL.$this->getPath("language/{$language}", $dirname, 'language/english').'/';
     }
 
     /**
@@ -161,7 +161,7 @@ 
      */
     public function getImageSource($image)
     {
-        return $this->forumImage[$this->forumImage[$image]] . $this->prefix . $image . $this->postfix;
+        return $this->forumImage[$this->forumImage[$image]].$this->prefix.$image.$this->postfix;
     }
 
     /**

class/PermissionForumHandler.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
     {
         //        $this->PermissionHandler($db);
         parent::__construct($db);
-        $this->templateFilename = XOOPS_VAR_PATH . '/configs/newbb_permission_template.php';
+        $this->templateFilename = XOOPS_VAR_PATH.'/configs/newbb_permission_template.php';
     }
 
     /**
@@ -53,7 +53,7 @@ 
         $items = array_filter(array_map('trim', explode(',', FORUM_PERM_ITEMS)));
         if (!empty($fullname)) {
             foreach (array_keys($items) as $key) {
-                $items[$key] = 'forum_' . $items[$key];
+                $items[$key] = 'forum_'.$items[$key];
             }
         }
         $validPerms[(int)$fullname] = $items;
@@ -74,7 +74,7 @@ 
             return $full_items;
         }
 
-        require_once __DIR__ . '/../include/functions.user.php';
+        require_once __DIR__.'/../include/functions.user.php';
         $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
         $ip  = \Xmf\IPAddress::fromRequest()->asReadable();
         if (!empty($GLOBALS['xoopsModuleConfig']['enable_usermoderate']) && !isset($suspension[$uid][$id])
@@ -133,10 +133,10 @@ 
         }
         // Create criteria for getting only the permissions regarding this module and this user's groups
         $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', $modid));
-        $criteria->add(new \Criteria('gperm_groupid', '(' . implode(',', $groups) . ')', 'IN'));
+        $criteria->add(new \Criteria('gperm_groupid', '('.implode(',', $groups).')', 'IN'));
         if ($id) {
             if (is_array($id)) {
-                $criteria->add(new \Criteria('gperm_itemid', '(' . implode(',', $id) . ')', 'IN'));
+                $criteria->add(new \Criteria('gperm_itemid', '('.implode(',', $id).')', 'IN'));
             } else {
                 $criteria->add(new \Criteria('gperm_itemid', (int)$id));
             }
@@ -144,7 +144,7 @@ 
         $gperm_names = implode(', ', $this->getValidItems($modid, $id));
 
         // Add criteria for gpermnames
-        $criteria->add(new \Criteria('gperm_name', '(' . $gperm_names . ')', 'IN'));
+        $criteria->add(new \Criteria('gperm_name', '('.$gperm_names.')', 'IN'));
         // Get all permission objects in this module and for this user's groups
         $userpermissions = $this->getObjects($criteria, true);
 
@@ -182,12 +182,12 @@ 
                 continue;
             }
             if ($isAdmin
-                || (isset($permission_set[$forumId]['forum_' . $item])
+                || (isset($permission_set[$forumId]['forum_'.$item])
                     && (!$topic_locked
                         || 'view' === $item))) {
-                $perm[] = constant('_MD_NEWBB_CAN_' . strtoupper($item));
+                $perm[] = constant('_MD_NEWBB_CAN_'.strtoupper($item));
             } else {
-                $perm[] = constant('_MD_NEWBB_CANNOT_' . strtoupper($item));
+                $perm[] = constant('_MD_NEWBB_CANNOT_'.strtoupper($item));
             }
         }
 
@@ -207,7 +207,7 @@ 
         $gpermHandler = xoops_getHandler('groupperm');
         $criteria     = new \CriteriaCompo(new \Criteria('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')));
         $items        = $this->getValidPerms(true);
-        $criteria->add(new \Criteria('gperm_name', "('" . implode("', '", $items) . "')", 'IN'));
+        $criteria->add(new \Criteria('gperm_name', "('".implode("', '", $items)."')", 'IN'));
         $criteria->add(new \Criteria('gperm_itemid', $forum_id));
 
         return $gpermHandler->deleteAll($criteria);

class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -34,19 +34,19 @@ 
         //        $sql   .= " WHERE metakey='version' LIMIT 1";
         //        $query = $GLOBALS['xoopsDB']->query($sql);
         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n";
         $html .= "<div style='padding: 8px;'>\n";
         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
         //        $html .= "<br>\n";
         //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n";
         $html .= "<ul>\n";
         //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+        $gdlib = function_exists('gd_info') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
         if (function_exists('gd_info')) {
             if (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
             }
         }
         //
@@ -56,18 +56,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
         //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+        $downloads = ini_get('file_uploads') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
         //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.ini_get('upload_max_filesize')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.ini_get('post_max_size')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.ini_get('memory_limit')."</span></b>\n";
         $html .= "</ul>\n";
         $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";
         $html .= "</ul>\n";
         $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";
         $html .= '</div>';
         $html .= '</fieldset><br>';