X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=a8e62eb2d3c5b143f881d6a0e98484a3eb97ed1d;hb=ca6980dc93884243957e9582f6a25797a746ddbb;hp=75ab39a174fff726dbae9da164aea9fb7a8fa031;hpb=d645ceb701b0e8aa1de2e5271bed35e56ef169f1;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 75ab39a..a8e62eb 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -24,45 +24,47 @@ class AdminModule extends PLModule function handlers() { return array( - 'phpinfo' => $this->make_hook('phpinfo', AUTH_MDP, 'admin'), + 'phpinfo' => $this->make_hook('phpinfo', AUTH_MDP, 'admin'), 'get_rights' => $this->make_hook('get_rights', AUTH_COOKIE, 'admin'), 'set_skin' => $this->make_hook('set_skin', AUTH_COOKIE, 'admin'), - 'admin' => $this->make_hook('default', AUTH_MDP, 'admin'), - 'admin/dead-but-active' => $this->make_hook('dead_but_active', AUTH_MDP, 'admin'), - 'admin/deaths' => $this->make_hook('deaths', AUTH_MDP, 'admin'), - 'admin/downtime' => $this->make_hook('downtime', AUTH_MDP, 'admin'), - 'admin/homonyms' => $this->make_hook('homonyms', AUTH_MDP, 'admin'), - 'admin/logger' => $this->make_hook('logger', AUTH_MDP, 'admin'), - 'admin/logger/actions' => $this->make_hook('logger_actions', AUTH_MDP, 'admin'), - 'admin/postfix/blacklist' => $this->make_hook('postfix_blacklist', AUTH_MDP, 'admin'), - 'admin/postfix/delayed' => $this->make_hook('postfix_delayed', AUTH_MDP, 'admin'), - 'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_MDP, 'admin'), - 'admin/postfix/whitelist' => $this->make_hook('postfix_whitelist', AUTH_MDP, 'admin'), - 'admin/mx/broken' => $this->make_hook('mx_broken', AUTH_MDP, 'admin'), - 'admin/skins' => $this->make_hook('skins', AUTH_MDP, 'admin'), - 'admin/user' => $this->make_hook('user', AUTH_MDP, 'admin'), - 'admin/add_accounts' => $this->make_hook('add_accounts', AUTH_MDP, 'admin'), - 'admin/validate' => $this->make_hook('validate', AUTH_MDP, 'admin,edit_directory'), - 'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_MDP, 'admin'), - 'admin/wiki' => $this->make_hook('wiki', AUTH_MDP, 'admin'), - 'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_MDP, 'admin'), - 'admin/icons' => $this->make_hook('icons', AUTH_MDP, 'admin'), - 'admin/geocoding' => $this->make_hook('geocoding', AUTH_MDP, 'admin'), - 'admin/accounts' => $this->make_hook('accounts', AUTH_MDP, 'admin'), - 'admin/account/watch' => $this->make_hook('account_watch', AUTH_MDP, 'admin'), - 'admin/account/types' => $this->make_hook('account_types', AUTH_MDP, 'admin'), - 'admin/jobs' => $this->make_hook('jobs', AUTH_MDP, 'admin,edit_directory'), - 'admin/profile' => $this->make_hook('profile', AUTH_MDP, 'admin,edit_directory') + 'admin' => $this->make_hook('default', AUTH_MDP, 'admin'), + 'admin/dead-but-active' => $this->make_hook('dead_but_active', AUTH_MDP, 'admin'), + 'admin/deaths' => $this->make_hook('deaths', AUTH_MDP, 'admin'), + 'admin/downtime' => $this->make_hook('downtime', AUTH_MDP, 'admin'), + 'admin/homonyms' => $this->make_hook('homonyms', AUTH_MDP, 'admin'), + 'admin/logger' => $this->make_hook('logger', AUTH_MDP, 'admin'), + 'admin/logger/actions' => $this->make_hook('logger_actions', AUTH_MDP, 'admin'), + 'admin/postfix/blacklist' => $this->make_hook('postfix_blacklist', AUTH_MDP, 'admin'), + 'admin/postfix/delayed' => $this->make_hook('postfix_delayed', AUTH_MDP, 'admin'), + 'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_MDP, 'admin'), + 'admin/postfix/whitelist' => $this->make_hook('postfix_whitelist', AUTH_MDP, 'admin'), + 'admin/mx/broken' => $this->make_hook('mx_broken', AUTH_MDP, 'admin'), + 'admin/skins' => $this->make_hook('skins', AUTH_MDP, 'admin'), + 'admin/user' => $this->make_hook('user', AUTH_MDP, 'admin'), + 'admin/add_accounts' => $this->make_hook('add_accounts', AUTH_MDP, 'admin'), + 'admin/validate' => $this->make_hook('validate', AUTH_MDP, 'admin,edit_directory'), + 'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_MDP, 'admin'), + 'admin/wiki' => $this->make_hook('wiki', AUTH_MDP, 'admin'), + 'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_MDP, 'admin'), + 'admin/icons' => $this->make_hook('icons', AUTH_MDP, 'admin'), + 'admin/geocoding' => $this->make_hook('geocoding', AUTH_MDP, 'admin'), + 'admin/accounts' => $this->make_hook('accounts', AUTH_MDP, 'admin'), + 'admin/account/watch' => $this->make_hook('account_watch', AUTH_MDP, 'admin'), + 'admin/account/types' => $this->make_hook('account_types', AUTH_MDP, 'admin'), + 'admin/xnet_without_group' => $this->make_hook('xnet_without_group', AUTH_MDP, 'admin'), + 'admin/jobs' => $this->make_hook('jobs', AUTH_MDP, 'admin,edit_directory'), + 'admin/profile' => $this->make_hook('profile', AUTH_MDP, 'admin,edit_directory'), + 'admin/phd' => $this->make_hook('phd', AUTH_MDP, 'admin') ); } - function handler_phpinfo(&$page) + function handler_phpinfo($page) { phpinfo(); exit; } - function handler_get_rights(&$page) + function handler_get_rights($page) { if (S::suid()) { $page->kill('Déjà en SUID'); @@ -86,7 +88,7 @@ class AdminModule extends PLModule } } - function handler_set_skin(&$page) + function handler_set_skin($page) { S::assert_xsrf_token(); S::set('skin', Post::s('change_skin')); @@ -97,13 +99,13 @@ class AdminModule extends PLModule } } - function handler_default(&$page) + function handler_default($page) { $page->changeTpl('admin/index.tpl'); $page->setTitle('Administration'); } - function handler_postfix_delayed(&$page) + function handler_postfix_delayed($page) { $page->changeTpl('admin/postfix_delayed.tpl'); $page->setTitle('Administration - Postfix : Retardés'); @@ -278,7 +280,7 @@ class AdminModule extends PLModule // }}} - function handler_logger(&$page, $action = null, $arg = null) { + function handler_logger($page, $action = null, $arg = null) { if ($action == 'session') { // we are viewing a session @@ -380,7 +382,7 @@ class AdminModule extends PLModule $page->setTitle('Administration - Logs des sessions'); } - function handler_user(&$page, $login = false) + function handler_user($page, $login = false) { global $globals; $page->changeTpl('admin/user.tpl'); @@ -442,6 +444,7 @@ class AdminModule extends PLModule } // Account Form {{{ + require_once 'emails.inc.php'; $to_update = array(); if (Post::has('disable_weak_access')) { $to_update['weak_password'] = null; @@ -502,9 +505,10 @@ class AdminModule extends PLModule if (Post::t('comment') != $user->comment) { $to_update['comment'] = Post::blank('comment') ? null : Post::t('comment'); } - if (!$user->checkPerms(User::PERM_MAIL) && Post::t('email') != $user->forlifeEmail()) { + if (require_email_update($user, Post::t('email'))) { $to_update['email'] = Post::t('email'); $listClient->change_user_email($user->forlifeEmail(), Post::t('email')); + update_alias_user($user->forlifeEmail(), Post::t('email')); } } if (!empty($to_update)) { @@ -572,7 +576,6 @@ class AdminModule extends PLModule // }}} // Email forwards form {{{ - require_once("emails.inc.php"); $redirect = ($registered ? new Redirect($user) : null); if (Post::has('add_fwd')) { $email = Post::t('email'); @@ -585,9 +588,9 @@ class AdminModule extends PLModule } else if (!Post::blank('del_fwd')) { $redirect->delete_email(Post::t('del_fwd')); } else if (!Post::blank('activate_fwd')) { - $redirect->modify_one_email(Post::t('activate_fwd', true)); + $redirect->modify_one_email(Post::t('activate_fwd'), true); } else if (!Post::blank('deactivate_fwd')) { - $redirect->modify_one_email(Post::t('deactivate_fwd', false)); + $redirect->modify_one_email(Post::t('deactivate_fwd'), false); } else if (Post::has('disable_fwd')) { $redirect->disable(); } else if (Post::has('enable_fwd')) { @@ -604,7 +607,7 @@ class AdminModule extends PLModule if (strpos($alias, '@') !== false) { list($alias, $domain) = explode('@', $alias); } else { - $domain = $globals->mail->domain; + $domain = $user->mainEmailDomain(); } // Checks for alias' user validity. @@ -616,36 +619,49 @@ class AdminModule extends PLModule if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) { $req = new AliasReq($user, $alias, 'Admin request', false); if ($req->commit()) { - $page->trigSuccess("Nouvel alias '$alias@$domain' attribué"); + $page->trigSuccess("Nouvel alias '$alias@$domain' attribué."); } else { - $page->trigError("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué"); + $page->trigError("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué."); } - } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) { - $res = XDB::execute("INSERT INTO aliases (uid, alias, type) - VALUES ({?}, {?}, 'alias')", - $user->id(), $alias); + } elseif ($domain == $user->mainEmailDomain()) { + XDB::execute('INSERT INTO email_source_account (email, uid, domain, type, flags) + SELECT {?}, {?}, id, \'alias\', \'\' + FROM email_virtual_domains + WHERE name = {?}', + $alias, $user->id(), $domain); $page->trigSuccess("Nouvel alias '$alias' ajouté"); } else { - $page->trigError("Le domaine '$domain' n'est pas valide"); + $page->trigError("Le domaine '$domain' n'est pas valide pour cet utilisateur."); } } else if (!Post::blank('del_alias')) { - XDB::execute("DELETE FROM aliases - WHERE uid = {?} AND alias = {?} AND - type NOT IN ('a_vie', 'homonyme')", - $user->id(), $val); - XDB::execute("UPDATE emails - SET rewrite = '' - WHERE uid = {?} AND rewrite LIKE CONCAT({?}, '@%')", - $user->id(), $val); + $delete_alias = Post::t('del_alias'); + list($email, $domain) = explode('@', $delete_alias); + XDB::execute('DELETE s + FROM email_source_account AS s + INNER JOIN email_virtual_domains AS m ON (s.domain = m.id) + INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) + WHERE s.email = {?} AND s.uid = {?} AND d.name = {?} AND type != \'forlife\'', + $email, $user->id(), $domain); + XDB::execute('UPDATE email_redirect_account AS r + INNER JOIN email_virtual_domains AS m ON (m.name = {?}) + INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) + SET r.rewrite = \'\' + WHERE r.uid = {?} AND r.rewrite = CONCAT({?}, \'@\', d.name)', + $domain, $user->id(), $email); fix_bestalias($user); - $page->trigSuccess("L'alias '$val' a été supprimé"); + $page->trigSuccess("L'alias '$delete_alias' a été supprimé"); } else if (!Post::blank('best')) { - XDB::execute("UPDATE aliases + $best_alias = Post::t('best'); + // First delete the bestalias flag from all this user's emails. + XDB::execute("UPDATE email_source_account SET flags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', flags, ','), ',bestalias,', ',')) WHERE uid = {?}", $user->id()); - XDB::execute("UPDATE aliases + // Then gives the bestalias flag to the given email. + list($email, $domain) = explode('@', $best_alias); + XDB::execute("UPDATE email_source_account SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') - WHERE uid = {?} AND alias = {?}", $user->id(), $val); + WHERE uid = {?} AND email = {?}", $user->id(), $email); + // As having a non-null bestalias value is critical in // plat/al's code, we do an a posteriori check on the // validity of the bestalias. @@ -675,10 +691,7 @@ class AdminModule extends PLModule // }}} - $page->addJsLink('jquery.ui.core.js'); - $page->addJsLink('jquery.ui.widget.js'); - $page->addJsLink('jquery.ui.tabs.js'); - $page->addJsLink('password.js'); + $page->addJsLink('jquery.ui.xorg.js'); // Displays last login and last host information. $res = XDB::query("SELECT start, host @@ -694,12 +707,17 @@ class AdminModule extends PLModule $page->assign('mlists', $listClient->get_all_user_lists($user->forlifeEmail())); // Display active aliases. - $page->assign('virtuals', $user->emailAliases()); - $page->assign('aliases', XDB::iterator("SELECT alias, type='a_vie' AS for_life, - FIND_IN_SET('bestalias',flags) AS best, expire - FROM aliases - WHERE uid = {?} AND type != 'homonyme' - ORDER BY type != 'a_vie'", $user->id())); + $page->assign('virtuals', $user->emailGroupAliases()); + $aliases = XDB::iterator("SELECT CONCAT(s.email, '@', d.name) AS email, (s.type = 'forlife') AS forlife, + (s.email REGEXP '\\\\.[0-9]{2}$') AS hundred_year, + FIND_IN_SET('bestalias', s.flags) AS bestalias, s.expire, + (s.type = 'alias_aux') AS alias + FROM email_source_account AS s + INNER JOIN email_virtual_domains AS d ON (s.domain = d.id) + WHERE s.uid = {?} + ORDER BY !alias, s.email", + $user->id()); + $page->assign('aliases', $aliases); $page->assign('account_types', XDB::iterator('SELECT * FROM account_types ORDER BY type')); $page->assign('skins', XDB::iterator('SELECT id, name FROM skins ORDER BY name')); $page->assign('profiles', XDB::iterator('SELECT p.pid, p.hrpid, FIND_IN_SET(\'owner\', ap.perms) AS owner @@ -734,7 +752,7 @@ class AdminModule extends PLModule return null; } - private static function formatNewUser(&$page, $infosLine, $separator, $promo, $size) + private static function formatNewUser($page, $infosLine, $separator, $promo, $size) { $infos = explode($separator, $infosLine); if (sizeof($infos) > $size || sizeof($infos) < 2) { @@ -758,13 +776,13 @@ class AdminModule extends PLModule return $infos; } - private static function formatSex(&$page, $sex, $line) + private static function formatSex($page, $sex, $line) { switch ($sex) { case 'F': - return PlUser::GENDER_FEMALE; + return 'female'; case 'M': - return PlUser::GENDER_MALE; + return 'male'; default: $page->trigError("La ligne $line n'a pas été ajoutée car le sexe $sex n'est pas pris en compte."); return null; @@ -778,7 +796,7 @@ class AdminModule extends PLModule return date("Y-m-d", strtotime(str_replace('/', '-', $birthDate))); } - function handler_add_accounts(&$page, $action = null, $promo = null) + function handler_add_accounts($page, $action = null, $promo = null) { $page->changeTpl('admin/add_accounts.tpl'); @@ -790,7 +808,6 @@ class AdminModule extends PLModule $nameTypes = array_flip($nameTypes); if (Env::t('add_type') == 'promo') { - $type = 'x'; $eduSchools = DirEnum::getOptions(DirEnum::EDUSCHOOLS); $eduSchools = array_flip($eduSchools); $eduDegrees = DirEnum::getOptions(DirEnum::EDUDEGREES); @@ -802,6 +819,7 @@ class AdminModule extends PLModule $grad_year = $promotion + 3; $promo = 'X' . $promotion; $hrpromo = $promotion; + $type = 'x'; break; case 'M': $degreeid = $eduDegrees[Profile::DEGREE_M]; @@ -815,12 +833,12 @@ class AdminModule extends PLModule $degreeid = $eduDegrees[Profile::DEGREE_D]; $grad_year = $promotion; $entry_year = $promotion - 3; - $promo = 'D' . $promotion; + $promo = 'D (en cours)'; $hrpromo = $promo; $type = 'phd'; break; default: - $page->killError("La formation n'est pas reconnue:" . Env::t('edu_type') . '.'); + $page->killError("La formation n'est pas reconnue : " . Env::t('edu_type') . '.'); } XDB::startTransaction(); @@ -831,7 +849,13 @@ class AdminModule extends PLModule $fullName = $infos[1] . ' ' . $infos[0]; $directoryName = $infos[0] . ' ' . $infos[1]; $birthDate = self::formatBirthDate($infos[2]); - $xorgId = Profile::getXorgId($infos[4]); + if ($type == 'x') { + $xorgId = Profile::getXorgId($infos[4]); + } elseif (isset($infos[4])) { + $xorgId = trim($infos[4]); + } else { + $xorgId = 0; + } if (is_null($xorgId)) { $page->trigError("La ligne $line n'a pas été ajoutée car le matricule École est mal renseigné."); continue; @@ -839,7 +863,7 @@ class AdminModule extends PLModule XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex) VALUES ({?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $xorgId, $infos[5], $birthDate, $sex); + $infos['hrid'], $xorgId, (isset($infos[5]) ? $infos[5] : null), $birthDate, $sex); $pid = XDB::insertId(); XDB::execute('INSERT INTO profile_name (pid, name, typeid) VALUES ({?}, {?}, {?}), @@ -854,9 +878,9 @@ class AdminModule extends PLModule directory_name, short_name, sort_name, promo) VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', $pid, $infos[1], $fullName, $fullName, $directoryName, $fullName, $directoryName, $promo); - XDB::execute('INSERT INTO profile_education (pid, eduid, degreeid, entry_year, grad_year, flags) - VALUES ({?}, {?}, {?}, {?}, {?}, {?})', - $pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year, 'primary'); + XDB::execute('INSERT INTO profile_education (id, pid, eduid, degreeid, entry_year, grad_year, flags) + VALUES (100, {?}, {?}, {?}, {?}, {?}, \'primary\')', + $pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year); XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, full_name, directory_name, display_name, sex) VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, $infos[1], $sex); @@ -920,15 +944,15 @@ class AdminModule extends PLModule } } - function handler_homonyms(&$page, $op = 'list', $target = null) + function handler_homonyms($page, $op = 'list', $target = null) { $page->changeTpl('admin/homonymes.tpl'); $page->setTitle('Administration - Homonymes'); $this->load("homonyms.inc.php"); if ($target) { - $user = User::getSilent($target); - if (!$user || !($loginbis = select_if_homonyme($user))) { + $user = User::getSilentWithUID($target); + if (!$user || !($loginbis = select_if_homonym($user))) { $target = 0; } else { $page->assign('user', $user); @@ -939,15 +963,16 @@ class AdminModule extends PLModule $page->assign('op', $op); $page->assign('target', $target); - // on a un $target valide, on prepare les mails + // When we have a valid target, prepare emails. if ($target) { - // on examine l'op a effectuer + require_once 'emails.inc.php'; + // Examine what operation needs to be performed. switch ($op) { case 'mail': S::assert_xsrf_token(); send_warning_homonyme($user, $loginbis); - switch_bestalias($user, $loginbis); + fix_bestalias($user); $op = 'list'; $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . '.'); break; @@ -955,12 +980,15 @@ class AdminModule extends PLModule case 'correct': S::assert_xsrf_token(); - switch_bestalias($user, $loginbis); - XDB::execute("UPDATE aliases - SET type = 'homonyme', expire=NOW() - WHERE alias = {?}", $loginbis); - XDB::execute('INSERT IGNORE INTO homonyms (homonyme_id, uid) - VALUES ({?}, {?})', $target, $target); + XDB::execute('DELETE FROM email_source_account + WHERE email = {?} AND type = \'alias\'', + $loginbis); + XDB::execute('INSERT INTO email_source_other (hrmid, email, domain, type, expire) + SELECT {?}, {?}, id, \'homonym\', NOW() + FROM email_virtual_domains + WHERE name = {?}', + User::makeHomonymHrmid($loginbis), $loginbis, $user->mainEmailDomain()); + fix_bestalias($user); send_robot_homonyme($user, $loginbis); $op = 'list'; $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . ', alias supprimé.'); @@ -969,25 +997,36 @@ class AdminModule extends PLModule } if ($op == 'list') { - $res = XDB::iterator( - "SELECT a.alias AS homonyme, s.alias AS forlife, - IF(h.homonyme_id = s.uid, a.expire, NULL) AS expire, - IF(h.homonyme_id = s.uid, a.type, NULL) AS type, ac.uid - FROM aliases AS a - LEFT JOIN homonyms AS h ON (h.homonyme_id = a.uid) - INNER JOIN aliases AS s ON (s.uid = h.uid AND s.type = 'a_vie') - INNER JOIN accounts AS ac ON (ac.uid = a.uid) - WHERE a.type = 'homonyme' OR a.expire != '' - ORDER BY a.alias, forlife"); - $hnymes = Array(); - while ($tab = $res->next()) { - $hnymes[$tab['homonyme']][] = $tab; - } - $page->assign_by_ref('hnymes', $hnymes); + // Retrieves homonyms that are already been fixed. + $res = XDB::iterator('SELECT o.email AS homonym, f.email AS forlife, o.expire, f.uid + FROM email_source_other AS o + INNER JOIN homonyms_list AS h ON (o.hrmid = h.hrmid) + INNER JOIN email_source_account AS f ON (h.uid = f.uid AND f.type = \'forlife\') + WHERE o.expire IS NOT NULL + ORDER BY homonym, forlife'); + $homonyms = array(); + while ($item = $res->next()) { + $homonyms[$item['homonym']][] = $item; + } + $page->assign_by_ref('homonyms', $homonyms); + + // Retrieves homonyms that needs to be fixed. + $res = XDB::iterator('SELECT e.email AS homonym, f.email AS forlife, e.expire, e.uid, (e.expire < NOW()) AS urgent + FROM email_source_account AS e + INNER JOIN homonyms_list AS l ON (e.uid = l.uid) + INNER JOIN homonyms_list AS h ON (l.hrmid = h.hrmid) + INNER JOIN email_source_account AS f ON (h.uid = f.uid AND f.type = \'forlife\') + WHERE e.expire IS NOT NULL + ORDER BY homonym, forlife'); + $homonyms_to_fix = array(); + while ($item = $res->next()) { + $homonyms_to_fix[$item['homonym']][] = $item; + } + $page->assign_by_ref('homonyms_to_fix', $homonyms_to_fix); } } - function handler_deaths(&$page, $promo = 0, $validate = false) + function handler_deaths($page, $promo = 0, $validate = false) { $page->changeTpl('admin/deces_promo.tpl'); $page->setTitle('Administration - Deces'); @@ -1037,7 +1076,7 @@ class AdminModule extends PLModule $page->assign('profileList', $res); } - function handler_dead_but_active(&$page) + function handler_dead_but_active($page) { $page->changeTpl('admin/dead_but_active.tpl'); $page->setTitle('Administration - Décédés'); @@ -1055,11 +1094,11 @@ class AdminModule extends PLModule $page->assign('dead', $res); } - function handler_validate(&$page, $action = 'list', $id = null) + function handler_validate($page, $action = 'list', $id = null) { $page->changeTpl('admin/validation.tpl'); $page->setTitle('Administration - Valider une demande'); - $page->addCssLink('nl.css'); + $page->addCssLink('nl.Polytechnique.org.css'); if ($action == 'edit' && !is_null($id)) { $page->assign('preview_id', $id); @@ -1113,7 +1152,7 @@ class AdminModule extends PLModule $page->assign('isAdmin', S::admin()); } - function handler_validate_answers(&$page, $action = 'list', $id = null) + function handler_validate_answers($page, $action = 'list', $id = null) { $page->setTitle('Administration - Réponses automatiques de validation'); $page->assign('title', 'Gestion des réponses automatiques'); @@ -1124,7 +1163,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } - function handler_skins(&$page, $action = 'list', $id = null) + function handler_skins($page, $action = 'list', $id = null) { $page->setTitle('Administration - Skins'); $page->assign('title', 'Gestion des skins'); @@ -1138,7 +1177,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } - function handler_postfix_blacklist(&$page, $action = 'list', $id = null) + function handler_postfix_blacklist($page, $action = 'list', $id = null) { $page->setTitle('Administration - Postfix : Blacklist'); $page->assign('title', 'Blacklist de postfix'); @@ -1148,7 +1187,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } - function handler_postfix_whitelist(&$page, $action = 'list', $id = null) + function handler_postfix_whitelist($page, $action = 'list', $id = null) { $page->setTitle('Administration - Postfix : Whitelist'); $page->assign('title', 'Whitelist de postfix'); @@ -1157,7 +1196,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } - function handler_mx_broken(&$page, $action = 'list', $id = null) + function handler_mx_broken($page, $action = 'list', $id = null) { $page->setTitle('Administration - MX Défaillants'); $page->assign('title', 'MX Défaillant'); @@ -1168,7 +1207,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } - function handler_logger_actions(&$page, $action = 'list', $id = null) + function handler_logger_actions($page, $action = 'list', $id = null) { $page->setTitle('Administration - Actions'); $page->assign('title', 'Gestion des actions de logger'); @@ -1178,7 +1217,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } - function handler_downtime(&$page, $action = 'list', $id = null) + function handler_downtime($page, $action = 'list', $id = null) { $page->setTitle('Administration - Coupures'); $page->assign('title', 'Gestion des coupures'); @@ -1230,7 +1269,7 @@ class AdminModule extends PLModule private static function updateLanguage(array $item) {} - function handler_geocoding(&$page, $category = null, $action = null, $id = null) + function handler_geocoding($page, $category = null, $action = null, $id = null) { // Warning, this handler requires the following packages: // * pkg-isocodes @@ -1417,7 +1456,6 @@ class AdminModule extends PLModule { $page->changeTpl('admin/accounts.tpl'); $page->setTitle('Administration - Comptes'); - $page->addJsLink('password.js'); if (Post::has('create_account')) { S::assert_xsrf_token(); @@ -1448,7 +1486,7 @@ class AdminModule extends PLModule } - function handler_account_types(&$page, $action = 'list', $id = null) + function handler_account_types($page, $action = 'list', $id = null) { $page->setTitle('Administration - Types de comptes'); $page->assign('title', 'Gestion des types de comptes'); @@ -1458,7 +1496,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } - function handler_wiki(&$page, $action = 'list', $wikipage = null, $wikipage2 = null) + function handler_wiki($page, $action = 'list', $wikipage = null, $wikipage2 = null) { if (S::hasAuthToken()) { $page->setRssLink('Changement Récents', @@ -1526,7 +1564,7 @@ class AdminModule extends PLModule $page->assign('perms_opts', $perms); } - function handler_ipwatch(&$page, $action = 'list', $ip = null) + function handler_ipwatch($page, $action = 'list', $ip = null) { $page->changeTpl('admin/ipwatcher.tpl'); @@ -1634,7 +1672,7 @@ class AdminModule extends PLModule } } - function handler_icons(&$page) + function handler_icons($page) { $page->changeTpl('admin/icons.tpl'); $dh = opendir('../htdocs/images/icons'); @@ -1651,7 +1689,7 @@ class AdminModule extends PLModule $page->assign('icons', $icons); } - function handler_account_watch(&$page) + function handler_account_watch($page) { $page->changeTpl('admin/accounts.tpl'); $page->assign('disabled', XDB::iterator('SELECT a.hruid, FIND_IN_SET(\'watch\', a.flags) AS watch, @@ -1665,7 +1703,17 @@ class AdminModule extends PLModule ORDER BY a.hruid')); } - function handler_jobs(&$page, $id = -1) + function handler_xnet_without_group($page) + { + $page->changeTpl('admin/xnet_without_group.tpl'); + $page->assign('accounts', XDB::iterator('SELECT a.hruid, a.state + FROM accounts AS a + LEFT JOIN group_members AS m ON (a.uid = m.uid) + WHERE a.type = \'xnet\' AND m.uid IS NULL + ORDER BY a.state, a.hruid')); + } + + function handler_jobs($page, $id = -1) { $page->changeTpl('admin/jobs.tpl'); @@ -1748,7 +1796,7 @@ class AdminModule extends PLModule } } - function handler_profile(&$page) + function handler_profile($page) { $page->changeTpl('admin/profile.tpl'); @@ -1778,6 +1826,61 @@ class AdminModule extends PLModule ORDER BY pd.directory_name'); $page->assign('updates', $res); } + + function handler_phd($page, $promo = null, $validate = false) + { + $page->changeTpl('admin/phd.tpl'); + $eduDegrees = DirEnum::getOptions(DirEnum::EDUDEGREES); + $eduDegrees = array_flip($eduDegrees); + + if (is_null($promo)) { + $promo_list = XDB::fetchColumn('SELECT DISTINCT(grad_year) + FROM profile_education + WHERE FIND_IN_SET(\'primary\', flags) AND NOT FIND_IN_SET(\'completed\', flags) AND degreeid = {?} + ORDER BY grad_year', + $eduDegrees[Profile::DEGREE_D]); + $page->assign('promo_list', $promo_list); + $page->assign('nothing', count($promo_list) == 0); + return; + } + + if ($validate) { + S::assert_xsrf_token(); + + $list = XDB::iterator('SELECT pe.pid, pd.directory_name + FROM profile_education AS pe + INNER JOIN profile_display AS pd ON (pe.pid = pd.pid) + WHERE FIND_IN_SET(\'primary\', pe.flags) AND NOT FIND_IN_SET(\'completed\', pe.flags) + AND pe.degreeid = {?} AND pe.grad_year = {?}', + $eduDegrees[Profile::DEGREE_D], $promo); + while ($res = $list->next()) { + $pid = $res['pid']; + $name = $res['directory_name']; + if (Post::b('completed_' . $pid)) { + $grad_year = Post::t('grad_year_' . $pid); + XDB::execute('UPDATE profile_education + SET flags = \'primary,completed\', grad_year = {?} + WHERE FIND_IN_SET(\'primary\', flags) AND pid = {?}', + $grad_year, $pid); + XDB::execute('UPDATE profile_display + SET promo = {?} + WHERE pid = {?}', + 'D' . $grad_year, $pid); + $page->trigSuccess("Promotion de $name validée."); + } + } + } + + $list = XDB::iterator('SELECT pe.pid, pd.directory_name + FROM profile_education AS pe + INNER JOIN profile_display AS pd ON (pe.pid = pd.pid) + WHERE FIND_IN_SET(\'primary\', pe.flags) AND NOT FIND_IN_SET(\'completed\', pe.flags) + AND pe.degreeid = {?} AND pe.grad_year = {?} + ORDER BY pd.directory_name', + $eduDegrees[Profile::DEGREE_D], $promo); + $page->assign('list', $list); + $page->assign('promo', $promo); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: