XOOPS / XoopsCore

xoops_lib/Xoops/Core/Psr4ClassLoader.php

Indentation +2 added lines, -2 removed lines

@@ -225,8 +225,8 @@
             // replace namespace separators with directory separators
             // in the relative class name, append with .php
             $file = $base_dir
-                  . str_replace('\\', '/', $relative_class)
-                  . '.php';
+                    . str_replace('\\', '/', $relative_class)
+                    . '.php';
 
             // if the mapped file exists, require it
             if ($this->requireFile($file)) {

Spacing +3 added lines, -3 removed lines

@@ -147,11 +147,11 @@
     public function addNamespace($prefix, $base_dir, $prepend = false)
     {
         // normalize namespace prefix
-        $prefix = trim($prefix, '\\') . '\\';
+        $prefix = trim($prefix, '\\').'\\';
 
         // normalize the base directory with a trailing separator
-        $base_dir = rtrim($base_dir, '/') . DIRECTORY_SEPARATOR;
-        $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . '/';
+        $base_dir = rtrim($base_dir, '/').DIRECTORY_SEPARATOR;
+        $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR).'/';
 
         // initialize the namespace prefix array
         if (isset($this->prefixes[$prefix]) === false) {

xoops_lib/Xoops/Core/Psr0ClassLoader.php

Spacing +3 added lines, -3 removed lines

@@ -179,11 +179,11 @@
                     $this->namespaceSeparator,
                     DIRECTORY_SEPARATOR,
                     $namespace
-                ) . DIRECTORY_SEPARATOR;
+                ).DIRECTORY_SEPARATOR;
             }
-            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->fileExtension;
+            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className).$this->fileExtension;
 
-            $absolute = ($this->includePath !== null ? $this->includePath . DIRECTORY_SEPARATOR : '') . $fileName;
+            $absolute = ($this->includePath !== null ? $this->includePath.DIRECTORY_SEPARATOR : '').$fileName;
             if (file_exists($absolute)) {
                 require $absolute;
             }

xoops_lib/Xoops/Core/Events.php

Spacing +6 added lines, -6 removed lines

@@ -101,12 +101,12 @@ 
             $modules_list = \Xoops::getInstance()->getActiveModules();
             if (empty($modules_list)) {
                 // this should only happen if an exception was thrown in setActiveModules()
-                $modules_list = array ('system');
+                $modules_list = array('system');
             }
