<?php
/***************************************************************************
- * Copyright (C) 2003-2009 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
'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/synchro_ax' => $this->make_hook('synchro_ax', AUTH_MDP, 'admin'),
'admin/user' => $this->make_hook('user', AUTH_MDP, 'admin'),
- 'admin/promo' => $this->make_hook('promo', AUTH_MDP, 'admin'),
+ 'admin/add_accounts' => $this->make_hook('add_accounts', AUTH_MDP, 'admin'),
'admin/validate' => $this->make_hook('validate', AUTH_MDP, 'admin'),
'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_MDP, 'admin'),
'admin/wiki' => $this->make_hook('wiki', AUTH_MDP, 'admin'),
MONTH(MAX(start)), MONTH(MIN(start)),
DAYOFMONTH(MAX(start)),
DAYOFMONTH(MIN(start))
- FROM #logger#.sessions");
+ FROM log_sessions");
list($ymax, $ymin, $mmax, $mmin, $dmax, $dmin) = $res->fetchOneRow();
if (($year < $ymin) || ($year == $ymin && $month < $mmin)) {
if ($year) {
$res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)),
MONTH(MAX(start)), MONTH(MIN(start))
- FROM #logger#.sessions");
+ FROM log_sessions");
list($ymax, $ymin, $mmax, $mmin) = $res->fetchOneRow();
if (($year < $ymin) || ($year > $ymax)) {
$years[0] = "----";
// retrieve available years
- $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM #logger#.sessions");
+ $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM log_sessions");
list($max, $min) = $res->fetchOneRow();
for($i = intval($min); $i<=$max; $i++) {
// we are viewing a session
$res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer
- FROM #logger#.sessions AS ls
+ FROM log_sessions AS ls
LEFT JOIN #x4dat#.aliases AS a ON (a.id = ls.uid AND a.type='a_vie')
LEFT JOIN #x4dat#.aliases AS sa ON (sa.id = ls.suid AND sa.type='a_vie')
WHERE ls.id = {?}", $arg);
$page->assign('session', $a = $res->fetchOneAssoc());
$res = XDB::iterator('SELECT a.text, e.data, e.stamp
- FROM #logger#.events AS e
- LEFT JOIN #logger#.actions AS a ON e.action=a.id
+ FROM log_events AS e
+ LEFT JOIN log_actions AS a ON e.action=a.id
WHERE e.session={?}', $arg);
while ($myarr = $res->next()) {
$page->append('events', $myarr);
$where = $this->_makeWhere($year, $month, $day, $loguid);
$select = "SELECT s.id, s.start, s.uid,
a.alias as username
- FROM #logger#.sessions AS s
+ FROM log_sessions AS s
LEFT JOIN #x4dat#.aliases AS a ON (a.id = s.uid AND a.type='a_vie')
$where
ORDER BY start DESC";
// attach events
$sql = "SELECT s.id, a.text
- FROM #logger#.sessions AS s
- LEFT JOIN #logger#.events AS e ON(e.session=s.id)
- INNER JOIN #logger#.actions AS a ON(a.id=e.action)
+ 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";
$res = XDB::iterator($sql);
// Displays last login and last host information.
$res = XDB::query("SELECT start, host
- FROM #logger#.sessions
+ FROM log_sessions
WHERE uid = {?} AND suid = 0
ORDER BY start DESC
LIMIT 1", $user->id());
$page->assign('bans', $bans);
}
- function getHruid($line, $key, $relation)
+ private static function getHrid($firstname, $lastname, $promo)
{
- $prenom = CSVImporter::getValue($line, 'prenom', $relation['prenom']);
- $nom = CSVImporter::getValue($line, 'nom', $relation['nom']);
- $promo = CSVImporter::getValue($line, 'promo', $relation['promo']);
-
- if ($prenom != 'NULL' && $nom != 'NULL' && $promo != 'NULL') {
- return make_forlife($prenom, $nom, $promo);
+ if ($firstname != null && $lastname != null && $promo != null) {
+ return User::makeHrid($firstname, $lastname, $promo);
}
return null;
}
- function getMatricule($line, $key, $relation)
+ private static function formatNewUser($infosLine, $separator, $promo, $size)
{
- $mat = $line['matricule'];
- $year = intval(substr($mat, 0, 3));
- $rang = intval(substr($mat, 3, 3));
- if ($year > 200) { $year /= 10; };
- if ($year < 96) {
- return null;
- } else {
- return sprintf('%04u%04u', 1900+$year, $rang);
+ $infos = explode($separator, $infosLine);
+ if (sizeof($infos) != $size) {
+ return false;
+ }
+
+ array_map('trim', $infos);
+ $hrid = self::getHrid($infos[1], $infos[0], $promo);
+ $res1 = XDB::query('SELECT COUNT(*)
+ FROM accounts
+ WHERE hruid = {?}', $hrid);
+ $res2 = XDB::query('SELECT COUNT(*)
+ FROM profiles
+ WHERE hrpid = {?}', $hrid);
+ if (is_null($hrid) || $res1->fetchOneCell() > 0 || $res2->fetchOneCell() > 0) {
+ $page->trigError("La ligne $line n'a pas été ajoutée.");
+ return false;
}
+ $infos['hrid'] = $hrid;
+ return $infos;
}
- function handler_promo(&$page, $action = null, $promo = null)
+ private static function formatSex(&$page, $sex, $line)
{
- if (Env::has('promo')) {
- if(Env::i('promo') > 1900 && Env::i('promo') < 2050) {
- $action = Env::v('valid_promo') == 'Ajouter des membres' ? 'add' : 'ax';
- pl_redirect('admin/promo/' . $action . '/' . Env::i('promo'));
- } else {
- $page->trigError('Promotion non valide.');
- }
+ switch ($sex) {
+ case 'F':
+ return PlUser::GENDER_FEMALE;
+ case 'M':
+ return PlUser::GENDER_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;
}
+ }
- $page->changeTpl('admin/promo.tpl');
- if ($promo > 1900 && $promo < 2050 && ($action == 'add' || $action == 'ax')) {
- $page->assign('promo', $promo);
- } else {
- return;
- }
+ private static function formatBirthDate($birthDate)
+ {
+ return date("Y-m-d", strtotime($birthDate));
+ }
- $importer = new CSVImporter('auth_user_md5', 'matricule');
- $importer->registerFunction('matricule', 'matricule Ecole vers X.org', array($this, 'getMatricule'));
- switch ($action) {
- case 'add':
- $fields = array('hruid', 'nom', 'nom_ini', 'prenom', 'naissance_ini',
- 'prenom_ini', 'promo', 'promo_sortie', 'flags',
- 'matricule', 'matricule_ax', 'perms');
- $importer->forceValue('hruid', array($this, 'getHruid'));
- $importer->forceValue('promo', $promo);
- $importer->forceValue('promo_sortie', $promo + 3);
- break;
- case 'ax':
- $fields = array('matricule', 'matricule_ax');
- break;
+ function handler_add_accounts(&$page, $action = null, $promo = null)
+ {
+ $page->changeTpl('admin/add_accounts.tpl');
+
+ if (Env::has('add_type') && Env::has('people')) {
+ require_once 'directory.enums.inc.php';
+ $lines = explode("\n", Env::t('people'));
+ $separator = Env::t('separator');
+ $promotion = Env::i('promotion');
+ $nameTypes = DirEnum::getOptionsArray(DirEnum::NAMETYPES);
+ $nameTypes = array_flip($nameTypes);
+
+ if (Env::t('add_type') == 'promo') {
+ $type = 'x';
+ $eduSchools = DirEnum::getOptionsArray(DirEnum::EDUSCHOOLS);
+ $eduSchools = array_flip($eduSchools);
+ $eduDegrees = DirEnum::getOptionsArray(DirEnum::EDUDEGREES);
+ $eduDegrees = array_flip($eduDegrees);
+ var_dump($eduDegrees);
+ switch (Env::t('edu_type')) {
+ case 'X':
+ $degreeid = $eduDegrees[Profile::DEGREE_X];
+ $entry_year = $promotion;
+ $grad_year = $promotion + 3;
+ $promo = 'X' . $promotion;
+ break;
+ case 'M':
+ $degreeid = $eduDegrees[Profile::DEGREE_M];
+ $grad_year = $promotion;
+ $entry_year = $promotion - 2;
+ $promo = 'M' . $promotion;
+ break;
+ case 'D':
+ $degreeid = $eduDegrees[Profile::DEGREE_D];
+ $grad_year = $promotion;
+ $entry_year = $promotion - 3;
+ $promo = 'D' . $promotion;
+ break;
+ default:
+ $page->killError("La formation n'est pas reconnue:" . Env::t('edu_type') . '.');
+ }
+
+ foreach ($lines as $line) {
+ if (($infos = self::formatNewUser($line, $separator, $promotion, 6))
+ && ($sex = self::formatSex($page, $infos[3], $line))) {
+ $name = $infos[1] . ' ' . $infos[0];
+ $birthDate = self::formatBirthDate($infos[2]);
+ $xorgId = Profile::getXorgId($infos[4]);
+
+ XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex)
+ VALUES ({?}, {?}, {?}, {?})',
+ $infos['hrid'], $xorgId, $infos[5], $birthDate, $sex);
+ $pid = XDB::insertId();
+ XDB::execute('INSERT INTO profile_name (pid, name, typeid)
+ VALUES ({?}, {?}, {?})',
+ $pid, $infos[0], $nameTypes['name_ini']);
+ XDB::execute('INSERT INTO profile_name (pid, name, typeid)
+ VALUES ({?}, {?}, {?})',
+ $pid, $infos[1], $nameTypes['firstname_ini']);
+ XDB::execute('INSERT INTO profile_display (pid, yourself, public_name, private_name,
+ directory_name, short_name, sort_name, promo)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $pid, $infos[1], $name, $name, $name, $name, $infos[0] . ' ' . $infos[1], $promo);
+ XDB::execute('INSERT INTO profile_education (pid, eduid, degreeid, entry_year, grad_year, flags)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?})',
+ $pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year, 'primary');
+ XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, full_name, display_name, sex)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $infos['hrid'], $type, 0, 'active', $name, $infos[1], $sex);
+ $uid = XDB::insertId();
+ XDB::execute('INSERT INTO account_profiles (uid, pid, perms)
+ VALUES ({?}, {?}, {?})',
+ $uid, $pid, 'owner');
+ }
+ }
+ } else if (Env::t('add_type') == 'account') {
+ $type = Env::t('type');
+ foreach ($lines as $line) {
+ if (($infos = self::formatNewUser($line, $separator, $type, 4))
+ && ($sex = self::formatSex(&$page, $infos[3], $line))) {
+ XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, display_name, sex)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $infos['hrid'], $type, 0, 'active', $infos[2], $infos[1] . ' ' . $infos[0], $infos[1], $sex);
+ }
+ }
+ } else if (Env::t('add_type') == 'ax_id') {
+ $type = 'x';
+ foreach ($lines as $line) {
+ if ($infos = self::formatNewUser($line, $separator, $promotion, 3)) {
+ XDB::execute('UPDATE profiles
+ SET ax_id = {?}
+ WHERE hrpid = {?}',
+ $infos[2], $infos['hrid']);
+ }
+ }
+ }
+
+ if ($page->nb_errs == 0) {
+ $page->trigSuccess("L'opération a été effectuée avec succès.");
+ } else {
+ $page->trigSuccess("L'opération a été effectuée avec succès, sauf pour les "
+ . $page->nb_errs . 'erreurs signalées ci-dessus.');
+ }
+ } else if (Env::has('add_type')) {
+ $res = XDB::query('SELECT type
+ FROM account_types');
+ $page->assign('account_types', $res->fetchColumn());
+ $page->assign('add_type', Env::s('add_type'));
}
- $importer->apply($page, "admin/promo/$action/$promo", $fields);
}
function handler_homonyms(&$page, $op = 'list', $target = null)
XDB::execute("UPDATE aliases
SET type = 'homonyme', expire=NOW()
WHERE alias = {?}", $loginbis);
- XDB::execute("REPLACE INTO homonymes (homonyme_id,user_id)
+ XDB::execute("REPLACE INTO homonyms (homonyme_id,user_id)
VALUES ({?}, {?})", $target, $target);
send_robot_homonyme($user, $loginbis);
$op = 'list';
IF(h.homonyme_id = s.id, a.type, NULL) AS type,
ac.uid AS user_id
FROM aliases AS a
- LEFT JOIN homonymes AS h ON (h.homonyme_id = a.id)
+ LEFT JOIN homonyms AS h ON (h.homonyme_id = a.id)
INNER JOIN aliases AS s ON (s.id = h.user_id AND s.type='a_vie')
INNER JOIN accounts AS ac ON (ac.uid = a.id)
WHERE a.type = 'homonyme' OR a.expire != ''
INNER JOIN #x4dat#.account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms))
INNER JOIN #x4dat#.profiles AS p ON (p.pid = ap.pid)
INNER JOIN #x4dat#.profile_display AS pd ON (pd.pid = p.pid)
- LEFT JOIN #logger#.sessions AS s ON (s.uid = a.uid AND suid = 0)
+ LEFT JOIN log_sessions AS s ON (s.uid = a.uid AND suid = 0)
WHERE a.state = 'active' AND p.deathdate IS NOT NULL
GROUP BY a.uid
ORDER BY pd.promo, pd.sort_name");
{
$page->setTitle('Administration - Actions');
$page->assign('title', 'Gestion des actions de logger');
- $table_editor = new PLTableEditor('admin/logger/actions','#logger#.actions','id');
+ $table_editor = new PLTableEditor('admin/logger/actions','log_actions','id');
$table_editor->describe('text','intitulé',true);
$table_editor->describe('description','description',true);
$table_editor->apply($page, $action, $id);
{
$page->setTitle('Administration - Coupures');
$page->assign('title', 'Gestion des coupures');
- $table_editor = new PLTableEditor('admin/downtime','coupures','id');
+ $table_editor = new PLTableEditor('admin/downtime','downtimes','id');
$table_editor->describe('debut','date',true);
$table_editor->describe('duree','durée',false);
$table_editor->describe('resume','résumé',true);
IF(w.ip = s.ip, s.host, s.forward_host)),
w.mask, w.detection, w.state, a.hruid
FROM #x4dat#.ip_watch AS w
- LEFT JOIN #logger#.sessions AS s ON (s.ip = w.ip)
- LEFT JOIN #logger#.sessions AS s2 ON (s2.forward_ip = w.ip)
+ LEFT JOIN log_sessions AS s ON (s.ip = w.ip)
+ LEFT JOIN log_sessions AS s2 ON (s2.forward_ip = w.ip)
LEFT JOIN #x4dat#.accounts AS a ON (a.uid = s.uid)
GROUP BY w.ip, a.hruid
ORDER BY w.state, w.ip, a.hruid";
a1.hruid AS edit, a2.hruid AS hruid, s.host
FROM #x4dat#.ip_watch AS w
LEFT JOIN #x4dat#.accounts AS a1 ON (a1.uid = w.uid)
- LEFT JOIN #logger#.sessions AS s ON (w.ip = s.ip)
+ LEFT JOIN log_sessions AS s ON (w.ip = s.ip)
LEFT JOIN #x4dat#.accounts AS a2 ON (a2.uid = s.uid)
WHERE w.ip = {?}
GROUP BY a2.hruid
$selectedJob = Env::has('selectedJob');
XDB::execute("DELETE FROM profile_phones
- WHERE uid = {?} AND link_type = 'hq'",
+ WHERE pid = {?} AND link_type = 'hq'",
$id);
XDB::execute("DELETE FROM profile_addresses
WHERE jobid = {?} AND type = 'hq'",
Env::t('name'), Env::t('acronym'), Env::t('url'), Env::t('email'),
Env::t('NAF_code'), Env::i('AX_code'), Env::i('holdingId'), $id);
- XDB::execute("INSERT INTO profile_phones (uid, link_type, link_id, tel_id, tel_type,
+ XDB::execute("INSERT INTO profile_phones (pid, link_type, link_id, tel_id, tel_type,
search_tel, display_tel, pub)
VALUES ({?}, 'hq', 0, 0, 'fixed', {?}, {?}, 'public'),
({?}, 'hq', 0, 1, 'fax', {?}, {?}, 'public')",
t.display_tel AS tel, f.display_tel AS fax, a.text AS address
FROM profile_job_enum AS e
LEFT JOIN profile_job_enum AS h ON (e.holdingid = h.id)
- LEFT JOIN profile_phones AS t ON (t.uid = e.id AND link_type = 'hq' AND tel_id = 0)
- LEFT JOIN profile_phones AS f ON (f.uid = e.id AND link_type = 'hq' AND tel_id = 1)
+ LEFT JOIN profile_phones AS t ON (t.pid = e.id AND link_type = 'hq' AND tel_id = 0)
+ LEFT JOIN profile_phones AS f ON (f.pid = e.id AND link_type = 'hq' AND tel_id = 1)
LEFT JOIN profile_addresses AS a ON (a.jobid = e.id AND a.type = 'hq')
WHERE e.id = {?}",
$id);