jaxon-php / jaxon-core

src/Jaxon.php

Doc Comments +6 added lines, -15 removed lines

@@ -191,15 +191,6 @@ 
      *        - Jaxon::CALLABLE_OBJECT: an object who's methods are to be registered
      *        - Jaxon::BROWSER_EVENT: an event which will cause zero or more event handlers to be called
      *        - Jaxon::EVENT_HANDLER: register an event handler function.
-     * @param mixed        $sFunction | $objObject | $sEvent
-     *        When registering a function, this is the name of the function
-     *        When registering a callable object, this is the object being registered
-     *        When registering an event or event handler, this is the name of the event
-     * @param mixed        $sIncludeFile | $aCallOptions | $sEventHandler
-     *        When registering a function, this is the (optional) include file
-     *        When registering a callable object, this is an (optional) array
-     *             of call options for the functions being registered
-     *        When registering an event handler, this is the name of the function
      *
      * @return mixed
      */
@@ -498,7 +489,7 @@ 
      * @param string        $sLibKey            The key of the library options in the file
      * @param string|null   $sAppKey            The key of the application options in the file
      *
-     * @return array
+     * @return null|Utils\Config\Config
      */
     public function readPhpConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -512,7 +503,7 @@ 
      * @param string        $sLibKey            The key of the library options in the file
      * @param string|null   $sAppKey            The key of the application options in the file
      *
-     * @return array
+     * @return null|Utils\Config\Config
      */
     public function readYamlConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -526,7 +517,7 @@ 
      * @param string        $sLibKey            The key of the library options in the file
      * @param string|null   $sAppKey            The key of the application options in the file
      *
-     * @return array
+     * @return Utils\Config\Config|null
      */
     public function readJsonConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -540,7 +531,7 @@ 
      * @param string        $sLibKey            The key of the library options in the file
      * @param string|null   $sAppKey            The key of the application options in the file
      *
-     * @return array
+     * @return null|Utils\Config\Config
      */
     public function readConfigFile($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
@@ -568,7 +559,7 @@ 
      * - 1000 thru 8999: User created plugins, typically, these plugins don't care about order
      * - 9000 thru 9999: Plugins that generally need to be last or near the end of the plugin list
      *
-     * @param Plugin         $xPlugin               An instance of a plugin
+     * @param Plugin\Plugin         $xPlugin               An instance of a plugin
      * @param integer        $nPriority             The plugin priority, used to order the plugins
      *
      * @return void
@@ -631,7 +622,7 @@ 
    /**
      * Check uploaded files validity and move them to the user dir
      *
-     * @return boolean
+     * @return null|boolean
      */
     public function saveUploadedFiles()
     {

Indentation +2 added lines, -2 removed lines

@@ -614,7 +614,7 @@ 
         $this->addViewNamespace('pagination', $sDirectory, '.php');
     }
 
-   /**
+    /**
      * Check if uploaded files are available
      *
      * @return boolean
@@ -628,7 +628,7 @@ 
         return $xUploadPlugin->canProcessRequest();
     }
 
-   /**
+    /**
      * Check uploaded files validity and move them to the user dir
      *
      * @return boolean

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'));
             }
-            else if(!$xUploadPlugin->canProcessRequest())
+            else if (!$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'));
-            }
-            else if(!$xUploadPlugin->canProcessRequest())
+            } else if(!$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;

src/Request/Plugin/FileUpload.php

Doc Comments +2 added lines, -2 removed lines

@@ -280,7 +280,7 @@ 
      *
      * @param array         $aArgs                An array containing the event specification
      *
-     * @return \Jaxon\Request\Request
+     * @return boolean
      */
     public function register($aArgs)
     {
@@ -342,7 +342,7 @@ 
     /**
      * Check uploaded files validity and move them to the user dir
      *
-     * @return boolean
+     * @return string
      */
     public function saveUploadedFiles()
     {

Indentation +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
             $aFiles[$sVarName] = [];
             foreach($aUserFiles as $aUserFile)
             {
-                 $aFiles[$sVarName][] = $aUserFile->toTempData();
+                    $aFiles[$sVarName][] = $aUserFile->toTempData();
             }
         }
         // Save upload data in a temp file

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'];
         }
-        else if(array_key_exists('jxnupl', $_GET))
+        else if (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();
         }
-        else if(($this->sTempFile))
+        else if (($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'];
-        }
-        else if(array_key_exists('jxnupl', $_GET))
+        } else if(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();
-        }
-        else if(($this->sTempFile))
+        } else if(($this->sTempFile))
         {
             $this->readFromTempFile();
         }

src/Plugin/Manager.php

Spacing +58 added lines, -58 removed lines

@@ -262,32 +262,32 @@ 
     {
         $bIsAlert = ($xPlugin instanceof \Jaxon\Request\Interfaces\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Request\Interfaces\Confirm);
-        if($xPlugin instanceof Request)
+        if ($xPlugin instanceof Request)
         {
             // The name of a request plugin is used as key in the plugin table
             $this->aRequestPlugins[$xPlugin->getName()] = $xPlugin;
         }
-        elseif($xPlugin instanceof Response)
+        elseif ($xPlugin instanceof Response)
         {
             // The name of a response plugin is used as key in the plugin table
             $this->aResponsePlugins[$xPlugin->getName()] = $xPlugin;
         }
-        elseif(!$bIsConfirm && !$bIsAlert)
+        elseif (!$bIsConfirm && !$bIsAlert)
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.invalid', array('name' => get_class($xPlugin))));
         }
         // This plugin implements the Alert interface
-        if($bIsAlert)
+        if ($bIsAlert)
         {
             $this->setAlert($xPlugin);
         }
         // This plugin implements the Confirm interface
-        if($bIsConfirm)
+        if ($bIsConfirm)
         {
             $this->setConfirm($xPlugin);
         }
         // Register the plugin as an event listener
-        if($xPlugin instanceof \Jaxon\Utils\Interfaces\EventListener)
+        if ($xPlugin instanceof \Jaxon\Utils\Interfaces\EventListener)
         {
             $this->addEventListener($xPlugin);
         }
