From ede53cd04cc03dbb9cd8ee2d2183337f3becf6e5 Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Mon, 08 Dec 2008 06:31:30 -0500
Subject: [PATCH] Add in debian document installation of ntpdate (for update time) and rkhunter (rootkit tool how ispconfig monitor)
---
server/plugins-available/mail_plugin.inc.php | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index edc2483..524c059 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -53,7 +53,7 @@
//* Mail Domains
//$app->plugins->registerEvent('mail_domain_insert',$this->plugin_name,'domain_insert');
//$app->plugins->registerEvent('mail_domain_update',$this->plugin_name,'domain_update');
- //$app->plugins->registerEvent('mail_domain_delete',$this->plugin_name,'domain_delete');
+ $app->plugins->registerEvent('mail_domain_delete',$this->plugin_name,'domain_delete');
}
@@ -66,12 +66,25 @@
$mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail');
// Create the maildir, if it does not exist
- if(!is_dir($data['new']['maildir'])) {
- exec('mkdir -p '.escapeshellcmd($data['new']['maildir']));
- exec('maildirmake '.escapeshellcmd($data['new']['maildir']));
- exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
+ if(!empty($data['new']['maildir']) && !is_dir($data['new']['maildir'])) {
+ $tmp_path = $data['new']['maildir'];
+ $tmp_path_parts = explode('/',$tmp_path);
+ unset($tmp_path_parts[count($tmp_path_parts)-2]);
+ $maildomain_path = implode('/',$tmp_path_parts);
+ if(!is_dir($maildomain_path)) {
+ exec("su -c 'mkdir -p ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
+ $app->log('Created Directory: '.$maildomain_path,LOGLEVEL_DEBUG);
+ }
+ exec("su -c 'maildirmake ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']);
+ $app->log('Executed: '."su -c 'maildirmake ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
+ //exec('maildirmake '.escapeshellcmd($data['new']['maildir']));
+ exec('chown -R '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
$app->log('Created Maildir: '.$data['new']['maildir'],LOGLEVEL_DEBUG);
}
+ //This is to fix the maildrop quota not being rebuilt after the quota is changed.
+ exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']);
+ $app->log('Created Maildir: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
+
}
function user_update($event_name,$data) {
@@ -95,6 +108,9 @@
rmdir($data['old']['maildir']);
$app->log('Moved Maildir from: '.$data['old']['maildir'].' to '.$data['new']['maildir'],LOGLEVEL_DEBUG);
}
+ //This is to fix the maildrop quota not being rebuilt after the quota is changed.
+ exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']);
+ $app->log('Created Maildir: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
}
function user_delete($event_name,$data) {
@@ -109,6 +125,22 @@
}
}
+ function domain_delete($event_name,$data) {
+ global $app, $conf;
+
+ // get the config
+ $app->uses("getconf");
+ $mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail');
+
+ $old_maildomain_path = escapeshellcmd($mail_config['homedir_path'].'/'.$data['old']['domain']);
+ if(!stristr($old_maildomain_path,'..') && !stristr($old_maildomain_path,'*') && strlen($old_maildomain_path) >= 10) {
+ exec('rm -rf '.escapeshellcmd($old_maildomain_path));
+ $app->log('Deleted the mail domain directory: '.$old_maildomain_path,LOGLEVEL_DEBUG);
+ } else {
+ $app->log('Possible security violation when deleting the mail domain directory: '.$old_maildomain_path,LOGLEVEL_ERROR);
+ }
+ }
+
--
Gitblit v1.9.1