XOOPS / XoopsCore25

htdocs/class/xoopsblock.php

Spacing +51 added lines, -51 removed lines

@@ -82,7 +82,7 @@ 
     public function load($id)
     {
         $id  = (int)$id;
-        $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . ' WHERE bid = ' . $id;
+        $sql = 'SELECT * FROM '.$this->db->prefix('newblocks').' WHERE bid = '.$id;
         $arr = $this->db->fetchArray($this->db->query($sql));
         $this->assignVars($arr);
     }
@@ -101,15 +101,15 @@ 
             ${$k} = $v;
         }
         if (empty($bid)) {
-            $bid = $this->db->genId($this->db->prefix('newblocks') . '_bid_seq');
+            $bid = $this->db->genId($this->db->prefix('newblocks').'_bid_seq');
             $sql = sprintf('INSERT INTO %s (bid, mid, func_num, options, name, title, content, side, weight, visible, block_type, c_type, isactive, dirname, func_file, show_func, edit_func, template, bcachetime, last_modified) VALUES (%u, %u, %u, %s, %s, %s, %s, %u, %u, %u, %s, %s, %u, %s, %s, %s, %s, %s, %u, %u)', $this->db->prefix('newblocks'), $bid, $mid, $func_num, $this->db->quoteString($options), $this->db->quoteString($name), $this->db->quoteString($title), $this->db->quoteString($content), $side, $weight, $visible, $this->db->quoteString($block_type), $this->db->quoteString($c_type), 1, $this->db->quoteString($dirname), $this->db->quoteString($func_file), $this->db->quoteString($show_func), $this->db->quoteString($edit_func), $this->db->quoteString($template), $bcachetime, time());
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newblocks') . ' SET options=' . $this->db->quoteString($options);
+            $sql = 'UPDATE '.$this->db->prefix('newblocks').' SET options='.$this->db->quoteString($options);
             // a custom block needs its own name
             if ($this->isCustom() /* in_array( $block_type , array( 'C' , 'E' ) ) */) {
-                $sql .= ', name=' . $this->db->quoteString($name);
+                $sql .= ', name='.$this->db->quoteString($name);
             }
-            $sql .= ', isactive=' . $isactive . ', title=' . $this->db->quoteString($title) . ', content=' . $this->db->quoteString($content) . ', side=' . $side . ', weight=' . $weight . ', visible=' . $visible . ', c_type=' . $this->db->quoteString($c_type) . ', template=' . $this->db->quoteString($template) . ', bcachetime=' . $bcachetime . ', last_modified=' . time() . ' WHERE bid=' . $bid;
+            $sql .= ', isactive='.$isactive.', title='.$this->db->quoteString($title).', content='.$this->db->quoteString($content).', side='.$side.', weight='.$weight.', visible='.$visible.', c_type='.$this->db->quoteString($c_type).', template='.$this->db->quoteString($template).', bcachetime='.$bcachetime.', last_modified='.time().' WHERE bid='.$bid;
         }
         if (!$this->db->query($sql)) {
             $this->setErrors('Could not save block data into database');
@@ -160,22 +160,22 @@ 
                 // S : use text sanitizater (smilies enabled)
                 // T : use text sanitizater (smilies disabled)
                 if ($c_type === 'H') {
-                    return str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+                    return str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'n'));
                 } elseif ($c_type === 'P') {
                     ob_start();
                     echo eval($this->getVar('content', 'n'));
                     $content = ob_get_contents();
                     ob_end_clean();
 
-                    return str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
+                    return str_replace('{X_SITEURL}', XOOPS_URL.'/', $content);
                 } elseif ($c_type === 'S') {
                     $myts    = MyTextSanitizer::getInstance();
-                    $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+                    $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'n'));
 
                     return $myts->displayTarea($content, 1, 1);
                 } else {
                     $myts    = MyTextSanitizer::getInstance();
-                    $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+                    $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $this->getVar('content', 'n'));
 
                     return $myts->displayTarea($content, 1, 0);
                 }
