<?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 *
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()) {
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()));
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)
+ sort_name, display_name, lastname, firstname, sex, best_domain)
VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
$infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, $sortName,
$firstname, $lastname, $firstname, $sex, $best_domain);
} else if (Env::t('add_type') == 'ax_id') {
$type = 'x';
foreach ($lines as $line) {
- if ($infos = self::formatNewUser($page, $line, $separator, $promotion, 3)) {
- XDB::execute('UPDATE profiles
- SET ax_id = {?}
- WHERE hrpid = {?}',
- $infos[2], $infos['hrid']);
+ $infos = explode($separator, $line);
+ if (sizeof($infos) > 3 || sizeof($infos) < 2) {
+ $page->trigError("La ligne $line n'a pas été ajoutée : mauvais nombre de champs.");
+ continue;
}
+ $infos = array_map('trim', $infos);
+ if (sizeof($infos) == 3) {
+ // Get human readable ID with first name and last name
+ $hrid = User::makeHrid($infos[1], $infos[0], $promotion);
+ $user = User::getSilent($hrid);
+ $axid = $infos[2];
+ } else {
+ // The first column is the hrid, possibly without the promotion
+ $user = User::getSilent($infos[0] . '.' . $promotion);
+ if (is_null($user)) {
+ $user = User::getSilent($infos[0]);
+ }
+ $axid = $infos[1];
+ }
+ if (!$axid) {
+ $page->trigError("La ligne $line n'a pas été ajoutée : matricule AX vide.");
+ continue;
+ }
+ if (is_null($user)) {
+ $page->trigError("La ligne $line n'a pas été ajoutée : aucun compte trouvé.");
+ continue;
+ }
+ $profile = $user->profile();
+ if ($profile->ax_id) {
+ $page->trigError("Le profil " . $profile->hrpid . " a déjà l'ID AX " . $profile->ax_id);
+ continue;
+ }
+ XDB::execute('UPDATE profiles
+ SET ax_id = {?}
+ WHERE pid = {?}',
+ $axid, $profile->id());
+
}
}
$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
$sex = Post::s('sex');
$email = Post::t('email');
$type = Post::s('type');
- $login = PlUser::makeHrid($firstname, $lastname, $type);
- if (!isvalid_email($email)) {
+ if (!$type) {
+ $page->trigError("Empty account type");
+ } elseif (!isvalid_email($email)) {
$page->trigError("Invalid email address: $email");
- } else if (strlen(Post::s('pwhash')) != 40) {
+ } elseif (strlen(Post::s('pwhash')) != 40) {
$page->trigError("Invalid password hash");
} else {
+ $login = PlUser::makeHrid($firstname, $lastname, $type);
$full_name = $firstname . ' ' . $lastname;
$directory_name = $lastname . ' ' . $firstname;
XDB::execute("INSERT INTO accounts (hruid, type, state, password,
$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
}
}
-// 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