-            $this->preloadList =array();
+            $this->preloadList = array();
             $i = 0;
             foreach ($modules_list as $module) {
-                if (is_dir($dir = \XoopsBaseConfig::get('root-path') . "/modules/{$module}/preloads/")) {
+                if (is_dir($dir = \XoopsBaseConfig::get('root-path')."/modules/{$module}/preloads/")) {
                     $file_list = Lists\File::getList($dir);
                     foreach ($file_list as $file) {
                         if (preg_match('/(\.php)$/i', $file)) {
@@ -150,10 +150,10 @@ 
     {
         $xoops = \Xoops::getInstance();
         foreach ($this->preloadList as $preload) {
-            $path = $xoops->path('modules/' . $preload['module'] . '/preloads/' . $preload['file']. '.php');
+            $path = $xoops->path('modules/'.$preload['module'].'/preloads/'.$preload['file'].'.php');
             include_once $path;
             $class_name = ucfirst($preload['module'])
-                . ($preload['file'] === 'preload' ? '' : ucfirst($preload['file']) )
+                . ($preload['file'] === 'preload' ? '' : ucfirst($preload['file']))
                 . 'Preload';
             if (!class_exists($class_name)) {
                 continue;
@@ -215,7 +215,7 @@ 
     public function addListener($eventName, $callback)
     {
         $eventName = $this->toInternalEventName($eventName);
-        $this->eventListeners[$eventName][]=$callback;
+        $this->eventListeners[$eventName][] = $callback;
     }
 
     /**

xoops_lib/Xoops/Core/Theme/Factory.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
             }
             $xoops->setConfig('theme_set', $options['folderName']);
         }
-        $options['path'] = \XoopsBaseConfig::get('themes-path') . '/' . $options['folderName'];
+        $options['path'] = \XoopsBaseConfig::get('themes-path').'/'.$options['folderName'];
         $inst = new XoopsTheme();
         foreach ($options as $k => $v) {
             $inst->$k = $v;

xoops_lib/Xoops/Core/Theme/Plugins/Blocks.php

Spacing +1 added lines, -1 removed lines

@@ -187,7 +187,7 @@
                 : "module:system/system_block_dummy.tpl";
         //$tplName = str_replace('.html', '.tpl', $tplName);
 
-        $cacheid = $this->generateCacheId('blk_' . $xobject->getVar('bid'));
+        $cacheid = $this->generateCacheId('blk_'.$xobject->getVar('bid'));
 
         $xoops->events()->triggerEvent(
             'core.themeblocks.buildblock.start',

xoops_lib/Xoops/Core/Theme/AdminFactory.php

Spacing +6 added lines, -6 removed lines

@@ -36,13 +36,13 @@
         $options["plugins"] = array();
         $options['renderBanner'] = false;
         $inst = parent::createInstance($options);
-        $inst->path = \XoopsBaseConfig::get('adminthemes-path') . '/' . $inst->folderName;
-        $inst->url = \XoopsBaseConfig::get('adminthemes-url') . '/' . $inst->folderName;
+        $inst->path = \XoopsBaseConfig::get('adminthemes-path').'/'.$inst->folderName;
+        $inst->url = \XoopsBaseConfig::get('adminthemes-url').'/'.$inst->folderName;
         $inst->template->assign(array(
-            'theme_path' => $inst->path, 'theme_tpl' => $inst->path . '/xotpl', 'theme_url' => $inst->url,
-            'theme_img'  => $inst->url . '/img', 'theme_icons' => $inst->url . '/icons',
-            'theme_css'  => $inst->url . '/css', 'theme_js' => $inst->url . '/js',
-            'theme_lang' => $inst->url . '/language',
+            'theme_path' => $inst->path, 'theme_tpl' => $inst->path.'/xotpl', 'theme_url' => $inst->url,
+            'theme_img'  => $inst->url.'/img', 'theme_icons' => $inst->url.'/icons',
+            'theme_css'  => $inst->url.'/css', 'theme_js' => $inst->url.'/js',
+            'theme_lang' => $inst->url.'/language',
         ));
 
         return $inst;

xoops_lib/Xoops/Core/Theme/XoopsTheme.php

Spacing +41 added lines, -41 removed lines

@@ -195,15 +195,15 @@ 
     {
         $xoops = \Xoops::getInstance();
         $this->assets = $xoops->assets();
-        $this->path = \XoopsBaseConfig::get('themes-path') . '/' . $this->folderName;
-        $this->url = \XoopsBaseConfig::get('themes-url') . '/' . $this->folderName;
+        $this->path = \XoopsBaseConfig::get('themes-path').'/'.$this->folderName;
+        $this->url = \XoopsBaseConfig::get('themes-url').'/'.$this->folderName;
         $this->template = null;
         $this->template = new XoopsTpl();
         //$this->template->currentTheme = $this;
         $this->template->assignByRef('xoTheme', $this);
         $this->template->assign(array(
             'xoops_theme'      => $xoops->getConfig('theme_set'),
-            'xoops_imageurl'   => \XoopsBaseConfig::get('themes-url') . '/' . $xoops->getConfig('theme_set') . '/',
+            'xoops_imageurl'   => \XoopsBaseConfig::get('themes-url').'/'.$xoops->getConfig('theme_set').'/',
             'xoops_themecss'   => $xoops->getCss($xoops->getConfig('theme_set')),
             'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
             'xoops_sitename'   => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
@@ -215,10 +215,10 @@ 
                 : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES)
         ));
         $this->template->assign(array(
-            'theme_path' => $this->path, 'theme_tpl' => $this->path . '/xotpl', 'theme_url' => $this->url,
-            'theme_img'  => $this->url . '/img', 'theme_icons' => $this->url . '/icons',
-            'theme_css'  => $this->url . '/css', 'theme_js' => $this->url . '/js',
-            'theme_lang' => $this->url . '/language',
+            'theme_path' => $this->path, 'theme_tpl' => $this->path.'/xotpl', 'theme_url' => $this->url,
+            'theme_img'  => $this->url.'/img', 'theme_icons' => $this->url.'/icons',
+            'theme_css'  => $this->url.'/css', 'theme_js' => $this->url.'/js',
+            'theme_lang' => $this->url.'/language',
         ));
 
         if ($xoops->isUser()) {
@@ -246,7 +246,7 @@ 
             'description', 'keywords', 'robots', 'rating', 'author', 'copyright'
         );
         foreach ($metas as $name) {
-            $this->addMeta('meta', $name, $xoops->getConfig('meta_' . $name));
+            $this->addMeta('meta', $name, $xoops->getConfig('meta_'.$name));
         }
 
         // Other assigns
@@ -285,8 +285,8 @@ 
         //to control order of loading JS and CSS
         // TODO - this should be done in such a way it can join the base asset
         //        load above.
-        if (\XoopsLoad::fileExists($this->path . "/theme_onload.php")) {
-            include_once($this->path . "/theme_onload.php");
+        if (\XoopsLoad::fileExists($this->path."/theme_onload.php")) {
+            include_once($this->path."/theme_onload.php");
         }
 
         // Instantiate and initialize all the theme plugins
@@ -328,22 +328,22 @@ 
                 $extra_string = $xoops->getConfig('locale');
                 // Generate group section
                 if (!$xoops->isUser()) {
-                    $extra_string .= '-' . FixedGroups::ANONYMOUS;
+                    $extra_string .= '-'.FixedGroups::ANONYMOUS;
                 } else {
                     $groups = $xoops->user->getGroups();
                     sort($groups);
                     // Generate group string for non-anonymous groups,
                     // db-pass and db-name (before we find better variables) are used
                     // to protect group sensitive contents
-                    $extra_string .= '-' . substr(md5(implode('-', $groups)), 0, 8) . '-' . substr(md5(
-                        \XoopsBaseConfig::get('db-pass') . \XoopsBaseConfig::get('db-name')
+                    $extra_string .= '-'.substr(md5(implode('-', $groups)), 0, 8).'-'.substr(md5(
+                        \XoopsBaseConfig::get('db-pass').\XoopsBaseConfig::get('db-name')
                         . \XoopsBaseConfig::get('db-user')
                     ), 0, 8);
                 }
             }
             $extraString = $extra_string;
         }
-        $cache_id .= '-' . $extraString;
+        $cache_id .= '-'.$extraString;
         return $cache_id;
     }
 
@@ -361,9 +361,9 @@ 
             $uri = str_replace(\XoopsBaseConfig::get('url'), '', $_SERVER['REQUEST_URI']);
             // Clean uri by removing session id
             if (defined('SID') && SID && strpos($uri, SID)) {
-                $uri = preg_replace("/([\?&])(" . SID . "$|" . SID . "&)/", "\\1", $uri);
+                $uri = preg_replace("/([\?&])(".SID."$|".SID."&)/", "\\1", $uri);
             }
-            $this->contentCacheId = $this->generateCacheId('page_' . substr(md5($uri), 0, 8));
+            $this->contentCacheId = $this->generateCacheId('page_'.substr(md5($uri), 0, 8));
             if ($this->template->isCached($template, $this->contentCacheId)) {
                 \Xoops::getInstance()->events()->triggerEvent('core.theme.checkcache.success', array($template, $this));
                 $this->render(null, null, $template);
@@ -434,7 +434,7 @@ 
 
         // We assume no overlap between $GLOBALS['xoopsOption']['xoops_module_header'] and
         // $this->template->getTemplateVars( 'xoops_module_header' ) ?
-        $this->template->assign('xoops_module_header', $this->renderMetas(true) . "\n" . $header);
+        $this->template->assign('xoops_module_header', $this->renderMetas(true)."\n".$header);
 
         if ($canvasTpl) {
             $this->canvasTemplate = $canvasTpl;
@@ -460,7 +460,7 @@ 
         if (false === (bool)($xoops->getConfig('disable_theme_shortcodes'))) {
             $this->template->loadFilter('output', 'shortcodes');
         }
-        $this->template->display($this->path . '/' . $this->canvasTemplate);
+        $this->template->display($this->path.'/'.$this->canvasTemplate);
         $this->renderCount++;
         $xoops->events()->triggerEvent('core.theme.render.end', array($this));
         return true;
@@ -489,16 +489,16 @@ 
 
         $language = \XoopsLocale::getLocale();
         // Load global localization stylesheet if available
-        if (\XoopsLoad::fileExists($xoops->path('locale/' . $language . '/style.css'))) {
-            $cssAssets[] = $xoops->path('locale/' . $language . '/style.css');
+        if (\XoopsLoad::fileExists($xoops->path('locale/'.$language.'/style.css'))) {
+            $cssAssets[] = $xoops->path('locale/'.$language.'/style.css');
         }
         //$this->addLanguage($type);
         // Load theme localization stylesheet and scripts if available
-        if (\XoopsLoad::fileExists($this->path . '/locale/' . $language . '/script.js')) {
-            $jsAssets[] = $this->url . '/locale/' . $language . '/script.js';
+        if (\XoopsLoad::fileExists($this->path.'/locale/'.$language.'/script.js')) {
+            $jsAssets[] = $this->url.'/locale/'.$language.'/script.js';
         }
-        if (\XoopsLoad::fileExists($this->path . '/locale/' . $language . '/style.css')) {
-            $cssAssets[] = $this->path . '/locale/' . $language . '/style.css';
+        if (\XoopsLoad::fileExists($this->path.'/locale/'.$language.'/style.css')) {
+            $cssAssets[] = $this->path.'/locale/'.$language.'/style.css';
         }
         return array($cssAssets, $jsAssets);
     }
@@ -642,7 +642,7 @@ 
     public function addBaseAssets($type, $assets)
     {
         if (is_scalar($assets)) {
-            $this->baseAssets[$type][]=$assets;
+            $this->baseAssets[$type][] = $assets;
         } elseif (is_array($assets)) {
             $this->baseAssets[$type] = array_merge($this->baseAssets[$type], $assets);
         }
@@ -809,14 +809,14 @@ 
         if (!empty($this->baseAssets['js'])) {
             $url = $this->assets->getUrlToAssets('js', $this->baseAssets['js']);
             if (!empty($url)) {
-                $str .= '<script src="' . $url . '" type="text/javascript"></script>'."\n";
+                $str .= '<script src="'.$url.'" type="text/javascript"></script>'."\n";
             }
         }
 
         if (!empty($this->baseAssets['css'])) {
             $url = $this->assets->getUrlToAssets('css', $this->baseAssets['css']);
             if (!empty($url)) {
-                $str .= '<link rel="stylesheet" href="' . $url . '" type="text/css" />'."\n";
+                $str .= '<link rel="stylesheet" href="'.$url.'" type="text/css" />'."\n";
             }
         }
         return $str;
@@ -839,9 +839,9 @@ 
         switch ($type) {
             case 'script':
                 foreach ($this->metas[$type] as $attrs) {
-                    $str .= "<script" . $this->renderAttributes($attrs) . ">";
+                    $str .= "<script".$this->renderAttributes($attrs).">";
                     if (@$attrs['_']) {
-                        $str .= "\n//<![CDATA[\n" . $attrs['_'] . "\n//]]>";
+                        $str .= "\n//<![CDATA[\n".$attrs['_']."\n//]]>";
                     }
                     $str .= "</script>\n";
                 }
@@ -850,29 +850,29 @@ 
                 foreach ($this->metas[$type] as $attrs) {
                     $rel = $attrs['rel'];
                     unset($attrs['rel']);
-                    $str .= '<link rel="' . $rel . '"' . $this->renderAttributes($attrs) . " />\n";
+                    $str .= '<link rel="'.$rel.'"'.$this->renderAttributes($attrs)." />\n";
                 }
                 break;
             case 'stylesheet':
                 foreach ($this->metas[$type] as $attrs) {
                     if (@$attrs['_']) {
-                        $str .= '<style' . $this->renderAttributes($attrs)
-                            . ">\n/* <![CDATA[ */\n" . $attrs['_'] . "\n/* //]]> */\n</style>";
+                        $str .= '<style'.$this->renderAttributes($attrs)
+                            . ">\n/* <![CDATA[ */\n".$attrs['_']."\n/* //]]> */\n</style>";
                     } else {
-                        $str .= '<link rel="stylesheet"' . $this->renderAttributes($attrs) . " />\n";
+                        $str .= '<link rel="stylesheet"'.$this->renderAttributes($attrs)." />\n";
                     }
                 }
                 break;
             case 'http':
                 foreach ($this->metas[$type] as $name => $content) {
-                    $str .= '<meta http-equiv="' . htmlspecialchars($name, ENT_QUOTES) . '" content="'
-                        . htmlspecialchars($content, ENT_QUOTES) . "\" />\n";
+                    $str .= '<meta http-equiv="'.htmlspecialchars($name, ENT_QUOTES).'" content="'
+                        . htmlspecialchars($content, ENT_QUOTES)."\" />\n";
                 }
                 break;
             default:
                 foreach ($this->metas[$type] as $name => $content) {
-                    $str .= '<meta name="' . htmlspecialchars($name, ENT_QUOTES) . '" content="'
-                        . htmlspecialchars($content, ENT_QUOTES) . "\" />\n";
+                    $str .= '<meta name="'.htmlspecialchars($name, ENT_QUOTES).'" content="'
+                        . htmlspecialchars($content, ENT_QUOTES)."\" />\n";
                 }
                 break;
         }
@@ -893,7 +893,7 @@ 
         if (!isset($cache[$tagName])) {
             $cache[$tagName] = 1;
         }
-        return $tagName . '-' . $cache[$tagName]++;
+        return $tagName.'-'.$cache[$tagName]++;
     }
 
     /**
@@ -908,7 +908,7 @@ 
         $str = '';
         foreach ($coll as $name => $val) {
             if ($name !== '_') {
-                $str .= ' ' . $name . '="' . htmlspecialchars($val, ENT_QUOTES) . '"';
+                $str .= ' '.$name.'="'.htmlspecialchars($val, ENT_QUOTES).'"';
             }
         }
         return $str;
@@ -928,12 +928,12 @@ 
         }
         $xoops_root_path = \XoopsBaseConfig::get('root-path');
 //\Xoops::getInstance()->events()->triggerEvent('debug.log', $this);
-        if (\XoopsLoad::fileExists($xoops_root_path . "/{$this->themesPath}/{$this->folderName}/{$path}")) {
+        if (\XoopsLoad::fileExists($xoops_root_path."/{$this->themesPath}/{$this->folderName}/{$path}")) {
 //\Xoops::getInstance()->events()->triggerEvent('debug.log', "custom theme path {$this->themesPath}/{$this->folderName}/{$path}");
             return "{$this->themesPath}/{$this->folderName}/{$path}";
         }
 
-        if (\XoopsLoad::fileExists($xoops_root_path . "/themes/{$this->folderName}/{$path}")) {
+        if (\XoopsLoad::fileExists($xoops_root_path."/themes/{$this->folderName}/{$path}")) {
 //\Xoops::getInstance()->events()->triggerEvent('debug.log', "main theme folder themes/{$this->folderName}/{$path}");
             return "themes/{$this->folderName}/{$path}";
         }

Indentation +8 added lines, -8 removed lines

@@ -174,12 +174,12 @@ 
      */
     public $headersCacheEngine = 'default';
 	
-	/**
+    /**
      * 
      *$renderer instance of renderer
      * 
      */	
-	protected $renderer;
+    protected $renderer;
 
     /**
      * *#@-
@@ -321,10 +321,10 @@ 
      */
     public function setRenderer($renderer)
     {
-		$this->renderer = $renderer;
+        $this->renderer = $renderer;
     }
 	
-	/**
+    /**
      * get the renderer
      *
      * @return Renderer
@@ -333,10 +333,10 @@ 
     {
         // return a default if not set
         if (null === $this->renderer) {
-			return $element->defaultRender();
-		} else {
-			return $this->renderer->render($element);
-		}
+            return $element->defaultRender();
+        } else {
+            return $this->renderer->render($element);
+        }
     }
 
     /**

xoops_lib/Xoops/Core/Database/Connection.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function setForce($force = false)
     {
-        $this->force = (bool) $force;
+        $this->force = (bool)$force;
     }
 
     /**
@@ -135,7 +135,7 @@ 
     {
         $prefix = \XoopsBaseConfig::get('db-prefix');
         if ($tablename != '') {
-            return $prefix . '_' . $tablename;
+            return $prefix.'_'.$tablename;
         } else {
             return $prefix;
         }
@@ -257,14 +257,14 @@ 
             $events->triggerEvent('core.database.query.end');
         } else {
             //$events->triggerEvent('core.database.query.failure', (array('Not safe:')));
-            return (int) 0;
+            return (int)0;
         }
         if ($result != 0) {
             //$events->triggerEvent('core.database.query.success', (array($query)));
-            return (int) $result;
+            return (int)$result;
         } else {
             //$events->triggerEvent('core.database.query.failure', (array($query)));
-            return (int) 0;
+            return (int)0;
         }
     }
 
@@ -331,7 +331,7 @@ 
             $result = call_user_func_array(array('parent', 'query'), func_get_args());
         } catch (\Exception $e) {
             $events->triggerEvent('core.exception', $e);
-            $result=null;
+            $result = null;
         }
         $events->triggerEvent('core.database.query.end');
         if ($result) {

xoops_lib/Xoops/Core/Database/Schema/ExportVisitor.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     public function acceptForeignKey(Table $localTable, ForeignKeyConstraint $fkConstraint)
     {
         if (!isset($this->schemaArray['tables'][$localTable->getName()]['constraint'])) {
-            $this->schemaArray['tables'][$localTable->getName()]['constraint']=array();
+            $this->schemaArray['tables'][$localTable->getName()]['constraint'] = array();
         }
         $this->schemaArray['tables'][$localTable->getName()]['constraint'][] = array(
                 'name' => $fkConstraint->getName(),