diff --git a/evoadmin/htdocs/alias.php b/evoadmin/htdocs/alias.php index 47b3e9d..13f6bbe 100755 --- a/evoadmin/htdocs/alias.php +++ b/evoadmin/htdocs/alias.php @@ -177,7 +177,7 @@ if (isset($_SESSION['login'])) if (!$conf['domaines']['onlyone']) { $info[0]['mailacceptinggeneralid'][$i] = - preg_replace('@'.$_SESSION['domain'],'',$info[0]['mailacceptinggeneralid'][$i]); + preg_replace("/".@$_SESSION['domain']."/",'',$info[0]['mailacceptinggeneralid'][$i]); } print "Mail accepté en entrée : diff --git a/evoadmin/htdocs/compte.php b/evoadmin/htdocs/compte.php index 903686f..a2b8b0d 100755 --- a/evoadmin/htdocs/compte.php +++ b/evoadmin/htdocs/compte.php @@ -426,7 +426,7 @@ if (isset($_SESSION['login'])) if (!$conf['domaines']['onlyone']) { $info[0]['mailacceptinggeneralid'][$i] = - preg_replace('@'.$_SESSION['domain'],'',$info[0]['mailacceptinggeneralid'][$i]); + preg_replace("/@".$_SESSION['domain']."/",'',$info[0]['mailacceptinggeneralid'][$i]); } print "Mail accepté en entrée : diff --git a/evoadmin/htdocs/evolibs/Html.php b/evoadmin/htdocs/evolibs/Html.php index ce508ac..956090a 100755 --- a/evoadmin/htdocs/evolibs/Html.php +++ b/evoadmin/htdocs/evolibs/Html.php @@ -45,7 +45,7 @@ class Html function clean2($texte) { $texte = htmlentities(strip_tags($texte),ENT_NOQUOTES); - $texte = preg_replace('\[([^"^=]+)=(http://[^"^[:space:]]+)\]', + $texte = preg_replace('/\[([^"^=]+)=(http:\/\/[^"^[:space:]]+)\]/', '\\1',$texte); return addslashes($texte); @@ -82,7 +82,7 @@ class Html while(list($car,$val) = each($couple)) { - $texte = preg_replace($car,$val,$texte); + $texte = preg_replace("/".$car."/",$val,$texte); } return $texte; diff --git a/evoadmin/htdocs/evolibs/Math.php b/evoadmin/htdocs/evolibs/Math.php index 7aec6f4..18e4f53 100755 --- a/evoadmin/htdocs/evolibs/Math.php +++ b/evoadmin/htdocs/evolibs/Math.php @@ -16,7 +16,7 @@ class Math // Pour eviter -0.00 if ( number_format($param, 2, '.', ' ') == -0.00 ) $param = 0.00; - return preg_replace('x',' ',number_format($param, 2, '.', 'x')); + return preg_replace('/x/',' ',number_format($param, 2, '.', 'x')); } function LongCode($param) diff --git a/evoadmin/htdocs/superadmin.php b/evoadmin/htdocs/superadmin.php index 09408dd..548a434 100755 --- a/evoadmin/htdocs/superadmin.php +++ b/evoadmin/htdocs/superadmin.php @@ -139,12 +139,10 @@ if (isset($_SESSION['login'])) { // we select domain in your DN // thanks to http://www.physiol.ox.ac.uk/~trp/regexp.html if ($conf['evoadmin']['version'] <= 2) { - $mydomain = preg_replace("/uid=" .$login. ",domain=((?:(?:[0-9a-zA-Z_\-]+)\.){1,}(?:[0-9a-zA-Z_\-]+))," - . LDAP_BASE ."/","$1",$_SESSION['dn']); + $mydomain = preg_replace("/\/uid=".$login.",domain=((?:(?:[0-9a-zA-Z_\-]+)\.){1,}(?:[0-9a-zA-Z_\-]+)),".LDAP_BASE."\//","$1",$_SESSION['dn']); } else { - $mydomain = preg_replace("/uid=" .$login. ",cn=((?:(?:[0-9a-zA-Z_\-]+)\.){1,}(?:[0-9a-zA-Z_\-]+))," - . LDAP_BASE ."/","$1",$_SESSION['dn']); + $mydomain = preg_replace("/\/uid=".$login.",cn=((?:(?:[0-9a-zA-Z_\-]+)\.){1,}(?:[0-9a-zA-Z_\-]+)),".LDAP_BASE."\//","$1",$_SESSION['dn']); } array_push($domaines,$mydomain);