diff --git a/core/trunk/core/class/class_security.php b/core/trunk/core/class/class_security.php index df660638d8a492b3754b3389ee36de94ce321a40..c913effc9adc2129c7a51ad53ced4a404fd5ccbe 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 1d7830c9a1c3fb48941575a6ebfc3961d817a219..e70b9b363d25a2ed26fc6b3bbce19bd80d531417 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 fcb9b3d14ab12199c4ac9239cb1f310d224d1c2a..c89ee83e101cadc515fff7255d3341e691b48688 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