From 362a6b3af3524de09ef0c41ee2e6d7b5dcd663fa Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Tue, 04 May 2010 07:34:31 -0400
Subject: [PATCH] Added version to installer ;-)
---
server/plugins-available/shelluser_jailkit_plugin.inc.php | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 3300b52..c1b32ab 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -89,10 +89,12 @@
$this->_setup_jailkit_chroot();
+ $this->_add_jailkit_user();
+
$command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
exec($command);
- $this->_add_jailkit_user();
+ $this->_update_website_security_level();
}
$app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -126,6 +128,8 @@
$this->_setup_jailkit_chroot();
$this->_add_jailkit_user();
+
+ $this->_update_website_security_level();
}
$app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
@@ -156,11 +160,12 @@
//exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
- $command = 'userdel -f -r';
+ $command = 'userdel';
$command .= ' '.escapeshellcmd($data['old']['username']);
exec($command);
$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
}
+
}
$app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
@@ -280,13 +285,18 @@
//* If the security level is set to high
if($web_config['security_level'] == 20) {
- exec("chmod 755 ".escapeshellcmd($web["document_root"]."/"));
- exec("chown root:root ".escapeshellcmd($web["document_root"]."/"));
+ $this->_exec("chmod 755 ".escapeshellcmd($web["document_root"]));
+ $this->_exec("chown root:root ".escapeshellcmd($web["document_root"]));
}
}
-
+ //* Wrapper for exec function for easier debugging
+ private function _exec($command) {
+ global $app;
+ $app->log("exec: ".$command,LOGLEVEL_DEBUG);
+ exec($command);
+ }
} // end class
--
Gitblit v1.9.1