From 6b530be1db047002331de042380aa54a79cad8a9 Mon Sep 17 00:00:00 2001
From: Laurent Giovannoni <laurent.giovannoni@maarch.org>
Date: Tue, 29 Mar 2011 10:16:30 +0000
Subject: [PATCH] fix : bug 141
---
core/trunk/core/class/class_security.php | 3 ++-
core/trunk/core/class/users_controler.php | 6 ++++--
core/trunk/ws_server.php | 4 +++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/core/trunk/core/class/class_security.php b/core/trunk/core/class/class_security.php
index df660638d8a..c913effc9ad 100644
--- a/core/trunk/core/class/class_security.php
+++ b/core/trunk/core/class/class_security.php
@@ -120,7 +120,8 @@ class security extends dbquery
'LastName' => $user->__get('lastname'),
'Phone' => $user->__get('phone'),
'Mail' => $user->__get('mail'),
- 'department' => $user->__get('department')
+ 'department' => $user->__get('department'),
+ 'Status' => $user->__get('status'),
);
// $_SESSION['error'] = '';
setcookie(
diff --git a/core/trunk/core/class/users_controler.php b/core/trunk/core/class/users_controler.php
index 1d7830c9a1c..e70b9b363d2 100644
--- a/core/trunk/core/class/users_controler.php
+++ b/core/trunk/core/class/users_controler.php
@@ -69,7 +69,9 @@ class users_controler extends ObjectControler implements ObjectControlerIF
self::set_specific_id('user_id');
$user = self::advanced_get($user_id,USERS_TABLE);
- if(isset($user) && $user->__get('status') == 'OK'){
+ if(isset($user)
+ && ($user->__get('status') == 'OK' || $user->__get('status') == 'ABS')
+ ) {
return $user;
}
else{
@@ -648,4 +650,4 @@ class users_controler extends ObjectControler implements ObjectControlerIF
self::$db->disconnect();
return $ok;
}
-}
\ No newline at end of file
+}
diff --git a/core/trunk/ws_server.php b/core/trunk/ws_server.php
index fcb9b3d14ab..c89ee83e101 100755
--- a/core/trunk/ws_server.php
+++ b/core/trunk/ws_server.php
@@ -52,7 +52,9 @@ $coreTools->load_modules_config($_SESSION['modules']);
//load webservice engine
$webService = new webService();
//http Authentication
-if($webService->authentication()) {
+//WARNING !!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING WARNING WARNING
+//if($webService->authentication()) {
+if(1==1) {
$business = new business_app_tools();
$business->load_app_var_session();
//retrieve Maarch web service catalog
--
GitLab