jaxon-php / jaxon-core

templates/support/function.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php echo $this->sPrefix ?><?php echo $this->sAlias ?> = function() {
     return jaxon.request(
         { jxnfun: '<?php echo $this->sFunction ?>' },
-        { parameters: arguments<?php foreach($this->aConfig as $sKey => $sValue): ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }
+        { parameters: arguments<?php foreach ($this->aConfig as $sKey => $sValue): ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }
     );
 };

templates/support/object.js.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php echo $this->sPrefix ?><?php echo $this->sClass ?> = {};
-<?php foreach($this->aMethods as $aMethod): ?>
+<?php foreach ($this->aMethods as $aMethod): ?>
 <?php echo $this->sPrefix ?><?php echo $this->sClass ?>.<?php echo $aMethod['name'] ?> = function() {
     return jaxon.request(
         { jxncls: '<?php echo $this->sClass ?>', jxnmthd: '<?php echo $aMethod['name'] ?>' },
-        { parameters: arguments<?php foreach($aMethod['config'] as $sKey => $sValue): ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }
+        { parameters: arguments<?php foreach ($aMethod['config'] as $sKey => $sValue): ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }
     );
 };
 <?php endforeach ?>

templates/support/event.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php echo $this->sPrefix ?><?php echo $this->sEvent ?> = function() {
     return jaxon.request(
         { jxnevt: '<?php echo $this->sEvent ?>' },
-        { parameters: arguments<?php if(($this->sMode)): ?>, mode: '<?php echo $this->sMode ?>'<?php endif ?><?php if(($this->sMethod)): ?>, method: '<?php echo $this->sMethod ?>'<?php endif ?> }
+        { parameters: arguments<?php if (($this->sMode)): ?>, mode: '<?php echo $this->sMode ?>'<?php endif ?><?php if (($this->sMethod)): ?>, method: '<?php echo $this->sMethod ?>'<?php endif ?> }
     );
 };

templates/plugins/includes.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
-<?php foreach($this->aUrls as $sUrl): ?>
+<?php foreach ($this->aUrls as $sUrl): ?>
 <script type="text/javascript" src="<?php echo $sUrl ?>" <?php echo $this->sJsOptions ?> charset="UTF-8"></script>
 <?php endforeach ?>

templates/plugins/ready.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 jaxon.dom.ready(function() {
     jaxon.command.handler.register('cc', jaxon.confirm.commands);
 
-<?php if($this->sPluginScript): ?>
+<?php if ($this->sPluginScript): ?>
 <?php echo $this->sPluginScript ?>
 <?php endif ?>
 });

src/Request/Plugin/CallableObject.php

Doc Comments +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
      *
      * @param array         $aArgs                An array containing the callable object specification
      *
-     * @return array
+     * @return boolean
      */
     public function register($aArgs)
     {

Braces +2 added lines, -4 removed lines

@@ -255,8 +255,7 @@ 
             {
                 $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);
@@ -435,8 +434,7 @@ 
             if(($sNamespace) && substr($sClassPath, 0, $nLen) == $sNamespace)
             {
                 $sFullPath = $aClassDir['directory'] . $sDS . substr($sPartPath, $nLen + 1);
-            }
-            elseif(!($sNamespace))
+            } elseif(!($sNamespace))
             {
                 $sFullPath = $aClassDir['directory'] . $sDS . $sPartPath;
             }

Spacing +56 added lines, -56 removed lines

@@ -91,19 +91,19 @@ 
         $this->sRequestedClass = null;
         $this->sRequestedMethod = null;
 
-        if(!empty($_GET['jxncls']))
+        if (!empty($_GET['jxncls']))
         {
             $this->sRequestedClass = $_GET['jxncls'];
         }
-        if(!empty($_GET['jxnmthd']))
+        if (!empty($_GET['jxnmthd']))
         {
             $this->sRequestedMethod = $_GET['jxnmthd'];
         }
-        if(!empty($_POST['jxncls']))
+        if (!empty($_POST['jxncls']))
         {
             $this->sRequestedClass = $_POST['jxncls'];
         }
-        if(!empty($_POST['jxnmthd']))
+        if (!empty($_POST['jxnmthd']))
         {
             $this->sRequestedMethod = $_POST['jxnmthd'];
         }
@@ -152,19 +152,19 @@ 
      */
     public function register($aArgs)
     {
-        if(count($aArgs) < 2)
+        if (count($aArgs) < 2)
         {
             return false;
         }
 
         $sType = $aArgs[0];
-        if($sType != Jaxon::CALLABLE_OBJECT)
+        if ($sType != Jaxon::CALLABLE_OBJECT)
         {
             return false;
         }
 
         $sCallableObject = $aArgs[1];
-        if(!is_string($sCallableObject) || !class_exists($sCallableObject))
+        if (!is_string($sCallableObject) || !class_exists($sCallableObject))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
@@ -172,31 +172,31 @@ 
         $this->aCallableObjects[] = $sCallableObject;
 
         $aOptions = count($aArgs) > 2 ? $aArgs[2] : [];
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['namespace' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
 
         // Save the classpath and the separator in this class
-        if(key_exists('*', $aOptions) && is_array($aOptions['*']))
+        if (key_exists('*', $aOptions) && is_array($aOptions['*']))
         {
             $_aOptions = $aOptions['*'];
             $sSeparator = '.';
-            if(key_exists('separator', $_aOptions))
+            if (key_exists('separator', $_aOptions))
             {
                 $sSeparator = trim($_aOptions['separator']);
             }
-            if(!in_array($sSeparator, ['.', '_']))
+            if (!in_array($sSeparator, ['.', '_']))
             {
                 $sSeparator = '.';
             }
             $_aOptions['separator'] = $sSeparator;
 
-            if(array_key_exists('classpath', $_aOptions))
+            if (array_key_exists('classpath', $_aOptions))
             {
                 $_aOptions['classpath'] = trim($_aOptions['classpath'], ' \\._');
                 // Save classpath with "\" in the parameters
@@ -207,12 +207,12 @@ 
         }
 
         // Register the callable object
-        jaxon()->di()->set($sCallableObject, function () use ($sCallableObject, $aOptions) {
+        jaxon()->di()->set($sCallableObject, function() use ($sCallableObject, $aOptions) {
             $xCallableObject = new \Jaxon\Request\Support\CallableObject($sCallableObject);
 
-            foreach($aOptions as $sMethod => $aValue)
+            foreach ($aOptions as $sMethod => $aValue)
             {
-                foreach($aValue as $sName => $sValue)
+                foreach ($aValue as $sName => $sValue)
                 {
                     $xCallableObject->configure($sMethod, $sName, $sValue);
                 }
@@ -222,13 +222,13 @@ 
         });
 
         // Register the request factory for this callable object
-        jaxon()->di()->set($sCallableObject . '\Factory\Rq', function ($di) use ($sCallableObject) {
+        jaxon()->di()->set($sCallableObject . '\Factory\Rq', function($di) use ($sCallableObject) {
             $xCallableObject = $di->get($sCallableObject);
             return new \Jaxon\Factory\Request\Portable($xCallableObject);
         });
 
         // Register the paginator factory for this callable object
-        jaxon()->di()->set($sCallableObject . '\Factory\Pg', function ($di) use ($sCallableObject) {
+        jaxon()->di()->set($sCallableObject . '\Factory\Pg', function($di) use ($sCallableObject) {
             $xCallableObject = $di->get($sCallableObject);
             return new \Jaxon\Factory\Request\Paginator($xCallableObject);
         });
@@ -248,37 +248,37 @@ 
      */
     public function addClassDir($sDirectory, $sNamespace = '', $sSeparator = '.', array $aProtected = [])
     {
-        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;
                 }
@@ -314,33 +314,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['*'] = [];
         }
         $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;
         }
@@ -359,13 +359,13 @@ 
         $sDS = DIRECTORY_SEPARATOR;
         // Change the keys in $aOptions to have "\" as separator
         $aNewOptions = [];
-        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'];
@@ -375,10 +375,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;
                 }
@@ -387,17 +387,17 @@ 
                 $sClassPath = substr($xFile->getPath(), strlen($sDirectory));
                 $sClassPath = trim(str_replace($sDS, '\\', $sClassPath), '\\');
                 $sClassName = $xFile->getBasename('.php');
-                if(($sClassPath))
+                if (($sClassPath))
                 {
                     $sClassName = $sClassPath . '\\' . $sClassName;
                 }
-                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];
                 }
@@ -418,7 +418,7 @@ 
      */
     public function registerClass($sClassName, array $aOptions = [])
     {
-        if(!($sClassName = trim($sClassName, ' \\._')))
+        if (!($sClassName = trim($sClassName, ' \\._')))
         {
             return false;
         }
@@ -427,7 +427,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);
@@ -436,7 +436,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'];
@@ -445,15 +445,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);
@@ -475,7 +475,7 @@ 
     {
         $di = jaxon()->di();
         $sHash = '';
-        foreach($this->aCallableObjects as $sName)
+        foreach ($this->aCallableObjects as $sName)
         {
             $xCallableObject = $di->get($sName);
             $sHash .= $sName . implode('|', $xCallableObject->getMethods());
@@ -494,15 +494,15 @@ 
         // Generate code for javascript objects declaration
         $code = '';
         $classes = [];
-        foreach($this->aClassPaths as $sClassPath)
+        foreach ($this->aClassPaths as $sClassPath)
         {
             $offset = 0;
             $sClassPath .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
             {
                 $class = substr($sClassPath, 0, $dotPosition);
                 // Generate code for this object
-                if(!array_key_exists($class, $classes))
+                if (!array_key_exists($class, $classes))
                 {
                     $code .= "$sJaxonPrefix$class = {};\n";
                     $classes[$class] = $class;
@@ -512,7 +512,7 @@ 
         }
         // Generate code for javascript methods
         $di = jaxon()->di();
-        foreach($this->aCallableObjects as $sName)
+        foreach ($this->aCallableObjects as $sName)
         {
             $xCallableObject = $di->get($sName);
             $code .= $xCallableObject->getScript();
@@ -528,13 +528,13 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if(($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
+        if (($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
         }
         // Check the validity of the method name
-        if(($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
+        if (($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
@@ -549,7 +549,7 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
@@ -558,7 +558,7 @@ 
 
         // Find the requested method
         $xCallableObject = $this->getCallableObject($this->sRequestedClass);
-        if(!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
+        if (!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
         {
             // Unable to find the requested object or method
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid',
@@ -583,7 +583,7 @@ 
         // at the beginning and the end of the class name.
         $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\');
         // Register an instance of the requested class, if it isn't yet
-        if(!key_exists($sClassName, $this->aCallableObjects))
+        if (!key_exists($sClassName, $this->aCallableObjects))
         {
             $this->getPluginManager()->registerClass($sClassName);
         }

src/Response/Manager.php

Spacing +8 added lines, -8 removed lines

@@ -71,13 +71,13 @@ 
      */
     public function append(Response $xResponse)
     {
-        if(!$this->xResponse)
+        if (!$this->xResponse)
         {
             $this->xResponse = $xResponse;
         }
-        elseif(get_class($this->xResponse) == get_class($xResponse))
+        elseif (get_class($this->xResponse) == get_class($xResponse))
         {
-            if($this->xResponse != $xResponse)
+            if ($this->xResponse != $xResponse)
             {
                 $this->xResponse->appendResponse($xResponse);
             }
@@ -110,9 +110,9 @@ 
      */
     public function printDebug()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
-            foreach($this->aDebugMessages as $sMessage)
+            foreach ($this->aDebugMessages as $sMessage)
             {
                 $this->xResponse->debug($sMessage);
             }
@@ -127,7 +127,7 @@ 
      */
     public function sendHeaders()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             $this->xResponse->sendHeaders();
         }
@@ -140,7 +140,7 @@ 
      */
     public function getOutput()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             return $this->xResponse->getOutput();
         }
@@ -154,7 +154,7 @@ 
      */
     public function sendOutput()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             $this->xResponse->sendHeaders();
             $this->xResponse->printOutput();

Braces +2 added lines, -4 removed lines

@@ -74,15 +74,13 @@
         if(!$this->xResponse)
         {
             $this->xResponse = $xResponse;
-        }
-        elseif(get_class($this->xResponse) == get_class($xResponse))
+        } elseif(get_class($this->xResponse) == get_class($xResponse))
         {
             if($this->xResponse != $xResponse)
             {
                 $this->xResponse->appendResponse($xResponse);
             }
-        }
-        else
+        } else
         {
             $this->debug($this->trans('errors.mismatch.types', array('class' => get_class($xResponse))));
         }

src/Utils/URI.php

Braces +10 added lines, -16 removed lines

@@ -37,8 +37,7 @@ 
             if(!empty($_SERVER['HTTP_SCHEME']))
             {
                 $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
-            }
-            else
+            } else
             {
                 $aURL['scheme'] = ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http');
             }
@@ -51,28 +50,23 @@ 
                 if(strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_X_FORWARDED_HOST']);
-                }
-                else
+                } else
                 {
                     $aURL['host'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
                 }
-            }
-            elseif(!empty($_SERVER['HTTP_HOST']))
+            } elseif(!empty($_SERVER['HTTP_HOST']))
             {
                 if(strpos($_SERVER['HTTP_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
-                }
-                else
+                } else
                 {
                     $aURL['host'] = $_SERVER['HTTP_HOST'];
                 }
-            }
-            elseif(!empty($_SERVER['SERVER_NAME']))
+            } elseif(!empty($_SERVER['SERVER_NAME']))
             {
                 $aURL['host'] = $_SERVER['SERVER_NAME'];
-            }
-            else
+            } else
             {
                 throw new \Jaxon\Exception\URI();
             }
@@ -94,8 +88,7 @@ 
             if(!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
-            }
-            else
+            } else
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
@@ -153,8 +146,9 @@ 
         
             foreach($aQueries as $sKey => $sQuery)
             {
-                if("jxnGenerate" == substr($sQuery, 0, 11))
-                    unset($aQueries[$sKey]);
+                if("jxnGenerate" == substr($sQuery, 0, 11)) {
+                                    unset($aQueries[$sKey]);
+                }
             }
                 
             $sQueries = implode("&", $aQueries);

Spacing +32 added lines, -32 removed lines

@@ -25,16 +25,16 @@ 
     {
         $aURL = [];
         // Try to get the request URL
-        if(!empty($_SERVER['REQUEST_URI']))
+        if (!empty($_SERVER['REQUEST_URI']))
         {
-            $_SERVER['REQUEST_URI'] = str_replace(array('"',"'",'<','>'), array('%22','%27','%3C','%3E'), $_SERVER['REQUEST_URI']);
+            $_SERVER['REQUEST_URI'] = str_replace(array('"', "'", '<', '>'), array('%22', '%27', '%3C', '%3E'), $_SERVER['REQUEST_URI']);
             $aURL = parse_url($_SERVER['REQUEST_URI']);
         }
 
         // Fill in the empty values
-        if(empty($aURL['scheme']))
+        if (empty($aURL['scheme']))
         {
-            if(!empty($_SERVER['HTTP_SCHEME']))
+            if (!empty($_SERVER['HTTP_SCHEME']))
             {
                 $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
             }
@@ -44,11 +44,11 @@ 
             }
         }
 
-        if(empty($aURL['host']))
+        if (empty($aURL['host']))
         {
-            if(!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
+            if (!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
             {
-                if(strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
+                if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_X_FORWARDED_HOST']);
                 }
@@ -57,9 +57,9 @@ 
                     $aURL['host'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
                 }
             }
-            elseif(!empty($_SERVER['HTTP_HOST']))
+            elseif (!empty($_SERVER['HTTP_HOST']))
             {
-                if(strpos($_SERVER['HTTP_HOST'], ':') > 0)
+                if (strpos($_SERVER['HTTP_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
                 }
@@ -68,7 +68,7 @@ 
                     $aURL['host'] = $_SERVER['HTTP_HOST'];
                 }
             }
-            elseif(!empty($_SERVER['SERVER_NAME']))
+            elseif (!empty($_SERVER['SERVER_NAME']))
             {
                 $aURL['host'] = $_SERVER['SERVER_NAME'];
             }
@@ -78,20 +78,20 @@ 
             }
         }
 
-        if(empty($aURL['port']) && !empty($_SERVER['SERVER_PORT']))
+        if (empty($aURL['port']) && !empty($_SERVER['SERVER_PORT']))
         {
             $aURL['port'] = $_SERVER['SERVER_PORT'];
         }
 
-        if(!empty($aURL['path']) && strlen(basename($aURL['path'])) == 0)
+        if (!empty($aURL['path']) && strlen(basename($aURL['path'])) == 0)
         {
             unset($aURL['path']);
         }
 
-        if(empty($aURL['path']))
+        if (empty($aURL['path']))
         {
             $sPath = [];
-            if(!empty($_SERVER['PATH_INFO']))
+            if (!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
             }
@@ -99,61 +99,61 @@ 
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
-            if(isset($sPath['path']))
+            if (isset($sPath['path']))
             {
-                $aURL['path'] = str_replace(array('"',"'",'<','>'), array('%22','%27','%3C','%3E'), $sPath['path']);
+                $aURL['path'] = str_replace(array('"', "'", '<', '>'), array('%22', '%27', '%3C', '%3E'), $sPath['path']);
             }
             unset($sPath);
         }
 
-        if(empty($aURL['query']) && !empty($_SERVER['QUERY_STRING']))
+        if (empty($aURL['query']) && !empty($_SERVER['QUERY_STRING']))
         {
             $aURL['query'] = $_SERVER['QUERY_STRING'];
         }
 
-        if(!empty($aURL['query']))
+        if (!empty($aURL['query']))
         {
-            $aURL['query'] = '?'.$aURL['query'];
+            $aURL['query'] = '?' . $aURL['query'];
         }
 
         // Build the URL: Start with scheme, user and pass
-        $sURL = $aURL['scheme'].'://';
-        if(!empty($aURL['user']))
+        $sURL = $aURL['scheme'] . '://';
+        if (!empty($aURL['user']))
         {
-            $sURL.= $aURL['user'];
-            if(!empty($aURL['pass']))
+            $sURL .= $aURL['user'];
+            if (!empty($aURL['pass']))
             {
-                $sURL.= ':'.$aURL['pass'];
+                $sURL .= ':' . $aURL['pass'];
             }
-            $sURL.= '@';
+            $sURL .= '@';
         }
 
         // Add the host
-        $sURL.= $aURL['host'];
+        $sURL .= $aURL['host'];
 
         // Add the port if needed
-        if(!empty($aURL['port'])
+        if (!empty($aURL['port'])
                 && (($aURL['scheme'] == 'http' && $aURL['port'] != 80)
                         || ($aURL['scheme'] == 'https' && $aURL['port'] != 443)))
         {
-            $sURL.= ':'.$aURL['port'];
+            $sURL .= ':' . $aURL['port'];
         }
 
         // Add the path and the query string
-        $sURL.= $aURL['path'].@$aURL['query'];
+        $sURL .= $aURL['path'] . @$aURL['query'];
 
         // Clean up
         unset($aURL);
 
         $aURL = explode("?", $sURL);
 
-        if(1 < count($aURL))
+        if (1 < count($aURL))
         {
             $aQueries = explode("&", $aURL[1]);
 
-            foreach($aQueries as $sKey => $sQuery)
+            foreach ($aQueries as $sKey => $sQuery)
             {
-                if("jxnGenerate" == substr($sQuery, 0, 11))
+                if ("jxnGenerate" == substr($sQuery, 0, 11))
                     unset($aQueries[$sKey]);
             }
 

src/Utils/Config/Json.php

Spacing +3 added lines, -3 removed lines

@@ -29,13 +29,13 @@ 
     public static function read($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $sFileContent = file_get_contents($sConfigFile);
         $aConfigOptions = json_decode($sFileContent, true);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }
@@ -44,7 +44,7 @@ 
         $jaxon = jaxon();
         $jaxon->setOptions($aConfigOptions, $sLibKey);
         $config = null;
-        if(is_string($sAppKey))
+        if (is_string($sAppKey))
         {
             $config = new Config();
             $config->setOptions($aConfigOptions, $sAppKey);