From 4bff20284a0a54908fa166551ccf14b94368d3b9 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Wed, 6 Apr 2005 13:34:10 +0000
Subject: [PATCH] =?UTF-8?q?deux=20petites=20modifs=20pour=20=C3=A9viter=20?=
=?UTF-8?q?de=20perdre=20du=20temps=20avec=20des=20faux=20bugs=20comme=20?=
=?UTF-8?q?=C3=A7a=20vient=20de=20m'arriver:=201.=20=5FT=20retourne=20son?=
=?UTF-8?q?=20argument=20plutot=20que=20''=20si=20ce=20n'est=20pas=20une?=
=?UTF-8?q?=20entr=C3=A9e=20dans=20le=20dico=20de=20la=20langue=202.=20ema?=
=?UTF-8?q?il=5Fvalide=20retourne=20comme=20valeur=20Vrai=20l'adresse=20ne?=
=?UTF-8?q?ttoy=C3=A9e=20(Nom@Domain)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_version.php3 | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index b05f7551ab..c8ab83a732 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -860,20 +860,17 @@ if (!defined('_DATA_META_CACHE') AND !defined('_ECRIRE_INC_META')) {
}
// Verifier la conformite d'une ou plusieurs adresses email
-function email_valide($adresse) {
- $adresses = explode(',', $adresse);
- if (is_array($adresses)) {
- while (list(, $adresse) = each($adresses)) {
- // nettoyer certains formats
- // "Marie Toto <Marie@toto.com>"
- $adresse = eregi_replace("^[^<>\"]*<([^<>\"]+)>$", "\\1", $adresse);
- // RFC 822
- if (!eregi('^[^()<>@,;:\\"/[:space:]]+(@([-_0-9a-z]+\.)*[-_0-9a-z]+)$', trim($adresse)))
- return false;
- }
- return true;
+// retourne false ou la normalisation de la derniere adresse donnee
+function email_valide($adresses) {
+ foreach (explode(',', $adresses) as $v) {
+ // nettoyer certains formats
+ // "Marie Toto <Marie@toto.com>"
+ $adresse = trim(eregi_replace("^[^<>\"]*<([^<>\"]+)>$", "\\1", $v));
+ // RFC 822
+ if (!eregi('^[^()<>@,;:\\"/[:space:]]+(@([-_0-9a-z]+\.)*[-_0-9a-z]+)$', $adresse))
+ return false;
}
- return false;
+ return $adresse;
}
//
@@ -887,7 +884,7 @@ function _T($texte, $args = '') {
$text = html2unicode($text);
}
- return $text;
+ return $text ? $text : $texte;
}
// chaines en cours de traduction
--
GitLab