@@ -303,7 +303,7 @@ 
     private function generateHash()
     {
         $sHash = $this->getVersion();
-        foreach($this->aPlugins as $xPlugin)
+        foreach ($this->aPlugins as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
@@ -320,9 +320,9 @@ 
      */
     public function canProcessRequest()
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 return true;
             }
@@ -341,12 +341,12 @@ 
     public function processRequest()
     {
         $xUploadPlugin = $this->getRequestPlugin(Jaxon::FILE_UPLOAD);
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 // Process uploaded files
-                if($xUploadPlugin != null)
+                if ($xUploadPlugin != null)
                 {
                     $xUploadPlugin->processRequest();
                 }
@@ -370,10 +370,10 @@ 
      */
     public function register($aArgs)
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
             $mResult = $xPlugin->register($aArgs);
-            if($mResult instanceof \Jaxon\Request\Request || is_array($mResult) || $mResult === true)
+            if ($mResult instanceof \Jaxon\Request\Request || is_array($mResult) || $mResult === true)
             {
                 return $mResult;
             }
@@ -393,37 +393,37 @@ 
      */
     public function addClassDir($sDirectory, $sNamespace = '', $sSeparator = '.', array $aProtected = array())
     {
-        if(!is_dir(($sDirectory = trim($sDirectory))))
+        if (!is_dir(($sDirectory = trim($sDirectory))))
         {
             return false;
         }
         // Only '.' and '_' are allowed to be used as separator. Any other value is ignored and '.' is used instead.
-        if(($sSeparator = trim($sSeparator)) != '_')
+        if (($sSeparator = trim($sSeparator)) != '_')
         {
             $sSeparator = '.';
         }
-        if(!($sNamespace = trim($sNamespace, ' \\')))
+        if (!($sNamespace = trim($sNamespace, ' \\')))
         {
             $sNamespace = '';
         }
-        if(($sNamespace))
+        if (($sNamespace))
         {
             // If there is an autoloader, register the dir with PSR4 autoloading
-            if(($this->xAutoloader))
+            if (($this->xAutoloader))
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }
         }
-        elseif(($this->xAutoloader))
+        elseif (($this->xAutoloader))
         {
             // If there is an autoloader, register the dir with classmap autoloading
             $itDir = new RecursiveDirectoryIterator($sDirectory);
             $itFile = new RecursiveIteratorIterator($itDir);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() != 'php')
                 {
                     continue;
                 }
@@ -459,33 +459,33 @@ 
         $sClassPath = substr($xFile->getPath(), strlen($sDirectory));
         $sClassPath = str_replace($sDS, '\\', trim($sClassPath, $sDS));
         $sClassName = $xFile->getBasename('.php');
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $sClassPath = ($sClassPath) ? $sNamespace . '\\' . $sClassPath : $sNamespace;
             $sClassName = '\\' . $sClassPath . '\\' . $sClassName;
         }
         // Require the file only if autoload is enabled but there is no autoloader
-        if(($this->bAutoloadEnabled) && !($this->xAutoloader))
+        if (($this->bAutoloadEnabled) && !($this->xAutoloader))
         {
             require_once($xFile->getPathname());
         }
         // Create and register an instance of the class
-        if(!array_key_exists('*', $aOptions) || !is_array($aOptions['*']))
+        if (!array_key_exists('*', $aOptions) || !is_array($aOptions['*']))
         {
             $aOptions['*'] = array();
         }
         $aOptions['*']['separator'] = $sSeparator;
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $aOptions['*']['namespace'] = $sNamespace;
         }
-        if(($sClassPath))
+        if (($sClassPath))
         {
             $aOptions['*']['classpath'] = $sClassPath;
         }
         // Filter excluded methods
-        $aProtected = array_filter($aProtected, function ($sName) {return is_string($sName);});
-        if(count($aProtected) > 0)
+        $aProtected = array_filter($aProtected, function($sName) {return is_string($sName); });
+        if (count($aProtected) > 0)
         {
             $aOptions['*']['protected'] = $aProtected;
         }
@@ -504,13 +504,13 @@ 
         $sDS = DIRECTORY_SEPARATOR;
         // Change the keys in $aOptions to have "\" as separator
         $aNewOptions = array();
-        foreach($aOptions as $key => $aOption)
+        foreach ($aOptions as $key => $aOption)
         {
             $key = trim(str_replace(['.', '_'], ['\\', '\\'], $key), ' \\');
             $aNewOptions[$key] = $aOption;
         }
 
-        foreach($this->aClassDirs as $aClassDir)
+        foreach ($this->aClassDirs as $aClassDir)
         {
             // Get the directory
             $sDirectory = $aClassDir['directory'];
@@ -520,10 +520,10 @@ 
             $itDir = new RecursiveDirectoryIterator($sDirectory);
             $itFile = new RecursiveIteratorIterator($itDir);
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() != 'php')
                 {
                     continue;
                 }
@@ -532,13 +532,13 @@ 
                 $sClassPath = substr($xFile->getPath(), strlen($sDirectory));
                 $sClassPath = trim(str_replace($sDS, '\\', $sClassPath), '\\');
                 $sClassName = $sClassPath . '\\' . $xFile->getBasename('.php');
-                if(($sNamespace))
+                if (($sNamespace))
                 {
                     $sClassName = $sNamespace . '\\' . $sClassName;
                 }
                 // Get the class options
                 $aClassOptions = [];
-                if(array_key_exists($sClassName, $aNewOptions))
+                if (array_key_exists($sClassName, $aNewOptions))
                 {
                     $aClassOptions = $aNewOptions[$sClassName];
                 }
