Bugfixes, Postgres improved support

core/Api/RoutesAPI.class.php

@@ -62,7 +62,7 @@ namespace Api\Routes {
           "action"  => $row["action"],
           "target"  => $row["target"],
           "extra"   => $row["extra"] ?? "",
-          "active"  => intval($row["active"]),
+          "active"  => intval($sql->parseBool($row["active"])),
         );
       }
 
@@ -147,7 +147,6 @@ namespace Api\Routes {
         return false;
       }
 
-
       $sql = $this->user->getSQL();
 
       // DELETE old rules
@@ -190,7 +189,7 @@ namespace Api\Routes {
 
           $value = $route[$key];
           $type = Parameter::parseType($value);
-          if ($type !== $expectedType && ($key !== "active" || !is_null($value))) {
+          if ($type !== $expectedType) {
             $expectedTypeName = Parameter::names[$expectedType];
             $gotTypeName = Parameter::names[$type];
             return $this->createError("Route $index has invalid value for key: $key, expected: $expectedTypeName, got: $gotTypeName");
@@ -218,6 +217,5 @@ namespace Api\Routes {
       return true;
     }
   }
-
 }
 

core/Api/SendMail.class.php

@@ -5,6 +5,7 @@ use Api\Parameter\Parameter;
 use Api\Parameter\StringType;
 use External\PHPMailer\Exception;
 use External\PHPMailer\PHPMailer;
+use Objects\ConnectionData;
 
 class SendMail extends Request {
 
@@ -20,17 +21,39 @@ class SendMail extends Request {
     $this->isPublic = false;
   }
 
+  private function getMailConfig() : ?ConnectionData {
+    $req = new \Api\Settings\Get($this->user);
+    $this->success = $req->execute(array("key" => "^mail_"));
+    $this->lastError = $req->getLastError();
+
+    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;
+      }
+
+      $host = $settings["mail_host"] ?? "localhost";
+      $port = intval($settings["mail_port"] ?? "25");
+      $login = $settings["mail_username"] ?? "";
+      $password = $settings["mail_password"] ?? "";
+      return new ConnectionData($host, $port, $login, $password);
+    }
+
+    return null;
+  }
+
   public function execute($values = array()) {
     if(!parent::execute($values)) {
       return false;
     }
 
-    try {
-      $mailConfig = $this->user->getConfiguration()->getMail();
-      if (!$mailConfig) {
-        return $this->createError("Mail is not configured yet.");
-      }
+    $mailConfig = $this->getMailConfig();
+    if (!$this->success) {
+      return false;
+    }
 
+    try {
       $mail = new PHPMailer;
       $mail->IsSMTP();
       $mail->setFrom($this->getParam('from'), $this->getParam('fromName'));

core/Api/SettingsAPI.class.php

@@ -0,0 +1,112 @@
+<?php
+
+namespace Api {
+
+  class SettingsAPI extends Request {
+
+  }
+
+}
+
+namespace Api\Settings {
+
+  use Api\Parameter\Parameter;
+  use Api\Parameter\StringType;
+  use Api\SettingsAPI;
+  use Driver\SQL\Column\Column;
+  use Driver\SQL\Condition\CondLike;
+  use Driver\SQL\Condition\CondRegex;
+  use Driver\SQL\Strategy\UpdateStrategy;
+  use Objects\User;
+
+  class Get extends SettingsAPI {
+
+    public function __construct(User $user, bool $externalCall = false) {
+      parent::__construct($user, $externalCall, array(
+        'key' => new StringType('key', 32, true, NULL)
+      ));
+
+      $this->requiredGroup = array(USER_GROUP_ADMIN);
+      $this->loginRequired = true;
+    }
+
+    public function execute($values = array()) {
+       if(!parent::execute($values)) {
+         return false;
+       }
+
+       $key = $this->getParam("key");
+       $sql = $this->user->getSQL();
+
+       $query = $sql->select("name", "value") ->from("Settings");
+
+       if (!is_null($key) && !empty($key)) {
+         $query->where(new CondRegex($key, new Column("name")));
+       }
+
+       $res = $query->execute();
+
+       $this->success = ($res !== FALSE);
+       $this->lastError = $sql->getLastError();
+
+       if ($this->success) {
+         $settings = array();
+         foreach($res as $row) {
+           $settings[$row["name"]] = $row["value"];
+         }
+         $this->result["settings"] = $settings;
+       }
+
+       return $this->success;
+    }
+  }
+
+  class Set extends SettingsAPI {
+    public function __construct(User $user, bool $externalCall = false) {
+      parent::__construct($user, $externalCall, array(
+        'settings' => new Parameter('settings', Parameter::TYPE_ARRAY)
+      ));
+
+      $this->requiredGroup = array(USER_GROUP_ADMIN);
+      $this->loginRequired = true;
+    }
+
+    public function execute($values = array()) {
+      if (!parent::execute($values)) {
+        return false;
+      }
+
+      $values = $this->getParam("settings");
+      if (empty($values)) {
+        return $this->createError("No values given.");
+      }
+
+      $paramKey = new StringType('key', 32);
+      $paramValue = new StringType('value', 1024);
+
+      $sql = $this->user->getSQL();
+      $query = $sql->insert("Settings", array("name", "value"));
+
+      foreach($values as $key => $value) {
+        if (!$paramKey->parseParam($key)) {
+          $key = print_r($key, true);
+          return $this->createError("Invalid Type for key in parameter settings: '$key' (Required: " . $paramKey->getTypeName() . ")");
+        } else if(!$paramValue->parseParam($value)) {
+          $value = print_r($value, true);
+          return $this->createError("Invalid Type for value in parameter settings: '$value' (Required: " . $paramValue->getTypeName() . ")");
+        } else {
+          $query->addRow($paramKey->value, $paramValue->value);
+        }
+      }
+
+      $query->onDuplicateKeyStrategy(new UpdateStrategy(
+        array("name"),
+        array("value" => new Column("value")))
+      );
+
+      $this->success = ($query->execute() !== FALSE);
+      $this->lastError = $sql->getLastError();
+      return $this->success;
+    }
+  }
+}

core/Api/Stats.class.php

@@ -67,6 +67,17 @@ class Stats extends Request {
     return $visitors;
   }
 
+  private function isMailConfigured() {
+    $req = new \Api\Settings\Get($this->user);
+    $this->success = $req->execute(array("key" => "^mail_enabled$"));
+
+    if ($this->success) {
+      return ($req->getResult()["mail_enabled"] ?? "0") === "1";
+    }
+
+    return $this->success;
+  }
+
   public function execute($values = array()) {
     if(!parent::execute($values)) {
       return false;
@@ -75,26 +86,32 @@ class Stats extends Request {
     $userCount = $this->getUserCount();
     $pageCount = $this->getPageCount();
     $visitorStatistics = $this->getVisitorStatistics();
+    if (!$this->success) {
+      return false;
+    }
 
     $loadAvg = "Unknown";
     if (function_exists("sys_getloadavg")) {
       $loadAvg = sys_getloadavg();
     }
 
-    if ($this->success) {
-      $this->result["userCount"] = $userCount;
-      $this->result["pageCount"] = $pageCount;
-      $this->result["visitors"] = $visitorStatistics;
-      $this->result["server"] = array(
-        "version" => WEBBASE_VERSION,
-        "server" => $_SERVER["SERVER_SOFTWARE"] ?? "Unknown",
-        "memory_usage" => memory_get_usage(),
-        "load_avg" => $loadAvg,
-        "database" => $this->user->getSQL()->getStatus(),
-        "mail" => $this->user->getConfiguration()->getMail() !== NULL
-      );
+    $mailConfigured = $this->isMailConfigured();
+    if (!$this->success) {
+      return false;
     }
 
+    $this->result["userCount"] = $userCount;
+    $this->result["pageCount"] = $pageCount;
+    $this->result["visitors"] = $visitorStatistics;
+    $this->result["server"] = array(
+      "version" => WEBBASE_VERSION,
+      "server" => $_SERVER["SERVER_SOFTWARE"] ?? "Unknown",
+      "memory_usage" => memory_get_usage(),
+      "load_avg" => $loadAvg,
+      "database" => $this->user->getSQL()->getStatus(),
+      "mail" => $mailConfigured
+    );
+
     return $this->success;
   }