XOOPS / XoopsCore

htdocs/modules/system/class/plugin/usermenu.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
             // View Account
             $ret[] = [
                 'name' => XoopsLocale::VIEW_ACCOUNT,
-                'link' => $xoops->url('userinfo.php?uid=' . $xoops->user->getVar('uid')),
+                'link' => $xoops->url('userinfo.php?uid='.$xoops->user->getVar('uid')),
                 'icon' => 'glyphicon-user',
             ];
 
@@ -58,7 +58,7 @@ 
 
             $name = XoopsLocale::INBOX;
             if ($pm_count = $pm_handler->getCount($criteria)) {
-                $name = XoopsLocale::INBOX . ' <span class="badge">' . $pm_count . '</span>';
+                $name = XoopsLocale::INBOX.' <span class="badge">'.$pm_count.'</span>';
             }
 
             $ret[] = [

htdocs/modules/system/class/CountryFlagProvider.php

Spacing +21 added lines, -21 removed lines

@@ -75,13 +75,13 @@ 
         }
 
         $xoops = \Xoops::getInstance();
-        $flagDir = $this->flagSource . $sizeDir . '/';
-        $flagFile = $flagDir . $countryCode . '.png';
+        $flagDir = $this->flagSource.$sizeDir.'/';
+        $flagFile = $flagDir.$countryCode.'.png';
 
         $file = $xoops->path($flagFile);
         // switch to unknown if file is not readable
         if (!is_readable($file)) {
-            $flagFile = $flagDir . '_unknown.png';
+            $flagFile = $flagDir.'_unknown.png';
         }
         $url = $xoops->url($flagFile);
         return $url;
@@ -94,24 +94,24 @@ 
      *
      * @var string[]
      */
