|
|
@ -115,13 +115,13 @@ class Session implements Emitter, \OCP\IUserSession { |
|
|
|
/** |
|
|
|
/** |
|
|
|
* set the login name |
|
|
|
* set the login name |
|
|
|
* |
|
|
|
* |
|
|
|
* @param string login name for the logged in user |
|
|
|
* @param string $loginName for the logged in user |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function setLoginname($loginname) { |
|
|
|
public function setLoginName($loginName) { |
|
|
|
if (is_null($loginname)) { |
|
|
|
if (is_null($loginName)) { |
|
|
|
$this->session->remove('loginname'); |
|
|
|
$this->session->remove('loginname'); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$this->session->set('loginname', $loginname); |
|
|
|
$this->session->set('loginname', $loginName); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -130,7 +130,7 @@ class Session implements Emitter, \OCP\IUserSession { |
|
|
|
* |
|
|
|
* |
|
|
|
* @return string |
|
|
|
* @return string |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function getLoginname() { |
|
|
|
public function getLoginName() { |
|
|
|
if ($this->activeUser) { |
|
|
|
if ($this->activeUser) { |
|
|
|
return $this->session->get('loginname'); |
|
|
|
return $this->session->get('loginname'); |
|
|
|
} else { |
|
|
|
} else { |
|
|
@ -158,7 +158,7 @@ class Session implements Emitter, \OCP\IUserSession { |
|
|
|
if (!is_null($user)) { |
|
|
|
if (!is_null($user)) { |
|
|
|
if ($user->isEnabled()) { |
|
|
|
if ($user->isEnabled()) { |
|
|
|
$this->setUser($user); |
|
|
|
$this->setUser($user); |
|
|
|
$this->setLoginname($uid); |
|
|
|
$this->setLoginName($uid); |
|
|
|
$this->manager->emit('\OC\User', 'postLogin', array($user, $password)); |
|
|
|
$this->manager->emit('\OC\User', 'postLogin', array($user, $password)); |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} else { |
|
|
|
} else { |
|
|
@ -176,7 +176,7 @@ class Session implements Emitter, \OCP\IUserSession { |
|
|
|
public function logout() { |
|
|
|
public function logout() { |
|
|
|
$this->manager->emit('\OC\User', 'logout'); |
|
|
|
$this->manager->emit('\OC\User', 'logout'); |
|
|
|
$this->setUser(null); |
|
|
|
$this->setUser(null); |
|
|
|
$this->setLoginname(null); |
|
|
|
$this->setLoginName(null); |
|
|
|
$this->unsetMagicInCookie(); |
|
|
|
$this->unsetMagicInCookie(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|