diff --git a/data/Dockerfiles/dovecot/imapsync_runner.pl b/data/Dockerfiles/dovecot/imapsync_runner.pl index d3aed97b..5b297abd 100644 --- a/data/Dockerfiles/dovecot/imapsync_runner.pl +++ b/data/Dockerfiles/dovecot/imapsync_runner.pl @@ -51,8 +51,8 @@ sub sig_handler { die "sig_handler received signal, preparing to exit...\n"; }; -open my $file, '<', "/etc/sogo/sieve.creds"; -my $creds = <$file>; +open my $file, '<', "/etc/sogo/sieve.creds"; +my $creds = <$file>; close $file; my ($master_user, $master_pass) = split /:/, $creds; my $sth = $dbh->prepare("SELECT id, @@ -166,17 +166,11 @@ while ($row = $sth->fetchrow_arrayref()) { $success = 1; } - $keep_job_active = 1; - if (defined $exit_status && $exit_status eq "EXIT_AUTHENTICATION_FAILURE_USER1") { - $keep_job_active = 0; - } - - $update = $dbh->prepare("UPDATE imapsync SET returned_text = ?, success = ?, exit_status = ?, active = ? WHERE id = ?"); + $update = $dbh->prepare("UPDATE imapsync SET returned_text = ?, success = ?, exit_status = ? WHERE id = ?"); $update->bind_param( 1, ${stdout} ); $update->bind_param( 2, ${success} ); $update->bind_param( 3, ${exit_status} ); - $update->bind_param( 4, ${keep_job_active} ); - $update->bind_param( 5, ${id} ); + $update->bind_param( 4, ${id} ); $update->execute(); } catch { $update = $dbh->prepare("UPDATE imapsync SET returned_text = 'Could not start or finish imapsync', success = 0 WHERE id = ?"); diff --git a/data/web/lang/lang.de-de.json b/data/web/lang/lang.de-de.json index 7167290f..e1a6e12f 100644 --- a/data/web/lang/lang.de-de.json +++ b/data/web/lang/lang.de-de.json @@ -265,8 +265,8 @@ "quota_notification_html": "Benachrichtigungs-E-Mail Inhalt:
Leer lassen, um Standard-Template wiederherzustellen.", "quota_notification_sender": "Benachrichtigungs-E-Mail Absender", "quota_notification_subject": "Benachrichtigungs-E-Mail Betreff", - "quota_notifications": "Quota Benachrichtigungen", - "quota_notifications_info": "Quota Benachrichtigungen werden an Mailboxen versendet, die 80 respektive 95 Prozent der zur Verfügung stehenden Quota überschreiten.", + "quota_notifications": "Quota-Benachrichtigungen", + "quota_notifications_info": "Quota-Benachrichtigungen werden an Mailboxen versendet, die 80 respektive 95 Prozent der zur Verfügung stehenden Quota überschreiten.", "quota_notifications_vars": "{{percent}} entspricht der aktuellen Quota in Prozent
{{username}} entspricht dem Mailbox-Namen", "r_active": "Aktive Restriktionen", "r_inactive": "Inaktive Restriktionen", diff --git a/docker-compose.yml b/docker-compose.yml index 621eb610..130e97b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -215,7 +215,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.20 + image: mailcow/dovecot:1.21 depends_on: - mysql-mailcow dns: