diff --git a/interface/web/js/scrigo.js b/interface/web/js/scrigo.js index 3fde0664897563d67dc2adbed6191ac56ccbf7fc..74163995472368986ca8969c63a949b9236e309f 100644 --- a/interface/web/js/scrigo.js +++ b/interface/web/js/scrigo.js @@ -6,7 +6,7 @@ function loadContentRefresh(pagename) { document.getElementById('pageContent').innerHTML = o.responseText; }, failure: function(o) { - alert('Ajax Request was not successful.'); + alert('Ajax Request was not successful.'+pagename); } } diff --git a/interface/web/monitor/logview.php b/interface/web/monitor/logview.php index 84387ef6c0907ee81a6102150f91e3149bdc7267..acbba035455b9b58d4f9a4886edce77421ba550d 100644 --- a/interface/web/monitor/logview.php +++ b/interface/web/monitor/logview.php @@ -104,6 +104,7 @@ $log = nl2br($log); $app->tpl->setVar("log",$log); $app->tpl->setVar("logfile",$logfile); +$app->tpl->setVar("logfile_id",$logfile_id); $app->tpl_defaults(); diff --git a/interface/web/monitor/templates/logview.htm b/interface/web/monitor/templates/logview.htm index 5e9fc46efc1691a57bc210e27c852bcee1188d31..222fdc2ed7e9e2d476d456db98925c8dc7ef5ee2 100644 --- a/interface/web/monitor/templates/logview.htm +++ b/interface/web/monitor/templates/logview.htm @@ -1,5 +1,5 @@ <div style="margin-left:30px;margin-top:30px;"><b><tmpl_var name="logfile"></b><br /><br /> -<select name="refreshinterval" id="refreshinterval" onChange="loadContentRefresh('monitor/index.php?log=mail_log')"> +<select name="refreshinterval" id="refreshinterval" onChange="loadContentRefresh('monitor/logview.php?log={tmpl_var name="logfile_id"}')"> {tmpl_var name="refresh"} </select><br /><br /> <tmpl_var name="log"></div> \ No newline at end of file diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php index 1c7195d76722df3230c790791697831407eb2310..c80deb13d15f23696b7cab889e24bf64f27ecd79 100644 --- a/server/plugins-available/mail_plugin.inc.php +++ b/server/plugins-available/mail_plugin.inc.php @@ -67,8 +67,16 @@ class mail_plugin { // Create the maildir, if it does not exist if(!is_dir($data['new']['maildir'])) { - exec("su -c 'mkdir -p ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']); + $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);