Google reCaptcha

core/Configuration/CreateDatabase.class.php

@@ -88,6 +88,7 @@ class CreateDatabase {
 
     $queries[] = $sql->createTable("Notification")
       ->addSerial("uid")
+      ->addEnum("type", array("default","message","warning"), false, "default")
       ->addDateTime("created_at", false, $sql->currentTimestamp())
       ->addString("title", 32)
       ->addString("message", 256)
@@ -96,7 +97,7 @@ class CreateDatabase {
     $queries[] = $sql->createTable("UserNotification")
       ->addInt("user_id")
       ->addInt("notification_id")
-      ->addBool("seen")
+      ->addBool("seen", false)
       ->foreignKey("user_id", "User", "uid")
       ->foreignKey("notification_id", "Notification", "uid")
       ->unique("user_id", "notification_id");
@@ -104,7 +105,7 @@ class CreateDatabase {
     $queries[] = $sql->createTable("GroupNotification")
       ->addInt("group_id")
       ->addInt("notification_id")
-      ->addBool("seen")
+      ->addBool("seen", false)
       ->foreignKey("group_id", "Group", "uid")
       ->foreignKey("notification_id", "Notification", "uid")
       ->unique("group_id", "notification_id");
@@ -144,8 +145,8 @@ class CreateDatabase {
     $queries[] = $sql->createTable("Settings")
       ->addString("name", 32)
       ->addString("value", 1024, true)
-      ->addBool("private", false)
-      ->addBool("readonly", false)
+      ->addBool("private", false) // these values are not returned from '/api/settings/get', but can be changed
+      ->addBool("readonly", false) // these values are neither returned, nor can be changed from outside
       ->primaryKey("name");
 
     $settingsQuery = $sql->insert("Settings", array("name", "value", "private", "readonly"))
@@ -162,6 +163,14 @@ class CreateDatabase {
     (Settings::loadDefaults())->addRows($settingsQuery);
     $queries[] = $settingsQuery;
 
+    $queries[] = $sql->createTable("ContactRequest")
+      ->addSerial("uid")
+      ->addString("from_name", 32)
+      ->addString("from_email", 64)
+      ->addString("message", 512)
+      ->addDateTime("created_at", false, $sql->currentTimestamp())
+      ->primaryKey("uid");
+
     return $queries;
   }
 

core/Configuration/Settings.class.php

@@ -16,6 +16,9 @@ class Settings {
   private string $jwtSecret;
   private bool $installationComplete;
   private bool $registrationAllowed;
+  private bool $recaptchaEnabled;
+  private string $recaptchaPublicKey;
+  private string $recaptchaPrivateKey;
 
   public function getJwtSecret(): string {
     return $this->jwtSecret;
@@ -36,6 +39,9 @@ class Settings {
     $settings->jwtSecret = $jwt;
     $settings->installationComplete = false;
     $settings->registrationAllowed = false;
+    $settings->recaptchaPublicKey = "";
+    $settings->recaptchaPrivateKey = "";
+    $settings->recaptchaEnabled = false;
     return $settings;
   }
 
@@ -49,6 +55,9 @@ class Settings {
       $this->registrationAllowed = $result["user_registration_enabled"] ?? $this->registrationAllowed;
       $this->installationComplete = $result["installation_completed"] ?? $this->installationComplete;
       $this->jwtSecret = $result["jwt_secret"] ?? $this->jwtSecret;
+      $this->recaptchaEnabled = $result["recaptcha_enabled"] ?? $this->recaptchaEnabled;
+      $this->recaptchaPublicKey = $result["recaptcha_public_key"] ?? $this->recaptchaPublicKey;
+      $this->recaptchaPrivateKey = $result["recaptcha_private_key"] ?? $this->recaptchaPrivateKey;
 
       if (!isset($result["jwt_secret"])) {
         $req = new \Api\Settings\Set($user);
@@ -66,7 +75,10 @@ class Settings {
       ->addRow("base_url", $this->baseUrl, false, false)
       ->addRow("user_registration_enabled", $this->registrationAllowed ? "1" : "0", false, false)
       ->addRow("installation_completed", $this->installationComplete ? "1" : "0", true, true)
-      ->addRow("jwt_secret", $this->jwtSecret, true, true);
+      ->addRow("jwt_secret", $this->jwtSecret, true, true)
+      ->addRow("recaptcha_enabled", $this->recaptchaEnabled ? "1" : "0", false, false)
+      ->addRow("recaptcha_public_key", $this->recaptchaPublicKey, false, false)
+      ->addRow("recaptcha_private_key", $this->recaptchaPrivateKey, true, false);
   }
 
   public function getSiteName() {
@@ -76,4 +88,16 @@ class Settings {
   public function getBaseUrl() {
     return $this->baseUrl;
   }
+
+  public function isRecaptchaEnabled() {
+    return $this->recaptchaEnabled;
+  }
+
+  public function getRecaptchaSiteKey() {
+    return $this->recaptchaPublicKey;
+  }
+
+  public function getRecaptchaSecretKey() {
+    return $this->recaptchaPrivateKey;
+  }
 }