From a59e37372507bcdf32df82eeac36bedfc41e9415 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 05 Nov 2008 04:40:15 -0500
Subject: [PATCH] Added apache dirctives variable to SSL vhost too.
---
server/plugins-available/mail_plugin.inc.php | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index 95ef769..c0a29ad 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -45,10 +45,15 @@
Register for the events
*/
+ //* Mailboxes
$app->plugins->registerEvent('mail_user_insert',$this->plugin_name,'user_insert');
$app->plugins->registerEvent('mail_user_update',$this->plugin_name,'user_update');
$app->plugins->registerEvent('mail_user_delete',$this->plugin_name,'user_delete');
-
+
+ //* 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');
}
@@ -56,12 +61,29 @@
function user_insert($event_name,$data) {
global $app, $conf;
+ // get the config
+ $app->uses("getconf");
+ $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'])) {
- mkdir($data['new']['maildir']);
- exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($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);
}
@@ -74,18 +96,21 @@
// Create the maildir, if it does not exist
if(!is_dir($data['new']['maildir'])) {
- mkdir($data['new']['maildir']);
+ exec('mkdir -p '.escapeshellcmd($data['new']['maildir']));
exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
$app->log('Created Maildir: '.$data['new']['maildir'],LOGLEVEL_DEBUG);
}
// Move mailbox, if domain has changed and delete old mailbox
if($data['new']['maildir'] != $data['old']['maildir'] && is_dir($data['old']['maildir'])) {
- exec('mv -f'.escapeshellcmd($data['old']['maildir']).'* '.escapeshellcmd($data['new']['maildir']));
- unlink($data['old']['maildir']);
+ exec('mv -f '.escapeshellcmd($data['old']['maildir']).'* '.escapeshellcmd($data['new']['maildir']));
+ if(is_file($data['old']['maildir'].'.ispconfig_mailsize'))exec('mv -f '.escapeshellcmd($data['old']['maildir']).'.ispconfig_mailsize '.escapeshellcmd($data['new']['maildir']));
+ 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) {
@@ -93,12 +118,11 @@
$old_maildir_path = escapeshellcmd($data['old']['maildir']);
if(!stristr($old_maildir_path,'..') && !stristr($old_maildir_path,'*') && strlen($old_maildir_path) >= 10) {
- exec('rm -rf '.$old_maildir_path);
+ exec('rm -rf '.escapeshellcmd($old_maildir_path));
$app->log('Deleted the Maildir: '.$data['old']['maildir'],LOGLEVEL_DEBUG);
} else {
$app->log('Possible security violation when deleting the maildir: '.$data['old']['maildir'],LOGLEVEL_ERROR);
}
-
}
--
Gitblit v1.9.1