X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=fa6d0f9f4c045e0006f59620710d9a45f870fdd7;hb=92ac93ec91a6e7b0f00fd21c6d19c31d46fe9f52;hp=ed0f84aff800540dec1d4c17dc78ac6260c6f812;hpb=f4dda5fb49dc3ca77c5d4769c78f131683a2dfd4;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index ed0f84a..fa6d0f9 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -55,6 +55,7 @@ class AdminModule extends PLModule '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/name' => $this->make_hook('admin_name', AUTH_PASSWD, 'admin'), 'admin/add_secondary_edu' => $this->make_hook('add_secondary_edu', AUTH_PASSWD, 'admin') ); } @@ -235,6 +236,15 @@ class AdminModule extends PLModule return $years; } + private function _getActions() + { + $actions = XDB::fetchAllAssoc('id', 'SELECT id, description + FROM log_actions'); + $actions[0] = '----'; + ksort($actions); + + return $actions; + } /** Make a where clause to get a user's sessions. * Prepare the where clause request that will retrieve the sessions. @@ -242,18 +252,20 @@ class AdminModule extends PLModule * @param $year INTEGER Only get log entries made during the given year. * @param $month INTEGER Only get log entries made during the given month. * @param $day INTEGER Only get log entries made during the given day. + * @param $action INTEGER Only get log entries corresponding to this action. * @param $uid INTEGER Only get log entries referring to the given user ID. * * @return STRING the WHERE clause of a query, including the 'WHERE' keyword * @private */ - function _makeWhere($year, $month, $day, $uid) + private function _makeWhere($year, $month, $day, $action, $uid) { // start constructing the "where" clause $where = array(); - if ($uid) - array_push($where, "s.uid='$uid'"); + if ($uid) { + $where[] = XDB::format('ls.uid = {?}', $uid); + } // we were given at least a year if ($year) { @@ -267,12 +279,16 @@ class AdminModule extends PLModule $dmin = mktime(0, 0, 0, 1, 1, $year); $dmax = mktime(0, 0, 0, 1, 1, $year+1); } - $where[] = "start >= " . date("Ymd000000", $dmin); - $where[] = "start < " . date("Ymd000000", $dmax); + $where[] = "ls.start >= " . date("Ymd000000", $dmin); + $where[] = "ls.start < " . date("Ymd000000", $dmax); + } + + if ($action != 0) { + $where[] = XDB::format('la.id = {?}', $action); } if (!empty($where)) { - return ' WHERE ' . implode($where, " AND "); + return 'WHERE ' . implode($where, ' AND '); } else { return ''; } @@ -320,6 +336,7 @@ class AdminModule extends PLModule $month = Env::i('month', intval(date('m'))); $day = Env::i('day', intval(date('d'))); } + $action = Post::i('action'); if (!$year) $month = 0; @@ -339,19 +356,30 @@ class AdminModule extends PLModule $page->assign('days', $this->_getDays($year, $month)); $page->assign('day', $day); + // Retrieve available actions + $page->assign('actions', $this->_getActions()); + $page->assign('action', $action); + $page->assign('loguser', $loguser); // smarty assignments if ($loguid || $year) { // get the requested sessions - $where = $this->_makeWhere($year, $month, $day, $loguid); - $select = "SELECT s.id, s.start, s.uid, - a.hruid as username - FROM log_sessions AS s - INNER JOIN accounts AS a ON (a.uid = s.uid) - $where - ORDER BY start DESC"; + $where = $this->_makeWhere($year, $month, $day, $action, $loguid); + if ($action != 0) { + $join = 'INNER JOIN log_events AS le ON (ls.id = le.session) + INNER JOIN log_actions AS la ON (le.action = la.id)'; + } else { + $join = ''; + } + $select = 'SELECT ls.id, ls.start, ls.uid, a.hruid as username + FROM log_sessions AS ls + INNER JOIN accounts AS a ON (a.uid = ls.uid) + ' . $join . ' + ' . $where . ' + GROUP BY ls.id + ORDER BY ls.start DESC'; $res = XDB::iterator($select); $sessions = array(); @@ -362,11 +390,11 @@ class AdminModule extends PLModule array_reverse($sessions); // attach events - $sql = "SELECT s.id, a.text - FROM log_sessions AS s - LEFT JOIN log_events AS e ON(e.session=s.id) - INNER JOIN log_actions AS a ON(a.id=e.action) - $where"; + $sql = 'SELECT ls.id, la.text + FROM log_sessions AS ls + LEFT JOIN log_events AS le ON (le.session = ls.id) + INNER JOIN log_actions AS la ON (la.id = le.action) + ' . $where; $res = XDB::iterator($sql); while ($event = $res->next()) { @@ -451,23 +479,25 @@ class AdminModule extends PLModule $to_update['weak_password'] = null; } else if (Post::has('update_account')) { if (!$user->hasProfile()) { + require_once 'name.func.inc.php'; $name_update = false; - if (Post::s('lastname') != $user->lastname) { - $to_update['lastname'] = Post::s('lastname'); + $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' && Post::s('firstname') != $user->firstname) { - $to_update['firstname'] = Post::s('firstname'); + if (Post::s('type') != 'virtual' && $firstname != $user->firstname) { + $to_update['firstname'] = $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('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'); @@ -518,10 +548,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)) { @@ -709,7 +740,7 @@ class AdminModule extends PLModule // Displays last login and last host information. $res = XDB::query("SELECT start, host FROM log_sessions - WHERE uid = {?} AND suid = 0 + WHERE uid = {?} AND suid IS NULL ORDER BY start DESC LIMIT 1", $user->id()); list($lastlogin,$host) = $res->fetchOneRow(); @@ -733,7 +764,7 @@ class AdminModule extends PLModule $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 + $page->assign('profiles', XDB::iterator('SELECT p.pid, p.hrpid, FIND_IN_SET(\'owner\', ap.perms) AS owner, p.ax_id FROM account_profiles AS ap INNER JOIN profiles AS p ON (ap.pid = p.pid) WHERE ap.uid = {?}', $user->id())); @@ -811,9 +842,11 @@ 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'); @@ -851,14 +884,21 @@ class AdminModule extends PLModule default: $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]); if ($type == 'x') { $xorgId = Profile::getXorgId($infos[4]); @@ -872,25 +912,26 @@ 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 ({?}, {?}, {?}, {?}, {?})', - $pid, $infos[0], $infos[0], $infos[1], $infos[1]); + $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); + $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, lastname, firstname, sex) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, - $infos[1], $infos[0], $infos[1], $sex); + 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 ({?}, {?}, {?})', @@ -907,14 +948,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]; + $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, - display_name, lastname, firstname, sex) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + sort_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]; + $sortName ,$firstname, $lastname, $firstname, $sex); + $newAccounts[$infos['hrid']] = $fullName; } } } @@ -1996,6 +2040,107 @@ class AdminModule extends PLModule } } + + function handler_admin_name($page, $hruid = null) + { + $page->changeTpl('admin/admin_name.tpl'); + + if (Post::has('id')) { + $user = User::get(Post::t('id')); + if (is_null($user)) { + $page->trigError("L'identifiant donné ne correspond à personne ou est ambigu."); + exit(); + } + pl_redirect('admin/name/' . $user->hruid); + } + + $user = User::getSilent($hruid); + if (!is_null($user)) { + require_once 'name.func.inc.php'; + + if ($user->hasProfile()) { + $name_types = array( + 'lastname_main' => 'Nom patronymique', + 'lastname_marital' => 'Nom marital', + 'lastname_ordinary' => 'Nom usuel', + 'firstname_main' => 'Prénom', + 'firstname_ordinary' => 'Prénom usuel', + 'pseudonym' => 'Pseudonyme' + ); + $names = XDB::fetchOneAssoc('SELECT lastname_main, lastname_marital, lastname_ordinary, + firstname_main, firstname_ordinary, pseudonym + FROM profile_public_names + WHERE pid = {?}', + $user->profile()->id()); + } else { + $name_types = array( + 'lastname' => 'Nom', + 'firstname' => 'Prénom' + ); + $names = XDB::fetchOneAssoc('SELECT lastname, firstname + FROM accounts + WHERE uid = {?}', + $user->id()); + } + + if (Post::has('correct')) { + $new_names = array(); + $update = true; + foreach ($name_types as $key => $fullname) { + $new_names[$key] = Post::t($key); + if (mb_strtolower($new_names[$key]) != mb_strtolower($names[$key])) { + $update = false; + } + } + + if ($update) { + if ($user->hasProfile()) { + update_public_names($user->profile()->id(), $new_names); + update_display_names($user->profile(), $new_names); + } else { + $new_names['full_name'] = build_full_name($new_names['firstname'], $new_names['lastname']); + $new_names['directory_name'] = build_directory_name($new_names['firstname'], $new_names['lastname']); + $new_names['sort_name'] = build_sort_name($new_names['firstname'], $new_names['lastname']); + XDB::execute('UPDATE accounts + SET lastname = {?}, firstname = {?}, full_name = {?}, + directory_name = {?}, sort_name = {?} + WHERE uid = {?}', + $new_names['lastname'], $new_names['firstname'], $new_names['full_name'], + $new_names['directory_name'], $new_names['sort_name'], $user->id()); + } + $page->trigSuccess('Mise à jour réussie.'); + } else { + $page->trigError('Seuls des changements de casse sont autorisés ici.'); + } + } + + if ($user->hasProfile()) { + $names = XDB::fetchOneAssoc('SELECT lastname_main, lastname_marital, lastname_ordinary, + firstname_main, firstname_ordinary, pseudonym + FROM profile_public_names + WHERE pid = {?}', + $user->profile()->id()); + } else { + $names = XDB::fetchOneAssoc('SELECT lastname, firstname + FROM accounts + WHERE uid = {?}', + $user->id()); + } + + foreach ($names as $key => $name) { + $names[$key] = array( + 'value' => $name, + 'standard' => capitalize_name($name) + ); + $names[$key]['different'] = ($names[$key]['value'] != $names[$key]['standard']); + } + + $page->assign('uid', $user->id()); + $page->assign('hruid', $user->hruid); + $page->assign('names', $names); + $page->assign('name_types', $name_types); + } + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: