From 555b2fbc82783b81bd083d5ef3902eb90fb2fb8a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 17 Sep 2007 23:58:11 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20possibilit=E9=20de=20garder?= =?UTF-8?q?=20le=20http?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/lib/functions.inc.php | 10 ++++++---- htdocs/societe.class.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index b3b84807d9e..b9bef9f1fc3 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -2670,18 +2670,20 @@ function dol_entity_decode($StringHtml) /** \brief Nettoie une url \param string url + \param string http (1: avec http, 0: sans http) \return string CleanUrl */ -function clean_url($url) +function clean_url($url,$http=1) { //Todo: voir plus tard pour les url avec accent $url = unaccent(trim($url)); - // On supprime le http - $url = eregi_replace('^http(s)?:[\\\/]+','',$url); + // Si défini on supprime le http + // TODO: supprimer les slashs en trop + if ($http==0) $url = eregi_replace('^http(s)?:[\\\/]+','',$url); // On récupère le nom de domaine - $domain = eregi('^[0-9A-Z-]+\.([0-9A-Z-]+\.)+[A-Z]{2,4}(:[0-9]+)?',$url,$regs); + $domain = eregi('^(http(s)?:[\\\/]+)?[0-9A-Z-]+\.([0-9A-Z-]+\.)+[A-Z]{2,4}(:[0-9]+)?',$url,$regs); // On passe le nom de domaine en minuscule $url = eregi_replace($regs[0],strtolower($regs[0]),$url); diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php index 2d750425af2..63102c39674 100644 --- a/htdocs/societe.class.php +++ b/htdocs/societe.class.php @@ -301,7 +301,7 @@ class Societe $this->fax = ereg_replace(" ","",$this->fax); $this->fax = ereg_replace("\.","",$this->fax); $this->email=trim($this->email); - $this->url=clean_url($this->url); + $this->url=clean_url($this->url,0); $this->siren=trim($this->siren); $this->siret=trim($this->siret); $this->ape=trim($this->ape);