-    private $overrideMap = array (
-        'AC' => 'SH',       // *Ascension Island part of Saint Helena, Ascension and Tristan da Cunha
-        'BQ' => 'NL',       // Caribbean Netherlands
-        'BV' => 'NO',       // Bouvet Island, dependency of Norway
-        'CP' => 'FR',       // *Clipperton Island,  overseas possession of France
-        'DG' => 'GB',       // *Diego Garcia, British Indian Ocean Territory disputed sovereignty
-        'EA' => 'ES',       // *Ceuta & Melilla, Spanish cities on the north coast of Africa
-        'GF' => 'FR',       // French Guiana, overseas region of France
-        'GP' => 'FR',       // Guadeloupe, overseas region of France
-        'HM' => 'AU',       // Heard & McDonald Islands, Australian external territory
-        'IO' => 'GB',       // British Indian Ocean Territory
-        'PM' => 'FR',       // St. Pierre & Miquelon, territorial overseas collectivity of France
-        'RE' => 'FR',       // Réunion, overseas region of France
-        'SJ' => 'NO',       // Svalbard & Jan Mayen, integrated parts of Norway not allocated to counties
-        'SX' => 'NL',       // Sint Maarten,  constituent country of the Kingdom of the Netherlands
-        'TA' => 'SH',       // *Tristan da Cunha part of Saint Helena, Ascension and Tristan da Cunha
-        'UM' => 'US',       // U.S. Outlying Islands
-        'XK' => '_kosovo',  // (User-assigned range) temporary assigned code
+    private $overrideMap = array(
+        'AC' => 'SH', // *Ascension Island part of Saint Helena, Ascension and Tristan da Cunha
+        'BQ' => 'NL', // Caribbean Netherlands
+        'BV' => 'NO', // Bouvet Island, dependency of Norway
+        'CP' => 'FR', // *Clipperton Island,  overseas possession of France
+        'DG' => 'GB', // *Diego Garcia, British Indian Ocean Territory disputed sovereignty
+        'EA' => 'ES', // *Ceuta & Melilla, Spanish cities on the north coast of Africa
+        'GF' => 'FR', // French Guiana, overseas region of France
+        'GP' => 'FR', // Guadeloupe, overseas region of France
+        'HM' => 'AU', // Heard & McDonald Islands, Australian external territory
+        'IO' => 'GB', // British Indian Ocean Territory
+        'PM' => 'FR', // St. Pierre & Miquelon, territorial overseas collectivity of France
+        'RE' => 'FR', // Réunion, overseas region of France
+        'SJ' => 'NO', // Svalbard & Jan Mayen, integrated parts of Norway not allocated to counties
+        'SX' => 'NL', // Sint Maarten,  constituent country of the Kingdom of the Netherlands
+        'TA' => 'SH', // *Tristan da Cunha part of Saint Helena, Ascension and Tristan da Cunha
+        'UM' => 'US', // U.S. Outlying Islands
+        'XK' => '_kosovo', // (User-assigned range) temporary assigned code
     );
 
     /**

htdocs/modules/system/class/cookie.php

Spacing +8 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
                 list ($k, $v) = each($key);
 
                 // Set string representation
-                $key = $k . '[' . $v . ']';
+                $key = $k.'['.$v.']';
 
                 // Set expiration time to -1hr (will cause browser deletion)
                 setcookie($key, false, time() - 3600);
@@ -60,7 +60,7 @@ 
                 foreach ($_COOKIE[$key] as $k => $v)
                 {
                     // Set string representation
-                    $cookie = $key . '[' . $k . ']';
+                    $cookie = $key.'['.$k.']';
 
                     // Set expiration time to -1hr (will cause browser deletion)
                     setcookie($cookie, false, time() - 3600);
@@ -138,12 +138,12 @@ 
     public static function set(
         $key,
         $value,
-        $expire = 0,            /* Default expire time (session, 1 week = 604800) */
-        $path = '',             /* Default path */
-        $domain = '',           /* Default domain */
-        $secure = false,        /* Does this cookie need a secure HTTPS connection? */
+        $expire = 0, /* Default expire time (session, 1 week = 604800) */
+        $path = '', /* Default path */
+        $domain = '', /* Default domain */
+        $secure = false, /* Does this cookie need a secure HTTPS connection? */
         $httponly = true        /* Can non-HTTP services access this cookie (IE: javascript)? */
-    ){
+    ) {
         // Make sure they aren't trying to set a reserved word
         if (!in_array($key, self::$_reserved))
         {
@@ -171,7 +171,7 @@ 
                 list ($k, $v) = each($key);
 
                 // Set string representation
-                $key = $k . '[' . $v . ']';
+                $key = $k.'['.$v.']';
             }
         }
 

Braces +18 added lines, -6 removed lines

@@ -95,11 +95,15 @@ 
             list ($k, $v) = each($key);
 
             // Check for key/value pair and return
-            if (isset($_COOKIE[$k][$v])) return true;
+            if (isset($_COOKIE[$k][$v])) {
+                return true;
+            }
         }
 
         // If key exists, return true
-        else if (isset($_COOKIE[$key])) return true;
+        else if (isset($_COOKIE[$key])) {
+            return true;
+        }
 
         // Key does not exist
         return false;
@@ -118,14 +122,20 @@ 
             list ($k, $v) = each($key);
 
             // Check for key/value pair and return
-            if (isset($_COOKIE[$k][$v])) return $_COOKIE[$k][$v];
+            if (isset($_COOKIE[$k][$v])) {
+                return $_COOKIE[$k][$v];
+            }
         }
 
         // Return single key if it's set
-        else if (isset($_COOKIE[$key])) return $_COOKIE[$key];
+        else if (isset($_COOKIE[$key])) {
+            return $_COOKIE[$key];
+        }
 
         // Otherwise return null
-        else return null;
+        else {
+            return null;
+        }
     }
 
     // Return the cookie array
@@ -155,7 +165,9 @@ 
         }
 
         // Otherwise, throw an error
-        else Error::warning('Could not set key -- it is reserved.', __CLASS__);
+        else {
+            Error::warning('Could not set key -- it is reserved.', __CLASS__);
+        }
     }
 
     // Converts strings to arrays (or vice versa if toString = true)

htdocs/modules/system/class/systembreadcrumb.php

Indentation -4 removed lines

@@ -72,7 +72,6 @@ 
 
     /**
      * Add link to breadcrumb
-
      */
     function addLink($title = '', $link = '', $home = false)
     {
@@ -83,7 +82,6 @@ 
 
     /**
      * Add Help link
-
      */
     function addHelp($link = '')
     {
@@ -92,7 +90,6 @@ 
 
     /**
      * Add Tips
-
      */
     function addTips($value)
     {
@@ -101,7 +98,6 @@ 
 
     /**
      * Render System BreadCrumb
-
      */
     function render()
     {

Spacing +9 added lines, -9 removed lines

@@ -115,34 +115,34 @@
                 }
             }
             // Call template
-            if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/system/language/' . $xoops->getConfig('language') . '/help/' . $this->_directory . '.html')) {
+            if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/system/language/'.$xoops->getConfig('language').'/help/'.$this->_directory.'.html')) {
                 $xoops->tpl()
-                        ->assign('help_content', \XoopsBaseConfig::get('root-path') . '/modules/system/language/' . $xoops->getConfig('language') . '/help/' . $this->_directory . '.html');
+                        ->assign('help_content', \XoopsBaseConfig::get('root-path').'/modules/system/language/'.$xoops->getConfig('language').'/help/'.$this->_directory.'.html');
             } else {
-                if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path') . '/modules/system/language/english/help/' . $this->_directory . '.html')) {
+                if (XoopsLoad::fileExists(\XoopsBaseConfig::get('root-path').'/modules/system/language/english/help/'.$this->_directory.'.html')) {
                     $xoops->tpl()
-                            ->assign('help_content', \XoopsBaseConfig::get('root-path') . '/modules/system/language/english/help/' . $this->_directory . '.html');
+                            ->assign('help_content', \XoopsBaseConfig::get('root-path').'/modules/system/language/english/help/'.$this->_directory.'.html');
                 } else {
                     $xoops->tpl()->assign('load_error', 1);
                 }
             }
         } else {
-            $out = $menu = '<style type="text/css" media="screen">@import ' . \XoopsBaseConfig::get('url') . '/modules/system/css/menu.css;</style>';
+            $out = $menu = '<style type="text/css" media="screen">@import '.\XoopsBaseConfig::get('url').'/modules/system/css/menu.css;</style>';
             $out .= '<ul id="xo-breadcrumb">';
             foreach ($this->_bread as $menu) {
                 if ($menu['home']) {
-                    $out .= '<li><a href="' . $menu['link'] . '" title="' . $menu['title'] . '"><img src="images/home.png" alt="' . $menu['title'] . '" class="home" /></a></li>';
+                    $out .= '<li><a href="'.$menu['link'].'" title="'.$menu['title'].'"><img src="images/home.png" alt="'.$menu['title'].'" class="home" /></a></li>';
                 } else {
                     if ($menu['link'] != '') {
-                        $out .= '<li><a href="' . $menu['link'] . '" title="' . $menu['title'] . '">' . $menu['title'] . '</a></li>';
+                        $out .= '<li><a href="'.$menu['link'].'" title="'.$menu['title'].'">'.$menu['title'].'</a></li>';
                     } else {
-                        $out .= '<li>' . $menu['title'] . '</li>';
+                        $out .= '<li>'.$menu['title'].'</li>';
                     }
                 }
             }
             $out .= '</ul>';
             if ($this->_tips) {
-                $out .= '<div class="tips">' . $this->_tips . '</div>';
+                $out .= '<div class="tips">'.$this->_tips.'</div>';
             }
             echo $out;
         }

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) {