From c2f53e76fde1ab534e67a9227d4f0adcde05dfa4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 14:05:37 -0400
Subject: [PATCH] Fix in maildrop plugin.
---
server/plugins-available/getmail_plugin.inc.php | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index 0e4d279..b7645bb 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -33,8 +33,20 @@
var $plugin_name = 'getmail_plugin';
var $class_name = 'getmail_plugin';
-
var $getmail_config_dir = '';
+
+ //* 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
@@ -128,12 +140,22 @@
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);
return false;
}
- if(is_file($config_file_path)) unlink($config_file_path);
+ 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);
+ }
}
--
Gitblit v1.9.1