Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html

Browse Source
This commit is contained in:
Laurent Destailleur
2008-10-01 19:44:30 +00:00
parent ecb4128496
commit b262ec547f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/lib/functions.lib.php
View File

@@ -2481,7 +2481,10 @@ function measuring_units_string($unit,$measuring_style='')
*/ */
function clean_url($url,$http=1) function clean_url($url,$http=1)
{ {
if (eregi('^(https?:[\\\/]+)?([0-9A-Z\-\.]+\.[A-Z]{2,4})(:[0-9]+)?',$url,$regs)) // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
// To include the minus sign in a char class, we must not escape it but put it at the end of the class
// Also, there's no need of escape a dot sign in a class
if (eregi('^(https?:[\\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?',$url,$regs))
{ {
$proto=$regs[1]; $proto=$regs[1];
$domain=$regs[2]; $domain=$regs[2];