From 547d2ca3087a9a3b1e383c8edd6c38fd02c455b9 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Wed, 15 Nov 2023 16:18:18 +0100 Subject: [PATCH] Add Dry Mode Option for ImapSyncs (Button) --- data/Dockerfiles/dovecot/imapsync_runner.pl | 5 ++++- data/web/inc/functions.mailbox.inc.php | 9 +++++++-- data/web/inc/init_db.inc.php | 3 ++- data/web/lang/lang.de-de.json | 1 + data/web/lang/lang.en-gb.json | 1 + data/web/templates/edit/syncjob.twig | 10 +++++++++- data/web/templates/modals/mailbox.twig | 11 +++++++++-- data/web/templates/modals/user.twig | 7 +++++++ docker-compose.yml | 2 +- 9 files changed, 41 insertions(+), 8 deletions(-) diff --git a/data/Dockerfiles/dovecot/imapsync_runner.pl b/data/Dockerfiles/dovecot/imapsync_runner.pl index 5b297abd9..f13f9abdb 100644 --- a/data/Dockerfiles/dovecot/imapsync_runner.pl +++ b/data/Dockerfiles/dovecot/imapsync_runner.pl @@ -75,7 +75,8 @@ my $sth = $dbh->prepare("SELECT id, custom_params, subscribeall, timeout1, - timeout2 + timeout2, + dry FROM imapsync WHERE active = 1 AND is_running = 0 @@ -111,6 +112,7 @@ while ($row = $sth->fetchrow_arrayref()) { $subscribeall = @$row[18]; $timeout1 = @$row[19]; $timeout2 = @$row[20]; + $dry = @$row[21]; if ($enc1 eq "TLS") { $enc1 = "--tls1"; } elsif ($enc1 eq "SSL") { $enc1 = "--ssl1"; } else { undef $enc1; } @@ -148,6 +150,7 @@ while ($row = $sth->fetchrow_arrayref()) { "--host2", "localhost", "--user2", $user2 . '*' . trim($master_user), "--passfile2", $passfile2->filename, + ($dry eq "1" ? ('--dry') : ()), '--no-modulesversion', '--noreleasecheck']; diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php index 68cb50f1b..298f607dc 100644 --- a/data/web/inc/functions.mailbox.inc.php +++ b/data/web/inc/functions.mailbox.inc.php @@ -325,6 +325,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { $timeout2 = intval($_data['timeout2']); $skipcrossduplicates = intval($_data['skipcrossduplicates']); $automap = intval($_data['automap']); + $dry = intval($_data['dry']); $port1 = $_data['port1']; $host1 = strtolower($_data['host1']); $password1 = $_data['password1']; @@ -435,8 +436,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ); return false; } - $stmt = $pdo->prepare("INSERT INTO `imapsync` (`user2`, `exclude`, `delete1`, `delete2`, `timeout1`, `timeout2`, `automap`, `skipcrossduplicates`, `maxbytespersecond`, `subscribeall`, `maxage`, `subfolder2`, `host1`, `authmech1`, `user1`, `password1`, `mins_interval`, `port1`, `enc1`, `delete2duplicates`, `custom_params`, `active`) - VALUES (:user2, :exclude, :delete1, :delete2, :timeout1, :timeout2, :automap, :skipcrossduplicates, :maxbytespersecond, :subscribeall, :maxage, :subfolder2, :host1, :authmech1, :user1, :password1, :mins_interval, :port1, :enc1, :delete2duplicates, :custom_params, :active)"); + $stmt = $pdo->prepare("INSERT INTO `imapsync` (`user2`, `exclude`, `delete1`, `delete2`, `timeout1`, `timeout2`, `automap`, `skipcrossduplicates`, `maxbytespersecond`, `subscribeall`, `dry`, `maxage`, `subfolder2`, `host1`, `authmech1`, `user1`, `password1`, `mins_interval`, `port1`, `enc1`, `delete2duplicates`, `custom_params`, `active`) + VALUES (:user2, :exclude, :delete1, :delete2, :timeout1, :timeout2, :automap, :skipcrossduplicates, :maxbytespersecond, :subscribeall, :dry, :maxage, :subfolder2, :host1, :authmech1, :user1, :password1, :mins_interval, :port1, :enc1, :delete2duplicates, :custom_params, :active)"); $stmt->execute(array( ':user2' => $username, ':custom_params' => $custom_params, @@ -450,6 +451,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ':skipcrossduplicates' => $skipcrossduplicates, ':maxbytespersecond' => $maxbytespersecond, ':subscribeall' => $subscribeall, + ':dry' => $dry, ':subfolder2' => $subfolder2, ':host1' => $host1, ':authmech1' => 'PLAIN', @@ -2031,6 +2033,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { $success = (isset($_data['success'])) ? NULL : $is_now['success']; $delete2duplicates = (isset($_data['delete2duplicates'])) ? intval($_data['delete2duplicates']) : $is_now['delete2duplicates']; $subscribeall = (isset($_data['subscribeall'])) ? intval($_data['subscribeall']) : $is_now['subscribeall']; + $dry = (isset($_data['dry'])) ? intval($_data['dry']) : $is_now['dry']; $delete1 = (isset($_data['delete1'])) ? intval($_data['delete1']) : $is_now['delete1']; $delete2 = (isset($_data['delete2'])) ? intval($_data['delete2']) : $is_now['delete2']; $automap = (isset($_data['automap'])) ? intval($_data['automap']) : $is_now['automap']; @@ -2164,6 +2167,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { `timeout1` = :timeout1, `timeout2` = :timeout2, `subscribeall` = :subscribeall, + `dry` = :dry, `active` = :active WHERE `id` = :id"); $stmt->execute(array( @@ -2189,6 +2193,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ':timeout1' => $timeout1, ':timeout2' => $timeout2, ':subscribeall' => $subscribeall, + ':dry' => $dry, ':active' => $active, )); $_SESSION['return'][] = array( diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php index e286ab553..2ce6a28c1 100644 --- a/data/web/inc/init_db.inc.php +++ b/data/web/inc/init_db.inc.php @@ -3,7 +3,7 @@ function init_db_schema() { try { global $pdo; - $db_version = "14022023_1000"; + $db_version = "15112023_1536"; $stmt = $pdo->query("SHOW TABLES LIKE 'versions'"); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); @@ -704,6 +704,7 @@ function init_db_schema() { "timeout1" => "SMALLINT NOT NULL DEFAULT '600'", "timeout2" => "SMALLINT NOT NULL DEFAULT '600'", "subscribeall" => "TINYINT(1) NOT NULL DEFAULT '1'", + "dry" => "TINYINT(1) NOT NULL DEFAULT '0'", "is_running" => "TINYINT(1) NOT NULL DEFAULT '0'", "returned_text" => "LONGTEXT", "last_run" => "TIMESTAMP NULL DEFAULT NULL", diff --git a/data/web/lang/lang.de-de.json b/data/web/lang/lang.de-de.json index 5d051615d..5811e150c 100644 --- a/data/web/lang/lang.de-de.json +++ b/data/web/lang/lang.de-de.json @@ -58,6 +58,7 @@ "domain": "Domain", "domain_matches_hostname": "Domain %s darf nicht dem Hostnamen entsprechen", "domain_quota_m": "Domain-Speicherplatz gesamt (MiB)", + "dry": "Simuliere Synchronisation (Probedurchlauf)", "enc_method": "Verschlüsselung", "exclude": "Elemente ausschließen (Regex)", "full_name": "Vor- und Nachname", diff --git a/data/web/lang/lang.en-gb.json b/data/web/lang/lang.en-gb.json index 36eb4ab48..da97bebde 100644 --- a/data/web/lang/lang.en-gb.json +++ b/data/web/lang/lang.en-gb.json @@ -58,6 +58,7 @@ "domain": "Domain", "domain_matches_hostname": "Domain %s matches hostname", "domain_quota_m": "Total domain quota (MiB)", + "dry": "Simulate synchronization", "enc_method": "Encryption method", "exclude": "Exclude objects (regex)", "full_name": "Full name", diff --git a/data/web/templates/edit/syncjob.twig b/data/web/templates/edit/syncjob.twig index 6f6cdedac..801009849 100644 --- a/data/web/templates/edit/syncjob.twig +++ b/data/web/templates/edit/syncjob.twig @@ -11,6 +11,7 @@ +
@@ -95,7 +96,7 @@
- + {{ lang.add.custom_params_hint }}
@@ -141,6 +142,13 @@
+
+
+
+ +
+
+
diff --git a/data/web/templates/modals/mailbox.twig b/data/web/templates/modals/mailbox.twig index 1f96851fc..22807c8d3 100644 --- a/data/web/templates/modals/mailbox.twig +++ b/data/web/templates/modals/mailbox.twig @@ -955,7 +955,7 @@
- + {{ lang.add.custom_params_hint }}
@@ -994,13 +994,20 @@
-
+
+
+
+
+ +
+
+
diff --git a/data/web/templates/modals/user.twig b/data/web/templates/modals/user.twig index 96051841b..b4188773c 100644 --- a/data/web/templates/modals/user.twig +++ b/data/web/templates/modals/user.twig @@ -167,6 +167,13 @@
+
+
+
+ +
+
+
diff --git a/docker-compose.yml b/docker-compose.yml index cdc686fb5..d942fad70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -218,7 +218,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.25 + image: mailcow/dovecot:1.26 depends_on: - mysql-mailcow dns: