X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=9eb2a64000e46e7f016afae39a58015bfac2b77f;hb=381a3df024fca8735efe69b73d303ca456336f2e;hp=99e594ae7e955e14e4c69d2dc6039e5984862fdd;hpb=eaf30d86cc99df2414cf4f171a9b0f11b0561e3b;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 99e594a..9eb2a64 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -1,6 +1,6 @@ changeTpl('admin/utilisateurs.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Edit/Su/Log'); require_once("emails.inc.php"); @@ -382,7 +383,7 @@ class AdminModule extends PLModule $_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(""); } } @@ -553,11 +554,14 @@ class AdminModule extends PLModule $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."); } @@ -566,6 +570,8 @@ class AdminModule extends PLModule 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, @@ -574,13 +580,34 @@ class AdminModule extends PLModule 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(); @@ -1032,19 +1059,20 @@ class AdminModule extends PLModule 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')); + 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') { @@ -1053,10 +1081,14 @@ class AdminModule extends PLModule $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); @@ -1064,6 +1096,7 @@ class AdminModule extends PLModule $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; @@ -1091,7 +1124,7 @@ class AdminModule extends PLModule 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()) {