From 0cea33c34d87b94355c1744b993e8b623aaf5e07 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Tue, 1 Jun 2021 15:17:52 +0200
Subject: [PATCH] Controllo su indirizzi e-mail aggiunti alla newsletter

---
 modules/newsletter/actions.php | 26 +++++++++++++++++++++++++-
 modules/newsletter/edit.php    |  4 ++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/modules/newsletter/actions.php b/modules/newsletter/actions.php
index 2e36bc177..1b56ac6ec 100755
--- a/modules/newsletter/actions.php
+++ b/modules/newsletter/actions.php
@@ -119,7 +119,31 @@ switch (filter('op')) {
 
         $newsletter->anagrafiche()->syncWithoutDetaching($receivers);
 
-        flash()->info(tr('Aggiunti nuovi destinatari alla newsletter!'));
+        //Controllo indirizzo e-mail aggiunto
+        foreach ($newsletter->anagrafiche as $anagrafica) {
+
+            $check = Validate::isValidEmail($anagrafica['email']);
+
+            if (empty($check['valid-format'])) {
+                $errors[] = $anagrafica['email'];
+            }
+        }
+
+        if (!empty($errors)) {
+            $message = '<ul>';
+            foreach ($errors as $error) {
+                $message .= '<li>'.$error.'</li>';
+            }
+            $message .= '</ul>';
+        }
+
+        if (!empty($message)) {
+            flash()->warning(tr('Attenzione questi indirizzi e-mail non sembrano essere validi: _EMAIL_ ', [
+                '_EMAIL_' => $message,
+            ]));
+        }else{
+            flash()->info(tr('Nuovi destinatari aggiunti correttamente alla newsletter!'));
+        }
 
         break;
 
diff --git a/modules/newsletter/edit.php b/modules/newsletter/edit.php
index 21f12a581..43ddfbd4c 100755
--- a/modules/newsletter/edit.php
+++ b/modules/newsletter/edit.php
@@ -162,7 +162,7 @@ if (!$anagrafiche->isEmpty()) {
                     <th>'.tr('Tipologia').'</th>
                     <th class="text-center">'.tr('E-mail').'</th>
                     <th class="text-center">'.tr('Data di invio').'</th>
-                    <th class="text-center" width="200">'.tr('Newsletter').'</th>
+                    <th class="text-center">'.tr('Newsletter').'</th>
                     <th class="text-center" width="60">#</th>
                 </tr>
             </thead>
@@ -188,7 +188,7 @@ if (!$anagrafiche->isEmpty()) {
                     {[ "type": "text", "name": "email", "id": "email_'.rand(0,99999).'", "readonly": "1", "class": "email-mask", "value": "'.$anagrafica->email.'", "validation": "email" ]}</td>
                     <td class="text-center">'.$data.'</td>
                     <td class="text-left">
-                    {[ "type": "checkbox", "readonly": "1","name": "disable_newsletter", "value": "'.!empty($anagrafica->enable_newsletter).'" ]}
+                    '.(!empty($anagrafica->enable_newsletter) ? '<span class="fa fa-check text-success"></span> '.tr('Abilitato') : '<span class="fa fa-close text-danger"></span> '.tr('Disabilitato')).'
                     </td>
                     <td class="text-center">
                         <a class="btn btn-danger ask btn-xs" data-backto="record-edit" data-op="remove_receiver" data-id="'.$anagrafica->id.'">