git subrepo commit (merge) mailcow/src/mailcow-dockerized

subrepo: subdir:   "mailcow/src/mailcow-dockerized"
  merged:   "32243e56"
upstream: origin:   "https://github.com/mailcow/mailcow-dockerized.git"
  branch:   "master"
  commit:   "e2b4b6f6"
git-subrepo: version:  "0.4.3"
  origin:   "???"
  commit:   "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/init_db.inc.php b/mailcow/src/mailcow-dockerized/data/web/inc/init_db.inc.php
index c43afbf..60a8ead 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/init_db.inc.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/init_db.inc.php
@@ -3,7 +3,7 @@
   try {

     global $pdo;

 

-    $db_version = "01072021_0630";

+    $db_version = "31102021_0620";

 

     $stmt = $pdo->query("SHOW TABLES LIKE 'versions'");

     $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));

@@ -364,6 +364,12 @@
           "password" => "VARCHAR(255) NOT NULL",

           "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",

           "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP",

+          "imap_access" => "TINYINT(1) NOT NULL DEFAULT '1'",

+          "smtp_access" => "TINYINT(1) NOT NULL DEFAULT '1'",

+          "dav_access" => "TINYINT(1) NOT NULL DEFAULT '1'",

+          "eas_access" => "TINYINT(1) NOT NULL DEFAULT '1'",

+          "pop3_access" => "TINYINT(1) NOT NULL DEFAULT '1'",

+          "sieve_access" => "TINYINT(1) NOT NULL DEFAULT '1'",

           "active" => "TINYINT(1) NOT NULL DEFAULT '1'"

         ),

         "keys" => array(

@@ -632,6 +638,8 @@
           "is_running" => "TINYINT(1) NOT NULL DEFAULT '0'",

           "returned_text" => "LONGTEXT",

           "last_run" => "TIMESTAMP NULL DEFAULT NULL",

+          "success" => "TINYINT(1) UNSIGNED DEFAULT NULL",

+          "exit_status" => "VARCHAR(50) DEFAULT NULL",

           "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",

           "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP",

           "active" => "TINYINT(1) NOT NULL DEFAULT '0'"

@@ -1210,6 +1218,7 @@
     $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.passwd_update', \"0\") WHERE JSON_VALUE(`attributes`, '$.passwd_update') IS NULL;");

     $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.relayhost', \"0\") WHERE JSON_VALUE(`attributes`, '$.relayhost') IS NULL;");

     $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.force_pw_update', \"0\") WHERE JSON_VALUE(`attributes`, '$.force_pw_update') IS NULL;");

+    $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.sieve_access', \"1\") WHERE JSON_VALUE(`attributes`, '$.sieve_access') IS NULL;");

     $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.sogo_access', \"1\") WHERE JSON_VALUE(`attributes`, '$.sogo_access') IS NULL;");

     $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.imap_access', \"1\") WHERE JSON_VALUE(`attributes`, '$.imap_access') IS NULL;");

     $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.pop3_access', \"1\") WHERE JSON_VALUE(`attributes`, '$.pop3_access') IS NULL;");