geekwright / XoopsCore

htdocs/class/database/manager.php

Indentation +1 added lines, -1 removed lines

@@ -330,7 +330,7 @@
      * Checks to see if table exists
      *
      * @param string $table name of database table looking for
-      *
+     *
      * @return bool true if exists or false if doesnt
      */
     public function tableExists($table)

Spacing +11 added lines, -11 removed lines

@@ -104,7 +104,7 @@ 
     {
         $this->db->connect(false);
 
-        $result = $this->db->query("CREATE DATABASE " . \XoopsBaseConfig::get('db-name'));
+        $result = $this->db->query("CREATE DATABASE ".\XoopsBaseConfig::get('db-name'));
 
         return ($result != false) ? true : false;
     }
@@ -171,7 +171,7 @@ 
                             }
                         } else {
                             if ($prefixed_query[1] === 'DROP TABLE') {
-                                if ($this->db->$queryFunc('DROP TABLE ' . $table) != false) {
+                                if ($this->db->$queryFunc('DROP TABLE '.$table) != false) {
                                     if (!isset($this->s_tables['drop'][$table])) {
                                         $this->s_tables['drop'][$table] = 1;
                                     }
@@ -275,7 +275,7 @@ 
     {
         $this->db->connect();
         $table = $this->db->prefix($table);
-        $query = 'INSERT INTO ' . $table . ' ' . $query;
+        $query = 'INSERT INTO '.$table.' '.$query;
         if (!$this->db->queryF($query)) {
             if (!isset($this->f_tables['insert'][$table])) {
                 $this->f_tables['insert'][$table] = 1;
@@ -319,7 +319,7 @@ 
         $this->db->connect();
         foreach ($tables as $key => $val) {
             //was: if (!$this->db->query("DROP TABLE " . $this->db->prefix($key))) {
-            if (!$this->db->query("DROP TABLE " . $this->db->prefix($val))) {
+            if (!$this->db->query("DROP TABLE ".$this->db->prefix($val))) {
                 $deleted[] = $val;
             }
         }
@@ -339,7 +339,7 @@ 
         $ret = false;
         if ($table != '') {
             $this->db->connect();
-            $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix($table);
+            $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix($table);
             $ret = (false != $this->db->query($sql)) ? true : false;
         }
         return $ret;
@@ -362,22 +362,22 @@ 
         $nTableName,
         $dropTable = false
     ) {
-        $sql = "SHOW COLUMNS FROM " . $this->db->prefix($oTableName);
+        $sql = "SHOW COLUMNS FROM ".$this->db->prefix($oTableName);
         $result = $this->db->queryF($sql);
         if (($rows = $this->db->getRowsNum($result)) == count($fieldsMap)) {
-            $sql = "SELECT * FROM " . $this->db->prefix($oTableName);
+            $sql = "SELECT * FROM ".$this->db->prefix($oTableName);
             $result = $this->db->queryF($sql);
             while (false !== ($myrow = $this->db->fetchArray($result))) {
                 ksort($fieldsMap);
                 ksort($myrow);
-                $sql = "INSERT INTO `" . $this->db->prefix($nTableName)
-                    . "` " . "(`" . implode("`,`", $fieldsMap) . "`)" .
-                    " VALUES ('" . implode("','", $myrow) . "')";
+                $sql = "INSERT INTO `".$this->db->prefix($nTableName)
+                    . "` "."(`".implode("`,`", $fieldsMap)."`)".
+                    " VALUES ('".implode("','", $myrow)."')";
 
                 $this->db->queryF($sql);
             }
             if ($dropTable) {
-                $sql = "DROP TABLE " . $this->db->prefix($oTableName);
+                $sql = "DROP TABLE ".$this->db->prefix($oTableName);
                 $this->db->queryF($sql);
             }
         }

htdocs/class/database/mysqldatabase.php

Spacing +16 added lines, -16 removed lines

@@ -70,7 +70,7 @@ 
             $frame = $stack[1];
             Xoops::getInstance()->deprecated(
                 'Legacy XoopsDB is deprecated since 2.6.0; all calls should be using Doctrine through $xoops->db(). '
-                . 'Called from ' . $frame['function'] . '() in ' . $frame['file'] . ' line '. $frame['line']
+                . 'Called from '.$frame['function'].'() in '.$frame['file'].' line '.$frame['line']
             );
         }
     }
@@ -342,14 +342,14 @@ 
             if (empty($start)) {
                 $start = 0;
             }
-            $sql = $sql . ' LIMIT ' . (int) $start . ', ' . (int) $limit;
+            $sql = $sql.' LIMIT '.(int)$start.', '.(int)$limit;
         }
         $events = \Xoops::getInstance()->events();
         $events->triggerEvent('core.database.query.start');
         try {
             $result = $this->conn->query($sql);
         } catch (Exception $e) {
-            $result=false;
+            $result = false;
         }
         $this->lastResult = $result;
         $events->triggerEvent('core.database.query.end');
@@ -451,19 +451,19 @@ 
             $t = $temp['native_type'];
 
             $temp = (string)(
-                ((($t === 'STRING') || ($t === 'VAR_STRING') ) ? 'string' : '' ) .
-                ( (in_array($t, array('TINY', 'SHORT', 'LONG', 'LONGLONG', 'INT24'))) ? 'int' : '' ) .
-                ( (in_array($t, array('FLOAT', 'DOUBLE', 'DECIMAL', 'NEWDECIMAL'))) ? 'real' : '' ) .
-                ( ($t === 'TIMESTAMP') ? 'timestamp' : '' ) .
-                ( ($t === 'YEAR') ? 'year' : '') .
-                ( (($t === 'DATE') || ($t === 'NEWDATE') ) ? 'date' : '' ) .
-                ( ($t === 'TIME') ? 'time' : '' ) .
-                ( ($t === 'SET') ? 'set' : '' ) .
-                ( ($t === 'ENUM') ? 'enum' : '' ) .
-                ( ($t === 'GEOMETRY') ? 'geometry' : '' ) .
-                ( ($t === 'DATETIME') ? 'datetime' : '' ) .
-                ( (in_array($t, array('TINY_BLOB', 'BLOB', 'MEDIUM_BLOB', 'LONG_BLOB' ))) ? 'blob' : '' ) .
-                ( ($t === 'NULL') ? 'null' : '' )
+                ((($t === 'STRING') || ($t === 'VAR_STRING')) ? 'string' : '').
+                ((in_array($t, array('TINY', 'SHORT', 'LONG', 'LONGLONG', 'INT24'))) ? 'int' : '').
+                ((in_array($t, array('FLOAT', 'DOUBLE', 'DECIMAL', 'NEWDECIMAL'))) ? 'real' : '').
+                (($t === 'TIMESTAMP') ? 'timestamp' : '').
+                (($t === 'YEAR') ? 'year' : '').
+                ((($t === 'DATE') || ($t === 'NEWDATE')) ? 'date' : '').
+                (($t === 'TIME') ? 'time' : '').
+                (($t === 'SET') ? 'set' : '').
+                (($t === 'ENUM') ? 'enum' : '').
+                (($t === 'GEOMETRY') ? 'geometry' : '').
+                (($t === 'DATETIME') ? 'datetime' : '').
+                ((in_array($t, array('TINY_BLOB', 'BLOB', 'MEDIUM_BLOB', 'LONG_BLOB'))) ? 'blob' : '').
+                (($t === 'NULL') ? 'null' : '')
             );
             return $temp;
         } catch (PDOException $e) {

htdocs/class/database/databasefactory.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     {
         static $legacy;
 
-        $file = \XoopsBaseConfig::get('root-path') . '/class/database/mysqldatabase.php';
+        $file = \XoopsBaseConfig::get('root-path').'/class/database/mysqldatabase.php';
         if (!isset($legacy) && file_exists($file)) {
             require_once $file;
             if (!defined('XOOPS_DB_PROXY')) {

htdocs/class/database/sqlutility.php

Spacing +5 added lines, -5 removed lines

@@ -92,14 +92,14 @@ 
                         $in_string = true;
                         $string_start = $char;
                     } else {
-                        if ($char === '#' || ($char === ' ' && $i > 1 && $sql[$i - 2] . $sql[$i - 1] == '--')) {
+                        if ($char === '#' || ($char === ' ' && $i > 1 && $sql[$i - 2].$sql[$i - 1] == '--')) {
                             $start_of_comment = (($sql[$i] === '#') ? $i : $i - 2);
-                            $end_of_comment = (strpos(' ' . $sql, "\012", $i + 2)) ? strpos(' ' . $sql, "\012", $i + 2)
-                                : strpos(' ' . $sql, "\015", $i + 2);
+                            $end_of_comment = (strpos(' '.$sql, "\012", $i + 2)) ? strpos(' '.$sql, "\012", $i + 2)
+                                : strpos(' '.$sql, "\015", $i + 2);
                             if (!$end_of_comment) {
                                 return true;
                             } else {
-                                $sql = substr($sql, 0, $start_of_comment) . ltrim(substr($sql, $end_of_comment));
+                                $sql = substr($sql, 0, $start_of_comment).ltrim(substr($sql, $end_of_comment));
                                 $sql_len = strlen($sql);
                                 $i--;
                             }
@@ -130,7 +130,7 @@ 
         if (preg_match($pattern, $query, $matches)
             || preg_match($pattern2, $query, $matches)
         ) {
-            $replace = "\\1 " . $prefix . "_\\4\\5";
+            $replace = "\\1 ".$prefix."_\\4\\5";
             $matches[0] = preg_replace($pattern, $replace, $query);
             return $matches;
         }

htdocs/class/utility/xoopsutility.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     {
         if (is_array($data)) {
             $return = array_map(array('XoopsUtility', 'recursive'),
-				array_fill(0, count($data), $handler), $data);
+                array_fill(0, count($data), $handler), $data);
             return $return;
         }
         // single function

htdocs/class/xoopsload.php

Spacing +148 added lines, -148 removed lines

@@ -117,15 +117,15 @@ 
             }
 
             return true;
-        } elseif (self::fileExists($file = \XoopsBaseConfig::get('root-path') . '/class/' . $name . '.php')) {
+        } elseif (self::fileExists($file = \XoopsBaseConfig::get('root-path').'/class/'.$name.'.php')) {
             //attempt loading from file
             include_once $file;
-            $class = 'Xoops' . ucfirst($name);
+            $class = 'Xoops'.ucfirst($name);
             if (class_exists($class)) {
                 return $class;
             } else {
                 trigger_error(
-                    'Class ' . $name . ' not found in file ' . __FILE__ . 'at line ' . __LINE__,
+                    'Class '.$name.' not found in file '.__FILE__.'at line '.__LINE__,
                     E_USER_WARNING
                 );
             }
@@ -143,7 +143,7 @@ 
      */
     private static function loadFramework($name)
     {
-        if (!self::fileExists($file = \XoopsBaseConfig::get('root-path') . '/Frameworks/' . $name . '/xoops' . $name . '.php')) {
+        if (!self::fileExists($file = \XoopsBaseConfig::get('root-path').'/Frameworks/'.$name.'/xoops'.$name.'.php')) {
             /*
             trigger_error(
                 'File ' . str_replace(\XoopsBaseConfig::get('root-path'), '', $file)
@@ -154,7 +154,7 @@ 
             return false;
         }
         include_once $file;
-        $class = 'Xoops' . ucfirst($name);
+        $class = 'Xoops'.ucfirst($name);
         if (class_exists($class, false)) {
             return $class;
         }
@@ -175,9 +175,9 @@ 
         if (empty($dirname)) {
             return false;
         }
-        if (self::fileExists($file = \XoopsBaseConfig::get('root-path') . '/modules/' . $dirname . '/class/' . $name . '.php')) {
+        if (self::fileExists($file = \XoopsBaseConfig::get('root-path').'/modules/'.$dirname.'/class/'.$name.'.php')) {
             include_once $file;
-            if (class_exists(ucfirst($dirname) . ucfirst($name))) {
+            if (class_exists(ucfirst($dirname).ucfirst($name))) {
                 return true;
             }
         }
@@ -195,50 +195,50 @@ 
     {
         $xoops_root_path = \XoopsBaseConfig::get('root-path');
         return array(
-            'bloggerapi' => $xoops_root_path . '/class/xml/rpc/bloggerapi.php',
-            'criteria' => $xoops_root_path . '/class/criteria.php',
-            'criteriacompo' => $xoops_root_path . '/class/criteria.php',
-            'criteriaelement' => $xoops_root_path . '/class/criteria.php',
-            'formdhtmltextarea' => $xoops_root_path . '/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
-            'formtextarea' => $xoops_root_path . '/class/xoopseditor/textarea/textarea.php',
-            'htmlawed' => $xoops_root_path . '/class/vendor/htmLawed.php',
-            'metaweblogapi' => $xoops_root_path . '/class/xml/rpc/metaweblogapi.php',
-            'movabletypeapi' => $xoops_root_path . '/class/xml/rpc/movabletypeapi.php',
-            'mytextsanitizer' => $xoops_root_path . '/class/module.textsanitizer.php',
+            'bloggerapi' => $xoops_root_path.'/class/xml/rpc/bloggerapi.php',
+            'criteria' => $xoops_root_path.'/class/criteria.php',
+            'criteriacompo' => $xoops_root_path.'/class/criteria.php',
+            'criteriaelement' => $xoops_root_path.'/class/criteria.php',
+            'formdhtmltextarea' => $xoops_root_path.'/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
+            'formtextarea' => $xoops_root_path.'/class/xoopseditor/textarea/textarea.php',
+            'htmlawed' => $xoops_root_path.'/class/vendor/htmLawed.php',
+            'metaweblogapi' => $xoops_root_path.'/class/xml/rpc/metaweblogapi.php',
+            'movabletypeapi' => $xoops_root_path.'/class/xml/rpc/movabletypeapi.php',
+            'mytextsanitizer' => $xoops_root_path.'/class/module.textsanitizer.php',
             //'mytextsanitizerextension' => $xoops_root_path . '/class/module.textsanitizer.php',
             //'phpmailer' => $xoops_root_path . '/class/mail/phpmailer/class.phpmailer.php',
-            'rssauthorhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsscategoryhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsscommentshandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsscopyrighthandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssdescriptionhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssdocshandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssgeneratorhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssguidhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssheighthandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssimagehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssitemhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsslanguagehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsslastbuilddatehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsslinkhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssmanagingeditorhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssnamehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsspubdatehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsssourcehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsstextinputhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsstitlehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssttlhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rssurlhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsswebmasterhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'rsswidthhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'saxparser' => $xoops_root_path . '/class/xml/saxparser.php',
+            'rssauthorhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsscategoryhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsscommentshandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsscopyrighthandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssdescriptionhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssdocshandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssgeneratorhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssguidhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssheighthandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssimagehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssitemhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsslanguagehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsslastbuilddatehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsslinkhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssmanagingeditorhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssnamehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsspubdatehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsssourcehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsstextinputhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsstitlehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssttlhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rssurlhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsswebmasterhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'rsswidthhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'saxparser' => $xoops_root_path.'/class/xml/saxparser.php',
             //'smarty' => $xoops_root_path . '/smarty/Smarty.class.php',
-            'snoopy' => $xoops_root_path . '/class/vendor/snoopy.php',
-            'sqlutility' => $xoops_root_path . '/class/database/sqlutility.php',
-            'tar' => $xoops_root_path . '/class/class.tar.php',
-            'xmltaghandler' => $xoops_root_path . '/class/xml/xmltaghandler.php',
-            'xoopsadminthemefactory' => $xoops_root_path . '/class/theme.php',
-            'xoopsapi' => $xoops_root_path . '/class/xml/rpc/xoopsapi.php',
+            'snoopy' => $xoops_root_path.'/class/vendor/snoopy.php',
+            'sqlutility' => $xoops_root_path.'/class/database/sqlutility.php',
+            'tar' => $xoops_root_path.'/class/class.tar.php',
+            'xmltaghandler' => $xoops_root_path.'/class/xml/xmltaghandler.php',
+            'xoopsadminthemefactory' => $xoops_root_path.'/class/theme.php',
+            'xoopsapi' => $xoops_root_path.'/class/xml/rpc/xoopsapi.php',
             //'xoopsauth' => $xoops_root_path . '/class/auth/auth.php',
             //'xoopsauthfactory' => $xoops_root_path . '/class/auth/authfactory.php',
             //'xoopsauthads' => $xoops_root_path . '/class/auth/auth_ads.php',
@@ -255,12 +255,12 @@ 
             //'xoopsblockmodulelink' => $xoops_root_path . '/kernel/blockmodulelink.php',
             //'xoopsblockmodulelinkhandler' => $xoops_root_path . '/kernel/blockmodulelink.php',
             //'xoopscalendar' => $xoops_root_path . '/class/calendar/xoopscalendar.php',
-            'xoopscaptcha' => $xoops_root_path . '/class/captcha/xoopscaptcha.php',
-            'xoopscaptchamethod' => $xoops_root_path . '/class/captcha/xoopscaptchamethod.php',
-            'xoopscaptchaimage' => $xoops_root_path . '/class/captcha/image.php',
-            'xoopscaptcharecaptcha' => $xoops_root_path . '/class/captcha/recaptcha.php',
-            'xoopscaptchatext' => $xoops_root_path . '/class/captcha/text.php',
-            'xoopscaptchaimagehandler' => $xoops_root_path . '/class/captcha/image/scripts/imageclass.php',
+            'xoopscaptcha' => $xoops_root_path.'/class/captcha/xoopscaptcha.php',
+            'xoopscaptchamethod' => $xoops_root_path.'/class/captcha/xoopscaptchamethod.php',
+            'xoopscaptchaimage' => $xoops_root_path.'/class/captcha/image.php',
+            'xoopscaptcharecaptcha' => $xoops_root_path.'/class/captcha/recaptcha.php',
+            'xoopscaptchatext' => $xoops_root_path.'/class/captcha/text.php',
+            'xoopscaptchaimagehandler' => $xoops_root_path.'/class/captcha/image/scripts/imageclass.php',
             //'xoopscomment' => $xoops_root_path . '/kernel/comment.php',
             //'xoopscommenthandler' => $xoops_root_path . '/kernel/comment.php',
             //'xoopscommentrenderer' => $xoops_root_path . '/class/commentrenderer.php',
@@ -271,15 +271,15 @@ 
             //'xoopsconfigitemhandler' => $xoops_root_path . '/kernel/configitem.php',
             //'xoopsconfigoption' => $xoops_root_path . '/kernel/configoption.php',
             //'xoopsconfigoptionhandler' => $xoops_root_path . '/kernel/configoption.php',
-            'xoopsdatabase' => $xoops_root_path . '/class/database/database.php',
+            'xoopsdatabase' => $xoops_root_path.'/class/database/database.php',
             //'xoopsconnection' => $xoops_root_path . '/class/database/connection.php',
             //'xoopsquerybuilder' => $xoops_root_path . '/class/database/querybuilder.php',
-            'xoopsdatabasefactory' => $xoops_root_path . '/class/database/databasefactory.php',
-            'xoopsdatabasemanager' => $xoops_root_path . '/class/database/manager.php',
-            'xoopsdownloader' => $xoops_root_path . '/class/downloader.php',
-            'xoopsmysqldatabase' => $xoops_root_path . '/class/database/mysqldatabase.php',
-            'xoopsmysqldatabaseproxy' => $xoops_root_path . '/class/database/mysqldatabaseproxy.php',
-            'xoopsmysqldatabasesafe' => $xoops_root_path . '/class/database/mysqldatabasesafe.php',
+            'xoopsdatabasefactory' => $xoops_root_path.'/class/database/databasefactory.php',
+            'xoopsdatabasemanager' => $xoops_root_path.'/class/database/manager.php',
+            'xoopsdownloader' => $xoops_root_path.'/class/downloader.php',
+            'xoopsmysqldatabase' => $xoops_root_path.'/class/database/mysqldatabase.php',
+            'xoopsmysqldatabaseproxy' => $xoops_root_path.'/class/database/mysqldatabaseproxy.php',
+            'xoopsmysqldatabasesafe' => $xoops_root_path.'/class/database/mysqldatabasesafe.php',
             //'xoopsgroup' => $xoops_root_path . '/kernel/group.php',
             //'xoopsgrouphandler' => $xoops_root_path . '/kernel/group.php',
             //'xoopsgroupperm' => $xoops_root_path . '/kernel/groupperm.php',
@@ -292,61 +292,61 @@ 
             //'xoopsimagesethandler' => $xoops_root_path . '/kernel/imageset.php',
             //'xoopsimagesetimg' => $xoops_root_path . '/kernel/imagesetimg.php',
             //'xoopsimagesetimghandler' => $xoops_root_path . '/kernel/imagesetimg.php',
-            'xoopslists' => $xoops_root_path . '/class/xoopslists.php',
+            'xoopslists' => $xoops_root_path.'/class/xoopslists.php',
             //'xoopslocal' => $xoops_root_path . '/include/xoopslocal.php',
-            'xoopslocalabstract' => $xoops_root_path . '/class/xoopslocal.php',
-            'xoopslogger' => $xoops_root_path . '/class/logger/xoopslogger.php',
-            'xoopseditor' => $xoops_root_path . '/class/xoopseditor/xoopseditor.php',
-            'xoopseditorhandler' => $xoops_root_path . '/class/xoopseditor/xoopseditor.php',
-            'xoopsfile' => $xoops_root_path . '/class/file/xoopsfile.php',
-            'xoopsfilehandler' => $xoops_root_path . '/class/file/file.php',
-            'xoopsfilterinput' => $xoops_root_path . '/class/xoopsfilterinput.php',
-            'xoopsfolderhandler' => $xoops_root_path . '/class/file/folder.php',
-            'xoopsform' => $xoops_root_path . '/class/xoopsform/form.php',
-            'xoopsformbutton' => $xoops_root_path . '/class/xoopsform/formbutton.php',
-            'xoopsformbuttontray' => $xoops_root_path . '/class/xoopsform/formbuttontray.php',
+            'xoopslocalabstract' => $xoops_root_path.'/class/xoopslocal.php',
+            'xoopslogger' => $xoops_root_path.'/class/logger/xoopslogger.php',
+            'xoopseditor' => $xoops_root_path.'/class/xoopseditor/xoopseditor.php',
+            'xoopseditorhandler' => $xoops_root_path.'/class/xoopseditor/xoopseditor.php',
+            'xoopsfile' => $xoops_root_path.'/class/file/xoopsfile.php',
+            'xoopsfilehandler' => $xoops_root_path.'/class/file/file.php',
+            'xoopsfilterinput' => $xoops_root_path.'/class/xoopsfilterinput.php',
+            'xoopsfolderhandler' => $xoops_root_path.'/class/file/folder.php',
+            'xoopsform' => $xoops_root_path.'/class/xoopsform/form.php',
+            'xoopsformbutton' => $xoops_root_path.'/class/xoopsform/formbutton.php',
+            'xoopsformbuttontray' => $xoops_root_path.'/class/xoopsform/formbuttontray.php',
             //'xoopsformcalendar' => $xoops_root_path . '/class/xoopsform/formcalendar.php',
-            'xoopsformcaptcha' => $xoops_root_path . '/class/xoopsform/formcaptcha.php',
-            'xoopsformcheckbox' => $xoops_root_path . '/class/xoopsform/formcheckbox.php',
-            'xoopsformcolorpicker' => $xoops_root_path . '/class/xoopsform/formcolorpicker.php',
+            'xoopsformcaptcha' => $xoops_root_path.'/class/xoopsform/formcaptcha.php',
+            'xoopsformcheckbox' => $xoops_root_path.'/class/xoopsform/formcheckbox.php',
+            'xoopsformcolorpicker' => $xoops_root_path.'/class/xoopsform/formcolorpicker.php',
             //'xoopsformcontainer' => $xoops_root_path . '/class/xoopsform/formcontainer.php',
-            'xoopsformdatetime' => $xoops_root_path . '/class/xoopsform/formdatetime.php',
-            'xoopsformdhtmltextarea' => $xoops_root_path . '/class/xoopsform/formdhtmltextarea.php',
-            'xoopsformeditor' => $xoops_root_path . '/class/xoopsform/formeditor.php',
-            'xoopsformelement' => $xoops_root_path . '/class/xoopsform/formelement.php',
-            'xoopsformelementtray' => $xoops_root_path . '/class/xoopsform/formelementtray.php',
-            'xoopsformfile' => $xoops_root_path . '/class/xoopsform/formfile.php',
-            'xoopsformhidden' => $xoops_root_path . '/class/xoopsform/formhidden.php',
-            'xoopsformhiddentoken' => $xoops_root_path . '/class/xoopsform/formhiddentoken.php',
-            'xoopsformlabel' => $xoops_root_path . '/class/xoopsform/formlabel.php',
-            'xoopsformloader' => $xoops_root_path . '/class/xoopsformloader.php',
-            'xoopsformpassword' => $xoops_root_path . '/class/xoopsform/formpassword.php',
-            'xoopsformradio' => $xoops_root_path . '/class/xoopsform/formradio.php',
-            'xoopsformradioyn' => $xoops_root_path . '/class/xoopsform/formradioyn.php',
+            'xoopsformdatetime' => $xoops_root_path.'/class/xoopsform/formdatetime.php',
+            'xoopsformdhtmltextarea' => $xoops_root_path.'/class/xoopsform/formdhtmltextarea.php',
+            'xoopsformeditor' => $xoops_root_path.'/class/xoopsform/formeditor.php',
+            'xoopsformelement' => $xoops_root_path.'/class/xoopsform/formelement.php',
+            'xoopsformelementtray' => $xoops_root_path.'/class/xoopsform/formelementtray.php',
+            'xoopsformfile' => $xoops_root_path.'/class/xoopsform/formfile.php',
+            'xoopsformhidden' => $xoops_root_path.'/class/xoopsform/formhidden.php',
+            'xoopsformhiddentoken' => $xoops_root_path.'/class/xoopsform/formhiddentoken.php',
+            'xoopsformlabel' => $xoops_root_path.'/class/xoopsform/formlabel.php',
+            'xoopsformloader' => $xoops_root_path.'/class/xoopsformloader.php',
+            'xoopsformpassword' => $xoops_root_path.'/class/xoopsform/formpassword.php',
+            'xoopsformradio' => $xoops_root_path.'/class/xoopsform/formradio.php',
+            'xoopsformradioyn' => $xoops_root_path.'/class/xoopsform/formradioyn.php',
             //'xoopsformraw' => $xoops_root_path . '/class/xoopsform/formraw.php',
-            'xoopsformselect' => $xoops_root_path . '/class/xoopsform/formselect.php',
-            'xoopsformselectcheckgroup' => $xoops_root_path . '/class/xoopsform/formselectcheckgroup.php',
-            'xoopsformselectcountry' => $xoops_root_path . '/class/xoopsform/formselectcountry.php',
-            'xoopsformselecteditor' => $xoops_root_path . '/class/xoopsform/formselecteditor.php',
-            'xoopsformselectgroup' => $xoops_root_path . '/class/xoopsform/formselectgroup.php',
-            'xoopsformselectlang' => $xoops_root_path . '/class/xoopsform/formselectlang.php',
+            'xoopsformselect' => $xoops_root_path.'/class/xoopsform/formselect.php',
+            'xoopsformselectcheckgroup' => $xoops_root_path.'/class/xoopsform/formselectcheckgroup.php',
+            'xoopsformselectcountry' => $xoops_root_path.'/class/xoopsform/formselectcountry.php',
+            'xoopsformselecteditor' => $xoops_root_path.'/class/xoopsform/formselecteditor.php',
+            'xoopsformselectgroup' => $xoops_root_path.'/class/xoopsform/formselectgroup.php',
+            'xoopsformselectlang' => $xoops_root_path.'/class/xoopsform/formselectlang.php',
             //'xoopsformselectlocale' => $xoops_root_path . '/class/xoopsform/formselectlocale.php',
-            'xoopsformselectmatchoption' => $xoops_root_path . '/class/xoopsform/formselectmatchoption.php',
-            'xoopsformselecttheme' => $xoops_root_path . '/class/xoopsform/formselecttheme.php',
-            'xoopsformselecttimezone' => $xoops_root_path . '/class/xoopsform/formselecttimezone.php',
-            'xoopsformselectuser' => $xoops_root_path . '/class/xoopsform/formselectuser.php',
+            'xoopsformselectmatchoption' => $xoops_root_path.'/class/xoopsform/formselectmatchoption.php',
+            'xoopsformselecttheme' => $xoops_root_path.'/class/xoopsform/formselecttheme.php',
+            'xoopsformselecttimezone' => $xoops_root_path.'/class/xoopsform/formselecttimezone.php',
+            'xoopsformselectuser' => $xoops_root_path.'/class/xoopsform/formselectuser.php',
             //'xoopsformtab' => $xoops_root_path . '/class/xoopsform/formtab.php',
             //'xoopsformtabtray' => $xoops_root_path . '/class/xoopsform/formtabtray.php',
-            'xoopsformtext' => $xoops_root_path . '/class/xoopsform/formtext.php',
-            'xoopsformtextarea' => $xoops_root_path . '/class/xoopsform/formtextarea.php',
-            'xoopsformtextdateselect' => $xoops_root_path . '/class/xoopsform/formtextdateselect.php',
+            'xoopsformtext' => $xoops_root_path.'/class/xoopsform/formtext.php',
+            'xoopsformtextarea' => $xoops_root_path.'/class/xoopsform/formtextarea.php',
+            'xoopsformtextdateselect' => $xoops_root_path.'/class/xoopsform/formtextdateselect.php',
             //'xoopsformmail' => $xoops_root_path . '/class/xoopsform/formmail.php',
             //'xoopsformurl' => $xoops_root_path . '/class/xoopsform/formurl.php',
-            'xoopsgroupformcheckbox' => $xoops_root_path . '/class/xoopsform/grouppermform.php',
-            'xoopsgrouppermform' => $xoops_root_path . '/class/xoopsform/grouppermform.php',
+            'xoopsgroupformcheckbox' => $xoops_root_path.'/class/xoopsform/grouppermform.php',
+            'xoopsgrouppermform' => $xoops_root_path.'/class/xoopsform/grouppermform.php',
             //'xoopsguestuser' => $xoops_root_path . '/kernel/user.php',
-            'xoopsmailer' => $xoops_root_path . '/class/xoopsmailer.php',
-            'xoopsmediauploader' => $xoops_root_path . '/class/uploader.php',
+            'xoopsmailer' => $xoops_root_path.'/class/xoopsmailer.php',
+            'xoopsmediauploader' => $xoops_root_path.'/class/uploader.php',
             //'xoopsmemberhandler' => $xoops_root_path . '/kernel/member.php',
             //'xoopsmembership' => $xoops_root_path . '/kernel/membership.php',
             //'xoopsmembershiphandler' => $xoops_root_path . '/kernel/membership.php',
@@ -354,35 +354,35 @@ 
             //'xoopsmoduleadmin' => $xoops_root_path . '/class/moduleadmin.php',
             //'xoopsmodule' => $xoops_root_path . '/kernel/module.php',
             //'xoopsmodulehandler' => $xoops_root_path . '/kernel/module.php',
-            'xoopsmultimailer' => $xoops_root_path . '/class/xoopsmultimailer.php',
+            'xoopsmultimailer' => $xoops_root_path.'/class/xoopsmultimailer.php',
             //'xoopsnotification' => $xoops_root_path . '/kernel/notification.php',
             //'xoopsnotificationhandler' => $xoops_root_path . '/kernel/notification.php',
-            'xoopsobject' => $xoops_root_path . '/kernel/object.php',
-            'xoopsobjecthandler' => $xoops_root_path . '/kernel/object.php',
-            'xoopsobjecttree' => $xoops_root_path . '/class/tree.php',
+            'xoopsobject' => $xoops_root_path.'/kernel/object.php',
+            'xoopsobjecthandler' => $xoops_root_path.'/kernel/object.php',
+            'xoopsobjecttree' => $xoops_root_path.'/class/tree.php',
             //'xoopsonline' => $xoops_root_path . '/kernel/online.php',
             //'xoopsonlinehandler' => $xoops_root_path . '/kernel/online.php',
-            'xoopspagenav' => $xoops_root_path . '/class/pagenav.php',
-            'xoopspersistableobjecthandler' => $xoops_root_path . '/kernel/object.php',
-            'xoopspreload' => $xoops_root_path . '/class/preload.php',
-            'xoopspreloaditem' => $xoops_root_path . '/class/preload.php',
+            'xoopspagenav' => $xoops_root_path.'/class/pagenav.php',
+            'xoopspersistableobjecthandler' => $xoops_root_path.'/kernel/object.php',
+            'xoopspreload' => $xoops_root_path.'/class/preload.php',
+            'xoopspreloaditem' => $xoops_root_path.'/class/preload.php',
             //'xoopsprivmessage' => $xoops_root_path . '/kernel/privmessage.php',
             //'xoopsprivmessagehandler' => $xoops_root_path . '/kernel/privmessage.php',
             //'xoopsranks' => $xoops_root_path . '/kernel/ranks.php',
             //'xoopsrankshandler' => $xoops_root_path . '/kernel/ranks.php',
             // 'xoopsregistry' => $xoops_root_path . '/class/registry.php',
-            'xoopsrequest' => $xoops_root_path . '/class/xoopsrequest.php',
+            'xoopsrequest' => $xoops_root_path.'/class/xoopsrequest.php',
             // 'xoopssecurity' => $xoops_root_path . '/class/xoopssecurity.php',
             // 'xoopssessionhandler' => $xoops_root_path . '/kernel/session.php',
-            'xoopssimpleform' => $xoops_root_path . '/class/xoopsform/simpleform.php',
-            'xoopstableform' => $xoops_root_path . '/class/xoopsform/tableform.php',
-            'xoopstardownloader' => $xoops_root_path . '/class/tardownloader.php',
-            'xoopstheme' => $xoops_root_path . '/class/theme.php',
-            'xoopsthemeblocksplugin' => $xoops_root_path . '/class/theme_blocks.php',
-            'xoopsthemefactory' => $xoops_root_path . '/class/theme.php',
-            'xoopsthemeform' => $xoops_root_path . '/class/xoopsform/themeform.php',
-            'xoopsthemeplugin' => $xoops_root_path . '/class/theme.php',
-            'xoopsthemesetparser' => $xoops_root_path . '/class/xml/themesetparser.php',
+            'xoopssimpleform' => $xoops_root_path.'/class/xoopsform/simpleform.php',
+            'xoopstableform' => $xoops_root_path.'/class/xoopsform/tableform.php',
+            'xoopstardownloader' => $xoops_root_path.'/class/tardownloader.php',
+            'xoopstheme' => $xoops_root_path.'/class/theme.php',
+            'xoopsthemeblocksplugin' => $xoops_root_path.'/class/theme_blocks.php',
+            'xoopsthemefactory' => $xoops_root_path.'/class/theme.php',
+            'xoopsthemeform' => $xoops_root_path.'/class/xoopsform/themeform.php',
+            'xoopsthemeplugin' => $xoops_root_path.'/class/theme.php',
+            'xoopsthemesetparser' => $xoops_root_path.'/class/xml/themesetparser.php',
             //'xoopstpl' => $xoops_root_path . '/class/template.php',
             //'xoopstplfile' => $xoops_root_path . '/kernel/tplfile.php',
             //'xoopstplfilehandler' => $xoops_root_path . '/kernel/tplfile.php',
@@ -390,26 +390,26 @@ 
             //'xoopstplsethandler' => $xoops_root_path . '/kernel/tplset.php',
             //'xoopsuser' => $xoops_root_path . '/kernel/user.php',
             //'xoopsuserhandler' => $xoops_root_path . '/kernel/user.php',
-            'xoopsuserutility' => $xoops_root_path . '/class/userutility.php',
-            'xoopsutility' => $xoops_root_path . '/class/utility/xoopsutility.php',
-            'xoopsxmlrpcapi' => $xoops_root_path . '/class/xml/rpc/xmlrpcapi.php',
-            'xoopsxmlrpcarray' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcbase64'=> $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcboolean' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcdatetime' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcdocument' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcdouble' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcfault' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcint' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcparser' => $xoops_root_path . '/class/xml/rpc/xmlrpcparser.php',
-            'xoopsxmlrpcrequest' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcresponse' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcstring' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpcstruct' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrpctag' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php',
-            'xoopsxmlrss2parser' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php',
-            'xoopszipdownloader' => $xoops_root_path . '/class/zipdownloader.php',
-            'zipfile' => $xoops_root_path . '/class/class.zipfile.php',
+            'xoopsuserutility' => $xoops_root_path.'/class/userutility.php',
+            'xoopsutility' => $xoops_root_path.'/class/utility/xoopsutility.php',
+            'xoopsxmlrpcapi' => $xoops_root_path.'/class/xml/rpc/xmlrpcapi.php',
+            'xoopsxmlrpcarray' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcbase64'=> $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcboolean' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcdatetime' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcdocument' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcdouble' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcfault' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcint' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcparser' => $xoops_root_path.'/class/xml/rpc/xmlrpcparser.php',
+            'xoopsxmlrpcrequest' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcresponse' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcstring' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpcstruct' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrpctag' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php',
+            'xoopsxmlrss2parser' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php',
+            'xoopszipdownloader' => $xoops_root_path.'/class/zipdownloader.php',
+            'zipfile' => $xoops_root_path.'/class/class.zipfile.php',
         );
     }
 
@@ -434,7 +434,7 @@ 
             } else {
                 return false;
             }
-            if (self::fileExists($file = \XoopsBaseConfig::get('root-path') . '/modules/' . $dirname . '/include/autoload.php')) {
+            if (self::fileExists($file = \XoopsBaseConfig::get('root-path').'/modules/'.$dirname.'/include/autoload.php')) {
                 if (!$configs = include $file) {
                     return false;
                 }
@@ -481,8 +481,8 @@ 
             return true;
         }
 
-        $file = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
-        if (!self::loadFile(\XoopsBaseConfig::get('lib-path') . DIRECTORY_SEPARATOR . $file)) {
+        $file = str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
+        if (!self::loadFile(\XoopsBaseConfig::get('lib-path').DIRECTORY_SEPARATOR.$file)) {
             return false;
         }
 
@@ -543,7 +543,7 @@ 
         static $libPath = null;
 
         if ($libPath === null) {
-            $loaderPath = $path . '/vendor/autoload.php';
+            $loaderPath = $path.'/vendor/autoload.php';
             if (self::fileExists($loaderPath)) {
                 $libPath = $path;
                 include $loaderPath;

htdocs/class/userutility.php

Spacing +19 added lines, -19 removed lines

@@ -113,18 +113,18 @@ 
         $stop = '';
         // Invalid email address
         if (!$xoops->checkEmail($email)) {
-            $stop .= XoopsLocale::E_INVALID_EMAIL . '<br />';
+            $stop .= XoopsLocale::E_INVALID_EMAIL.'<br />';
         }
         if (strrpos($email, ' ') > 0) {
-            $stop .= XoopsLocale::E_EMAIL_SHOULD_NOT_CONTAIN_SPACES . '<br />';
+            $stop .= XoopsLocale::E_EMAIL_SHOULD_NOT_CONTAIN_SPACES.'<br />';
         }
         // Check forbidden email address if current operator is not an administrator
         if (!$xoops->userIsAdmin) {
             $bad_emails = $xoops->getConfig('bad_emails');
             if (!empty($bad_emails)) {
                 foreach ($bad_emails as $be) {
-                    if (!empty($be) && preg_match('/' . $be . '/i', $email)) {
-                        $stop .= XoopsLocale::E_INVALID_EMAIL . '<br />';
+                    if (!empty($be) && preg_match('/'.$be.'/i', $email)) {
+                        $stop .= XoopsLocale::E_INVALID_EMAIL.'<br />';
                         break;
                     }
                 }
@@ -133,23 +133,23 @@ 
         // $uname = XoopsLocale::trim($uname);
         // no controls, puctuation, symbols, spaces or invisible separators
         if (!preg_match('/^[^\p{C}\p{P}\p{S}\p{Z}]+$/u', $uname)) {
-            $stop .= XoopsLocale::E_INVALID_USERNAME . '<br />';
+            $stop .= XoopsLocale::E_INVALID_USERNAME.'<br />';
         }
         // Check uname settings if current operator is not an administrator
         if (!$xoops->userIsAdmin) {
             $maxuname = $xoops->getConfig('maxuname');
             if (!empty($maxuname) && mb_strlen($uname) > $maxuname) {
-                $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_LESS_THAN, $maxuname) . '<br />';
+                $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_LESS_THAN, $maxuname).'<br />';
             }
             $minuname = $xoops->getConfig('minuname');
             if (!empty($minuname) && mb_strlen($uname) < $minuname) {
-                $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_MORE_THAN, $minuname) . '<br />';
+                $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_MORE_THAN, $minuname).'<br />';
             }
             $bad_unames = $xoops->getConfig('bad_unames');
             if (!empty($bad_unames)) {
                 foreach ($bad_unames as $bu) {
-                    if (!empty($bu) && preg_match('/' . $bu . '/i', $uname)) {
-                        $stop .= XoopsLocale::E_NAME_IS_RESERVED . '<br />';
+                    if (!empty($bu) && preg_match('/'.$bu.'/i', $uname)) {
+                        $stop .= XoopsLocale::E_NAME_IS_RESERVED.'<br />';
                         break;
                     }
                 }
@@ -166,7 +166,7 @@ 
         }
         $count = $user_handler->getCount($criteria);
         if ($count > 0) {
-            $stop .= XoopsLocale::E_USERNAME_TAKEN . '<br />';
+            $stop .= XoopsLocale::E_USERNAME_TAKEN.'<br />';
         }
 
         $criteria = new CriteriaCompo(new Criteria('email', $email));
@@ -175,7 +175,7 @@ 
         }
         $count = $user_handler->getCount($criteria);
         if ($count > 0) {
-            $stop .= XoopsLocale::E_EMAIL_TAKEN . '<br />';
+            $stop .= XoopsLocale::E_EMAIL_TAKEN.'<br />';
         }
 
         // If password is not set, skip password validation
@@ -184,14 +184,14 @@ 
         }
 
         if (empty($pass) || empty($vpass)) {
-            $stop .= XoopsLocale::E_MUST_PROVIDE_PASSWORD . '<br />';
+            $stop .= XoopsLocale::E_MUST_PROVIDE_PASSWORD.'<br />';
         }
         if (isset($pass) && isset($vpass) && ($pass != $vpass)) {
-            $stop .= XoopsLocale::E_PASSWORDS_MUST_MATCH . '<br />';
+            $stop .= XoopsLocale::E_PASSWORDS_MUST_MATCH.'<br />';
         } else {
             $minpass = $xoops->getConfig('minpass');
             if (($pass != '') && (!empty($minpass)) && (mb_strlen($pass) < $minpass)) {
-                $stop .= sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $minpass) . '<br />';
+                $stop .= sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $minpass).'<br />';
             }
         }
         return $stop;
@@ -269,7 +269,7 @@ 
         $users = array();
         if (count($userids) > 0) {
             $criteria = new CriteriaCompo(new Criteria('level', 0, '>'));
-            $criteria->add(new Criteria('uid', "('" . implode(',', array_unique($userids)) . "')", 'IN'));
+            $criteria->add(new Criteria('uid', "('".implode(',', array_unique($userids))."')", 'IN'));
 
             $user_handler = $xoops->getHandlerUser();
             if (!$rows = $user_handler->getAll($criteria, array('uid', 'uname', 'name'), false, true)) {
@@ -282,8 +282,8 @@ 
                     $users[$uid] = $myts->htmlSpecialChars($row['uname']);
                 }
                 if ($linked) {
-                    $users[$uid] = '<a href="' . \XoopsBaseConfig::get('url') . '/userinfo.php?uid='
-                        . $uid . '" title="' . $users[$uid] . '">' . $users[$uid] . '</a>';
+                    $users[$uid] = '<a href="'.\XoopsBaseConfig::get('url').'/userinfo.php?uid='
+                        . $uid.'" title="'.$users[$uid].'">'.$users[$uid].'</a>';
                 }
             }
         }
@@ -318,8 +318,8 @@ 
                     $username = $user->getVar('uname');
                 }
                 if (!empty($linked)) {
-                    $username = '<a href="' . \XoopsBaseConfig::get('url') . '/userinfo.php?uid='
-                        . $userid . '" title="' . $username . '">' . $username . '</a>';
+                    $username = '<a href="'.\XoopsBaseConfig::get('url').'/userinfo.php?uid='
+                        . $userid.'" title="'.$username.'">'.$username.'</a>';
                 }
             }
         }

htdocs/class/tardownloader.php

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
      */
     public function addFileData(&$data, $filename, $time = 0)
     {
-        $dummyfile = \XoopsBaseConfig::get('caches-path') . '/dummy_' . time() . '.html';
+        $dummyfile = \XoopsBaseConfig::get('caches-path').'/dummy_'.time().'.html';
         $fp = @fopen($dummyfile, 'w');
         if ($fp === false) {
             return false;
@@ -131,7 +131,7 @@ 
      */
     public function addBinaryFileData(&$data, $filename, $time = 0)
     {
-        $dummyfile = \XoopsBaseConfig::get('caches-path') . '/dummy_' . time() . '.html';
+        $dummyfile = \XoopsBaseConfig::get('caches-path').'/dummy_'.time().'.html';
         $fp = @fopen($dummyfile, 'wb');
         if ($fp === false) {
             return false;
@@ -165,8 +165,8 @@ 
      */
     public function download($name, $gzip = true)
     {
-        $this->_header($name . $this->ext);
-        $str = $this->archiver->toTarOutput($name . $this->ext, $gzip);
+        $this->_header($name.$this->ext);
+        $str = $this->archiver->toTarOutput($name.$this->ext, $gzip);
         if ($str !== false) {
             echo $str;
         }

htdocs/class/class.zipfile.php

Indentation +4 added lines, -4 removed lines

@@ -158,9 +158,9 @@
         $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
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -92,8 +92,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
@@ -157,10 +157,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
\ No newline at end of file