XOOPS / XoopsCore

xoops_lib/Xoops.php

Spacing +72 added lines, -72 removed lines

@@ -141,14 +141,14 @@ 
 
         $this->paths['www'] = array($root, $url);
         $this->paths['var'] = array($var, null);
-        $this->paths['lib'] = array($lib, $url . '/browse.php');
-        $this->paths['XOOPS'] = array($lib, $url . '/browse.php');
+        $this->paths['lib'] = array($lib, $url.'/browse.php');
+        $this->paths['XOOPS'] = array($lib, $url.'/browse.php');
         $this->paths['assets'] = array(\XoopsBaseConfig::get('asset-path'), \XoopsBaseConfig::get('asset-url'));
-        $this->paths['images'] = array($root . '/images', $url . '/images');
-        $this->paths['language'] = array($root . '/language', $url . '/language');
-        $this->paths['locale'] = array($root . '/locale', $url . '/locale');
+        $this->paths['images'] = array($root.'/images', $url.'/images');
+        $this->paths['language'] = array($root.'/language', $url.'/language');
+        $this->paths['locale'] = array($root.'/locale', $url.'/locale');
         $this->paths['media'] = array(\XoopsBaseConfig::get('media-path'), \XoopsBaseConfig::get('media-url'));
-        $this->paths['modules'] = array($root . '/modules', $url . '/modules');
+        $this->paths['modules'] = array($root.'/modules', $url.'/modules');
         $this->paths['themes'] = array(\XoopsBaseConfig::get('themes-path'), \XoopsBaseConfig::get('themes-url'));
         $this->paths['uploads'] = array(\XoopsBaseConfig::get('uploads-path'), \XoopsBaseConfig::get('uploads-url'));
 
@@ -373,7 +373,7 @@ 
     public function path($url, $virtual = false)
     {
         $url = $this->normalizePath($url);
-        $rootPath = $this->normalizePath(\XoopsBaseConfig::get('root-path') . '/');
+        $rootPath = $this->normalizePath(\XoopsBaseConfig::get('root-path').'/');
         if (0 === strpos($url, $rootPath)) {
             $url = substr($url, strlen($rootPath));
         }
@@ -385,11 +385,11 @@ 
             list($root, $path) = array('www', $url);
         }
         if (!$virtual) { // Returns a physical path
-            $path = $this->paths[$root][0] . '/' . $path;
+            $path = $this->paths[$root][0].'/'.$path;
             //$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
             return $path;
         }