@@ -204,7 +204,7 @@ 
             if (!$show_func) {
                 return false;
             }
-            if (!file_exists($func_file = $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file')))) {
+            if (!file_exists($func_file = $GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file')))) {
                 return false;
             }
             // must get lang files b4 including the file
@@ -250,9 +250,9 @@ 
     public function buildContent($position, $content = '', $contentdb = '')
     {
         if ($position == 0) {
-            $ret = $contentdb . $content;
+            $ret = $contentdb.$content;
         } elseif ($position == 1) {
-            $ret = $content . $contentdb;
+            $ret = $content.$contentdb;
         }
 
         return $ret;
@@ -300,13 +300,13 @@ 
             if (!$edit_func) {
                 return false;
             }
-            if (file_exists($GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file')))) {
-                if (file_exists($file = $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/blocks.php'))) {
+            if (file_exists($GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file')))) {
+                if (file_exists($file = $GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/language/'.$xoopsConfig['language'].'/blocks.php'))) {
                     include_once $file;
-                } elseif (file_exists($file = $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/language/english/blocks.php'))) {
+                } elseif (file_exists($file = $GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/language/english/blocks.php'))) {
                     include_once $file;
                 }
-                include_once $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file'));
+                include_once $GLOBALS['xoops']->path('modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file'));
                 $options   = explode('|', $this->getVar('options'));
                 $edit_form = $edit_func($options);
                 if (!$edit_form) {
@@ -346,20 +346,20 @@ 
         if (!$asobject) {
             $sql = 'SELECT b.bid ';
         }
-        $sql .= 'FROM ' . $db->prefix('newblocks') . ' b LEFT JOIN ' . $db->prefix('group_permission') . " l ON l.gperm_itemid=b.bid WHERE gperm_name = 'block_read' AND gperm_modid = 1";
+        $sql .= 'FROM '.$db->prefix('newblocks').' b LEFT JOIN '.$db->prefix('group_permission')." l ON l.gperm_itemid=b.bid WHERE gperm_name = 'block_read' AND gperm_modid = 1";
         if (is_array($groupid)) {
-            $sql .= ' AND (l.gperm_groupid=' . $groupid[0] . '';
+            $sql .= ' AND (l.gperm_groupid='.$groupid[0].'';
             $size = count($groupid);
             if ($size > 1) {
                 for ($i = 1; $i < $size; ++$i) {
-                    $sql .= ' OR l.gperm_groupid=' . $groupid[$i] . '';
+                    $sql .= ' OR l.gperm_groupid='.$groupid[$i].'';
                 }
             }
             $sql .= ')';
         } else {
-            $sql .= ' AND l.gperm_groupid=' . $groupid . '';
+            $sql .= ' AND l.gperm_groupid='.$groupid.'';
         }
-        $sql .= ' AND b.isactive=' . $isactive;
+        $sql .= ' AND b.isactive='.$isactive;
         if (isset($side)) {
             // get both sides in sidebox? (some themes need this)
             if ($side == XOOPS_SIDEBLOCK_BOTH) {
@@ -369,9 +369,9 @@ 
             } elseif ($side == XOOPS_FOOTERBLOCK_ALL) {
                 $side = '(b.side=10 OR b.side=11 OR b.side=12 )';
             } else {
-                $side = 'b.side=' . $side;
+                $side = 'b.side='.$side;
             }
-            $sql .= ' AND ' . $side;
+            $sql .= ' AND '.$side;
         }
         if (isset($visible)) {
             $sql .= " AND b.visible=$visible";
@@ -407,7 +407,7 @@ 
     {
         $db          = XoopsDatabaseFactory::getDatabaseConnection();
         $ret         = array();
-        $where_query = ' WHERE isactive=' . $isactive;
+        $where_query = ' WHERE isactive='.$isactive;
         if (isset($side)) {
             // get both sides in sidebox? (some themes need this)
             if ($side == XOOPS_SIDEBLOCK_BOTH) {
@@ -417,24 +417,24 @@ 
             } elseif ($side == XOOPS_FOOTERBLOCK_ALL) {
                 $side = '(side=10 OR side=11 OR side=12)';
             } else {
-                $side = 'side=' . $side;
+                $side = 'side='.$side;
             }
-            $where_query .= ' AND ' . $side;
+            $where_query .= ' AND '.$side;
         }
         if (isset($visible)) {
-            $where_query .= ' AND visible=.' . $visible;
+            $where_query .= ' AND visible=.'.$visible;
         }
-        $where_query .= ' ORDER BY ' . $orderby;
+        $where_query .= ' ORDER BY '.$orderby;
         switch ($rettype) {
             case 'object':
-                $sql    = 'SELECT * FROM ' . $db->prefix('newblocks') . '' . $where_query;
+                $sql    = 'SELECT * FROM '.$db->prefix('newblocks').''.$where_query;
                 $result = $db->query($sql);
                 while (false !== ($myrow = $db->fetchArray($result))) {
                     $ret[] = new XoopsBlock($myrow);
                 }
                 break;
             case 'list':
-                $sql    = 'SELECT * FROM ' . $db->prefix('newblocks') . '' . $where_query;
+                $sql    = 'SELECT * FROM '.$db->prefix('newblocks').''.$where_query;
                 $result = $db->query($sql);
                 while (false !== ($myrow = $db->fetchArray($result))) {
                     $block                      = new XoopsBlock($myrow);
@@ -444,7 +444,7 @@ 
                 }
                 break;
             case 'id':
-                $sql    = 'SELECT bid FROM ' . $db->prefix('newblocks') . '' . $where_query;
+                $sql    = 'SELECT bid FROM '.$db->prefix('newblocks').''.$where_query;
                 $result = $db->query($sql);
                 while (false !== ($myrow = $db->fetchArray($result))) {
                     $ret[] = $myrow['bid'];
@@ -468,9 +468,9 @@ 
         $moduleid = (int)$moduleid;
         $db       = XoopsDatabaseFactory::getDatabaseConnection();
         if ($asobject == true) {
-            $sql = $sql = 'SELECT * FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $moduleid;
+            $sql = $sql = 'SELECT * FROM '.$db->prefix('newblocks').' WHERE mid='.$moduleid;
         } else {
-            $sql = 'SELECT bid FROM ' . $db->prefix('newblocks') . ' WHERE mid=' . $moduleid;
+            $sql = 'SELECT bid FROM '.$db->prefix('newblocks').' WHERE mid='.$moduleid;
         }
         $result = $db->query($sql);
         $ret    = array();
@@ -502,12 +502,12 @@ 
         $db       = XoopsDatabaseFactory::getDatabaseConnection();
         $ret      = array();
         if (isset($groupid)) {
-            $sql = 'SELECT DISTINCT gperm_itemid FROM ' . $db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1";
+            $sql = 'SELECT DISTINCT gperm_itemid FROM '.$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1";
             if (is_array($groupid)) {
-                $sql .= ' AND gperm_groupid IN (' . implode(',', $groupid) . ')';
+                $sql .= ' AND gperm_groupid IN ('.implode(',', $groupid).')';
             } else {
                 if ((int)$groupid > 0) {
-                    $sql .= ' AND gperm_groupid=' . (int)$groupid;
+                    $sql .= ' AND gperm_groupid='.(int)$groupid;
                 }
             }
             $result   = $db->query($sql);
@@ -519,14 +519,14 @@ 
                 return $blockids;
             }
         }
-        $sql = 'SELECT b.* FROM ' . $db->prefix('newblocks') . ' b, ' . $db->prefix('block_module_link') . ' m WHERE m.block_id=b.bid';
-        $sql .= ' AND b.isactive=' . $isactive;
+        $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
+        $sql .= ' AND b.isactive='.$isactive;
         if (isset($visible)) {
-            $sql .= ' AND b.visible=' . (int)$visible;
+            $sql .= ' AND b.visible='.(int)$visible;
         }
         if (!isset($module_id)) {
         } elseif (!empty($module_id)) {
-            $sql .= ' AND m.module_id IN (0,' . (int)$module_id;
+            $sql .= ' AND m.module_id IN (0,'.(int)$module_id;
             if ($toponlyblock) {
                 $sql .= ',-1';
             }
@@ -539,9 +539,9 @@ 
             }
         }
         if (!empty($blockids)) {
-            $sql .= ' AND b.bid IN (' . implode(',', $blockids) . ')';
+            $sql .= ' AND b.bid IN ('.implode(',', $blockids).')';
         }
-        $sql .= ' ORDER BY ' . $orderby;
+        $sql .= ' ORDER BY '.$orderby;
         $result = $db->query($sql);
         while (false !== ($myrow = $db->fetchArray($result))) {
             $block              = new XoopsBlock($myrow);
@@ -567,13 +567,13 @@ 
         $db   = XoopsDatabaseFactory::getDatabaseConnection();
         $ret  = array();
         $bids = array();
-        $sql  = 'SELECT DISTINCT(bid) from ' . $db->prefix('newblocks');
+        $sql  = 'SELECT DISTINCT(bid) from '.$db->prefix('newblocks');
         if ($result = $db->query($sql)) {
             while (false !== ($myrow = $db->fetchArray($result))) {
                 $bids[] = $myrow['bid'];
             }
         }
-        $sql     = 'SELECT DISTINCT(p.gperm_itemid) from ' . $db->prefix('group_permission') . ' p, ' . $db->prefix('groups') . " g WHERE g.groupid=p.gperm_groupid AND p.gperm_name='block_read'";
+        $sql     = 'SELECT DISTINCT(p.gperm_itemid) from '.$db->prefix('group_permission').' p, '.$db->prefix('groups')." g WHERE g.groupid=p.gperm_groupid AND p.gperm_name='block_read'";
         $grouped = array();
         if ($result = $db->query($sql)) {
             while (false !== ($myrow = $db->fetchArray($result))) {
@@ -582,14 +582,14 @@ 
         }
         $non_grouped = array_diff($bids, $grouped);
         if (!empty($non_grouped)) {
-            $sql = 'SELECT b.* FROM ' . $db->prefix('newblocks') . ' b, ' . $db->prefix('block_module_link') . ' m WHERE m.block_id=b.bid';
-            $sql .= ' AND b.isactive=' . (int)$isactive;
+            $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid';
+            $sql .= ' AND b.isactive='.(int)$isactive;
             if (isset($visible)) {
-                $sql .= ' AND b.visible=' . (int)$visible;
+                $sql .= ' AND b.visible='.(int)$visible;
             }
             if (!isset($module_id)) {
             } elseif (!empty($module_id)) {
-                $sql .= ' AND m.module_id IN (0,' . (int)$module_id;
+                $sql .= ' AND m.module_id IN (0,'.(int)$module_id;
                 if ($toponlyblock) {
                     $sql .= ',-1';
                 }
@@ -601,12 +601,12 @@ 
                     $sql .= ' AND m.module_id=0';
                 }
             }
-            $sql .= ' AND b.bid IN (' . implode(',', $non_grouped) . ')';
-            $sql .= ' ORDER BY ' . $orderby;
+            $sql .= ' AND b.bid IN ('.implode(',', $non_grouped).')';
+            $sql .= ' ORDER BY '.$orderby;
             $result = $db->query($sql);
             while (false !== ($myrow = $db->fetchArray($result))) {
                 $block              = new XoopsBlock($myrow);
-                $ret[$myrow['bid']] =& $block;
+                $ret[$myrow['bid']] = & $block;
                 unset($block);
             }
         }

htdocs/class/xoopskernel.php

Spacing +9 added lines, -9 removed lines

@@ -32,12 +32,12 @@ 
      */
     public function __construct()
     {
-        $this->paths['XOOPS']   = array(XOOPS_PATH, XOOPS_URL . 'browse.php');
+        $this->paths['XOOPS']   = array(XOOPS_PATH, XOOPS_URL.'browse.php');
         $this->paths['www']     = array(XOOPS_ROOT_PATH, XOOPS_URL);
         $this->paths['var']     = array(XOOPS_VAR_PATH, null);
-        $this->paths['lib']     = array(XOOPS_PATH, XOOPS_URL . 'browse.php');
-        $this->paths['modules'] = array(XOOPS_ROOT_PATH . '/modules', XOOPS_URL . '/modules');
-        $this->paths['themes']  = array(XOOPS_ROOT_PATH . '/themes', XOOPS_URL . '/themes');
+        $this->paths['lib']     = array(XOOPS_PATH, XOOPS_URL.'browse.php');
+        $this->paths['modules'] = array(XOOPS_ROOT_PATH.'/modules', XOOPS_URL.'/modules');
+        $this->paths['themes']  = array(XOOPS_ROOT_PATH.'/themes', XOOPS_URL.'/themes');
     }
 
     /**
@@ -55,13 +55,13 @@ 
             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('/', DS, $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);
     }
 
     /**
@@ -93,9 +93,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;
@@ -167,7 +167,7 @@ 
                 $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
             }
             if (isset($_SERVER['QUERY_STRING'])) {
-                $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+                $_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
             }
         }
     }

htdocs/class/xoopstopic.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 
 $GLOBALS['xoopsLogger']->addDeprecated("'/class/xoopstopic.php' is deprecated since XOOPS 2.5.4, please create your own class instead.");
 
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 
 /**
  * Class XoopsTopic
@@ -84,7 +84,7 @@ 
     public function getTopic($topicid)
     {
         $topicid = (int)$topicid;
-        $sql     = 'SELECT * FROM ' . $this->table . ' WHERE topic_id=' . $topicid . '';
+        $sql     = 'SELECT * FROM '.$this->table.' WHERE topic_id='.$topicid.'';
         $array   = $this->db->fetchArray($this->db->query($sql));
         $this->makeTopic($array);
     }
@@ -126,7 +126,7 @@ 
             $this->topic_pid = 0;
         }
         if (empty($this->topic_id)) {
-            $this->topic_id = $this->db->genId($this->table . '_topic_id_seq');
+            $this->topic_id = $this->db->genId($this->table.'_topic_id_seq');
             $sql            = sprintf("INSERT INTO %s (topic_id, topic_pid, topic_imgurl, topic_title) VALUES (%u, %u, '%s', '%s')", $this->table, $this->topic_id, $this->topic_pid, $imgurl, $title);
         } else {
             $sql = sprintf("UPDATE %s SET topic_pid = %u, topic_imgurl = '%s', topic_title = '%s' WHERE topic_id = %u", $this->table, $this->topic_pid, $imgurl, $title, $this->topic_id);
@@ -376,7 +376,7 @@ 
      */
     public function getTopicsList()
     {
-        $result = $this->db->query('SELECT topic_id, topic_pid, topic_title FROM ' . $this->table);
+        $result = $this->db->query('SELECT topic_id, topic_pid, topic_title FROM '.$this->table);
         $ret    = array();
         $myts   = MyTextSanitizer::getInstance();
         while (false !== ($myrow = $this->db->fetchArray($result))) {
@@ -394,7 +394,7 @@ 
      */
     public function topicExists($pid, $title)
     {
-        $sql = 'SELECT COUNT(*) from ' . $this->table . ' WHERE topic_pid = ' . (int)$pid . " AND topic_title = '" . trim($title) . "'";
+        $sql = 'SELECT COUNT(*) from '.$this->table.' WHERE topic_pid = '.(int)$pid." AND topic_title = '".trim($title)."'";
         $rs  = $this->db->query($sql);
         list($count) = $this->db->fetchRow($rs);
         if ($count > 0) {

htdocs/class/utility/xoopsutility.php

Indentation +2 added lines, -2 removed lines

@@ -59,8 +59,8 @@
         // Method of a class
         if (is_array($handler)) {
             return call_user_func(array(
-                                      $handler[0],
-                                      $handler[1]), $data);
+                                        $handler[0],
+                                        $handler[1]), $data);
         }
 
         return $data;

htdocs/class/userutility.php

Spacing +19 added lines, -19 removed lines

@@ -126,16 +126,16 @@ 
         $stop              = '';
         // Invalid email address
         if (!checkEmail($email)) {
-            $stop .= _US_INVALIDMAIL . '<br>';
+            $stop .= _US_INVALIDMAIL.'<br>';
         }
         if (strrpos($email, ' ') > 0) {
-            $stop .= _US_EMAILNOSPACES . '<br>';
+            $stop .= _US_EMAILNOSPACES.'<br>';
         }
         // Check forbidden email address if current operator is not an administrator
         if (!$xoopsUser_isAdmin) {
             foreach ($xoopsConfigUser['bad_emails'] as $be) {
-                if (!empty($be) && preg_match('/' . $be . '/i', $email)) {
-                    $stop .= _US_INVALIDMAIL . '<br>';
+                if (!empty($be) && preg_match('/'.$be.'/i', $email)) {
+                    $stop .= _US_INVALIDMAIL.'<br>';
                     break;
                 }
             }
@@ -156,19 +156,19 @@ 
                 break;
         }
         if (empty($uname) || preg_match($restriction, $uname)) {
-            $stop .= _US_INVALIDNICKNAME . '<br>';
+            $stop .= _US_INVALIDNICKNAME.'<br>';
         }
         // Check uname settings if current operator is not an administrator
         if (!$xoopsUser_isAdmin) {
             if (strlen($uname) > $xoopsConfigUser['maxuname']) {
-                $stop .= sprintf(_US_NICKNAMETOOLONG, $xoopsConfigUser['maxuname']) . '<br>';
+                $stop .= sprintf(_US_NICKNAMETOOLONG, $xoopsConfigUser['maxuname']).'<br>';
             }
             if (strlen($uname) < $xoopsConfigUser['minuname']) {
-                $stop .= sprintf(_US_NICKNAMETOOSHORT, $xoopsConfigUser['minuname']) . '<br>';
+                $stop .= sprintf(_US_NICKNAMETOOSHORT, $xoopsConfigUser['minuname']).'<br>';
             }
             foreach ($xoopsConfigUser['bad_unames'] as $bu) {
-                if (!empty($bu) && preg_match('/' . $bu . '/i', $uname)) {
-                    $stop .= _US_NAMERESERVED . '<br>';
+                if (!empty($bu) && preg_match('/'.$bu.'/i', $uname)) {
+                    $stop .= _US_NAMERESERVED.'<br>';
                     break;
                 }
             }
@@ -181,17 +181,17 @@ 
         $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
         // Check if uname/email already exists if the user is a new one
         $uid    = is_object($user) ? $user->getVar('uid') : 0;
-        $sql    = 'SELECT COUNT(*) FROM `' . $xoopsDB->prefix('users') . '` WHERE `uname` = ' . $xoopsDB->quote(addslashes($uname)) . (($uid > 0) ? " AND `uid` <> {$uid}" : '');
+        $sql    = 'SELECT COUNT(*) FROM `'.$xoopsDB->prefix('users').'` WHERE `uname` = '.$xoopsDB->quote(addslashes($uname)).(($uid > 0) ? " AND `uid` <> {$uid}" : '');
         $result = $xoopsDB->query($sql);
         list($count) = $xoopsDB->fetchRow($result);
         if ($count > 0) {
-            $stop .= _US_NICKNAMETAKEN . '<br>';
+            $stop .= _US_NICKNAMETAKEN.'<br>';
         }
-        $sql    = 'SELECT COUNT(*) FROM `' . $xoopsDB->prefix('users') . '` WHERE `email` = ' . $xoopsDB->quote(addslashes($email)) . (($uid > 0) ? " AND `uid` <> {$uid}" : '');
+        $sql    = 'SELECT COUNT(*) FROM `'.$xoopsDB->prefix('users').'` WHERE `email` = '.$xoopsDB->quote(addslashes($email)).(($uid > 0) ? " AND `uid` <> {$uid}" : '');
         $result = $xoopsDB->query($sql);
         list($count) = $xoopsDB->fetchRow($result);
         if ($count > 0) {
-            $stop .= _US_EMAILTAKEN . '<br>';
+            $stop .= _US_EMAILTAKEN.'<br>';
         }
         // If password is not set, skip password validation
         if ($pass === null && $vpass === null) {
@@ -199,12 +199,12 @@ 
         }
 
         if (!isset($pass) || $pass == '' || !isset($vpass) || $vpass == '') {
-            $stop .= _US_ENTERPWD . '<br>';
+            $stop .= _US_ENTERPWD.'<br>';
         }
         if (isset($pass) && ($pass != $vpass)) {
-            $stop .= _US_PASSNOTSAME . '<br>';
+            $stop .= _US_PASSNOTSAME.'<br>';
         } elseif (($pass != '') && (strlen($pass) < $xoopsConfigUser['minpass'])) {
-            $stop .= sprintf(_US_PWDTOOSHORT, $xoopsConfigUser['minpass']) . '<br>';
+            $stop .= sprintf(_US_PWDTOOSHORT, $xoopsConfigUser['minpass']).'<br>';
         }
 
         return $stop;
@@ -272,7 +272,7 @@ 
         $users = array();
         if (count($userid) > 0) {
             $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
-            $sql     = 'SELECT uid, uname, name FROM ' . $xoopsDB->prefix('users') . ' WHERE level > 0 AND uid IN(' . implode(',', array_unique($userid)) . ')';
+            $sql     = 'SELECT uid, uname, name FROM '.$xoopsDB->prefix('users').' WHERE level > 0 AND uid IN('.implode(',', array_unique($userid)).')';
             if (!$result = $xoopsDB->query($sql)) {
                 return $users;
             }
@@ -284,7 +284,7 @@ 
                     $users[$uid] = $myts->htmlSpecialChars($row['uname']);
                 }
                 if ($linked) {
-                    $users[$uid] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $uid . '" title="' . $users[$uid] . '">' . $users[$uid] . '</a>';
+                    $users[$uid] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$uid.'" title="'.$users[$uid].'">'.$users[$uid].'</a>';
                 }
             }
         }
@@ -319,7 +319,7 @@ 
                     $username = $user->getVar('uname');
                 }
                 if (!empty($linked)) {
-                    $username = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $userid . '" title="' . $username . '">' . $username . '</a>';
+                    $username = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$userid.'" title="'.$username.'">'.$username.'</a>';
                 }
             }
         }

htdocs/class/tree.php

Spacing +6 added lines, -6 removed lines

@@ -175,11 +175,11 @@ 
     {
         if ($key > 0) {
             $value = $this->tree[$key]['obj']->getVar($this->myId);
-            $ret .= '<option value="' . $value . '"';
+            $ret .= '<option value="'.$value.'"';
             if ($value == $selected) {
                 $ret .= ' selected';
             }
-            $ret .= '>' . $prefix_curr . $this->tree[$key]['obj']->getVar($fieldName) . '</option>';
+            $ret .= '>'.$prefix_curr.$this->tree[$key]['obj']->getVar($fieldName).'</option>';
             $prefix_curr .= $prefix_orig;
         }
         if (isset($this->tree[$key]['child']) && !empty($this->tree[$key]['child'])) {
@@ -215,13 +215,13 @@ 
     ) {
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
         trigger_error("makeSelBox() is deprecated since 2.5.9, please use makeSelectElement(), accessed from {$trace[0]['file']} line {$trace[0]['line']},");
-        $ret = '<select name="' . $name . '" id="' . $name . '" ' . $extra . '>';
+        $ret = '<select name="'.$name.'" id="'.$name.'" '.$extra.'>';
         if (false !== (bool)$addEmptyOption) {
             $ret .= '<option value="0"></option>';
         }
         $this->makeSelBoxOptions($fieldName, $selected, $key, $ret, $prefix);
 
-        return $ret . '</select>';
+        return $ret.'</select>';
     }
 
     /**
@@ -278,7 +278,7 @@ 
     {
         if ($key > 0) {
             $value = $this->tree[$key]['obj']->getVar($this->myId);
-            $name = $prefix_curr . $this->tree[$key]['obj']->getVar($fieldName);
+            $name = $prefix_curr.$this->tree[$key]['obj']->getVar($fieldName);
             $element->addOption($value, $name);
             $prefix_curr .= $prefix_orig;
         }
@@ -308,7 +308,7 @@ 
             return $this->tree;
         }
         trigger_error(
-            'Undefined property: XoopsObjectTree::$' . $name .
+            'Undefined property: XoopsObjectTree::$'.$name.
             " in {$trace[0]['file']} line {$trace[0]['line']}, ",
             E_USER_NOTICE);
         return null;

htdocs/class/cache/file.php

Spacing +7 added lines, -7 removed lines

@@ -102,8 +102,8 @@ 
     public function init($settings = array())
     {
         parent::init($settings);
-        $defaults       = array(
-            'path'      => XOOPS_VAR_PATH . '/caches/xoops_cache',
+        $defaults = array(
+            'path'      => XOOPS_VAR_PATH.'/caches/xoops_cache',
             'extension' => '.php',
             'prefix'    => 'xoops_',
             'lock'      => false,
@@ -112,7 +112,7 @@ 
         $this->settings = array_merge($defaults, $this->settings);
         if (!isset($this->file)) {
             XoopsLoad::load('XoopsFile');
-            $this->file = XoopsFile::getHandler('file', $this->settings['path'] . '/index.html', true);
+            $this->file = XoopsFile::getHandler('file', $this->settings['path'].'/index.html', true);
         }
         $this->settings['path'] = $this->file->folder->cd($this->settings['path']);
         if (empty($this->settings['path'])) {
@@ -169,9 +169,9 @@ 
             } else {
                 $data = serialize($data);
             }
-            $contents = $expires . $lineBreak . $data . $lineBreak;
+            $contents = $expires.$lineBreak.$data.$lineBreak;
         } else {
-            $contents = $expires . $lineBreak . 'return ' . var_export($data, true) . ';' . $lineBreak;
+            $contents = $expires.$lineBreak.'return '.var_export($data, true).';'.$lineBreak;
         }
 
         if ($this->settings['lock']) {
@@ -211,7 +211,7 @@ 
         if (!empty($data) && !empty($this->settings['serialize'])) {
             $data = stripslashes($data);
             // $data = preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", $data);
-            $data = preg_replace_callback('!s:(\d+):"(.*?)";!s', function ($m) { return 's:' . strlen($m[2]) . ':"' . $m[2] . '";'; }, $data);
+            $data = preg_replace_callback('!s:(\d+):"(.*?)";!s', function($m) { return 's:'.strlen($m[2]).':"'.$m[2].'";'; }, $data);
             $data = unserialize($data);
             if (is_array($data)) {
                 XoopsLoad::load('XoopsUtility');
@@ -293,7 +293,7 @@ 
     private function setKey($key)
     {
         $this->file->folder->cd($this->settings['path']);
-        $this->file->name   = $this->settings['prefix'] . $key . $this->settings['extension'];
+        $this->file->name   = $this->settings['prefix'].$key.$this->settings['extension'];
         $this->file->handle = null;
         $this->file->info   = null;
         if (!$this->file->folder->inPath($this->file->pwd(), true)) {

htdocs/class/cache/xcache.php

Spacing +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
                 if (!empty($value)) {
                     $backup[$key] = $value;
                 }
-                $varName       = '__' . $key;
+                $varName       = '__'.$key;
                 $_SERVER[$key] = $this->settings[$varName];
             }
         }

htdocs/class/cache/memcache.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
             return false;
         }
         parent::init($settings);
-        $defaults       = array(
+        $defaults = array(
             'servers'  => array(
                 '127.0.0.1'),
             'compress' => false);