Commit 82ca2750 authored by tbrehm's avatar tbrehm
Browse files

- Fixed bug in logview refresh function.

- Fixed bug with maildir creation in mail plugin.
parent fa795806
......@@ -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);
}
}
......
......@@ -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();
......
<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
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment