XOOPS / XoopsCore

htdocs/modules/system/blocks/main.php

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
                 $block['modules'][$i]['highlight'] = true;
                 $block['nothome'] = true;
             }
-             /* @var $plugin MenusPluginInterface */
+                /* @var $plugin MenusPluginInterface */
             if ($xoops->isModule() && $module->getVar('dirname') == $xoops->module->getVar('dirname') && $plugin = \Xoops\Module\Plugin::getPlugin($module->getVar('dirname'), 'menus')) {
                 $sublinks = $plugin->subMenus();
                 foreach ($sublinks as $sublink) {

Spacing +3 added lines, -3 removed lines

@@ -41,8 +41,8 @@ 
         if (in_array($i, $read_allowed)) {
             $block['modules'][$i]['name'] = $module->getVar('name');
             $block['modules'][$i]['dirname'] = $module->getVar('dirname');
-            if (XoopsLoad::fileExists($xoops->path('modules/' . $module->getVar('dirname') . '/icons/logo_small.png'))) {
-                $block['modules'][$i]['image'] = $xoops->url('modules/' . $module->getVar('dirname') . '/icons/logo_small.png');
+            if (XoopsLoad::fileExists($xoops->path('modules/'.$module->getVar('dirname').'/icons/logo_small.png'))) {
+                $block['modules'][$i]['image'] = $xoops->url('modules/'.$module->getVar('dirname').'/icons/logo_small.png');
             }
             if ($xoops->isModule() && ($i == $xoops->module->getVar('mid'))) {
                 $block['modules'][$i]['highlight'] = true;
@@ -58,7 +58,7 @@ 
                 foreach ($sublinks as $sublink) {
                     $block['modules'][$i]['sublinks'][] = array(
                         'name' => $sublink['name'],
-                        'url'  => \XoopsBaseConfig::get('url') . '/modules/' . $module->getVar('dirname') . '/' . $sublink['url']
+                        'url'  => \XoopsBaseConfig::get('url').'/modules/'.$module->getVar('dirname').'/'.$sublink['url']
                     );
                 }
             }

htdocs/modules/system/blocks/newmembers.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     $count = count($newmembers);
     for ($i = 0; $i < $count; ++$i) {
         if ($options[1] == 1) {
-            $block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') !== 'blank.gif' ? \XoopsBaseConfig::get('uploads-url') . '/' . $newmembers[$i]->getVar('user_avatar') : '';
+            $block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') !== 'blank.gif' ? \XoopsBaseConfig::get('uploads-url').'/'.$newmembers[$i]->getVar('user_avatar') : '';
         } else {
             $block['users'][$i]['avatar'] = '';
         }
@@ -54,7 +54,7 @@ 
 function b_system_newmembers_edit($options)
 {
     $block_form = new Xoops\Form\BlockForm();
-    $block_form->addElement( new Xoops\Form\Text(SystemLocale::NUMBER_OF_USERS_TO_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
+    $block_form->addElement(new Xoops\Form\Text(SystemLocale::NUMBER_OF_USERS_TO_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
     $block_form->addElement(new Xoops\Form\RadioYesNo(SystemLocale::DISPLAY_USERS_AVATARS, 'options[1]', $options[1]));
     return $block_form->render();
 }

htdocs/modules/system/blocks/themes.php

Spacing +6 added lines, -6 removed lines

@@ -25,20 +25,20 @@ 
     $theme_options = '';
     $theme_set_allowed = $xoops->getConfig('theme_set_allowed');
     foreach ($theme_set_allowed as $theme) {
-        $theme_options .= '<option value="' . $theme . '"';
+        $theme_options .= '<option value="'.$theme.'"';
         if ($theme == $xoops->getConfig('theme_set')) {
             $theme_options .= ' selected="selected"';
         }
-        $theme_options .= '>' . $theme . '</option>';
+        $theme_options .= '>'.$theme.'</option>';
     }
     $block = array();
     if ($options[0] == 1) {
-        $block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"" . \XoopsBaseConfig::get('themes-url') . "/" . $xoops->getConfig('theme_set') . "/screenshot.png\" alt=\"screenshot\" width=\"" . (int)($options[1]) . "\" /><br /><select class=\"span2\" id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/screenshot.png', '" . \XoopsBaseConfig::get('url') . "');\">" . $theme_options . "</select><br /><input type=\"submit\" value=\"" . XoopsLocale::A_GO . "\" />";
+        $block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"".\XoopsBaseConfig::get('themes-url')."/".$xoops->getConfig('theme_set')."/screenshot.png\" alt=\"screenshot\" width=\"".(int)($options[1])."\" /><br /><select class=\"span2\" id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/screenshot.png', '".\XoopsBaseConfig::get('url')."');\">".$theme_options."</select><br /><input type=\"submit\" value=\"".XoopsLocale::A_GO."\" />";
     } else {
-        $block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
+        $block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">'.$theme_options.'</select>';
     }
 
-    $block['theme_select'] .= '<br />(' . sprintf(SystemLocale::F_THEMES, '<strong>' . count($theme_set_allowed) . '</strong>') . ')<br />';
+    $block['theme_select'] .= '<br />('.sprintf(SystemLocale::F_THEMES, '<strong>'.count($theme_set_allowed).'</strong>').')<br />';
     return $block;
 }
 
@@ -46,6 +46,6 @@ 
 {
     $block_form = new Xoops\Form\BlockForm();
     $block_form->addElement(new Xoops\Form\RadioYesNo(SystemLocale::DISPLAY_SCREENSHOT_IMAGE, 'options[0]', $options[0]));
-    $block_form->addElement( new Xoops\Form\Text(SystemLocale::SCREENSHOT_IMAGE_WIDTH, 'options[1]', 1, 3, $options[1]), true);
+    $block_form->addElement(new Xoops\Form\Text(SystemLocale::SCREENSHOT_IMAGE_WIDTH, 'options[1]', 1, 3, $options[1]), true);
     return $block_form->render();
 }

htdocs/modules/system/blocks/user.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 
         if (is_array($menu) && !empty($menu)) {
             $block['modules'][$i]['name'] = $menu['name'];
-            $block['modules'][$i]['link'] = $xoops->url('modules/' . $dirname . '/' . $menu['link']);
+            $block['modules'][$i]['link'] = $xoops->url('modules/'.$dirname.'/'.$menu['link']);
             $block['modules'][$i]['image'] = $menu['image'];
             $block['modules'][$i]['icon'] = 'glyphicon glyphicon-none';
             $block['modules'][$i]['dirname'] = $dirname;
@@ -54,7 +54,7 @@ 
                         $block['modules'][$i]['sublinks'][] = array(
                             'name' => $sublink['name'],
                             'title' => $sublink['name'],
-                            'url'  => $xoops->url('modules/' . $dirname . '/' . $sublink['url'])
+                            'url'  => $xoops->url('modules/'.$dirname.'/'.$sublink['url'])
                         );
                     }
                 }
@@ -67,7 +67,7 @@ 
     // View Account
     array_unshift($block['modules'], array(
         '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 glyphicon-user',
         'title' => XoopsLocale::VIEW_ACCOUNT,
     ));
@@ -100,7 +100,7 @@ 
     $name = XoopsLocale::INBOX;
     $class = '';
     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>';
         //$class = 'text-info';
     }
 

htdocs/modules/system/blocks/online.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
         $members = '';
         for ($i = 0; $i < $total; ++$i) {
             if ($onlines[$i]['online_uid'] > 0) {
-                $members .= ' <a href="' . \XoopsBaseConfig::get('url') . '/userinfo.php?uid=' . $onlines[$i]['online_uid'] . '" title="' . $onlines[$i]['online_uname'] . '">' . $onlines[$i]['online_uname'] . '</a>,';
+                $members .= ' <a href="'.\XoopsBaseConfig::get('url').'/userinfo.php?uid='.$onlines[$i]['online_uid'].'" title="'.$onlines[$i]['online_uname'].'">'.$onlines[$i]['online_uname'].'</a>,';
             } else {
                 ++$guests;
             }
@@ -58,7 +58,7 @@ 
         $block['online_total'] = sprintf(XoopsLocale::F_USERS_ONLINE, $total);
         if ($xoops->isModule()) {
             $mytotal = $online_handler->getCount(new Criteria('online_module', $xoops->module->getVar('mid')));
-            $block['online_total'] .= ' (' . sprintf(XoopsLocale::F_USERS_BROWSING, $mytotal, $xoops->module->getVar('name')) . ')';
+            $block['online_total'] .= ' ('.sprintf(XoopsLocale::F_USERS_BROWSING, $mytotal, $xoops->module->getVar('name')).')';
         }
         $block['lang_members'] = XoopsLocale::MEMBERS;
         $block['lang_guests'] = XoopsLocale::GUESTS;

htdocs/modules/system/blocks/topposters.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     for ($i = 0; $i < $count; ++$i) {
         $block['users'][$i]['rank'] = $i + 1;
         if ($options[1] == 1) {
-            $block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') !== 'blank.gif' ? \XoopsBaseConfig::get('uploads-url') . '/' . $topposters[$i]->getVar('user_avatar') : '';
+            $block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') !== 'blank.gif' ? \XoopsBaseConfig::get('uploads-url').'/'.$topposters[$i]->getVar('user_avatar') : '';
         } else {
             $block['users'][$i]['avatar'] = '';
         }

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)