X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuser.php;h=616ce562beec4653c903879850f8ca6a9464e199;hb=365ba8c32d586aeec614b69fca8c9d566713d488;hp=eb112ca37f4effd17d6e48eccf3e03aa862bbd90;hpb=acc9be56f2cc773f7e684f9cd3201141bc126ee2;p=platal.git diff --git a/classes/user.php b/classes/user.php index eb112ca..616ce56 100644 --- a/classes/user.php +++ b/classes/user.php @@ -26,9 +26,22 @@ class User extends PlUser { global $globals; + if ($login instanceof Profile) { + $res = XDB::query('SELECT ap.uid + FROM account_profiles AS ap + WHERE ap.pid = {?} AND FIND_IN_SET(\'owner\', perms)', + $login->id()); + if ($res->numRows()) { + return $res->fetchOneCell(); + } + throw new UserNotFoundException(); + } + // If $data is an integer, fetches directly the result. if (is_numeric($login)) { - $res = XDB::query("SELECT user_id FROM auth_user_md5 WHERE user_id = {?}", $login); + $res = XDB::query('SELECT a.uid + FROM accounts AS a + WHERE a.uid = {?}', $login); if ($res->numRows()) { return $res->fetchOneCell(); } @@ -37,7 +50,9 @@ class User extends PlUser } // Checks whether $login is a valid hruid or not. - $res = XDB::query("SELECT user_id FROM auth_user_md5 WHERE hruid = {?}", $login); + $res = XDB::query('SELECT a.uid + FROM accounts AS a + WHERE a.hruid = {?}', $login); if ($res->numRows()) { return $res->fetchOneCell(); } @@ -52,23 +67,24 @@ class User extends PlUser // Checks if $login is a valid alias on the main domains. list($mbox, $fqdn) = explode('@', $login); if ($fqdn == $globals->mail->domain || $fqdn == $globals->mail->domain2) { - $res = XDB::query("SELECT u.user_id - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (a.id = u.user_id AND a.type IN ('alias', 'a_vie')) - WHERE a.alias = {?}", $mbox); + $res = XDB::query('SELECT a.uid + FROM accounts AS a + INNER JOIN aliases AS al ON (al.id = a.uid AND al.type IN (\'alias\', \'a_vie\')) + WHERE al.alias = {?}', $mbox); if ($res->numRows()) { return $res->fetchOneCell(); } + /** TODO: implements this by inspecting the profile. if (preg_match('/^(.*)\.([0-9]{4})$/u', $mbox, $matches)) { - $res = XDB::query("SELECT u.user_id - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (a.id = u.user_id AND a.type IN ('alias', 'a_vie')) - WHERE a.alias = {?} AND u.promo = {?}", $matches[1], $matches[2]); + $res = XDB::query('SELECT a.uid + FROM accounts AS a + INNER JOIN aliases AS al ON (al.id = a.uid AND al.type IN ('alias', 'a_vie')) + WHERE al.alias = {?} AND a.promo = {?}', $matches[1], $matches[2]); if ($res->numRows() == 1) { return $res->fetchOneCell(); } - } + }*/ throw new UserNotFoundException(); } @@ -82,10 +98,10 @@ class User extends PlUser if ($redir = $res->fetchOneCell()) { // We now have a valid alias, which has to be translated to an hruid. list($alias, $alias_fqdn) = explode('@', $redir); - $res = XDB::query("SELECT u.user_id - FROM auth_user_md5 AS u - LEFT JOIN aliases AS a ON (a.id = u.user_id AND a.type IN ('alias', 'a_vie')) - WHERE a.alias = {?}", $alias); + $res = XDB::query("SELECT a.uid + FROM accounts AS a + LEFT JOIN aliases AS al ON (al.id = a.uid AND al.type IN ('alias', 'a_vie')) + WHERE al.alias = {?}", $alias); if ($res->numRows()) { return $res->fetchOneCell(); } @@ -95,9 +111,9 @@ class User extends PlUser } // Otherwise, we do suppose $login is an email redirection. - $res = XDB::query("SELECT u.user_id - FROM auth_user_md5 AS u - LEFT JOIN emails AS e ON (e.uid = u.user_id) + $res = XDB::query("SELECT a.uid + FROM accounts AS a + LEFT JOIN emails AS e ON (e.uid = a.uid) WHERE e.email = {?}", $login); if ($res->numRows() == 1) { return $res->fetchOneCell(); @@ -117,19 +133,21 @@ class User extends PlUser } global $globals; - $res = XDB::query("SELECT u.hruid, u.promo, + /** TODO: promo stuff again */ + /** TODO: fix perms field to fit new perms system */ + $res = XDB::query("SELECT a.hruid, d.promo_display AS promo, CONCAT(af.alias, '@{$globals->mail->domain}') AS forlife, CONCAT(ab.alias, '@{$globals->mail->domain}') AS bestalias, - CONCAT(u.prenom, ' ', IF(u.nom_usage <> '', u.nom_usage, u.nom)) AS full_name, - IF(u.prenom != '', u.prenom, u.nom) AS display_name, - FIND_IN_SET('femme', u.flags) AS gender, - q.core_mail_fmt AS email_format, - u.perms - FROM auth_user_md5 AS u - LEFT JOIN auth_user_quick AS q ON (q.user_id = u.user_id) - LEFT JOIN aliases AS af ON (af.id = u.user_id AND af.type = 'a_vie') - LEFT JOIN aliases AS ab ON (ab.id = u.user_id AND FIND_IN_SET('bestalias', ab.flags)) - WHERE u.user_id = {?}", $this->user_id); + a.full_name, a.display_name, a.sex = 'female' AS gender, + a.email_format, + IF (a.state = 'active', at.perms, '') AS perms, + a.is_admin + FROM accounts AS a + INNER JOIN account_types AS at ON (at.type = a.type) + INNER JOIN profile_display AS d ON (d.uid = a.uid) + LEFT JOIN aliases AS af ON (af.id = a.uid AND af.type = 'a_vie') + LEFT JOIN aliases AS ab ON (ab.id = a.uid AND FIND_IN_SET('bestalias', ab.flags)) + WHERE a.uid = {?}", $this->user_id); $this->fillFromArray($res->fetchOneAssoc()); } @@ -165,9 +183,6 @@ class User extends PlUser if (isset($values['mail_fmt'])) { $values['email_format'] = $values['mail_fmt']; } - if (isset($values['email_format'])) { - $values['email_format'] = ($values['email_format'] ? self::FORMAT_HTML : self::FORMAT_TEXT); - } parent::fillFromArray($values); } @@ -183,18 +198,22 @@ class User extends PlUser if ($this->perms === null) { $this->loadMainFields(); } - $this->perm_flags = self::makePerms($this->perms); + $this->perm_flags = self::makePerms($this->perms, $this->is_admin); + } + + /** Return the main profile attached with this account if any. + */ + public function profile() + { + return Profile::get($this); } // Return permission flags for a given permission level. - public static function makePerms($perms) + public static function makePerms($perms, $is_admin) { - $flags = new PlFlagSet(); - if (is_null($flags) || $perms == 'disabled' || $perms == 'ext') { - return $flags; - } + $flags = new PlFlagSet($perms); $flags->addFlag(PERMS_USER); - if ($perms == 'admin') { + if ($is_admin) { $flags->addFlag(PERMS_ADMIN); } return $flags;