From 1052213c978274c3bacb2188aba0c6b4b91f96c3 Mon Sep 17 00:00:00 2001 From: De Coninck Laurent Date: Mon, 12 Feb 2018 18:12:43 +0100 Subject: [PATCH 1/3] Fix 8183 - adherent welcome e-mail Fix the adherent welcome e-mail. [see: #8183] --- htdocs/adherents/type.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index a0f36c409de..01c8841708f 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -96,7 +96,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) $object->label = trim($label); $object->subscription = (int) trim($subscription); $object->note = trim($comment); - $object->mail_valid = (boolean) trim($mail_valid); + $object->mail_valid = $db->escape(trim($mail_valid)); $object->vote = (boolean) trim($vote); // Fill array 'array_options' with data from add form @@ -134,7 +134,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) $object->label = trim($label); $object->subscription = (int) trim($subscription); $object->note = trim($comment); - $object->mail_valid = (boolean) trim($mail_valid); + $object->mail_valid = $db->escape(trim($mail_valid)); $object->vote = (boolean) trim($vote); // Fill array 'array_options' with data from add form From 0d00c51c2aaf0a614eed10ebc912bd903d7aa02a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Feb 2018 20:51:05 +0100 Subject: [PATCH 2/3] Update type.php --- htdocs/adherents/type.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 01c8841708f..2d36f1d7fc5 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -96,7 +96,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) $object->label = trim($label); $object->subscription = (int) trim($subscription); $object->note = trim($comment); - $object->mail_valid = $db->escape(trim($mail_valid)); + $object->mail_valid = trim($mail_valid); $object->vote = (boolean) trim($vote); // Fill array 'array_options' with data from add form From d0fdf700d77a474ac03fae4cf0868ead674265a5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Feb 2018 20:51:33 +0100 Subject: [PATCH 3/3] Update type.php --- htdocs/adherents/type.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 2d36f1d7fc5..a66108dec21 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -134,7 +134,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) $object->label = trim($label); $object->subscription = (int) trim($subscription); $object->note = trim($comment); - $object->mail_valid = $db->escape(trim($mail_valid)); + $object->mail_valid = trim($mail_valid); $object->vote = (boolean) trim($vote); // Fill array 'array_options' with data from add form