diff --git a/webservice/clienttools/services/0.9/auth.php b/webservice/clienttools/services/0.9/auth.php index 3bc6753..5c6453d 100644 --- a/webservice/clienttools/services/0.9/auth.php +++ b/webservice/clienttools/services/0.9/auth.php @@ -3,7 +3,7 @@ class auth extends client_service { public function login(){ - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function'); + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function'); $params=$this->AuthInfo; $username=$params['user']; @@ -72,7 +72,7 @@ class auth extends client_service { } public function japiLogin(){ - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function'); + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function'); global $default; $user=$this->KT->get_user_object_by_username($this->AuthInfo['user']); @@ -84,7 +84,7 @@ class auth extends client_service { } public function pickup_session(){ - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function'); + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function'); $params=$this->AuthInfo; $app_type=$params['appType']; $session_id=$params['session']; @@ -101,7 +101,7 @@ class auth extends client_service { public function ping(){ - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function'); + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function'); global $default; $user=$this->KT->get_user_object_by_username($this->AuthInfo['user']); $versions=$this->handler->getServerVersions(); @@ -124,13 +124,19 @@ class auth extends client_service { } function logout($params){ - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function'); + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function'); $params=$this->AuthInfo; $app_type=$params['appType']; $session_id=$params['session']; $ip=$_SERVER['REMOTE_ADDR']; - $session = $this->KT->get_active_session($session_id, $ip, $app_type); + $session=$this->KT->get_session(); + $this->logInfo((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Logout Session Object (From KT)',$session); + + if(get_class($session)!='KTAPI_UserSession'){ + $session = $this->KT->get_active_session($session_id, $ip, $app_type); + } + $this->logInfo((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Logout Session Object (To Logout)',$session); if (PEAR::isError($session)){ return false;