From ccc7e75d2948e52c5f88efff65a9736ed87d5a1d Mon Sep 17 00:00:00 2001 From: jwarnier Date: Wed, 8 Sep 2010 20:45:46 +0000 Subject: [PATCH] replace double-quotes with single-quotes whenever appropriate and remove exec()s --- .../postfix_server_plugin.inc.php | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php index 3732cc7e25..e426eb156d 100644 --- a/server/plugins-available/postfix_server_plugin.inc.php +++ b/server/plugins-available/postfix_server_plugin.inc.php @@ -80,13 +80,13 @@ class postfix_server_plugin { // get the config $app->uses("getconf"); - $mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail'); + $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"] != '') { + 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'"); @@ -95,22 +95,23 @@ class postfix_server_plugin { exec("postconf -e 'smtp_sasl_security_options ='"); // Store the sasl passwd - $content = $mail_config["relayhost"]." ".$mail_config["relayhost_user"].":".$mail_config["relayhost_password"]; + $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"); + 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)."'"); + 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 +?> -- GitLab