if (!S::logged()) {
S::set('auth', AUTH_COOKIE);
}
- return User::getSilentWithValues(null, array('user_id' => S::i('auth_by_cookie')));
+ return User::getSilentWithUID(S::i('auth_by_cookie'));
}
S::kill('challenge');
S::logger($uid)->log('auth_ok');
}
- return User::getSilentWithValues(null, array('user_id' => $uid));
+ return User::getSilentWithUID($uid);
}
protected function startSessionAs($user, $level)
{
- if ((!is_null(S::v('user')) && S::v('user')->id() != $user->id())
+ if ((!is_null(S::user()) && S::user()->id() != $user->id())
|| (S::has('uid') && S::i('uid') != $user->id())) {
return false;
} else if (S::has('uid')) {
$res = XDB::query("SELECT a.uid, a.hruid, a.display_name, a.full_name,
a.sex = 'female' AS femme, a.email_format,
a.token, FIND_IN_SET('watch', a.flags) AS watch_account,
- UNIX_TIMESTAMP(fp.last_seen) AS banana_last, w.last AS watch_last,
+ UNIX_TIMESTAMP(fp.last_seen) AS banana_last, UNIX_TIMESTAMP(w.last) AS watch_last,
a.last_version, g.g_account_name IS NOT NULL AS googleapps,
UNIX_TIMESTAMP(s.start) AS lastlogin, s.host,
a.is_admin, at.perms
INNER JOIN watch AS w ON(w.uid = a.uid)
LEFT JOIN forum_profiles AS fp ON(fp.uid = a.uid)
LEFT JOIN gapps_accounts AS g ON(a.uid = g.l_userid AND g.g_status = 'active')
- LEFT JOIN logger.last_sessions AS ls ON (ls.uid = a.uid)
- LEFT JOIN logger.sessions AS s ON(s.id = ls.id)
+ LEFT JOIN #logger#.last_sessions AS ls ON (ls.uid = a.uid)
+ LEFT JOIN #logger#.sessions AS s ON(s.id = ls.id)
WHERE a.uid = {?} AND a.state = 'active'", $user->id());
+ if ($res->numRows() != 1) {
+ return false;
+ }
+
$sess = $res->fetchOneAssoc();
$perms = $sess['perms'];
unset($sess['perms']);
return true;
}
- /** Start a session without authentication data for the given user.
- * This is used to identify the user after his registration, to be
- * removed after rewriting registration procedure.
- * XXX: Temporary
- */
- public function startWeakSession($user)
- {
- if (!$this->startSessionAs($user, AUTH_MDP)) {
- $this->destroy();
- return false;
- }
- S::set('auth', AUTH_MDP);
- return true;
- }
-
private function securityChecks()
{
$mail_subject = array();
public function updateNbNotifs()
{
require_once 'notifs.inc.php';
- $n = select_notifs(false, S::i('uid'), S::v('watch_last'), false);
- S::set('notifs', $n->numRows());
+ $user = S::user();
+ $n = Watch::getCount($user);
+ S::set('notifs', $n);
}
public function setAccessCookie($replace = false, $log = true) {