From abc09ddbb12d4332a08b115e1b69baec9a1b030a Mon Sep 17 00:00:00 2001 From: vogelor <vogelor@ispconfig3> Date: Thu, 18 Dec 2008 07:08:38 -0500 Subject: [PATCH] improvement of the RAID-State --- server/plugins-available/mail_plugin.inc.php | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php index c0a29ad..ffb896a 100644 --- a/server/plugins-available/mail_plugin.inc.php +++ b/server/plugins-available/mail_plugin.inc.php @@ -33,6 +33,19 @@ var $plugin_name = 'mail_plugin'; var $class_name = 'mail_plugin'; + //* 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 @@ -53,7 +66,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,7 +79,7 @@ $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'])) { + 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]); @@ -125,6 +138,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