X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuser.php;h=0f4286794675a4e6cc8f00dade2513e553004462;hb=ccc951d9ef4b747cf4c5b08d52e6f8938338f6de;hp=1ce06bc28a6b53d94a684eeb753fecb75660773b;hpb=fa589f9001c44a41537d1f75ead96368d7202f3b;p=platal.git diff --git a/classes/user.php b/classes/user.php index 1ce06bc..0f42867 100644 --- a/classes/user.php +++ b/classes/user.php @@ -91,16 +91,20 @@ class User extends PlUser return $res->fetchOneCell(); } - /** TODO: implements this by inspecting the profile. if (preg_match('/^(.*)\.([0-9]{4})$/u', $mbox, $matches)) { $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]); + FROM accounts AS a + INNER JOIN aliases AS al ON (al.uid = a.uid AND al.type IN (\'alias\', \'a_vie\')) + INNER JOIN account_profiles AS ap ON (a.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms)) + INNER JOIN profiles AS p ON (p.pid = ap.pid) + INNER JOIN profile_education AS pe ON (p.pid = pe.pid AND FIND_IN_SET(\'primary\', pe.flags)) + WHERE p.hrpid = {?} OR ((pe.entry_year <= {?} AND pe.grad_year >= {?}) AND al.alias = {?}) + GROUP BY a.uid', + $matches[0], $matches[2], $matches[2], $matches[1]); if ($res->numRows() == 1) { return $res->fetchOneCell(); } - }*/ + } throw new UserNotFoundException(); } @@ -148,6 +152,10 @@ class User extends PlUser protected static function loadMainFieldsFromUIDs(array $uids, $respect_order = true) { + if (empty($uids)) { + return PlIteratorUtils::emptyIterator(); + } + global $globals; $joins = ''; $fields = array(); @@ -171,17 +179,18 @@ class User extends PlUser $uids = array_map(array('XDB', 'escape'), $uids); return XDB::iterator('SELECT a.uid, a.hruid, a.registration_date, ah.alias AS homonym, - CONCAT(af.alias, \'@' . $globals->mail->domain . '\') AS forlife, - CONCAT(af.alias, \'@' . $globals->mail->domain2 . '\') AS forlife_alternate, - CONCAT(ab.alias, \'@' . $globals->mail->domain . '\') AS bestalias, - CONCAT(ab.alias, \'@' . $globals->mail->domain2 . '\') AS bestalias_alternate, - a.full_name, a.display_name, a.sex = \'female\' AS gender, - IF(a.state = \'active\', at.perms, \'\') AS perms, - a.email_format, a.is_admin, a.state, a.type, a.skin, + IF (af.alias IS NULL, NULL, CONCAT(af.alias, \'@' . $globals->mail->domain . '\')) AS forlife, + IF (af.alias IS NULL, NULL, CONCAT(af.alias, \'@' . $globals->mail->domain2 . '\')) AS forlife_alternate, + IF (ab.alias IS NULL, NULL, CONCAT(ab.alias, \'@' . $globals->mail->domain . '\')) AS bestalias, + IF (ab.alias IS NULL, NULL, CONCAT(ab.alias, \'@' . $globals->mail->domain2 . '\')) AS bestalias_alternate, + a.email, a.full_name, a.directory_name, a.display_name, a.sex = \'female\' AS gender, + IF(a.state = \'active\', CONCAT(at.perms, \',\', IF(a.user_perms IS NULL, \'\', a.user_perms)), \'\') AS perms, + a.user_perms, a.email_format, a.is_admin, a.state, a.type, a.skin, FIND_IN_SET(\'watch\', a.flags) AS watch, a.comment, - a.weak_password IS NOT NULL AS weak_access, - a.token IS NOT NULL AS token_access, - (e.email IS NULL AND NOT FIND_IN_SET(\'googleapps\', eo.storage)) AND a.state != \'pending\' AS lost + a.weak_password IS NOT NULL AS weak_access, g.g_account_name IS NOT NULL AS googleapps, + a.token IS NOT NULL AS token_access, a.token, a.last_version, + (e.email IS NULL AND NOT FIND_IN_SET(\'googleapps\', eo.storage)) AND a.state != \'pending\' AS lost, + UNIX_TIMESTAMP(s.start) AS lastlogin, s.host, UNIX_TIMESTAMP(fp.last_seen) AS banana_last ' . $fields . ' FROM accounts AS a INNER JOIN account_types AS at ON (at.type = a.type) @@ -190,6 +199,10 @@ class User extends PlUser LEFT JOIN aliases AS ah ON (ah.uid = a.uid AND ah.type = \'homonyme\') LEFT JOIN emails AS e ON (e.uid = a.uid AND e.flags = \'active\') LEFT JOIN email_options AS eo ON (eo.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) + LEFT JOIN forum_profiles AS fp ON (fp.uid = a.uid) ' . $joins . ' WHERE a.uid IN (' . implode(', ', $uids) . ') GROUP BY a.uid @@ -208,35 +221,6 @@ class User extends PlUser $this->fillFromArray(self::loadMainFieldsFromUIDs(array($this->uid))->next()); } - // Specialization of the fillFromArray method, to implement hacks to enable - // lazy loading of user's main properties from the session. - // TODO(vzanotti): remove the conversion hacks once the old codebase will - // stop being used actively. - protected function fillFromArray(array $values) - { - // Also, if display_name and full_name are not known, but the user's - // surname and last name are, we can construct the former two. - if (isset($values['prenom']) && isset($values['nom'])) { - if (!isset($values['display_name'])) { - $values['display_name'] = ($values['prenom'] ? $values['prenom'] : $values['nom']); - } - if (!isset($values['full_name'])) { - $values['full_name'] = $values['prenom'] . ' ' . $values['nom']; - } - } - - // We also need to convert the gender (usually named "femme"), and the - // email format parameter (valued "texte" instead of "text"). - if (isset($values['femme'])) { - $values['gender'] = (bool) $values['femme']; - } - if (isset($values['mail_fmt'])) { - $values['email_format'] = $values['mail_fmt']; - } - - parent::fillFromArray($values); - } - // Specialization of the buildPerms method // This function build 'generic' permissions for the user. It does not take // into account page specific permissions (e.g X.net group permissions) @@ -260,6 +244,11 @@ class User extends PlUser WHERE a.uid = {?}', $this->id()); } + public function isActive() + { + return $this->state == 'active'; + } + /** Overload PlUser::promo(): there no promo defined for a user in the current * schema. The promo is a field from the profile. */ @@ -287,11 +276,35 @@ class User extends PlUser return $this->profile()->lastName(); } + public function displayName() + { + if (!$this->hasProfile()) { + return $this->display_name; + } + return $this->profile()->yourself; + } + + public function fullName($with_promo = false) + { + if (!$this->hasProfile()) { + return $this->full_name; + } + return $this->profile()->fullName($with_promo); + } + + public function directoryName() + { + if (!$this->hasProfile()) { + return $this->directory_name; + } + return $this->profile()->directory_name; + } + /** Return the main profile attached with this account if any. */ - public function profile() + public function profile($forceFetch = false) { - if (!$this->_profile_fetched) { + if (!$this->_profile_fetched || $forceFetch) { $this->_profile_fetched = true; $this->_profile = Profile::get($this); } @@ -376,34 +389,74 @@ class User extends PlUser */ private function fetchMarketingData() { - if (isset($this->last_known_email)) { + if (isset($this->pending_registration_date)) { return; } - $infos = XDB::fetchOneAssoc('SELECT IF (MAX(m.last) > p.relance, MAX(m.last), p.relance) AS last_relance, - p.email AS last_known_email - FROM register_pending AS p - LEFT JOIN register_marketing AS m ON (p.uid = m.uid) - WHERE p.uid = {?} - GROUP BY p.uid', $this->id()); - if (!$infos) { - $infos = array('last_relance' => null, 'last_known_email' => null); + $infos = XDB::fetchOneAssoc('SELECT rp.date AS pending_registration_date, rp.email AS pending_registration_email, + rm.last AS last_marketing_date, rm.email AS last_marketing_email + FROM accounts AS a + LEFT JOIN register_pending AS rp ON (rp.uid = a.uid) + LEFT JOIN register_marketing AS rm ON (rm.uid = a.uid AND rm.last != \'0000-00-00\') + WHERE a.uid = {?} + ORDER BY rm.last DESC', $this->id()); + if (is_null($infos)) { + $infos = array( + 'pending_registration_date' => null, + 'pending_registration_email' => null, + 'last_marketing_date' => null, + 'last_marketing_email' => null + ); } $this->fillFromArray($infos); } - public function lastMarketingRelance() + public function pendingRegistrationDate() { $this->fetchMarketingData(); - return $this->last_relance; + return $this->pending_registration_date; + } + + public function pendingRegistrationEmail() + { + $this->fetchMarketingData(); + return $this->pending_registration_email; + } + + public function lastMarketingDate() + { + $this->fetchMarketingData(); + return $this->last_marketing_date; + } + + public function lastMarketingEmail() + { + $this->fetchMarketingData(); + return $this->last_marketing_email; } public function lastKnownEmail() { $this->fetchMarketingData(); - return $this->last_known_email; + if ($this->pending_registration_email > $this->last_marketing_date) { + return $this->pending_registration_email; + } + return $this->last_marketing_email; } + /** Format of the emails sent by the site + */ + public function setEmailFormat($format) + { + Platal::assert($format == self::FORMAT_HTML || $format == self::FORMAT_TEXT, + "Invalid email format \"$format\""); + XDB::execute("UPDATE accounts + SET email_format = {?} + WHERE uid = {?}", + $format, $this->uid); + $this->email_format = $format; + } + /** Get watch informations */ private function fetchWatchData() @@ -462,6 +515,14 @@ class User extends PlUser return $this->watch_last; } + public function invalidWatchCache() + { + unset($this->watch_actions); + unset($this->watch_users); + unset($this->watch_last); + unset($this->watch_promos); + } + // Contacts private $contacts = null; @@ -493,6 +554,11 @@ class User extends PlUser return isset($this->contacts[$profile->id()]); } + public function isWatchedUser(Profile &$profile) + { + return in_array($profile->id(), $this->watchUsers()); + } + // Groupes X private $groups = null; public function groups() @@ -541,11 +607,15 @@ class User extends PlUser */ public function clear($clearAll = true) { - XDB::execute('DELETE FROM account_lost_passwords, register_marketing, - register_pending, register_subs, watch_nonins, - watch, watch_promo - WHERE uid = {?}', - $this->id()); + $tables = array('account_lost_passwords', 'register_marketing', + 'register_pending', 'register_subs', 'watch_nonins', + 'watch', 'watch_promo'); + + foreach ($tables as $t) { + XDB::execute('DELETE FROM ' . $t . ' + WHERE uid = {?}', + $this->id()); + } if ($clearAll) { $groupIds = XDB::iterator('SELECT asso_id @@ -567,14 +637,19 @@ class User extends PlUser } } - XDB::execute('DELETE FROM account_auth_openid, announce_read, contacts, - email_options, email_send_save, emails, - forum_innd, forum_profiles, forum_subs, - gapps_accounts, gapps_nicknames, group_announces_read, - group_members, group_member_sub_requests, reminder, requests, - requests_hidden - WHERE uid = {?}', - $this->id()); + $tables = array('account_auth_openid', 'gannounce_read', 'contacts', + 'email_options', 'gemail_send_save', 'emails', + 'forum_innd', 'gforum_profiles', 'forum_subs', + 'gapps_accounts', 'ggapps_nicknames', 'group_announces_read', + 'group_members', 'ggroup_member_sub_requests', 'reminder', 'requests', + 'requests_hidden'); + + foreach ($tables as $t) { + XDB::execute('DELETE FROM ' . $t . ' + WHERE uid = {?}', + $this->id()); + } + XDB::execute("UPDATE accounts SET registration_date = 0, state = 'pending', password = NULL, weak_password = NULL, token = NULL, is_admin = 0 @@ -601,7 +676,100 @@ class User extends PlUser } $mmlist = new MMList($this); - $mmlist->kill($alias, $clearAll); + $mmlist->kill($this->hruid, $clearAll); + } + + // Merge all infos in other user and then clean this one + public function mergeIn(User &$newuser) { + if ($this->profile()) { + // Don't disable user with profile in this way. + global $globals; + Platal::page()->trigError('Impossible de fusionner les comptes ' . $this->hruid . ' et ' . $newuser->hruid . + '. Contacte support@' . $globals->mail->domain . '.'); + return false; + } + + if ($this->forlifeEmail()) { + // If the new user is not registered and does not have already an email address, + // we need to give him the old user's email address if he has any. + if (!$newuser->perms) { + XDB::execute('UPDATE accounts + SET email = {?} + WHERE uid = {?} AND email IS NULL', + $this->forlifeEmail(), $newuser->id()); + } + $newemail = XDB::fetchOneCell('SELECT email + FROM accounts + WHERE uid = {?}', + $newuser->id()); + + // Change email used in aliases and mailing lists. + if ($this->forlifeEmail() != $newemail) { + // virtual_redirect (email aliases) + XDB::execute('DELETE v1 + FROM virtual_redirect AS v1, virtual_redirect AS v2 + WHERE v1.vid = v2.vid AND v1.redirect = {?} AND v2.redirect = {?}', + $this->forlifeEmail(), $newemail); + XDB::execute('UPDATE virtual_redirect + SET redirect = {?} + WHERE redirect = {?}', + $newemail, $this->forlifeEmail()); + + // group mailing lists + $group_domains = XDB::fetchColumn('SELECT g.mail_domain + FROM groups AS g + INNER JOIN group_members AS gm ON(g.id = gm.asso_id) + WHERE g.mail_domain != \'\' AND gm.uid = {?}', + $this->id()); + foreach ($group_domains as $mail_domain) { + $mmlist = new MMList($this, $mail_domain); + $mmlist->replace_email_in_all($this->forlifeEmail(), $newemail); + } + // main domain lists + $mmlist = new MMList($this); + $mmlist->replace_email_in_all($this->forlifeEmail(), $newemail); + } + } + + // Updates user in following tables. + foreach (array('group_announces', 'payment_transactions', 'log_sessions') as $table) { + XDB::execute('UPDATE ' . $table . ' + SET uid = {?} + WHERE uid = {?}', + $newuser->id(), $this->id()); + } + XDB::execute('UPDATE group_events + SET organisateur_uid = {?} + WHERE organisateur_uid = {?}', + $newuser->id(), $this->id()); + + // Merges user in following tables, ie updates when possible, then deletes remaining occurences of the old user. + foreach (array('group_announces_read', 'group_event_participants', 'group_member_sub_requests', 'group_members') as $table) { + XDB::execute('UPDATE IGNORE ' . $table . ' + SET uid = {?} + WHERE uid = {?}', + $newuser->id(), $this->id()); + XDB::execute('DELETE FROM ' . $table . ' + WHERE uid = {?}', + $this->id()); + } + + // Eventually updates last session id and deletes old user's accounts entry. + $lastSession = XDB::fetchOneCell('SELECT id + FROM log_sessions + WHERE uid = {?} + ORDER BY start DESC + LIMIT 1', + $newuser->id()); + XDB::execute('UPDATE log_last_sessions + SET id = {?} + WHERE uid = {?}', + $newuser->id()); + XDB::execute('DELETE FROM accounts + WHERE uid = {?}', + $this->id()); + + return true; } // Return permission flags for a given permission level. @@ -612,6 +780,11 @@ class User extends PlUser if ($is_admin) { $flags->addFlag(PERMS_ADMIN); } + + // Access to private directory implies access to 'less'-private version. + if ($flags->hasFlag('directory_private')) { + $flags->addFlag('directory_ax'); + } return $flags; } @@ -653,6 +826,35 @@ class User extends PlUser || $dom == $globals->mail->alias_dom2; } + /* Tries to find pending accounts with an hruid close to $login. */ + public static function getPendingAccounts($login, $iterator = false) + { + global $globals; + + if (strpos($login, '@') === false) { + return null; + } + + list($login, $domain) = explode('@', $login); + + if ($domain && $domain != $globals->mail->domain && $domain != $globals->mail->domain2) { + return null; + } + + $sql = "SELECT uid, full_name + FROM accounts + WHERE state = 'pending' AND REPLACE(hruid, '-', '') LIKE + CONCAT('%', REPLACE(REPLACE(REPLACE({?}, ' ', ''), '-', ''), '\'', ''), '%') + ORDER BY full_name"; + if ($iterator) { + return XDB::iterator($sql, $login); + } else { + $res = XDB::query($sql, $login); + return $res->fetchAllAssoc(); + } + } + + public static function iterOverUIDs($uids, $respect_order = true) { return new UserIterator(self::loadMainFieldsFromUIDs($uids, $respect_order)); @@ -691,7 +893,11 @@ class User extends PlUser $table = array(); if ($fetchProfile) { $profiles = Profile::iterOverUIDS($uids, true); - $profile = $profiles->next(); + if ($profiles != null) { + $profile = $profiles->next(); + } else { + $profile = null; + } } /** We iterate through the users, moving in @@ -701,7 +907,7 @@ class User extends PlUser */ while (($user = $users->next())) { if ($fetchProfile) { - if ($profile->owner_id == $user->id()) { + if ($profile != null && $profile->owner_id == $user->id()) { $user->_profile = $profile; $profile = $profiles->next(); }