-        return !isset($this->paths[$root][1]) ? '' : ($this->paths[$root][1] . '/' . $path);
+        return !isset($this->paths[$root][1]) ? '' : ($this->paths[$root][1].'/'.$path);
     }
 
     /**
@@ -437,9 +437,9 @@ 
         }
         if (!empty($params)) {
             foreach ($params as $k => $v) {
-                $params[$k] = $k . '=' . rawurlencode($v);
+                $params[$k] = $k.'='.rawurlencode($v);
             }
-            $url .= '?' . implode('&', $params);
+            $url .= '?'.implode('&', $params);
         }
         return $url;
     }
@@ -520,7 +520,7 @@ 
                 $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
             }
             if (isset($_SERVER['QUERY_STRING'])) {
-                $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+                $_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
             }
         }
     }
@@ -560,18 +560,18 @@ 
         if ($matched) {
             $names = array('tpl_name', 'type', 'module', 'file');
             $ret = array();
-            for ($i=0; $i<4; ++$i) {
+            for ($i = 0; $i < 4; ++$i) {
                 $ret[$names[$i]] = $parts[$i];
             }
         } else {
             // this should be eliminated
-            $this->events()->triggerEvent('debug.log', "Sloppy template: " . $tpl_name);
+            $this->events()->triggerEvent('debug.log', "Sloppy template: ".$tpl_name);
             $ret = array();
             $ret['type'] = $this->isAdminSide ? 'admin' : 'module';
             $info = explode(':', $tpl_name);
             if (count($info) == 2) {
                 $ret['type'] = $info[0];
-                $tpl_name = str_replace($ret['type'] . ':', '', $tpl_name);
+                $tpl_name = str_replace($ret['type'].':', '', $tpl_name);
             }
 
             if ($ret['type'] === 'db') {
@@ -590,7 +590,7 @@ 
                     $ret['module'] = $this->module->getVar('dirname', 'n');
                 }
             }
-            $ret['tpl_name'] = $ret['type'] . ':' . $ret['module'] . '/' . $ret['file'];
+            $ret['tpl_name'] = $ret['type'].':'.$ret['module'].'/'.$ret['file'];
         }
 
         return $ret;
@@ -628,7 +628,7 @@ 
             $this->events()->triggerEvent('system.class.gui.header');
             $cpanelTheme = isset($xoopsConfig['cpanel']) ? $xoopsConfig['cpanel'] : 'default';
             include_once $this->path("modules/system/themes/{$cpanelTheme}/{$cpanelTheme}.php");
-            $cpanelClass = 'XoopsGui' . ucfirst($cpanelTheme);
+            $cpanelClass = 'XoopsGui'.ucfirst($cpanelTheme);
             $gui = new $cpanelClass();
             $gui->header();
         } else {
@@ -638,8 +638,8 @@ 
                 $smarty = $repeat = null;
                 $this->theme()->headContent(
                     null,
-                    "<base href='" . \XoopsBaseConfig::get('url') . '/modules/'
-                    . $this->getConfig('startpage') . "/' />",
+                    "<base href='".\XoopsBaseConfig::get('url').'/modules/'
+                    . $this->getConfig('startpage')."/' />",
                     $smarty,
                     $repeat
                 );
@@ -686,7 +686,7 @@ 
         $this->events()->triggerEvent('core.footer.start');
 
         if (!headers_sent()) {
-            header('Content-Type:text/html; charset=' . XoopsLocale::getCharset());
+            header('Content-Type:text/html; charset='.XoopsLocale::getCharset());
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
             header('Cache-Control: private, no-cache');
             header('Pragma: no-cache');
@@ -1014,10 +1014,10 @@ 
             }
         }
         if (XoopsLoad::fileExists(
-            $hnd_file = \XoopsBaseConfig::get('root-path') . "/modules/{$module_dir}/class/form/{$name}.php"
+            $hnd_file = \XoopsBaseConfig::get('root-path')."/modules/{$module_dir}/class/form/{$name}.php"
         )) {
             include_once $hnd_file;
-            $class = ucfirst(strtolower($module_dir)) . ucfirst($name) . 'Form';
+            $class = ucfirst(strtolower($module_dir)).ucfirst($name).'Form';
             if (class_exists($class)) {
                 $instance = new $class($obj);
                 if ($instance instanceof \Xoops\Form\Form) {
@@ -1063,7 +1063,7 @@ 
         if ((empty($domain) || 'global' === $domain)) {
             $path = '';
         } else {
-            $path = (is_array($domain)) ? array_shift($domain) . '/' : "modules/{$domain}/";
+            $path = (is_array($domain)) ? array_shift($domain).'/' : "modules/{$domain}/";
         }
         $path .= 'language';
 
@@ -1205,9 +1205,9 @@ 
         $xoopsConfigMetaFooter = $this->getConfigs();
 
         if (!headers_sent()) {
-            header('Content-Type:text/html; charset=' . XoopsLocale::getCharset());
+            header('Content-Type:text/html; charset='.XoopsLocale::getCharset());
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+            header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
             header(
                 'Cache-Control: no-store, no-cache, max-age=1, s-maxage=1, must-revalidate, post-check=0, pre-check=0'
             );
@@ -1216,28 +1216,28 @@ 
 
         echo "<!DOCTYPE html>\n";
         $xoops_url = \XoopsBaseConfig::get('url');
-        echo '<html lang="' . XoopsLocale::getLangCode() . '">
+        echo '<html lang="'.XoopsLocale::getLangCode().'">
               <head>
               <meta charset="utf-8">
               <meta http-equiv="X-UA-Compatible" content="IE=edge">
               <meta name="viewport" content="width=device-width, initial-scale=1">
-              <meta name="robots" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_robots']) . '" />
-              <meta name="keywords" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_keywords']) . '" />
-              <meta name="description" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_description']) . '" />
-              <meta name="rating" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_rating']) . '" />
-              <meta name="author" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_author']) . '" />
+              <meta name="robots" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_robots']).'" />
+              <meta name="keywords" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_keywords']).'" />
+              <meta name="description" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_description']).'" />
+              <meta name="rating" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_rating']).'" />
+              <meta name="author" content="' . htmlspecialchars($xoopsConfigMetaFooter['meta_author']).'" />
               <meta name="generator" content="XOOPS" />
-              <title>' . htmlspecialchars($this->getConfig('sitename')) . '</title>'
+              <title>' . htmlspecialchars($this->getConfig('sitename')).'</title>'
             . $this->theme->renderBaseAssets();
 
         $locale = $this->getConfig('locale');
-        if (XoopsLoad::fileExists($this->path('locale/' . $locale . '/style.css'))) {
-            echo '<link rel="stylesheet" type="text/css" media="all" href="' . $xoops_url
-                . '/locale/' . $locale . '/style.css" />';
+        if (XoopsLoad::fileExists($this->path('locale/'.$locale.'/style.css'))) {
+            echo '<link rel="stylesheet" type="text/css" media="all" href="'.$xoops_url
+                . '/locale/'.$locale.'/style.css" />';
         }
         $themecss = $this->getCss($this->getConfig('theme_set'));
         if ($themecss) {
-            echo '<link rel="stylesheet" type="text/css" media="all" href="' . $themecss . '" />';
+            echo '<link rel="stylesheet" type="text/css" media="all" href="'.$themecss.'" />';
         }
         if ($closehead) {
             echo '</head><body>';
@@ -1337,13 +1337,13 @@ 
         foreach ($hiddens as $name => $value) {
             if (is_array($value)) {
                 foreach ($value as $caption => $newvalue) {
-                    $str_hiddens .= '<input type="radio" name="' . $name . '" value="'
-                        . htmlspecialchars($newvalue) . '" > ' . $caption . NWLINE;
+                    $str_hiddens .= '<input type="radio" name="'.$name.'" value="'
+                        . htmlspecialchars($newvalue).'" > '.$caption.NWLINE;
                 }
-                $str_hiddens .= '<br />' . NWLINE;
+                $str_hiddens .= '<br />'.NWLINE;
             } else {
-                $str_hiddens .= '<input type="hidden" name="' . $name . '" value="'
-                    . htmlspecialchars($value) . '" />' . NWLINE;
+                $str_hiddens .= '<input type="hidden" name="'.$name.'" value="'
+                    . htmlspecialchars($value).'" />'.NWLINE;
             }
         }
         if ($addtoken != false) {
@@ -1455,7 +1455,7 @@ 
         $url = trim($url);
         if ($url != '') {
             if (!preg_match('/^(https?|ftps?|ed2k)\:\/\//i', $url)) {
-                $url = 'http://' . $url;
+                $url = 'http://'.$url;
             }
         }
         return $url;
@@ -1524,7 +1524,7 @@ 
         )));
         $this->setTpl($this->theme()->template);
         $this->tpl()->assign(array(
-            'xoops_theme'      => $theme, 'xoops_imageurl' => \XoopsBaseConfig::get('themes-url') . '/' . $theme . '/',
+            'xoops_theme'      => $theme, 'xoops_imageurl' => \XoopsBaseConfig::get('themes-url').'/'.$theme.'/',
             'xoops_themecss'   => $this->getCss($theme),
             'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
             'xoops_sitename'   => htmlspecialchars($this->getConfig('sitename'), ENT_QUOTES),
@@ -1536,8 +1536,8 @@ 
 
         $this->tpl()->assign('time', (int)($time));
         if (!empty($_SERVER['REQUEST_URI']) && $addredirect && strstr($url, 'user.php')) {
-            $joiner = (false===strpos($url, '?')) ? '?' : '&amp;';
-            $url .= $joiner . 'xoops_redirect=' . urlencode($_SERVER['REQUEST_URI']);
+            $joiner = (false === strpos($url, '?')) ? '?' : '&amp;';
+            $url .= $joiner.'xoops_redirect='.urlencode($_SERVER['REQUEST_URI']);
         }
         $url = preg_replace("/&amp;/i", '&', htmlspecialchars($url, ENT_QUOTES));
         $this->tpl()->assign('url', $url);
@@ -1601,25 +1601,25 @@ 
         }
         $xoops_theme_path = \XoopsBaseConfig::get('themes-path');
         $xoops_theme_url = \XoopsBaseConfig::get('themes-url');
-        if (is_dir($xoops_theme_path . '/' . $theme)) {
-            if (XoopsLoad::fileExists($xoops_theme_path . '/' . $theme . '/' . $str_css)) {
-                return $xoops_theme_url . '/' . $theme . '/' . $str_css;
-            } elseif (XoopsLoad::fileExists($xoops_theme_path . '/' . $theme . '/style.css')) {
-                return $xoops_theme_url . '/' . $theme . '/style.css';
+        if (is_dir($xoops_theme_path.'/'.$theme)) {
+            if (XoopsLoad::fileExists($xoops_theme_path.'/'.$theme.'/'.$str_css)) {
+                return $xoops_theme_url.'/'.$theme.'/'.$str_css;
+            } elseif (XoopsLoad::fileExists($xoops_theme_path.'/'.$theme.'/style.css')) {
+                return $xoops_theme_url.'/'.$theme.'/style.css';
             }
         }
-        if (is_dir($xoops_theme_path . '/' . $theme . '/css')) {
-            if (XoopsLoad::fileExists($xoops_theme_path . '/' . $theme . '/css/' . $str_css)) {
-                return $xoops_theme_url . '/' . $theme . '/css/' . $str_css;
-            } elseif (XoopsLoad::fileExists($xoops_theme_path . '/' . $theme . '/css/style.css')) {
-                return $xoops_theme_url . '/' . $theme . '/css/style.css';
+        if (is_dir($xoops_theme_path.'/'.$theme.'/css')) {
+            if (XoopsLoad::fileExists($xoops_theme_path.'/'.$theme.'/css/'.$str_css)) {
+                return $xoops_theme_url.'/'.$theme.'/css/'.$str_css;
+            } elseif (XoopsLoad::fileExists($xoops_theme_path.'/'.$theme.'/css/style.css')) {
+                return $xoops_theme_url.'/'.$theme.'/css/style.css';
             }
         }
-        if (is_dir($xoops_theme_path . '/' . $theme . '/assets/css')) {
-            if (XoopsLoad::fileExists($xoops_theme_path . '/' . $theme . '/assets/css/' . $str_css)) {
-                return $xoops_theme_url . '/' . $theme . '/assets/css/' . $str_css;
-            } elseif (XoopsLoad::fileExists($xoops_theme_path . '/' . $theme . '/assets/css/style.css')) {
-                return $xoops_theme_url . '/' . $theme . '/assets/css/style.css';
+        if (is_dir($xoops_theme_path.'/'.$theme.'/assets/css')) {
+            if (XoopsLoad::fileExists($xoops_theme_path.'/'.$theme.'/assets/css/'.$str_css)) {
+                return $xoops_theme_url.'/'.$theme.'/assets/css/'.$str_css;
+            } elseif (XoopsLoad::fileExists($xoops_theme_path.'/'.$theme.'/assets/css/style.css')) {
+                return $xoops_theme_url.'/'.$theme.'/assets/css/style.css';
             }
         }
         return '';
@@ -1733,7 +1733,7 @@ 
             if (empty($dirname)) {
                 $dirname = $this->isModule() ? $this->module->getVar('dirname') : 'system';
             }
-            $this->moduleConfigs[$dirname][$key] =& $value;
+            $this->moduleConfigs[$dirname][$key] = & $value;
         }
     }
 
@@ -1817,18 +1817,18 @@ 
             if (is_object($module)) {
                 $configs = $this->getHandlerConfig()->getConfigsByModule($module->getVar('mid'));
                 $this->cache()->write($key, $configs);
-                $this->moduleConfigs[$dirname] =& $configs;
+                $this->moduleConfigs[$dirname] = & $configs;
             }
         } else {
-            $this->moduleConfigs[$dirname] =& $configs;
+            $this->moduleConfigs[$dirname] = & $configs;
         }
 
         if ($this->isModule()) {
             //for legacy
-            $this->moduleConfig =& $this->moduleConfigs[$this->module->getVar('dirname')];
+            $this->moduleConfig = & $this->moduleConfigs[$this->module->getVar('dirname')];
         }
         if ($dirname === 'system') {
-            $this->config =& $this->moduleConfigs['system'];
+            $this->config = & $this->moduleConfigs['system'];
         }
         return $this->moduleConfigs[$dirname];
     }
@@ -1855,10 +1855,10 @@ 
         }
         if ($appendWithKey) {
             foreach ($values as $key2 => $value) {
-                $this->moduleConfigs[$dirname][$key][$key2] =& $value;
+                $this->moduleConfigs[$dirname][$key][$key2] = & $value;
             }
         } else {
-            $this->moduleConfigs[$dirname][$key][] =& $values;
+            $this->moduleConfigs[$dirname][$key][] = & $values;
         }
     }
 
@@ -1888,7 +1888,7 @@ 
      */
     public function getBaseDomain($url, $includeSubdomain = false)
     {
-        $url=mb_strtolower($url, 'UTF-8');
+        $url = mb_strtolower($url, 'UTF-8');
 
         $host = parse_url($url, PHP_URL_HOST);
         if (empty($host)) {
@@ -1899,13 +1899,13 @@ 
         }
 
         // check for exceptions, localhost and ip address (v4 & v6)
-        if ($host==='localhost') {
+        if ($host === 'localhost') {
             return $host;
         }
         // Check for IPV6 URL (see http://www.ietf.org/rfc/rfc2732.txt)
         // strip brackets before validating
-        if (substr($host, 0, 1)==='[' && substr($host, -1)===']') {
-            $host = substr($host, 1, (strlen($host)-2));
+        if (substr($host, 0, 1) === '[' && substr($host, -1) === ']') {
+            $host = substr($host, 1, (strlen($host) - 2));
         }
         if (filter_var($host, FILTER_VALIDATE_IP)) {
             return $host;
@@ -1935,7 +1935,7 @@ 
             $module = $tplfile->getVar('tpl_module', 'n');
             $type = $tplfile->getVar('tpl_type', 'n');
             $tpl = new XoopsTpl();
-            return $tpl->touch($type . ':' . $module . '/' . $file);
+            return $tpl->touch($type.':'.$module.'/'.$file);
         }
         return false;
     }