Removed duplicate function

htdocs/core/lib/functions.lib.php

@@ -1188,6 +1188,9 @@ function dol_print_phone($phone,$country='',$cid=0,$socid=0,$addlink='',$separ="
 	if (empty($phone)) { return ''; }
 	if (empty($country)) $country=$mysoc->country_code;
 
+	// Short format for small screens
+	if ($conf->dol_optimize_smallscreen) $separ='';
+
 	$newphone=$phone;
 	if (strtoupper($country) == "FR")
 	{

htdocs/opensurvey/fonctions.php

@@ -136,23 +136,6 @@ function is_error($cerr)
 }
 
 
-
-/**
- * Vérifie une adresse e-mail selon les normes RFC
- *
- * @param  	string  $email  l'adresse e-mail a vérifier
- * @return  bool    vrai si l'adresse est correcte, faux sinon
- * @see 	http://fightingforalostcause.net/misc/2006/compare-email-regex.php
- * @see 	http://svn.php.net/viewvc/php/php-src/trunk/ext/filter/logical_filters.c?view=markup
- */
-function validateEmail($email)
-{
-	$pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD';
-
-	return (bool) preg_match($pattern, $email);
-}
-
-
 /**
  * Fonction vérifiant l'existance et la valeur non vide d'une clé d'un tableau
  *

htdocs/opensurvey/public/create_survey.php

@@ -74,9 +74,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre") || GET
 		$_SESSION["mailsonde"] = false;
 	}
 
-	if(validateEmail($adresse) === false) {
+	if (! isValidEmail($adresse)) $erreur_adresse = true;
-		$erreur_adresse = true;
-	}
 
 	//var_dump($titre.' - '.$nom.' - '.$adresse.' - '.!$erreur_adresse.' - '.! $erreur_injection_titre.' - '.! $erreur_injection_commentaires.' - '.! $erreur_injection_nom.' - '.$creation_sondage_date.' - '.$creation_sondage_autre); exit;