Settings + Test Mail

core/Api/SendMail.class.php

@@ -11,12 +11,9 @@ class SendMail extends Request {
 
   public function __construct($user, $externalCall = false) {
     parent::__construct($user, $externalCall, array(
-      'from' => new Parameter('from', Parameter::TYPE_EMAIL),
       'to' => new Parameter('to', Parameter::TYPE_EMAIL),
       'subject'  => new StringType('subject', -1),
       'body' => new StringType('body', -1),
-      'fromName' => new StringType('fromName', -1, true, ''),
-      'replyTo' => new Parameter('to', Parameter::TYPE_EMAIL, true, ''),
     ));
     $this->isPublic = false;
   }
@@ -28,6 +25,7 @@ class SendMail extends Request {
 
     if ($this->success) {
       $settings = $req->getResult()["settings"];
+
       if (!isset($settings["mail_enabled"]) || $settings["mail_enabled"] !== "1") {
         $this->createError("Mail is not configured yet.");
         return null;
@@ -37,7 +35,9 @@ class SendMail extends Request {
       $port = intval($settings["mail_port"] ?? "25");
       $login = $settings["mail_username"] ?? "";
       $password = $settings["mail_password"] ?? "";
-      return new ConnectionData($host, $port, $login, $password);
+      $connectionData = new ConnectionData($host, $port, $login, $password);
+      $connectionData->setProperty("from", $settings["mail_from"] ?? "");
+      return $connectionData;
     }
 
     return null;
@@ -56,7 +56,7 @@ class SendMail extends Request {
     try {
       $mail = new PHPMailer;
       $mail->IsSMTP();
-      $mail->setFrom($this->getParam('from'), $this->getParam('fromName'));
+      $mail->setFrom($mailConfig->getProperty("from"));
       $mail->addAddress($this->getParam('to'));
       $mail->Subject = $this->getParam('subject');
       $mail->SMTPDebug = 0;
@@ -70,11 +70,6 @@ class SendMail extends Request {
       $mail->CharSet = 'UTF-8';
       $mail->Body = $this->getParam('body');
 
-      $replyTo = $this->getParam('replyTo');
-      if(!is_null($replyTo) && !empty($replyTo)) {
-        $mail->AddReplyTo($replyTo, $this->getParam('fromName'));
-      }
-
       $this->success = @$mail->Send();
       if (!$this->success) {
         $this->lastError = "Error sending Mail: $mail->ErrorInfo";

core/Api/SendTestMail.class.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Api;
+
+use Api\Parameter\Parameter;
+use Objects\User;
+
+class SendTestMail extends Request {
+
+  public function __construct(User $user, bool $externalCall = false) {
+    parent::__construct($user, $externalCall, array(
+      "receiver" => new Parameter("receiver", Parameter::TYPE_EMAIL)
+    ));
+  }
+
+  public function execute($values = array()) {
+    if (!parent::execute($values)) {
+      return false;
+    }
+
+    $receiver = $this->getParam("receiver");
+    $req = new SendMail($this->user);
+    $this->success = $req->execute(array(
+      "to" => $receiver,
+      "subject" => "Test E-Mail",
+      "body" => "Hey! If you receive this e-mail, your mail configuration seems to be working."
+    ));
+
+    $this->lastError = $req->getLastError();
+    return $this->success;
+  }
+
+}

core/Api/SettingsAPI.class.php

@@ -16,6 +16,7 @@ namespace Api\Settings {
   use Driver\SQL\Column\Column;
   use Driver\SQL\Condition\Compare;
   use Driver\SQL\Condition\CondLike;
+  use Driver\SQL\Condition\CondNot;
   use Driver\SQL\Condition\CondRegex;
   use Driver\SQL\Strategy\UpdateStrategy;
   use Objects\User;
@@ -42,11 +43,12 @@ namespace Api\Settings {
        $query = $sql->select("name", "value") ->from("Settings");
 
        if (!is_null($key) && !empty($key)) {
-         $query->where(new CondRegex($key, new Column("name")));
+         $query->where(new CondRegex(new Column("name"), $key));
        }
 
+       // filter sensitive values, if called from outside
        if ($this->isExternalCall()) {
-         $query->where(new Compare("name", "jwt_secret", "!="));
+         $query->where(new CondNot("private"));
        }
 
        $res = $query->execute();

core/Api/UserAPI.class.php

@@ -461,7 +461,8 @@ If the invitation was not intended, you can simply ignore this email.<br><br><a
               return $this->createError("Error creating Session: " . $sql->getLastError());
             } else {
               $this->result["loggedIn"] = true;
-              $this->result['logoutIn'] = $this->user->getSession()->getExpiresSeconds();
+              $this->result["logoutIn"] = $this->user->getSession()->getExpiresSeconds();
+              $this->result["csrf_token"] = $this->user->getSession()->getCsrfToken();
               $this->success = true;
             }
           } else {