|
|
|
@ -194,16 +194,22 @@ class OC_User {
|
|
|
|
|
if( $run ){
|
|
|
|
|
$uid=self::checkPassword( $uid, $password );
|
|
|
|
|
if($uid){
|
|
|
|
|
$_SESSION['user_id'] = $uid;
|
|
|
|
|
OC_Crypt::init($uid,$password);
|
|
|
|
|
OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid ));
|
|
|
|
|
return true;
|
|
|
|
|
}else{
|
|
|
|
|
return false;
|
|
|
|
|
return self::setUserId($uid);
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @brief Sets user id for session and triggers emit
|
|
|
|
|
* @returns true
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
public static function setUserId($uid) {
|
|
|
|
|
$_SESSION['user_id'] = $uid;
|
|
|
|
|
OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid ));
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -215,7 +221,7 @@ class OC_User {
|
|
|
|
|
public static function logout(){
|
|
|
|
|
OC_Hook::emit( "OC_User", "logout", array());
|
|
|
|
|
$_SESSION['user_id'] = false;
|
|
|
|
|
OC_User::unsetUsernameInCookie();
|
|
|
|
|
OC_User::unsetMagicInCookie();
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -341,21 +347,21 @@ class OC_User {
|
|
|
|
|
* @brief Set cookie value to use in next page load
|
|
|
|
|
* @param string $username username to be set
|
|
|
|
|
*/
|
|
|
|
|
public static function setUsernameInCookie($username, $password){
|
|
|
|
|
public static function setMagicInCookie($username, $token){
|
|
|
|
|
setcookie("oc_username", $username, time()+60*60*24*15);
|
|
|
|
|
setcookie("oc_password", $password, time()+60*60*24*15);
|
|
|
|
|
setcookie("oc_token", $token, time()+60*60*24*15);
|
|
|
|
|
setcookie("oc_remember_login", true, time()+60*60*24*15);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @brief Remove cookie for "remember username"
|
|
|
|
|
*/
|
|
|
|
|
public static function unsetUsernameInCookie(){
|
|
|
|
|
public static function unsetMagicInCookie(){
|
|
|
|
|
unset($_COOKIE["oc_username"]);
|
|
|
|
|
unset($_COOKIE["oc_password"]);
|
|
|
|
|
unset($_COOKIE["oc_token"]);
|
|
|
|
|
unset($_COOKIE["oc_remember_login"]);
|
|
|
|
|
setcookie("oc_username", NULL, -1);
|
|
|
|
|
setcookie("oc_password", NULL, -1);
|
|
|
|
|
setcookie("oc_token", NULL, -1);
|
|
|
|
|
setcookie("oc_remember_login", NULL, -1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|