@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | /** |
171 | 171 | * get the current active user |
172 | 172 | * |
173 | - * @return IUser|null Current user, otherwise null |
|
173 | + * @return null|User Current user, otherwise null |
|
174 | 174 | */ |
175 | 175 | public function getUser() { |
176 | 176 | // FIXME: This is a quick'n dirty work-around for the incognito mode as |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | |
301 | 301 | /** |
302 | 302 | * Tries to login the user with HTTP Basic Authentication |
303 | - * @return boolean if the login was successful |
|
303 | + * @return boolean|null if the login was successful |
|
304 | 304 | */ |
305 | 305 | public function tryBasicAuthLogin() { |
306 | 306 | if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) { |
@@ -322,6 +322,9 @@ discard block |
||
322 | 322 | return false; |
323 | 323 | } |
324 | 324 | |
325 | + /** |
|
326 | + * @param string $uid |
|
327 | + */ |
|
325 | 328 | private function loginWithToken($uid) { |
326 | 329 | //$this->manager->emit('\OC\User', 'preTokenLogin', array($uid)); |
327 | 330 | $user = $this->manager->get($uid); |