X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnet.php;h=ae6edc4aee078faff0560e0b77c7259ca980251c;hb=d4cb8f1fea2a6f2cc2bc0411f94c12195d2c99b2;hp=2c048356d4220fc7673fe24fe2382783a310fab8;hpb=3af5a31e4e6d5655fa43b218dc3c8ba15c53592e;p=platal.git diff --git a/modules/xnet.php b/modules/xnet.php index 2c04835..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), + '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 (is_null($x)) { + if (!$x || !($profile = Profile::get($x))) { return PL_NOT_FOUND; } - $res = XDB::query("SELECT attachmime, attach - FROM aliases - INNER JOIN photo ON(id = uid) - WHERE alias = {?}", $x); - - if ((list($type, $data) = $res->fetchOneRow())) { - Header("Content-type: image/$type"); - echo $data; - } else { - Header('Content-type: image/png'); - echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png'); - } - exit; + // Retrieve the photo and its mime type. + $photo = $profile->getPhoto(true, true); + + // Display the photo, or a default one when not available. + $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'); if (Get::has('del')) { $res = XDB::query('SELECT id, nom, mail_domain - FROM groupex.asso WHERE diminutif={?}', + FROM groups WHERE diminutif={?}', Get::v('del')); list($id, $nom, $domain) = $res->fetchOneRow(); $page->assign('nom', $nom); if ($id && Post::has('del')) { S::assert_xsrf_token(); - XDB::query('DELETE FROM groupex.membres WHERE asso_id={?}', $id); + XDB::query('DELETE FROM group_members WHERE asso_id={?}', $id); $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); @@ -102,7 +101,7 @@ class XnetModule extends PLModule } } - XDB::query('DELETE FROM groupex.asso WHERE id={?}', $id); + XDB::query('DELETE FROM groups WHERE id={?}', $id); $page->trigSuccess("Groupe $nom supprimé"); Get::kill('del'); } @@ -111,118 +110,177 @@ class XnetModule extends PLModule } } - if (Post::has('diminutif')) { + if (Post::has('diminutif') && Post::v('diminutif') != "") { S::assert_xsrf_token(); $res = XDB::query('SELECT COUNT(*) - FROM groupex.asso + FROM groups WHERE diminutif = {?}', Post::v('diminutif')); if ($res->fetchOneCell() == 0) { - XDB::execute('INSERT INTO groupex.asso (id, diminutif) + XDB::execute('INSERT INTO groups (id, diminutif) VALUES (NULL, {?})', Post::v('diminutif')); - pl_redirect('../' . Post::v('diminutif') . '/edit'); + pl_redirect(Post::v('diminutif') . '/edit'); } else { $page->trigError('Le diminutif demandé est déjà pris.'); } } $res = XDB::query('SELECT nom, diminutif - FROM groupex.asso + FROM groups ORDER BY nom'); $page->assign('assos', $res->fetchAllAssoc()); } - function handler_plan(&$page) + function handler_plan($page) { $page->changeTpl('xnet/plan.tpl'); $page->setType('plan'); $res = XDB::iterator( - 'SELECT dom.id, dom.nom as domnom, asso.diminutif, asso.nom - FROM groupex.dom - INNER JOIN groupex.asso ON dom.id = asso.dom - WHERE FIND_IN_SET("GroupesX", dom.cat) AND FIND_IN_SET("GroupesX", asso.cat) - ORDER BY dom.nom, asso.nom'); + 'SELECT dom.id, dom.nom as domnom, groups.diminutif, groups.nom + FROM group_dom AS dom + INNER JOIN groups ON dom.id = groups.dom + WHERE FIND_IN_SET("GroupesX", dom.cat) AND FIND_IN_SET("GroupesX", groups.cat) + ORDER BY dom.nom, groups.nom'); $groupesx = array(); while ($tmp = $res->next()) { $groupesx[$tmp['id']][] = $tmp; } $page->assign('groupesx', $groupesx); $res = XDB::iterator( - 'SELECT dom.id, dom.nom as domnom, asso.diminutif, asso.nom - FROM groupex.dom - INNER JOIN groupex.asso ON dom.id = asso.dom - WHERE FIND_IN_SET("Binets", dom.cat) AND FIND_IN_SET("Binets", asso.cat) - ORDER BY dom.nom, asso.nom'); + 'SELECT dom.id, dom.nom as domnom, groups.diminutif, groups.nom + FROM group_dom AS dom + INNER JOIN groups ON dom.id = groups.dom + WHERE FIND_IN_SET("Binets", dom.cat) AND FIND_IN_SET("Binets", groups.cat) + ORDER BY dom.nom, groups.nom'); $binets = array(); while ($tmp = $res->next()) { $binets[$tmp['id']][] = $tmp; } $page->assign('binets', $binets); $res = XDB::iterator( - 'SELECT asso.diminutif, asso.nom - FROM groupex.asso + 'SELECT diminutif, nom + FROM groups WHERE cat LIKE "%Promotions%" ORDER BY diminutif'); $page->assign('promos', $res); $res = XDB::iterator( - 'SELECT asso.diminutif, asso.nom - FROM groupex.asso + 'SELECT diminutif, nom + FROM groups WHERE FIND_IN_SET("Institutions", cat) ORDER BY diminutif'); $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 = strtolower($cat); + $cat = mb_strtolower($cat); $page->changeTpl('xnet/groupes.tpl'); $page->assign('cat', $cat); $page->assign('dom', $dom); - $res = XDB::query("SELECT id,nom FROM groupex.dom - WHERE FIND_IN_SET({?}, cat) - ORDER BY nom", $cat); + $res = XDB::query("SELECT id,nom + FROM group_dom + WHERE FIND_IN_SET({?}, cat) + ORDER BY nom", $cat); $doms = $res->fetchAllAssoc(); $page->assign('doms', $doms); if (empty($doms)) { - $res = XDB::query("SELECT diminutif, nom, site FROM groupex.asso - WHERE FIND_IN_SET({?}, cat) - ORDER BY nom", $cat); + $res = XDB::query("SELECT diminutif, nom, site + FROM groups + WHERE FIND_IN_SET({?}, cat) + ORDER BY nom", $cat); $page->assign('gps', $res->fetchAllAssoc()); } elseif (!is_null($dom)) { - $res = XDB::query("SELECT diminutif, nom, site FROM groupex.asso - WHERE FIND_IN_SET({?}, cat) AND dom={?} - ORDER BY nom", $cat, $dom); + $res = XDB::query("SELECT diminutif, nom, site + FROM groups + WHERE FIND_IN_SET({?}, cat) AND dom={?} + ORDER BY nom", $cat, $dom); $page->assign('gps', $res->fetchAllAssoc()); } $page->setType($cat); } - function handler_autologin(&$page) + function handler_autologin($page) { $allkeys = func_get_args(); unset($allkeys[0]); $url = join('/',$allkeys); - header("Content-type: text/javascript; charset=utf-8"); + pl_content_headers("text/javascript"); echo '$.ajax({ url: "'.$url.'?forceXml=1", dataType: "xml", success: function(xml) { $("body",xml).insertBefore("body"); $("body:eq(1)").remove(); }});'; exit; } + + function handler_edit($page) + { + global $globals; + + $user = S::user(); + if (empty($user)) { + return PL_NOT_FOUND; + } + if ($user->type != 'xnet') { + pl_redirect('index'); + } + + $page->changeTpl('xnet/edit.tpl'); + if (Post::has('change')) { + S::assert_xsrf_token(); + + // Convert user status to X + if (!Post::blank('login_X')) { + $forlife = $this->changeLogin($page, $user, Post::t('login_X')); + if ($forlife) { + pl_redirect('index'); + } + } + + // 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 = {?}, + firstname = {?}, lastname = {?}, sex = {?}, email = {?} + WHERE uid = {?}', + $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 (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.'); + } + } + + $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: