From 6250b7ea002fd99e40d0170d31e7e19e69f97ccd Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Thu, 23 Jan 2014 13:53:43 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master'
---
server/plugins-available/postfix_server_plugin.inc.php | 108 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 43 deletions(-)
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index 3732cc7..ad92dec 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -29,88 +29,110 @@
*/
class postfix_server_plugin {
-
+
var $plugin_name = 'postfix_server_plugin';
var $class_name = 'postfix_server_plugin';
-
-
+
+
var $postfix_config_dir = '/etc/postfix';
-
+
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
function onInstall() {
global $conf;
-
+
if($conf['services']['mail'] == true) {
return true;
} else {
return false;
}
-
+
}
-
+
/*
This function is called when the plugin is loaded
*/
-
+
function onLoad() {
global $app;
-
+
/*
Register for the events
*/
-
- $app->plugins->registerEvent('server_insert','postfix_server_plugin','insert');
- $app->plugins->registerEvent('server_update','postfix_server_plugin','update');
-
-
-
+
+ $app->plugins->registerEvent('server_insert', 'postfix_server_plugin', 'insert');
+ $app->plugins->registerEvent('server_update', 'postfix_server_plugin', 'update');
+
+
+
}
-
- function insert($event_name,$data) {
+
+ function insert($event_name, $data) {
global $app, $conf;
-
- $this->update($event_name,$data);
-
+
+ $this->update($event_name, $data);
+
}
-
+
// The purpose of this plugin is to rewrite the main.cf file
- function update($event_name,$data) {
+ function update($event_name, $data) {
global $app, $conf;
-
+
// get the config
$app->uses("getconf");
- $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"] != '') {
+ $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'] != '') {
exec("postconf -e 'smtp_sasl_auth_enable = yes'");
} else {
exec("postconf -e 'smtp_sasl_auth_enable = no'");
}
exec("postconf -e 'smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd'");
exec("postconf -e 'smtp_sasl_security_options ='");
-
+
// Store the sasl passwd
- $content = $mail_config["relayhost"]." ".$mail_config["relayhost_user"].":".$mail_config["relayhost_password"];
- file_put_contents('/etc/postfix/sasl_passwd',$content);
- exec("chown root:root /etc/postfix/sasl_passwd");
- exec("chmod 600 /etc/postfix/sasl_passwd");
- exec("postmap /etc/postfix/sasl_passwd");
- exec("/etc/init.d/postfix restart");
-
+ $content = $mail_config['relayhost'].' '.$mail_config['relayhost_user'].':'.$mail_config['relayhost_password'];
+ file_put_contents('/etc/postfix/sasl_passwd', $content);
+ chmod('/etc/postfix/sasl_passwd', 0600);
+ chown('/etc/postfix/sasl_passwd', 'root');
+ chgrp('/etc/postfix/sasl_passwd', 'root');
+ exec('postmap /etc/postfix/sasl_passwd');
+ exec($conf['init_scripts'] . '/' . 'postfix restart');
+
} else {
exec("postconf -e 'relayhost ='");
}
-
- 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)."'");
-
+
+ if($mail_config['realtime_blackhole_list'] != $old_ini_data['mail']['realtime_blackhole_list']) {
+ $rbl_hosts = trim(preg_replace('/\s+/', '', $mail_config['realtime_blackhole_list']));
+ if($rbl_hosts != ''){
+ $rbl_hosts = explode(",", $rbl_hosts);
+ }
+ $options = explode(", ", exec("postconf -h smtpd_recipient_restrictions"));
+ foreach ($options as $key => $value) {
+ if (!preg_match('/reject_rbl_client/', $value)) {
+ $new_options[] = $value;
+ }
+ }
+ if(is_array($rbl_hosts) && !empty($rbl_hosts)){
+ foreach ($rbl_hosts as $key => $value) {
+ $value = trim($value);
+ if($value != '') $new_options[] = "reject_rbl_client ".$value;
+ }
+ }
+ exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
+ }
+
+ 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)."'");
+
}
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1