X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=ad07d0eb52894f1c2f87acd360afddf725a1fe45;hb=a88f005d4257a040a397d4958c3beb059a9e00ec;hp=a8e62eb2d3c5b143f881d6a0e98484a3eb97ed1d;hpb=8a70ca6fac73380af967fdd9271a834be25b021e;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index a8e62eb..ad07d0e 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -54,7 +54,8 @@ class AdminModule extends PLModule '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/phd' => $this->make_hook('phd', AUTH_MDP, 'admin'), + 'admin/add_secondary_edu' => $this->make_hook('add_secondary_edu', AUTH_MDP, 'admin') ); } @@ -450,15 +451,27 @@ class AdminModule extends PLModule $to_update['weak_password'] = null; } else if (Post::has('update_account')) { if (!$user->hasProfile()) { - if (Post::s('full_name') != $user->fullName()) { - $to_update['full_name'] = Post::s('full_name'); + $name_update = false; + if (Post::s('lastname') != $user->lastname) { + $to_update['lastname'] = Post::s('lastname'); + $name_update = true; + } + if (Post::s('type') != 'virtual' && Post::s('firstname') != $user->firstname) { + $to_update['firstname'] = Post::s('firstname'); + $name_update = true; + } + if ($name_update) { + if (Post::s('type') != 'virtual') { + $to_update['full_name'] = Post::s('firstname') . ' ' . Post::s('lastname'); + $to_update['directory_name'] = mb_strtoupper(Post::s('lastname')) . ' ' . Post::s('firstname'); + } else { + $to_update['full_name'] = Post::s('lastname'); + $to_update['directory_name'] = mb_strtoupper(Post::s('lastname')); + } } if (Post::s('display_name') != $user->displayName()) { $to_update['display_name'] = Post::s('display_name'); } - if (Post::s('directory_name') != $user->directoryName()) { - $to_update['directory_name'] = Post::s('directory_name'); - } } if (Post::s('sex') != ($user->isFemale() ? 'female' : 'male')) { $to_update['sex'] = Post::s('sex'); @@ -804,8 +817,6 @@ class AdminModule extends PLModule $lines = explode("\n", Env::t('people')); $separator = Env::t('separator'); $promotion = Env::i('promotion'); - $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES); - $nameTypes = array_flip($nameTypes); if (Env::t('add_type') == 'promo') { $eduSchools = DirEnum::getOptions(DirEnum::EDUSCHOOLS); @@ -834,7 +845,7 @@ class AdminModule extends PLModule $grad_year = $promotion; $entry_year = $promotion - 3; $promo = 'D (en cours)'; - $hrpromo = $promo; + $hrpromo = 'D' . $promotion; $type = 'phd'; break; default: @@ -865,25 +876,21 @@ class AdminModule extends PLModule VALUES ({?}, {?}, {?}, {?}, {?})', $infos['hrid'], $xorgId, (isset($infos[5]) ? $infos[5] : null), $birthDate, $sex); $pid = XDB::insertId(); - XDB::execute('INSERT INTO profile_name (pid, name, typeid) - VALUES ({?}, {?}, {?}), - ({?}, {?}, {?}), - ({?}, {?}, {?}), - ({?}, {?}, {?})', - $pid, $infos[0], $nameTypes['name_ini'], - $pid, $infos[0], $nameTypes['lastname'], - $pid, $infos[1], $nameTypes['firstname_ini'], - $pid, $infos[1], $nameTypes['firstname']); + XDB::execute('INSERT INTO profile_public_names (pid, lastname_initial, lastname_main, firstname_initial, firstname_main) + VALUES ({?}, {?}, {?}, {?}, {?})', + $pid, $infos[0], $infos[0], $infos[1], $infos[1]); XDB::execute('INSERT INTO profile_display (pid, yourself, public_name, private_name, directory_name, short_name, sort_name, promo) VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', $pid, $infos[1], $fullName, $fullName, $directoryName, $fullName, $directoryName, $promo); - 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); + XDB::execute('INSERT INTO profile_education (id, pid, eduid, degreeid, entry_year, grad_year, promo_year, flags) + VALUES (100, {?}, {?}, {?}, {?}, {?}, {?}, \'primary\')', + $pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year, $promotion); + XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, full_name, directory_name, + display_name, lastname, firstname, sex) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, + $infos[1], $infos[0], $infos[1], $sex); $uid = XDB::insertId(); XDB::execute('INSERT INTO account_profiles (uid, pid, perms) VALUES ({?}, {?}, {?})', @@ -902,14 +909,11 @@ class AdminModule extends PLModule if (!is_null($sex)) { $fullName = $infos[1] . ' ' . $infos[0]; $directoryName = $infos[0] . ' ' . $infos[1]; - XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, - email, full_name, directory_name, - display_name, sex) - VALUES ({?}, {?}, {?}, {?}, - {?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $type, 0, 'pending', - $infos[2], $fullName, $directoryName, - $infos[1], $sex); + XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, directory_name, + display_name, lastname, firstname, sex) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $type, 0, 'pending', $infos[2], $fullName, $directoryName, + $infos[1], $infos[0], $infos[1], $sex); $newAccounts[$infos['hrid']] = $infos[1] . ' ' . $infos[0]; } } @@ -965,14 +969,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; @@ -980,16 +982,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; @@ -1024,6 +1018,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) @@ -1159,7 +1161,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); } @@ -1170,10 +1172,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); } @@ -1203,7 +1205,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); } @@ -1223,10 +1225,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); } @@ -1460,7 +1462,7 @@ class AdminModule extends PLModule if (Post::has('create_account')) { S::assert_xsrf_token(); $firstname = Post::t('firstname'); - $lastname = strtoupper(Post::t('lastname')); + $lastname = mb_strtoupper(Post::t('lastname')); $sex = Post::s('sex'); $email = Post::t('email'); $type = Post::s('type'); @@ -1474,10 +1476,11 @@ class AdminModule extends PLModule $directory_name = $lastname . ' ' . $firstname; XDB::execute("INSERT INTO accounts (hruid, type, state, password, registration_date, email, full_name, - display_name, sex, directory_name) - VALUES ({?}, {?}, 'active', {?}, NOW(), {?}, {?}, {?}, {?}, {?})", + display_name, sex, directory_name, + lastname, firstname) + VALUES ({?}, {?}, 'active', {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?})", $login, $type, Post::s('pwhash'), $email, $full_name, $full_name, $sex, - $directory_name); + $directory_name, $lastname, $firstname); } } @@ -1881,6 +1884,118 @@ class AdminModule extends PLModule $page->assign('list', $list); $page->assign('promo', $promo); } + + function handler_add_secondary_edu($page) + { + $page->changeTpl('admin/add_secondary_edu.tpl'); + + if (!(Post::has('verify') || Post::has('add'))) { + return; + } elseif (!Post::has('people')) { + $page->trigWarning("Aucune information n'a été fournie."); + return; + } + + require_once 'name.func.inc.php'; + $lines = explode("\n", Post::t('people')); + $separator = Post::t('separator'); + $degree = Post::v('degree'); + $promotion = Post::i('promotion'); + $schoolsList = array_flip(DirEnum::getOptions(DirEnum::EDUSCHOOLS)); + $degreesList = array_flip(DirEnum::getOptions(DirEnum::EDUDEGREES)); + $edu_id = $schoolsList[Profile::EDU_X]; + $degree_id = $degreesList[$degree]; + + $res = array( + 'incomplete' => array(), + 'empty' => array(), + 'multiple' => array(), + 'already' => array(), + 'new' => array() + ); + $old_pids = array(); + $new_pids = array(); + foreach ($lines as $line) { + $line = trim($line); + $line_array = explode($separator, $line); + array_walk($line_array, 'trim'); + if (count($line_array) != 3) { + $page->trigError("La ligne « $line » est incomplète."); + $res['incomplete'][] = $line; + continue; + } + $cond = new PFC_And(new UFC_NameTokens(split_name_for_search($line_array[0]), array(), false, false, Profile::LASTNAME)); + $cond->addChild(new UFC_NameTokens(split_name_for_search($line_array[1]), array(), false, false, Profile::FIRSTNAME)); + $cond->addChild(new UFC_Promo('=', UserFilter::DISPLAY, $line_array[2])); + $uf = new UserFilter($cond); + $pid = $uf->getPIDs(); + $count = count($pid); + if ($count == 0) { + $page->trigError("La ligne « $line » ne correspond à aucun profil existant."); + $res['empty'][] = $line; + continue; + } elseif ($count > 1) { + $page->trigError("La ligne « $line » correspond à plusieurs profils existant."); + $res['multiple'][] = $line; + continue; + } else { + $count = XDB::fetchOneCell('SELECT COUNT(*) AS count + FROM profile_education + WHERE pid = {?} AND eduid = {?} AND degreeid = {?}', + $pid, $edu_id, $degree_id); + if ($count == 1) { + $res['already'][] = $line; + $old_pids[] = $pid[0]; + } else { + $res['new'][] = $line; + $new_pids[] = $pid[0]; + } + } + } + + $display = array(); + foreach ($res as $type => $res_type) { + if (count($res_type) > 0) { + $display = array_merge($display, array('--------------------' . $type . ':'), $res_type); + } + } + $page->assign('people', implode("\n", $display)); + $page->assign('promotion', $promotion); + $page->assign('degree', $degree); + + if (Post::has('add')) { + $entry_year = $promotion - Profile::educationDuration($degree); + + if (Post::b('force_addition')) { + $pids = array_unique(array_merge($old_pids, $new_pids)); + } else { + $pids = array_unique($new_pids); + + // Updates years. + 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. + $select = XDB::format('MAX(id) + 1, pid, {?}, {?}, {?}, {?}, {?}, \'secondary\'', + $edu_id, $degree_id, $entry_year, $promotion, $promotion ); + XDB::startTransaction(); + foreach ($pids as $pid) { + XDB::execute('INSERT INTO profile_education (id, pid, eduid, degreeid, entry_year, grad_year, promo_year, flags) + SELECT ' . $select . ' + FROM profile_education + WHERE pid = {?} + GROUP BY pid', + $pid); + } + XDB::commit(); + } + + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: