ricardosierra / validate

src/Validate/Traits/FakeNameTrait.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public static function incluiInArray($field, $array)
     {
         foreach ($array as $notPermit) {
-            if(strpos($field, $notPermit) !== false){
+            if (strpos($field, $notPermit) !== false) {
                 return true;
             }
         }

src/Validate/Phone.php

Spacing +6 added lines, -6 removed lines

@@ -11,10 +11,10 @@ 
     public static function toDatabase(string $phone)
     {
         $phone = preg_replace('/[^0-9]/', '', $phone);
-        if (substr((string) $phone,0,2)=='55') {
+        if (substr((string) $phone, 0, 2) == '55') {
             return $phone;
         }
-        if (empty($phone) || $phone=='55') {
+        if (empty($phone) || $phone == '55') {
             return null;
         }
         if (strlen($phone)>11) {
@@ -32,19 +32,19 @@ 
     {
         $phone = self::break($phoneNumber);
 
-        if ((int) $phone['country'] === 0 ) {
+        if ((int) $phone['country'] === 0) {
             return false;
         }
 
-        if ((int) $phone['region'] === 0 ) {
+        if ((int) $phone['region'] === 0) {
             return false;
         }
 
-        if ((int) $phone['number'] === 0 ) {
+        if ((int) $phone['number'] === 0) {
             return false;
         }
 
-        if (strlen(static::toDatabase($phoneNumber)) < 12 || strlen(static::toDatabase($phoneNumber)) > 13) {
+        if (strlen(static::toDatabase($phoneNumber))<12 || strlen(static::toDatabase($phoneNumber))>13) {
             return false;
         }
 

src/Validate/Url.php

Spacing +128 added lines, -128 removed lines

@@ -41,8 +41,8 @@ 
      * @return string Directory
      */
     public function parseDir($url) {
-        $slash = strrpos($url,'/');
-        return substr($url,0,$slash+1);
+        $slash = strrpos($url, '/');
+        return substr($url, 0, $slash+1);
     }
 
     /**
@@ -65,15 +65,15 @@ 
 
         $relativeUrl = self::urlToAbsolute($baseUrl, $relativeUrl); //make them absolute, not relative
 
-        if (stripos($relativeUrl,'#') != FALSE) { 
-            $relativeUrl = substr($relativeUrl,0,stripos($relativeUrl,'#')); //remove anchors
+        if (stripos($relativeUrl, '#') != FALSE) { 
+            $relativeUrl = substr($relativeUrl, 0, stripos($relativeUrl, '#')); //remove anchors
         }
 
-        if (!preg_match('#(^http://(.*)/$)|http://(.*)/(.*)\.([A-Za-z0-9]+)|http://(.*)/([^\?\#]*)(\?|\#)([^/]*)#i',$relativeUrl)) { 
+        if (!preg_match('#(^http://(.*)/$)|http://(.*)/(.*)\.([A-Za-z0-9]+)|http://(.*)/([^\?\#]*)(\?|\#)([^/]*)#i', $relativeUrl)) { 
             $relativeUrl .= '/';
         }
 
-        $relativeUrl = preg_replace('#http://([^.]+).([a-zA-z]{3})/#i','http://www.$1.$2/',$relativeUrl);
+        $relativeUrl = preg_replace('#http://([^.]+).([a-zA-z]{3})/#i', 'http://www.$1.$2/', $relativeUrl);
         return $relativeUrl;
     }
 
@@ -85,7 +85,7 @@ 
      * @return bool true on image, false on anything else
      */
     public static function isImage($link) {
-        if (preg_match('%\.(gif|jpe?g|png|bmp)$%i',$link)) return true;
+        if (preg_match('%\.(gif|jpe?g|png|bmp)$%i', $link)) return true;
         else return false;
     }
 
@@ -128,7 +128,7 @@ 
         }
 
         foreach ($excludedArray as $pattern) {
-            if ( preg_match($pattern, urldecode($link)) ) {
+            if (preg_match($pattern, urldecode($link))) {
                 echo "<p>matched exclude pattern <b>$pattern</b> in ".urldecode($link)."</p>";
                 return TRUE;
             } 
@@ -143,7 +143,7 @@ 
      * @return bool true on mailto:, false on everything else
      */
     public static function isMailto($link) {
-        if (stripos($link,'mailto:')===FALSE) return false;
+        if (stripos($link, 'mailto:') === FALSE) return false;
         else return true;
     }
 
@@ -170,73 +170,73 @@ 
      * @params string $relativeURL URL to convert to absolute
      * @return string Absolute URL
      */
-    public static function urlToAbsolute( $baseUrl, $relativeUrl ) {
+    public static function urlToAbsolute($baseUrl, $relativeUrl) {
         // If relative URL has a scheme, clean path and return.
-        $r = self::splitUrl( $relativeUrl );
-        if ( $r === FALSE ) {
+        $r = self::splitUrl($relativeUrl);
+        if ($r === FALSE) {
             return FALSE;
         }
 
 
-        if ( !empty( $r['scheme'] ) )
+        if (!empty($r['scheme']))
         {
-            if ( !empty( $r['path'] ) && $r['path'][0] == '/' ) {
-                $r['path'] = self::urlRemoveDotSegments( $r['path'] );
+            if (!empty($r['path']) && $r['path'][0] == '/') {
+                $r['path'] = self::urlRemoveDotSegments($r['path']);
             }
 
-            return self::joinUrl( $r );
+            return self::joinUrl($r);
         }
     
         // Make sure the base URL is absolute.
-        $b = self::splitUrl( $baseUrl );
-        if ( $b === FALSE || empty( $b['scheme'] ) || empty( $b['host'] ) ) {
+        $b = self::splitUrl($baseUrl);
+        if ($b === FALSE || empty($b['scheme']) || empty($b['host'])) {
             return FALSE;
         }
 
         $r['scheme'] = $b['scheme'];
     
         // If relative URL has an authority, clean path and return.
-        if ( isset( $r['host'] ) )
+        if (isset($r['host']))
         {
-            if ( !empty( $r['path'] ) ) {
-                $r['path'] = self::urlRemoveDotSegments( $r['path'] );
+            if (!empty($r['path'])) {
+                $r['path'] = self::urlRemoveDotSegments($r['path']);
             }
 
-            return self::joinUrl( $r );
+            return self::joinUrl($r);
         }
-        unset( $r['port'] );
-        unset( $r['user'] );
-        unset( $r['pass'] );
+        unset($r['port']);
+        unset($r['user']);
+        unset($r['pass']);
     
         // Copy base authority.
         $r['host'] = $b['host'];
-        if ( isset( $b['port'] ) ) $r['port'] = $b['port'];
-        if ( isset( $b['user'] ) ) $r['user'] = $b['user'];
-        if ( isset( $b['pass'] ) ) $r['pass'] = $b['pass'];
+        if (isset($b['port'])) $r['port'] = $b['port'];
+        if (isset($b['user'])) $r['user'] = $b['user'];
+        if (isset($b['pass'])) $r['pass'] = $b['pass'];
     
         // If relative URL has no path, use base path
-        if ( empty( $r['path'] ) )
+        if (empty($r['path']))
         {
-            if ( !empty( $b['path'] ) ) {
+            if (!empty($b['path'])) {
                 $r['path'] = $b['path'];
             }
 
-            if ( !isset( $r['query'] ) && isset( $b['query'] ) ) {
+            if (!isset($r['query']) && isset($b['query'])) {
                 $r['query'] = $b['query'];
             }
 
-            return self::joinUrl( $r );
+            return self::joinUrl($r);
         }
     
         // If relative URL path doesn't start with /, merge with base path
-        if ( $r['path'][0] != '/' )
+        if ($r['path'][0] != '/')
         {
-            $base = mb_strrchr( $b['path'], '/', TRUE, 'UTF-8' );
-            if ( $base === FALSE ) $base = '';
-            $r['path'] = $base . '/' . $r['path'];
+            $base = mb_strrchr($b['path'], '/', TRUE, 'UTF-8');
+            if ($base === FALSE) $base = '';
+            $r['path'] = $base.'/'.$r['path'];
         }
-        $r['path'] = self::urlRemoveDotSegments( $r['path'] );
-        return self::joinUrl( $r );
+        $r['path'] = self::urlRemoveDotSegments($r['path']);
+        return self::joinUrl($r);
     }
 
     /**
@@ -246,29 +246,29 @@ 
      * Code distributed under OSI BSD (http://www.opensource.org/licenses/bsd-license.php)
      * 
      */
-    public static function urlRemoveDotSegments( $path ) {
+    public static function urlRemoveDotSegments($path) {
         // multi-byte character explode
-        $inSegs  = preg_split( '!/!u', $path );
+        $inSegs  = preg_split('!/!u', $path);
         $outSegs = array( );
-        foreach ( $inSegs as $seg )
+        foreach ($inSegs as $seg)
         {
-            if ( $seg == '' || $seg == '.') {
+            if ($seg == '' || $seg == '.') {
                 continue;
             }
-            if ( $seg == '..' ) {
-                array_pop( $outSegs );
+            if ($seg == '..') {
+                array_pop($outSegs);
             } else {
-                array_push( $outSegs, $seg );
+                array_push($outSegs, $seg);
             }
         }
-        $outPath = implode( '/', $outSegs );
-        if ( $path[0] == '/' ) {
-            $outPath = '/' . $outPath;
+        $outPath = implode('/', $outSegs);
+        if ($path[0] == '/') {
+            $outPath = '/'.$outPath;
         }
 
         // compare last multi-byte character against '/'
-        if ( $outPath != '/' &&
-            (mb_strlen($path)-1) == mb_strrpos( $path, '/', 'UTF-8' ) ) {
+        if ($outPath != '/' &&
+            (mb_strlen($path)-1) == mb_strrpos($path, '/', 'UTF-8')) {
             $outPath .= '/';
         }
 
@@ -282,16 +282,16 @@ 
      * Code distributed under OSI BSD (http://www.opensource.org/licenses/bsd-license.php)
      * 
      */
-    public static function splitUrl( $url, $decode=TRUE )
+    public static function splitUrl($url, $decode = TRUE)
     {
         $m = [];
         $xunressub     = 'a-zA-Z\d\-._~\!$&\'()*+,;=';
-        $xpchar        = $xunressub . ':@%';
+        $xpchar        = $xunressub.':@%';
 
         $xscheme       = '([a-zA-Z][a-zA-Z\d+-.]*)';
 
-        $xuserinfo     = '((['  . $xunressub . '%]*)' .
-                        '(:([' . $xunressub . ':%]*))?)';
+        $xuserinfo     = '((['.$xunressub.'%]*)'.
+                        '(:(['.$xunressub.':%]*))?)';
 
         $xipv4         = '(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})';
 
@@ -300,64 +300,64 @@ 
         $xhost_name    = '([a-zA-Z%]+)';
         // $xhost_name    = '([a-zA-Z\d-.%]+)'; @todo alterado pq tava dando erro nesse parser
 
-        $xhost         = '(' . $xhost_name . '|' . $xipv4 . '|' . $xipv6 . ')';
+        $xhost         = '('.$xhost_name.'|'.$xipv4.'|'.$xipv6.')';
         $xport         = '(\d*)';
-        $xauthority    = '((' . $xuserinfo . '@)?' . $xhost .
-                        '?(:' . $xport . ')?)';
+        $xauthority    = '(('.$xuserinfo.'@)?'.$xhost.
+                        '?(:'.$xport.')?)';
 
-        $xslash_seg    = '(/[' . $xpchar . ']*)';
-        $xpath_authabs = '((//' . $xauthority . ')((/[' . $xpchar . ']*)*))';
-        $xpath_rel     = '([' . $xpchar . ']+' . $xslash_seg . '*)';
-        $xpath_abs     = '(/(' . $xpath_rel . ')?)';
-        $xapath        = '(' . $xpath_authabs . '|' . $xpath_abs .
-                        '|' . $xpath_rel . ')';
+        $xslash_seg    = '(/['.$xpchar.']*)';
+        $xpath_authabs = '((//'.$xauthority.')((/['.$xpchar.']*)*))';
+        $xpath_rel     = '(['.$xpchar.']+'.$xslash_seg.'*)';
+        $xpath_abs     = '(/('.$xpath_rel.')?)';
+        $xapath        = '('.$xpath_authabs.'|'.$xpath_abs.
+                        '|'.$xpath_rel.')';
 
-        $xqueryfrag    = '([' . $xpchar . '/?' . ']*)';
+        $xqueryfrag    = '(['.$xpchar.'/?'.']*)';
 
-        $xurl          = '^(' . $xscheme . ':)?' .  $xapath . '?' .
-                        '(\?' . $xqueryfrag . ')?(#' . $xqueryfrag . ')?$';
+        $xurl          = '^('.$xscheme.':)?'.$xapath.'?'.
+                        '(\?'.$xqueryfrag.')?(#'.$xqueryfrag.')?$';
     
     
         // Split the URL into components.
-        if ( !preg_match( '!' . $xurl . '!', $url, $m ) ) {
+        if (!preg_match('!'.$xurl.'!', $url, $m)) {
             return FALSE;
         }
     
-        if ( !empty($m[2]) )        $parts['scheme']  = strtolower($m[2]);
+        if (!empty($m[2]))        $parts['scheme']  = strtolower($m[2]);
     
-        if ( !empty($m[7]) ) {
-            if ( isset( $m[9] ) )   $parts['user']    = $m[9];
-            else            $parts['user']    = '';
+        if (!empty($m[7])) {
+            if (isset($m[9]))   $parts['user']    = $m[9];
+            else            $parts['user'] = '';
         }
-        if ( !empty($m[10]) )       $parts['pass']    = $m[11];
+        if (!empty($m[10]))       $parts['pass']    = $m[11];
     
-        if ( !empty($m[13]) )       $h=$parts['host'] = $m[13];
-        else if ( !empty($m[14]) )  $parts['host']    = $m[14];
-        else if ( !empty($m[16]) )  $parts['host']    = $m[16];
-        else if ( !empty( $m[5] ) ) $parts['host']    = '';
-        if ( !empty($m[17]) )       $parts['port']    = $m[18];
+        if (!empty($m[13]))       $h = $parts['host'] = $m[13];
+        else if (!empty($m[14]))  $parts['host']    = $m[14];
+        else if (!empty($m[16]))  $parts['host']    = $m[16];
+        else if (!empty($m[5])) $parts['host']    = '';
+        if (!empty($m[17]))       $parts['port']    = $m[18];
     
-        if ( !empty($m[19]) )       $parts['path']    = $m[19];
-        else if ( !empty($m[21]) )  $parts['path']    = $m[21];
-        else if ( !empty($m[25]) )  $parts['path']    = $m[25];
+        if (!empty($m[19]))       $parts['path']    = $m[19];
+        else if (!empty($m[21]))  $parts['path']    = $m[21];
+        else if (!empty($m[25]))  $parts['path']    = $m[25];
     
-        if ( !empty($m[27]) )       $parts['query']   = $m[28];
-        if ( !empty($m[29]) )       $parts['fragment']= $m[30];
+        if (!empty($m[27]))       $parts['query']   = $m[28];
+        if (!empty($m[29]))       $parts['fragment'] = $m[30];
     
-        if ( !$decode )
+        if (!$decode)
             return $parts;
-        if ( !empty($parts['user']) )
-            $parts['user']     = rawurldecode( $parts['user'] );
-        if ( !empty($parts['pass']) )
-            $parts['pass']     = rawurldecode( $parts['pass'] );
-        if ( !empty($parts['path']) )
-            $parts['path']     = rawurldecode( $parts['path'] );
-        if ( isset($h) )
-            $parts['host']     = rawurldecode( $parts['host'] );
-        if ( !empty($parts['query']) )
-            $parts['query']    = rawurldecode( $parts['query'] );
-        if ( !empty($parts['fragment']) )
-            $parts['fragment'] = rawurldecode( $parts['fragment'] );
+        if (!empty($parts['user']))
+            $parts['user']     = rawurldecode($parts['user']);
+        if (!empty($parts['pass']))
+            $parts['pass']     = rawurldecode($parts['pass']);
+        if (!empty($parts['path']))
+            $parts['path']     = rawurldecode($parts['path']);
+        if (isset($h))
+            $parts['host']     = rawurldecode($parts['host']);
+        if (!empty($parts['query']))
+            $parts['query']    = rawurldecode($parts['query']);
+        if (!empty($parts['fragment']))
+            $parts['fragment'] = rawurldecode($parts['fragment']);
         return $parts;
     }
 
@@ -368,62 +368,62 @@ 
      * Code distributed under OSI BSD (http://www.opensource.org/licenses/bsd-license.php)
      * 
      */
-    public static function joinUrl( $parts, $encode=TRUE )
+    public static function joinUrl($parts, $encode = TRUE)
     {
-        if ( $encode )
+        if ($encode)
         {
-            if ( isset( $parts['user'] ) ) {
-                $parts['user']     = rawurlencode( $parts['user'] );
+            if (isset($parts['user'])) {
+                $parts['user']     = rawurlencode($parts['user']);
             }
-            if ( isset( $parts['pass'] ) ) {
-                $parts['pass']     = rawurlencode( $parts['pass'] );
+            if (isset($parts['pass'])) {
+                $parts['pass']     = rawurlencode($parts['pass']);
             }
-            if ( isset( $parts['host'] ) &&
-                !preg_match( '!^(\[[\da-f.:]+\]])|([\da-f.:]+)$!ui', $parts['host'] ) ) {
-                $parts['host']     = rawurlencode( $parts['host'] );
+            if (isset($parts['host']) &&
+                !preg_match('!^(\[[\da-f.:]+\]])|([\da-f.:]+)$!ui', $parts['host'])) {
+                $parts['host']     = rawurlencode($parts['host']);
             }
-            if ( !empty( $parts['path'] ) ) {
-                $parts['path']     = preg_replace( '!%2F!ui', '/',
-                    rawurlencode( $parts['path'] ) );
+            if (!empty($parts['path'])) {
+                $parts['path']     = preg_replace('!%2F!ui', '/',
+                    rawurlencode($parts['path']));
             }
 
-            if ( isset( $parts['query'] ) ) {
-                $parts['query']    = rawurlencode( $parts['query'] );
+            if (isset($parts['query'])) {
+                $parts['query'] = rawurlencode($parts['query']);
             }
 
-            if ( isset( $parts['fragment'] ) ) {
-                $parts['fragment'] = rawurlencode( $parts['fragment'] );
+            if (isset($parts['fragment'])) {
+                $parts['fragment'] = rawurlencode($parts['fragment']);
             }
         }
     
         $url = '';
-        if ( !empty( $parts['scheme'] ) )
-            $url .= $parts['scheme'] . ':';
-        if ( isset( $parts['host'] ) )
+        if (!empty($parts['scheme']))
+            $url .= $parts['scheme'].':';
+        if (isset($parts['host']))
         {
             $url .= '//';
-            if ( isset( $parts['user'] ) )
+            if (isset($parts['user']))
             {
                 $url .= $parts['user'];
-                if ( isset( $parts['pass'] ) )
-                    $url .= ':' . $parts['pass'];
+                if (isset($parts['pass']))
+                    $url .= ':'.$parts['pass'];
                 $url .= '@';
             }
-            if ( preg_match( '!^[\da-f]*:[\da-f.:]+$!ui', $parts['host'] ) )
-                $url .= '[' . $parts['host'] . ']'; // IPv6
+            if (preg_match('!^[\da-f]*:[\da-f.:]+$!ui', $parts['host']))
+                $url .= '['.$parts['host'].']'; // IPv6
             else
-                $url .= $parts['host'];             // IPv4 or name
-            if ( isset( $parts['port'] ) )
-                $url .= ':' . $parts['port'];
-            if ( !empty( $parts['path'] ) && $parts['path'][0] != '/' )
+                $url .= $parts['host']; // IPv4 or name
+            if (isset($parts['port']))
+                $url .= ':'.$parts['port'];
+            if (!empty($parts['path']) && $parts['path'][0] != '/')
                 $url .= '/';
         }
-        if ( !empty( $parts['path'] ) )
+        if (!empty($parts['path']))
             $url .= $parts['path'];
-        if ( isset( $parts['query'] ) )
-            $url .= '?' . $parts['query'];
-        if ( isset( $parts['fragment'] ) )
-            $url .= '#' . $parts['fragment'];
+        if (isset($parts['query']))
+            $url .= '?'.$parts['query'];
+        if (isset($parts['fragment']))
+            $url .= '#'.$parts['fragment'];
         return $url;
     }
 

Braces +109 added lines, -55 removed lines

@@ -85,8 +85,11 @@ 
      * @return bool true on image, false on anything else
      */
     public static function isImage($link) {
-        if (preg_match('%\.(gif|jpe?g|png|bmp)$%i',$link)) return true;
-        else return false;
+        if (preg_match('%\.(gif|jpe?g|png|bmp)$%i',$link)) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -143,8 +146,11 @@ 
      * @return bool true on mailto:, false on everything else
      */
     public static function isMailto($link) {
-        if (stripos($link,'mailto:')===FALSE) return false;
-        else return true;
+        if (stripos($link,'mailto:')===FALSE) {
+            return false;
+        } else {
+            return true;
+        }
     }
 
     /* Depreciated (I think)
@@ -210,9 +216,15 @@ 
     
         // Copy base authority.
         $r['host'] = $b['host'];
-        if ( isset( $b['port'] ) ) $r['port'] = $b['port'];
-        if ( isset( $b['user'] ) ) $r['user'] = $b['user'];
-        if ( isset( $b['pass'] ) ) $r['pass'] = $b['pass'];
+        if ( isset( $b['port'] ) ) {
+            $r['port'] = $b['port'];
+        }
+        if ( isset( $b['user'] ) ) {
+            $r['user'] = $b['user'];
+        }
+        if ( isset( $b['pass'] ) ) {
+            $r['pass'] = $b['pass'];
+        }
     
         // If relative URL has no path, use base path
         if ( empty( $r['path'] ) )
@@ -232,7 +244,9 @@ 
         if ( $r['path'][0] != '/' )
         {
             $base = mb_strrchr( $b['path'], '/', TRUE, 'UTF-8' );
-            if ( $base === FALSE ) $base = '';
+            if ( $base === FALSE ) {
+                $base = '';
+            }
             $r['path'] = $base . '/' . $r['path'];
         }
         $r['path'] = self::urlRemoveDotSegments( $r['path'] );
@@ -323,41 +337,70 @@ 
             return FALSE;
         }
     
-        if ( !empty($m[2]) )        $parts['scheme']  = strtolower($m[2]);
+        if ( !empty($m[2]) ) {
+            $parts['scheme']  = strtolower($m[2]);
+        }
     
         if ( !empty($m[7]) ) {
-            if ( isset( $m[9] ) )   $parts['user']    = $m[9];
-            else            $parts['user']    = '';
+            if ( isset( $m[9] ) ) {
+                $parts['user']    = $m[9];
+            } else {
+                $parts['user']    = '';
+            }
+        }
+        if ( !empty($m[10]) ) {
+            $parts['pass']    = $m[11];
         }
-        if ( !empty($m[10]) )       $parts['pass']    = $m[11];
     
-        if ( !empty($m[13]) )       $h=$parts['host'] = $m[13];
-        else if ( !empty($m[14]) )  $parts['host']    = $m[14];
-        else if ( !empty($m[16]) )  $parts['host']    = $m[16];
-        else if ( !empty( $m[5] ) ) $parts['host']    = '';
-        if ( !empty($m[17]) )       $parts['port']    = $m[18];
+        if ( !empty($m[13]) ) {
+            $h=$parts['host'] = $m[13];
+        } else if ( !empty($m[14]) ) {
+            $parts['host']    = $m[14];
+        } else if ( !empty($m[16]) ) {
+            $parts['host']    = $m[16];
+        } else if ( !empty( $m[5] ) ) {
+            $parts['host']    = '';
+        }
+        if ( !empty($m[17]) ) {
+            $parts['port']    = $m[18];
+        }
     
-        if ( !empty($m[19]) )       $parts['path']    = $m[19];
-        else if ( !empty($m[21]) )  $parts['path']    = $m[21];
-        else if ( !empty($m[25]) )  $parts['path']    = $m[25];
+        if ( !empty($m[19]) ) {
+            $parts['path']    = $m[19];
+        } else if ( !empty($m[21]) ) {
+            $parts['path']    = $m[21];
+        } else if ( !empty($m[25]) ) {
+            $parts['path']    = $m[25];
+        }
     
-        if ( !empty($m[27]) )       $parts['query']   = $m[28];
-        if ( !empty($m[29]) )       $parts['fragment']= $m[30];
+        if ( !empty($m[27]) ) {
+            $parts['query']   = $m[28];
+        }
+        if ( !empty($m[29]) ) {
+            $parts['fragment']= $m[30];
+        }
     
-        if ( !$decode )
-            return $parts;
-        if ( !empty($parts['user']) )
-            $parts['user']     = rawurldecode( $parts['user'] );
-        if ( !empty($parts['pass']) )
-            $parts['pass']     = rawurldecode( $parts['pass'] );
-        if ( !empty($parts['path']) )
-            $parts['path']     = rawurldecode( $parts['path'] );
-        if ( isset($h) )
-            $parts['host']     = rawurldecode( $parts['host'] );
-        if ( !empty($parts['query']) )
-            $parts['query']    = rawurldecode( $parts['query'] );
-        if ( !empty($parts['fragment']) )
-            $parts['fragment'] = rawurldecode( $parts['fragment'] );
+        if ( !$decode ) {
+                    return $parts;
+        }
+        if ( !empty($parts['user']) ) {
+                    $parts['user']     = rawurldecode( $parts['user'] );
+        }
+        if ( !empty($parts['pass']) ) {
+                    $parts['pass']     = rawurldecode( $parts['pass'] );
+        }
+        if ( !empty($parts['path']) ) {
+                    $parts['path']     = rawurldecode( $parts['path'] );
+        }
+        if ( isset($h) ) {
+                    $parts['host']     = rawurldecode( $parts['host'] );
+        }
+        if ( !empty($parts['query']) ) {
+                    $parts['query']    = rawurldecode( $parts['query'] );
+        }
+        if ( !empty($parts['fragment']) ) {
+                    $parts['fragment'] = rawurldecode( $parts['fragment'] );
+        }
         return $parts;
     }
 
@@ -397,33 +440,44 @@ 
         }
     
         $url = '';
-        if ( !empty( $parts['scheme'] ) )
-            $url .= $parts['scheme'] . ':';
+        if ( !empty( $parts['scheme'] ) ) {
+                    $url .= $parts['scheme'] . ':';
+        }
         if ( isset( $parts['host'] ) )
         {
             $url .= '//';
             if ( isset( $parts['user'] ) )
             {
                 $url .= $parts['user'];
-                if ( isset( $parts['pass'] ) )
-                    $url .= ':' . $parts['pass'];
+                if ( isset( $parts['pass'] ) ) {
+                                    $url .= ':' . $parts['pass'];
+                }
                 $url .= '@';
             }
-            if ( preg_match( '!^[\da-f]*:[\da-f.:]+$!ui', $parts['host'] ) )
-                $url .= '[' . $parts['host'] . ']'; // IPv6
-            else
-                $url .= $parts['host'];             // IPv4 or name
-            if ( isset( $parts['port'] ) )
-                $url .= ':' . $parts['port'];
-            if ( !empty( $parts['path'] ) && $parts['path'][0] != '/' )
-                $url .= '/';
-        }
-        if ( !empty( $parts['path'] ) )
-            $url .= $parts['path'];
-        if ( isset( $parts['query'] ) )
-            $url .= '?' . $parts['query'];
-        if ( isset( $parts['fragment'] ) )
-            $url .= '#' . $parts['fragment'];
+            if ( preg_match( '!^[\da-f]*:[\da-f.:]+$!ui', $parts['host'] ) ) {
+                            $url .= '[' . $parts['host'] . ']';
+            }
+            // IPv6
+            else {
+                            $url .= $parts['host'];
+            }
+            // IPv4 or name
+            if ( isset( $parts['port'] ) ) {
+                            $url .= ':' . $parts['port'];
+            }
+            if ( !empty( $parts['path'] ) && $parts['path'][0] != '/' ) {
+                            $url .= '/';
+            }
+        }
+        if ( !empty( $parts['path'] ) ) {
+                    $url .= $parts['path'];
+        }
+        if ( isset( $parts['query'] ) ) {
+                    $url .= '?' . $parts['query'];
+        }
+        if ( isset( $parts['fragment'] ) ) {
+                    $url .= '#' . $parts['fragment'];
+        }
         return $url;
     }