XOOPS / XoopsCore

htdocs/modules/system/themes/default/menu.php

Spacing +5 added lines, -5 removed lines

@@ -47,16 +47,16 @@
 $dirlist = XoopsLists::getDirListAsArray($admin_dir);
 $index = 0;
 foreach ($dirlist as $file) {
-    if (XoopsLoad::fileExists($admin_dir . '/' . $file . '/xoops_version.php')) {
-        include $admin_dir . '/' . $file . '/xoops_version.php';
+    if (XoopsLoad::fileExists($admin_dir.'/'.$file.'/xoops_version.php')) {
+        include $admin_dir.'/'.$file.'/xoops_version.php';
         if ($modversion['hasAdmin']) {
-            if ($xoops->getModuleConfig('active_' . $file, 'system')) {
+            if ($xoops->getModuleConfig('active_'.$file, 'system')) {
                 $category = isset($modversion['category']) ? (int)($modversion['category']) : 0;
                 if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
                     $adminmenu[$index]['title'] = trim($modversion['name']);
                     $adminmenu[$index]['desc'] = trim($modversion['description']);
-                    $adminmenu[$index]['link'] = 'admin.php?fct=' . $file;
-                    $adminmenu[$index]['icon'] = 'icons/' . $modversion['image'];
+                    $adminmenu[$index]['link'] = 'admin.php?fct='.$file;
+                    $adminmenu[$index]['icon'] = 'icons/'.$modversion['image'];
                 }
             }
         }

htdocs/modules/system/xoops_version.php

Spacing +6 added lines, -6 removed lines

@@ -57,7 +57,7 @@ 
 $modversion['jquery'] = 1;
 
 // table definitions
-$modversion['schema']           = 'sql/schema.yml';
+$modversion['schema'] = 'sql/schema.yml';
 
 // Tables created by sql file or schema (without prefix!)
 $modversion['tables'] = array(
@@ -354,7 +354,7 @@ 
     'category'    => 'general',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => 'xoops_user_' . dechex(time()),
+    'default'     => 'xoops_user_'.dechex(time()),
 );
 
 $modversion['config'][] = array(
@@ -364,7 +364,7 @@ 
     'category'    => 'general',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => 'xoops_session_' . dechex(time()),
+    'default'     => 'xoops_session_'.dechex(time()),
 );
 
 $modversion['config'][] = array(
@@ -1052,7 +1052,7 @@ 
     'default'     => 1,
 );
 
-$icons                  = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/modules/system/images/icons');
+$icons                  = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/modules/system/images/icons');
 $modversion['config'][] = array(
     'name'        => 'typeicons',
     'title'       => 'CONF_ICONS',
@@ -1063,7 +1063,7 @@ 
     'options'     => $icons,
 );
 
-$breadcrumb             = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/modules/system/images/breadcrumb');
+$breadcrumb             = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/modules/system/images/breadcrumb');
 $modversion['config'][] = array(
     'name'        => 'typebreadcrumb',
     'title'       => 'CONF_BREADCRUMB',
@@ -1074,7 +1074,7 @@ 
     'options'     => $breadcrumb,
 );
 
-$jquery_theme           = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path') . '/media/jquery/ui/themes');
+$jquery_theme           = XoopsLists::getDirListAsArray(\XoopsBaseConfig::get('root-path').'/media/jquery/ui/themes');
 $modversion['config'][] = array(
     'name'        => 'jquery_theme',
     'title'       => 'CONF_JQUERY_THEME',

htdocs/modules/system/admin.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Include header
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // Get main instance
 $xoops = Xoops::getInstance();
@@ -34,7 +34,7 @@ 
 if ($system->checkRight()) {
     if (isset($fct) && $fct != '') {
         $fct = preg_replace("/[^a-z0-9_\-]/i", "", $fct);
-        if (XoopsLoad::fileExists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/admin/' . $fct . '/xoops_version.php'))) {
+        if (XoopsLoad::fileExists($file = $xoops->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/admin/'.$fct.'/xoops_version.php'))) {
             // Load language file
             //system_loadLanguage($fct, $xoopsModule->getVar('dirname', 'n'));
             // Include Configuration file
@@ -50,7 +50,7 @@ 
             if ($category > 0) {
                 $group = $xoopsUser->getGroups();
                 if (in_array(FixedGroups::ADMIN, $group) || false != $sysperm_handler->checkRight('system_admin', $category, $group, $xoopsModule->getVar('mid'))) {
-                    if (XoopsLoad::fileExists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/admin/' . $fct . '/main.php'))) {
+                    if (XoopsLoad::fileExists($file = $xoops->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/admin/'.$fct.'/main.php'))) {
                         include_once $file;
                         unset($file);
                     } else {
@@ -60,7 +60,7 @@ 
                     $error = true;
                 }
             } elseif ($fct === 'version') {
-                if (XoopsLoad::fileExists($file = $xoops->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/admin/version/main.php'))) {
+                if (XoopsLoad::fileExists($file = $xoops->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/admin/version/main.php'))) {
                     include_once $file;
                     unset($file);
                 } else {
@@ -84,11 +84,11 @@ 
         $part = $system->cleanVars($_REQUEST, 'type', '', 'string');
         $config_handler = $xoops->getHandlerConfig();
 
-        $criteria = new Criteria('conf_name', 'active_' . $part);
+        $criteria = new Criteria('conf_name', 'active_'.$part);
         $configs = $config_handler->getConfigs($criteria);
         foreach ($configs as $conf) {
             /* @var $conf XoopsConfigItem */
-            if ($conf->getVar('conf_name') == 'active_' . $part) {
+            if ($conf->getVar('conf_name') == 'active_'.$part) {
                 $conf->setVar('conf_value', !$conf->getVar('conf_value'));
                 $config_handler->insertConfig($conf);
             }
@@ -104,7 +104,7 @@ 
     $xoops->theme()->addBaseScriptAssets('modules/system/js/admin.js');
     // Define Breadcrumb and tips
     $admin_page = new \Xoops\Module\Admin();
-    $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+    $admin_page->addBreadcrumbLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);
     $admin_page->addBreadcrumbLink(SystemLocale::SYSTEM_CONFIGURATION);
     $admin_page->renderBreadcrumb();
     $admin_page->addTips(SystemLocale::TIPS_MAIN);
@@ -118,16 +118,16 @@ 
         $all_ok = true;
     }
 
-    $admin_dir = \XoopsBaseConfig::get('root-path') . '/modules/system/admin';
+    $admin_dir = \XoopsBaseConfig::get('root-path').'/modules/system/admin';
     $dirlist = XoopsLists::getDirListAsArray($admin_dir);
     $inactive_section = array('blocksadmin', 'groups', 'modulesadmin', 'preferences', 'tplsets', 'extensions', 'users', 'services');
     foreach ($dirlist as $directory) {
-        if (XoopsLoad::fileExists($file = $admin_dir . '/' . $directory . '/xoops_version.php')) {
+        if (XoopsLoad::fileExists($file = $admin_dir.'/'.$directory.'/xoops_version.php')) {
             require $file;
             unset($file);
 
             if ($modversion['hasAdmin']) {
-                if ($xoops->getModuleConfig('active_' . $directory)) {
+                if ($xoops->getModuleConfig('active_'.$directory)) {
                     $category = isset($modversion['category']) ? (int)($modversion['category']) : 0;
                     if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
                         $menu['file'] = $directory;

htdocs/modules/system/preloads/preload.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
             && $xoops->getConfig('redirect_message_ajax')
         ) {
             $_SESSION['redirect_message'] = $args[2];
-            header("Location: " . preg_replace("/[&]amp;/i", '&', $url));
+            header("Location: ".preg_replace("/[&]amp;/i", '&', $url));
             exit();
         }
     }
@@ -57,7 +57,7 @@ 
             $xoops->theme()->addScript('', array('type' => 'text/javascript'), '
             (function($){
                 $(document).ready(function(){
-                $.jGrowl("' . $_SESSION['redirect_message'] . '", {  life:3000 , position: "center", speed: "slow" });
+                $.jGrowl("' . $_SESSION['redirect_message'].'", {  life:3000 , position: "center", speed: "slow" });
             });
             })(jQuery);
             ');
@@ -75,7 +75,7 @@ 
             $xoops->theme()->addScript('', array('type' => 'text/javascript'), '
             (function($){
             $(document).ready(function(){
-                $.jGrowl("' . $_SESSION['redirect_message'] . '", {  life:3000 , position: "center", speed: "slow" });
+                $.jGrowl("' . $_SESSION['redirect_message'].'", {  life:3000 , position: "center", speed: "slow" });
             });
             })(jQuery);
             ');
@@ -93,7 +93,7 @@ 
     public static function eventCoreServiceLocateCountryflag(Provider $provider)
     {
         if (is_a($provider, '\Xoops\Core\Service\Provider')) {
-            $path = dirname(__DIR__) . '/class/CountryFlagProvider.php';
+            $path = dirname(__DIR__).'/class/CountryFlagProvider.php';
             require $path;
             $object = new CountryFlagProvider();
             $provider->register($object);

htdocs/modules/system/include/functions.php

Spacing +11 added lines, -11 removed lines

@@ -78,11 +78,11 @@ 
         return false;
     }
     $language = empty($language) ? $xoops->getConfig('language') : $language;
-    $path = 'modules/' . $domain . '/language/';
-    if (XoopsLoad::fileExists($file = $xoops->path($path . $language . '/admin/' . $name . '.php'))) {
+    $path = 'modules/'.$domain.'/language/';
+    if (XoopsLoad::fileExists($file = $xoops->path($path.$language.'/admin/'.$name.'.php'))) {
         $ret = include_once $file;
     } else {
-        $ret = include_once $xoops->path($path . 'english/admin/' . $name . '.php');
+        $ret = include_once $xoops->path($path.'english/admin/'.$name.'.php');
     }
     return $ret;
 }
@@ -95,16 +95,16 @@ 
 function system_adminVersion($version, $value = '')
 {
     static $tblVersion = array();
-    if (is_array($tblVersion) && array_key_exists($version . '.' . $value, $tblVersion)) {
-        return $tblVersion[$version . '.' . $value];
+    if (is_array($tblVersion) && array_key_exists($version.'.'.$value, $tblVersion)) {
+        return $tblVersion[$version.'.'.$value];
     }
     $xoops = Xoops::getInstance();
-    $path = $xoops->path('modules/system/admin/' . $version . '/xoops_version.php');
+    $path = $xoops->path('modules/system/admin/'.$version.'/xoops_version.php');
     if (XoopsLoad::fileExists($path)) {
         $modversion = array();
         include $path;
         $retvalue = $modversion[$value];
-        $tblVersion[$version . '.' . $value] = $retvalue;
+        $tblVersion[$version.'.'.$value] = $retvalue;
         return $retvalue;
     }
     return '';
@@ -119,7 +119,7 @@ 
     $xoops = Xoops::getInstance();
     $style = 'default';
 
-    $url = $xoops->url('modules/system/images/icons/' . $style . '/' . $img);
+    $url = $xoops->url('modules/system/images/icons/'.$style.'/'.$img);
     return $url;
 }
 
@@ -131,11 +131,11 @@ 
 {
     $xoops = Xoops::getInstance();
 
-    $path = $xoops->path('modules/' . $xoops->module->getVar('dirname', 'n') . '/templates/admin/' . $name . '.tpl');
+    $path = $xoops->path('modules/'.$xoops->module->getVar('dirname', 'n').'/templates/admin/'.$name.'.tpl');
     if (XoopsLoad::fileExists($path)) {
         echo $xoops->tpl()->fetch($path);
     } else {
-        echo "Unable to read " . $name;
+        echo "Unable to read ".$name;
     }
 }
 
@@ -147,7 +147,7 @@ 
  */
 function modify_chmod($value_chmod, $path_file, $id)
 {
-    $chmod = '<div id="loading_' . $id . '" align="center" style="display:none;">' . '<img src="./images/mimetypes/spinner.gif" title="Loading" alt="Loading" width="12px"/></div>' . '<div id="chmod' . $id . '">' . '<select size="1" onChange="filemanager_modify_chmod(\'' . $path_file . '\', \'' . $id . '\')" name="chmod" id="chmod">';
+    $chmod = '<div id="loading_'.$id.'" align="center" style="display:none;">'.'<img src="./images/mimetypes/spinner.gif" title="Loading" alt="Loading" width="12px"/></div>'.'<div id="chmod'.$id.'">'.'<select size="1" onChange="filemanager_modify_chmod(\''.$path_file.'\', \''.$id.'\')" name="chmod" id="chmod">';
     if ($value_chmod == 777) {
         $chmod .= '<option value="777" selected><span style="color:green">777</span></option>';
     } else {

htdocs/modules/system/language/english/admin/_tplsets.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  * @version     $Id$
  */
 
- //Nav
+    //Nav
 //define("_AM_SYSTEM_TEMPLATES_NAV_MANAGER","Templates Manager");
 //define("_AM_SYSTEM_TEMPLATES_NAV_MAIN","Templates Manager");
 //Tips

htdocs/modules/system/language/english/_blocks.php

Spacing +1 added lines, -1 removed lines

@@ -49,4 +49,4 @@
 //define("_MB_SYSTEM_NUMTHEME", "%s themes");
 //define("_MB_SYSTEM_THSHOW", "Display screenshot image");
 //define("_MB_SYSTEM_THWIDTH", "Screenshot image width");
-define("_MB_SYSTEM_REMEMBERME","Remember me");
\ No newline at end of file
+define("_MB_SYSTEM_REMEMBERME", "Remember me");
\ No newline at end of file

htdocs/modules/system/help.php

Spacing +48 added lines, -48 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Include header
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $system = System::getInstance();
@@ -42,24 +42,24 @@ 
 if ($mid > 0) {
     $module = $xoops->getModuleById($mid);
 
-    $system_breadcrumb->addLink($module->getVar('name'), 'help.php?mid=' . $module->getVar('mid', 's'));
+    $system_breadcrumb->addLink($module->getVar('name'), 'help.php?mid='.$module->getVar('mid', 's'));
     $system_breadcrumb->addLink(system_adminVersion($page, 'name'));
     $system_breadcrumb->render();
 
     if ($module->getVar('dirname', 'e') === 'system') {
 
-        $admin_dir = \XoopsBaseConfig::get('root-path') . '/modules/system/admin';
+        $admin_dir = \XoopsBaseConfig::get('root-path').'/modules/system/admin';
         $dirlist = XoopsLists::getDirListAsArray($admin_dir);
 
         foreach ($dirlist as $directory) {
-            if (XoopsLoad::fileExists($file = $admin_dir . '/' . $directory . '/xoops_version.php')) {
+            if (XoopsLoad::fileExists($file = $admin_dir.'/'.$directory.'/xoops_version.php')) {
 
                 require $file;
                 unset($file);
 
                 if ($modversion['help']) {
                     $help['name'] = system_adminVersion($directory, 'name');
-                    $help['link'] = 'help.php?mid=' . $mid . '&' . system_adminVersion($directory, 'help');
+                    $help['link'] = 'help.php?mid='.$mid.'&'.system_adminVersion($directory, 'help');
 
                     $xoops->tpl()->appendByRef('help', $help);
                     unset($help);
@@ -72,12 +72,12 @@ 
         $list_help = array();
         $listed_mods[0] = $module->toArray();
         $helplist = $module->getInfo('helpsection');
-        $j=0;
+        $j = 0;
         if (is_array($helplist)) {
             foreach ($helplist as $helpitem) {
                 if (($helpitem['name'] != '') && ($helpitem['link'] != '')) {
                     $list_help[$j]['name'] = $helpitem['name'];
-                    $list_help[$j]['link'] = 'help.php?mid=' . $mid . '&' . $helpitem['link'];
+                    $list_help[$j]['link'] = 'help.php?mid='.$mid.'&'.$helpitem['link'];
                     ++$j;
                 }
             }
@@ -85,9 +85,9 @@ 
             $xoopsTpl->assign('list_mods', $listed_mods);
         }
         unset ($helplist);
-        if (( $module->getInfo('help') != '' ) && ($j == 0)) {
+        if (($module->getInfo('help') != '') && ($j == 0)) {
             $help['name'] = $module->getInfo('name');
-            $help['link'] = 'help.php?mid=' . $mid . '&' . $module->getInfo('help');
+            $help['link'] = 'help.php?mid='.$mid.'&'.$module->getInfo('help');
             $xoopsTpl->appendByRef('help', $help);
         }
         unset($help);
@@ -100,22 +100,22 @@ 
 
     if ($page !== '') {
         // Call template
-        if ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/' . XoopsLocale::getLocale() . '/help/' . $page . '.tpl')) {
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/' . XoopsLocale::getLocale() . '/help/' . $page . '.tpl');
-        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/' . XoopsLocale::getLocale() . '/help/' . $page . '.html')) {
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/' . XoopsLocale::getLocale() . '/help/' . $page . '.html');
-        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl')) {
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl');
-        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html')) {
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html');
-        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/en_US/help/' . $page . '.tpl')) {
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/en_US/help/' . $page . '.tpl');
-        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/en_US/help/' . $page . '.html')) {
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/locale/en_US/help/' . $page . '.html');
-        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl')) {
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl');
-        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html')) {
-            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html');
+        if ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/'.XoopsLocale::getLocale().'/help/'.$page.'.tpl')) {
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/'.XoopsLocale::getLocale().'/help/'.$page.'.tpl');
+        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/'.XoopsLocale::getLocale().'/help/'.$page.'.html')) {
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/'.XoopsLocale::getLocale().'/help/'.$page.'.html');
+        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.tpl')) {
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.tpl');
+        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.html')) {
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/'.$xoopsConfig['language'].'/help/'.$page.'.html');
+        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/en_US/help/'.$page.'.tpl')) {
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/en_US/help/'.$page.'.tpl');
+        } elseif ($helpfile = XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/en_US/help/'.$page.'.html')) {
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/locale/en_US/help/'.$page.'.html');
+        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.tpl')) {
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.tpl');
+        } elseif (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.html')) {
+            $helpcontent = $xoops->tpl()->fetch(\XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e').'/language/english/help/'.$page.'.html');
         } else {
             $xoops->tpl()->assign('load_error', 1);
         }
@@ -126,23 +126,23 @@ 
         $xoops->tpl()->assign('helpcontent', $helpcontent);
     } else {
         if ($helpfile = XoopsLoad::fileExists(
-            \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e')
-            . '/locale/' . XoopsLocale::getLocale() . '/help/module_index.html'
+            \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e')
+            . '/locale/'.XoopsLocale::getLocale().'/help/module_index.html'
         )) {
             $helpcontent = $xoops->tpl()->fetch(
-                \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e')
-                . '/locale/' . XoopsLocale::getLocale() . '/help/module_index.html'
+                \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e')
+                . '/locale/'.XoopsLocale::getLocale().'/help/module_index.html'
             );
         } elseif (XoopsLoad::fileExists(
-            \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e')
-            . '/language/' . $xoops->getConfig('language') . '/help/module_index.html'
+            \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e')
+            . '/language/'.$xoops->getConfig('language').'/help/module_index.html'
         )) {
             $helpcontent = $xoops->tpl()->fetch(
-                \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getVar('dirname', 'e')
-                . '/language/' . $xoops->getConfig('language') . '/help/module_index.html'
+                \XoopsBaseConfig::get('root-path').'/modules/'.$module->getVar('dirname', 'e')
+                . '/language/'.$xoops->getConfig('language').'/help/module_index.html'
             );
         } else {
-            $helpcontent = '<p>' . $module->getInfo('description') . '</p>';
+            $helpcontent = '<p>'.$module->getInfo('description').'</p>';
         }
         $xoops->tpl()->assign('helpcontent', $helpcontent);
     }
@@ -169,19 +169,19 @@ 
         $listed_mods[$i]['description'] = $module->getInfo('description');
 
         if ($module->getVar('dirname', 'e') === 'system') {
-            $admin_dir = \XoopsBaseConfig::get('root-path') . '/modules/system/admin';
+            $admin_dir = \XoopsBaseConfig::get('root-path').'/modules/system/admin';
             $dirlist = XoopsLists::getDirListAsArray($admin_dir);
 
             foreach ($dirlist as $directory) {
-                if (XoopsLoad::fileExists($file = $admin_dir . '/' . $directory . '/xoops_version.php')) {
+                if (XoopsLoad::fileExists($file = $admin_dir.'/'.$directory.'/xoops_version.php')) {
 
                     require $file;
                     unset($file);
 
                     if ($modversion['help']) {
                         $list_help[$j]['name'] = system_adminVersion($directory, 'name');
-                        $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e')
-                            . '&amp;' . system_adminVersion($directory, 'help');
+                        $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e')
+                            . '&amp;'.system_adminVersion($directory, 'help');
                     }
                     unset($modversion);
                     ++$j;
@@ -190,15 +190,15 @@ 
             unset($dirlist);
         } else {
             $helplist = $module->getInfo('helpsection');
-            $k=0;
+            $k = 0;
 
             // Only build the list if one has been defined.
             if (is_array($helplist)) {
                 foreach ($helplist as $helpitem) {
                     if (($helpitem['name'] != '') && ($helpitem['link'] != '')) {
                         $list_help[$j]['name'] = $helpitem['name'];
-                        $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e')
-                            . '&amp;' . $helpitem['link'];
+                        $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e')
+                            . '&amp;'.$helpitem['link'];
                         ++$j;
                         ++$k;
                     }
@@ -207,10 +207,10 @@ 
             unset($helplist);
 
             // If there is no help section ($k=0), and a lone help parameter has been defined.
-            if (( $module->getInfo('help') != '' ) && ($k == 0)) {
+            if (($module->getInfo('help') != '') && ($k == 0)) {
                 $list_help[$j]['name'] = $module->getInfo('name');
-                $list_help[$j]['link'] = 'help.php?mid=' . $module->getVar('mid', 'e')
-                    . '&amp;' . $module->getInfo('help');
+                $list_help[$j]['link'] = 'help.php?mid='.$module->getVar('mid', 'e')
+                    . '&amp;'.$module->getInfo('help');
             }
         }
         $listed_mods[$i]['help_page'] = $list_help;
@@ -225,15 +225,15 @@ 
     $xoops->tpl()->assign('list_mods', $listed_mods);
 
     if (XoopsLoad::fileExists(
-        \XoopsBaseConfig::get('root-path') . '/modules/system/language/'
-        . $xoops->getConfig('language') . '/help/help_center.html'
+        \XoopsBaseConfig::get('root-path').'/modules/system/language/'
+        . $xoops->getConfig('language').'/help/help_center.html'
     )) {
         $helpcontent = $xoops->tpl()->fetch(
-            \XoopsBaseConfig::get('root-path') . '/modules/system/language/' . $xoops->getConfig('language')
+            \XoopsBaseConfig::get('root-path').'/modules/system/language/'.$xoops->getConfig('language')
             . '/help/help_center.html'
         );
     } else {
-        $helpcontent = '<div id="non-modhelp">' . SystemLocale::WELCOME_TO_XOOPS_HELP_CENTER . '</div>';
+        $helpcontent = '<div id="non-modhelp">'.SystemLocale::WELCOME_TO_XOOPS_HELP_CENTER.'</div>';
     }
 
     $xoops->tpl()->assign('helpcontent', $helpcontent);

htdocs/modules/system/menu.php

Spacing +3 added lines, -3 removed lines

@@ -40,15 +40,15 @@
 $dirlist = XoopsLists::getDirListAsArray($admin_dir);
 $index = 0;
 foreach ($dirlist as $file) {
-    if (XoopsLoad::fileExists($fileinc = $admin_dir . '/' . $file . '/xoops_version.php')) {
+    if (XoopsLoad::fileExists($fileinc = $admin_dir.'/'.$file.'/xoops_version.php')) {
         include $fileinc;
         unset($fileinc);
         if ($modversion['hasAdmin']) {
-            if ($xoops->getModuleConfig('active_' . $file, 'system')) {
+            if ($xoops->getModuleConfig('active_'.$file, 'system')) {
                 $category = isset($modversion['category']) ? (int)($modversion['category']) : 0;
                 if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
                     $adminmenu[$index]['title'] = trim($modversion['name']);
-                    $adminmenu[$index]['link'] = 'admin.php?fct=' . $file;
+                    $adminmenu[$index]['link'] = 'admin.php?fct='.$file;
                     $adminmenu[$index]['image'] = $modversion['image'];
                 }
             }