patch

lbr38 · Nov 3, 2023 · caf1cdd · caf1cdd
1 parent 8f13166
commit caf1cdd
Show file tree

Hide file tree

Showing 10 changed files with 689 additions and 416 deletions.
diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml
@@ -12,7 +12,7 @@ services:
       args:
         env: devel
         fqdn: motionui-dev.localhost
-    restart: unless-stopped
+    restart: always
     ports:
       - "8888:8080"
     volumes:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       args:
         env: prod
         fqdn: motionui.example.com
-    restart: unless-stopped
+    restart: always
     ports:
       - "8080:8080"
     volumes:

diff --git a/www/config/properties.php b/www/config/properties.php
@@ -2,7 +2,7 @@
 $config = array(
     'project_name' => 'motion-UI',
     'project_dir_name' => 'motionui',
-    'project_logo' => 'https://raw.githubusercontent.com/lbr38/motion-UI/main/www/public//assets/images/motion.png',
+    'project_logo' => 'https://raw.githubusercontent.com/lbr38/motion-UI/main/www/public/assets/images/motion.png',
     'project_git_repo' => 'https://github.com/lbr38/motion-UI',
     'project_git_repo_raw' => 'https://raw.githubusercontent.com/lbr38/motion-UI/main',
     'project_update_doc_url' => 'https://github.com/lbr38/motion-UI/wiki/01.-Installation-and-update#update-motion-ui'

diff --git a/www/controllers/Mail.php b/www/controllers/Mail.php
@@ -11,7 +11,7 @@
 
 class Mail
 {
-    public function __construct(string|array $to, string $subject, string $content, string $link = null, string $linkName = 'Click here', string $attachmentFilePath = null)
+    public function __construct(string $to, string $subject, string $content, string $link = null, string $linkName = 'Click here', string $attachmentFilePath = null)
     {
         if (empty($to)) {
             throw new \Exception('Error: mail recipient cannot be empty');
@@ -23,13 +23,16 @@ public function __construct(string|array $to, string $subject, string $content,
             throw new \Exception('Error: mail message cannot be empty');
         }
 
-        if (is_array($to)) {
-            $to = implode(',', $to);
+        /**
+         *  if there is a , in the $to string, it means there are multiple recipients
+         */
+        if (strpos($to, ',') !== false) {
+            $to = explode(',', $to);
         }
 
         /**
          *  HTML message template
-         *  Powered by stripo.email
+         *  Powered by MJML
          */
         ob_start();
         include(ROOT . '/templates/mail/mail.template.html.php');
@@ -43,7 +46,15 @@ public function __construct(string|array $to, string $subject, string $content,
         try {
             // Recipients
             $mail->setFrom('noreply@' . WWW_HOSTNAME, PROJECT_NAME);
-            $mail->addAddress($to);
+
+            if (is_array($to)) {
+                foreach ($to as $recipient) {
+                    $mail->addAddress($recipient);
+                }
+            } else {
+                $mail->addAddress($to);
+            }
+
             $mail->addReplyTo('noreply@' . WWW_HOSTNAME, PROJECT_NAME);
 
             // Attachments
@@ -58,7 +69,7 @@ public function __construct(string|array $to, string $subject, string $content,
 
             $mail->send();
         } catch (Exception $e) {
-            echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}";
+            throw new Exception('Error: mail could not be sent. Mailer Error: ' . $mail->ErrorInfo);
         }
     }
 }
diff --git a/www/controllers/ajax/motion.php b/www/controllers/ajax/motion.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ *  Send a test email
+ */
+if ($_POST['action'] == "sendTestEmail" and !empty($_POST['mailRecipient'])) {
+    try {
+        $mymail = new \Controllers\Mail($_POST['mailRecipient'], 'Test email', 'This is a test email sent by motion-UI.');
+    } catch (Exception $e) {
+        response(HTTP_BAD_REQUEST, $e->getMessage());
+    }
+
+    response(HTTP_OK, 'Email sent');
+}
+
 /*
  *  Enable / disable alerts
  */

diff --git a/www/public/resources/js/motion.js b/www/public/resources/js/motion.js
@@ -119,6 +119,14 @@ $(document).on('click','#disable-alert-btn',function () {
     enableAlert('disabled');
 });
 
+/**
+ *  Event: send a test email
+ */
+$(document).on('click','#send-test-email-btn',function () {
+    var mailRecipient = $(this).attr('mail-recipient');
+    sendTestEmail(mailRecipient);
+});
+
 /**
  *  Event: select stats dates
  */
@@ -665,6 +673,31 @@ function enableAlert(status)
     });
 }
 
+/**
+ * Ajax: send a test email
+ */
+function sendTestEmail(mailRecipient)
+{
+    $.ajax({
+        type: "POST",
+        url: "/ajax/controller.php",
+        data: {
+            controller: "motion",
+            action: "sendTestEmail",
+            mailRecipient: mailRecipient
+        },
+        dataType: "json",
+        success: function (data, textStatus, jqXHR) {
+            jsonValue = jQuery.parseJSON(jqXHR.responseText);
+            printAlert(jsonValue.message, 'success');
+        },
+        error: function (jqXHR, textStatus, thrownError) {
+            jsonValue = jQuery.parseJSON(jqXHR.responseText);
+            printAlert(jsonValue.message, 'error');
+        },
+    });
+}
+
 /**
  * Ajax: configure alerts
  * @param {*} mondayStart

diff --git a/www/public/resources/styles/common.css b/www/public/resources/styles/common.css
@@ -1,5 +1,5 @@
 /**
- *  v1.2
+ *  v1.3
  */
 
 /**
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /**
-     *  v1.2
+     *  v1.3
      */
     /**
@@ Expand Down @@