<?php
/***************************************************************************
- * Copyright (C) 2003-2009 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
{
$res = XDB::query('SELECT a.uid, a.password
FROM accounts AS a
- INNER JOIN aliases AS l ON (l.id = a.uid AND l.type != \'homonyme\')
+ INNER JOIN aliases AS l ON (l.uid = a.uid AND l.type != \'homonyme\')
WHERE l.' . $login_type . ' = {?} AND a.state = \'active\'',
$login);
if (list($uid, $password) = $res->fetchOneRow()) {
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')) {
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
- FROM accounts AS a
- INNER JOIN account_types AS at ON(a.type = at.type)
- 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)
- WHERE a.uid = {?} AND u.perms IN('admin', 'user')", $user->id());
+ FROM accounts AS a
+ INNER JOIN account_types AS at ON (a.type = at.type)
+ LEFT 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 log_last_sessions AS ls ON (ls.uid = a.uid)
+ LEFT JOIN log_sessions AS s ON(s.id = ls.id)
+ WHERE a.uid = {?} AND a.state = 'active'", $user->id());
if ($res->numRows() != 1) {
return false;
}
{
$res = XDB::query('SELECT a.uid AS user_id, a.hruid
FROM aliases AS l
- INNER JOIN accounts AS a ON (l.id = a.uid AND a.state = \'active\')
+ INNER JOIN accounts AS a ON (l.uid = a.uid AND a.state = \'active\')
WHERE a.token = {?} AND l.alias = {?} AND l.type != \'homonyme\'',
$token, $login);
if ($res->numRows() == 1) {