<?php
/***************************************************************************
- * Copyright (C) 2003-2011 Polytechnique.org *
+ * Copyright (C) 2003-2014 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
'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')
);
}
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.
* @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) {
$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 '';
}
$month = Env::i('month', intval(date('m')));
$day = Env::i('day', intval(date('d')));
}
+ $action = Post::i('action');
if (!$year)
$month = 0;
$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();
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()) {
$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');
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)) {
if (Post::i('del_profile', 0) != 0) {
XDB::execute('DELETE FROM account_profiles
WHERE uid = {?} AND pid = {?}',
- $user->id(), Post::i('del_profile'));
+ $user->id(), Post::i('del_profile'));
+ XDB::execute('DELETE FROM profiles
+ WHERE pid = {?}',
+ Post::i('del_profile'));
} else if (!Post::blank('new_profile')) {
$profile = Profile::get(Post::t('new_profile'));
if (!$profile) {
// 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();
$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()));
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');
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]);
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);
+ sort_name, display_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 ({?}, {?}, {?})',
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;
}
}
}
$r = XDB::iterator('SHOW COLUMNS FROM requests_answers');
while (($a = $r->next()) && $a['Field'] != 'category');
- $page->assign('categories', $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1))));
+ $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1)));
+ sort($categories);
+ $page->assign('categories', $categories);
$hidden = array();
$res = XDB::query('SELECT hidden_requests
$table_editor->describe('type', 'Catégorie', true);
$table_editor->describe('perms', 'Permissions associées', true);
$table_editor->apply($page, $action, $id);
+
+ $page->trigWarning(
+ 'Le niveau de visibilité "ax", utilisé par la permission "directory_ax", ' .
+ 'correspond à la visibilité dans l\'annuaire papier.');
}
function handler_wiki($page, $action = 'list', $wikipage = null, $wikipage2 = null)
} else {
XDB::execute('UPDATE profile_job_enum
SET name = {?}, acronym = {?}, url = {?}, email = {?},
- NAF_code = {?}, AX_code = {?}, holdingid = {?}
+ SIREN_code = {?}, NAF_code = {?}, AX_code = {?}, holdingid = {?}
WHERE id = {?}',
Env::t('name'), Env::t('acronym'), Env::t('url'), Env::t('email'),
+ (Env::t('SIREN') == 0 ? null : Env::t('SIREN')),
(Env::t('NAF_code') == 0 ? null : Env::t('NAF_code')),
(Env::i('AX_code') == 0 ? null : Env::t('AX_code')),
(Env::i('holdingId') == 0 ? null : Env::t('holdingId')), $id);
}
if (!Env::has('change') && $id != -1) {
- $res = XDB::query("SELECT e.id, e.name, e.acronym, e.url, e.email, e.NAF_code, e.AX_code,
+ $res = XDB::query("SELECT e.id, e.name, e.acronym, e.url, e.email, e.SIREN_code AS SIREN, e.NAF_code, e.AX_code,
h.id AS holdingId, h.name AS holdingName, h.acronym AS holdingAcronym,
t.display_tel AS tel, f.display_tel AS fax, a.text AS address
FROM profile_job_enum AS e
}
}
+
+ 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:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
?>
projects / platal.git / blobdiff