XOOPS / XoopsCore25

htdocs/class/zipdownloader.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
      */
     public function download($name, $gzip = true)
     {
-        $this->_header($name . $this->ext);
+        $this->_header($name.$this->ext);
         echo $this->archiver->file();
     }
 }

htdocs/class/criteria.php

Spacing +9 added lines, -9 removed lines

@@ -216,7 +216,7 @@ 
     public function &add(CriteriaElement $criteriaElement, $condition = 'AND')
     {
         if (is_object($criteriaElement)) {
-            $this->criteriaElements[] =& $criteriaElement;
+            $this->criteriaElements[] = & $criteriaElement;
             $this->conditions[]       = $condition;
         }
 
@@ -238,7 +238,7 @@ 
                 if (!$render = $this->criteriaElements[$i]->render()) {
                     continue;
                 }
-                $render_string .= (empty($render_string) ? '' : ' ' . $this->conditions[$i] . ' ') . $render;
+                $render_string .= (empty($render_string) ? '' : ' '.$this->conditions[$i].' ').$render;
             }
             $ret = empty($render_string) ? '' : "({$render_string})";
         }
@@ -254,7 +254,7 @@ 
     public function renderWhere()
     {
         $ret = $this->render();
-        $ret = ($ret != '') ? 'WHERE ' . $ret : $ret;
+        $ret = ($ret != '') ? 'WHERE '.$ret : $ret;
 
         return $ret;
     }
@@ -274,7 +274,7 @@ 
             for ($i = 1; $i < $count; ++$i) {
                 $cond   = strtoupper($this->conditions[$i]);
                 $op     = ($cond === 'OR') ? '|' : '&';
-                $retval = "({$op}{$retval}" . $this->criteriaElements[$i]->renderLdap() . ')';
+                $retval = "({$op}{$retval}".$this->criteriaElements[$i]->renderLdap().')';
             }
         }
 
