stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2024-10-29 21:07:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fire the logon_event when the user logs on. Cleanup some old code from the user/helpers/user.php file."

Browse Source
This commit is contained in:
Tim Almdal 2009-10-27 14:01:53 -07:00
parent ab1d21eb34
commit 3228f04ed9
2 changed files with 1 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/gallery/controllers/login.php
View File

@ -77,6 +77,7 @@ class Login_Controller extends Controller {
}
identity::set_active_user($user);
log::info("user", t("User %name logged in", array("name" => $user->name)));
module::event("user_login", $user);
}
// Either way, regenerate the session id to avoid session trapping

92
modules/user/helpers/user.php
View File

@ -24,57 +24,6 @@
* Note: by design, this class does not do any permission checking.
*/
class user_Core {
/**
* Make sure that we have a session and group_ids cached in the session.
*/
static function load_user() {
$session = Session::instance();
if (!($user = $session->get("user"))) {
$session->set("user", $user = user::guest());
}
// The installer cannot set a user into the session, so it just sets an id which we should
// upconvert into a user.
if ($user === 2) {
$user = model_cache::get("user", 2);
user::login($user);
$session->set("user", $user);
}
if (!$session->get("group_ids")) {
$ids = array();
foreach ($user->groups as $group) {
$ids[] = $group->id;
}
$session->set("group_ids", $ids);
}
}
/**
* Return the array of group ids this user belongs to
*
* @return array
*/
static function group_ids() {
return Session::instance()->get("group_ids", array(1));
}
/**
* Return the active user. If there's no active user, return the guest user.
*
* @return User_Model
*/
static function active() {
// @todo (maybe) cache this object so we're not always doing session lookups.
$user = Session::instance()->get("user", null);
if (!isset($user)) {
// Don't do this as a fallback in the Session::get() call because it can trigger unnecessary
// work.
$user = user::guest();
}
return $user;
}
/**
* Return the guest user.
*
@ -86,18 +35,6 @@ class user_Core {
return model_cache::get("user", 1);
}
/**
* Change the active user.
*
* @return User_Model
*/
static function set_active($user) {
$session = Session::instance();
$session->set("user", $user);
$session->delete("group_ids");
self::load_user();
}
/**
* Create a new user.
*
@ -170,35 +107,6 @@ class user_Core {
return $hashGenerator->HashPassword($password);
}
/**
* Log in as a given user.
* @param object $user the user object.
*/
static function login($user) {
$user->login_count += 1;
$user->last_login = time();
$user->save();
user::set_active($user);
module::event("user_login", $user);
}
/**
* Log out the active user and destroy the session.
* @param object $user the user object.
*/
static function logout() {
$user = user::active();
if (!$user->guest) {
try {
Session::instance()->destroy();
} catch (Exception $e) {
Kohana::log("error", $e);
}
module::event("user_logout", $user);
}
}
/**
* Look up a user by id.
* @param integer $id the user id