X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=a993a9c99b0a6e42a43c681143a9c15db6327eaf;hb=3a9876d8fcd3155e7917774b2c9169df729749bb;hp=41fe1bb6fc22e28d51e723659fedc0e4d03e00a1;hpb=06a548e57db2a5f848e7b0f6110d219eaa114f00;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 41fe1bb..a993a9c 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -24,35 +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/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_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') ); } @@ -442,20 +445,35 @@ 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; } else if (Post::has('update_account')) { if (!$user->hasProfile()) { - if (Post::s('full_name') != $user->fullName()) { - $to_update['full_name'] = Post::s('full_name'); + require_once 'name.func.inc.php'; + $name_update = false; + $lastname = capitalize_name(Post::t('lastname')); + $firstname = capitalize_name(Post::t('firstname')); + if ($lastname != $user->lastname) { + $to_update['lastname'] = $lastname; + $name_update = true; + } + if (Post::s('type') != 'virtual' && $firstname != $user->firstname) { + $to_update['firstname'] = $firstname; + $name_update = true; + } + if ($name_update) { + if (Post::s('type') == 'virtual') { + $firstname = ''; + } + $to_update['full_name'] = build_full_name($firstname, $lastname); + $to_update['directory_name'] = build_directory_name($firstname, $lastname); + $to_update['sort_name'] = build_sort_name($firstname, $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'); @@ -502,9 +520,11 @@ 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()) { - $to_update['email'] = Post::t('email'); - $listClient->change_user_email($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)) { @@ -572,11 +592,10 @@ 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'); - if (!isvalid_email_redirection($email)) { + if (!isvalid_email_redirection($email, $user)) { $page->trigError("Email non valide: $email"); } else { $redirect->add_email($email); @@ -585,9 +604,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 +623,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 +635,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. @@ -692,11 +724,16 @@ class AdminModule extends PLModule // Display active aliases. $page->assign('virtuals', $user->emailGroupAliases()); - $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())); + $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 @@ -759,9 +796,9 @@ class AdminModule extends PLModule { 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; @@ -777,17 +814,16 @@ class AdminModule extends PLModule function handler_add_accounts($page, $action = null, $promo = null) { + require_once 'name.func.inc.php'; $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'); - $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES); - $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); @@ -799,6 +835,7 @@ class AdminModule extends PLModule $grad_year = $promotion + 3; $promo = 'X' . $promotion; $hrpromo = $promotion; + $type = 'x'; break; case 'M': $degreeid = $eduDegrees[Profile::DEGREE_M]; @@ -812,51 +849,61 @@ class AdminModule extends PLModule $degreeid = $eduDegrees[Profile::DEGREE_D]; $grad_year = $promotion; $entry_year = $promotion - 3; - $promo = 'D' . $promotion; - $hrpromo = $promo; + $promo = 'D (en cours)'; + $hrpromo = 'D' . $promotion; $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') . '.'); } + $best_domain = XDB::fetchOneCell('SELECT id + FROM email_virtual_domains + WHERE name = {?}', + User::$sub_mail_domains[$type] . Platal::globals()->mail->domain); XDB::startTransaction(); foreach ($lines as $line) { if ($infos = self::formatNewUser($page, $line, $separator, $hrpromo, 6)) { $sex = self::formatSex($page, $infos[3], $line); + $lastname = capitalize_name($infos[0]); + $firstname = capitalize_name($infos[1]); if (!is_null($sex)) { - $fullName = $infos[1] . ' ' . $infos[0]; - $directoryName = $infos[0] . ' ' . $infos[1]; + $fullName = build_full_name($firstname, $lastname); + $directoryName = build_directory_name($firstname, $lastname); + $sortName = build_sort_name($firstname, $lastname); $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; } - XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex) - VALUES ({?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $xorgId, $infos[5], $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_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, $lastname, $lastname, $firstname, $firstname); 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); + $pid, $firstname, $fullName, $fullName, $directoryName, $fullName, $sortName, $promo); + 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, sort_name, lastname, firstname, sex, best_domain) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, $sortName, + $firstname, $lastname, $firstname, $sex, $best_domain); $uid = XDB::insertId(); XDB::execute('INSERT INTO account_profiles (uid, pid, perms) VALUES ({?}, {?}, {?})', @@ -873,17 +920,17 @@ class AdminModule extends PLModule if ($infos = self::formatNewUser($page, $line, $separator, $type, 4)) { $sex = self::formatSex($page, $infos[3], $line); 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); - $newAccounts[$infos['hrid']] = $infos[1] . ' ' . $infos[0]; + $lastname = capitalize_name($infos[0]); + $firstname = capitalize_name($infos[1]); + $fullName = build_full_name($firstname, $lastname); + $directoryName = build_directory_name($firstname, $lastname); + $sortName = build_sort_name($firstname, $lastname); + XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, directory_name, + sort_name, display_name, lastname, firstname, sex) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $type, 0, 'pending', $infos[2], $fullName, $directoryName, + $sortName ,$firstname, $lastname, $firstname, $sex); + $newAccounts[$infos['hrid']] = $fullName; } } } @@ -924,8 +971,8 @@ class AdminModule extends PLModule $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); @@ -936,15 +983,14 @@ 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 + // Examine what operation needs to be performed. switch ($op) { case 'mail': S::assert_xsrf_token(); - send_warning_homonyme($user, $loginbis); - switch_bestalias($user, $loginbis); + send_warning_homonym($user, $loginbis); $op = 'list'; $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . '.'); break; @@ -952,13 +998,8 @@ 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); - 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; @@ -966,21 +1007,40 @@ 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); + } + + 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)); } } @@ -1117,7 +1177,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); } @@ -1128,10 +1188,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); } @@ -1161,7 +1221,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); } @@ -1181,10 +1241,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); } @@ -1227,7 +1287,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 @@ -1418,7 +1478,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'); @@ -1432,10 +1492,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); } } @@ -1661,6 +1722,16 @@ class AdminModule extends PLModule ORDER BY a.hruid')); } + 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'); @@ -1774,6 +1845,173 @@ 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); + } + + 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: