XOOPS / XoopsCore25

htdocs/class/uploader.php

Spacing +15 added lines, -15 removed lines

@@ -75,7 +75,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;
@@ -126,7 +126,7 @@ 
         14 => 'iff',
         15 => 'wbmp',
         16 => 'xbm');
-    public $randomFilename  = false;
+    public $randomFilename = false;
 
     /**
      * Constructor
@@ -148,7 +148,7 @@ 
             return false;
         }
         if (is_array($allowedMimeTypes)) {
-            $this->allowedMimeTypes =& $allowedMimeTypes;
+            $this->allowedMimeTypes = & $allowedMimeTypes;
         }
         $this->uploadDir = $uploadDir;
 
@@ -172,7 +172,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');
         }
     }
@@ -238,7 +238,7 @@ 
             $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];
@@ -249,11 +249,11 @@ 
 
             return false;
         } 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'];
@@ -269,7 +269,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;
@@ -468,7 +468,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);
         }
@@ -477,7 +477,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));
 
@@ -572,7 +572,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);
@@ -628,8 +628,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);
     }
@@ -657,9 +657,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>';
                 }
             }