<?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 *
'phpinfo' => $this->make_hook('phpinfo', AUTH_MDP, 'admin'),
'get_rights' => $this->make_hook('get_rights', AUTH_MDP, 'admin'),
'admin' => $this->make_hook('default', AUTH_MDP, 'admin'),
- 'admin/ax-xorg' => $this->make_hook('ax_xorg', 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/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'),
'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_MDP, 'admin'),
'admin/icons' => $this->make_hook('icons', 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'),
);
function _getDays($year, $month)
{
// give a 'no filter' option
- $months[0] = "----";
+ $days = array();
+ $days[0] = "----";
if ($year && $month) {
$day_max = Array(-1, 31, checkdate(2, 29, $year) ? 29 : 28 , 31,
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)) {
function _getMonths($year)
{
// give a 'no filter' option
+ $months = array();
$months[0] = "----";
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)) {
function _getYears()
{
// give a 'no filter' option
+ $years = array();
$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++) {
$where = array();
if ($uid)
- array_push($where, "uid='$uid'");
+ array_push($where, "s.uid='$uid'");
// we were given at least a year
if ($year) {
// we are viewing a session
$res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer
- FROM #logger#.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')
+ FROM log_sessions AS ls
+ LEFT JOIN aliases AS a ON (a.uid = ls.uid AND a.type='a_vie')
+ LEFT JOIN aliases AS sa ON (sa.uid = 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);
} else {
$loguser = $action == 'user' ? $arg : Env::v('loguser');
- $res = XDB::query('SELECT id FROM aliases WHERE alias={?}',
+ $res = XDB::query('SELECT uid FROM aliases WHERE alias={?}',
$loguser);
$loguid = $res->fetchOneCell();
$where = $this->_makeWhere($year, $month, $day, $loguid);
$select = "SELECT s.id, s.start, s.uid,
a.alias as username
- FROM #logger#.sessions AS s
- LEFT JOIN #x4dat#.aliases AS a ON (a.id = s.uid AND a.type='a_vie')
+ FROM log_sessions AS s
+ LEFT JOIN aliases AS a ON (a.uid = s.uid AND a.type='a_vie')
$where
ORDER BY start DESC";
$res = XDB::iterator($select);
// 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);
}
// Loads the user identity using the environment.
- $user = User::get($login);
- if (!$user) {
- return;
+ if ($login) {
+ $user = User::get($login);
+ }
+ if (empty($user)) {
+ pl_redirect('admin/accounts');
}
$login = $user->login();
}
// Handles specific requests (AX sync, su, ...).
- if(Post::has('logs_account')) {
+ if(Post::has('log_account')) {
pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m'));
}
- if(Post::has('su_button') && $registered) {
+ if(Post::has('su_account') && $registered) {
if (!Platal::session()->startSUID($user)) {
$page->trigError('Impossible d\'effectuer un SUID sur ' . $user->login());
} else {
}
}
+ // Handles account deletion.
+ if (Post::has('account_deletion_confirmation')) {
+ $uid = $user->id();
+ $name = $user->fullName();
+ $user->profile()->clear();
+ $user->clear(true);
+ $page->trigSuccess("L'utilisateur $name ($uid) a bien été supprimé.");
+ }
+
// Account Form {{{
$to_update = array();
if (Post::has('disable_weak_access')) {
$to_update['weak_password'] = null;
} else if (Post::has('update_account')) {
- if (Post::s('full_name') != $user->fullName()) {
- // XXX: Update profile if a profile is associated
- $to_update['full_name'] = Post::s('full_name');
- }
- if (Post::s('display_name') != $user->displayName()) {
- // XXX: Update profile if a profile is associated
- $to_update['display_name'] = Post::s('display_name');
+ if (!$user->hasProfile()) {
+ if (Post::s('full_name') != $user->fullName()) {
+ $to_update['full_name'] = Post::s('full_name');
+ }
+ 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');
+ if ($user->hasProfile()) {
+ XDB::execute('UPDATE profiles
+ SET sex = {?}
+ WHERE pid = {?}',
+ Post::s('sex'), $user->profile()->id());
+ }
}
- if (!Post::blank('hashpass')) {
- $to_update['password'] = Post::s('hashpass');
- // TODO: Propagate the password update to GoogleApps, when required. Eg:
- // $account = new GoogleAppsAccount($user);
- // if ($account->active() && $account->sync_password) {
- // $account->set_password($pass_encrypted);
- // }
+ if (!Post::blank('pwhash')) {
+ $to_update['password'] = Post::s('pwhash');
+ require_once 'googleapps.inc.php';
+ $account = new GoogleAppsAccount($user);
+ if ($account->active() && $account->sync_password) {
+ $account->set_password(Post::s('pwhash'));
+ }
}
if (!Post::blank('weak_password')) {
$to_update['weak_password'] = Post::s('weak_password');
if (Post::i('token_access', 0) != ($user->token_access ? 1 : 0)) {
$to_update['token'] = Post::i('token_access') ? rand_url_id(16) : null;
}
- if (Post::i('skin', 0) != $user->skin) {
- $to_update['skin'] = Post::i('skin', 0);
+ if (Post::i('skin') != $user->skin) {
+ $to_update['skin'] = Post::i('skin');
if ($to_update['skin'] == 0) {
$to_update['skin'] = null;
}
}
}
if (!empty($to_update)) {
- // TODO: fetch the initial values of the fields, and eventually send
- // a summary of the changes to an admin.
+ $res = XDB::query('SELECT *
+ FROM accounts
+ WHERE uid = {?}', $user->id());
+ $oldValues = $res->fetchAllAssoc();
+ $oldValues = $oldValues[0];
+
$set = array();
+ $diff = array();
foreach ($to_update as $k => $value) {
- $set[] = XDB::format($k . ' = {?}', $value);
+ $value = XDB::format('{?}', $value);
+ $set[] = $k . ' = ' . $value;
+ $diff[$k] = array($oldValues[$k], trim($value, "'"));
+ unset($oldValues[$k]);
}
XDB::execute('UPDATE accounts
- SET ' . implode(', ', $set) . '
+ SET ' . implode(', ', $set) . '
WHERE uid = ' . XDB::format('{?}', $user->id()));
$page->trigSuccess('Données du compte mise à jour avec succès');
$user = User::getWithUID($user->id());
+
+ /* Formats the $diff and send it to the site administrators. The rules are the folowing:
+ * -formats: password, token, weak_password
+ */
+ foreach (array('password', 'token', 'weak_password') as $key) {
+ if (isset($diff[$key])) {
+ $diff[$key] = array('old value', 'new value');
+ } else {
+ $oldValues[$key] = 'old value';
+ }
+ }
+
+ $mail = new PlMailer('admin/useredit.mail.tpl');
+ $mail->assign('admin', S::user()->hruid);
+ $mail->assign('hruid', $user->hruid);
+ $mail->assign('diff', $diff);
+ $mail->assign('oldValues', $oldValues);
+ $mail->send();
}
// }}}
$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 (id, alias, type)
+ $res = XDB::execute("INSERT INTO aliases (uid, alias, type)
VALUES ({?}, {?}, 'alias')",
$user->id(), $alias);
$page->trigSuccess("Nouvel alias '$alias' ajouté");
}
} else if (!Post::blank('del_alias')) {
XDB::execute("DELETE FROM aliases
- WHERE id = {?} AND alias = {?} AND
+ WHERE uid = {?} AND alias = {?} AND
type NOT IN ('a_vie', 'homonyme')",
$user->id(), $val);
XDB::execute("UPDATE emails
} else if (!Post::blank('best')) {
XDB::execute("UPDATE aliases
SET flags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', flags, ','), ',bestalias,', ','))
- WHERE id = {?}", $user->id());
+ WHERE uid = {?}", $user->id());
XDB::execute("UPDATE aliases
SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias')
- WHERE id = {?} AND alias = {?}", $user->id(), $val);
+ WHERE uid = {?} AND alias = {?}", $user->id(), $val);
// 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.
}
// }}}
+ // OpenId form {{{
+ if (Post::has('del_openid')) {
+ XDB::execute('DELETE FROM account_auth_openid
+ WHERE id = {?}', Post::i('del_openid'));
+ }
+ // }}}
+
// Forum form {{{
if (Post::has('b_edit')) {
XDB::execute("DELETE FROM forum_innd
// }}}
- $page->addJsLink('ui.core.js');
- $page->addJsLink('ui.tabs.js');
+ $page->addJsLink('jquery.ui.core.js');
+ $page->addJsLink('jquery.ui.tabs.js');
+ $page->addJsLink('password.js');
// 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('aliases', XDB::iterator("SELECT alias, type='a_vie' AS for_life,
FIND_IN_SET('bestalias',flags) AS best, expire
FROM aliases
- WHERE id = {?} AND type != 'homonyme'
+ WHERE uid = {?} AND type != 'homonyme'
ORDER BY type != 'a_vie'", $user->id()));
$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'));
FROM account_profiles AS ap
INNER JOIN profiles AS p ON (ap.pid = p.pid)
WHERE ap.uid = {?}', $user->id()));
+ $page->assign('openid', XDB::iterator('SELECT id, url
+ FROM account_auth_openid
+ WHERE uid = {?}', $user->id()));
// Displays email redirection and the general profile.
if ($registered && $redirect) {
}
$page->assign('user', $user);
+ $page->assign('hasProfile', $user->hasProfile());
// Displays forum bans.
$res = XDB::query("SELECT write_perm, read_perm, comment
$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(&$page, $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 || sizeof($infos) < 2) {
+ $page->trigError("La ligne $infosLine n'a pas été ajoutée.");
+ 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 $infosLine 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')) {
+ $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);
+ $eduDegrees = array_flip($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($page, $line, $separator, $promotion, 6)) {
+ $sex = self::formatSex($page, $infos[3], $line);
+ if (!is_null($sex)) {
+ $fullName = $infos[1] . ' ' . $infos[0];
+ $directoryName = $infos[0] . ' ' . $infos[1];
+ $birthDate = self::formatBirthDate($infos[2]);
+ $xorgId = Profile::getXorgId($infos[4]);
+ 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);
+ $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], $fullName, $fullName, $directoryName, $fullName, $directoryName, $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, directory_name, display_name, sex)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $infos['hrid'], $type, 0, 'active', $fullName, $directoryName, $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');
+ $newAccounts = array();
+ foreach ($lines as $line) {
+ 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, 'active', $infos[2], $fullName, $directoryName, $infos[1], $sex);
+ $newAccounts[$infos['hrid']] = $infos[1] . ' ' . $infos[0];
+ }
+ }
+ }
+ if (!empty($newAccounts)) {
+ $page->assign('newAccounts', $newAccounts);
+ }
+ } 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']);
+ }
+ }
+ }
+
+ $errors = $page->nb_errs();
+ if ($errors == 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 '
+ . (($errors == 1) ? 'l\'erreur signalée' : "les $errors 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, uid)
VALUES ({?}, {?})", $target, $target);
send_robot_homonyme($user, $loginbis);
$op = 'list';
if ($op == 'list') {
$res = XDB::iterator(
"SELECT a.alias AS homonyme, s.alias AS forlife,
- IF(h.homonyme_id = s.id, a.expire, NULL) AS expire,
- IF(h.homonyme_id = s.id, a.type, NULL) AS type,
- ac.uid AS user_id
+ 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 homonymes 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)
+ 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);
+ $page->assign_by_ref('hnymes', $hnymes);
}
}
if ($validate) {
S::assert_xsrf_token();
- $res = XDB::iterRow('SELECT p.hrpid, pd.directory_name, p.deathdate
+ $res = XDB::iterRow('SELECT p.pid, pd.directory_name, p.deathdate
FROM profiles AS p
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
WHERE pd.promo = {?}', $promo);
while (list($pid, $name, $death) = $res->next()) {
- $val = Env::v($pid);
- if($val == $deces || empty($val)) {
+ $val = Env::v('death_' . $pid);
+ if ($val == $death) {
continue;
}
+ if (empty($val)) {
+ $val = null;
+ }
XDB::execute('UPDATE profiles
SET deathdate = {?}, deathdate_rec = NOW()
- WHERE hrpid = {?}', $val, $pid);
- $page->trigSuccess('Ajout du décès de ' . $name . ' le ' . $val . '.');
- if($death == '0000-00-00' || empty($death)) {
- // TODO: FIX THIS DEPRECATED CALL
- require_once('user.func.inc.php');
- user_clear_all_subs($uid, false); // by default, dead ppl do not loose their email
+ WHERE pid = {?}', $val, $pid);
+
+ $page->trigSuccess('Édition du décès de ' . $name . ' (' . ($val ? $val : 'ressuscité') . ').');
+ if ($val && ($death == '0000-00-00' || empty($death))) {
+ $profile = Profile::get($pid);
+ $profile->clear();
+ $profile->owner()->clear(false);
}
}
}
- $res = XDB::iterator('SELECT p.hrpid, pd.directory_name, p.deathdate
+ $res = XDB::iterator('SELECT p.pid, pd.directory_name, p.deathdate
FROM profiles AS p
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
WHERE pd.promo = {?}
ORDER BY pd.sort_name', $promo);
- $page->assign('decedes', $res);
+ $page->assign('profileList', $res);
}
function handler_dead_but_active(&$page)
$res = XDB::iterator(
"SELECT a.hruid, pd.promo, p.ax_id, pd.directory_name, p.deathdate, DATE(MAX(s.start)) AS last
- FROM #x4dat#.accounts AS a
- 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)
+ FROM accounts AS a
+ INNER JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms))
+ INNER JOIN profiles AS p ON (p.pid = ap.pid)
+ INNER JOIN profile_display AS pd ON (pd.pid = p.pid)
+ 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");
function handler_validate(&$page, $action = 'list', $id = null)
{
- $page->changeTpl('admin/valider.tpl');
+ $page->changeTpl('admin/validation.tpl');
$page->setTitle('Administration - Valider une demande');
- $page->addCssLink('nl.css');
+ $page->addCssLink('nl.css');
$page->addJsLink('ajax.js');
- require_once("validations.inc.php");
-
- if ($action == 'edit' and !is_null($id)) {
+ if ($action == 'edit' && !is_null($id)) {
$page->assign('preview_id', $id);
+ } else {
+ $page->assign('preview_id', null);
}
if(Env::has('uid') && Env::has('type') && Env::has('stamp')) {
$page->assign('categories', $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1))));
$hidden = array();
- $res = XDB::query('SELECT hidden_requests FROM requests_hidden WHERE user_id = {?}', S::v('uid'));
+ $res = XDB::query('SELECT hidden_requests
+ FROM requests_hidden
+ WHERE uid = {?}', S::v('uid'));
$hide_requests = $res->fetchOneCell();
if (Post::has('hide')) {
$hide = array();
$hide[] = $cat;
}
$hide_requests = join(',', $hide);
- XDB::query('REPLACE INTO requests_hidden (user_id, hidden_requests) VALUES({?}, {?})',
+ XDB::query('REPLACE INTO requests_hidden (uid, hidden_requests)
+ VALUES ({?}, {?})',
S::v('uid'), $hide_requests);
} elseif ($hide_requests) {
foreach (explode(',', $hide_requests) as $hide_type)
// where several copies of the site use the same DB, but not the same "dynamic configuration"
global $globals;
$globals->updateNbValid();
- $page->assign('vit', new ValidateIterator());
+ $page->assign('vit', Validate::iterate());
}
function handler_validate_answers(&$page, $action = 'list', $id = null)
{
$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);
$table_editor->apply($page, $action, $id);
}
- function handler_account_types(&$page, $action = 'list', $id = null)
+ function handler_accounts(PlPage $page)
+ {
+ $page->changeTpl('admin/accounts.tpl');
+ $page->setTitle('Administration - Comptes');
+ $page->addJsLink('password.js');
+
+ if (Post::has('create_account')) {
+ S::assert_xsrf_token();
+ $firstname = Post::t('firstname');
+ $lastname = strtoupper(Post::t('lastname'));
+ $sex = Post::b('sex') ? User::GENDER_FEMALE : User::GENDER_MALE;
+ $email = Post::t('email');
+ $type = Post::s('type');
+ $login = PlUser::makeHrid($firstname, $lastname, $type);
+ if (!isvalid_email($email)) {
+ $page->trigError("Invalid email address: $email");
+ } else if (strlen(Post::s('pwhash')) != 40) {
+ $page->trigError("Invalid password hash");
+ } else {
+ $full_name = $firstname . ' ' . $lastname;
+ $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(), {?}, {?}, {?}, {?}, {?})",
+ $login, $type, Post::s('pwhash'), $email, $full_name, $full_name, $sex,
+ $directory_name);
+ }
+ }
+
+ $uf = new UserFilter(new UFC_AccountType('ax', 'school', 'fx'));
+ $page->assign('users', $uf->iterUsers());
+
+ }
+
+ function handler_account_types(&$page, $action = 'list', $id = null)
{
$page->setTitle('Administration - Types de comptes');
$page->assign('title', 'Gestion des types de comptes');
{
if (S::hasAuthToken()) {
$page->setRssLink('Changement Récents',
- '/Site/AllRecentChanges?action=rss&user=' . S::v('hruid') . '&hash=' . S::v('token'));
+ '/Site/AllRecentChanges?action=rss&user=' . S::v('hruid') . '&hash=' . S::user()->token);
}
// update wiki perms
IF(w.ip = s2.ip, s2.host, s2.forward_host),
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 #x4dat#.accounts AS a ON (a.uid = s.uid)
+ FROM ip_watch AS w
+ 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 accounts AS a ON (a.uid = s.uid)
GROUP BY w.ip, a.hruid
ORDER BY w.state, w.ip, a.hruid";
$it = Xdb::iterRow($sql);
} elseif ($action == 'edit') {
$sql = "SELECT w.detection, w.state, w.last, w.description, w.mask,
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 #x4dat#.accounts AS a2 ON (a2.uid = s.uid)
+ FROM ip_watch AS w
+ LEFT JOIN accounts AS a1 ON (a1.uid = w.uid)
+ LEFT JOIN log_sessions AS s ON (w.ip = s.ip)
+ LEFT JOIN accounts AS a2 ON (a2.uid = s.uid)
WHERE w.ip = {?}
GROUP BY a2.hruid
ORDER BY a2.hruid";
$page->assign('icons', $icons);
}
- function handler_accounts(&$page)
+ function handler_account_watch(&$page)
{
$page->changeTpl('admin/accounts.tpl');
$page->assign('disabled', XDB::iterator('SELECT a.hruid, FIND_IN_SET(\'watch\', a.flags) AS watch,
$page->changeTpl('admin/jobs.tpl');
if (Env::has('search')) {
- $res = XDB::query("SELECT e.id, e.name, e.acronym
- FROM profile_job_enum AS e
- WHERE e.name LIKE CONCAT('% ', {?}, '%') OR e.acronym LIKE CONCAT('% ', {?}, '%')",
+ $res = XDB::query("SELECT id, name, acronym
+ FROM profile_job_enum
+ WHERE name LIKE CONCAT('%', {?}, '%') OR acronym LIKE CONCAT('%', {?}, '%')",
Env::t('job'), Env::t('job'));
if ($res->numRows() <= 20) {
}
if (Env::has('edit')) {
- // TODO: use address and phone classes to update profile_job_enum and profile_phones once they are done.
-
S::assert_xsrf_token();
$selectedJob = Env::has('selectedJob');
- XDB::execute("DELETE FROM profile_phones
- WHERE uid = {?} AND link_type = 'hq'",
- $id);
- XDB::execute("DELETE FROM profile_addresses
- WHERE jobid = {?} AND type = 'hq'",
- $id);
- XDB::execute('DELETE FROM profile_job_enum
- WHERE id = {?}',
- $id);
-
+ Phone::deletePhones(0, Phone::LINK_COMPANY, $id);
+ Address::delete(null, Address::LINK_COMPANY, $id);
if (Env::has('change')) {
XDB::execute('UPDATE profile_job
SET jobid = {?}
WHERE jobid = {?}',
Env::i('newJobId'), $id);
+ XDB::execute('DELETE FROM profile_job_enum
+ WHERE id = {?}',
+ $id);
$page->trigSuccess("L'entreprise a bien été remplacée.");
} else {
- require_once 'profil.func.inc.php';
- require_once 'geocoding.inc.php';
-
- $display_tel = format_display_number(Env::v('tel'), $error_tel);
- $display_fax = format_display_number(Env::v('fax'), $error_fax);
- $gmapsGeocoder = new GMapsGeocoder();
- $address = array('text' => Env::t('address'));
- $address = $gmapsGeocoder->getGeocodedAddress($address);
- Geocoder::getAreaId($address, 'administrativeArea');
- Geocoder::getAreaId($address, 'subAdministrativeArea');
- Geocoder::getAreaId($address, 'locality');
-
XDB::execute('UPDATE profile_job_enum
SET name = {?}, acronym = {?}, url = {?}, email = {?},
NAF_code = {?}, AX_code = {?}, holdingid = {?}
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,
- search_tel, display_tel, pub)
- VALUES ({?}, 'hq', 0, 0, 'fixed', {?}, {?}, 'public'),
- ({?}, 'hq', 0, 1, 'fax', {?}, {?}, 'public')",
- $id, format_phone_number(Env::v('tel')), $display_tel,
- $id, format_phone_number(Env::v('fax')), $display_fax);
-
- XDB::execute("INSERT INTO profile_addresses (jobid, type, id, accuracy,
- text, postalText, postalCode, localityId,
- subAdministrativeAreaId, administrativeAreaId,
- countryId, latitude, longitude, updateTime,
- north, south, east, west)
- VALUES ({?}, 'hq', 0, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?},
- {?}, {?}, FROM_UNIXTIME({?}), {?}, {?}, {?}, {?})",
- $id, $address['accuracy'], $address['text'], $address['postalText'],
- $address['postalCode'], $address['localityId'],
- $address['subAdministrativeAreaId'], $address['administrativeAreaId'],
- $address['countryId'], $address['latitude'], $address['longitude'],
- $address['updateTime'], $address['north'], $address['south'],
- $address['east'], $address['west']);
+ $phone = new Phone(array('display' => Env::v('tel'), 'link_id' => $id, 'id' => 0, 'type' => 'fixed',
+ 'link_type' => Phone::LINK_COMPANY, 'pub' => 'public'));
+ $fax = new Phone(array('display' => Env::v('fax'), 'link_id' => $id, 'id' => 1, 'type' => 'fax',
+ 'link_type' => Phone::LINK_COMPANY, 'pub' => 'public'));
+ $address = new Address(array('jobid' => $jobid, 'type' => Address::LINK_COMPANY, 'text' => Env::t('address')));
+ $phone->save();
+ $fax->save();
+ $address->save();
$page->trigSuccess("L'entreprise a bien été mise à jour.");
}
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 t.link_type = 'hq' AND t.tel_id = 0)
+ LEFT JOIN profile_phones AS f ON (f.pid = e.id AND f.link_type = 'hq' AND f.tel_id = 1)
LEFT JOIN profile_addresses AS a ON (a.jobid = e.id AND a.type = 'hq')
WHERE e.id = {?}",
$id);
projects / platal.git / blobdiff