From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/plugins-available/postfix_server_plugin.inc.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index d0062b1..64c5571 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -162,10 +162,10 @@
}
if($app->system->is_installed('dovecot')) {
+ $temp = exec("postconf -n virtual_transport", $out);
if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') {
- $temp = exec("postconf -n virtual_transport", $out);
// If dovecot switch to lmtp
- if($out[0] != "virtual_transport = lmtp:unix:private/dovecot-lmtp" {
+ if($out[0] != "virtual_transport = lmtp:unix:private/dovecot-lmtp") {
exec("postconf -e 'virtual_transport = lmtp:unix:private/dovecot-lmtp'");
exec('postfix reload');
$app->system->replaceLine("/etc/dovecot/dovecot.conf", "protocols = imap pop3", "protocols = imap pop3 lmtp");
@@ -173,11 +173,12 @@
}
} else {
// If dovecot switch to dovecot
- if($out[0] != "virtual_transport = dovecot" {
+ if($out[0] != "virtual_transport = dovecot") {
exec("postconf -e 'virtual_transport = dovecot'");
exec('postfix reload');
$app->system->replaceLine("/etc/dovecot/dovecot.conf", "protocols = imap pop3 lmtp", "protocols = imap pop3");
exec($conf['init_scripts'] . '/' . 'dovecot restart');
+ }
}
}
--
Gitblit v1.9.1