From d41111a065e532f3f65e4eee7fed189ef949ade3 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 14 Dec 2012 12:16:27 -0500
Subject: [PATCH] Fixed: Sorting as client can lead to sql errors due to amigious column sys_userid (JOINs)
---
interface/lib/classes/remoting_lib.inc.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 095b8c2..617250c 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -114,6 +114,7 @@
var $sys_default_group;
var $sys_groups;
var $client_id;
+ var $dataRecord;
//* Load the form definition from file.
@@ -656,6 +657,7 @@
$this->action = $action;
$this->primary_id = $primary_id;
+ $this->dataRecord = $record;
$record = $this->encode($record,true);
$sql_insert_key = '';
@@ -846,7 +848,7 @@
$language = $app->db->quote($params["language"]);
$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('$username','','$insert_id')", 'groupid');
$groups = $groupid;
- $password = $app->auth->crypt_password(stripslashes($password));
+ if(!isset($params['_ispconfig_pw_crypted']) || $params['_ispconfig_pw_crypted'] != 1) $password = $app->auth->crypt_password(stripslashes($password));
$sql1 = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id)
VALUES ('$username','$password','$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,$insert_id)";
$app->db->query($sql1);
@@ -857,7 +859,8 @@
$username = $app->db->quote($params["username"]);
$clear_password = $app->db->quote($params["password"]);
$client_id = $app->functions->intval($client_id);
- $password = $app->auth->crypt_password(stripslashes($clear_password));
+ if(!isset($params['_ispconfig_pw_crypted']) || $params['_ispconfig_pw_crypted'] != 1) $password = $app->auth->crypt_password(stripslashes($clear_password));
+ else $password = $clear_password;
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);
--
Gitblit v1.9.1