From d75f0807d3d054fba633ffef4e4785900d05de6e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 02 Aug 2008 05:08:03 -0400
Subject: [PATCH] - Enabled tools module for administrator by default. - Updated Ubuntu installation instructions.

---
 server/plugins-available/mail_plugin.inc.php |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index e63d3f1..c80deb1 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -61,10 +61,24 @@
 	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'])) {
-			exec('mkdir -p '.escapeshellcmd($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);
 		}
 	}

--
Gitblit v1.9.1