Peter M. Groen / knowledgetree

Commit 1129b23590eff54aa7ab14c5d6ddf0bb31321101

Authored by Mark Holtzhausen
1 parent 56b96aff

Logout Function Fixed

Inline Side-by-side
Showing 1 changed file with 12 additions and 6 deletions
webservice/clienttools/services/0.9/auth.php
  View file @1129b23
... ... @@ -3,7 +3,7 @@
3 3 class auth extends client_service {
4 4  
5 5 public function login(){
6   - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function');
  6 + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
7 7 $params=$this->AuthInfo;
8 8  
9 9 $username=$params['user'];
... ... @@ -72,7 +72,7 @@ class auth extends client_service {
72 72 }
73 73  
74 74 public function japiLogin(){
75   - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function');
  75 + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
76 76 global $default;
77 77  
78 78 $user=$this->KT->get_user_object_by_username($this->AuthInfo['user']);
... ... @@ -84,7 +84,7 @@ class auth extends client_service {
84 84 }
85 85  
86 86 public function pickup_session(){
87   - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function');
  87 + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
88 88 $params=$this->AuthInfo;
89 89 $app_type=$params['appType'];
90 90 $session_id=$params['session'];
... ... @@ -101,7 +101,7 @@ class auth extends client_service {
101 101  
102 102  
103 103 public function ping(){
104   - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function');
  104 + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
105 105 global $default;
106 106 $user=$this->KT->get_user_object_by_username($this->AuthInfo['user']);
107 107 $versions=$this->handler->getServerVersions();
... ... @@ -124,13 +124,19 @@ class auth extends client_service {
124 124 }
125 125  
126 126 function logout($params){
127   - $this->logTrace(__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__,'Enter Function');
  127 + $this->logTrace((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Enter Function');
128 128 $params=$this->AuthInfo;
129 129 $app_type=$params['appType'];
130 130 $session_id=$params['session'];
131 131 $ip=$_SERVER['REMOTE_ADDR'];
132 132  
133   - $session = $this->KT->get_active_session($session_id, $ip, $app_type);
  133 + $session=$this->KT->get_session();
  134 + $this->logInfo((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Logout Session Object (From KT)',$session);
  135 +
  136 + if(get_class($session)!='KTAPI_UserSession'){
  137 + $session = $this->KT->get_active_session($session_id, $ip, $app_type);
  138 + }
  139 + $this->logInfo((__CLASS__.'::'.__METHOD__.'('.__FILE__.' '.__LINE__.')'),'Logout Session Object (To Logout)',$session);
134 140  
135 141 if (PEAR::isError($session)){
136 142 return false;
... ...