From 530929b9ccba440cd1df5d989979ceaa85a5a1e2 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 24 Feb 2010 10:04:08 -0500
Subject: [PATCH] - Changed version number to 3.0.2 - Better default settings for the "Normal" spamfilter policy.
---
interface/lib/classes/remoting_lib.inc.php | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 1dbb5f2..503a982 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -139,31 +139,33 @@
//* Load the user profile
function loadUserProfile($client_id = 0) {
- global $app,$conf;
+ global $app,$conf;
+
+ $client_id = intval($client_id);
- $client_id = intval($client_id);
-
- if($client_id == 0) {
- $this->sys_username = 'admin';
- $this->sys_userid = 1;
- $this->sys_default_group = 1;
- $this->sys_groups = 1;
- } else {
- //* load system user
- $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE sysuser_id = $client_id");
- if(empty($user["userid"])) {
- $this->errorMessage .= 'No sysuser with the ID $client_id found.';
- return false;
- }
- $this->sys_username = $user['username'];
- $this->sys_userid = $user['userid'];
- $this->sys_default_group = $user['default_group'];
- $this->sys_groups = $user['groups'];
- }
-
- return true;
-
- }
+ if($client_id == 0) {
+ $this->sys_username = 'admin';
+ $this->sys_userid = 1;
+ $this->sys_default_group = 1;
+ $this->sys_groups = 1;
+ } else {
+ //* load system user - try with sysuser and before with userid (workarrond)
+ $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE sysuser_id = $client_id");
+ if(empty($user["userid"])) {
+ $user = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = $client_id");
+ if(empty($user["userid"])) {
+ $this->errorMessage .= "No sysuser with the ID $client_id found.";
+ return false;
+ }
+ }
+ $this->sys_username = $user['username'];
+ $this->sys_userid = $user['userid'];
+ $this->sys_default_group = $user['default_group'];
+ $this->sys_groups = $user['groups'];
+ }
+
+ return true;
+ }
/**
--
Gitblit v1.9.1