From d35b34d03ffe0d92cbaeb4410c913550150fab4e Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Mon, 04 May 2015 13:56:31 -0400 Subject: [PATCH] - prepared layout change for login page --- server/plugins-available/postfix_server_plugin.inc.php | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php index 474d10d..94a5762 100644 --- a/server/plugins-available/postfix_server_plugin.inc.php +++ b/server/plugins-available/postfix_server_plugin.inc.php @@ -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; @@ -138,6 +139,24 @@ 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')) { -- Gitblit v1.9.1