From f5d9544164b039001906db98b59c92f7250553fb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 05 Apr 2011 07:28:45 -0400
Subject: [PATCH] Meerged revisions 2265-2278 from stable branch.
---
interface/lib/classes/remoting_lib.inc.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 57ff998..ecd71bf 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -701,7 +701,7 @@
function ispconfig_sysuser_update($params,$client_id){
global $app;
$username = $app->db->quote($params["username"]);
- $password = $app->db->quote($params["password"]);
+ $clear_password = $app->db->quote($params["password"]);
$client_id = intval($client_id);
$salt="$1$";
$base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -709,8 +709,9 @@
$salt.=$base64_alphabet[mt_rand(0,63)];
}
$salt.="$";
- $password = crypt(stripslashes($password),$salt);
- $sql = "UPDATE sys_user set username = '$username', passwort = '$password' WHERE client_id = $client_id";
+ $password = crypt(stripslashes($clear_password),$salt);
+ if ($clear_password) $pwstring = ", passwort = '$password'"; else $pwstring ="" ;
+ $sql = "UPDATE sys_user set username = '$username' $pwstring WHERE client_id = $client_id";
$app->db->query($sql);
}
@@ -719,6 +720,8 @@
$client_id = intval($client_id);
$sql = "DELETE FROM sys_user WHERE client_id = $client_id";
$app->db->query($sql);
+ $sql = "DELETE FROM sys_group WHERE client_id = $client_id";
+ $app->db->query($sql);
}
function datalogSave($action,$primary_id, $record_old, $record_new) {
--
Gitblit v1.9.1