From d13bc4e5e298619194327d2c09810091e9fc02ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 23 Oct 2004 00:59:15 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Si=20l'email=20n'est=20pas=20renseign=E9?=
 =?UTF-8?q?,=20il=20ne=20faut=20pas=20faire=20le=20test=20de=20sa=20validi?=
 =?UTF-8?q?t=E9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/contact/index.php | 42 ++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
index ab254db7e2b..4e1e8d813ff 100644
--- a/htdocs/contact/index.php
+++ b/htdocs/contact/index.php
@@ -21,8 +21,20 @@
  * $Source$
  *
  */
+
+
+/*!
+	    \file       htdocs/contact/index.php
+        \ingroup    societe
+		\brief      Page liste des contacts
+		\version    $Revision$
+*/
+
 require("./pre.inc.php");
 
+$langs->load("companies");
+
+
 /*
  * Sécurité accés client
  */
@@ -138,23 +150,23 @@ if ($result)
     }
   print '<p><table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   print '<tr class="liste_titre"><td>';
-  print_liste_field_titre("Nom","index.php","lower(p.name)", $begin);
+  print_liste_field_titre($langs->trans("Lastname"),"index.php","lower(p.name)", $begin);
   print "</td><td>";
-  print_liste_field_titre("Prénom","index.php","lower(p.firstname)", $begin);
+  print_liste_field_titre($langs->trans("Firstname"),"index.php","lower(p.firstname)", $begin);
   print "</td><td>";
-  print_liste_field_titre("Société","index.php","lower(s.nom)", $begin);
+  print_liste_field_titre($langs->trans("Company"),"index.php","lower(s.nom)", $begin);
   print '</td>';
 
-  print '<td>Téléphone</td>';
+  print '<td>'.$langs->trans("Phone").'</td>';
 
   if ($_GET["view"] == 'phone')
     {
-      print '<td>Portable</td>';
-      print '<td>Fax</td>';
+      print '<td>'.$langs->trans("Mobile").'</td>';
+      print '<td>'.$langs->trans("Fax").'</td>';
     }
   else
     {
-      print '<td>email</td>';
+      print '<td>'.$langs->trans("EMail").'</td>';
     }
 
   print "</tr>\n";
@@ -191,11 +203,17 @@ if ($result)
 	}
       else
 	{
-	  print '<td><a href="mailto:'.$obj->email.'">'.$obj->email.'</a>&nbsp;';
-	  if (!valid_email($obj->email))
-	    {
-	      print "Email Invalide !";
-	    }
+	  print '<td>';
+        if (! $obj->email) {
+            print '&nbsp;';
+        }
+        elseif (! ValidEmail($obj->email))
+        {
+            print "Email Invalide !";
+        }
+        else {
+            print '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>';
+        }
 	  print '</td>';
 	}