Skip to content

Commit

Permalink
Merge pull request #6181 from mailcow/fix/5703
Browse files Browse the repository at this point in the history
[Web] Add additional columns to _sogo_static_view
  • Loading branch information
FreddleSpl0it authored Nov 20, 2024
2 parents bb31060 + d08b9ae commit 6f4c2b3
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions data/web/inc/init_db.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ function init_db_schema() {
try {
global $pdo;

$db_version = "29072024_1000";
$db_version = "20112024_1105";

$stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
$num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
Expand Down Expand Up @@ -111,6 +111,10 @@ function init_db_schema() {
"c_name" => "VARCHAR(255) NOT NULL",
"c_password" => "VARCHAR(255) NOT NULL DEFAULT ''",
"c_cn" => "VARCHAR(255)",
"c_l" => "VARCHAR(255)",
"c_o" => "VARCHAR(255)",
"c_ou" => "VARCHAR(255)",
"c_telephonenumber" => "VARCHAR(255)",
"mail" => "VARCHAR(255) NOT NULL",
// TODO -> use TEXT and check if SOGo login breaks on empty aliases
"aliases" => "TEXT NOT NULL",
Expand Down Expand Up @@ -1004,7 +1008,7 @@ function init_db_schema() {
)
),
"attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
),
),
"pushover" => array(
"cols" => array(
"username" => "VARCHAR(255) NOT NULL",
Expand Down Expand Up @@ -1388,7 +1392,7 @@ function init_db_schema() {
"key_size" => 2048,
"max_quota_for_domain" => 10240 * 1048576,
)
);
);
$default_mailbox_template = array(
"template" => "Default",
"type" => "mailbox",
Expand Down Expand Up @@ -1423,7 +1427,7 @@ function init_db_schema() {
"acl_quarantine_category" => 1,
"acl_app_passwds" => 1,
)
);
);
$stmt = $pdo->prepare("SELECT id FROM `templates` WHERE `type` = :type AND `template` = :template");
$stmt->execute(array(
":type" => "domain",
Expand All @@ -1437,8 +1441,8 @@ function init_db_schema() {
":type" => "domain",
":template" => $default_domain_template["template"],
":attributes" => json_encode($default_domain_template["attributes"])
));
}
));
}
$stmt = $pdo->prepare("SELECT id FROM `templates` WHERE `type` = :type AND `template` = :template");
$stmt->execute(array(
":type" => "mailbox",
Expand All @@ -1452,8 +1456,8 @@ function init_db_schema() {
":type" => "mailbox",
":template" => $default_mailbox_template["template"],
":attributes" => json_encode($default_mailbox_template["attributes"])
));
}
));
}

if (php_sapi_name() == "cli") {
echo "DB initialization completed" . PHP_EOL;
Expand Down

0 comments on commit 6f4c2b3

Please sign in to comment.