From 07c3bd9b777e55d0b8fc988d6583e44861a3ee43 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 15 Mar 2009 08:04:13 -0400
Subject: [PATCH] Improved password protection of website statistics.

---
 server/plugins-available/shelluser_jailkit_plugin.inc.php |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 308178f..666251b 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -87,7 +87,7 @@
 			
 				$this->_setup_jailkit_chroot();
 				
-				$command .= 'usermod --unlock '.escapeshellcmd($data['new']['username']);
+				$command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
 				exec($command);
 				
 				$this->_add_jailkit_user();
@@ -151,8 +151,12 @@
 			//commented out proved to be dangerous on config errors
 			//exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
 			
-			
-			$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
+			if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
+				$command = 'userdel -f -r';
+				$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);

--
Gitblit v1.9.1