XOOPS / XoopsCore

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

htdocs/class/file/xoopsfile.php

Spacing +2 added lines, -2 removed lines

@@ -41,12 +41,12 @@
     {
         $handler = null;
         $name = strtolower(trim($name));
-        $class = 'Xoops' . ucfirst($name) . 'Handler';
+        $class = 'Xoops'.ucfirst($name).'Handler';
         if (in_array($name, array('file', 'folder'))) {
             $handler = new $class($path, $create, $mode);
         } else {
             trigger_error(
-                'Class ' . $class . ' not exist in File ' . __FILE__ . ' at Line ' . __LINE__,
+                'Class '.$class.' not exist in File '.__FILE__.' at Line '.__LINE__,
                 E_USER_WARNING
             );
             return false;

htdocs/class/file/file.php

Spacing +2 added lines, -2 removed lines

@@ -340,7 +340,7 @@ 
             $this->info();
         }
         if (isset($this->info['extension'])) {
-            return basename($this->name, '.' . $this->info['extension']);
+            return basename($this->name, '.'.$this->info['extension']);
         } elseif ($this->name) {
             return $this->name;
         }
@@ -393,7 +393,7 @@ 
      */
     public function pwd()
     {
-        return $this->folder->slashTerm($this->folder->pwd()) . $this->name;
+        return $this->folder->slashTerm($this->folder->pwd()).$this->name;
     }
 
     /**

htdocs/class/file/folder.php

Spacing +11 added lines, -11 removed lines

@@ -102,18 +102,18 @@ 
     public function __construct($path = '', $create = true, $mode = false)
     {
         if (empty($path)) {
-            $path = \XoopsBaseConfig::get('var-path') . '/caches/xoops_cache';
+            $path = \XoopsBaseConfig::get('var-path').'/caches/xoops_cache';
         }
         if ($mode) {
             $this->mode = intval($mode, 8);
         }
-        if (! XoopsLoad::fileExists($path) && $create == true) {
+        if (!XoopsLoad::fileExists($path) && $create == true) {
             $this->create($path, $this->mode);
         }
-        if (! $this->isAbsolute($path)) {
+        if (!$this->isAbsolute($path)) {
             $path1 = $this->realpath($path);
-            if (false===$path1)
-                throw new InvalidArgumentException($path . ' not found');
+            if (false === $path1)
+                throw new InvalidArgumentException($path.' not found');
             $path = $path1;
         }
         $this->cd($path);
@@ -275,7 +275,7 @@ 
      */
     public static function isWindowsPath($path)
     {
-        if (preg_match('/^[A-Z]:/i', $path) || false !== strpos($path,'\\')) {
+        if (preg_match('/^[A-Z]:/i', $path) || false !== strpos($path, '\\')) {
             return true;
         }
         return false;
@@ -292,7 +292,7 @@ 
      */
     public static function isAbsolute($path)
     {
-        $path = str_replace('\\','/',$path);
+        $path = str_replace('\\', '/', $path);
         $match = preg_match('/^(\/|[A-Z]:\/|\/\/)/', $path);
         return ($match == 1);
     }
@@ -345,7 +345,7 @@ 
         if (self::isSlashTerm($path)) {
             return $path;
         }
-        return $path . self::correctSlashFor($path);
+        return $path.self::correctSlashFor($path);
     }
 
     /**
@@ -360,7 +360,7 @@ 
      */
     public static function addPathElement($path, $element)
     {
-        return self::slashTerm($path) . $element;
+        return self::slashTerm($path).$element;
     }
 
     /**
@@ -375,7 +375,7 @@ 
     {
         $xoops_root_path = \XoopsBaseConfig::get('root-path');
         $dir = substr($this->slashTerm($xoops_root_path), 0, -1);
-        $newdir = $dir . ($path{0}==='/'?'':'/') . $path;
+        $newdir = $dir.($path{0} === '/' ? '' : '/').$path;
         return $this->inPath($newdir);
     }
 
@@ -503,7 +503,7 @@ 
                 }
                 $found = false;
                 if (($hidden === true) || ($hidden === false && $item{0} !== '.')) {
-                    $found = $path . '/' . $item;
+                    $found = $path.'/'.$item;
                 }
                 if ($found !== false) {
                     if (is_dir($found)) {

Braces +3 added lines, -2 removed lines

@@ -112,8 +112,9 @@
         }
         if (! $this->isAbsolute($path)) {
             $path1 = $this->realpath($path);
-            if (false===$path1)
-                throw new InvalidArgumentException($path . ' not found');
+            if (false===$path1) {
+                            throw new InvalidArgumentException($path . ' not found');
+            }
             $path = $path1;
         }
         $this->cd($path);

htdocs/class/zipdownloader.php

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
      */
     public function download($name, $gzip = true)
     {
-        $this->_header($name . $this->ext);
+        $this->_header($name.$this->ext);
         $result = $this->archiver->file();
         if ($result !== false) {
             echo $result;

htdocs/class/downloader.php

Indentation +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
      * @param boolean|string $newfilename
      * @return void
      */
-     abstract function addFile($filepath, $newfilename = null);
+        abstract function addFile($filepath, $newfilename = null);
 
     /**
      * @abstract

Spacing +3 added lines, -3 removed lines

@@ -55,14 +55,14 @@
         if (function_exists('mb_http_output')) {
             mb_http_output('pass');
         }
-        header('Content-Type: ' . $this->mimetype);
+        header('Content-Type: '.$this->mimetype);
         if (preg_match("/MSIE ([0-9]\.[0-9]{1,2})/", $_SERVER['HTTP_USER_AGENT'])) {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
             header('Expires: 0');
             header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
             header('Pragma: public');
         } else {
-            header('Content-Disposition: attachment; filename="' . $filename . '"');
+            header('Content-Disposition: attachment; filename="'.$filename.'"');
             header('Expires: 0');
             header('Pragma: no-cache');
         }

htdocs/class/xoopseditor/xoopseditor.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
         // TODO: switch to property_exists() as of PHP 5.1.0
         $vars = get_class_vars(__CLASS__);
         foreach ($configs as $key => $val) {
-            $method = "set" . ucfirst($key);
+            $method = "set".ucfirst($key);
             if (method_exists($this, $method)) {
                 $this->$method($val);
             } else {
@@ -154,7 +154,7 @@ 
      */
     private function __construct()
     {
-        $this->root_path = \XoopsBaseConfig::get('root-path') . '/class/xoopseditor';
+        $this->root_path = \XoopsBaseConfig::get('root-path').'/class/xoopseditor';
     }
 
     /**
@@ -205,17 +205,17 @@ 
     {
         $list = array();
         $order = array();
-        $fileList = XoopsLists::getDirListAsArray($this->root_path . '/');
+        $fileList = XoopsLists::getDirListAsArray($this->root_path.'/');
 
         foreach ($fileList as $item) {
-            if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/' . XoopsLocale::getLegacyLanguage() . '.php')) {
+            if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/language/'.XoopsLocale::getLegacyLanguage().'.php')) {
                 include_once $file;
             } else {
-                if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/language/english.php')) {
+                if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/language/english.php')) {
                     include_once $file;
                 }
             }
-            if (XoopsLoad::fileExists($file = $this->root_path . '/' . $item . '/editor_registry.php')) {
+            if (XoopsLoad::fileExists($file = $this->root_path.'/'.$item.'/editor_registry.php')) {
                 include $file;
                 if (empty($config['order'])) {
                     continue;
@@ -277,15 +277,15 @@ 
         if (empty($name) || !array_key_exists($name, $this->getList())) {
             return $editor;
         }
-        $editor_path = $this->root_path . '/' . $name;
-        if (XoopsLoad::fileExists($file = $editor_path . '/language/' . XoopsLocale::getLegacyLanguage() . '.php')) {
+        $editor_path = $this->root_path.'/'.$name;
+        if (XoopsLoad::fileExists($file = $editor_path.'/language/'.XoopsLocale::getLegacyLanguage().'.php')) {
             include_once $file;
         } else {
-            if (XoopsLoad::fileExists($file = $editor_path . '/language/english.php')) {
+            if (XoopsLoad::fileExists($file = $editor_path.'/language/english.php')) {
                 include_once $file;
             }
         }
-        if (XoopsLoad::fileExists($file = $editor_path . '/editor_registry.php')) {
+        if (XoopsLoad::fileExists($file = $editor_path.'/editor_registry.php')) {
             include $file;
         } else {
             return $editor;