XOOPS / XoopsCore

xoops_lib/Xoops/Core/Lists/HtmlFile.php

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
         if (is_dir($path) && $handle = opendir($path)) {
             while (false !== ($file = readdir($handle))) {
                 if ((preg_match('/\.(htm|html|xhtml)$/i', $file) && !is_dir($file))) {
-                    $file = $prefix . $file;
-                    $fileList[$file] = $prefix . $file;
+                    $file = $prefix.$file;
+                    $fileList[$file] = $prefix.$file;
                 }
             }
             closedir($handle);

xoops_lib/Xoops/Core/Lists/Directory.php

Spacing +3 added lines, -3 removed lines

@@ -34,15 +34,15 @@
      */
     public static function getList($path = '', $ignored = [])
     {
-        $ignored = (array) $ignored;
+        $ignored = (array)$ignored;
         $list = array();
-        $path = rtrim($path, '/') . '/';
+        $path = rtrim($path, '/').'/';
         if (is_dir($path) && $handle = opendir($path)) {
             while ($file = readdir($handle)) {
                 if (substr($file, 0, 1) === '.' || in_array(strtolower($file), $ignored)) {
                     continue;
                 }
-                if (is_dir($path . $file)) {
+                if (is_dir($path.$file)) {
                     $list[$file] = $file;
                 }
             }

xoops_lib/Xoops/Core/Lists/ImageFile.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         if (is_dir($path) && $handle = opendir($path)) {
             while (false !== ($file = readdir($handle))) {
                 if (preg_match('/\.(gif|jpg|jpeg|png|swf)$/i', $file)) {
-                    $file = $prefix . $file;
+                    $file = $prefix.$file;
                     $fileList[$file] = $file;
                 }
             }

xoops_lib/Xoops/Core/Lists/Theme.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
      */
     public static function getList()
     {
-        $fileList = Directory::getList(\XoopsBaseConfig::get('themes-path') . '/');
+        $fileList = Directory::getList(\XoopsBaseConfig::get('themes-path').'/');
 
         return $fileList;
     }

xoops_lib/Xoops/Core/Lists/SubjectIcon.php

Spacing +3 added lines, -3 removed lines

@@ -36,8 +36,8 @@ 
     {
         $xoops = \Xoops::getInstance();
         $subDirectory = trim($subDirectory, '/');
-        $path = 'images/subject/' . $subDirectory;
-        $subjects = ImageFile::getList($xoops->path($path), $subDirectory . '/');
+        $path = 'images/subject/'.$subDirectory;
+        $subjects = ImageFile::getList($xoops->path($path), $subDirectory.'/');
 
         return $subjects;
     }
@@ -57,7 +57,7 @@ 
         foreach (array_keys($subjects) as $name) {
             $element->addOption(
                 $name,
-                '<img src="' . $xoops->url('images/subject/') . $name . '" alt="' . $name . '" />'
+                '<img src="'.$xoops->url('images/subject/').$name.'" alt="'.$name.'" />'
             );
         }
     }

xoops_lib/Xoops/Core/Lists/TimeZone.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
         //$xoops->cache()->delete($key);
         $timeZones = $xoops->cache()->cacheRead(
             $key,
-            function () {
+            function() {
                 $timeZones = array();
                 $territories = Territory::getContinentsAndCountries();
                 $maxLen = 0;
@@ -52,7 +52,7 @@ 
                             $maxLen = max(strlen($zone), $maxLen);
                             $name = Calendar::getTimezoneExemplarCity($zone);
                             if (!isset($timeZones[$zone]) && !empty($name)) {
-                                $timeZones[$zone] = $cName['name'] . '/' . $name;
+                                $timeZones[$zone] = $cName['name'].'/'.$name;
                             }
                         }
                     }

xoops_lib/Xoops/Core/Security.php

Spacing +10 added lines, -10 removed lines

@@ -60,13 +60,13 @@ 
         $timeout = ($timeout <= 0) ? 300 : $timeout;
         $token_id = Random::generateOneTimeToken();
         // save token data on the server
-        if (!isset($_SESSION[$name . '_SESSION'])) {
-            $_SESSION[$name . '_SESSION'] = array();
+        if (!isset($_SESSION[$name.'_SESSION'])) {
+            $_SESSION[$name.'_SESSION'] = array();
         }
         $token_data = array(
             'id' => $token_id, 'expire' => time() + (int)($timeout)
         );
-        array_push($_SESSION[$name . '_SESSION'], $token_data);
+        array_push($_SESSION[$name.'_SESSION'], $token_data);
         return $token_id;
     }
 
@@ -85,13 +85,13 @@ 
         $log = array();
         $token = ($token !== false)
             ? $token
-            : (isset($_REQUEST[$name . '_REQUEST']) ? $_REQUEST[$name . '_REQUEST'] : '');
-        if (empty($token) || empty($_SESSION[$name . '_SESSION'])) {
+            : (isset($_REQUEST[$name.'_REQUEST']) ? $_REQUEST[$name.'_REQUEST'] : '');
+        if (empty($token) || empty($_SESSION[$name.'_SESSION'])) {
             $str = 'No valid token found in request/session';
             $this->setErrors($str);
             $log[] = array('Token Validation', $str);
         } else {
-            $token_data =& $_SESSION[$name . '_SESSION'];
+            $token_data = & $_SESSION[$name.'_SESSION'];
             if (is_array($token_data)) {
                 foreach (array_keys($token_data) as $i) {
                     if ($token === $token_data[$i]['id']) {
@@ -128,7 +128,7 @@ 
      */
     public function clearTokens($name = 'XOOPS_TOKEN')
     {
-        $_SESSION[$name . '_SESSION'] = array();
+        $_SESSION[$name.'_SESSION'] = array();
     }
 
     /**
@@ -152,7 +152,7 @@ 
      */
     public function garbageCollection($name = 'XOOPS_TOKEN')
     {
-        $sessionName = $name . '_SESSION';
+        $sessionName = $name.'_SESSION';
         if (!empty($_SESSION[$sessionName]) && is_array($_SESSION[$sessionName])) {
             $_SESSION[$sessionName] = array_filter($_SESSION[$sessionName], array($this, 'filterToken'));
         }
@@ -194,7 +194,7 @@ 
             && $_SERVER['REMOTE_ADDR'] != ''
         ) {
             foreach ($xoops->getConfig('bad_ips') as $bi) {
-                if (!empty($bi) && preg_match('/' . $bi . '/', $_SERVER['REMOTE_ADDR'])) {
+                if (!empty($bi) && preg_match('/'.$bi.'/', $_SERVER['REMOTE_ADDR'])) {
                     exit();
                 }
             }
@@ -241,7 +241,7 @@ 
         } else {
             $ret = '';
             if (is_array($this->errors)) {
-                $ret = implode('<br />', $this->errors) . '<br />';
+                $ret = implode('<br />', $this->errors).'<br />';
             }
             return $ret;
         }

xoops_lib/Xoops/Core/Logger.php

Indentation +1 added lines, -1 removed lines

@@ -468,7 +468,7 @@
      * @return void
      *
      * @deprecated
-    */
+     */
     public function __call($method, $args)
     {
         $this->deprecatedMessage();

Spacing +22 added lines, -22 removed lines

@@ -101,7 +101,7 @@ 
             // if an error occurs before a locale is established,
             // we still need messages, so check and deal with it
 
-            $msg = ': ' . sprintf(
+            $msg = ': '.sprintf(
                     (class_exists('\XoopsLocale', false) ? \XoopsLocale::EF_LOGGER_FILELINE : "%s in file %s line %s"),
                     $this->sanitizePath($errorString),
                     $this->sanitizePath($errorFile),
@@ -110,23 +110,23 @@ 
 
             switch ($errorNumber) {
                 case E_USER_NOTICE:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:').$msg;
                     $this->log(LogLevel::NOTICE, $msg);
                     break;
                 case E_NOTICE:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_NOTICE : '*Notice:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_NOTICE : '*Notice:').$msg;
                     $this->log(LogLevel::NOTICE, $msg);
                     break;
                 case E_WARNING:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_WARNING : '*Warning:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_WARNING : '*Warning:').$msg;
                     $this->log(LogLevel::WARNING, $msg);
                     break;
                 case E_STRICT:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_STRICT : '*Strict:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_STRICT : '*Strict:').$msg;
                     $this->log(LogLevel::WARNING, $msg);
                     break;
                 case E_USER_ERROR:
-                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:') . $msg;
+                    $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:').$msg;
                     @$this->log(LogLevel::CRITICAL, $msg);
                     break;
                 case E_USER_DEPRECATED:
@@ -134,7 +134,7 @@ 
                     \Xoops::getInstance()->events()->triggerEvent('core.deprecated', array($msg));
                     break;
                 default:
-                    $msg = $this->getReadableErrorType($errorNumber) . $msg;
+                    $msg = $this->getReadableErrorType($errorNumber).$msg;
                     $this->log(LogLevel::ERROR, $msg);
                     break;
             }
@@ -157,7 +157,7 @@ 
                         }
                     }
                 } else {
-                    echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>" . _XOOPS_FATAL_BACKTRACE . ":<br />";
+                    echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>"._XOOPS_FATAL_BACKTRACE.":<br />";
                     foreach ($trace as $step) {
                         if (isset($step['file'])) {
                             printf("%s (%d)\n<br />", $this->sanitizePath($step['file']), $step['line']);
@@ -239,7 +239,7 @@ 
      */
     private function reportFatalError($msg)
     {
-        $msg=$this->sanitizePath($msg);
+        $msg = $this->sanitizePath($msg);
         if ('cli' === php_sapi_name()) {
             fprintf(STDERR, "\nError : %s\n", $msg);
         } else {
@@ -262,18 +262,18 @@ 
     public function sanitizePath($message)
     {
         $cleaners = [
-            ['\\', '/',],
-            [\XoopsBaseConfig::get('var-path'), 'VAR',],
-            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('var-path'))), 'VAR',],
-            [\XoopsBaseConfig::get('lib-path'), 'LIB',],
-            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('lib-path'))), 'LIB',],
-            [\XoopsBaseConfig::get('root-path'), 'ROOT',],
-            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('root-path'))), 'ROOT',],
-            [\XoopsBaseConfig::get('db-name') . '.', '',],
-            [\XoopsBaseConfig::get('db-name'), '',],
-            [\XoopsBaseConfig::get('db-prefix') . '_', '',],
-            [\XoopsBaseConfig::get('db-user'), '***',],
-            [\XoopsBaseConfig::get('db-pass'), '***',],
+            ['\\', '/', ],
+            [\XoopsBaseConfig::get('var-path'), 'VAR', ],
+            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('var-path'))), 'VAR', ],
+            [\XoopsBaseConfig::get('lib-path'), 'LIB', ],
+            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('lib-path'))), 'LIB', ],
+            [\XoopsBaseConfig::get('root-path'), 'ROOT', ],
+            [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('root-path'))), 'ROOT', ],
+            [\XoopsBaseConfig::get('db-name').'.', '', ],
+            [\XoopsBaseConfig::get('db-name'), '', ],
+            [\XoopsBaseConfig::get('db-prefix').'_', '', ],
+            [\XoopsBaseConfig::get('db-user'), '***', ],
+            [\XoopsBaseConfig::get('db-pass'), '***', ],
         ];
         $stringsToClean = array_column($cleaners, 0);
         $replacementStings = array_column($cleaners, 1);
@@ -478,7 +478,7 @@ 
     {
         $this->deprecatedMessage();
         // legacy compatibility: turn off logger display for $xoopsLogger->activated = false; usage
-        if ($var==='activated' && !$val) {
+        if ($var === 'activated' && !$val) {
             $this->quiet();
         }
 

xoops_lib/Xoops/Core/MediaUploader.php

Spacing +6 added lines, -6 removed lines

@@ -410,13 +410,13 @@ 
             $this->savedFileName = $this->targetFileName;
         } else {
             if (isset($this->prefix)) {
-                $this->savedFileName = uniqid($this->prefix) . '.' . strtolower($matched[1]);
+                $this->savedFileName = uniqid($this->prefix).'.'.strtolower($matched[1]);
             } else {
                 $this->savedFileName = strtolower($this->mediaName);
             }
         }
 
-        $this->savedDestination = $this->uploadDir . '/' . $this->savedFileName;
+        $this->savedDestination = $this->uploadDir.'/'.$this->savedFileName;
         if (!move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {
             $this->setErrors(sprintf(\XoopsLocale::EF_FILE_NOT_SAVED_TO, $this->savedDestination));
             return false;
@@ -554,8 +554,8 @@ 
         $patterns = array();
         $replaces = array();
         foreach ($this->extensionsToBeSanitized as $ext) {
-            $patterns[] = "/\." . preg_quote($ext) . "\./i";
-            $replaces[] = "_" . $ext . ".";
+            $patterns[] = "/\.".preg_quote($ext)."\./i";
+            $replaces[] = "_".$ext.".";
         }
         $this->mediaName = preg_replace($patterns, $replaces, $this->mediaName);
     }
@@ -587,9 +587,9 @@ 
             $ret = '';
             if (count($this->errors) > 0) {
                 $ret = '<h4>'
-                . sprintf(\XoopsLocale::EF_ERRORS_RETURNED_WHILE_UPLOADING_FILE, $this->mediaName) . '</h4>';
+                . sprintf(\XoopsLocale::EF_ERRORS_RETURNED_WHILE_UPLOADING_FILE, $this->mediaName).'</h4>';
                 foreach ($this->errors as $error) {
-                    $ret .= $error . '<br />';
+                    $ret .= $error.'<br />';
                 }
             }
             return $ret;