X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnet.php;h=ae6edc4aee078faff0560e0b77c7259ca980251c;hb=d4cb8f1fea2a6f2cc2bc0411f94c12195d2c99b2;hp=1f6dbf946f526dc456fb3b69976c9f3689b3cdcb;hpb=25b261b1e0c8745d1f134f1a082e428ab50bd811;p=platal.git diff --git a/modules/xnet.php b/modules/xnet.php index 1f6dbf9..ae6edc4 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_PASSWD, 'admin'), + 'groups' => $this->make_hook('groups', AUTH_PUBLIC), + 'groupes.php' => $this->make_hook('groups2', AUTH_PUBLIC), + 'plan' => $this->make_hook('plan', AUTH_PUBLIC), + // Should be removed in a future release as links will have expired anyway. + 'register/ext' => $this->make_hook('register_ext', AUTH_PUBLIC), + 'photo' => $this->make_hook('photo', AUTH_PASSWD, 'groups'), + 'autologin' => $this->make_hook('autologin', AUTH_PASSWD, 'groups'), + 'edit' => $this->make_hook('edit', AUTH_PASSWD, 'groups'), + '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 +53,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 +83,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 +134,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 +175,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); @@ -212,7 +216,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 +226,7 @@ class XnetModule extends PLModule exit; } - function handler_edit(&$page) + function handler_edit($page) { global $globals; @@ -238,13 +242,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 +251,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 +276,11 @@ class XnetModule extends PLModule $page->addJsLink('password.js'); $page->assign('user', $user); } + + function handler_register_ext($page, $hash = null) + { + http_redirect(Platal::globals()->xnet->xorg_baseurl . 'register/ext/' . $hash); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: