jaxon-php / jaxon-core

src/Utils/Http/URI.php

Doc Comments +1 added lines

@@ -21,6 +21,7 @@
      *
      * @var array       &$aURL      The URL data
      * @var string      $sKey       The key in the $_SERVER array
+     * @param string $sKey
      */
     private static function getHostFromServer(array &$aURL, $sKey)
     {

Spacing +29 added lines, -29 removed lines

@@ -24,9 +24,9 @@ 
      */
     private static function getHostFromServer(array &$aURL, $sKey)
     {
-        if(empty($aURL['host']) && !empty($_SERVER[$sKey]))
+        if (empty($aURL['host']) && !empty($_SERVER[$sKey]))
         {
-            if(strpos($_SERVER[$sKey], ':') > 0)
+            if (strpos($_SERVER[$sKey], ':') > 0)
             {
                 list($aURL['host'], $aURL['port']) = explode(':', $_SERVER[$sKey]);
             }
@@ -46,16 +46,16 @@ 
     {
         $aURL = [];
         // Try to get the request URL
-        if(!empty($_SERVER['REQUEST_URI']))
+        if (!empty($_SERVER['REQUEST_URI']))
         {
-            $_SERVER['REQUEST_URI'] = str_replace(['"',"'",'<','>'], ['%22','%27','%3C','%3E'], $_SERVER['REQUEST_URI']);
+            $_SERVER['REQUEST_URI'] = str_replace(['"', "'", '<', '>'], ['%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'];
             }
@@ -68,24 +68,24 @@ 
         self::getHostFromServer($aURL, 'HTTP_X_FORWARDED_HOST');
         self::getHostFromServer($aURL, 'HTTP_HOST');
         self::getHostFromServer($aURL, 'SERVER_NAME');
-        if(empty($aURL['host']))
+        if (empty($aURL['host']))
         {
             throw new \Jaxon\Exception\URI();
         }
 
-        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']);
             }
@@ -93,61 +93,61 @@ 
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
-            if(isset($sPath['path']))
+            if (isset($sPath['path']))
             {
-                $aURL['path'] = str_replace(['"',"'",'<','>'], ['%22','%27','%3C','%3E'], $sPath['path']);
+                $aURL['path'] = str_replace(['"', "'", '<', '>'], ['%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]);
             }
 

Braces +6 added lines, -8 removed lines

@@ -29,8 +29,7 @@ 
             if(strpos($_SERVER[$sKey], ':') > 0)
             {
                 list($aURL['host'], $aURL['port']) = explode(':', $_SERVER[$sKey]);
-            }
-            else
+            } else
             {
                 $aURL['host'] = $_SERVER[$sKey];
             }
@@ -58,8 +57,7 @@ 
             if(!empty($_SERVER['HTTP_SCHEME']))
             {
                 $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
-            }
-            else
+            } else
             {
                 $aURL['scheme'] = ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http');
             }
@@ -88,8 +86,7 @@ 
             if(!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
-            }
-            else
+            } else
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
@@ -147,8 +144,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);

src/Utils/Validation/Validator.php

Spacing +6 added lines, -6 removed lines

@@ -129,7 +129,7 @@ 
     {
         $xDefault = $this->xConfig->getOption('upload.default.' . $sProperty);
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.' . $sProperty, $xDefault);
-        if(is_array($aAllowed) && !in_array($sValue, $aAllowed))
+        if (is_array($aAllowed) && !in_array($sValue, $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, [$sField = $sValue]);
             return false;
@@ -150,7 +150,7 @@ 
     {
         $xDefault = $this->xConfig->getOption('upload.default.' . $sProperty, 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.' . $sProperty, $xDefault);
-        if($iSize > 0 && (
+        if ($iSize > 0 && (
             ($sProperty == 'max-size' && $iFileSize > $iSize) ||
             ($sProperty == 'min-size' && $iFileSize < $iSize)))
         {
@@ -172,25 +172,25 @@ 
     {
         $this->sErrorMessage = '';
         // Verify the file extension
-        if(!$this->validateFileProperty($sName, $aUploadedFile['type'], 'types', 'type'))
+        if (!$this->validateFileProperty($sName, $aUploadedFile['type'], 'types', 'type'))
         {
             return false;
         }
 
         // Verify the file extension
-        if(!$this->validateFileProperty($sName, $aUploadedFile['extension'], 'extensions', 'extension'))
+        if (!$this->validateFileProperty($sName, $aUploadedFile['extension'], 'extensions', 'extension'))
         {
             return false;
         }
 
         // Verify the max size
-        if(!$this->validateFileSize($sName, $aUploadedFile['size'], 'max-size'))
+        if (!$this->validateFileSize($sName, $aUploadedFile['size'], 'max-size'))
         {
             return false;
         }
 
         // Verify the min size
-        if(!$this->validateFileSize($sName, $aUploadedFile['size'], 'min-size'))
+        if (!$this->validateFileSize($sName, $aUploadedFile['size'], 'min-size'))
         {
             return false;
         }