From 8edabf647814a012307bbf68628e4656ecf89eff Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 14:12:28 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 interface/web/sites/shell_user_edit.php |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php
index 24ef093..3c72a5f 100644
--- a/interface/web/sites/shell_user_edit.php
+++ b/interface/web/sites/shell_user_edit.php
@@ -158,15 +158,16 @@
 		global $app, $conf;
 
 		$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));
-		$server_id = $web["server_id"];
-		$dir = $web["document_root"];
-		$puser = $web["system_user"];
-		$pgroup = $web["system_group"];
+
+		$server_id = $app->functions->intval($web["server_id"]);
+		$dir = $app->db->quote($web["document_root"]);
+		$uid = $app->db->quote($web["system_user"]);
+		$gid = $app->db->quote($web["system_group"]);
 
 		// The FTP user shall be owned by the same group then the website
-		$sys_groupid = $web['sys_groupid'];
+		$sys_groupid = $app->functions->intval($web['sys_groupid']);
 
-		$sql = "UPDATE shell_user SET server_id = $server_id, dir = '$dir', puser = '$puser', pgroup = '$pgroup', sys_groupid = '$sys_groupid' WHERE shell_user_id = ".$this->id;
+		$sql = "UPDATE shell_user SET server_id = $server_id, dir = '$dir', puser = '$uid', pgroup = '$gid', sys_groupid = '$sys_groupid' WHERE shell_user_id = ".$this->id;
 		$app->db->query($sql);
 
 	}

--
Gitblit v1.9.1