geekwright / XoopsCore

htdocs/modules/system/class/extension.php

Spacing +10 added lines, -10 removed lines

@@ -67,7 +67,7 @@ 
         $i = 0;
         foreach ($this->modulesList as $file) {
             $file = trim($file);
-            if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $file . '/xoops_version.php')) {
+            if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$file.'/xoops_version.php')) {
                 clearstatcache();
                 /* @var $module XoopsModule */
                 $module = $module_handler->create();
@@ -97,7 +97,7 @@ 
                         ) {
                             $module->setInfo(
                                 'link_pref',
-                                \XoopsBaseConfig::get('url') . '/modules/system/admin.php?fct=preferences&op=showmod&mod='
+                                \XoopsBaseConfig::get('url').'/modules/system/admin.php?fct=preferences&op=showmod&mod='
                                 . $module->getInfo('mid')
                             );
                         }
@@ -106,28 +106,28 @@ 
                     }
                     $module->setInfo('version', round($module->getInfo('version'), 2));
                     if (XoopsLoad::fileExists(
-                        \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getInfo('dirname') . '/icons/logo_small.png'
+                        \XoopsBaseConfig::get('root-path').'/modules/'.$module->getInfo('dirname').'/icons/logo_small.png'
                     )) {
                         $module->setInfo(
                             'logo_small',
-                            \XoopsBaseConfig::get('url') . '/modules/' . $module->getInfo('dirname') . '/icons/logo_small.png'
+                            \XoopsBaseConfig::get('url').'/modules/'.$module->getInfo('dirname').'/icons/logo_small.png'
                         );
                     } else {
-                        $module->setInfo('logo_small', \XoopsBaseConfig::get('url') . '/media/xoops/images/icons/16/default.png');
+                        $module->setInfo('logo_small', \XoopsBaseConfig::get('url').'/media/xoops/images/icons/16/default.png');
                     }
                     if (XoopsLoad::fileExists(
-                        \XoopsBaseConfig::get('root-path') . '/modules/' . $module->getInfo('dirname') . '/icons/logo_large.png'
+                        \XoopsBaseConfig::get('root-path').'/modules/'.$module->getInfo('dirname').'/icons/logo_large.png'
                     )) {
                         $module->setInfo(
                             'logo_large',
-                            \XoopsBaseConfig::get('url') . '/modules/' . $module->getInfo('dirname') . '/icons/logo_large.png'
+                            \XoopsBaseConfig::get('url').'/modules/'.$module->getInfo('dirname').'/icons/logo_large.png'
                         );
                     } else {
-                        $module->setInfo('logo_large', \XoopsBaseConfig::get('url') . '/media/xoops/images/icons/32/default.png');
+                        $module->setInfo('logo_large', \XoopsBaseConfig::get('url').'/media/xoops/images/icons/32/default.png');
                     }
                     $module->setInfo(
                         'link_admin',
-                        \XoopsBaseConfig::get('url') . '/modules/' . $module->getInfo('dirname') . '/' . $module->getInfo('adminindex')
+                        \XoopsBaseConfig::get('url').'/modules/'.$module->getInfo('dirname').'/'.$module->getInfo('adminindex')
                     );
                     $module->setInfo('options', $module->getAdminMenu());
                     $ret[] = $module;
