From c3538ca36120ad69018649b1fb2af3ad58bec672 Mon Sep 17 00:00:00 2001 From: William Mead Date: Tue, 20 Feb 2024 18:57:28 +0100 Subject: [PATCH] Clean function addlink parameter (#28311) --- htdocs/contact/canvas/actions_contactcard_common.class.php | 2 +- htdocs/contact/list.php | 2 +- htdocs/contrat/list.php | 2 +- htdocs/societe/canvas/actions_card_common.class.php | 2 +- htdocs/societe/list.php | 2 +- htdocs/user/list.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index 2061d2c711f..d0db16191d0 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -249,7 +249,7 @@ abstract class ActionsContactCardCommon $this->tpl['phone_perso'] = dol_print_phone($this->object->phone_perso, $this->object->country_code, 0, $this->object->id, 'AC_TEL'); $this->tpl['phone_mobile'] = dol_print_phone($this->object->phone_mobile, $this->object->country_code, 0, $this->object->id, 'AC_TEL'); $this->tpl['fax'] = dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX'); - $this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL'); + $this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 1); $this->tpl['visibility'] = $this->object->LibPubPriv($this->object->priv); diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 37517aa6ef9..26f1c8c2f89 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -1586,7 +1586,7 @@ while ($i < $imaxinloop) { if ($contextpage == 'poslist') { print $obj->email; } else { - print dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1); + print dol_print_email($obj->email, $obj->rowid, $obj->socid, 1, 18, 0, 1); } print ''; if (!$i) { diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index f21e19b43a1..d6d688ef27a 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -1183,7 +1183,7 @@ while ($i < $imaxinloop) { } // Email if (!empty($arrayfields['s.email']['checked'])) { - print ''.dol_print_email($obj->email, 0, $obj->socid, 0, 0, 1, 1).''; + print ''.dol_print_email($obj->email, 0, $obj->socid, 1, 0, 1, 1).''; } // Town if (!empty($arrayfields['s.town']['checked'])) { diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 0ca0079270a..8949242dfc3 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -299,7 +299,7 @@ abstract class ActionsCardCommon $this->tpl['phone'] = dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL'); $this->tpl['fax'] = dol_print_phone($this->object->fax, $this->object->country_code, 0, $this->object->id, 'AC_FAX'); - $this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 'AC_EMAIL'); + $this->tpl['email'] = dol_print_email($this->object->email, 0, $this->object->id, 1); $this->tpl['url'] = dol_print_url($this->object->url); $this->tpl['tva_assuj'] = yn($this->object->tva_assuj); diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 946fc1b3d33..32866803df7 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -1902,7 +1902,7 @@ while ($i < $imaxinloop) { } } if (!empty($arrayfields['s.email']['checked'])) { - print ''.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 'AC_EMAIL', 0, 0, 1)."\n"; + print ''.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 1, 0, 0, 1)."\n"; if (!$i) { $totalarray['nbfield']++; } diff --git a/htdocs/user/list.php b/htdocs/user/list.php index eb5b214d362..ecc5c2a54f3 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -1180,7 +1180,7 @@ while ($i < $imaxinloop) { } } if (!empty($arrayfields['u.email']['checked'])) { - print ''.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 'AC_EMAIL', 0, 0, 1)."\n"; + print ''.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 1, 0, 0, 1)."\n"; if (!$i) { $totalarray['nbfield']++; }