From 6f67c78cf8668e570c5ef7fd4430e3d0e4a66aef Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 22 Nov 2008 07:49:58 -0500
Subject: [PATCH] Replaced php code for app version in main template with a template variable.

---
 server/plugins-available/shelluser_base_plugin.inc.php |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 7e6b485..3ae2ef2 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -89,15 +89,16 @@
 			$command = 'usermod';
 			$command .= ' --home '.escapeshellcmd($data['new']['dir']);
 			$command .= ' --gid '.escapeshellcmd($data['new']['pgroup']);
-			$command .= ' --non-unique ';
+			// $command .= ' --non-unique ';
 			$command .= ' --password '.escapeshellcmd($data['new']['password']);
-			$command .= ' --shell '.escapeshellcmd($data['new']['shell']);
-			$command .= ' --uid '.escapeshellcmd($uid);
+			if($data['new']['chroot'] != 'jailkit') $command .= ' --shell '.escapeshellcmd($data['new']['shell']);
+			// $command .= ' --uid '.escapeshellcmd($uid);
 			$command .= ' --login '.escapeshellcmd($data['new']['username']);
 			$command .= ' '.escapeshellcmd($data['old']['username']);
 			
 			exec($command);
-			$app->log("Updated shelluser: ".$data['new']['username'],LOGLEVEL_DEBUG);
+			// $app->log("Updated shelluser: $command ",LOGLEVEL_DEBUG);
+			$app->log("Updated shelluser: ".$data['old']['username'],LOGLEVEL_DEBUG);
 			
 		} else {
 			$app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.",LOGLEVEL_ERROR);

--
Gitblit v1.9.1