From 5ca959fa688255a8de61f89fe2751eb4d24a6912 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 22 Mar 2016 09:22:07 -0400
Subject: [PATCH] fixed typo
---
server/plugins-available/postfix_server_plugin.inc.php | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index 15accbf..64c5571 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -161,28 +161,30 @@
exec('postfix reload');
}
- if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') {
- // If dovecot switch to lmtp
- if($app->system->is_installed('dovecot')) {
- 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");
- exec($conf['init_scripts'] . '/' . 'dovecot restart');
+ if($app->system->is_installed('dovecot')) {
+ $temp = exec("postconf -n virtual_transport", $out);
+ if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') {
+ // If dovecot switch to 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");
+ exec($conf['init_scripts'] . '/' . 'dovecot restart');
+ }
+ } else {
+ // If dovecot switch to 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');
+ }
}
}
- else {
- // If dovecot switch to dovecot
- if($app->system->is_installed('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');
- }
- }
-print_r($mail_config);
- exec("postconf -e 'mailbox_size_limit = ".intval($mail_config['mailbox_size_limit']*1024*1024)."'");
- exec("postconf -e 'message_size_limit = ".intval($mail_config['message_size_limit']*1024*1024)."'");
+ exec("postconf -e 'mailbox_size_limit = ".intval($mail_config['mailbox_size_limit']*1024*1024)."'"); //TODO : no reload?
+ exec("postconf -e 'message_size_limit = ".intval($mail_config['message_size_limit']*1024*1024)."'"); //TODO : no reload?
+
}
--
Gitblit v1.9.1