X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=53ebb12429ecbce7c0cd9afcf72f23d5c5b70f02;hb=1aff3b59c0f46dafe3396c1123a252645805e233;hp=21e2002cfa4f5f3d7742b8f722ae536eebba28ab;hpb=7c8b692c4bc04cdac02c74f29a988f9f9f4ee398;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 21e2002..53ebb12 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -1,6 +1,6 @@ $this->make_hook('site', AUTH_PUBLIC), '%grp/edit' => $this->make_hook('edit', AUTH_PASSWD, 'groupadmin'), '%grp/mail' => $this->make_hook('mail', AUTH_PASSWD, 'groupadmin'), - '%grp/forum' => $this->make_hook('forum', AUTH_PASSWD, 'groupmember'), + '%grp/forum' => $this->make_hook('forum', AUTH_PASSWD, 'groupannu'), '%grp/former_users' => $this->make_hook('former_users', AUTH_PASSWD, 'admin'), '%grp/annuaire' => $this->make_hook('annuaire', AUTH_PASSWD, 'groupannu'), '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_PASSWD, 'groupmember:groupannu'), '%grp/annuaire/csv' => $this->make_hook('csv', AUTH_PASSWD, 'groupmember:groupannu'), '%grp/directory/sync' => $this->make_hook('directory_sync', AUTH_PASSWD, 'groupadmin'), '%grp/directory/unact' => $this->make_hook('non_active', AUTH_PASSWD, 'groupadmin'), + '%grp/directory/awact' => $this->make_hook('awaiting_active', AUTH_PASSWD, 'groupadmin'), '%grp/trombi' => $this->make_hook('trombi', AUTH_PASSWD, 'groupannu'), '%grp/geoloc' => $this->make_hook('geoloc', AUTH_PASSWD, 'groupannu'), '%grp/subscribe' => $this->make_hook('subscribe', AUTH_PASSWD, 'groups'), @@ -51,6 +52,7 @@ class XnetGrpModule extends PLModule '%grp/member/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_PASSWD, 'groups', NO_AUTH), '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_PASSWD, 'groupadmin'), '%grp/member/suggest' => $this->make_hook('admin_member_suggest', AUTH_PASSWD, 'groupadmin'), + '%grp/member/reg' => $this->make_hook('admin_member_reg', AUTH_PASSWD, 'groupadmin'), '%grp/rss' => $this->make_token_hook('rss', AUTH_PUBLIC), '%grp/announce/new' => $this->make_hook('edit_announce', AUTH_PASSWD, 'groupadmin'), @@ -243,6 +245,7 @@ class XnetGrpModule extends PLModule $page->assign('pub', Post::v('pub')); $page->assign('notif_unsub', Post::i('notif_unsub')); $page->assign('descr', Post::t('descr')); + $page->assign('disable_mails', Post::b('disable_mails')); $page->assign('error', $error); return; } @@ -259,7 +262,7 @@ class XnetGrpModule extends PLModule descr={?}, site={?}, mail={?}, resp={?}, forum={?}, mail_domain={?}, ax={?}, axDate = {?}, pub={?}, sub_url={?}, inscriptible={?}, unsub_url={?}, - flags = {?}, welcome_msg = {?} + flags = {?}, welcome_msg = {?}, disable_mails = {?} WHERE id={?}", Post::v('nom'), Post::v('diminutif'), Post::v('cat'), (Post::i('dom') == 0) ? null : Post::i('dom'), @@ -269,6 +272,7 @@ class XnetGrpModule extends PLModule Post::has('ax'), $axDate, Post::v('pub'), Post::v('sub_url'), Post::v('inscriptible'), Post::v('unsub_url'), $flags, Post::t('welcome_msg'), + Post::b('disable_mails'), $globals->asso('id')); if (Post::v('mail_domain')) { XDB::execute('INSERT IGNORE INTO email_virtual_domains (name) @@ -345,11 +349,15 @@ class XnetGrpModule extends PLModule $page->assign('pub', $globals->asso('pub')); $page->assign('notif_unsub', $globals->asso('notif_unsub')); $page->assign('notify_all', $globals->asso('notify_all')); + $page->assign('disable_mails', $globals->asso('disable_mails')); } function handler_mail($page) { global $globals; + if ($globals->asso('disable_mails')) { + return PL_FORBIDDEN; + } $page->changeTpl('xnetgrp/mail.tpl'); $mmlist = new MMList(S::user(), $globals->asso('mail_domain')); @@ -452,9 +460,28 @@ class XnetGrpModule extends PLModule $filename = $globals->asso('diminutif') . '.csv'; } $users = $globals->asso()->getMembersFilter(null, new UFO_Name())->getUsers(); - pl_cached_content_headers('text/x-csv', 1); - $page->changeTpl('xnetgrp/annuaire-csv.tpl', NO_SKIN); - $page->assign('users', $users); + $admin = may_update(); + pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1); + + echo utf8_decode("Nom;Prénom;Sexe;Promotion;Commentaire"); + if ($admin) { + echo utf8_decode(";Société;Poste\n"); + } else { + echo utf8_decode("\n"); + } + foreach ($users as $user) { + $line = $user->lastName() . ';' . $user->firstName() . ';' . ($user->isFemale() ? 'F' : 'M') + . ';' . $user->promo() . ';' . strtr($user->group_comm, ';', ','); + if ($admin) { + if ($user->hasProfile()) { + $line .= ';' . $user->profile()->getMainJob()->company->name . ';' . $user->profile()->getMainJob()->description; + } else { + $line .= ';;'; + } + } + echo utf8_decode($line) . "\n"; + } + exit(); } function handler_directory_sync($page) @@ -471,8 +498,8 @@ class XnetGrpModule extends PLModule $users = array_keys(Env::v('add_users')); $former_users = XDB::fetchColumn('SELECT uid FROM group_former_members - WHERE remember = TRUE AND uid IN {?}', - $users); + WHERE remember = TRUE AND asso_id = {?} AND uid IN {?}', + $globals->asso('id'), $users); $new_users = array_diff($users, $former_users); foreach ($former_users as $uid) { @@ -487,10 +514,8 @@ class XnetGrpModule extends PLModule $data = array(); foreach ($new_users as $uid) { - $data[] = XDB::format('({?}, {?})', $globals->asso('id'), $uid); + Group::subscribe($globals->asso('id'), $uid); } - XDB::rawExecute('INSERT INTO group_members (asso_id, uid) - VALUES ' . implode(',', $data)); } if (Env::has('add_nonusers')) { @@ -508,24 +533,24 @@ class XnetGrpModule extends PLModule continue; } + require_once 'name.func.inc.php'; $parts = explode('.', $local_part); if (count($parts) == 1) { - $lastname = $display_name = $full_name = $directory_name = ucfirst($local_part); + $lastname = $display_name = capitalize_name($mbox); $firstname = ''; } else { - $firstname = ucfirst($parts[0]); - $lastname = ucwords(implode(' ', array_slice($parts, 1))); - $display_name = $firstname; - $full_name = $firstname . ' ' . $lastname; - $directory_name = strtoupper($lastname) . ' ' . $firstname; + $display_name = $firstname = capitalize_name($parts[0]); + $lastname = capitalize_name(implode(' ', array_slice($parts, 1))); } - XDB::execute('INSERT INTO accounts (hruid, display_name, full_name, directory_name, firstname, lastname, email, type, state) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', - $hruid, $display_name, $full_name, $directory_name, $firstname, $lastname, $email); + $full_name = build_full_name($firstname, $lastname); + $directory_name = build_directory_name($firstname, $lastname); + $sort_name = build_sort_name($firstname, $lastname); + XDB::execute('INSERT INTO accounts (hruid, display_name, full_name, directory_name, sort_name, + firstname, lastname, email, type, state) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', + $hruid, $display_name, $full_name, $directory_name, $sort_name, $firstname, $lastname, $email); $uid = XDB::insertId(); - XDB::execute('INSERT INTO group_members (asso_id, uid) - VALUES ({?}, {?})', - $globals->asso('id'), $uid); + Group::subscribe($globals->asso('id'), $uid); } } @@ -607,8 +632,7 @@ class XnetGrpModule extends PLModule $uids_to_enable = array_intersect(array_keys(Post::v('enable_accounts')), $uids); $user = S::user(); - $group = Platal::globals()->asso('nom'); - $request = new BulkAccountsReq($user, $uids_to_enable, $group); + $request = new BulkAccountsReq($user, $uids_to_enable, $globals->asso('nom'), $globals->asso('diminutif')); $request->submit(); $page->trigSuccess('Un email va bientôt être envoyé aux personnes sélectionnées pour l\'activation de leur compte.'); @@ -623,6 +647,70 @@ class XnetGrpModule extends PLModule $page->assign('users', $users); } + private function again($uid) + { + $data = XDB::fetchOneAssoc('SELECT hash, group_name, sender_name, email + FROM register_pending_xnet + WHERE uid = {?}', + $uid); + XDB::execute('UPDATE register_pending_xnet + SET last_date = NOW() + WHERE uid = {?}', + $uid); + + $mailer = new PlMailer('xnet/account.mail.tpl'); + $mailer->addCc('validation+xnet_account@polytechnique.org'); + $mailer->setTo($data['email']); + $mailer->assign('hash', $data['hash']); + $mailer->assign('email', $data['email']); + $mailer->assign('group', $data['group_name']); + $mailer->assign('sender_name', $data['sender_name']); + $mailer->assign('again', true); + $mailer->assign('baseurl', Platal::globals()->xnet->xorg_baseurl); + $mailer->send(); + } + + function handler_awaiting_active($page) + { + global $globals; + $page->changeTpl('xnetgrp/awaiting_active.tpl'); + + XDB::execute('DELETE FROM register_pending_xnet + WHERE DATE_SUB(NOW(), INTERVAL 1 MONTH) > date'); + + $uids = XDB::fetchColumn('SELECT g.uid + FROM group_members AS g + INNER JOIN accounts AS a ON (a.uid = g.uid) + INNER JOIN register_pending_xnet AS p ON (p.uid = g.uid) + WHERE a.uid = g.uid AND g.asso_id = {?} AND a.type = \'xnet\' AND a.state = \'pending\'', + $globals->asso('id')); + + if (Post::has('again')) { + S::assert_xsrf_token(); + + $uids_to_again = array_intersect(array_keys(Post::v('again')), $uids); + foreach ($uids_to_again as $uid) { + $this->again($uid); + } + $page->trigSuccess('Relances effectuées avec succès.'); + } + + if ($uids) { + $registration_date = XDB::fetchAllAssoc('uid', 'SELECT uid, date + FROM register_pending_xnet + WHERE uid IN {?}', $uids); + $last_date = XDB::fetchAllAssoc('uid', 'SELECT uid, last_date + FROM register_pending_xnet + WHERE uid IN {?}', $uids); + + $users = User::getBulkUsersWithUIDs($uids); + $page->assign('users', $users); + $page->assign('registration_date', $registration_date); + $page->assign('last_date', $last_date); + } + + } + private function removeSubscriptionRequest($uid) { global $globals; @@ -637,7 +725,7 @@ class XnetGrpModule extends PLModule $this->removeSubscriptionRequest($user->id()); Group::subscribe($globals->asso('id'), $user->id()); - if (XDB::affectedRows() == 1) { + if (XDB::affectedRows() == 1 && $user->forlifeEmail()) { $mailer = new PlMailer(); $mailer->addTo($user->forlifeEmail()); $mailer->setFrom('"' . S::user()->fullName() . '" <' . S::user()->forlifeEmail() . '>'); @@ -700,12 +788,14 @@ class XnetGrpModule extends PLModule S::assert_xsrf_token(); $this->removeSubscriptionRequest($user->id()); - $mailer = new PlMailer(); - $mailer->addTo($user->forlifeEmail()); - $mailer->setFrom('"' . S::user()->fullName() . '" <' . S::user()->forlifeEmail() . '>'); - $mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription annulée'); - $mailer->setTxtBody(Env::v('motif')); - $mailer->send(); + if ($user->forlifeEmail()) { + $mailer = new PlMailer(); + $mailer->addTo($user->forlifeEmail()); + $mailer->setFrom('"' . S::user()->fullName() . '" <' . S::user()->forlifeEmail() . '>'); + $mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription annulée'); + $mailer->setTxtBody(Env::v('motif')); + $mailer->send(); + } $page->killSuccess("La demande de {$user->fullName()} a bien été refusée."); } else { $page->assign('show_form', true); @@ -737,12 +827,15 @@ class XnetGrpModule extends PLModule XDB::execute('DELETE FROM group_former_members WHERE uid = {?} AND asso_id = {?}', S::i('uid'), $globals->asso('id')); - $uf = New UserFilter(New UFC_Group($globals->asso('id'), true)); - $admins = $uf->iterUsers(); + $admins = $globals->asso()->iterToNotify(); $admin = $admins->next(); - $to = $admin->bestEmail(); - while ($admin = $admins->next()) { - $to .= ', ' . $admin->bestEmail(); + if (!is_null($admin)) { + $to = $admin->bestEmail(); + while ($admin = $admins->next()) { + $to .= ', ' . $admin->bestEmail(); + } + } else { + $to = ''; } $append = "\n" @@ -827,7 +920,11 @@ class XnetGrpModule extends PLModule break; } } - http_redirect($_SERVER['HTTP_REFERER']); + if (!empty($_SERVER['HTTP_REFERER'])) { + http_redirect($_SERVER['HTTP_REFERER']); + } else { + pl_redirect(''); + } } function handler_admin_annuaire($page) @@ -875,6 +972,7 @@ class XnetGrpModule extends PLModule global $globals; $page->changeTpl('xnetgrp/membres-add.tpl'); + $page->addJsLink('xnet_members.js'); if (is_null($email)) { return; @@ -903,22 +1001,26 @@ class XnetGrpModule extends PLModule XDB::query('UPDATE accounts SET email = {?} WHERE uid = {?} AND email IS NULL', - Post::t('email'), $user->id()); + $email, $user->id()); // Add email for marketing if required. - if (Env::v('market')) { + if (Env::v('marketing')) { $market = Marketing::get($user->uid, $email); if (!$market) { $market = new Marketing($user->uid, $email, 'group', $globals->asso('nom'), - Env::v('market_from'), S::v('uid')); + Env::v('marketing_from'), S::v('uid')); $market->add(); } } + } elseif (Env::v('broken')) { + // Add email for broken if required. + $valid = new BrokenReq(S::user(), $user, $email, 'Groupe : ' . $globals->asso('nom')); + $valid->submit(); } } else { $user = User::getSilent($email); // Wrong email and no user: failure. - if (is_null($user) && !$is_valid_email) { + if (is_null($user) && (!$is_valid_email || !User::isForeignEmailAddress($email))) { $page->trigError('« ' . $email . ' Â» n\'est pas une adresse email valide.'); return; } @@ -941,20 +1043,22 @@ class XnetGrpModule extends PLModule // If the user has no account yet, creates new account: build names from email address. if (empty($user)) { + require_once 'name.func.inc.php'; $parts = explode('.', $mbox); if (count($parts) == 1) { - $lastname = $display_name = $full_name = $directory_name = ucfirst($mbox); + $lastname = $display_name = capitalize_name($mbox); $firstname = ''; } else { - $firstname = ucfirst($parts[0]); - $lastname = ucwords(implode(' ', array_slice($parts, 1))); - $display_name = $firstname; - $full_name = "$firstname $lastname"; - $directory_name = strtoupper($lastname) . " " . $firstname; + $display_name = $firstname = capitalize_name($parts[0]); + $lastname = capitalize_name(implode(' ', array_slice($parts, 1))); } - XDB::execute('INSERT INTO accounts (hruid, display_name, full_name, directory_name, firstname, lastname, email, type, state) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', - $hruid, $display_name, $full_name, $directory_name, $firstname, $lastname, $email); + $full_name = build_full_name($firstname, $lastname); + $directory_name = build_directory_name($firstname, $lastname); + $sort_name = build_sort_name($firstname, $lastname); + XDB::execute('INSERT INTO accounts (hruid, display_name, full_name, directory_name, sort_name, + firstname, lastname, email, type, state) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', + $hruid, $display_name, $full_name, $directory_name, $sort_name, $firstname, $lastname, $email); $user = User::getSilent($hruid); } @@ -981,6 +1085,28 @@ class XnetGrpModule extends PLModule Group::subscribe($globals->asso('id'), $user->id()); $this->removeSubscriptionRequest($user->id()); + if ($user->isActive() && $user->bestEmail()) { + $mailer = new PlMailer('xnetgrp/forced-subscription.mail.tpl'); + $mailer->addTo($user->bestEmail()); + $mailer->assign('group', $globals->asso('nom')); + $mailer->assign('anim', S::user()->fullname()); + $mailer->assign('diminutif', $globals->asso('diminutif')); + $mailer->send(); + } + + // Check if the group has more than 1000 members, if so, disable the "send mail" function. + $full_count = XDB::fetchOneCell('SELECT COUNT(*) + FROM group_members + WHERE asso_id = {?}', + $globals->asso('id')); + if ($full_count > 999) { + XDB::execute( + "UPDATE groups + SET disable_mails = 1 + WHERE id = {?}", + $globals->asso('id')); + } + if ($suggest_account_activation) { pl_redirect('member/suggest/' . $user->login() . '/' . $email . '/' . $globals->asso('nom')); } else { @@ -1019,11 +1145,13 @@ class XnetGrpModule extends PLModule if (Post::has('suggest')) { if (Post::t('suggest') == 'yes') { + global $globals; + $user = S::user(); - $request = new AccountReq($user, $hruid, $email, Platal::globals()->asso('nom')); + $request = new AccountReq($user, $hruid, $email, $globals->asso('nom'), $globals->asso('diminutif')); $request->submit(); $page->trigSuccessRedirect('Un email va bien être envoyé à ' . $email . ' pour l\'activation de son compte.', - Platal::globals()->asso('diminutif') . '/member/' . $hruid); + $globals->asso('diminutif') . '/member/' . $hruid); } else { pl_redirect('member/' . $hruid); } @@ -1032,20 +1160,34 @@ class XnetGrpModule extends PLModule $page->assign('hruid', $hruid); } + function handler_admin_member_reg($page, $uid) + { + pl_content_headers('text/plain'); + + $user = User::getSilentWithUID($uid); + if ($user && $user->state != 'pending' && $user->hasProfile()) { + echo true; + } + echo false; + exit(); + } + function handler_admin_member_new_ajax($page) { pl_content_headers("text/html"); $page->changeTpl('xnetgrp/membres-new-search.tpl', NO_SKIN); $users = array(); + $same_email = false; if (Env::has('login')) { $user = User::getSilent(Env::t('login')); if ($user && $user->state != 'pending') { - $users = array($user); + $users = array($user->id() => $user); + $same_email = true; } } if (empty($users)) { list($lastname, $firstname) = str_replace(array('-', ' ', "'"), '%', array(Env::t('nom'), Env::t('prenom'))); - $cond = new PFC_And(new PFC_Not(new UFC_Registered())); + $cond = new PFC_And(); if (!empty($lastname)) { $cond->addChild(new UFC_NameTokens($lastname, array(), false, false, Profile::LASTNAME)); } @@ -1062,7 +1204,9 @@ class XnetGrpModule extends PLModule $users = array(); } } + $page->assign('users', $users); + $page->assign('same_email', $same_email); } function unsubscribe(PlUser $user, $remember = false) @@ -1072,7 +1216,7 @@ class XnetGrpModule extends PLModule if ($globals->asso('notif_unsub')) { $mailer = new PlMailer('xnetgrp/unsubscription-notif.mail.tpl'); - $admins = $globals->asso()->iterAdmins(); + $admins = $globals->asso()->iterToNotify(); while ($admin = $admins->next()) { $mailer->addTo($admin); } @@ -1082,6 +1226,11 @@ class XnetGrpModule extends PLModule $mailer->send(); } + $nl = Newsletter::forGroup($globals->asso('shortname')); + if (!is_null($nl)) { + $nl->unsubscribe(null, S::i('uid')); + } + $domain = $globals->asso('mail_domain'); if (!$domain) { return true; @@ -1185,7 +1334,7 @@ class XnetGrpModule extends PLModule } } - private function changeLogin(PlPage $page, PlUser $user, $login) + private function changeLogin(PlPage $page, PlUser $user, $login, $req_broken = false, $req_marketing = false, $marketing_from = 'user') { // Search the user's uid. $xuser = User::getSilent($login); @@ -1205,6 +1354,19 @@ class XnetGrpModule extends PLModule return false; } + // Market or suggest new redirection if required. + $email = $user->bestEmail(); + if ($req_broken) { + $valid = new BrokenReq(S::user(), $xuser, $email, 'Groupe : ' . Platal::globals()->asso('nom')); + $valid->submit(); + } elseif ($req_marketing) { + $market = Marketing::get($xuser->uid, $email); + if (!$market) { + $market = new Marketing($xuser->uid, $email, 'group', Platal::globals()->asso('nom'), $marketing_from, S::i('uid')); + $market->add(); + } + } + if ($user->mergeIn($xuser)) { return $xuser->login(); } @@ -1225,16 +1387,18 @@ class XnetGrpModule extends PLModule } $page->changeTpl('xnetgrp/membres-edit.tpl'); + $page->addJsLink('xnet_members.js'); $mmlist = new MMList(S::user(), $globals->asso('mail_domain')); if (Post::has('change')) { - require_once 'emails.inc.php'; S::assert_xsrf_token(); + require_once 'emails.inc.php'; + require_once 'name.func.inc.php'; // Convert user status to X - if (!Post::blank('login_X')) { - $forlife = $this->changeLogin($page, $user, Post::t('login_X')); + if (!Post::blank('x')) { + $forlife = $this->changeLogin($page, $user, Post::i('userid'), Post::b('broken'), Post::b('marketing'), Post::v('marketing_from')); if ($forlife) { pl_redirect('member/' . $forlife); } @@ -1242,35 +1406,38 @@ class XnetGrpModule extends PLModule // Update user info if ($user->type == 'virtual' || ($user->type == 'xnet' && !$user->perms)) { - $lastname = Post::s('lastname'); + $lastname = capitalize_name(Post::t('lastname')); if (Post::s('type') != 'virtual') { - $firstname = Post::s('firstname'); - $full_name = $firstname . ' ' . $lastname; - $directory_name = mb_strtoupper($lastname) . ' ' . $firstname; + $firstname = capitalize_name(Post::t('firstname')); } else { $firstname = ''; - $full_name = $lastname; - $directory_name = mb_strtoupper($lastname); } + $full_name = build_full_name($firstname, $lastname); + $directory_name = build_directory_name($firstname, $lastname); + $sort_name = build_sort_name($firstname, $lastname); XDB::query('UPDATE accounts - SET full_name = {?}, directory_name = {?}, display_name = {?}, + SET full_name = {?}, directory_name = {?}, sort_name = {?}, display_name = {?}, firstname = {?}, lastname = {?}, sex = {?}, type = {?} WHERE uid = {?}', - $full_name, $directory_name, Post::t('display_name'), $firstname, $lastname, + $full_name, $directory_name, $sort_name, Post::t('display_name'), $firstname, $lastname, (Post::t('sex') == 'male') ? 'male' : 'female', (Post::t('type') == 'xnet') ? 'xnet' : 'virtual', $user->id()); } // Updates email. $new_email = strtolower(Post::t('email')); - if (!$user->perms && require_email_update($user, $new_email)) { + if (($user->type == 'virtual' || ($user->type == 'xnet' && !$user->perms)) + && require_email_update($user, $new_email)) { XDB::query('UPDATE accounts SET email = {?} WHERE uid = {?}', $new_email, $user->id()); - $listClient = new MMList(S::user()); - $listClient->change_user_email($user->forlifeEmail(), $new_email); - update_alias_user($user->forlifeEmail(), $new_email); + if ($user->forlifeEmail()) { + $listClient = new MMList(S::user()); + $listClient->change_user_email($user->forlifeEmail(), $new_email); + update_alias_user($user->forlifeEmail(), $new_email); + } + $user = User::getWithUID($user->id()); } if (XDB::affectedRows()) { $page->trigSuccess('Données de l\'utilisateur mises à jour.'); @@ -1278,25 +1445,12 @@ class XnetGrpModule extends PLModule if (($user->type == 'xnet' && !$user->perms)) { if (Post::b('suggest')) { - $request = new AccountReq(S::user(), $user->hruid, Post::t('email'), $globals->asso('nom')); + $request = new AccountReq(S::user(), $user->hruid, Post::t('email'), $globals->asso('nom'), $globals->asso('diminutif')); $request->submit(); $page->trigSuccess('Le compte va bientôt être activé.'); } if (Post::b('again')) { - $data = XDB::fetchOneAssoc('SELECT hash, group_name, sender_name, email - FROM register_pending_xnet - WHERE uid = {?}', - $user->id()); - - $mailer = new PlMailer('xnet/account.mail.tpl'); - $mailer->addCc('validation+xnet_account@polytechnique.org'); - $mailer->setTo($data['email']); - $mailer->assign('hash', $data['hash']); - $mailer->assign('email', $data['email']); - $mailer->assign('group', $data['group_name']); - $mailer->assign('sender_name', $data['sender_name']); - $mailer->assign('again', true); - $mailer->send(); + $this->again($user->id()); $page->trigSuccess('Relance effectuée avec succès.'); } } @@ -1634,5 +1788,5 @@ class XnetGrpModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>