From 5c6e79a66c8a8675d667da8a99199541dabdb321 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@users.sourceforge.net> Date: Fri, 14 Nov 2008 19:47:47 +0000 Subject: [PATCH] New: Add function dol_print_email --- htdocs/admin/company.php | 4 ++-- htdocs/contact/fiche.php | 2 +- htdocs/contact/index.php | 2 +- htdocs/lib/functions.lib.php | 18 +++++++++++++++++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 3d062b2a758..becf1802fbc 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -512,10 +512,10 @@ else print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Fax").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_FAX . '</td></tr>'; $var=!$var; - print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Mail").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_MAIL . '</td></tr>'; + print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Mail").'</td><td>' . dol_print_email($conf->global->MAIN_INFO_SOCIETE_MAIL) . '</td></tr>'; $var=!$var; - print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Web").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_WEB . '</td></tr>'; + print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Web").'</td><td>' . dol_print_url($conf->global->MAIN_INFO_SOCIETE_WEB) . '</td></tr>'; $var=!$var; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>'; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 4a7eb7ed20f..f62222d4cb6 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -539,7 +539,7 @@ if ($_GET["id"] && $_GET["action"] != 'edit') } else { - print $contact->email; + print dol_print_email($contact->email); } print '</td>'; if ($conf->mailing->enabled) diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index 8f03441f8e1..7c2930b0e68 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -334,7 +334,7 @@ if ($result) print "Bad email"; } else { - print '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>'; + print dol_print_email($obj->email); } print '</td>'; } diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 0e578d5de44..811aeca092c 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -782,7 +782,6 @@ function dol_print_size($size) return $size.' '.$langs->trans("Bytes"); } - /** * \brief Show Url link * \param url Url to show @@ -802,6 +801,23 @@ function dol_print_url($url,$target='_blank',$max=32) return $link; } +/** + * \brief Show EMail link + * \param email EMail to show + * \param max Max number of characters to show + * \return string HTML Link + */ +function dol_print_email($email,$max=32) +{ + $link='<a href="'; + if (! eregi('^mailto:',$email)) $link.='mailto:'; + $link.=$email; + $link.='">'; + $link.=dolibarr_trunc($email,$max); + $link.='</a>'; + return $link; +} + /** * \brief Show click to dial link * \param phone Phone to call -- GitLab