@@ -323,12 +323,12 @@ 
      */
     public function render()
     {
-        $clause = (!empty($this->prefix) ? "{$this->prefix}." : '') . $this->column;
+        $clause = (!empty($this->prefix) ? "{$this->prefix}." : '').$this->column;
         if (!empty($this->function)) {
             $clause = sprintf($this->function, $clause);
         }
         if (in_array(strtoupper($this->operator), array('IS NULL', 'IS NOT NULL'))) {
-            $clause .= ' ' . $this->operator;
+            $clause .= ' '.$this->operator;
         } else {
             if ('' === ($value = trim($this->value))) {
                 return '';
@@ -363,7 +363,7 @@ 
 
         if ($this->operator === '!=' || $this->operator === '<>') {
             $operator = '=';
-            $clause   = '(!(' . $this->column . $operator . $this->value . '))';
+            $clause   = '(!('.$this->column.$operator.$this->value.'))';
         } else {
             if ($this->operator === 'IN') {
                 $newvalue = str_replace(array('(', ')'), '', $this->value);
@@ -371,9 +371,9 @@ 
                 foreach ($tab as $uid) {
                     $clause .= "({$this->column}={$uid})";
                 }
-                $clause = '(|' . $clause . ')';
+                $clause = '(|'.$clause.')';
             } else {
-                $clause = '(' . $this->column . $this->operator . $this->value . ')';
+                $clause = '('.$this->column.$this->operator.$this->value.')';
             }
         }
 

htdocs/class/uploader.php

Spacing +15 added lines, -15 removed lines

@@ -50,7 +50,7 @@ 
      * Flag indicating if unrecognized mimetypes should be allowed (use with precaution ! may lead to security issues )
      */
 
-    public $allowUnknownTypes       = false;
+    public $allowUnknownTypes = false;
     public $mediaName;
     public $mediaType;
     public $mediaSize;
@@ -101,7 +101,7 @@ 
         14 => 'iff',
         15 => 'wbmp',
         16 => 'xbm');
-    public $randomFilename  = false;
+    public $randomFilename = false;
 
     /**
      * Constructor
@@ -123,7 +123,7 @@ 
             return false;
         }
         if (is_array($allowedMimeTypes)) {
-            $this->allowedMimeTypes =& $allowedMimeTypes;
+            $this->allowedMimeTypes = & $allowedMimeTypes;
         }
         $this->uploadDir = $uploadDir;
 
@@ -147,7 +147,7 @@ 
         if (isset($randomFilename)) {
             $this->randomFilename = $randomFilename;
         }
-        if (!include_once $GLOBALS['xoops']->path('language/' . $GLOBALS['xoopsConfig']['language'] . '/uploader.php')) {
+        if (!include_once $GLOBALS['xoops']->path('language/'.$GLOBALS['xoopsConfig']['language'].'/uploader.php')) {
             include_once $GLOBALS['xoops']->path('language/english/uploader.php');
         }
     }
@@ -199,18 +199,18 @@ 
             $this->mediaName = get_magic_quotes_gpc() ? stripslashes($_FILES[$media_name]['name'][$index]) : $_FILES[$media_name]['name'][$index];
             if ($this->randomFilename) {
                 $unique          = uniqid();
-                $this->mediaName = '' . $unique . '--' . $this->mediaName;
+                $this->mediaName = ''.$unique.'--'.$this->mediaName;
             }
             $this->mediaType    = $_FILES[$media_name]['type'][$index];
             $this->mediaSize    = $_FILES[$media_name]['size'][$index];
             $this->mediaTmpName = $_FILES[$media_name]['tmp_name'][$index];
             $this->mediaError   = !empty($_FILES[$media_name]['error'][$index]) ? $_FILES[$media_name]['error'][$index] : 0;
         } else {
-            $media_name      =& $_FILES[$media_name];
+            $media_name      = & $_FILES[$media_name];
             $this->mediaName = get_magic_quotes_gpc() ? stripslashes($media_name['name']) : $media_name['name'];
             if ($this->randomFilename) {
                 $unique          = uniqid();
-                $this->mediaName = '' . $unique . '--' . $this->mediaName;
+                $this->mediaName = ''.$unique.'--'.$this->mediaName;
             }
             $this->mediaType    = $media_name['type'];
             $this->mediaSize    = $media_name['size'];
@@ -226,7 +226,7 @@ 
         }
         $this->errors = array();
         if ($this->mediaError > 0) {
-            switch($this->mediaError){
+            switch ($this->mediaError) {
                 case UPLOAD_ERR_INI_SIZE:
                     $this->setErrors(_ER_UP_INISIZE);
                     return false;
@@ -425,7 +425,7 @@ 
         if (isset($this->targetFileName)) {
             $this->savedFileName = $this->targetFileName;
         } elseif (isset($this->prefix)) {
-            $this->savedFileName = uniqid($this->prefix) . '.' . strtolower($matched[1]);
+            $this->savedFileName = uniqid($this->prefix).'.'.strtolower($matched[1]);
         } else {
             $this->savedFileName = strtolower($this->mediaName);
         }
@@ -434,7 +434,7 @@ 
         $this->savedFileName = preg_replace('!\s+!', '_', $this->savedFileName);
         $this->savedFileName = preg_replace("/[^a-zA-Z0-9\._-]/", '', $this->savedFileName);
 
-        $this->savedDestination = $this->uploadDir . '/' . $this->savedFileName;
+        $this->savedDestination = $this->uploadDir.'/'.$this->savedFileName;
         if (!move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {
             $this->setErrors(sprintf(_ER_UP_FAILEDSAVEFILE, $this->savedDestination));
 
@@ -529,7 +529,7 @@ 
     public function checkMimeType()
     {
         // if the browser supplied mime type looks suspicious, refuse it
-        $structureCheck = (bool) preg_match('/^\w+\/[-+.\w]+$/', $this->mediaType);
+        $structureCheck = (bool)preg_match('/^\w+\/[-+.\w]+$/', $this->mediaType);
         if (false === $structureCheck) {
             $this->mediaType = 'invalid';
             $this->setErrors(_ER_UP_UNKNOWNFILETYPEREJECTED);
@@ -585,8 +585,8 @@ 
         $patterns = array();
         $replaces = array();
         foreach ($this->extensionsToBeSanitized as $ext) {
-            $patterns[] = "/\." . preg_quote($ext) . "\./i";
-            $replaces[] = '_' . $ext . '.';
+            $patterns[] = "/\.".preg_quote($ext)."\./i";
+            $replaces[] = '_'.$ext.'.';
         }
         $this->mediaName = preg_replace($patterns, $replaces, $this->mediaName);
     }
@@ -614,9 +614,9 @@ 
         } else {
             $ret = '';
             if (count($this->errors) > 0) {
-                $ret = '<h4>' . sprintf(_ER_UP_ERRORSRETURNED, htmlspecialchars($this->mediaName, ENT_QUOTES)) . '</h4>';
+                $ret = '<h4>'.sprintf(_ER_UP_ERRORSRETURNED, htmlspecialchars($this->mediaName, ENT_QUOTES)).'</h4>';
                 foreach ($this->errors as $error) {
-                    $ret .= $error . '<br>';
+                    $ret .= $error.'<br>';
                 }
             }
 

htdocs/class/xoopsload.php

Spacing +68 added lines, -68 removed lines

@@ -108,13 +108,13 @@ 
             }
 
             return true;
-        } elseif (file_exists($file = XOOPS_ROOT_PATH . '/class/' . $name . '.php')) {
+        } elseif (file_exists($file = XOOPS_ROOT_PATH.'/class/'.$name.'.php')) {
             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__, E_USER_WARNING);
+                trigger_error('Class '.$name.' not found in file '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
             }
         }
 
@@ -130,13 +130,13 @@ 
      */
     public static function loadFramework($name)
     {
-        if (!file_exists($file = XOOPS_ROOT_PATH . '/Frameworks/' . $name . '/xoops' . $name . '.php')) {
-            trigger_error('File ' . str_replace(XOOPS_ROOT_PATH, '', $file) . ' not found in file ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+        if (!file_exists($file = XOOPS_ROOT_PATH.'/Frameworks/'.$name.'/xoops'.$name.'.php')) {
+            trigger_error('File '.str_replace(XOOPS_ROOT_PATH, '', $file).' not found in file '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
 
             return false;
         }
         include_once $file;
-        $class = 'Xoops' . ucfirst($name);
+        $class = 'Xoops'.ucfirst($name);
         if (class_exists($class)) {
             return $class;
         }
@@ -156,9 +156,9 @@ 
         if (empty($dirname)) {
             return false;
         }
-        if (file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/class/' . $name . '.php')) {
+        if (file_exists($file = XOOPS_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;
             }
         }
@@ -174,64 +174,64 @@ 
     public static function loadCoreConfig()
     {
         return $configs = array(
-            'xoopsuserutility'           => XOOPS_ROOT_PATH . '/class/userutility.php',
-            'xoopsmediauploader'         => XOOPS_ROOT_PATH . '/class/uploader.php',
-            'xoopsutility'               => XOOPS_ROOT_PATH . '/class/utility/xoopsutility.php',
-            'xoopscaptcha'               => XOOPS_ROOT_PATH . '/class/captcha/xoopscaptcha.php',
-            'xoopscache'                 => XOOPS_ROOT_PATH . '/class/cache/xoopscache.php',
-            'xoopsfile'                  => XOOPS_ROOT_PATH . '/class/file/xoopsfile.php',
-            'xoopsmodelfactory'          => XOOPS_ROOT_PATH . '/class/model/xoopsmodel.php',
-            'xoopscalendar'              => XOOPS_ROOT_PATH . '/class/calendar/xoopscalendar.php',
-            'xoopskernel'                => XOOPS_ROOT_PATH . '/class/xoopskernel.php',
-            'xoopssecurity'              => XOOPS_ROOT_PATH . '/class/xoopssecurity.php',
-            'xoopslogger'                => XOOPS_ROOT_PATH . '/class/logger/xoopslogger.php',
-            'xoopspagenav'               => XOOPS_ROOT_PATH . '/class/pagenav.php',
-            'xoopslists'                 => XOOPS_ROOT_PATH . '/class/xoopslists.php',
-            'xoopslocal'                 => XOOPS_ROOT_PATH . '/include/xoopslocal.php',
-            'xoopslocalabstract'         => XOOPS_ROOT_PATH . '/class/xoopslocal.php',
-            'xoopseditor'                => XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php',
-            'xoopseditorhandler'         => XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php',
-            'xoopsformloader'            => XOOPS_ROOT_PATH . '/class/xoopsformloader.php',
-            'xoopsformelement'           => XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php',
-            'xoopsform'                  => XOOPS_ROOT_PATH . '/class/xoopsform/form.php',
-            'xoopsformlabel'             => XOOPS_ROOT_PATH . '/class/xoopsform/formlabel.php',
-            'xoopsformselect'            => XOOPS_ROOT_PATH . '/class/xoopsform/formselect.php',
-            'xoopsformpassword'          => XOOPS_ROOT_PATH . '/class/xoopsform/formpassword.php',
-            'xoopsformbutton'            => XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php',
-            'xoopsformbuttontray'        => XOOPS_ROOT_PATH . '/class/xoopsform/formbuttontray.php',
-            'xoopsformcheckbox'          => XOOPS_ROOT_PATH . '/class/xoopsform/formcheckbox.php',
-            'xoopsformselectcheckgroup'  => XOOPS_ROOT_PATH . '/class/xoopsform/formselectcheckgroup.php',
-            'xoopsformhidden'            => XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php',
-            'xoopsformfile'              => XOOPS_ROOT_PATH . '/class/xoopsform/formfile.php',
-            'xoopsformradio'             => XOOPS_ROOT_PATH . '/class/xoopsform/formradio.php',
-            'xoopsformradioyn'           => XOOPS_ROOT_PATH . '/class/xoopsform/formradioyn.php',
-            'xoopsformselectcountry'     => XOOPS_ROOT_PATH . '/class/xoopsform/formselectcountry.php',
-            'xoopsformselecttimezone'    => XOOPS_ROOT_PATH . '/class/xoopsform/formselecttimezone.php',
-            'xoopsformselectlang'        => XOOPS_ROOT_PATH . '/class/xoopsform/formselectlang.php',
-            'xoopsformselectgroup'       => XOOPS_ROOT_PATH . '/class/xoopsform/formselectgroup.php',
-            'xoopsformselectuser'        => XOOPS_ROOT_PATH . '/class/xoopsform/formselectuser.php',
-            'xoopsformselecttheme'       => XOOPS_ROOT_PATH . '/class/xoopsform/formselecttheme.php',
-            'xoopsformselectmatchoption' => XOOPS_ROOT_PATH . '/class/xoopsform/formselectmatchoption.php',
-            'xoopsformtext'              => XOOPS_ROOT_PATH . '/class/xoopsform/formtext.php',
-            'xoopsformtextarea'          => XOOPS_ROOT_PATH . '/class/xoopsform/formtextarea.php',
-            'xoopsformdhtmltextarea'     => XOOPS_ROOT_PATH . '/class/xoopsform/formdhtmltextarea.php',
-            'xoopsformelementtray'       => XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php',
-            'xoopsthemeform'             => XOOPS_ROOT_PATH . '/class/xoopsform/themeform.php',
-            'xoopssimpleform'            => XOOPS_ROOT_PATH . '/class/xoopsform/simpleform.php',
-            'xoopsformtextdateselect'    => XOOPS_ROOT_PATH . '/class/xoopsform/formtextdateselect.php',
-            'xoopsformdatetime'          => XOOPS_ROOT_PATH . '/class/xoopsform/formdatetime.php',
-            'xoopsformhiddentoken'       => XOOPS_ROOT_PATH . '/class/xoopsform/formhiddentoken.php',
-            'xoopsformcolorpicker'       => XOOPS_ROOT_PATH . '/class/xoopsform/formcolorpicker.php',
-            'xoopsformcaptcha'           => XOOPS_ROOT_PATH . '/class/xoopsform/formcaptcha.php',
-            'xoopsformeditor'            => XOOPS_ROOT_PATH . '/class/xoopsform/formeditor.php',
-            'xoopsformselecteditor'      => XOOPS_ROOT_PATH . '/class/xoopsform/formselecteditor.php',
-            'xoopsformcalendar'          => XOOPS_ROOT_PATH . '/class/xoopsform/formcalendar.php',
-            'xoopsformrenderer'          => XOOPS_ROOT_PATH . '/class/xoopsform/renderer/XoopsFormRenderer.php',
-            'xoopsformrendererinterface' => XOOPS_ROOT_PATH . '/class/xoopsform/renderer/XoopsFormRendererInterface.php',
-            'xoopsformrendererlegacy'    => XOOPS_ROOT_PATH . '/class/xoopsform/renderer/XoopsFormRendererLegacy.php',
-            'xoopsformrendererbootstrap3'=> XOOPS_ROOT_PATH . '/class/xoopsform/renderer/XoopsFormRendererBootstrap3.php',
-            'xoopsfilterinput'           => XOOPS_ROOT_PATH . '/class/xoopsfilterinput.php',
-            'xoopsrequest'               => XOOPS_ROOT_PATH . '/class/xoopsrequest.php');
+            'xoopsuserutility'           => XOOPS_ROOT_PATH.'/class/userutility.php',
+            'xoopsmediauploader'         => XOOPS_ROOT_PATH.'/class/uploader.php',
+            'xoopsutility'               => XOOPS_ROOT_PATH.'/class/utility/xoopsutility.php',
+            'xoopscaptcha'               => XOOPS_ROOT_PATH.'/class/captcha/xoopscaptcha.php',
+            'xoopscache'                 => XOOPS_ROOT_PATH.'/class/cache/xoopscache.php',
+            'xoopsfile'                  => XOOPS_ROOT_PATH.'/class/file/xoopsfile.php',
+            'xoopsmodelfactory'          => XOOPS_ROOT_PATH.'/class/model/xoopsmodel.php',
+            'xoopscalendar'              => XOOPS_ROOT_PATH.'/class/calendar/xoopscalendar.php',
+            'xoopskernel'                => XOOPS_ROOT_PATH.'/class/xoopskernel.php',
+            'xoopssecurity'              => XOOPS_ROOT_PATH.'/class/xoopssecurity.php',
+            'xoopslogger'                => XOOPS_ROOT_PATH.'/class/logger/xoopslogger.php',
+            'xoopspagenav'               => XOOPS_ROOT_PATH.'/class/pagenav.php',
+            'xoopslists'                 => XOOPS_ROOT_PATH.'/class/xoopslists.php',
+            'xoopslocal'                 => XOOPS_ROOT_PATH.'/include/xoopslocal.php',
+            'xoopslocalabstract'         => XOOPS_ROOT_PATH.'/class/xoopslocal.php',
+            'xoopseditor'                => XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php',
+            'xoopseditorhandler'         => XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php',
+            'xoopsformloader'            => XOOPS_ROOT_PATH.'/class/xoopsformloader.php',
+            'xoopsformelement'           => XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php',
+            'xoopsform'                  => XOOPS_ROOT_PATH.'/class/xoopsform/form.php',
+            'xoopsformlabel'             => XOOPS_ROOT_PATH.'/class/xoopsform/formlabel.php',
+            'xoopsformselect'            => XOOPS_ROOT_PATH.'/class/xoopsform/formselect.php',
+            'xoopsformpassword'          => XOOPS_ROOT_PATH.'/class/xoopsform/formpassword.php',
+            'xoopsformbutton'            => XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php',
+            'xoopsformbuttontray'        => XOOPS_ROOT_PATH.'/class/xoopsform/formbuttontray.php',
+            'xoopsformcheckbox'          => XOOPS_ROOT_PATH.'/class/xoopsform/formcheckbox.php',
+            'xoopsformselectcheckgroup'  => XOOPS_ROOT_PATH.'/class/xoopsform/formselectcheckgroup.php',
+            'xoopsformhidden'            => XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php',
+            'xoopsformfile'              => XOOPS_ROOT_PATH.'/class/xoopsform/formfile.php',
+            'xoopsformradio'             => XOOPS_ROOT_PATH.'/class/xoopsform/formradio.php',
+            'xoopsformradioyn'           => XOOPS_ROOT_PATH.'/class/xoopsform/formradioyn.php',
+            'xoopsformselectcountry'     => XOOPS_ROOT_PATH.'/class/xoopsform/formselectcountry.php',
+            'xoopsformselecttimezone'    => XOOPS_ROOT_PATH.'/class/xoopsform/formselecttimezone.php',
+            'xoopsformselectlang'        => XOOPS_ROOT_PATH.'/class/xoopsform/formselectlang.php',
+            'xoopsformselectgroup'       => XOOPS_ROOT_PATH.'/class/xoopsform/formselectgroup.php',
+            'xoopsformselectuser'        => XOOPS_ROOT_PATH.'/class/xoopsform/formselectuser.php',
+            'xoopsformselecttheme'       => XOOPS_ROOT_PATH.'/class/xoopsform/formselecttheme.php',
+            'xoopsformselectmatchoption' => XOOPS_ROOT_PATH.'/class/xoopsform/formselectmatchoption.php',
+            'xoopsformtext'              => XOOPS_ROOT_PATH.'/class/xoopsform/formtext.php',
+            'xoopsformtextarea'          => XOOPS_ROOT_PATH.'/class/xoopsform/formtextarea.php',
+            'xoopsformdhtmltextarea'     => XOOPS_ROOT_PATH.'/class/xoopsform/formdhtmltextarea.php',
+            'xoopsformelementtray'       => XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php',
+            'xoopsthemeform'             => XOOPS_ROOT_PATH.'/class/xoopsform/themeform.php',
+            'xoopssimpleform'            => XOOPS_ROOT_PATH.'/class/xoopsform/simpleform.php',
+            'xoopsformtextdateselect'    => XOOPS_ROOT_PATH.'/class/xoopsform/formtextdateselect.php',
+            'xoopsformdatetime'          => XOOPS_ROOT_PATH.'/class/xoopsform/formdatetime.php',
+            'xoopsformhiddentoken'       => XOOPS_ROOT_PATH.'/class/xoopsform/formhiddentoken.php',
+            'xoopsformcolorpicker'       => XOOPS_ROOT_PATH.'/class/xoopsform/formcolorpicker.php',
+            'xoopsformcaptcha'           => XOOPS_ROOT_PATH.'/class/xoopsform/formcaptcha.php',
+            'xoopsformeditor'            => XOOPS_ROOT_PATH.'/class/xoopsform/formeditor.php',
+            'xoopsformselecteditor'      => XOOPS_ROOT_PATH.'/class/xoopsform/formselecteditor.php',
+            'xoopsformcalendar'          => XOOPS_ROOT_PATH.'/class/xoopsform/formcalendar.php',
+            'xoopsformrenderer'          => XOOPS_ROOT_PATH.'/class/xoopsform/renderer/XoopsFormRenderer.php',
+            'xoopsformrendererinterface' => XOOPS_ROOT_PATH.'/class/xoopsform/renderer/XoopsFormRendererInterface.php',
+            'xoopsformrendererlegacy'    => XOOPS_ROOT_PATH.'/class/xoopsform/renderer/XoopsFormRendererLegacy.php',
+            'xoopsformrendererbootstrap3'=> XOOPS_ROOT_PATH.'/class/xoopsform/renderer/XoopsFormRendererBootstrap3.php',
+            'xoopsfilterinput'           => XOOPS_ROOT_PATH.'/class/xoopsfilterinput.php',
+            'xoopsrequest'               => XOOPS_ROOT_PATH.'/class/xoopsrequest.php');
     }
 
     /**
@@ -253,7 +253,7 @@ 
             } else {
                 return false;
             }
-            if (file_exists($file = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/include/autoload.php')) {
+            if (file_exists($file = XOOPS_ROOT_PATH.'/modules/'.$dirname.'/include/autoload.php')) {
                 if (!$configs = include $file) {
                     return false;
                 }
@@ -269,4 +269,4 @@ 
 /**
  * XMF libraries
  */
-include_once XOOPS_ROOT_PATH . '/class/libraries/vendor/autoload.php';
+include_once XOOPS_ROOT_PATH.'/class/libraries/vendor/autoload.php';

htdocs/image.php

Spacing +42 added lines, -42 removed lines

@@ -76,17 +76,17 @@ 
 }
 
 $xoopsOption['nocommon'] = true;
-require_once __DIR__ . '/mainfile.php';
-
-include_once __DIR__ . '/include/defines.php';
-include_once __DIR__ . '/include/functions.php';
-include_once __DIR__ . '/include/version.php';
-include_once __DIR__ . '/kernel/object.php';
-include_once __DIR__ . '/class/xoopsload.php';
-include_once __DIR__ . '/class/preload.php';
-include_once __DIR__ . '/class/module.textsanitizer.php';
-include_once __DIR__ . '/class/database/databasefactory.php';
-require_once __DIR__ . '/class/criteria.php';
+require_once __DIR__.'/mainfile.php';
+
+include_once __DIR__.'/include/defines.php';
+include_once __DIR__.'/include/functions.php';
+include_once __DIR__.'/include/version.php';
+include_once __DIR__.'/kernel/object.php';
+include_once __DIR__.'/class/xoopsload.php';
+include_once __DIR__.'/class/preload.php';
+include_once __DIR__.'/class/module.textsanitizer.php';
+include_once __DIR__.'/class/database/databasefactory.php';
+require_once __DIR__.'/class/criteria.php';
 XoopsLoad::load('xoopslogger');
 $xoopsLogger = XoopsLogger::getInstance();
 $xoopsLogger->startTime();
@@ -107,7 +107,7 @@ 
     if (!$ifModifiedSince && !$ifNoneMatch) {
         return null;
     }
-    if ($ifNoneMatch && $ifNoneMatch != $etag && $ifNoneMatch != '"' . $etag . '"') {
+    if ($ifNoneMatch && $ifNoneMatch != $etag && $ifNoneMatch != '"'.$etag.'"') {
         return null;
     } // etag is there but doesn't match
     if ($ifModifiedSince && $ifModifiedSince != $lastModified) {
@@ -151,7 +151,7 @@ 
     $workingWidth = $imageWidth * $q;
     $workingHeight = $imageHeight * $q;
 
-    $workingImage= imagecreatetruecolor($workingWidth, $workingHeight);
+    $workingImage = imagecreatetruecolor($workingWidth, $workingHeight);
     $alphaColor = imagecolorallocatealpha($workingImage, $r, $g, $b, 127);
     imagealphablending($workingImage, false);
     imagesavealpha($workingImage, true);
@@ -241,7 +241,7 @@ 
         exit404BadReq();
     }
 
-    $fullPath = XOOPS_ROOT_PATH . $imageUrl;
+    $fullPath = XOOPS_ROOT_PATH.$imageUrl;
     if (strpos($fullPath, XOOPS_VAR_PATH) === 0) { // no access to data (shouldn't be in root, but...)
         exit404BadReq();
     }
@@ -268,7 +268,7 @@ 
     if (count($images) != 1) {
         // No Xoops images or to many Xoops images
         header('Content-type: image/gif');
-        readfile(XOOPS_UPLOAD_PATH . '/blank.gif');
+        readfile(XOOPS_UPLOAD_PATH.'/blank.gif');
         exit();
     }
     $image = $images[0];
@@ -278,7 +278,7 @@ 
     if (!$imgcat = $imgcatHandler->get($imgcatId)) {
         // No Image category
         header('Content-type: image/gif');
-        readfile(XOOPS_UPLOAD_PATH . '/blank.gif');
+        readfile(XOOPS_UPLOAD_PATH.'/blank.gif');
         exit();
     }
     // Get image data
@@ -289,7 +289,7 @@ 
         $imagePath = null;
         $imageData = $image->getVar('image_body');
     } else {
-        $imagePath = XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name');
+        $imagePath = XOOPS_UPLOAD_PATH.'/'.$image->getVar('image_name');
         $imageData = file_get_contents($imagePath);
     }
     $sourceImage = imagecreatefromstring($imageData);
@@ -304,7 +304,7 @@ 
         // will exit on any unacceptable urls
         imageFilenameCheck($imageUrl);
 
-        $imagePath = XOOPS_ROOT_PATH . $imageUrl;
+        $imagePath = XOOPS_ROOT_PATH.$imageUrl;
         if (!file_exists($imagePath)) {
             exit404BadReq();
         }
@@ -315,7 +315,7 @@ 
         $imagePath = $imageUrl;
     }
     // Get the size and MIME type of the requested image
-    $imageFilename = basename($imagePath);  // image filename
+    $imageFilename = basename($imagePath); // image filename
     $imagesize = getimagesize($imagePath);
     $imageWidth = $imagesize[0];
     $imageHeight = $imagesize[1];
@@ -339,7 +339,7 @@ 
 } else {
     // No id, no url, no src parameters
     header('Content-type: image/gif');
-    readfile(XOOPS_ROOT_PATH . '/uploads/blank.gif');
+    readfile(XOOPS_ROOT_PATH.'/uploads/blank.gif');
     exit();
 }
 
@@ -349,12 +349,12 @@ 
 // Get image_data from the Xoops cache only if the edited image has been cached after the latest modification
 // of the original image
 xoops_load('XoopsCache');
-$edited_image_filename = 'editedimage_' . md5($_SERVER['REQUEST_URI']) . '_' . $imageFilename;
+$edited_image_filename = 'editedimage_'.md5($_SERVER['REQUEST_URI']).'_'.$imageFilename;
 $cached_image = XoopsCache::read($edited_image_filename);
 if (!isset($_GET['nocache']) && !isset($_GET['noservercache']) && !empty($cached_image)
     && ($cached_image['cached_time'] >= $imageCreatedTime)) {
     header("Content-type: {$imageMimetype}");
-    header('Content-Length: ' . strlen($cached_image['image_data']));
+    header('Content-Length: '.strlen($cached_image['image_data']));
     echo $cached_image['image_data'];
     exit();
 }
@@ -389,11 +389,11 @@ 
 // image and exit
 if (empty($_GET['width']) && empty($_GET['height']) && empty($_GET['color']) && empty($_GET['filter'])
     && empty($_GET['radius']) && empty($_GET['angle'])) {
-    $last_modified_string = gmdate('D, d M Y H:i:s', $imageCreatedTime) . ' GMT';
+    $last_modified_string = gmdate('D, d M Y H:i:s', $imageCreatedTime).' GMT';
     $etag = md5($imageData);
     doConditionalGet($etag, $last_modified_string);
     header("Content-type: {$imageMimetype}");
-    header('Content-Length: ' . strlen($imageData));
+    header('Content-Length: '.strlen($imageData));
     echo $imageData;
     exit();
 }
@@ -497,16 +497,16 @@ 
         if (strlen($color) == 6) {
             $background = imagecolorallocate(
                 $destination_image,
-                intval($color[0] . $color[1], 16),
-                intval($color[2] . $color[3], 16),
-                intval($color[4] . $color[5], 16)
+                intval($color[0].$color[1], 16),
+                intval($color[2].$color[3], 16),
+                intval($color[4].$color[5], 16)
             );
         } elseif (strlen($color) == 3) {
             $background = imagecolorallocate(
                 $destination_image,
-                intval($color[0] . $color[0], 16),
-                intval($color[1] . $color[1], 16),
-                intval($color[2] . $color[2], 16)
+                intval($color[0].$color[0], 16),
+                intval($color[1].$color[1], 16),
+                intval($color[2].$color[2], 16)
             );
         }
         if ($background) {
@@ -525,16 +525,16 @@ 
     if (strlen($color) == 6) {
         $background = imagecolorallocate(
             $destination_image,
-            intval($color[0] . $color[1], 16),
-            intval($color[2] . $color[3], 16),
-            intval($color[4] . $color[5], 16)
+            intval($color[0].$color[1], 16),
+            intval($color[2].$color[3], 16),
+            intval($color[4].$color[5], 16)
         );
     } elseif (strlen($color) == 3) {
         $background = imagecolorallocate(
             $destination_image,
-            intval($color[0] . $color[0], 16),
-            intval($color[1] . $color[1], 16),
-            intval($color[2] . $color[2], 16)
+            intval($color[0].$color[0], 16),
+            intval($color[1].$color[1], 16),
+            intval($color[2].$color[2], 16)
         );
     }
     if ($background) {
@@ -544,7 +544,7 @@ 
 
 // Imagefilter
 if (ENABLE_IMAGEFILTER && !empty($filter)) {
-    $filterSet = (array) $filter;
+    $filterSet = (array)$filter;
     foreach ($filterSet as $currentFilter) {
         $rawFilterArgs = explode(',', $currentFilter);
         $filterConst = constant(array_shift($rawFilterArgs));
@@ -632,25 +632,25 @@ 
  * Send the edited image to the browser
  */
 // See if the browser already has the image
-$last_modified_string = gmdate('D, d M Y H:i:s', $imageCreatedTime) . ' GMT';
+$last_modified_string = gmdate('D, d M Y H:i:s', $imageCreatedTime).' GMT';
 $etag = md5($imageData);
 doConditionalGet($etag, $last_modified_string);
 
 header('HTTP/1.1 200 OK');
 // if image is cacheable
 if (!isset($_GET['nocache']) && !isset($_GET['nobrowsercache'])) {
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $imageCreatedTime) . 'GMT');
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $imageCreatedTime).'GMT');
     header('Cache-control: max-age=31536000');
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 31536000) . 'GMT');
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + 31536000).'GMT');
 } else {
     // "Kill" the browser cache
     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // past date
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); // always modified
     header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
     header('Cache-Control: post-check=0, pre-check=0', false);
     header('Pragma: no-cache'); // HTTP/1.0
 }
 header("Content-type: {$imageMimetype}");
 header("Content-disposition: filename={$imageFilename}");
