From 45858cbbdb9b5b81567d9ba27a059ef52a042436 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 04 Mar 2010 08:59:20 -0500
Subject: [PATCH] Fixed: FS#1073 - (SOAP) Problem with custom_mailfilter->mail_user_update/mail_user_add
---
interface/lib/classes/remoting.inc.php | 15 +++++++++------
interface/lib/classes/remoting_lib.inc.php | 2 ++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 19e4e3f..8166002 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -1942,11 +1942,11 @@
$app->uses('remoting_lib');
- //* Load the form definition
- $app->remoting_lib->loadFormDef($formdef_file);
-
//* load the user profile of the client
$app->remoting_lib->loadUserProfile($client_id);
+
+ //* Load the form definition
+ $app->remoting_lib->loadFormDef($formdef_file);
//* Get the SQL query
$sql = $app->remoting_lib->getSQL($params,'INSERT',0);
@@ -1989,11 +1989,11 @@
$app->uses('remoting_lib');
- //* Load the form definition
- $app->remoting_lib->loadFormDef($formdef_file);
-
//* load the user profile of the client
$app->remoting_lib->loadUserProfile($client_id);
+
+ //* Load the form definition
+ $app->remoting_lib->loadFormDef($formdef_file);
//* Get the SQL query
$sql = $app->remoting_lib->getSQL($params,'UPDATE',$primary_id);
@@ -2036,6 +2036,9 @@
$app->uses('remoting_lib');
+ //* load the user profile of the client
+ $app->remoting_lib->loadUserProfile($client_id);
+
//* Load the form definition
$app->remoting_lib->loadFormDef($formdef_file);
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 38d9010..565cad1 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -148,6 +148,7 @@
$this->sys_userid = 1;
$this->sys_default_group = 1;
$this->sys_groups = 1;
+ $_SESSION["s"]["user"]["typ"] = 'admin';
} else {
//* load system user - try with sysuser and before with userid (workarrond)
/*
@@ -165,6 +166,7 @@
$this->sys_userid = $user['userid'];
$this->sys_default_group = $user['default_group'];
$this->sys_groups = $user['groups'];
+ $_SESSION["s"]["user"]["typ"] = $user['typ'];
}
return true;
--
Gitblit v1.9.1