From 7eade0da5ec04ec86a89aed3c98e27cba3dae491 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 07 May 2015 08:33:08 -0400
Subject: [PATCH] avoid the second use of query in install.php
---
server/plugins-available/postfix_server_plugin.inc.php | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index fd9fd5a..94a5762 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -79,12 +79,12 @@
global $app, $conf;
// get the config
- $app->uses("getconf");
+ $app->uses("getconf,system");
$old_ini_data = $app->ini_parser->parse_ini_string($data['old']['config']);
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
copy('/etc/postfix/main.cf', '/etc/postfix/main.cf~');
-
+
if($mail_config['relayhost'] != '') {
exec("postconf -e 'relayhost = ".$mail_config['relayhost']."'");
if($mail_config['relayhost_user'] != '' && $mail_config['relayhost_password'] != '') {
@@ -115,6 +115,7 @@
$rbl_hosts = explode(",", $rbl_hosts);
}
$options = explode(", ", exec("postconf -h smtpd_recipient_restrictions"));
+ $new_options = array();
foreach ($options as $key => $value) {
if (!preg_match('/reject_rbl_client/', $value)) {
$new_options[] = $value;
@@ -137,6 +138,37 @@
}
exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
}
+
+ if($mail_config['reject_sender_login_mismatch'] != $old_ini_data['mail']['reject_sender_login_mismatch']) {
+ $options = explode(", ", exec("postconf -h smtpd_sender_restrictions"));
+ $new_options = array();
+ foreach ($options as $key => $value) {
+ if (!preg_match('/reject_authenticated_sender_login_mismatch/', $value)) {
+ $new_options[] = $value;
+ }
+ }
+
+ if ($mail_config['reject_sender_login_mismatch'] == 'y') {
+ reset($new_options); $i = 0;
+ // insert after check_sender_access but before permit_...
+ while (isset($new_options[$i]) && substr($new_options[$i], 0, 19) == 'check_sender_access') ++$i;
+ array_splice($new_options, $i, 0, array('reject_authenticated_sender_login_mismatch'));
+ }
+ exec("postconf -e 'smtpd_sender_restrictions = ".implode(", ", $new_options)."'");
+ }
+
+ 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'");
+ }
+ }
+ else {
+ // If dovecot switch to dovecot
+ if($app->system->is_installed('dovecot')) {
+ exec("postconf -e 'virtual_transport = dovecot'");
+ }
+ }
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)."'");
--
Gitblit v1.9.1