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 | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index b7645bb..6b8a7ee 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -108,12 +108,22 @@
} 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') {
$tpl = str_replace('{TYPE}','SimplePOP3Retriever',$tpl);
} elseif ($data["new"]["type"] == 'imap') {
$tpl = str_replace('{TYPE}','SimpleIMAPRetriever',$tpl);
+ } elseif ($data["new"]["type"] == 'pop3ssl') {
+ $tpl = str_replace('{TYPE}','SimplePOP3SSLRetriever',$tpl);
+ } elseif ($data["new"]["type"] == 'imapssl') {
+ $tpl = str_replace('{TYPE}','SimpleIMAPSSLRetriever',$tpl);
}
// Set server, username, password and destination.
@@ -125,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);
@@ -150,15 +160,10 @@
$app->log("Possibly faked path for getmail config file: '$config_file_path'. File is not written.",LOGLEVEL_ERROR);
return false;
}
- if(is_file($config_file_path)) {
- unlink($config_file_path);
- $app->log("Deleting file: '$config_file_path'.",LOGLEVEL_DEBUG);
- } else {
- $app->log("Nothing to delete: '$config_file_path'.",LOGLEVEL_DEBUG);
- }
+ if(is_file($config_file_path)) unlink($config_file_path);
}
} // end class
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1