Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

New: Add function dol_print_email

Browse Source
This commit is contained in:
Laurent Destailleur
2008-11-14 19:47:47 +00:00
parent 4ab16dd3a6
commit 5c6e79a66c
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/company.php
View File

@@ -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>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Fax").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_FAX . '</td></tr>';
$var=!$var; $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; $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; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Gencod").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_GENCOD . '</td></tr>';

2
htdocs/contact/fiche.php
View File

@@ -539,7 +539,7 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
} }
else else
{ {
print $contact->email; print dol_print_email($contact->email);
} }
print '</td>'; print '</td>';
if ($conf->mailing->enabled) if ($conf->mailing->enabled)

2
htdocs/contact/index.php
View File

@@ -334,7 +334,7 @@ if ($result)
print "Bad email"; print "Bad email";
} }
else { else {
print '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>'; print dol_print_email($obj->email);
} }
print '</td>'; print '</td>';
} }

18
htdocs/lib/functions.lib.php
View File

@@ -782,7 +782,6 @@ function dol_print_size($size)
return $size.' '.$langs->trans("Bytes"); return $size.' '.$langs->trans("Bytes");
} }
/** /**
* \brief Show Url link * \brief Show Url link
* \param url Url to show * \param url Url to show
@@ -802,6 +801,23 @@ function dol_print_url($url,$target='_blank',$max=32)
return $link; 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 * \brief Show click to dial link
* \param phone Phone to call * \param phone Phone to call