-header('Content-Length: ' . strlen($imageData));
+header('Content-Length: '.strlen($imageData));
 echo $imageData;

htdocs/mainfile.dist.php

Spacing +2 added lines, -2 removed lines

@@ -69,13 +69,13 @@
     }
 
     // Secure file
-    require XOOPS_VAR_PATH . '/data/secure.php';
+    require XOOPS_VAR_PATH.'/data/secure.php';
 
     define('XOOPS_GROUP_ADMIN', '1');
     define('XOOPS_GROUP_USERS', '2');
     define('XOOPS_GROUP_ANONYMOUS', '3');
 
     if (!isset($xoopsOption['nocommon']) && XOOPS_ROOT_PATH != '') {
-        include XOOPS_ROOT_PATH . '/include/common.php';
+        include XOOPS_ROOT_PATH.'/include/common.php';
     }
 }

htdocs/install/page_dbconnection.php

Indentation +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@
 if (@empty($vars['DB_HOST'])) {
     // Fill with default values
     $vars = array_merge($vars, array(
-                                 'DB_TYPE'     => 'mysql',
-                                 'DB_HOST'     => 'localhost',
-                                 'DB_USER'     => '',
-                                 'DB_PASS'     => '',
-                                 'DB_PCONNECT' => 0));
+                                    'DB_TYPE'     => 'mysql',
+                                    'DB_HOST'     => 'localhost',
+                                    'DB_USER'     => '',
+                                    'DB_PASS'     => '',
+                                    'DB_PCONNECT' => 0));
 }
 ob_start();
 ?>

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 $pageHasForm = true;
 $pageHasHelp = true;
 
-$vars =& $_SESSION['settings'];
+$vars = & $_SESSION['settings'];
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     $params = array('DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_PASS');
@@ -46,7 +46,7 @@ 
     $hostConnectPrefix = empty($vars['DB_PCONNECT']) ? '' : 'p:';
     $link = new mysqli($hostConnectPrefix.$vars['DB_HOST'], $vars['DB_USER'], $vars['DB_PASS']);
     if (0 !== $link->connect_errno) {
-        $error = ERR_NO_DBCONNECTION .' (' . $link->connect_errno . ') ' . $link->connect_error;;
+        $error = ERR_NO_DBCONNECTION.' ('.$link->connect_errno.') '.$link->connect_error; ;
     }
     if (empty($error)) {
         $wizard->redirectToPage('+1');
@@ -66,7 +66,7 @@ 
 ob_start();
 ?>
 <?php if (!empty($error)) {
-    echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> ' . $error . "</div>\n";
+    echo '<div class="alert alert-danger"><span class="fa fa-ban text-danger"></span> '.$error."</div>\n";
 } ?>
     <div class="panel panel-info">
     <div class="panel-heading"><?php echo LEGEND_CONNECTION; ?></div>

htdocs/install/language/english/install.php

Spacing +11 added lines, -11 removed lines

@@ -40,9 +40,9 @@ 
 // Titles (main and pages)
 define('XOOPS_INSTALL_WIZARD', 'XOOPS Installation Wizard');
 define('LANGUAGE_SELECTION', 'Language selection');
-define('LANGUAGE_SELECTION_TITLE', 'Select your language');        // L128
+define('LANGUAGE_SELECTION_TITLE', 'Select your language'); // L128
 define('INTRODUCTION', 'Introduction');
-define('INTRODUCTION_TITLE', 'Welcome to the XOOPS Installation Wizard');        // L0
+define('INTRODUCTION_TITLE', 'Welcome to the XOOPS Installation Wizard'); // L0
 define('CONFIGURATION_CHECK', 'Configuration check');
 define('CONFIGURATION_CHECK_TITLE', 'Checking your server configuration');
 define('PATHS_SETTINGS', 'Paths settings');
@@ -60,35 +60,35 @@ 
 define('DATA_INSERTION', 'Data insertion');
 define('DATA_INSERTION_TITLE', 'Saving your settings to the database');
 define('WELCOME', 'Welcome');
-define('WELCOME_TITLE', 'Welcome to your XOOPS site');        // L0
+define('WELCOME_TITLE', 'Welcome to your XOOPS site'); // L0
 // Settings (labels and help text)
 define('XOOPS_PATHS', 'XOOPS Physical paths');
 define('XOOPS_URLS', 'Web locations');
 define('XOOPS_ROOT_PATH_LABEL', 'XOOPS documents root physical path');
 define('XOOPS_ROOT_PATH_HELP', 'Physical path to the XOOPS documents (served) directory WITHOUT trailing slash');
 define('XOOPS_LIB_PATH_LABEL', 'XOOPS library directory');
-define('XOOPS_LIB_PATH_HELP', 'Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of ' . XOOPS_ROOT_PATH_LABEL . ' to make it secure.');
+define('XOOPS_LIB_PATH_HELP', 'Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of '.XOOPS_ROOT_PATH_LABEL.' to make it secure.');
 define('XOOPS_DATA_PATH_LABEL', 'XOOPS data files directory');
-define('XOOPS_DATA_PATH_HELP', 'Physical path to the XOOPS data files (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of ' . XOOPS_ROOT_PATH_LABEL . ' to make it secure.');
+define('XOOPS_DATA_PATH_HELP', 'Physical path to the XOOPS data files (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of '.XOOPS_ROOT_PATH_LABEL.' to make it secure.');
 define('XOOPS_URL_LABEL', 'Website location (URL)'); // L56
 define('XOOPS_URL_HELP', 'Main URL that will be used to access your XOOPS installation'); // L58
 define('LEGEND_CONNECTION', 'Server connection');
 define('LEGEND_DATABASE', 'Database'); // L51
-define('DB_HOST_LABEL', 'Server hostname');    // L27
+define('DB_HOST_LABEL', 'Server hostname'); // L27
 define('DB_HOST_HELP', 'Hostname of the database server. If you are unsure, <em>localhost</em> works in most cases'); // L67
-define('DB_USER_LABEL', 'User name');    // L28
+define('DB_USER_LABEL', 'User name'); // L28
 define('DB_USER_HELP', 'Name of the user account that will be used to connect to the database server'); // L65
-define('DB_PASS_LABEL', 'Password');    // L52
+define('DB_PASS_LABEL', 'Password'); // L52
 define('DB_PASS_HELP', 'Password of your database user account'); // L68
-define('DB_NAME_LABEL', 'Database name');    // L29
+define('DB_NAME_LABEL', 'Database name'); // L29
 define('DB_NAME_HELP', 'The name of database on the host. The installer will attempt to create the database if not exist'); // L64
 define('DB_CHARSET_LABEL', 'Database character set');
 define('DB_CHARSET_HELP', 'MySQL includes character set support that enables you to store data using a variety of character sets and perform comparisons according to a variety of collations.');
 define('DB_COLLATION_LABEL', 'Database collation');
 define('DB_COLLATION_HELP', 'A collation is a set of rules for comparing characters in a character set.');
-define('DB_PREFIX_LABEL', 'Table prefix');    // L30
+define('DB_PREFIX_LABEL', 'Table prefix'); // L30
 define('DB_PREFIX_HELP', 'This prefix will be added to all new tables created to avoid name conflicts in the database. If you are unsure, just keep the default'); // L63
-define('DB_PCONNECT_LABEL', 'Use persistent connection');    // L54
+define('DB_PCONNECT_LABEL', 'Use persistent connection'); // L54
 define('DB_PCONNECT_HELP', "Default is 'No'. Leave it blank if you are unsure"); // L69
 define('DB_DATABASE_LABEL', 'Database');
 define('LEGEND_ADMIN_ACCOUNT', 'Administrator account');

htdocs/install/include/install_tpl.php

Spacing +17 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
  **/
 
 defined('XOOPS_INSTALL') || die('XOOPS Installation wizard die');
-include_once '../language/' . $wizard->language . '/global.php';
+include_once '../language/'.$wizard->language.'/global.php';
 ?><!doctype html>
 <html lang="<?php echo _LANGCODE; ?>">
 
@@ -40,8 +40,8 @@ 
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title><?php echo XOOPS_VERSION . ' : ' . XOOPS_INSTALL_WIZARD; ?>
-        (<?php echo ($wizard->pageIndex + 1) . '/' . count($wizard->pages); ?>)</title>
+    <title><?php echo XOOPS_VERSION.' : '.XOOPS_INSTALL_WIZARD; ?>
+        (<?php echo ($wizard->pageIndex + 1).'/'.count($wizard->pages); ?>)</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="assets/css/bootstrap.min.css" rel="stylesheet">
@@ -64,8 +64,8 @@ 
     }
     ?>
     <?php
