X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuser.php;h=c265bf0ce27a0a1ebc7e30c4b7048578670dfe0d;hb=c76545c351fae4e2298624ff9ee5bf854dc5a5b6;hp=32c3aa132f6601cfd3a22b17a9deaecbb518a850;hpb=2ab3486b89b57e612d6f412afa97f7442a0e2ac0;p=platal.git diff --git a/classes/user.php b/classes/user.php index 32c3aa1..c265bf0 100644 --- a/classes/user.php +++ b/classes/user.php @@ -21,6 +21,15 @@ class User extends PlUser { + const PERM_GROUPS = 'groups'; + const PERM_MAIL = 'mail'; + const PERM_DIRECTORY_AX = 'directory_ax'; + const PERM_DIRECTORY_PRIVATE = 'directory_private'; + const PERM_EDIT_DIRECTORY = 'edit_directory'; + const PERM_FORUMS = 'forums'; + const PERM_LISTS = 'lists'; + const PERM_PAYMENT = 'payment'; + private $_profile_fetched = false; private $_profile = null; @@ -37,7 +46,7 @@ class User extends PlUser } if ($login instanceof User) { - $machin->id(); + return $login->id(); } if ($login instanceof Profile) { @@ -179,13 +188,13 @@ 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, - IF (af.alias IS NULL, a.email, CONCAT(af.alias, \'@' . $globals->mail->domain . '\')) AS forlife, - CONCAT(af.alias, \'@' . $globals->mail->domain2 . '\') AS forlife_alternate, - IF (ab.alias IS NULL, a.email, CONCAT(ab.alias, \'@' . $globals->mail->domain . '\')) AS bestalias, - CONCAT(ab.alias, \'@' . $globals->mail->domain2 . '\') AS bestalias_alternate, - a.full_name, a.directory_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, g.g_account_name IS NOT NULL AS googleapps, a.token IS NOT NULL AS token_access, a.token, a.last_version, @@ -322,8 +331,9 @@ class User extends PlUser */ public function canEdit(Profile $profile) { - // XXX: Check permissions (e.g. secretary permission) - // and flags from the profile + if ($this->checkPerms(User::PERM_EDIT_DIRECTORY)) { + return true; + } return XDB::fetchOneCell('SELECT pid FROM account_profiles WHERE uid = {?} AND pid = {?}', @@ -618,13 +628,15 @@ class User extends PlUser } if ($clearAll) { + global $globals; + $groupIds = XDB::iterator('SELECT asso_id FROM group_members WHERE uid = {?}', $this->id()); while ($groupId = $groupIds->next()) { $group = Group::get($groupId); - if ($group->notif_unsub) { + if (!empty($group) && $group->notif_unsub) { $mailer = new PlMailer('xnetgrp/unsubscription-notif.mail.tpl'); $admins = $group->iterAdmins(); while ($admin = $admins->next()) { @@ -637,17 +649,22 @@ class User extends PlUser } } - $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', + $tables = array('account_auth_openid', 'announce_read', 'contacts', + 'email_options', 'email_send_save', 'emails', + 'forum_innd', 'forum_profiles', 'forum_subs', + 'group_announces_read', 'group_members', + 'group_member_sub_requests', 'reminder', 'requests', 'requests_hidden'); - foreach ($tables as $t) { XDB::execute('DELETE FROM ' . $t . ' WHERE uid = {?}', - $this->id()); + $this->id()); + } + + foreach (array('gapps_accounts', 'gapps_nicknames') as $t) { + XDB::execute('DELETE FROM ' . $t . ' + WHERE l_userid = {?}', + $this->id()); } XDB::execute("UPDATE accounts @@ -668,74 +685,102 @@ class User extends PlUser if ($globals->mailstorage->googleapps_domain) { require_once 'googleapps.inc.php'; - if (GoogleAppsAccount::account_status($uid)) { - $account = new GoogleAppsAccount($user); + if (GoogleAppsAccount::account_status($this->id())) { + $account = new GoogleAppsAccount($this); $account->suspend(); } } } $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() || !$newuser->id()) { - // don't disable user with profile in this way + 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; } - // TODO check all tables to see if there is no other info to use - $newemail = $newuser->forlifeEmail(); - if (!$newemail && $this->forlifeEmail()) { - XDB::execute("UPDATE accounts - SET email = {?} - WHERE uid = {?} AND email IS NULL", - $this->forlifeEmail(), $newuser->id()); - $newemail = $this->forlifeEmail(); - } - - // change email used in aliases and mailing lists - if ($this->forlifeEmail() != $newemail && $this->forlifeEmail()) { - // 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()); - - // require_once 'mmlist.php'; - - // 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(), $newmail); + 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()); } - // main domain lists - $mmlist = new MMList($this); - $mmlist->replace_email_in_all($this->forlifeEmail(), $newmail); - } - - // group_members (xnet group membership) - XDB::execute("DELETE g1 - FROM group_members AS g1, group_members AS g2 - WHERE g1.uid = {?} AND g2.uid = {?} AND g1.asso_id = g2.asso_id", - $this->id(), $newuser->id()); - XDB::execute("UPDATE group_members - SET uid = {?} - WHERE uid = {?}", - $this->id(), $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', 'group_events') as $table) { + XDB::execute('UPDATE ' . $table . ' + SET uid = {?} + WHERE 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()); + } - XDB::execute("DELETE FROM accounts 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; } @@ -748,6 +793,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; }