fix url validate

typecho · May 15, 2023 · 98e4c1d · 98e4c1d
1 parent 7a41f0d
commit 98e4c1d
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/var/Typecho/Validate.php b/var/Typecho/Validate.php
@@ -97,7 +97,7 @@ public static function maxLength(string $str, int $length): bool
     public static function email(string $str): bool
     {
         $email = filter_var($str, FILTER_SANITIZE_EMAIL);
-        return filter_var($str, FILTER_VALIDATE_EMAIL) && ($email === $str);
+        return !!filter_var($str, FILTER_VALIDATE_EMAIL) && ($email === $str);
     }
 
     /**
@@ -111,14 +111,8 @@ public static function email(string $str): bool
      */
     public static function url(string $str): bool
     {
-        $parts = parse_url($str);
-        if (!$parts) {
-            return false;
-        }
-
-        return isset($parts['scheme']) &&
-        in_array($parts['scheme'], ['http', 'https']) &&
-        !preg_match('/(\(|\)|\\\|"|<|>|[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19])/', $str);
+        $url = Common::safeUrl($str);
+        return !!filter_var($str, FILTER_VALIDATE_URL) && ($url === $str);
     }
 
     /**