-    if (file_exists('language/' . $wizard->language . '/style.css')) {
-        echo '<link rel="stylesheet" type="text/css" media="all" href="language/' . $wizard->language . '/style.css" />';
+    if (file_exists('language/'.$wizard->language.'/style.css')) {
+        echo '<link rel="stylesheet" type="text/css" media="all" href="language/'.$wizard->language.'/style.css" />';
     }
     ?>
     <script type="text/javascript" src="./assets/js/xo-installer.js"></script>
@@ -94,9 +94,9 @@ 
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-book"></i> <?php echo SUPPORT; ?> <b class="caret"></b></a>
                 <ul class="dropdown-menu">
                     <?php
-                    @include_once './language/' . $wizard->language . '/support.php';
+                    @include_once './language/'.$wizard->language.'/support.php';
                     foreach ($supports as $lang => $support) {
-                        echo '<li><a href="' . $support['url'] . '" target="_blank">' . $support['title'] . '</a></li>';
+                        echo '<li><a href="'.$support['url'].'" target="_blank">'.$support['title'].'</a></li>';
                     }
                     ?>
                 </ul>
@@ -116,14 +116,14 @@ 
                 <?php
                 foreach (array_keys($wizard->pages) as $k => $page) {
                     if ($k == $wizard->pageIndex) {
-                        echo'<li class="active"><a><i class="' . $wizard->pages[$page]['icon'] . '"></i> '
-                            . $wizard->pages[$page]['name'] . '</a></li>';
+                        echo'<li class="active"><a><i class="'.$wizard->pages[$page]['icon'].'"></i> '
+                            . $wizard->pages[$page]['name'].'</a></li>';
                     } elseif ($k > $wizard->pageIndex) {
-                        echo'<li class="disabled"><a><i class="' . $wizard->pages[$page]['icon'] . '"></i> '
-                            . $wizard->pages[$page]['name'] . '</a></li>';
+                        echo'<li class="disabled"><a><i class="'.$wizard->pages[$page]['icon'].'"></i> '
+                            . $wizard->pages[$page]['name'].'</a></li>';
                     } else {
-                        echo'<li><a href="' . $wizard->pageURI($page) . '"><i class="'
-                            . $wizard->pages[$page]['icon'] . ' text-success"></i> ' . $wizard->pages[$page]['name']
+                        echo'<li><a href="'.$wizard->pageURI($page).'"><i class="'
+                            . $wizard->pages[$page]['icon'].' text-success"></i> '.$wizard->pages[$page]['name']
                             . '</a></li>';
                     }
                 }
@@ -167,7 +167,7 @@ 
                                     <span class="<?php echo $wizard->pages[$wizard->currentPage]['icon']; ?> fa-5x"></span>
                                 </div>
                                 <div class="col-xs-9 text-right">
-                                    <div class="huge"><?php echo ($wizard->pageIndex + 1) . '/' . count($wizard->pages); ?></div>
+                                    <div class="huge"><?php echo ($wizard->pageIndex + 1).'/'.count($wizard->pages); ?></div>
                                     <div><?php echo XOOPS_INSTALLING; ?></div>
                                 </div>
                             </div>
@@ -179,8 +179,8 @@ 
                     </div>
                 </div>
                 <?php
-                $versionParts=array();
-                $versionResult = preg_match ('/(^[a-z\s]*)([0-9\.]*)/i', XOOPS_VERSION, $versionParts);
+                $versionParts = array();
+                $versionResult = preg_match('/(^[a-z\s]*)([0-9\.]*)/i', XOOPS_VERSION, $versionParts);
                 ?>
 
                 <div class="col-lg-3 col-md-6">
@@ -251,7 +251,7 @@ 
          * Check the url to see if we reached 'page_end.php' and if so, launch the cleanup via ajax.
          **/
         if ('page_end.php' == location.pathname.substring(location.pathname.lastIndexOf('/') + 1)) {
-            $.post( "cleanup.php", { instsuffix: <?php echo isset($install_rename_suffix) ? "'" . $install_rename_suffix . "'" : "''"; ?> } );
+            $.post( "cleanup.php", { instsuffix: <?php echo isset($install_rename_suffix) ? "'".$install_rename_suffix."'" : "''"; ?> } );
         };
     });
 </script>