ricardosierra / validate

src/Validate/Url.php

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;
     }