X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=a2d5d59adb9127274c9a6501d10118dbf40eef22;hb=c9566e01c2add8f12a858abe0fbb0bc6b8e3c0d4;hp=97789791d819b6986431e8c3139e691f30190fc7;hpb=304cdf32d7c38afbd381909545021fc44c8a0e05;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 9778979..a2d5d59 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -24,38 +24,38 @@ class AdminModule extends PLModule function handlers() { return array( - 'phpinfo' => $this->make_hook('phpinfo', AUTH_MDP, 'admin'), + 'phpinfo' => $this->make_hook('phpinfo', AUTH_PASSWD, '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/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'), - 'admin/add_secondary_edu' => $this->make_hook('add_secondary_edu', AUTH_MDP, 'admin') + 'admin' => $this->make_hook('default', AUTH_PASSWD, 'admin'), + 'admin/dead-but-active' => $this->make_hook('dead_but_active', AUTH_PASSWD, 'admin'), + 'admin/deaths' => $this->make_hook('deaths', AUTH_PASSWD, 'admin'), + 'admin/downtime' => $this->make_hook('downtime', AUTH_PASSWD, 'admin'), + 'admin/homonyms' => $this->make_hook('homonyms', AUTH_PASSWD, 'admin'), + 'admin/logger' => $this->make_hook('logger', AUTH_PASSWD, 'admin'), + 'admin/logger/actions' => $this->make_hook('logger_actions', AUTH_PASSWD, 'admin'), + 'admin/postfix/blacklist' => $this->make_hook('postfix_blacklist', AUTH_PASSWD, 'admin'), + 'admin/postfix/delayed' => $this->make_hook('postfix_delayed', AUTH_PASSWD, 'admin'), + 'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_PASSWD, 'admin'), + 'admin/postfix/whitelist' => $this->make_hook('postfix_whitelist', AUTH_PASSWD, 'admin'), + 'admin/mx/broken' => $this->make_hook('mx_broken', AUTH_PASSWD, 'admin'), + 'admin/skins' => $this->make_hook('skins', AUTH_PASSWD, 'admin'), + 'admin/user' => $this->make_hook('user', AUTH_PASSWD, 'admin'), + 'admin/add_accounts' => $this->make_hook('add_accounts', AUTH_PASSWD, 'admin'), + 'admin/validate' => $this->make_hook('validate', AUTH_PASSWD, 'admin,edit_directory'), + 'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_PASSWD, 'admin'), + 'admin/wiki' => $this->make_hook('wiki', AUTH_PASSWD, 'admin'), + 'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_PASSWD, 'admin'), + 'admin/icons' => $this->make_hook('icons', AUTH_PASSWD, 'admin'), + 'admin/geocoding' => $this->make_hook('geocoding', AUTH_PASSWD, 'admin'), + 'admin/accounts' => $this->make_hook('accounts', AUTH_PASSWD, 'admin'), + 'admin/account/watch' => $this->make_hook('account_watch', AUTH_PASSWD, 'admin'), + 'admin/account/types' => $this->make_hook('account_types', AUTH_PASSWD, 'admin'), + 'admin/xnet_without_group' => $this->make_hook('xnet_without_group', AUTH_PASSWD, 'admin'), + 'admin/jobs' => $this->make_hook('jobs', AUTH_PASSWD, 'admin,edit_directory'), + 'admin/profile' => $this->make_hook('profile', AUTH_PASSWD, 'admin,edit_directory'), + 'admin/phd' => $this->make_hook('phd', AUTH_PASSWD, 'admin'), + 'admin/add_secondary_edu' => $this->make_hook('add_secondary_edu', AUTH_PASSWD, 'admin') ); } @@ -518,10 +518,11 @@ class AdminModule extends PLModule if (Post::t('comment') != $user->comment) { $to_update['comment'] = Post::blank('comment') ? null : Post::t('comment'); } - 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')); + $new_email = strtolower(Post::t('email')); + if (require_email_update($user, $new_email)) { + $to_update['email'] = $new_email; + $listClient->change_user_email($user->forlifeEmail(), $new_email); + update_alias_user($user->forlifeEmail(), $new_email); } } if (!empty($to_update)) { @@ -592,7 +593,7 @@ class AdminModule extends PLModule $redirect = ($registered ? new Redirect($user) : null); if (Post::has('add_fwd')) { $email = Post::t('email'); - if (!isvalid_email_redirection($email)) { + if (!isvalid_email_redirection($email, $user)) { $page->trigError("Email non valide: $email"); } else { $redirect->add_email($email); @@ -814,6 +815,7 @@ class AdminModule extends PLModule $page->changeTpl('admin/add_accounts.tpl'); if (Env::has('add_type') && Env::has('people')) { + static $titles = array('male' => 'M', 'female' => 'MLLE'); $lines = explode("\n", Env::t('people')); $separator = Env::t('separator'); $promotion = Env::i('promotion'); @@ -872,9 +874,10 @@ class AdminModule extends PLModule continue; } - XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex) - VALUES ({?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $xorgId, (isset($infos[5]) ? $infos[5] : null), $birthDate, $sex); + XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex, title) + VALUES ({?}, {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $xorgId, (isset($infos[5]) ? $infos[5] : null), + $birthDate, $sex, $titles[$sex]); $pid = XDB::insertId(); XDB::execute('INSERT INTO profile_public_names (pid, lastname_initial, lastname_main, firstname_initial, firstname_main) VALUES ({?}, {?}, {?}, {?}, {?})', @@ -969,14 +972,12 @@ class AdminModule extends PLModule // When we have a valid target, prepare emails. if ($target) { - 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); - fix_bestalias($user); + send_warning_homonym($user, $loginbis); $op = 'list'; $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . '.'); break; @@ -984,16 +985,8 @@ class AdminModule extends PLModule case 'correct': S::assert_xsrf_token(); - 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); + fix_homonym($user, $loginbis); + send_robot_homonym($user, $loginbis); $op = 'list'; $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . ', alias supprimé.'); break; @@ -1028,6 +1021,14 @@ class AdminModule extends PLModule } $page->assign_by_ref('homonyms_to_fix', $homonyms_to_fix); } + + if ($op == 'correct-conf') { + $page->assign('robot_mail_text', get_robot_mail_text($user, $loginbis)); + } + + if ($op == 'mail-conf') { + $page->assign('warning_mail_text', get_warning_mail_text($user, $loginbis)); + } } function handler_deaths($page, $promo = 0, $validate = false) @@ -1163,7 +1164,7 @@ class AdminModule extends PLModule $table_editor = new PLTableEditor('admin/validate/answers','requests_answers','id'); $table_editor->describe('category','catégorie',true); $table_editor->describe('title','titre',true); - $table_editor->describe('answer','texte',false); + $table_editor->describe('answer','texte',false, true); $table_editor->apply($page, $action, $id); } @@ -1174,10 +1175,10 @@ class AdminModule extends PLModule $table_editor = new PLTableEditor('admin/skins','skins','id'); $table_editor->describe('name','nom',true); $table_editor->describe('skin_tpl','nom du template',true); - $table_editor->describe('auteur','auteur',false); + $table_editor->describe('auteur','auteur',false, true); $table_editor->describe('comment','commentaire',true); - $table_editor->describe('date','date',false); - $table_editor->describe('ext','extension du screenshot',false); + $table_editor->describe('date','date',false, true); + $table_editor->describe('ext','extension du screenshot',false, true); $table_editor->apply($page, $action, $id); } @@ -1207,7 +1208,7 @@ class AdminModule extends PLModule $table_editor = new PLTableEditor('admin/mx/broken', 'mx_watch', 'host', true); $table_editor->describe('host', 'Masque', true); $table_editor->describe('state', 'Niveau', true); - $table_editor->describe('text', 'Description du problème', false); + $table_editor->describe('text', 'Description du problème', false, true); $table_editor->apply($page, $action, $id); } @@ -1227,10 +1228,10 @@ class AdminModule extends PLModule $page->assign('title', 'Gestion des coupures'); $table_editor = new PLTableEditor('admin/downtime','downtimes','id'); $table_editor->describe('debut','date',true); - $table_editor->describe('duree','durée',false); + $table_editor->describe('duree','durée',false, true); $table_editor->describe('resume','résumé',true); $table_editor->describe('services','services affectés',true); - $table_editor->describe('description','description',false); + $table_editor->describe('description','description',false, true); $table_editor->apply($page, $action, $id); } @@ -1974,10 +1975,12 @@ class AdminModule extends PLModule $pids = array_unique($new_pids); // Updates years. - XDB::execute('UPDATE profile_education - SET entry_year = {?}, grad_year = {?}, promo_year = {?} - WHERE pid IN {?} AND eduid = {?} AND degreeid = {?}', - $entry_year, $promotion, $promotion, $old_pids, $edu_id, $degree_id); + if (count($old_pids)) { + XDB::execute('UPDATE profile_education + SET entry_year = {?}, grad_year = {?}, promo_year = {?} + WHERE pid IN {?} AND eduid = {?} AND degreeid = {?}', + $entry_year, $promotion, $promotion, $old_pids, $edu_id, $degree_id); + } } // Precomputes values common to all users. @@ -1988,7 +1991,8 @@ class AdminModule extends PLModule XDB::execute('INSERT INTO profile_education (id, pid, eduid, degreeid, entry_year, grad_year, promo_year, flags) SELECT ' . $select . ' FROM profile_education - WHERE pid = {?}', + WHERE pid = {?} + GROUP BY pid', $pid); } XDB::commit();