From b4aaf3eedda4001ad5e01ac2c19494020148a77c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 08 Sep 2011 10:57:26 -0400
Subject: [PATCH] Fixed: FS#1579 - Add Exim config files for centos to config file folder.
---
server/plugins-available/getmail_plugin.inc.php | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index b394b8f..6b8a7ee 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -108,6 +108,12 @@
} else {
$tpl = str_replace('{DELETE}','0',$tpl);
}
+
+ if($data["new"]["read_all"] == 'y') {
+ $tpl = str_replace('{READ_ALL}', '1', $tpl);
+ } else {
+ $tpl = str_replace('{READ_ALL}', '0', $tpl);
+ }
// Set the data retriever
if($data["new"]["type"] == 'pop3') {
@@ -129,8 +135,8 @@
// Write the config file.
file_put_contents($config_file_path,$tpl);
$app->log("Writing Getmail config file: $config_file_path",LOGLEVEL_DEBUG);
- exec("chmod 400 $config_file_path");
- exec("chown getmail $config_file_path");
+ chmod($config_file_path, 0400);
+ chown($config_file_path, 'getmail');
unset($tpl);
unset($config_file_path);
@@ -144,6 +150,11 @@
function delete($event_name,$data) {
global $app, $conf;
+ // load the server specific configuration options for getmail
+ $app->uses("getconf");
+ $getmail_config = $app->getconf->get_server_config($conf["server_id"], 'getmail');
+ $this->getmail_config_dir = $getmail_config["getmail_config_dir"];
+
$config_file_path = escapeshellcmd($this->getmail_config_dir.'/'.$data["old"]["source_server"].'_'.$data["old"]["source_username"].'.conf');
if(stristr($config_file_path,"..") || stristr($config_file_path,"|") || stristr($config_file_path,";") || stristr($config_file_path,'$')) {
$app->log("Possibly faked path for getmail config file: '$config_file_path'. File is not written.",LOGLEVEL_ERROR);
@@ -155,4 +166,4 @@
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1