XOOPS / XoopsCore25

htdocs/class/captcha/config.text.php

Spacing +1 added lines, -1 removed lines

@@ -20,5 +20,5 @@
 defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 
 return $config = array(
-    'num_chars' => 6,  // Maximum characters
+    'num_chars' => 6, // Maximum characters
 );

htdocs/class/captcha/image.php

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
                 'imageftbbox');
             foreach ($required_functions as $func) {
                 if (!function_exists($func)) {
-                    trigger_error('Function ' . $func . ' is not defined', E_USER_WARNING);
+                    trigger_error('Function '.$func.' is not defined', E_USER_WARNING);
 
                     return false;
                 }
@@ -63,22 +63,22 @@ 
      */
     public function render()
     {
-        $js    = "<script type='text/javascript'>
+        $js = "<script type='text/javascript'>
                 function xoops_captcha_refresh(imgId)
                 {
-                    xoopsGetElementById(imgId).src = '" . XOOPS_URL . "/class/captcha/image/scripts/image.php?refresh='+Math.random();
+                    xoopsGetElementById(imgId).src = '" . XOOPS_URL."/class/captcha/image/scripts/image.php?refresh='+Math.random();
                 }
                 </script>";
         $image = $this->loadImage();
-        $image .= "<br><a href=\"javascript: xoops_captcha_refresh('" . $this->config['name'] . "')\">" . _CAPTCHA_REFRESH . '</a>';
-        $input = '<input type="text" name="' . $this->config['name'] . '" id="' . $this->config['name'] . '" size="' . $this->config['num_chars'] . '" maxlength="' . $this->config['num_chars'] . '" value="" />';
+        $image .= "<br><a href=\"javascript: xoops_captcha_refresh('".$this->config['name']."')\">"._CAPTCHA_REFRESH.'</a>';
+        $input = '<input type="text" name="'.$this->config['name'].'" id="'.$this->config['name'].'" size="'.$this->config['num_chars'].'" maxlength="'.$this->config['num_chars'].'" value="" />';
         $rule  = _CAPTCHA_RULE_IMAGE;
-        $rule .= '<br>' . (empty($this->config['casesensitive']) ? _CAPTCHA_RULE_CASEINSENSITIVE : _CAPTCHA_RULE_CASESENSITIVE);
+        $rule .= '<br>'.(empty($this->config['casesensitive']) ? _CAPTCHA_RULE_CASEINSENSITIVE : _CAPTCHA_RULE_CASESENSITIVE);
         if (!empty($this->config['maxattempts'])) {
-            $rule .= '<br>' . sprintf(_CAPTCHA_MAXATTEMPTS, $this->config['maxattempts']);
+            $rule .= '<br>'.sprintf(_CAPTCHA_MAXATTEMPTS, $this->config['maxattempts']);
         }
 
-        return $js . $image . '<br><br>' . $input . '<br>' . $rule;
+        return $js.$image.'<br><br>'.$input.'<br>'.$rule;
     }
 
     /**
@@ -88,6 +88,6 @@ 
      */
     public function loadImage()
     {
-        return '<img id="' . $this->config['name'] . '" src="' . XOOPS_URL . '/class/captcha/image/scripts/image.php" onclick=\'this.src="' . XOOPS_URL . '/class/captcha/image/scripts/image.php?refresh="+Math.random()' . '\' style="cursor: pointer; vertical-align: middle;" alt="" />';
+        return '<img id="'.$this->config['name'].'" src="'.XOOPS_URL.'/class/captcha/image/scripts/image.php" onclick=\'this.src="'.XOOPS_URL.'/class/captcha/image/scripts/image.php?refresh="+Math.random()'.'\' style="cursor: pointer; vertical-align: middle;" alt="" />';
     }
 }

htdocs/class/captcha/image/scripts/image.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
  * @subpackage          CAPTCHA
  */
 
-include __DIR__  . '/../../../../mainfile.php';
+include __DIR__.'/../../../../mainfile.php';
 
 error_reporting(0);
 $xoopsLogger->activated = false;
@@ -53,7 +53,7 @@ 
     {
         xoops_load('XoopsCaptcha');
         $this->captchaHandler = XoopsCaptcha::getInstance();
-        $this->config          = $this->captchaHandler->loadConfig('image');
+        $this->config = $this->captchaHandler->loadConfig('image');
     }
 
     public function loadImage()
@@ -98,7 +98,7 @@ 
     {
         if ($this->invalid) {
             header('Content-type: image/gif');
-            readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
+            readfile(XOOPS_ROOT_PATH.'/images/subject/icon2.gif');
 
             return null;
         }
@@ -124,8 +124,8 @@ 
             return $items;
         }
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        $file_path = XOOPS_ROOT_PATH . "/class/captcha/image/{$name}";
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+        $file_path = XOOPS_ROOT_PATH."/class/captcha/image/{$name}";
         $files     = XoopsLists::getFileListAsArray($file_path);
         foreach ($files as $item) {
             if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
@@ -198,7 +198,7 @@ 
     public function loadFont()
     {
         $fonts      = $this->getList('fonts', 'ttf');
-        $this->font = XOOPS_ROOT_PATH . '/class/captcha/image/fonts/' . $fonts[array_rand($fonts)];
+        $this->font = XOOPS_ROOT_PATH.'/class/captcha/image/fonts/'.$fonts[array_rand($fonts)];
     }
 
     public function setImageSize()
@@ -237,7 +237,7 @@ 
     {
         $RandBackground = null;
         if ($backgrounds = $this->getList('backgrounds', '(gif|jpg|png)')) {
-            $RandBackground = XOOPS_ROOT_PATH . '/class/captcha/image/backgrounds/' . $backgrounds[array_rand($backgrounds)];
+            $RandBackground = XOOPS_ROOT_PATH.'/class/captcha/image/backgrounds/'.$backgrounds[array_rand($backgrounds)];
         }
 
         return $RandBackground;

htdocs/class/captcha/recaptcha.php

Spacing +4 added lines, -4 removed lines

@@ -45,11 +45,11 @@ 
     public function render()
     {
         trigger_error("recaptcha is outdated , use recaptcha_2 in \class\captcha\config.php", E_USER_WARNING);
-        require_once __DIR__ . '/recaptcha/recaptchalib.php';
+        require_once __DIR__.'/recaptcha/recaptchalib.php';
         $form = "<script type=\"text/javascript\">
             var RecaptchaOptions = {
-            theme : '" . $this->config['theme'] . "',
-            lang : '" . $this->config['lang'] . "'
+            theme : '" . $this->config['theme']."',
+            lang : '" . $this->config['lang']."'
             };
             </script>";
         $form .= recaptcha_get_html($this->config['public_key']);
@@ -67,7 +67,7 @@ 
     public function verify($sessionName = null)
     {
         $is_valid = false;
-        require_once __DIR__ . '/recaptcha/recaptchalib.php';
+        require_once __DIR__.'/recaptcha/recaptchalib.php';
         if (!empty(Request::getString('recaptcha_response_field', '', 'POST'))) {
             $resp = recaptcha_check_answer($this->config['private_key'], $_SERVER['REMOTE_ADDR'], Request::getString('recaptcha_challenge_field', '', 'POST'), Request::getString('recaptcha_response_field', '', 'POST'));
             if (!$resp->is_valid) {

htdocs/class/captcha/text.php

Spacing +4 added lines, -4 removed lines

@@ -44,10 +44,10 @@ 
      */
     public function render()
     {
-        $form = $this->loadText() . '&nbsp;&nbsp; <input type="text" name="' . $this->config['name'] . '" id="' . $this->config['name'] . '" size="' . $this->config['num_chars'] . '" maxlength="' . $this->config['num_chars'] . '" value="" />';
-        $form .= '<br>' . _CAPTCHA_RULE_TEXT;
+        $form = $this->loadText().'&nbsp;&nbsp; <input type="text" name="'.$this->config['name'].'" id="'.$this->config['name'].'" size="'.$this->config['num_chars'].'" maxlength="'.$this->config['num_chars'].'" value="" />';
+        $form .= '<br>'._CAPTCHA_RULE_TEXT;
         if (!empty($this->config['maxattempts'])) {
-            $form .= '<br>' . sprintf(_CAPTCHA_MAXATTEMPTS, $this->config['maxattempts']);
+            $form .= '<br>'.sprintf(_CAPTCHA_MAXATTEMPTS, $this->config['maxattempts']);
         }
 
         return $form;
@@ -60,7 +60,7 @@ 
      */
     public function loadText()
     {
-        return '<span style="font-style: normal; font-weight: bold; font-size: 100%; color: #333; border: 1px solid #333; padding: 1px 5px;">' . $this->outputText . '</span>';
+        return '<span style="font-style: normal; font-weight: bold; font-size: 100%; color: #333; border: 1px solid #333; padding: 1px 5px;">'.$this->outputText.'</span>';
     }
 
     protected function buildQuestion()

htdocs/class/preload.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
         if ($modules_list = XoopsCache::read('system_modules_active')) {
             $i = 0;
             foreach ($modules_list as $module) {
-                if (is_dir($dir = XOOPS_ROOT_PATH . "/modules/{$module}/preloads/")) {
+                if (is_dir($dir = XOOPS_ROOT_PATH."/modules/{$module}/preloads/")) {
                     $file_list = XoopsLists::getFileListAsArray($dir);
                     foreach ($file_list as $file) {
                         if (preg_match('/(\.php)$/i', $file)) {
@@ -107,8 +107,8 @@ 
     public function setEvents()
     {
         foreach ($this->_preloads as $preload) {
-            include_once XOOPS_ROOT_PATH . '/modules/' . $preload['module'] . '/preloads/' . $preload['file'] . '.php';
-            $class_name = ucfirst($preload['module']) . ucfirst($preload['file']) . 'Preload';
+            include_once XOOPS_ROOT_PATH.'/modules/'.$preload['module'].'/preloads/'.$preload['file'].'.php';
+            $class_name = ucfirst($preload['module']).ucfirst($preload['file']).'Preload';
             if (!class_exists($class_name)) {
                 continue;
             }

htdocs/class/xoopssecurity.php

Indentation +26 added lines, -26 removed lines

@@ -181,32 +181,32 @@
     public function checkSuperglobals()
     {
         foreach (array(
-                     'GLOBALS',
-                     '_SESSION',
-                     'HTTP_SESSION_VARS',
-                     '_GET',
-                     'HTTP_GET_VARS',
-                     '_POST',
-                     'HTTP_POST_VARS',
-                     '_COOKIE',
-                     'HTTP_COOKIE_VARS',
-                     '_REQUEST',
-                     '_SERVER',
-                     'HTTP_SERVER_VARS',
-                     '_ENV',
-                     'HTTP_ENV_VARS',
-                     '_FILES',
-                     'HTTP_POST_FILES',
-                     'xoopsDB',
-                     'xoopsUser',
-                     'xoopsUserId',
-                     'xoopsUserGroups',
-                     'xoopsUserIsAdmin',
-                     'xoopsConfig',
-                     'xoopsOption',
-                     'xoopsModule',
-                     'xoopsModuleConfig',
-                     'xoopsRequestUri') as $bad_global) {
+                        'GLOBALS',
+                        '_SESSION',
+                        'HTTP_SESSION_VARS',
+                        '_GET',
+                        'HTTP_GET_VARS',
+                        '_POST',
+                        'HTTP_POST_VARS',
+                        '_COOKIE',
+                        'HTTP_COOKIE_VARS',
+                        '_REQUEST',
+                        '_SERVER',
+                        'HTTP_SERVER_VARS',
+                        '_ENV',
+                        'HTTP_ENV_VARS',
+                        '_FILES',
+                        'HTTP_POST_FILES',
+                        'xoopsDB',
+                        'xoopsUser',
+                        'xoopsUserId',
+                        'xoopsUserGroups',
+                        'xoopsUserIsAdmin',
+                        'xoopsConfig',
+                        'xoopsOption',
+                        'xoopsModule',
+                        'xoopsModuleConfig',
+                        'xoopsRequestUri') as $bad_global) {
             if (isset($_REQUEST[$bad_global])) {
                 header('Location: ' . XOOPS_URL . '/');
                 exit();

Spacing +14 added lines, -14 removed lines

@@ -58,15 +58,15 @@ 
         }
         $token_id = md5(uniqid(mt_rand(), true));
         // 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);
-        $_SESSION[$name . '_SESSION'][] = $token_data;
+        $_SESSION[$name.'_SESSION'][] = $token_data;
 
-        return md5($token_id . $_SERVER['HTTP_USER_AGENT'] . XOOPS_DB_PREFIX);
+        return md5($token_id.$_SERVER['HTTP_USER_AGENT'].XOOPS_DB_PREFIX);
     }
 
     /**
@@ -81,16 +81,16 @@ 
     public function validateToken($token = false, $clearIfValid = true, $name = 'XOOPS_TOKEN')
     {
         global $xoopsLogger;
-        $token = ($token !== false) ? $token : (isset($_REQUEST[$name . '_REQUEST']) ? $_REQUEST[$name . '_REQUEST'] : '');
-        if (empty($token) || empty($_SESSION[$name . '_SESSION'])) {
+        $token = ($token !== false) ? $token : (isset($_REQUEST[$name.'_REQUEST']) ? $_REQUEST[$name.'_REQUEST'] : '');
+        if (empty($token) || empty($_SESSION[$name.'_SESSION'])) {
             $xoopsLogger->addExtra('Token Validation', 'No valid token found in request/session');
 
             return false;
         }
         $validFound = false;
-        $token_data = &$_SESSION[$name . '_SESSION'];
+        $token_data = &$_SESSION[$name.'_SESSION'];
         foreach (array_keys($token_data) as $i) {
-            if ($token === md5($token_data[$i]['id'] . $_SERVER['HTTP_USER_AGENT'] . XOOPS_DB_PREFIX)) {
+            if ($token === md5($token_data[$i]['id'].$_SERVER['HTTP_USER_AGENT'].XOOPS_DB_PREFIX)) {
                 if ($this->filterToken($token_data[$i])) {
                     if ($clearIfValid) {
                         // token should be valid once, so clear it once validated
@@ -124,7 +124,7 @@ 
      */
     public function clearTokens($name = 'XOOPS_TOKEN')
     {
-        $_SESSION[$name . '_SESSION'] = array();
+        $_SESSION[$name.'_SESSION'] = array();
     }
 
     /**
@@ -148,7 +148,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'));
         }
@@ -208,7 +208,7 @@ 
                      'xoopsModuleConfig',
                      'xoopsRequestUri') as $bad_global) {
             if (isset($_REQUEST[$bad_global])) {
-                header('Location: ' . XOOPS_URL . '/');
+                header('Location: '.XOOPS_URL.'/');
                 exit();
             }
         }
@@ -225,7 +225,7 @@ 
         global $xoopsConfig;
         if ($xoopsConfig['enable_badips'] == 1 && isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] != '') {
             foreach ($xoopsConfig['bad_ips'] as $bi) {
-                if (!empty($bi) && preg_match('/' . $bi . '/', $_SERVER['REMOTE_ADDR'])) {
+                if (!empty($bi) && preg_match('/'.$bi.'/', $_SERVER['REMOTE_ADDR'])) {
                     exit();
                 }
             }
@@ -242,7 +242,7 @@ 
      */
     public function getTokenHTML($name = 'XOOPS_TOKEN')
     {
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $token = new XoopsFormHiddenToken($name);
 
         return $token->render();
@@ -275,7 +275,7 @@ 
             $ret = '';
             if (count($this->errors) > 0) {
                 foreach ($this->errors as $error) {
-                    $ret .= $error . '<br>';
+                    $ret .= $error.'<br>';
                 }
             }
 

htdocs/class/class.zipfile.php

Indentation +4 added lines, -4 removed lines

@@ -161,10 +161,10 @@
         $ctrldir = implode('', $this->ctrl_dir);
 
         return $data . $ctrldir . $this->eof_ctrl_dir . pack('v', count($this->ctrl_dir)) . // total # of entries "on this disk"
-               pack('v', count($this->ctrl_dir)) . // total # of entries overall
-               pack('V', strlen($ctrldir)) . // size of central dir
-               pack('V', strlen($data)) . // offset to start of central dir
-               "\x00\x00"; // .zip file comment length
+                pack('v', count($this->ctrl_dir)) . // total # of entries overall
+                pack('V', strlen($ctrldir)) . // size of central dir
+                pack('V', strlen($data)) . // offset to start of central dir
+                "\x00\x00"; // .zip file comment length
     } // end of the 'file()' method
 } // end of the 'zipfile' class
 

Spacing +6 added lines, -6 removed lines

@@ -95,8 +95,8 @@ 
         $name = str_replace('\\', '/', $name);
 
         $dtime    = dechex($this->unix2DosTime($time));
-        $hexdtime = '\x' . $dtime[6] . $dtime[7] . '\x' . $dtime[4] . $dtime[5] . '\x' . $dtime[2] . $dtime[3] . '\x' . $dtime[0] . $dtime[1];
-        eval('$hexdtime = "' . $hexdtime . '";');
+        $hexdtime = '\x'.$dtime[6].$dtime[7].'\x'.$dtime[4].$dtime[5].'\x'.$dtime[2].$dtime[3].'\x'.$dtime[0].$dtime[1];
+        eval('$hexdtime = "'.$hexdtime.'";');
 
         $fr = "\x50\x4b\x03\x04";
         $fr .= "\x14\x00"; // ver needed to extract
@@ -160,10 +160,10 @@ 
         $data    = implode('', $this->datasec);
         $ctrldir = implode('', $this->ctrl_dir);
 
-        return $data . $ctrldir . $this->eof_ctrl_dir . pack('v', count($this->ctrl_dir)) . // total # of entries "on this disk"
-               pack('v', count($this->ctrl_dir)) . // total # of entries overall
-               pack('V', strlen($ctrldir)) . // size of central dir
-               pack('V', strlen($data)) . // offset to start of central dir
+        return $data.$ctrldir.$this->eof_ctrl_dir.pack('v', count($this->ctrl_dir)).// total # of entries "on this disk"
+               pack('v', count($this->ctrl_dir)).// total # of entries overall
+               pack('V', strlen($ctrldir)).// size of central dir
+               pack('V', strlen($data)).// offset to start of central dir
                "\x00\x00"; // .zip file comment length
     } // end of the 'file()' method
 } // end of the 'zipfile' class

htdocs/class/theme.php

Spacing +49 added lines, -49 removed lines

@@ -72,7 +72,7 @@ 
             }
             $GLOBALS['xoopsConfig']['theme_set'] = $options['folderName'];
         }
-        $options['path'] = XOOPS_THEME_PATH . '/' . $options['folderName'];
+        $options['path'] = XOOPS_THEME_PATH.'/'.$options['folderName'];
         $inst            = null;
         $inst            = new xos_opal_Theme();
         foreach ($options as $k => $v) {
@@ -117,17 +117,17 @@ 
         $options['plugins']      = array();
         $options['renderBanner'] = false;
         $inst                    = parent::createInstance($options, $initArgs);
-        $inst->path              = XOOPS_ADMINTHEME_PATH . '/' . $inst->folderName;
-        $inst->url               = XOOPS_ADMINTHEME_URL . '/' . $inst->folderName;
+        $inst->path              = XOOPS_ADMINTHEME_PATH.'/'.$inst->folderName;
+        $inst->url               = XOOPS_ADMINTHEME_URL.'/'.$inst->folderName;
         $inst->template->assign(array(
                                     'theme_path'  => $inst->path,
-                                    'theme_tpl'   => $inst->path . '/xotpl',
+                                    '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_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;
     }
@@ -268,16 +268,16 @@ 
         /** @var XoopsConfigHandler $configHandler */
         $configHandler = xoops_getHandler('config');
 
-        $this->path                   = XOOPS_THEME_PATH . '/' . $this->folderName;
-        $this->url                    = XOOPS_THEME_URL . '/' . $this->folderName;
+        $this->path                   = XOOPS_THEME_PATH.'/'.$this->folderName;
+        $this->url                    = XOOPS_THEME_URL.'/'.$this->folderName;
         $this->template               = null;
         $this->template               = new XoopsTpl();
         $this->template->currentTheme = $this;
         $this->template->assign_by_ref('xoTheme', $this);
         $GLOBALS['xoTheme']  = $this;
         $GLOBALS['xoopsTpl'] = $this->template;
-        $tempPath = str_replace('\\', '/', realpath(XOOPS_ROOT_PATH) . '/');
-        $tempName = str_replace('\\', '/',  realpath($_SERVER['SCRIPT_FILENAME']));
+        $tempPath = str_replace('\\', '/', realpath(XOOPS_ROOT_PATH).'/');
+        $tempName = str_replace('\\', '/', realpath($_SERVER['SCRIPT_FILENAME']));
         $xoops_page = str_replace($tempPath, '', $tempName);
         if (strpos($xoops_page, 'modules') !== false) {
             $xoops_page = str_replace('modules/', '', $xoops_page);
@@ -292,15 +292,15 @@ 
             $xoops_startpage = 'system';
         }
         // call the theme_autorun.php if the theme has one
-        if (file_exists($this->path . "/theme_autorun.php")) {
-            include_once($this->path . "/theme_autorun.php");
+        if (file_exists($this->path."/theme_autorun.php")) {
+            include_once($this->path."/theme_autorun.php");
         }
 
         $searchConfig = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
-        $xoops_search = (bool) (isset($searchConfig['enable_search']) && $searchConfig['enable_search'] === 1);
+        $xoops_search = (bool)(isset($searchConfig['enable_search']) && $searchConfig['enable_search'] === 1);
         $this->template->assign(array(
             'xoops_theme'      => $GLOBALS['xoopsConfig']['theme_set'],
-            'xoops_imageurl'   => XOOPS_THEME_URL . '/' . $GLOBALS['xoopsConfig']['theme_set'] . '/',
+            'xoops_imageurl'   => XOOPS_THEME_URL.'/'.$GLOBALS['xoopsConfig']['theme_set'].'/',
             'xoops_themecss'   => xoops_getcss($GLOBALS['xoopsConfig']['theme_set']),
             'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
             'xoops_sitename'   => htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES),
@@ -319,7 +319,7 @@ 
         if (isset($GLOBALS['xoopsUser']) && is_object($GLOBALS['xoopsUser'])) {
             $this->template->assign(array(
                 'xoops_isuser'     => true,
-                'xoops_avatar'     => XOOPS_UPLOAD_URL . '/' . $GLOBALS['xoopsUser']->getVar('user_avatar'),
+                'xoops_avatar'     => XOOPS_UPLOAD_URL.'/'.$GLOBALS['xoopsUser']->getVar('user_avatar'),
                 'xoops_userid'     => $GLOBALS['xoopsUser']->getVar('uid'),
                 'xoops_uname'      => $GLOBALS['xoopsUser']->getVar('uname'),
                 'xoops_name'       => $GLOBALS['xoopsUser']->getVar('name'),
@@ -335,7 +335,7 @@ 
         }
 
         // Meta tags
-        $criteria       = new CriteriaCompo(new Criteria('conf_modid', 0));
+        $criteria = new CriteriaCompo(new Criteria('conf_modid', 0));
         $criteria->add(new Criteria('conf_catid', XOOPS_CONF_METAFOOTER));
         $config = $configHandler->getConfigs($criteria, true);
         foreach (array_keys($config) as $i) {
@@ -360,7 +360,7 @@ 
             if (!is_object($bundleId)) {
                 $this->plugins[$bundleId]        = null;
                 $this->plugins[$bundleId]        = new $bundleId();
-                $this->plugins[$bundleId]->theme =& $this;
+                $this->plugins[$bundleId]->theme = & $this;
                 $this->plugins[$bundleId]->xoInit();
                 unset($this->plugins[$k]);
             }
@@ -391,18 +391,18 @@ 
                 $extra_string = $GLOBALS['xoopsConfig']['language'];
                 // Generate group section
                 if (!isset($GLOBALS['xoopsUser']) || !is_object($GLOBALS['xoopsUser'])) {
-                    $extra_string .= '-' . XOOPS_GROUP_ANONYMOUS;
+                    $extra_string .= '-'.XOOPS_GROUP_ANONYMOUS;
                 } else {
                     $groups = $GLOBALS['xoopsUser']->getGroups();
                     sort($groups);
                     // Generate group string for non-anonymous groups,
                     // XOOPS_DB_PASS and XOOPS_DB_NAME (before we find better variables) are used to protect group sensitive contents
-                    $extra_string .= '-' . substr(md5(implode('-', $groups)), 0, 8) . '-' . substr(md5(XOOPS_DB_PASS . XOOPS_DB_NAME . XOOPS_DB_USER), 0, 8);
+                    $extra_string .= '-'.substr(md5(implode('-', $groups)), 0, 8).'-'.substr(md5(XOOPS_DB_PASS.XOOPS_DB_NAME.XOOPS_DB_USER), 0, 8);
                 }
             }
             $extraString = $extra_string;
         }
-        $cache_id .= '-' . $extraString;
+        $cache_id .= '-'.$extraString;
 
         return $cache_id;
     }
@@ -421,9 +421,9 @@ 
             $uri                            = str_replace(XOOPS_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->is_cached($template, $this->contentCacheId)) {
                 $xoopsLogger = XoopsLogger::getInstance();
                 $xoopsLogger->addExtra($template, sprintf('Cached (regenerates every %d seconds)', $this->contentCacheLifetime));
@@ -483,7 +483,7 @@ 
         if ($this->contentCacheLifetime && $this->contentCacheId && !$contentTpl) {
             $content['htmlHeadStrings'] = $this->htmlHeadStrings;
             $content['metas']           = $this->metas;
-            $content['xoops_pagetitle'] =& $this->template->get_template_vars('xoops_pagetitle');
+            $content['xoops_pagetitle'] = & $this->template->get_template_vars('xoops_pagetitle');
             $content['header']          = $header;
             $cache->write($this->contentCacheId, $content);
         }
@@ -504,7 +504,7 @@ 
         }
 
         // We assume no overlap between $GLOBALS['xoopsOption']['xoops_module_header'] and $this->template->get_template_vars( 'xoops_module_header' ) ?
-        $this->template->assign('xoops_module_header', $this->renderMetas(null, true) . "\n" . $header);
+        $this->template->assign('xoops_module_header', $this->renderMetas(null, true)."\n".$header);
 
         if ($canvasTpl) {
             $this->canvasTemplate = $canvasTpl;
@@ -527,10 +527,10 @@ 
 
         // Do not cache the main (theme.html) template output
         $this->template->caching = 0;
-        if (file_exists($this->path . '/' . $this->canvasTemplate)) {
-            $this->template->display($this->path . '/' . $this->canvasTemplate);
+        if (file_exists($this->path.'/'.$this->canvasTemplate)) {
+            $this->template->display($this->path.'/'.$this->canvasTemplate);
         } else {
-            $this->template->display($this->path . '/theme.html');
+            $this->template->display($this->path.'/theme.html');
         }
         $this->renderCount++;
         $xoopsLogger->stopTime('Page rendering');
@@ -554,16 +554,16 @@ 
     {
         $language = $GLOBALS['xoopsConfig']['language'];
         // Load global localization stylesheet if available
-        if (file_exists($GLOBALS['xoops']->path('language/' . $language . '/style.css'))) {
-            $this->addStylesheet($GLOBALS['xoops']->url('language/' . $language . '/style.css'));
+        if (file_exists($GLOBALS['xoops']->path('language/'.$language.'/style.css'))) {
+            $this->addStylesheet($GLOBALS['xoops']->url('language/'.$language.'/style.css'));
         }
         $this->addLanguage($type, $language);
         // Load theme localization stylesheet and scripts if available
-        if (file_exists($this->path . '/language/' . $language . '/script.js')) {
-            $this->addScript($this->url . '/language/' . $language . '/script.js');
+        if (file_exists($this->path.'/language/'.$language.'/script.js')) {
+            $this->addScript($this->url.'/language/'.$language.'/script.js');
         }
-        if (file_exists($this->path . '/language/' . $language . '/style.css')) {
-            $this->addStylesheet($this->url . '/language/' . $language . '/style.css');
+        if (file_exists($this->path.'/language/'.$language.'/style.css')) {
+            $this->addStylesheet($this->url.'/language/'.$language.'/style.css');
         }
 
         return true;
@@ -580,8 +580,8 @@ 
     public function addLanguage($type = 'main', $language = null)
     {
         $language = (null === $language) ? $GLOBALS['xoopsConfig']['language'] : $language;
-        if (!file_exists($fileinc = $this->path . "/language/{$language}/{$type}.php")) {
-            if (!file_exists($fileinc = $this->path . "/language/english/{$type}.php")) {
+        if (!file_exists($fileinc = $this->path."/language/{$language}/{$type}.php")) {
+            if (!file_exists($fileinc = $this->path."/language/english/{$type}.php")) {
                 return false;
             }
         }
@@ -768,9 +768,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";
                     }
@@ -779,26 +779,26 @@ 
                     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;
             }
@@ -824,7 +824,7 @@ 
             $cache[$tagName] = 1;
         }
 
-        return $tagName . '-' . $cache[$tagName]++;
+        return $tagName.'-'.$cache[$tagName]++;
     }
 
     /**
@@ -838,7 +838,7 @@ 
         $str = '';
         foreach ($coll as $name => $val) {
             if ($name !== '_') {
-                $str .= ' ' . $name . '="' . htmlspecialchars($val, ENT_QUOTES) . '"';
+                $str .= ' '.$name.'="'.htmlspecialchars($val, ENT_QUOTES).'"';
             }
         }
 
@@ -857,11 +857,11 @@ 
             $path = substr($path, 1);
         }
 
-        if (file_exists(XOOPS_ROOT_PATH . "/{$this->themesPath}/{$this->folderName}/{$path}")) {
+        if (file_exists(XOOPS_ROOT_PATH."/{$this->themesPath}/{$this->folderName}/{$path}")) {
             return "{$this->themesPath}/{$this->folderName}/{$path}";
         }
 
-        if (file_exists(XOOPS_ROOT_PATH . "/themes/{$this->folderName}/{$path}")) {
+        if (file_exists(XOOPS_ROOT_PATH."/themes/{$this->folderName}/{$path}")) {
             return "themes/{$this->folderName}/{$path}";
         }