Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#124492 by m3avrck, mfer: more accurate checking for valid URLs in valid_url()

5.x
Neil Drumm 2009-01-16 19:26:09 +00:00
parent 5fdb86d204
commit b9378534b7
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
includes/common.inc
View File

@ -888,7 +888,7 @@ function valid_email_address($mail) {
* *
* This function should only be used on actual URLs. It should not be used for * This function should only be used on actual URLs. It should not be used for
* Drupal menu paths, which can contain arbitrary characters. * Drupal menu paths, which can contain arbitrary characters.
* * Valid values per RFC 3986.
* @param $url * @param $url
* The URL to verify. * The URL to verify.
* @param $absolute * @param $absolute
@ -897,12 +897,26 @@ function valid_email_address($mail) {
* TRUE if the URL is in a valid format. * TRUE if the URL is in a valid format.
*/ */
function valid_url($url, $absolute = FALSE) { function valid_url($url, $absolute = FALSE) {
$allowed_characters = '[a-z0-9\/:_\-_\.\?\$,;~=#&%\+]';
if ($absolute) { if ($absolute) {
return preg_match("/^(http|https|ftp):\/\/". $allowed_characters ."+$/i", $url); return (bool)preg_match("
/^ # Start at the beginning of the text
(?:ftp|https?):\/\/ # Look for ftp, http, or https schemes
(?: # Userinfo (optional) which is typically
(?:(?:[\w\.\-\+!$&'\(\)*\+,;=]|%[0-9a-f]{2})+:)* # a username or a username and password
(?:[\w\.\-\+%!$&'\(\)*\+,;=]|%[0-9a-f]{2})+@ # combination
)?
(?:
(?:[a-z0-9\-\.]|%[0-9a-f]{2})+ # A domain name or a IPv4 address
|(?:\[(?:[0-9a-f]{0,4}:)*(?:[0-9a-f]{0,4})\]) # or a well formed IPv6 address
)
(?::[0-9]+)? # Server port number (optional)
(?:[\/|\?]
(?:[\w#!:\.\?\+=&@$'~*,;\/\(\)\[\]\-]|%[0-9a-f]{2}) # The path and query (optional)
*)?
$/xi", $url);
} }
else { else {
return preg_match("/^". $allowed_characters ."+$/i", $url); return (bool)preg_match("/^(?:[\w#!:\.\?\+=&@$'~*,;\/\(\)\[\]\-]|%[0-9a-f]{2})+$/i", $url);
} }
} }