<?php
/***************************************************************************
- * Copyright (C) 2003-2007 Polytechnique.org *
+ * Copyright (C) 2003-2008 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
function handler_user(&$page, $login = false)
{
+ global $globals;
$page->changeTpl('admin/utilisateurs.tpl');
$page->assign('xorg_title','Polytechnique.org - Administration - Edit/Su/Log');
require_once("emails.inc.php");
$_SESSION['suid'] = $_SESSION;
$r = XDB::query("SELECT id FROM aliases WHERE alias={?}", $login);
if($uid = $r->fetchOneCell()) {
- start_connexion($uid,true);
+ start_connexion($uid, true);
pl_redirect("");
}
}
LEFT JOIN aliases AS a ON (a.id = u.user_id AND type= 'a_vie')
WHERE u.user_id = {?}", $login);
} else {
- $r = XDB::query("SELECT *, a.alias AS forlife,
+ $r = XDB::query("SELECT *, a.alias AS forlife,
FIND_IN_SET('watch', u.flags) AS watch, FIND_IN_SET('femme', u.flags) AS sexe,
(year(naissance) > promo - 15 or year(naissance) < promo - 25) AS naiss_err
FROM auth_user_md5 AS u
INNER JOIN aliases AS a ON ( a.id = u.user_id AND a.alias={?} AND type!='homonyme' )", $login);
- }
+ }
$mr = $r->fetchOneAssoc();
if (!is_numeric($login)) { //user has a forlife
XDB::execute("UPDATE emails
SET rewrite = ''
WHERE uid = {?} AND rewrite LIKE CONCAT({?}, '@%')",
- $mr['user_id'], $val);
+ $mr['user_id'], $val);
fix_bestalias($mr['user_id']);
$page->trig($val." a été supprimé");
}
}
break;
case "add_alias":
- XDB::execute("INSERT INTO aliases (id,alias,type) VALUES ({?}, {?}, 'alias')",
- $mr['user_id'], Env::v('email'));
+ global $globals;
+ $alias = trim(Env::v('email'));
+ if (strpos($alias, '@') !== false) {
+ list($alias, $domain) = explode('@', $alias);
+ } else {
+ $domain = $globals->mail->domain;
+ }
+ if (!preg_match('/[-a-z0-9\.]+/s', $alias)) {
+ $page->trig("'$alias' n'est pas un alias valide");
+ }
+ if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) {
+ $req = new AliasReq($mr['user_id'], $alias, 'Admin request', false);
+ if ($req->commit()) {
+ $page->trig("Nouvel alias '$alias@$domain' attribué");
+ } else {
+ $page->trig("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué");
+ }
+ } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) {
+ if (XDB::execute("INSERT INTO aliases (id,alias,type) VALUES ({?}, {?}, 'alias')",
+ $mr['user_id'], $alias)) {
+ $page->trig("Nouvel alias '$alias' ajouté");
+ } else {
+ $page->trig("Impossible d'ajouter l'alias '$alias', il est probablement déjà attribué");
+ }
+ } else {
+ $page->trig("Le domaine '$domain' n'est pas valide");
+ }
break;
case "best":
$res = XDB::query($watch);
$new_fields = $res->fetchOneAssoc();
-
- $mailer = new PlMailer("admin/mail_intervention.tpl");
+
+ $mailer = new PlMailer("admin/useredit.mail.tpl");
$mailer->assign("user", S::v('forlife'));
$mailer->assign('old', $old_fields);
$mailer->assign('new', $new_fields);
$mailer->send();
+
+ // update number of subscribers (perms or deceased may have changed)
+ update_NbIns();
$page->trig("updaté correctement.");
}
set_new_usage($mr['user_id'], Env::v('nomusageN'), make_username(Env::v('prenomN'), Env::v('nomusageN')));
}
if (Env::v('decesN') != $mr['deces']) {
+ require_once 'notifs.inc.php';
+ register_watch_op($mr['user_id'], WATCH_DEATH, $mr['deces']);
user_clear_all_subs($mr['user_id'], false);
}
$r = XDB::query("SELECT *, a.alias AS forlife,
LEFT JOIN aliases AS a ON (a.id = u.user_id AND type= 'a_vie')
WHERE u.user_id = {?}", $mr['user_id']);
$mr = $r->fetchOneAssoc();
+
+ // If GoogleApps is enabled, the user did choose to use synchronized passwords,
+ // and the password was changed, updates the Google Apps password as well.
+ if ($globals->mailstorage->googleapps_domain && Env::v('newpass_clair') != "********") {
+ require_once 'googleapps.inc.php';
+ $account = new GoogleAppsAccount($mr['user_id'], $mr['forlife']);
+ if ($account->g_status == 'active' && $account->sync_password) {
+ $account->set_password($pass_encrypted);
+ }
+ }
+
+ // If GoogleApps is enabled, and the user is now disabled, disables the Google Apps account as well.
+ if ($globals->mailstorage->googleapps_domain &&
+ $new_fields['perms'] == 'disabled' &&
+ $new_fields['perms'] != $old_fields['perms']) {
+ require_once 'googleapps.inc.php';
+ $account = new GoogleAppsAccount($mr['user_id'], $mr['forlife']);
+ $account->suspend();
+ }
break;
// DELETE FROM auth_user_md5
case "u_kill":
user_clear_all_subs($mr['user_id']);
+ // update number of subscribers (perms or deceased may have changed)
+ update_NbIns();
$page->trig("'{$mr['user_id']}' a été désinscrit !");
- $mailer = new PlMailer("admin/mail_intervention.tpl");
+ $mailer = new PlMailer("admin/useredit.mail.tpl");
$mailer->assign("user", S::v('forlife'));
$mailer->assign("query", "\nUtilisateur $login désinscrit");
$mailer->send();
$res = XDB::iterator("SELECT alias
FROM virtual
INNER JOIN virtual_redirect USING(vid)
- WHERE type = 'user' AND redirect LIKE '" . $login . "@%'");
+ WHERE type = 'user' AND redirect LIKE '" . $mr['forlife'] . "@%'");
$page->assign('virtuals', $res);
$page->assign('aliases', XDB::iterator(
FROM aliases
WHERE id = {?} AND type!='homonyme'
ORDER BY type!= 'a_vie'", $mr["user_id"]));
- if ($mr['perms'] != 'pending') {
- $page->assign('emails',$redirect->emails);
+ if ($mr['perms'] != 'pending' && isset($redirect)) {
+ $page->assign('emails', $redirect->emails);
}
$page->assign('mr',$mr);
{
if (Env::has('promo')) {
if(Env::i('promo') > 1900 && Env::i('promo') < 2050) {
- $action = Env::v('valid_promo') == 'Ajouter des membres' ? 'add' : 'ax';
+ $action = Env::v('valid_promo') == 'Ajouter des membres' ? 'add' : 'ax';
pl_redirect('admin/promo/' . $action . '/' . Env::i('promo'));
} else {
$page->trig('Promo non valide');
}
}
}
-
+
if ($action == 'delete' && $wikipage != '') {
if (wiki_delete_page($wikipage)) {
$page->trig("La page ".$wikipage." a été supprimée.");
$page->trig("Impossible de supprimer la page ".$wikipage.".");
}
}
-
+
if ($action == 'rename' && $wikipage != '' && $wikipage2 != '' && $wikipage != $wikipage2) {
if ($changedLinks = wiki_rename_page($wikipage, $wikipage2)) {
$s = 'La page <em>'.$wikipage.'</em> a été déplacée en <em>'.$wikipage2.'</em>.';
}
function handler_ipwatch(&$page, $action = 'list', $ip = null)
- {
+ {
$page->changeTpl('admin/ipwatcher.tpl');
-
+
$states = array('safe' => 'Ne pas surveiller',
'unsafe' => 'Surveiller les inscriptions',
'dangerous' => 'Surveiller tous les accès',
if (trim(Post::v('ipN')) != '') {
Xdb::execute('INSERT IGNORE INTO ip_watch (ip, state, detection, last, uid, description)
VALUES ({?}, {?}, CURDATE(), NOW(), {?}, {?})',
- trim(Post::v('ipN')), Post::v('stateN'), S::i('uid'), Post::v('descriptionN'));
- };
- break;
-
- case 'edit':
- Xdb::execute('UPDATE ip_watch
+ ip_to_uint(trim(Post::v('ipN'))), Post::v('stateN'), S::i('uid'), Post::v('descriptionN'));
+ };
+ break;
+
+ case 'edit':
+ Xdb::execute('UPDATE ip_watch
SET state = {?}, last = NOW(), uid = {?}, description = {?}
- WHERE ip = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), Post::v('ipN'));
+ WHERE ip = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'),
+ ip_to_uint(Post::v('ipN')));
break;
-
+
default:
if ($action == 'delete' && !is_null($ip)) {
- Xdb::execute('DELETE FROM emails_watch WHERE ip = {?}', $ip);
+ Xdb::execute('DELETE FROM ip_watch WHERE ip = {?}', ip_to_uint($ip));
}
}
if ($action != 'create' && $action != 'edit') {
$page->assign('action', $action);
if ($action == 'list') {
- $sql = "SELECT w.ip, IF(w.ip = s.ip, s.host, s.forward_host), w.detection, w.state, a.alias AS forlife
+ $sql = "SELECT w.ip, IF(s.ip IS NULL,
+ IF(w.ip = s2.ip, s2.host, s2.forward_host),
+ IF(w.ip = s.ip, s.host, s.forward_host)),
+ w.detection, w.state, a.alias AS forlife
FROM ip_watch AS w
- LEFT JOIN logger.sessions AS s ON (s.ip = w.ip OR s.forward_ip = w.ip)
- LEFT JOIN aliases AS a ON (a.id = s.uid AND a.type = 'a_vie')
+ 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 aliases AS a ON (a.id = s.uid AND a.type = 'a_vie')
GROUP BY w.ip, a.alias
ORDER BY w.state, w.ip, a.alias";
$it = Xdb::iterRow($sql);
$table = array();
$props = array();
while (list($ip, $host, $date, $state, $forlife) = $it->next()) {
+ $ip = uint_to_ip($ip);
if (count($props) == 0 || $props['ip'] != $ip) {
if (count($props) > 0) {
$table[] = $props;
$sql = "SELECT w.detection, w.state, w.last, w.description,
a1.alias AS edit, a2.alias AS forlife, s.host
FROM ip_watch AS w
- LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie')
+ LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie')
LEFT JOIN logger.sessions AS s ON (w.ip = s.ip)
LEFT JOIN aliases AS a2 ON (a2.id = s.uid AND a2.type = 'a_vie')
WHERE w.ip = {?}
GROUP BY a2.alias
ORDER BY a2.alias";
- $it = Xdb::iterRow($sql, $ip);
+ $it = Xdb::iterRow($sql, ip_to_uint($ip));
$props = array();
while (list($detection, $state, $last, $description, $edit, $forlife, $host) = $it->next()) {
$page->assign('ip', $props);
}
}
-
+
function handler_icons(&$page)
{
$page->changeTpl('admin/icons.tpl');