jaxon-php / jaxon-core

src/Request/Plugin/FileUpload.php

Spacing +29 added lines, -29 removed lines

@@ -68,11 +68,11 @@ 
     {
         $this->sUploadSubdir = uniqid() . DIRECTORY_SEPARATOR;
 
-        if(array_key_exists('jxnupl', $_POST))
+        if (array_key_exists('jxnupl', $_POST))
         {
             $this->sTempFile = $_POST['jxnupl'];
         }
-        elseif(array_key_exists('jxnupl', $_GET))
+        elseif (array_key_exists('jxnupl', $_GET))
         {
             $this->sTempFile = $_GET['jxnupl'];
         }
@@ -100,7 +100,7 @@ 
      */
     protected function filterFilename($sFilename, $sVarName)
     {
-        if(($this->cFileFilter))
+        if (($this->cFileFilter))
         {
             $cFileFilter = $this->cFileFilter;
             $sFilename = (string)$cFileFilter($sFilename, $sVarName);
@@ -120,12 +120,12 @@ 
     {
         $sUploadDir = rtrim(trim($sUploadDir), '/\\') . DIRECTORY_SEPARATOR;
         // Verify that the upload dir exists and is writable
-        if(!is_writable($sUploadDir))
+        if (!is_writable($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
         $sUploadDir .= $sUploadSubDir;
-        if(!file_exists($sUploadDir) && !@mkdir($sUploadDir))
+        if (!file_exists($sUploadDir) && !@mkdir($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -172,7 +172,7 @@ 
         $sUploadDir = rtrim(trim($sUploadDir), '/\\') . DIRECTORY_SEPARATOR;
         $sUploadDir .= 'tmp' . DIRECTORY_SEPARATOR;
         $sUploadTempFile = $sUploadDir . $this->sTempFile . '.json';
-        if(!is_readable($sUploadTempFile))
+        if (!is_readable($sUploadTempFile))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -188,18 +188,18 @@ 
     {
         // Check validity of the uploaded files
         $aTempFiles = [];
-        foreach($_FILES as $sVarName => $aFile)
+        foreach ($_FILES as $sVarName => $aFile)
         {
-            if(is_array($aFile['name']))
+            if (is_array($aFile['name']))
             {
                 $nFileCount = count($aFile['name']);
-                for($i = 0; $i < $nFileCount; $i++)
+                for ($i = 0; $i < $nFileCount; $i++)
                 {
-                    if(!$aFile['name'][$i])
+                    if (!$aFile['name'][$i])
                     {
                         continue;
                     }
-                    if(!array_key_exists($sVarName, $aTempFiles))
+                    if (!array_key_exists($sVarName, $aTempFiles))
                     {
                         $aTempFiles[$sVarName] = [];
                     }
@@ -219,11 +219,11 @@ 
             }
             else
             {
-                if(!$aFile['name'])
+                if (!$aFile['name'])
                 {
                     continue;
                 }
-                if(!array_key_exists($sVarName, $aTempFiles))
+                if (!array_key_exists($sVarName, $aTempFiles))
                 {
                     $aTempFiles[$sVarName] = [];
                 }
@@ -243,17 +243,17 @@ 
         }
 
         // Check uploaded files validity
-        foreach($aTempFiles as $sVarName => $aFiles)
+        foreach ($aTempFiles as $sVarName => $aFiles)
         {
-            foreach($aFiles as $aFile)
+            foreach ($aFiles as $aFile)
             {
                 // Verify upload result
-                if($aFile['error'] != 0)
+                if ($aFile['error'] != 0)
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.upload.failed', $aFile));
                 }
                 // Verify file validity (format, size)
-                if(!$this->validateUploadedFile($sVarName, $aFile))
+                if (!$this->validateUploadedFile($sVarName, $aFile))
                 {
                     throw new \Jaxon\Exception\Error($this->getValidatorMessage());
                 }
@@ -263,10 +263,10 @@ 
         }
 
         // Copy the uploaded files from the temp dir to the user dir
-        foreach($aTempFiles as $sVarName => $_aTempFiles)
+        foreach ($aTempFiles as $sVarName => $_aTempFiles)
         {
             $this->aUserFiles[$sVarName] = [];
-            foreach($_aTempFiles as $aFile)
+            foreach ($_aTempFiles as $aFile)
             {
                 // Get the path to the upload dir
                 $sUploadDir = $this->getUploadDir($sVarName);
@@ -288,10 +288,10 @@ 
     {
         // Convert uploaded file to an array
         $aFiles = [];
-        foreach($this->aUserFiles as $sVarName => $aUserFiles)
+        foreach ($this->aUserFiles as $sVarName => $aUserFiles)
         {
             $aFiles[$sVarName] = [];
-            foreach($aUserFiles as $aUserFile)
+            foreach ($aUserFiles as $aUserFile)
             {
                  $aFiles[$sVarName][] = $aUserFile->toTempData();
             }
@@ -312,10 +312,10 @@ 
         // Upload temp file
         $sUploadTempFile = $this->getUploadTempFile();
         $aFiles = json_decode(file_get_contents($sUploadTempFile), true);
-        foreach($aFiles as $sVarName => $aUserFiles)
+        foreach ($aFiles as $sVarName => $aUserFiles)
         {
             $this->aUserFiles[$sVarName] = [];
-            foreach($aUserFiles as $aUserFile)
+            foreach ($aUserFiles as $aUserFile)
             {
                 $this->aUserFiles[$sVarName][] = UploadedFile::fromTempData($aUserFile);
             }
@@ -382,7 +382,7 @@ 
      */
     public function noRequestPluginFound()
     {
-        if(count($_FILES) > 0)
+        if (count($_FILES) > 0)
         {
             $this->bRequestIsHttpUpload = true;
         }
@@ -405,17 +405,17 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
-        if(count($_FILES) > 0)
+        if (count($_FILES) > 0)
         {
             // Ajax request with upload
             $this->readFromHttpData();
 
-            if($this->bRequestIsHttpUpload)
+            if ($this->bRequestIsHttpUpload)
             {
                 // Process an HTTP upload request
                 // This requires to set the response to be returned.
@@ -425,14 +425,14 @@ 
                     $this->saveToTempFile();
                     $xResponse->setUploadedFile($this->sTempFile);
                 }
-                catch(Exception $e)
+                catch (Exception $e)
                 {
                     $xResponse->setErrorMessage($e->getMessage());
                 }
                 jaxon()->di()->getResponseManager()->append($xResponse);
             }
         }
-        elseif(($this->sTempFile))
+        elseif (($this->sTempFile))
         {
             // Ajax request following and HTTP upload
             $this->readFromTempFile();