X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnet.php;h=bd95e38e4f41c2e56f2f3f4ffe87543da00276d1;hb=911075226546c6b058eca1e0b889097f79fa6232;hp=eac7a2e7bc5c3790f1615ce4014234616c385eb7;hpb=9a7f3d8ec9c2a69584f2bb5cb0c50154f1cbb704;p=platal.git diff --git a/modules/xnet.php b/modules/xnet.php index eac7a2e..bd95e38 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -1,6 +1,6 @@ $this->make_hook('index', AUTH_PUBLIC), - 'exit' => $this->make_hook('exit', AUTH_PUBLIC), - - 'admin' => $this->make_hook('admin', AUTH_MDP, 'admin'), - 'groups' => $this->make_hook('groups', AUTH_PUBLIC), - 'groupes.php' => $this->make_hook('groups2', AUTH_PUBLIC), - 'plan' => $this->make_hook('plan', AUTH_PUBLIC), - 'photo' => $this->make_hook('photo', AUTH_MDP), - 'autologin' => $this->make_hook('autologin', AUTH_MDP), - 'edit' => $this->make_hook('edit', AUTH_MDP, 'user'), - - 'Xnet' => $this->make_wiki_hook(), + 'index' => $this->make_hook('index', AUTH_PUBLIC), + 'exit' => $this->make_hook('exit', AUTH_PUBLIC), + + 'admin' => $this->make_hook('admin', AUTH_MDP, 'admin'), + 'groups' => $this->make_hook('groups', AUTH_PUBLIC), + 'groupes.php' => $this->make_hook('groups2', AUTH_PUBLIC), + 'plan' => $this->make_hook('plan', AUTH_PUBLIC), + 'photo' => $this->make_hook('photo', AUTH_MDP), + 'autologin' => $this->make_hook('autologin', AUTH_MDP), + 'login/ext' => $this->make_hook('login_ext', AUTH_PUBLIC), + 'register/ext' => $this->make_hook('register_ext', AUTH_PUBLIC), + 'recovery/ext' => $this->make_hook('recovery_ext', AUTH_PUBLIC), + 'tmpPWD/ext' => $this->make_hook('tmpPWD_ext', AUTH_PUBLIC), + 'edit' => $this->make_hook('edit', AUTH_MDP, 'user'), + 'password' => $this->make_hook('password', AUTH_MDP, 'user'), + + 'Xnet' => $this->make_wiki_hook(), ); } - function handler_photo(&$page, $x = null) + function handler_photo($page, $x = null) { if (!$x || !($profile = Profile::get($x))) { return PL_NOT_FOUND; @@ -52,20 +57,20 @@ class XnetModule extends PLModule $photo->send(); } - function handler_index(&$page) + function handler_index($page) { $page->nomenu = true; $page->changeTpl('xnet/index.tpl'); } - function handler_exit(&$page) + function handler_exit($page) { Platal::session()->stopSUID(); Platal::session()->destroy(); $page->changeTpl('xnet/deconnexion.tpl'); } - function handler_admin(&$page) + function handler_admin($page) { $page->changeTpl('xnet/admin.tpl'); @@ -82,10 +87,13 @@ class XnetModule extends PLModule $page->trigSuccess('membres supprimés'); if ($domain) { - XDB::query('DELETE FROM virtual_domains WHERE domain={?}', $domain); - XDB::query('DELETE FROM virtual, virtual_redirect - USING virtual INNER JOIN virtual_redirect USING (vid) - WHERE alias LIKE {?}', '%@'.$domain); + XDB::execute('DELETE v + FROM email_virtual AS v + INNER JOIN email_virtual_domains AS d ON (v.domain = d.id) + WHERE d.name = {?}', + $domain); + XDB::execute('DELETE FROM email_virtual_domains + WHERE name = {?}', $domain); $page->trigSuccess('suppression des alias mails'); $mmlist = new MMList(S::v('uid'), S::v('password'), $domain); @@ -130,7 +138,7 @@ class XnetModule extends PLModule $page->assign('assos', $res->fetchAllAssoc()); } - function handler_plan(&$page) + function handler_plan($page) { $page->changeTpl('xnet/plan.tpl'); @@ -171,15 +179,15 @@ class XnetModule extends PLModule $page->assign('inst', $res); } - function handler_groups2(&$page) + function handler_groups2($page) { - $this->handler_groups(&$page, Get::v('cat'), Get::v('dom')); + $this->handler_groups($page, Get::v('cat'), Get::v('dom')); } - function handler_groups(&$page, $cat = null, $dom = null) + function handler_groups($page, $cat = null, $dom = null) { if (!$cat) { - $this->handler_index(&$page); + $this->handler_index($page); } $cat = mb_strtolower($cat); @@ -188,7 +196,7 @@ class XnetModule extends PLModule $page->assign('cat', $cat); $page->assign('dom', $dom); - $res = XDB::query("SELECT id,nom + $res = XDB::query("SELECT id,nom FROM group_dom WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat); @@ -212,7 +220,7 @@ class XnetModule extends PLModule $page->setType($cat); } - function handler_autologin(&$page) + function handler_autologin($page) { $allkeys = func_get_args(); unset($allkeys[0]); @@ -222,7 +230,147 @@ class XnetModule extends PLModule exit; } - function handler_edit(&$page) + function handler_login_ext($page) + { + if (!S::logged()) { + $page->changeTpl('xnet/login.tpl'); + } else { + pl_redirect(''); + } + } + + function handler_register_ext($page, $hash = null) + { + XDB::execute('DELETE FROM register_pending_xnet + WHERE DATE_SUB(NOW(), INTERVAL 1 MONTH) > date'); + $res = XDB::fetchOneAssoc('SELECT uid, hruid + FROM register_pending_xnet + WHERE hash = {?}', + $hash); + + if (is_null($hash) || is_null($res)) { + $page->trigErrorRedirect('Cette adresse n\'existe pas ou n\'existe plus sur le serveur.', ''); + } + + if (Post::has('pwhash') && Post::t('pwhash')) { + XDB::query('UPDATE accounts + SET password = {?}, state = \'active\' + WHERE uid = {?} AND state = \'pending\' AND type = \'xnet\'', + Post::t('pwhash'), $res['uid']); + XDB::query('DELETE FROM register_pending_xnet + WHERE uid = {?}', + $res['uid']); + + S::logger($res['uid'])->log('passwd', ''); + + // Try to start a session (so the user don't have to log in); we will use + // the password available in Post:: to authenticate the user. + Post::kill('wait'); + Platal::session()->startAvailableAuth(); + + $page->changeTpl('xnet/register.success.tpl'); + $page->assign('hruid', $res['hruid']); + } else { + $page->changeTpl('platal/password.tpl'); + $page->assign('xnet', true); + $page->assign('hruid', $res['hruid']); + $page->assign('do_auth', 1); + } + } + + function handler_recovery_ext($page) + { + $page->changeTpl('xnet/recovery.tpl'); + + if (!Post::has('login')) { + return; + } + + $user = User::getSilent(Post::t('login')); + if (is_null($user)) { + $page->trigError('Le compte n\'existe pas.'); + return; + } + if ($user->state != 'active') { + $page->trigError('Ton compte n\'est pas activé.'); + return; + } + + $page->assign('ok', true); + + $hash = rand_url_id(); + XDB::execute('INSERT INTO account_xnet_lost_passwords (uid, date, hash) + VALUES ({?}, NOW(), {?})', + $user->id(), $hash); + + $mymail = new PlMailer(); + $mymail->setFrom('"Gestion des mots de passe" mail->domain . '>'); + $mymail->addTo($user); + $mymail->setSubject("Votre certificat d'authentification"); + $mymail->setTxtBody("Visitez la page suivante qui expire dans six heures : +http://polytechnique.net/tmpPWD/ext/$hash + +Si en cliquant dessus vous n'y arrivez pas, copiez intégralement l'adresse dans la barre de votre navigateur. Si vous n'avez pas utilisé ce lien dans six heures, vous pouvez tout simplement recommencer cette procédure. + +-- +Polytechnique.org +\"Le portail des élèves & anciens élèves de l'École polytechnique\" + +Email envoyé à " . Post::t('login')); + $mymail->send(); + + S::logger($user->id())->log('recovery', $user->bestEmail()); + } + + function handler_tmpPWD_ext($page, $hash = null) + { + global $globals; + XDB::execute('DELETE FROM account_xnet_lost_passwords + WHERE DATE_SUB(NOW(), INTERVAL 380 MINUTE) > date'); + + $uid = XDB::fetchOneCell('SELECT uid + FROM account_xnet_lost_passwords + WHERE hash = {?}', + $hash); + if (is_null($uid)) { + $page->trigErrorRedirect("Cette adresse n'existe pas ou n'existe plus sur le serveur.", ''); + } + + $hruid = XDB::fetchOneCell('SELECT hruid + FROM accounts + WHERE uid = {?}', + $uid); + + if (Post::has('pwhash') && Post::t('pwhash')) { + $password = Post::t('pwhash'); + XDB::query('UPDATE accounts + SET password = {?} + WHERE uid = {?} AND state = \'active\'', + $password, $uid); + XDB::query('DELETE FROM account_xnet_lost_passwords + WHERE hash = {?}', + $hash); + + S::logger($uid)->log('passwd', ''); + + // Try to start a session (so the user don't have to log in); we will use + // the password available in Post:: to authenticate the user. + Post::kill('wait'); + Platal::session()->startAvailableAuth(); + + $page->changeTpl('xnet/register.success.tpl'); + $page->assign('hruid', $hruid); + } else { + $page->changeTpl('platal/password.tpl'); + $page->assign('xnet_reset', true); + $page->assign('hruid', $hruid); + $page->assign('do_auth', 1); + } + } + + + + function handler_edit($page) { global $globals; @@ -238,13 +386,6 @@ class XnetModule extends PLModule if (Post::has('change')) { S::assert_xsrf_token(); - if ($user->groupCount() == 0 && Post::t('delete') == 'OUI') { - XDB::execute('DELETE FROM accounts - WHERE uid = {?}', - $user->id()); - pl_redirect('index'); - } - // Convert user status to X if (!Post::blank('login_X')) { $forlife = $this->changeLogin($page, $user, Post::t('login_X')); @@ -254,20 +395,24 @@ class XnetModule extends PLModule } // Update user info + $full_name = Post::t('firstname') . ' ' . Post::t('lastname'); + $directory_name = mb_strtoupper(Post::t('lastname')) . ' ' . Post::t('firstname'); XDB::query('UPDATE accounts SET full_name = {?}, directory_name = {?}, display_name = {?}, - sex = {?}, email = {?} + firstname = {?}, lastname = {?}, sex = {?}, email = {?} WHERE uid = {?}', - Post::t('full_name'), Post::t('directory_name'), Post::t('display_name'), + $full_name, $directory_name, Post::t('display_name'), + Post::t('firstname'), Post::t('lastname'), (Post::t('sex') == 'male') ? 'male' : 'female', Post::t('email'), $user->id()); - // If user is of type xnet and new password is given. - if (!Post::blank('pwhash')) { - XDB::query('UPDATE accounts - SET password = {?} - WHERE uid = {?}', - Post::t('pwhash'), $user->id()); - } if (XDB::affectedRows()) { + require_once 'emails.inc.php'; + if (require_email_update($user, Post::t('email'))) { + $listClient = new MMList(S::user()); + $listClient->change_user_email($user->forlifeEmail(), Post::t('email')); + update_alias_user($user->forlifeEmail(), Post::t('email')); + } + $user = User::getWithUID($user->id()); + S::set('user', $user); $page->trigSuccess('Données mises à jour.'); } } @@ -275,6 +420,27 @@ class XnetModule extends PLModule $page->addJsLink('password.js'); $page->assign('user', $user); } + + function handler_password ($page) + { + if (Post::has('pwhash') && Post::t('pwhash')) { + S::assert_xsrf_token(); + + S::set('password', $password = Post::t('pwhash')); + XDB::execute('UPDATE accounts + SET password = {?} + WHERE uid={?}', $password, + S::i('uid')); + S::logger()->log('passwd'); + Platal::session()->setAccessCookie(true); + $page->changeTpl('platal/password.success.tpl'); + $page->run(); + } + + $page->changeTpl('platal/password.tpl'); + $page->assign('xnet_reset', true); + $page->assign('do_auth', 0); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: