Draft: Resolve "Redesign Mail"

Related to #79

plugins/tasks/Mail.php

@@ -64,14 +64,12 @@ class Mail implements EndpointInterface
 
     if ($this->verifySpamProtection($fdTasksConf)) {
       // Note : if list_tasks is empty, the controller receive null as result and will log/process it properly.
-      foreach ($tasks as $mail) {
-
-
+      foreach ($tasks as $task) {
         // verify status before processing (to be checked with schedule as well).
-        if ($mail["fdtasksgranularstatus"][0] == 1 && $this->gateway->verifySchedule($mail["fdtasksgranularschedule"][0])) {
+        if ($this->gateway->statusAndScheduleCheck($task)) {
 
           // Search for the related attached mail object.
-          $mailInfos   = $this->retrieveMailTemplateInfos($mail["fdtasksgranularref"][0]);
+          $mailInfos   = $this->retrieveMailTemplateInfos($task["fdtasksgranularref"][0]);
           $mailContent = $mailInfos[0];
 
           // Only takes arrays related to files attachments for the mail template selected
@@ -80,9 +78,9 @@ class Mail implements EndpointInterface
           $this->gateway->unsetCountKeys($mailInfos);
           $mailAttachments = array_values($mailInfos);
 
-          $setFrom    = $mail["fdtasksgranularmailfrom"][0];
-          $setBCC     = $mail["fdtasksgranularmailbcc"][0] ?? NULL;
-          $recipients = $mail["fdtasksgranularmail"];
+          $setFrom    = $task["fdtasksgranularmailfrom"][0];
+          $setBCC     = $task["fdtasksgranularmailbcc"][0] ?? NULL;
+          $recipients = $task["fdtasksgranularmail"];
           $body       = $mailContent["fdmailtemplatebody"][0];
           $signature  = $mailContent["fdmailtemplatesignature"][0] ?? NULL;
           $subject    = $mailContent["fdmailtemplatesubject"][0];
@@ -94,40 +92,14 @@ class Mail implements EndpointInterface
             $attachments[]       = $fileInfo;
           }
 
-          // Required before passing the array to the constructor mail.
-          if (empty($attachments)) {
-            $attachments = NULL;
-          }
-
-          $mail_controller = new \FusionDirectory\Mail\MailLib($setFrom,
-                                                $setBCC,
-                                                $recipients,
-                                                $body,
-                                                $signature,
-                                                $subject,
-                                                $receipt,
-                                                $attachments);
-
-          $mailSentResult = $mail_controller->sendMail();
-
-          if ($mailSentResult[0] == "SUCCESS") {
-
-            // The third arguments "2" is the status code of success for mail as of now 18/11/22
-            $result[$mail["dn"]]['statusUpdate']       = $this->gateway->updateTaskStatus($mail["dn"], $mail["cn"][0], "2");
-            $result[$mail["dn"]]['mailStatus']         = 'mail : ' . $mail["dn"] . ' was successfully sent';
-            $result[$mail["dn"]]['updateLastMailExec'] = $this->gateway->updateLastMailExecTime($fdTasksConf[0]["dn"]);
-
-          } else {
-            $result[$mail["dn"]]['statusUpdate'] = $this->gateway->updateTaskStatus($mail["dn"], $mail["cn"][0], $mailSentResult[0]);
-            $result[$mail["dn"]]['Error']        = $mailSentResult;
-          }
+          $mailSentResult = $this->sendMail($setFrom, $setBCC, $recipients, $body, $signature, $subject, $receipt, $attachments);
+          $result[$task["dn"]] = $this->updateResult($mailSentResult, $task, $fdTasksConf);
 
           // Verification anti-spam max mails to be sent and quit loop if matched
           $maxMailsIncrement += 1; //Only one as recipients in mail object is always one email.
           if ($maxMailsIncrement == $maxMailsConfig) {
             break;
           }
-
         }
       }
     }
@@ -135,6 +107,43 @@ class Mail implements EndpointInterface
     return $result;
   }
 
+  private function sendMail ($setFrom, $setBCC, $recipients, $body, $signature, $subject, $receipt, $attachments)
+  {
+      // Required before passing the array to the constructor mail.
+      if (empty($attachments)) {
+          $attachments = NULL;
+      }
+
+      $mail_controller = new \FusionDirectory\Mail\MailLib($setFrom,
+          $setBCC,
+          $recipients,
+          $body,
+          $signature,
+          $subject,
+          $receipt,
+          $attachments);
+
+      return $mail_controller->sendMail();
+  }
+
+  private function updateResult(array $mailSentResult, $task, $fdTasksConf): array
+  {
+      $result = [];
+      if ($mailSentResult[0] == "SUCCESS") {
+
+          // The third arguments "2" is the status code of success for mail as of now 18/11/22
+          $result['statusUpdate']       = $this->gateway->updateTaskStatus($task["dn"], $task["cn"][0], "2");
+          $result['mailStatus']         = 'mail : ' . $task["dn"] . ' was successfully sent';
+          $result['updateLastMailExec'] = $this->gateway->updateLastMailExecTime($fdTasksConf[0]["dn"]);
+
+      } else {
+          $result['statusUpdate'] = $this->gateway->updateTaskStatus($task["dn"], $task["cn"][0], $mailSentResult[0]);
+          $result['Error']        = $mailSentResult;
+      }
+
+      return $result;
+  }
+
   /**
    * @return array
    * Note : A simple retrieval methods of the mail backend configuration set in FusionDirectory
@@ -184,5 +193,4 @@ class Mail implements EndpointInterface
   {
     return $this->gateway->getLdapTasks("(|(objectClass=fdMailTemplate)(objectClass=fdMailAttachments))", [], $templateName);
   }
-
 }