jaxon-php / jaxon-core

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/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,19 +78,19 @@ 
             }
         }
 
-        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']))
         {
-            if(!empty($_SERVER['PATH_INFO']))
+            if (!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
             }
@@ -98,61 +98,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/Request/Parameter.php

Spacing +8 added lines, -8 removed lines

@@ -91,19 +91,19 @@ 
      */
     public static function make($xValue)
     {
-        if($xValue instanceof Interfaces\Parameter)
+        if ($xValue instanceof Interfaces\Parameter)
         {
             return $xValue;
         }
-        elseif(is_numeric($xValue))
+        elseif (is_numeric($xValue))
         {
             return new Parameter(Jaxon::NUMERIC_VALUE, $xValue);
         }
-        elseif(is_string($xValue))
+        elseif (is_string($xValue))
         {
             return new Parameter(Jaxon::QUOTED_VALUE, $xValue);
         }
-        elseif(is_bool($xValue))
+        elseif (is_bool($xValue))
         {
             return new Parameter(Jaxon::BOOL_VALUE, $xValue);
         }
@@ -122,7 +122,7 @@ 
     {
         $sJsCode = '';
         $sQuoteCharacter = "'";
-        switch($this->sType)
+        switch ($this->sType)
         {
         case Jaxon::FORM_VALUES:
             $sFormID = (string)$this->xValue;
@@ -130,11 +130,11 @@ 
             break;
         case Jaxon::INPUT_VALUE:
             $sInputID = (string)$this->xValue;
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $sInputID . $sQuoteCharacter  . ").value";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sInputID . $sQuoteCharacter . ").value";
             break;
         case Jaxon::CHECKED_VALUE:
             $sCheckedID = (string)$this->xValue;
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $sCheckedID  . $sQuoteCharacter . ").checked";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sCheckedID . $sQuoteCharacter . ").checked";
             break;
         case Jaxon::ELEMENT_INNERHTML:
             $sElementID = (string)$this->xValue;
@@ -153,7 +153,7 @@ 
             $sJsCode = (string)$this->xValue;
             break;
         case Jaxon::JS_VALUE:
-            if(is_array($this->xValue) || is_object($this->xValue))
+            if (is_array($this->xValue) || is_object($this->xValue))
             {
                 // Unable to use double quotes here because they cannot be handled on client side.
                 // So we are using simple quotes even if the Json standard recommends double quotes.

Braces +5 added lines, -10 removed lines

@@ -94,20 +94,16 @@ 
         if($xValue instanceof Interfaces\Parameter)
         {
             return $xValue;
-        }
-        elseif(is_numeric($xValue))
+        } elseif(is_numeric($xValue))
         {
             return new Parameter(Jaxon::NUMERIC_VALUE, $xValue);
-        }
-        elseif(is_string($xValue))
+        } elseif(is_string($xValue))
         {
             return new Parameter(Jaxon::QUOTED_VALUE, $xValue);
-        }
-        elseif(is_bool($xValue))
+        } elseif(is_bool($xValue))
         {
             return new Parameter(Jaxon::BOOL_VALUE, $xValue);
-        }
-        else // if(is_array($xValue) || is_object($xValue))
+        } else // if(is_array($xValue) || is_object($xValue))
         {
             return new Parameter(Jaxon::JS_VALUE, $xValue);
         }
@@ -158,8 +154,7 @@ 
                 // Unable to use double quotes here because they cannot be handled on client side.
                 // So we are using simple quotes even if the Json standard recommends double quotes.
                 $sJsCode = str_replace(['"'], ["'"], json_encode($this->xValue, JSON_HEX_APOS | JSON_HEX_QUOT));
-            }
-            else
+            } else
             {
                 $sJsCode = (string)$this->xValue;
             }

src/Utils/Validation/Validator.php

Spacing +4 added lines, -4 removed lines

@@ -129,7 +129,7 @@ 
         // Verify the file extension
         $xDefault = $this->xConfig->getOption('upload.default.types');
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.types', $xDefault);
-        if(is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed))
+        if (is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.type', $aUploadedFile);
             return false;
@@ -137,7 +137,7 @@ 
         // Verify the file extension
         $xDefault = $this->xConfig->getOption('upload.default.extensions');
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.extensions', $xDefault);
-        if(is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed))
+        if (is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.extension', $aUploadedFile);
             return false;
@@ -145,7 +145,7 @@ 
         // Verify the max size
         $xDefault = $this->xConfig->getOption('upload.default.max-size', 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.max-size', $xDefault);
-        if($iSize > 0 && $aUploadedFile['size'] > $iSize)
+        if ($iSize > 0 && $aUploadedFile['size'] > $iSize)
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.max-size', $aUploadedFile);
             return false;
@@ -153,7 +153,7 @@ 
         // Verify the min size
         $xDefault = $this->xConfig->getOption('upload.default.min-size', 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.min-size', $xDefault);
-        if($iSize > 0 && $aUploadedFile['size'] < $iSize)
+        if ($iSize > 0 && $aUploadedFile['size'] < $iSize)
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.min-size', $aUploadedFile);
             return false;

src/Utils/Translation/Translator.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
         }
         if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
         {
-           return $sText;
+            return $sText;
         }
         $message = $this->aTranslations[$sLanguage][$sText];
         foreach($aPlaceHolders as $name => $value)

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sName] = $xTranslation;
-            }
-            else
+            } else
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sName, $xTranslation);

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
      */
     private function _loadTranslations($sLanguage, $sPrefix, array $aTranslations)
     {
-        foreach($aTranslations as $sName => $xTranslation)
+        foreach ($aTranslations as $sName => $xTranslation)
         {
             $sName = trim($sName);
             $sName = ($sPrefix) ? $sPrefix . '.' . $sName : $sName;
-            if(!is_array($xTranslation))
+            if (!is_array($xTranslation))
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sName] = $xTranslation;
@@ -82,17 +82,17 @@ 
      */
     public function loadTranslations($sFilePath, $sLanguage)
     {
-        if(!file_exists($sFilePath))
+        if (!file_exists($sFilePath))
         {
             return;
         }
         $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
+        if (!is_array($aTranslations))
         {
             return;
         }
         // Load the translations
-        if(!array_key_exists($sLanguage, $this->aTranslations))
+        if (!array_key_exists($sLanguage, $this->aTranslations))
         {
             $this->aTranslations[$sLanguage] = [];
         }
@@ -111,20 +111,20 @@ 
     public function trans($sText, array $aPlaceHolders = [], $sLanguage = null)
     {
         $sText = trim((string)$sText);
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->xConfig->getOption('language');
         }
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
+        if (!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
         {
            return $sText;
         }
         $message = $this->aTranslations[$sLanguage][$sText];
-        foreach($aPlaceHolders as $name => $value)
+        foreach ($aPlaceHolders as $name => $value)
         {
             $message = str_replace(':' . $name, $value, $message);
         }