From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
server/plugins-available/postfix_server_plugin.inc.php | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index 8d00e31..ad92dec 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -29,62 +29,62 @@
*/
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");
$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~');
-
+
+ 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'] != '') {
@@ -94,16 +94,16 @@
}
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);
+ 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 ='");
}
@@ -130,7 +130,7 @@
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
--
Gitblit v1.9.1