jaxon-php / jaxon-core

src/Jaxon.php

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;

Spacing +26 added lines, -26 removed lines

@@ -132,7 +132,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,
@@ -209,13 +209,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;
             }
@@ -301,7 +301,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
@@ -310,7 +310,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -319,18 +319,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,
@@ -343,7 +343,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());
@@ -354,7 +354,7 @@ 
                     $aParams = array($e);
                 }
 
-                if(isset($this->aProcessingEvents[$sEvent]))
+                if (isset($this->aProcessingEvents[$sEvent]))
                 {
                     // Call the processing event
                     $this->aProcessingEvents[$sEvent]->call($aParams);
@@ -367,7 +367,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)
@@ -377,10 +377,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));
@@ -389,7 +389,7 @@ 
 
         $this->getResponseManager()->printDebug();
 
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             $this->getResponseManager()->sendOutput();
             exit();
@@ -439,16 +439,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";
         }
@@ -546,7 +546,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);
@@ -622,7 +622,7 @@ 
      */
     public function hasUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return false;
         }
@@ -638,11 +638,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'));
             }
@@ -651,14 +651,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();
         }
@@ -672,7 +672,7 @@ 
      */
     public function getUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return [];
         }
@@ -688,7 +688,7 @@ 
      */
     public function setUploadFileFilter(Closure $fFileFilter)
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return;
         }