jaxon-php / jaxon-core

src/Request/Plugin/FileUpload.php

Spacing +27 added lines, -27 removed lines

@@ -49,11 +49,11 @@ 
     {
         $this->aUserFiles = [];
 
-        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'];
         }
@@ -81,7 +81,7 @@ 
      */
     protected function filterFilename($sFilename, $sVarName)
     {
-        if(($this->fFileFilter))
+        if (($this->fFileFilter))
         {
             $fFileFilter = $this->fFileFilter;
             $sFilename = (string)$fFileFilter($sFilename, $sVarName);
@@ -98,17 +98,17 @@ 
     {
         // 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']))
             {
-                for($i = 0; $i < count($aFile['name']); $i++)
+                for ($i = 0; $i < count($aFile['name']); $i++)
                 {
-                    if(!$aFile['name'][$i])
+                    if (!$aFile['name'][$i])
                     {
                         continue;
                     }
-                    if(!array_key_exists($sVarName, $aTempFiles))
+                    if (!array_key_exists($sVarName, $aTempFiles))
                     {
                         $aTempFiles[$sVarName] = [];
                     }
@@ -128,11 +128,11 @@ 
             }
             else
             {
-                if(!$aFile['name'])
+                if (!$aFile['name'])
                 {
                     continue;
                 }
-                if(!array_key_exists($sVarName, $aTempFiles))
+                if (!array_key_exists($sVarName, $aTempFiles))
                 {
                     $aTempFiles[$sVarName] = [];
                 }
@@ -155,24 +155,24 @@ 
         $sDefaultUploadDir = $this->getOption('upload.default.dir');
 
         // 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());
                 }
                 // Verify that the upload dir exists and is writable
                 $sUploadDir = $this->getOption('upload.files.' . $sVarName . '.dir', $sDefaultUploadDir);
                 $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-                if(!is_writable($sUploadDir))
+                if (!is_writable($sUploadDir))
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
                 }
@@ -180,10 +180,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)
             {
                 // Set the user file data
                 $sUploadDir = $this->getOption('upload.files.' . $sVarName . '.dir', $sDefaultUploadDir);
@@ -206,16 +206,16 @@ 
         // Default upload dir
         $sUploadDir = $this->getOption('upload.default.dir');
         $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-        if(!is_writable($sUploadDir))
+        if (!is_writable($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
         // 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();
             }
@@ -238,16 +238,16 @@ 
         $sUploadDir = $this->getOption('upload.default.dir');
         $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
         $sUploadDir .= 'tmp' . DIRECTORY_SEPARATOR;
-        if(!is_readable($sUploadDir . $this->sTempFile . '.json'))
+        if (!is_readable($sUploadDir . $this->sTempFile . '.json'))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
         $aFiles = file_get_contents($sUploadDir . $this->sTempFile . '.json');
         $aFiles = json_decode($aFiles, 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);
             }
@@ -324,15 +324,15 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
-        if(count($_FILES) > 0)
+        if (count($_FILES) > 0)
         {
             $this->readFromHttpData();
         }
-        elseif(($this->sTempFile))
+        elseif (($this->sTempFile))
         {
             $this->readFromTempFile();
         }
@@ -347,7 +347,7 @@ 
     public function saveUploadedFiles()
     {
         // Process uploaded files
-        if(!$this->processRequest())
+        if (!$this->processRequest())
         {
             return '';
         }

Braces +3 added lines, -6 removed lines

@@ -52,8 +52,7 @@ 
         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'];
         }
@@ -125,8 +124,7 @@ 
                         'extension' => pathinfo($aFile['name'][$i], PATHINFO_EXTENSION),
                     ];
                 }
-            }
-            else
+            } else
             {
                 if(!$aFile['name'])
                 {
@@ -331,8 +329,7 @@ 
         if(count($_FILES) > 0)
         {
             $this->readFromHttpData();
-        }
-        elseif(($this->sTempFile))
+        } elseif(($this->sTempFile))
         {
             $this->readFromTempFile();
         }

src/Jaxon.php

Spacing +26 added lines, -26 removed lines

@@ -131,7 +131,7 @@ 
             'core.prefix.event'                 => 'jaxon_event_',
             // 'core.request.uri'               => '',
             'core.request.mode'                 => 'asynchronous',
-            'core.request.method'               => 'POST',    // W3C: Method is case sensitive
+            'core.request.method'               => 'POST', // W3C: Method is case sensitive
             'core.debug.on'                     => false,
             'core.debug.verbose'                => false,
             'core.process.exit'                 => true,
@@ -208,13 +208,13 @@ 
         $aArgs = func_get_args();
         $nArgs = func_num_args();
 
-        if(self::PROCESSING_EVENT == $sType)
+        if (self::PROCESSING_EVENT == $sType)
         {
-            if($nArgs > 2)
+            if ($nArgs > 2)
             {
                 $sEvent = $xArgs;
                 $xUserFunction = $aArgs[2];
-                if(!is_a($xUserFunction, 'Request\\Support\\UserFunction'))
+                if (!is_a($xUserFunction, 'Request\\Support\\UserFunction'))
                     $xUserFunction = new Request\Support\UserFunction($xUserFunction);
                 $this->aProcessingEvents[$sEvent] = $xUserFunction;
             }
@@ -300,7 +300,7 @@ 
     public function processRequest()
     {
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($filename, $linenumber))
+        if (headers_sent($filename, $linenumber))
         {
             echo $this->trans('errors.output.already-sent', array(
                 'location' => $filename . ':' . $linenumber
@@ -309,7 +309,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -318,18 +318,18 @@ 
         $mResult = true;
 
         // Handle before processing event
-        if(isset($this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]))
+        if (isset($this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]))
         {
             $this->aProcessingEvents[self::PROCESSING_EVENT_BEFORE]->call(array(&$bEndRequest));
         }
 
-        if(!$bEndRequest)
+        if (!$bEndRequest)
         {
             try
             {
                 $mResult = $this->getPluginManager()->processRequest();
             }
-            catch(Exception $e)
+            catch (Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -342,7 +342,7 @@ 
                 $xResponseManager->debug($e->getMessage());
                 $mResult = false;
 
-                if($e instanceof \Jaxon\Exception\Error)
+                if ($e instanceof \Jaxon\Exception\Error)
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
@@ -353,7 +353,7 @@ 
                     $aParams = array($e);
                 }
 
-                if(isset($this->aProcessingEvents[$sEvent]))
+                if (isset($this->aProcessingEvents[$sEvent]))
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
@@ -366,7 +366,7 @@ 
             }
         }
         // Clean the processing buffer
-        if(($this->getOption('core.process.clean')))
+        if (($this->getOption('core.process.clean')))
         {
             $er = error_reporting(0);
             while (ob_get_level() > 0)
@@ -376,10 +376,10 @@ 
             error_reporting($er);
         }
 
-        if($mResult === true)
+        if ($mResult === true)
         {
             // Handle after processing event
-            if(isset($this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]))
+            if (isset($this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]))
             {
                 $bEndRequest = false;
                 $this->aProcessingEvents[self::PROCESSING_EVENT_AFTER]->call(array($bEndRequest));
@@ -388,7 +388,7 @@ 
 
         $this->getResponseManager()->printDebug();
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             $this->getResponseManager()->sendOutput();
             exit();
@@ -438,16 +438,16 @@ 
      */
     public function getScript($bIncludeJs = false, $bIncludeCss = false)
     {
-        if(!$this->getOption('core.request.uri'))
+        if (!$this->getOption('core.request.uri'))
         {
             $this->setOption('core.request.uri', URI::detect());
         }
         $sCode = '';
-        if(($bIncludeCss))
+        if (($bIncludeCss))
         {
             $sCode .= $this->getPluginManager()->getCss() . "\n";
         }
-        if(($bIncludeJs))
+        if (($bIncludeJs))
         {
             $sCode .= $this->getPluginManager()->getJs() . "\n";
         }
@@ -545,7 +545,7 @@ 
     public function readConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
         $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
-        switch($sExt)
+        switch ($sExt)
         {
         case 'php':
             return $this->readPhpConfigFile($sConfigFile, $sLibKey, $sAppKey);
@@ -621,7 +621,7 @@ 
      */
     public function hasUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return false;
         }
@@ -637,11 +637,11 @@ 
     {
         try
         {
-            if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+            if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
             {
                 throw new Exception($this->trans('errors.upload.plugin'));
             }
-            elseif(!$xUploadPlugin->canProcessRequest())
+            elseif (!$xUploadPlugin->canProcessRequest())
             {
                 throw new Exception($this->trans('errors.upload.request'));
             }
@@ -650,14 +650,14 @@ 
             $sResponse = '{"code": "success", "upl": "' . $sKey . '"}';
             $return = true;
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $sResponse = '{"code": "error", "msg": "' . addslashes($e->getMessage()) . '"}';
             $return = false;
         }
         // Send the response back to the browser
         echo '<script>var res = ', $sResponse, '; </script>';
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             exit();
         }
@@ -671,7 +671,7 @@ 
      */
     public function getUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return [];
         }
@@ -687,7 +687,7 @@ 
      */
     public function setUploadFileFilter($fFileFilter)
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return;
         }

Braces +8 added lines, -12 removed lines

@@ -214,8 +214,9 @@ 
             {
                 $sEvent = $xArgs;
                 $xUserFunction = $aArgs[2];
-                if(!is_a($xUserFunction, 'Request\\Support\\UserFunction'))
-                    $xUserFunction = new Request\Support\UserFunction($xUserFunction);
+                if(!is_a($xUserFunction, 'Request\\Support\\UserFunction')) {
+                                    $xUserFunction = new Request\Support\UserFunction($xUserFunction);
+                }
                 $this->aProcessingEvents[$sEvent] = $xUserFunction;
             }
             /*else
@@ -328,8 +329,7 @@ 
             try
             {
                 $mResult = $this->getPluginManager()->processRequest();
-            }
-            catch(Exception $e)
+            } catch(Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -346,8 +346,7 @@ 
                 {
                     $sEvent = self::PROCESSING_EVENT_INVALID;
                     $aParams = array($e->getMessage());
-                }
-                else
+                } else
                 {
                     $sEvent = self::PROCESSING_EVENT_ERROR;
                     $aParams = array($e);
@@ -357,8 +356,7 @@ 
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
-                }
-                else
+                } else
                 {
                     // The exception is not to be processed here.
                     throw $e;
@@ -640,8 +638,7 @@ 
             if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
             {
                 throw new Exception($this->trans('errors.upload.plugin'));
-            }
-            elseif(!$xUploadPlugin->canProcessRequest())
+            } elseif(!$xUploadPlugin->canProcessRequest())
             {
                 throw new Exception($this->trans('errors.upload.request'));
             }
@@ -649,8 +646,7 @@ 
             $sKey = $xUploadPlugin->saveUploadedFiles();
             $sResponse = '{"code": "success", "upl": "' . $sKey . '"}';
             $return = true;
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $sResponse = '{"code": "error", "msg": "' . addslashes($e->getMessage()) . '"}';
             $return = false;