Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Guilherme Filippo
ISPConfig 3
Commits
d4db6047
Commit
d4db6047
authored
May 03, 2010
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a php warning and removed -f switch from userdel command in jailkit plugin.
parent
a2cb1442
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
interface/web/monitor/show_sys_state.php
interface/web/monitor/show_sys_state.php
+6
-4
server/plugins-available/shelluser_jailkit_plugin.inc.php
server/plugins-available/shelluser_jailkit_plugin.inc.php
+1
-1
No files found.
interface/web/monitor/show_sys_state.php
View file @
d4db6047
...
...
@@ -153,10 +153,12 @@ function _getSysState() {
$html
.
=
$data
[
'html_server'
];
/* get all VE's of this server */
$veInfo
=
$data
[
've_info'
];
foreach
(
$veInfo
as
$info
)
{
for
(
$i
=
0
;
$i
<
sizeof
(
$serverData
);
$i
++
)
{
if
(
$serverData
[
$i
][
'server_name'
]
==
$info
[
'hostname'
])
{
$html
=
str_replace
(
'##VE_INFO##'
,
$serverData
[
$i
][
'html_ve'
]
.
'##VE_INFO##'
,
$html
);
if
(
is_array
(
$veInfo
))
{
foreach
(
$veInfo
as
$info
)
{
for
(
$i
=
0
;
$i
<
sizeof
(
$serverData
);
$i
++
)
{
if
(
$serverData
[
$i
][
'server_name'
]
==
$info
[
'hostname'
])
{
$html
=
str_replace
(
'##VE_INFO##'
,
$serverData
[
$i
][
'html_ve'
]
.
'##VE_INFO##'
,
$html
);
}
}
}
}
...
...
server/plugins-available/shelluser_jailkit_plugin.inc.php
View file @
d4db6047
...
...
@@ -160,7 +160,7 @@ class shelluser_jailkit_plugin {
//exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
if
(
@
is_dir
(
$data
[
'old'
][
'dir'
]
.
$jailkit_chroot_userhome
))
{
$command
=
'userdel
-f
'
;
$command
=
'userdel'
;
$command
.
=
' '
.
escapeshellcmd
(
$data
[
'old'
][
'username'
]);
exec
(
$command
);
$app
->
log
(
"Jailkit Plugin -> delete chroot home:"
.
$data
[
'old'
][
'dir'
]
.
$jailkit_chroot_userhome
,
LOGLEVEL_DEBUG
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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