X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=ef9fa0e02ed687aa4e64a7ccd6374cb6b6c2455b;hb=89fcda94efa5fa0eaf7184f0f964430388624ce3;hp=af011ea8edffed8e6ba7c49b17bd86cf2ac1684e;hpb=669cb0e010526f24b234de22753cbfbb24971522;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index af011ea..ef9fa0e 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -27,6 +27,7 @@ class AdminModule extends PLModule 'phpinfo' => $this->make_hook('phpinfo', 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/homonyms' => $this->make_hook('homonyms', AUTH_MDP, 'admin'), @@ -459,7 +460,7 @@ class AdminModule extends PLModule break; case "clean_fwd": if (!empty($val)) { - $redirect->cleanErrors($val); + $redirect->clean_errors($val); } break; case "add_alias": @@ -548,6 +549,11 @@ class AdminModule extends PLModule promo = $promo, comment = '".addslashes($comm)."' WHERE user_id = '{$mr['user_id']}'"; + if ($perms == 'disabled' && $old_fields['perms'] != 'disabled') { + // A user has been banned ==> ensure his php session has been killed + // This solution is ugly and overkill, but, it should be efficient. + kill_sessions(); + } if (XDB::execute($query)) { user_reindex($mr['user_id']); @@ -559,7 +565,7 @@ class AdminModule extends PLModule $mailer->assign('old', $old_fields); $mailer->assign('new', $new_fields); $mailer->send(); - + // update number of subscribers (perms or deceased may have changed) update_NbIns(); @@ -586,7 +592,7 @@ class AdminModule extends PLModule 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) { + if ($account->active() && $account->sync_password) { $account->set_password($pass_encrypted); } } @@ -835,6 +841,21 @@ class AdminModule extends PLModule $page->assign('decedes', $res); } + function handler_dead_but_active(&$page) { + $page->changeTpl('admin/dead_but_active.tpl'); + $page->assign('xorg_title','Polytechnique.org - Administration - Décédés'); + + $res = XDB::iterator( + "SELECT u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, a.alias, DATE(MAX(s.start)) AS last + FROM auth_user_md5 AS u + LEFT JOIN aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie') + LEFT JOIN logger.sessions AS s ON (s.uid = u.user_id AND suid = 0) + WHERE perms IN ('admin', 'user') AND deces <> 0 + GROUP BY u.user_id + ORDER BY u.promo, u.nom"); + $page->assign('dead', $res); + } + function handler_synchro_ax(&$page, $user = null, $action = null) { $page->changeTpl('admin/synchro_ax.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Synchro AX'); @@ -1080,17 +1101,18 @@ class AdminModule extends PLModule switch (Post::v('action')) { case 'create': if (trim(Post::v('ipN')) != '') { - Xdb::execute('INSERT IGNORE INTO ip_watch (ip, state, detection, last, uid, description) - VALUES ({?}, {?}, CURDATE(), NOW(), {?}, {?})', - ip_to_uint(trim(Post::v('ipN'))), Post::v('stateN'), S::i('uid'), Post::v('descriptionN')); + Xdb::execute('INSERT IGNORE INTO ip_watch (ip, mask, state, detection, last, uid, description) + VALUES ({?}, {?}, {?}, CURDATE(), NOW(), {?}, {?})', + ip_to_uint(trim(Post::v('ipN'))), ip_to_uint(trim(Post::v('maskN'))), + Post::v('stateN'), S::i('uid'), Post::v('descriptionN')); }; break; case 'edit': Xdb::execute('UPDATE ip_watch - SET state = {?}, last = NOW(), uid = {?}, description = {?} + SET state = {?}, last = NOW(), uid = {?}, description = {?}, mask = {?} WHERE ip = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), - ip_to_uint(Post::v('ipN'))); + ip_to_uint(Post::v('maskN')), ip_to_uint(Post::v('ipN'))); break; default: @@ -1107,7 +1129,7 @@ class AdminModule extends PLModule $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 + w.mask, w.detection, w.state, a.alias AS forlife FROM 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) @@ -1118,13 +1140,15 @@ class AdminModule extends PLModule $table = array(); $props = array(); - while (list($ip, $host, $date, $state, $forlife) = $it->next()) { + while (list($ip, $host, $mask, $date, $state, $forlife) = $it->next()) { $ip = uint_to_ip($ip); + $mask = uint_to_ip($mask); if (count($props) == 0 || $props['ip'] != $ip) { if (count($props) > 0) { $table[] = $props; } $props = array('ip' => $ip, + 'mask' => $mask, 'host' => $host, 'detection' => $date, 'state' => $state, @@ -1138,7 +1162,7 @@ class AdminModule extends PLModule } $page->assign('table', $table); } elseif ($action == 'edit') { - $sql = "SELECT w.detection, w.state, w.last, w.description, + $sql = "SELECT w.detection, w.state, w.last, w.description, w.mask, 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') @@ -1150,9 +1174,10 @@ class AdminModule extends PLModule $it = Xdb::iterRow($sql, ip_to_uint($ip)); $props = array(); - while (list($detection, $state, $last, $description, $edit, $forlife, $host) = $it->next()) { + while (list($detection, $state, $last, $description, $mask, $edit, $forlife, $host) = $it->next()) { if (count($props) == 0) { $props = array('ip' => $ip, + 'mask' => uint_to_ip($mask), 'host' => $host, 'detection' => $detection, 'state' => $state,