From 2d18c0953ff1f4847c12e6c4a4f26a024a467905 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 03 Mar 2010 06:04:53 -0500
Subject: [PATCH] Fixed: FS#1086 - fetchmail jobs get not removed from disk when they were deleted in ispconfig.

---
 server/plugins-available/getmail_plugin.inc.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index b394b8f..a168aff 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -144,6 +144,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);

--
Gitblit v1.9.1