owncloud / core

lib/private/user/session.php

Doc Comments +7 added lines, -4 removed lines

@@ -175,7 +175,7 @@ 
 	/**
 	 * get the current active user
 	 *
-	 * @return IUser|null Current user, otherwise null
+	 * @return null|User Current user, otherwise null
 	 */
 	public function getUser() {
 		// FIXME: This is a quick'n dirty work-around for the incognito mode as
@@ -278,7 +278,7 @@ 
 	 *
 	 * @param string $uid
 	 * @param string $password
-	 * @return boolean
+	 * @return boolean|null
 	 * @throws LoginException
 	 */
 	public function login($uid, $password) {
@@ -328,7 +328,7 @@ 
 	 * Tries to login the user with HTTP Basic Authentication
 	 *
 	 * @param IRequest $request
-	 * @return boolean if the login was successful
+	 * @return boolean|null if the login was successful
 	 */
 	public function tryBasicAuthLogin(IRequest $request) {
 		// TODO: use $request->server instead of super globals
@@ -351,6 +351,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $uid
+	 */
 	private function loginWithToken($uid) {
 		//$this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
 		$user = $this->manager->get($uid);
@@ -371,7 +374,7 @@ 
 	 * @param IRequest $request
 	 * @param string $uid user UID
 	 * @param string $password
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public function createSessionToken(IRequest $request, $uid, $password) {
 		if (is_null($this->manager->get($uid))) {