@@ -153,7 +153,7 @@ 
         $ret = array();
         $i = 0;
         foreach ($this->modulesList as $file) {
-            if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/' . $file . '/xoops_version.php')) {
+            if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/'.$file.'/xoops_version.php')) {
                 clearstatcache();
                 $file = trim($file);
                 if (!in_array($file, $this->modulesDirnames)) {

htdocs/modules/system/class/form/group.php

Spacing +6 added lines, -6 removed lines

@@ -70,12 +70,12 @@ 
 
         $s_cat_checkbox = new Xoops\Form\Checkbox('', "system_catids", $s_cat_value);
         //$s_cat_checkbox->columns = 6;
-        $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 $file) {
-            include \XoopsBaseConfig::get('root-path') . '/modules/system/admin/' . $file . '/xoops_version.php';
+            include \XoopsBaseConfig::get('root-path').'/modules/system/admin/'.$file.'/xoops_version.php';
             if (!empty($modversion['category'])) {
-                if ($xoops->getModuleConfig('active_' . $file, 'system') == 1) {
+                if ($xoops->getModuleConfig('active_'.$file, 'system') == 1) {
                     $s_cat_checkbox->addOption($modversion['category'], $modversion['name']);
                 }
             }
@@ -124,7 +124,7 @@ 
 
         $block_handler = $xoops->getHandlerBlock();
         $blocks_obj = $block_handler->getDistinctObjects(
-            new Criteria("mid", "('" . implode("', '", array_keys($module_list)) . "')", "IN"),
+            new Criteria("mid", "('".implode("', '", array_keys($module_list))."')", "IN"),
             true
         );
 
@@ -146,12 +146,12 @@ 
 
             $new_blocks_array = array();
             foreach ($blocks_module[$mid] as $key => $value) {
-                $new_blocks_array[$key] = "<a href='" . \XoopsBaseConfig::get('url')
+                $new_blocks_array[$key] = "<a href='".\XoopsBaseConfig::get('url')
                     . "/modules/system/admin.php?fct=blocksadmin&amp;op=edit&amp;bid={$key}' "
                     . "title='ID: {$key}' rel='external'>{$value}</a>";
             }
             $r_block_checkbox = new Xoops\Form\Checkbox(
-                '<strong>' . $module_list[$mid] . '</strong><br />',
+                '<strong>'.$module_list[$mid].'</strong><br />',
                 "read_bids[]",
                 $r_block_value
             );

htdocs/modules/system/class/form/preferences.php

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
         $configs = $mod->getInfo('config');
         $configNames = array();
         foreach (array_keys($configs) as $i) {
-            $configNames[$configs[$i]['name']] =& $configs[$i];
+            $configNames[$configs[$i]['name']] = & $configs[$i];
         }
         $configCats = $mod->getInfo('configcat');
         if (!$configCats) {
@@ -85,7 +85,7 @@ 
         $tabTray = new Xoops\Form\TabTray('', 'pref_tabtay');
         $tabs = array();
         foreach ($configCats as $name => $info) {
-            $tabs[$name] = new Xoops\Form\Tab($info['name'], 'pref_tab_' . $name);
+            $tabs[$name] = new Xoops\Form\Tab($info['name'], 'pref_tab_'.$name);
             if (isset($info['description']) && $info['description'] != '') {
                 $tabs[$name]->addElement(new Xoops\Form\Label('', $info['description']));
             }
@@ -99,7 +99,7 @@ 
         } elseif ($mod->getInfo('adminindex')) {
             $this->addElement(new Xoops\Form\Hidden(
                 'redirect',
-                \XoopsBaseConfig::get('url') . '/modules/' . $mod->getVar('dirname') . '/' . $mod->getInfo('adminindex')
+                \XoopsBaseConfig::get('url').'/modules/'.$mod->getVar('dirname').'/'.$mod->getInfo('adminindex')
             ));
         }
         $count = count($obj);
@@ -260,7 +260,7 @@ 
                         $ele = new Xoops\Form\ElementTray($title, '<br />');
                         foreach (array_keys($modules) as $mid) {
                             $c_val = isset($currrent_val[$mid]) ? (int)($currrent_val[$mid]) : null;
-                            $selform = new Xoops\Form\Select($modules[$mid]->getVar('name'), $obj[$i]->getVar('conf_name') . "[$mid]", $c_val);
+                            $selform = new Xoops\Form\Select($modules[$mid]->getVar('name'), $obj[$i]->getVar('conf_name')."[$mid]", $c_val);
                             $selform->addOptionArray($cache_options);
                             $ele->addElement($selform);
                             unset($selform);

htdocs/modules/system/class/form/block.php

Spacing +5 added lines, -5 removed lines

@@ -152,17 +152,17 @@
                 if (count($btemplate) > 0) {
                     $this->addElement(new Xoops\Form\Label(
                         XoopsLocale::CONTENT,
-                        '<a href="' . \XoopsBaseConfig::get('url') . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='
-                        . $btemplate[0]->getVar('tpl_id') . '">' . SystemLocale::EDIT_TEMPLATE . '</a>'
+                        '<a href="'.\XoopsBaseConfig::get('url').'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='
+                        . $btemplate[0]->getVar('tpl_id').'">'.SystemLocale::EDIT_TEMPLATE.'</a>'
                     ));
                 } else {
                     $btemplate2 = $tplfile_handler->find('default', 'block', $this->obj->getVar('bid'));
                     if (count($btemplate2) > 0) {
                         $this->addElement(new Xoops\Form\Label(
                             XoopsLocale::CONTENT,
-                            '<a href="' . \XoopsBaseConfig::get('url') . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='
-                            . $btemplate2[0]->getVar('tpl_id') . '" rel="external">'
-                            . SystemLocale::EDIT_TEMPLATE . '</a>'
+                            '<a href="'.\XoopsBaseConfig::get('url').'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='
+                            . $btemplate2[0]->getVar('tpl_id').'" rel="external">'
+                            . SystemLocale::EDIT_TEMPLATE.'</a>'
                         ));
                     }
                 }

htdocs/modules/system/class/form/user.php

Spacing +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
         } else {
             //add each user groups
             foreach ($groups as $key => $group) {
-                $group_select[] = new Xoops\Form\Hidden('groups[' . $key . ']', $group);
+                $group_select[] = new Xoops\Form\Hidden('groups['.$key.']', $group);
             }
         }
         foreach ($group_select as $group) {

htdocs/modules/system/class/menu.php

Indentation +4 added lines, -4 removed lines

@@ -132,10 +132,10 @@
         $xoops->tpl()->assign('xo_module_menu_top', $this->_menutop);
         $this->_menutabs[$currentoption]['current'] = 1;
         $xoops->tpl()->assign('xo_module_menu_tab', $this->_menutabs);
-         //$xoops->tpl()->assign('xo_admin_help', $this->_help);
-         //if ($xoops->tpl()_name == '') {
-         //    $xoops->tpl()->display('admin:system/admin_tabs.tpl');
-         //}
+            //$xoops->tpl()->assign('xo_admin_help', $this->_help);
+            //if ($xoops->tpl()_name == '') {
+            //    $xoops->tpl()->display('admin:system/admin_tabs.tpl');
+            //}
         return;
 
         global $modversion;

Spacing +10 added lines, -10 removed lines

@@ -113,13 +113,13 @@ 
 
         if ($num > 1) {
             foreach ($arr as $val) {
-                $return_str .= ' &gt; <a href="' . $site . $val . '/">' . $bc_label[$val] . '</a>';
-                $site .= $val . '/';
+                $return_str .= ' &gt; <a href="'.$site.$val.'/">'.$bc_label[$val].'</a>';
+                $site .= $val.'/';
             }
         } else {
             if ($num == 1) {
                 $arr = $str;
-                $return_str .= ' &gt; <a href="' . $bc_site . $arr . '/">' . $bc_label[$arr] . '</a>';
+                $return_str .= ' &gt; <a href="'.$bc_site.$arr.'/">'.$bc_label[$arr].'</a>';
             }
         }
 
@@ -161,12 +161,12 @@ 
         $menu = substr($menu, 0, -1);
 
         $menu .= "</td>";
-        $menu .= "<td style='text-align: right;'><strong>" . $this->_obj->getVar('name') . "</strong> : " . $breadcrumb . "</td>";
+        $menu .= "<td style='text-align: right;'><strong>".$this->_obj->getVar('name')."</strong> : ".$breadcrumb."</td>";
         $menu .= "</tr>\n</table>\n";
         $menu .= "</div>\n";
         $menu .= "<div id='buttonbar_mod'><ul>";
         foreach ($this->_menutabs as $k => $v) {
-            $menu .= "<li id='" . $menuItems[$i] . "'><a href='" . \XoopsBaseConfig::get('url') . "/modules/" . $this->_obj->getVar('dirname') . "/" . $k . "'><span>$v</span></a></li>\n";
+            $menu .= "<li id='".$menuItems[$i]."'><a href='".\XoopsBaseConfig::get('url')."/modules/".$this->_obj->getVar('dirname')."/".$k."'><span>$v</span></a></li>\n";
             ++$i;
         }
         $menu .= "</ul>\n</div>\n";
@@ -174,18 +174,18 @@ 
             $menu .= "<h4 class='admin_header'>";
             if (isset($modversion['name'])) {
                 if ($modversion['image'] && $this->_obj->getVar('mid') == 1) {
-                    $system_image = \XoopsBaseConfig::get('url') . '/modules/system/images/system/' . $modversion['image'];
+                    $system_image = \XoopsBaseConfig::get('url').'/modules/system/images/system/'.$modversion['image'];
                 } else {
-                    $system_image = \XoopsBaseConfig::get('url') . '/modules/' . $_dirname . '/images/' . $modversion['image'];
+                    $system_image = \XoopsBaseConfig::get('url').'/modules/'.$_dirname.'/images/'.$modversion['image'];
                 }
                 $menu .= "<img src='$system_image' align='middle' height='32' width='32' alt='' />";
-                $menu .= " " . $modversion['name'] . "</h4>\n";
+                $menu .= " ".$modversion['name']."</h4>\n";
             } else {
-                $menu .= " " . $this->_header . "</h4>\n";
+                $menu .= " ".$this->_header."</h4>\n";
             }
         }
         if ($this->_subheader) {
-            $menu .= "<div class='admin_subheader'>" . $this->_subheader . "</div>\n";
+            $menu .= "<div class='admin_subheader'>".$this->_subheader."</div>\n";
         }
         $menu .= '<div class="clear">&nbsp;</div>';
         unset($this->_obj);

htdocs/modules/system/header.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  */
 
 // Include XOOPS control panel header
-include_once dirname(dirname(__DIR__)) . '/include/cp_header.php';
+include_once dirname(dirname(__DIR__)).'/include/cp_header.php';
 
 $xoops = Xoops::getInstance();
 
@@ -48,4 +48,4 @@ 
 XoopsLoad::load('systembreadcrumb', 'system');
 
 $system_breadcrumb = SystemBreadcrumb::getInstance($fct);
-$system_breadcrumb->addLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url') . '/admin.php', true);
+$system_breadcrumb->addLink(SystemLocale::CONTROL_PANEL, \XoopsBaseConfig::get('url').'/admin.php', true);

htdocs/modules/maintenance/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  * @version         $Id$
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->header();
 $aboutAdmin = new \Xoops\Module\Admin();

htdocs/modules/maintenance/admin/dump.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
  * @version         $Id$
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 // Get main instance
 $system = System::getInstance();
 $xoops = Xoops::getInstance();
@@ -40,14 +40,14 @@ 
 
     case 'list':
     default:
-        $files = glob(\XoopsBaseConfig::get('root-path') . '/modules/maintenance/dump/*.*');
+        $files = glob(\XoopsBaseConfig::get('root-path').'/modules/maintenance/dump/*.*');
         $count = 0;
         foreach ($files as $filename_path) {
             $filename = basename(strtolower($filename_path));
             if ($filename !== 'index.html') {
                 $file_arr[$count]['name'] = $filename;
                 $stat = stat($filename_path);
-                $file_arr[$count]['size'] = number_format($stat['size']/1024);
+                $file_arr[$count]['size'] = number_format($stat['size'] / 1024);
                 ++$count;
                 unset($filename);
             }
@@ -85,18 +85,18 @@ 
         $dump = new Maintenance();
         $sql_text = "# \n";
         $sql_text .= "# Dump SQL, Generated by XOOPS \n";
-        $sql_text .= "# Date : " . \XoopsLocale::formatTimestamp(time(), 'medium') . " \n";
+        $sql_text .= "# Date : ".\XoopsLocale::formatTimestamp(time(), 'medium')." \n";
         $sql_text .= "# \n\n";
         if ($dump_tables != false) {
             $result_module = array();
             for ($i = 0; $i < count($dump_tables); ++$i) {
                 //structure
-                $result_tables[$i]['name'] = $db->prefix . '_' . $dump_tables[$i];
-                $result_structure = $dump->dumpTableStructure($db->prefix . '_' . $dump_tables[$i], $drop);
+                $result_tables[$i]['name'] = $db->prefix.'_'.$dump_tables[$i];
+                $result_structure = $dump->dumpTableStructure($db->prefix.'_'.$dump_tables[$i], $drop);
                 $sql_text .= $result_structure['sql_text'];
                 $result_tables[$i]['structure'] = $result_structure['structure'];
                 //data
-                $result_data = $dump->dumpTableData($db->prefix . '_' . $dump_tables[$i]);
+                $result_data = $dump->dumpTableData($db->prefix.'_'.$dump_tables[$i]);
                 $sql_text .= $result_data['sql_text'];
                 $result_tables[$i]['records'] = $result_data['records'];
             }
@@ -113,13 +113,13 @@ 
                     $count = 0;
                     foreach ($modtables as $table) {
                         //structure
-                        $result_tables[$count]['name'] = $db->prefix . '_' . $table;
-                        $result_structure = $dump->dumpTableStructure($db->prefix . '_' . $table, $drop);
+                        $result_tables[$count]['name'] = $db->prefix.'_'.$table;
+                        $result_structure = $dump->dumpTableStructure($db->prefix.'_'.$table, $drop);
                         $sql_text .= $result_structure['sql_text'];
                         $result_tables[$count]['structure'] = $result_structure['structure'];
 
                         //data
-                        $result_data = $dump->dumpTableData($db->prefix . '_' . $table);
+                        $result_data = $dump->dumpTableData($db->prefix.'_'.$table);
                         $sql_text .= $result_data['sql_text'];
                         $result_tables[$count]['records'] = $result_data['records'];
                         ++$count;
@@ -143,12 +143,12 @@ 
         if ($filename == '') {
             $xoops->redirect("dump.php", 2, _AM_MAINTENANCE_DUMP_NOFILE);
         }
-        unlink(\XoopsBaseConfig::get('root-path') . '/modules/maintenance/dump/' . $filename);
+        unlink(\XoopsBaseConfig::get('root-path').'/modules/maintenance/dump/'.$filename);
         $xoops->redirect("dump.php", 2, _AM_MAINTENANCE_DUMP_DELETED);
         break;
 
     case 'dump_deleteall':
-        $files = glob(\XoopsBaseConfig::get('root-path') . '/modules/maintenance/dump/*.*');
+        $files = glob(\XoopsBaseConfig::get('root-path').'/modules/maintenance/dump/*.*');
         $count = 0;
         foreach ($files as $filename_path) {
             if (basename(strtolower($filename_path)) !== 'index.html') {