maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- validateUrl needed to idna-convert the url if its a domain, also needed new regex (subfolder, etc.)

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-05-04 10:30:02 +00:00
parent 9c79654cf4
commit 1f6e3c271b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/functions/validate/function.validateUrl.php
View File

@@ -28,18 +28,18 @@
function validateUrl($url)
{
global $idna_convert;
if(strtolower(substr($url, 0, 7)) != "http://"
&& strtolower(substr($url, 0, 8)) != "https://")
{
$url = 'http://' . $url;
}
// needs converting
$url = $idna_convert->encode($url);
// there is a bug in php 5.2.13 - 5.3.2 which
// lets filter_var fail if the domain has
// a dash (-) in it. As the PHP_VERSION constant
// gives also patch-brandings, e.g. '5.3.2-pl0-gentoo'
// we just always use our regex
$pattern = '/^https?:\/\/([a-z0-9]([a-z0-9\-]{0,61}[a-z0-9])?\.)+[a-z]{2,6}$/i';
$pattern = "/^https?\:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(\/\S*)?$/i";
if(preg_match($pattern, $url))
{
return true;