@@ -559,7 +559,7 @@ 
      */
     public function registerClass($sClassName, array $aOptions = array())
     {
-        if(!($sClassName = trim($sClassName, ' \\._')))
+        if (!($sClassName = trim($sClassName, ' \\._')))
         {
             return false;
         }
@@ -568,7 +568,7 @@ 
         // Replace "." and "_" with antislashes, and set the class path.
         $sClassName = str_replace(['.', '_'], ['\\', '\\'], $sClassName);
         $sClassPath = '';
-        if(($nLastSlashPosition = strrpos($sClassName, '\\')) !== false)
+        if (($nLastSlashPosition = strrpos($sClassName, '\\')) !== false)
         {
             $sClassPath = substr($sClassName, 0, $nLastSlashPosition);
             $sClassName = substr($sClassName, $nLastSlashPosition + 1);
@@ -577,7 +577,7 @@ 
         $sPartPath = str_replace('\\', $sDS, $sClassPath) . $sDS . $sClassName . '.php';
 
         // Search for the class file in all directories.
-        foreach($this->aClassDirs as $aClassDir)
+        foreach ($this->aClassDirs as $aClassDir)
         {
             // Get the separator
             $sSeparator = $aClassDir['separator'];
@@ -586,15 +586,15 @@ 
             $nLen = strlen($sNamespace);
             $sFullPath = '';
             // Check if the class belongs to the namespace
-            if(($sNamespace) && substr($sClassPath, 0, $nLen) == $sNamespace)
+            if (($sNamespace) && substr($sClassPath, 0, $nLen) == $sNamespace)
             {
                 $sFullPath = $aClassDir['directory'] . $sDS . substr($sPartPath, $nLen + 1);
             }
-            elseif(!($sNamespace))
+            elseif (!($sNamespace))
             {
                 $sFullPath = $aClassDir['directory'] . $sDS . $sPartPath;
             }
-            if(($sFullPath) && is_file($sFullPath))
+            if (($sFullPath) && is_file($sFullPath))
             {
                 // Found the file in this directory
                 $xFileInfo = new \SplFileInfo($sFullPath);
@@ -618,7 +618,7 @@ 
     {
         $xObject = null; // The user registered object
         $xPlugin = $this->getRequestPlugin('CallableObject'); // The CallableObject plugin
-        if(($xPlugin))
+        if (($xPlugin))
         {
             $xObject = $xPlugin->getRegisteredObject($sClassName);
         }
@@ -632,7 +632,7 @@ 
      */
     private function getJsLibUri()
     {
-        if(!$this->hasOption('js.lib.uri'))
+        if (!$this->hasOption('js.lib.uri'))
         {
             return 'https://cdn.jsdelivr.net/jaxon/1.2.0/';
         }
@@ -652,7 +652,7 @@ 
         $jsDelivrUri = 'https://cdn.jsdelivr.net';
         $nLen = strlen($jsDelivrUri);
         // The jsDelivr CDN only hosts minified files
-        if(($this->getOption('js.app.minify')) || substr($this->getJsLibUri(), 0, $nLen) == $jsDelivrUri)
+        if (($this->getOption('js.app.minify')) || substr($this->getJsLibUri(), 0, $nLen) == $jsDelivrUri)
         {
             return '.min.js';
         }
@@ -669,7 +669,7 @@ 
         // Check config options
         // - The js.app.extern option must be set to true
         // - The js.app.uri and js.app.dir options must be set to non null values
-        if(!$this->getOption('js.app.extern') ||
+        if (!$this->getOption('js.app.extern') ||
             !$this->getOption('js.app.uri') ||
             !$this->getOption('js.app.dir'))
         {
@@ -678,7 +678,7 @@ 
         // Check dir access
         // - The js.app.dir must be writable
         $sJsAppDir = $this->getOption('js.app.dir');
-        if(!is_dir($sJsAppDir) || !is_writable($sJsAppDir))
+        if (!is_dir($sJsAppDir) || !is_writable($sJsAppDir))
         {
             return false;
         }
@@ -692,7 +692,7 @@ 
      */
     private function setTemplateCacheDir()
     {
-        if($this->hasOption('core.template.cache_dir'))
+        if ($this->hasOption('core.template.cache_dir'))
         {
             $this->setCacheDir($this->getOption('core.template.cache_dir'));
         }
@@ -714,7 +714,7 @@ 
 
         // Add component files to the javascript file array;
         $aJsFiles = array($sJsCoreUrl);
-        if($this->getOption('core.debug.on'))
+        if ($this->getOption('core.debug.on'))
         {
             $aJsFiles[] = $sJsDebugUrl;
             $aJsFiles[] = $sJsLanguageUrl;
@@ -730,7 +730,7 @@ 
             'sJsOptions' => $this->getOption('js.app.options'),
             'aUrls' => $aJsFiles,
         ));
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sCode .= rtrim($xPlugin->getJs(), " \n") . "\n";
         }
@@ -748,7 +748,7 @@ 
         $this->setTemplateCacheDir();
 
         $sCode = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sCode .= rtrim($xPlugin->getCss(), " \n") . "\n";
         }
@@ -836,7 +836,7 @@ 
         ));
 
         $sPluginScript = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
             $sPluginScript .= "\n" . trim($xPlugin->getScript(), " \n");
         }
@@ -865,7 +865,7 @@ 
     {
         // Get the config and plugins scripts
         $sScript = $this->getConfigScript() . "\n" . $this->getReadyScript() . "\n";
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
             $sScript .= "\n" . trim($xPlugin->getScript(), " \n");
         }
@@ -887,7 +887,7 @@ 
         // Set the template engine cache dir
         $this->setTemplateCacheDir();
 
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -896,13 +896,13 @@ 
             $sHash = $this->generateHash();
             $sOutFile = $sHash . '.js';
             $sMinFile = $sHash . '.min.js';
-            if(!is_file($sJsAppDir . $sOutFile))
+            if (!is_file($sJsAppDir . $sOutFile))
             {
                 file_put_contents($sJsAppDir . $sOutFile, $this->getAllScripts());
             }
-            if(($this->getOption('js.app.minify')) && !is_file($sJsAppDir . $sMinFile))
+            if (($this->getOption('js.app.minify')) && !is_file($sJsAppDir . $sMinFile))
             {
-                if(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                if (($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                 {
                     $sOutFile = $sMinFile;
                 }
@@ -935,7 +935,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -951,7 +951,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

templates/plugins/config.js.php

Spacing +5 added lines, -5 removed lines

@@ -14,18 +14,18 @@
 jaxon.config.defaultMode = "<?php echo $this->sDefaultMode ?>";
 jaxon.config.defaultMethod = "<?php echo $this->sDefaultMethod ?>";
 jaxon.config.responseType = "<?php echo $this->sResponseType ?>";
-<?php if($this->nResponseQueueSize > 0): ?>
+<?php if ($this->nResponseQueueSize > 0): ?>
 jaxon.config.responseQueueSize = <?php echo $this->nResponseQueueSize ?>;
 <?php endif ?>
-<?php if(($this->bDebug)): ?>
-<?php if(($this->sDebugOutputID)): ?>
+<?php if (($this->bDebug)): ?>
+<?php if (($this->sDebugOutputID)): ?>
 jaxon.debug.outputID = "<?php echo $this->sDebugOutputID ?>";
 <?php endif ?>
-<?php if(($this->bVerboseDebug)): ?>
+<?php if (($this->bVerboseDebug)): ?>
 jaxon.debug.verbose.active = true;
 <?php endif ?>
 <?php endif ?>
-<?php if(($this->sCsrfMetaName)): ?>
+<?php if (($this->sCsrfMetaName)): ?>
 metaTags = document.getElementsByTagName('meta');
 for(i = 0; i < metaTags.length; i++)
 {