Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
82ca2750
Commit
82ca2750
authored
Jul 10, 2008
by
tbrehm
Browse files
- Fixed bug in logview refresh function.
- Fixed bug with maildir creation in mail plugin.
parent
fa795806
Changes
4
Hide whitespace changes
Inline
Side-by-side
interface/web/js/scrigo.js
View file @
82ca2750
...
...
@@ -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
);
}
}
...
...
interface/web/monitor/logview.php
View file @
82ca2750
...
...
@@ -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
();
...
...
interface/web/monitor/templates/logview.htm
View file @
82ca2750
<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
server/plugins-available/mail_plugin.inc.php
View file @
82ca2750
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment