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->getMailConfig();
-      $mailConfig = $this->user->getConfiguration()->getMail();
+    if (!$this->success) {
-      if (!$mailConfig) {
+      return false;
-        return $this->createError("Mail is not configured yet.");
+    }
-      }
 
+    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) {
+    $mailConfigured = $this->isMailConfigured();
-      $this->result["userCount"] = $userCount;
+    if (!$this->success) {
-      $this->result["pageCount"] = $pageCount;
+      return false;
-      $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
-      );
     }
 
+    $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;
   }
 

core/Configuration/.gitignore

@@ -1,3 +1 @@
-Mail\.class\.php
-JWT\.class\.php
 Database\.class\.php

core/Configuration/Configuration.class.php

@@ -2,53 +2,33 @@
 
 namespace Configuration;
 
-use Error;
 use Objects\ConnectionData;
 
 class Configuration {
 
   private ?ConnectionData $database;
-  private ?ConnectionData $mail;
+  private Settings $settings;
-  private ?KeyData $jwt;
 
   function __construct() {
-  }
+    $this->database = null;
+    $this->settings = Settings::loadDefaults();
 
-  public function load() {
+    $class = \Configuration\Database::class;
-    try {
+    $path = getClassPath($class, true);
-
+    if(file_exists($path) && is_readable($path)) {
-      $classes = array(
+      include_once $path;
-        \Configuration\Database::class => &$this->database,
+      if(class_exists($class)) {
-        \Configuration\Mail::class => &$this->mail,
+        $this->database = new \Configuration\Database();
-        \Configuration\JWT::class => &$this->jwt
-      );
-
-      $success = true;
-      foreach($classes as $class => &$ref) {
-        $path = getClassPath($class);
-        if(!file_exists($path)) {
-          $success = false;
-        } else {
-          include_once $path;
-          if(class_exists($class)) {
-            $ref = new $class();
-          }
-        }
       }
-
-      return $success;
-    } catch(Error $e) {
-      die($e);
     }
   }
 
-  public function getDatabase() { return $this->database; }
+  public function getDatabase() : ?ConnectionData {
-  public function getJWT() { return $this->jwt; }
+    return $this->database;
-  public function getMail() { return $this->mail; }
+  }
 
-  public function isFilePresent($className) {
+  public function getSettings() : Settings {
-    $path = getClassPath("\\Configuration\\$className");
+    return $this->settings;
-    return file_exists($path);
   }
 
   public function create(string $className, $data) {

core/Configuration/CreateDatabase.class.php

@@ -8,6 +8,9 @@ use \Driver\SQL\Strategy\CascadeStrategy;
 
 class CreateDatabase {
 
+  // NOTE:
+  // explicit serial ids removed due to postgres' serial implementation
+
   public static function createQueries(SQL $sql) {
     $queries = array();
 
@@ -21,8 +24,8 @@ class CreateDatabase {
       ->unique("name");
 
     $queries[] = $sql->insert("Language", array("uid", "code", "name"))
-      ->addRow(1, "en_US", 'American English')
+      ->addRow( "en_US", 'American English')
-      ->addRow(2, "de_DE", 'Deutsch Standard');
+      ->addRow( "de_DE", 'Deutsch Standard');
 
     $queries[] = $sql->createTable("User")
       ->addSerial("uid")
@@ -72,9 +75,9 @@ class CreateDatabase {
       ->unique("name");
 
     $queries[] = $sql->insert("Group", array("uid", "name", "color"))
-      ->addRow(USER_GROUP_MODERATOR, USER_GROUP_MODERATOR_NAME, "#007bff")
+      ->addRow(USER_GROUP_MODERATOR_NAME, "#007bff")
-      ->addRow(USER_GROUP_SUPPORT, USER_GROUP_SUPPORT_NAME, "#28a745")
+      ->addRow(USER_GROUP_SUPPORT_NAME, "#28a745")
-      ->addRow(USER_GROUP_ADMIN, USER_GROUP_ADMIN_NAME, "#dc3545");
+      ->addRow(USER_GROUP_ADMIN_NAME, "#dc3545");
 
     $queries[] = $sql->createTable("UserGroup")
       ->addInt("user_id")
@@ -137,6 +140,22 @@ class CreateDatabase {
       ->addRow("^/acceptInvite(/)?$", "dynamic", "\\Documents\\Account", "\\Views\\Account\\AcceptInvite")
       ->addRow("^/$", "static", "/static/welcome.html", NULL);
 
+    $queries[] = $sql->createTable("Settings")
+      ->addString("name", 32)
+      ->addString("value", 1024, true)
+      ->primaryKey("name");
+
+    $settingsQuery = $sql->insert("Settings", array("name", "value"))
+      // ->addRow("mail_enabled", "0") # this key will be set during installation
+      ->addRow("mail_host", "")
+      ->addRow("mail_port", "")
+      ->addRow("mail_username", "")
+      ->addRow("mail_password", "")
+      ->addRow("mail_from", "");
+
+    (Settings::loadDefaults())->addRows($settingsQuery);
+    $queries[] = $settingsQuery;
+
     return $queries;
   }
 }

core/Configuration/KeyData.class.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Configuration;
-
-class KeyData {
-
-    protected string $key;
-
-    public function __construct(string $key) {
-        $this->key = $key;
-    }
-
-    public function getKey() {
-        return $this->key;
-    }
-
-}

core/Configuration/Settings.class.php

@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Do not change settings here, they are dynamically loaded from database.
+ */
+
+namespace Configuration;
+
+use Driver\SQL\Query\Insert;
+use Objects\User;
+
+class Settings {
+
+  private string $siteName;
+  private string $baseUrl;
+  private string $jwtSecret;
+  private bool $installationComplete;
+  private bool $registrationAllowed;
+
+  public function getJwtSecret(): string {
+    return $this->jwtSecret;
+  }
+
+  public function isInstalled() {
+    return $this->installationComplete;
+  }
+
+  public static function loadDefaults() : Settings {
+    $hostname = php_uname("n");
+    $protocol = getProtocol();
+    $jwt = generateRandomString(32);
+
+    $settings = new Settings();
+    $settings->siteName = "WebBase";
+    $settings->baseUrl = "$protocol://$hostname";
+    $settings->jwtSecret = $jwt;
+    $settings->installationComplete = false;
+    $settings->registrationAllowed = false;
+    return $settings;
+  }
+
+  public function loadFromDatabase(User $user) {
+    $req = new \Api\Settings\Get($user);
+    $success = $req->execute();
+
+    if ($success) {
+      $result = $req->getResult()["settings"];
+      $this->siteName = $result["site_name"] ?? $this->siteName;
+      $this->registrationAllowed = $result["user_registration_enabled"] ?? $this->registrationAllowed;
+      $this->installationComplete = $result["installation_completed"] ?? $this->installationComplete;
+      $this->jwtSecret = $result["jwt_secret"] ?? $this->jwtSecret;
+
+      if (!isset($result["jwt_secret"])) {
+        $req = new \Api\Settings\Set($user);
+        $req->execute(array("settings" => array(
+          "jwt_secret" => $this->jwtSecret
+        )));
+      }
+    }
+
+    return false;
+  }
+
+  public function addRows(Insert $query) {
+    $query->addRow("site_name", $this->siteName)
+      ->addRow("base_url", $this->baseUrl)
+      ->addRow("user_registration_enabled", $this->registrationAllowed ? "1" : "0")
+      ->addRow("installation_completed", $this->installationComplete ? "1" : "0")
+      ->addRow("jwt_secret", $this->jwtSecret);
+  }
+}

core/Documents/Install.class.php

@@ -16,8 +16,6 @@ namespace Documents {
 
 namespace Documents\Install {
 
-  use Api\Notifications\Create;
-  use Api\Parameter\Parameter;
   use Configuration\CreateDatabase;
   use Driver\SQL\SQL;
   use Elements\Body;
@@ -113,6 +111,10 @@ namespace Documents\Install {
       }
 
       $sql = $user->getSQL();
+      if(!$sql || !$sql->isConnected()) {
+        return self::DATABASE_CONFIGURATION;
+      }
+
       $countKeyword = $sql->count();
       $res = $sql->select($countKeyword)->from("User")->execute();
       if ($res === FALSE) {
@@ -125,19 +127,28 @@ namespace Documents\Install {
         }
       }
 
-      if($step === self::ADD_MAIL_SERVICE && $config->isFilePresent("Mail")) {
+      if ($step === self::ADD_MAIL_SERVICE) {
-        $step = self::FINISH_INSTALLATION;
+        $req = new \Api\Settings\Get($user);
-        if(!$config->isFilePresent("JWT") && !$config->create("JWT", generateRandomString(32))) {
+        $success = $req->execute(array("key" => "^mail_enabled$"));
-          $this->errorString = "Unable to create jwt file";
+        if (!$success) {
-        } else {
+          $this->errorString = $req->getLastError();
-          $req = new Create($user);
+          return self::DATABASE_CONFIGURATION;
-          $success = $req->execute(array(
+        } else if (isset($req->getResult()["settings"]["mail_enabled"])) {
-            "title" => "Welcome",
+          $step = self::FINISH_INSTALLATION;
-            "message" => "Your Web-base was successfully installed. Check out the admin dashboard. Have fun!",
+
-            "groupId" => USER_GROUP_ADMIN)
+          $req = new \Api\Settings\Set($user);
-          );
+          $success = $req->execute(array("settings" => array("installation_completed" => "1")));
           if (!$success) {
             $this->errorString = $req->getLastError();
+          } else {
+            $req = new \Api\Notifications\Create($user);
+            $success = $req->execute(array(
+                "title" => "Welcome",
+                "message" => "Your Web-base was successfully installed. Check out the admin dashboard. Have fun!",
+                "groupId" => USER_GROUP_ADMIN
+              )
+            );
+            $this->errorString = $req->getLastError();
           }
         }
       }
@@ -264,7 +275,8 @@ namespace Documents\Install {
             }
           }
 
-          if($success && !$this->getDocument()->getUser()->getConfiguration()->create("Database", $connectionData)) {
+          $config = $this->getDocument()->getUser()->getConfiguration();
+          if(!$config->create("Database", $connectionData)) {
             $success = false;
             $msg = "Unable to write file";
           }
@@ -348,10 +360,9 @@ namespace Documents\Install {
       $success = true;
       $msg = $this->errorString;
       if($this->getParameter("skip") === "true") {
-        if(!$user->getConfiguration()->create("Mail", null)) {
+        $req = new \Api\Settings\Set($user);
-          $success = false;
+        $success = $req->execute(array("settings" => array( "mail_enabled" => "0" )));
-          $msg = "Unable to create file";
+        $msg = $req->getLastError();
-        }
       } else {
 
         $address = $this->getParameter("address");
@@ -415,11 +426,15 @@ namespace Documents\Install {
           }
 
           if($success) {
-            $connectionData = new ConnectionData($address, $port, $username, $password);
+            $req = new \Api\Settings\Set($user);
-            if(!$user->getConfiguration()->create("Mail", $connectionData)) {
+            $success = $req->execute(array("settings" => array(
-              $success = false;
+              "mail_enabled" => "1",
-              $msg = "Unable to create file";
+              "mail_host" => "$address",
-            }
+              "mail_port" => "$port",
+              "mail_username" => "$username",
+              "mail_password" => "$password",
+            )));
+            $msg = $req->getLastError();
           }
         }
       }
@@ -461,26 +476,26 @@ namespace Documents\Install {
 
         switch($status) {
           case self::PENDING:
-            $statusIcon  = '<i class="fas fa-spin fa-spinner"></i>';
+            $statusIcon  = $this->createIcon("spinner");
             $statusText  = "Loading…";
             $statusColor = "muted";
             break;
 
           case self::SUCCESSFUL:
-            $statusIcon  = '<i class="fas fa-check-circle"></i>';
+            $statusIcon  = $this->createIcon("check-circle");
             $statusText  = "Successful";
             $statusColor = "success";
             break;
 
           case self::ERROR:
-            $statusIcon  = '<i class="fas fa-times-circle"></i>';
+            $statusIcon  = $this->createIcon("times-circle");
             $statusText  = "Failed";
             $statusColor = "danger";
             break;
 
           case self::NOT_STARTED:
           default:
-            $statusIcon = '<i class="far fa-circle"></i>';
+            $statusIcon = $this->createIcon("circle", "far");
             $statusText = "Pending";
             $statusColor = "muted";
             break;
@@ -797,6 +812,5 @@ namespace Documents\Install {
 
       return $html;
     }
-
   }
 }

core/Driver/SQL/MySQL.class.php

@@ -173,7 +173,7 @@ class MySQL extends SQL {
         $leftColumn = $this->columnName($key);
         if ($value instanceof Column) {
           $columnName = $this->columnName($value->getName());
-          $updateValues[] = "$leftColumn=$columnName";
+          $updateValues[] = "$leftColumn=VALUES($columnName)";
         } else if($value instanceof Add) {
           $columnName = $this->columnName($value->getColumn());
           $operator = $value->getOperator();

core/Driver/SQL/PostgreSQL.class.php

@@ -139,7 +139,7 @@ class PostgreSQL extends SQL {
                 $leftColumn = $this->columnName($key);
                 if ($value instanceof Column) {
                   $columnName = $this->columnName($value->getName());
-                  $updateValues[] = "$leftColumn=$columnName";
+                  $updateValues[] = "$leftColumn=EXCLUDED.$columnName";
                 } else if ($value instanceof Add) {
                   $columnName = $this->columnName($value->getColumn());
                   $operator = $value->getOperator();

core/Driver/SQL/SQL.class.php

@@ -215,7 +215,9 @@ abstract class SQL {
   }
 
   public function executeTruncate(Truncate $truncate) {
-    return $this->execute("TRUNCATE " . $truncate->getTable());
+    $query = "TRUNCATE " . $this->tableName($truncate->getTable());
+    if ($truncate->dump) { var_dump($query); }
+    return $this->execute($query);
   }
 
   public function executeUpdate(Update $update) {
@@ -391,4 +393,8 @@ abstract class SQL {
   }
 
   public abstract function getStatus();
+
+  public function parseBool($val) : bool {
+    return in_array($val, array(true, 1, '1', 't', 'true', 'TRUE'));
+  }
 }

core/Elements/View.class.php

@@ -94,7 +94,7 @@ abstract class View extends StaticView {
   protected function createIcon($icon, $type = "fas", $classes = "") {
     $iconClass = "$type fa-$icon";
 
-    if($icon === "spinner")
+    if($icon === "spinner" || $icon === "circle-notch")
       $iconClass .= " fa-spin";
 
     if($classes)

core/Objects/Session.class.php

@@ -62,13 +62,11 @@ class Session extends ApiObject {
 
   public function sendCookie() {
     $this->updateMetaData();
-    $jwt = $this->user->getConfiguration()->getJwt();
+    $settings = $this->user->getConfiguration()->getSettings();
-    if($jwt) {
+    $token = array('userId' => $this->user->getId(), 'sessionId' => $this->sessionId);
-      $token = array('userId' => $this->user->getId(), 'sessionId' => $this->sessionId);
+    $sessionCookie = JWT::encode($token, $settings->getJwtSecret());
-      $sessionCookie = JWT::encode($token, $jwt->getKey());
+    $secure = strcmp(getProtocol(), "https") === 0;
-      $secure = strcmp(getProtocol(), "https") === 0;
+    setcookie('session', $sessionCookie, $this->getExpiresTime(), "/", "", $secure);
-      setcookie('session', $sessionCookie, $this->getExpiresTime(), "/", "", $secure);
-    }
   }
 
   public function getExpiresTime() {

core/Objects/User.class.php

@@ -43,6 +43,10 @@ class User extends ApiObject {
     $databaseConf = $this->configuration->getDatabase();
     if($databaseConf) {
       $this->sql = SQL::createConnection($databaseConf);
+      if ($this->sql->isConnected()) {
+        $settings = $this->configuration->getSettings();
+        $settings->loadFromDatabase($this);
+      }
     } else {
       $this->sql = null;
     }
@@ -155,7 +159,7 @@ class User extends ApiObject {
         $this->uid = $userId;
         $this->session = new Session($this, $sessionId, $csrfToken);
         $this->session->setData(json_decode($row["data"] ?? '{}'));
-        $this->session->stayLoggedIn($row["stay_logged_in"]);
+        $this->session->stayLoggedIn($this->sql->parseBool(["stay_logged_in"]));
         if($sessionUpdate) $this->session->update();
         $this->loggedIn = true;
 
@@ -175,11 +179,11 @@ class User extends ApiObject {
   private function parseCookies() {
     if(isset($_COOKIE['session'])
       && is_string($_COOKIE['session'])
-      && !empty($_COOKIE['session'])
+      && !empty($_COOKIE['session'])) {
-      && ($jwt = $this->configuration->getJWT())) {
       try {
         $token = $_COOKIE['session'];
-        $decoded = (array)JWT::decode($token, $jwt->getKey());
+        $settings = $this->configuration->getSettings();
+        $decoded = (array)JWT::decode($token, $settings->getJwtSecret());
         if(!is_null($decoded)) {
           $userId = (isset($decoded['userId']) ? $decoded['userId'] : NULL);
           $sessionId = (isset($decoded['sessionId']) ? $decoded['sessionId'] : NULL);

index.php

@@ -25,8 +25,10 @@ spl_autoload_register(function($class) {
 });
 
 $config = new Configuration();
-$installation = (!$config->load());
 $user   = new Objects\User($config);
+$sql    = $user->getSQL();
+$settings = $config->getSettings();
+$installation = !$sql || ($sql->isConnected() && !$settings->isInstalled());
 
 if(isset($_GET["api"]) && is_string($_GET["api"])) {
   header("Content-Type: application/json");

js/admin.min.js

@@ -9251,7 +9251,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) *
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return CreateGroup; });\n/* harmony import */ var _elements_alert__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../elements/alert */ \"./src/elements/alert.js\");\n/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-router-dom */ \"./node_modules/react-router-dom/esm/react-router-dom.js\");\n/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react */ \"./node_modules/react/index.js\");\n/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var _elements_icon__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../elements/icon */ \"./src/elements/icon.js\");\n/* harmony import */ var react_tooltip__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-tooltip */ \"./node_modules/react-tooltip/dist/index.es.js\");\n/* harmony import */ var rc_color_picker_assets_index_css__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! rc-color-picker/assets/index.css */ \"./node_modules/rc-color-picker/assets/index.css\");\n/* harmony import */ var rc_color_picker_assets_index_css__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(rc_color_picker_assets_index_css__WEBPACK_IMPORTED_MODULE_5__);\n/* harmony import */ var rc_color_picker__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! rc-color-picker */ \"./node_modules/rc-color-picker/lib/index.js\");\n/* harmony import */ var rc_color_picker__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(rc_color_picker__WEBPACK_IMPORTED_MODULE_6__);\nfunction _typeof(obj) { \"@babel/helpers - typeof\"; if (typeof Symbol === \"function\" && typeof Symbol.iterator === \"symbol\") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === \"function\" && obj.constructor === Symbol && obj !== Symbol.prototype ? \"symbol\" : typeof obj; }; } return _typeof(obj); }\n\nfunction _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }\n\nfunction ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }\n\nfunction _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }\n\nfunction _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }\n\nfunction _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function\"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }\n\nfunction _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }\n\nfunction _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return funLine truncated
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return CreateGroup; });\n/* harmony import */ var _elements_alert__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../elements/alert */ \"./src/elements/alert.js\");\n/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-router-dom */ \"./node_modules/react-router-dom/esm/react-router-dom.js\");\n/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react */ \"./node_modules/react/index.js\");\n/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var _elements_icon__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../elements/icon */ \"./src/elements/icon.js\");\n/* harmony import */ var react_tooltip__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-tooltip */ \"./node_modules/react-tooltip/dist/index.es.js\");\n/* harmony import */ var rc_color_picker_assets_index_css__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! rc-color-picker/assets/index.css */ \"./node_modules/rc-color-picker/assets/index.css\");\n/* harmony import */ var rc_color_picker_assets_index_css__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(rc_color_picker_assets_index_css__WEBPACK_IMPORTED_MODULE_5__);\n/* harmony import */ var rc_color_picker__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! rc-color-picker */ \"./node_modules/rc-color-picker/lib/index.js\");\n/* harmony import */ var rc_color_picker__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(rc_color_picker__WEBPACK_IMPORTED_MODULE_6__);\nfunction _typeof(obj) { \"@babel/helpers - typeof\"; if (typeof Symbol === \"function\" && typeof Symbol.iterator === \"symbol\") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === \"function\" && obj.constructor === Symbol && obj !== Symbol.prototype ? \"symbol\" : typeof obj; }; } return _typeof(obj); }\n\nfunction _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }\n\nfunction ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }\n\nfunction _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }\n\nfunction _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }\n\nfunction _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } }\n\nfunction _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if (\"value\" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }\n\nfunction _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }\n\nfunction _inherits(subClass, superClass) { if (typeof superClass !== \"function\" && superClass !== null) { throw new TypeError(\"Super expression must either be null or a function\"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }\n\nfunction _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }\n\nfunction _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return funLine truncated
 
 /***/ }),
 

src/src/views/addgroup.js

@@ -126,7 +126,7 @@ export default class CreateGroup extends React.Component {
                 this.setState({...this.state, name: "", color: "", alerts: alerts, isSubmitting: false});
             } else {
                 alerts.push({message: res.msg, title: "Error creating Group", type: "danger"});
-                this.setState({...this.state, name: "", color: "", alerts: alerts, isSubmitting: false});
+                this.setState({...this.state, alerts: alerts, isSubmitting: false});
             }
         });
     }