X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=ef9fa0e02ed687aa4e64a7ccd6374cb6b6c2455b;hb=53ee429b076f679168fda0301651a21b00ddf0e3;hp=d9a78573ac4a20af88cce43f5c23eb881d2e036b;hpb=7cbf5d4bde73e077c71205281bbd83bc5687d557;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index d9a7857..ef9fa0e 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -1,6 +1,6 @@ $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'), @@ -351,6 +352,7 @@ class AdminModule extends PLModule 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"); @@ -382,7 +384,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(""); } } @@ -396,12 +398,12 @@ class AdminModule extends PLModule 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 @@ -435,7 +437,7 @@ class AdminModule extends PLModule 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é"); } @@ -458,12 +460,37 @@ class AdminModule extends PLModule break; case "clean_fwd": if (!empty($val)) { - $redirect->cleanErrors($val); + $redirect->clean_errors($val); } 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": @@ -522,18 +549,26 @@ 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']); $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."); } if (Env::v('nomusageN') != $mr['nom_usage']) { @@ -541,6 +576,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, @@ -549,17 +586,53 @@ 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->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->assign("deletion", true); $mailer->send(); break; + + case "b_edit": + XDB::execute("DELETE FROM forums.innd WHERE uid = {?}", $mr['user_id']); + if (Env::v('write_perm') != "" || Env::v('read_perm') != "" || Env::v('commentaire') != "" ) { + XDB::execute("INSERT INTO forums.innd + SET ipmin = '0', + ipmax = '4294967295', + write_perm = {?}, + read_perm = {?}, + comment = {?}, + priority = '200', + uid = {?}", + Env::v('write_perm'), Env::v('read_perm'), Env::v('comment'), $mr['user_id']); + } + break; } } @@ -575,7 +648,7 @@ class AdminModule extends PLModule $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( @@ -583,11 +656,18 @@ class AdminModule extends PLModule 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); + + // Bans forums + $res = XDB::query("SELECT write_perm, read_perm, comment + FROM forums.innd + WHERE uid = {?}", $mr['user_id']); + $bans = $res->fetchOneAssoc(); + $page->assign('bans', $bans); } } @@ -608,7 +688,7 @@ class AdminModule extends PLModule { 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'); @@ -761,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'); @@ -869,6 +964,7 @@ class AdminModule extends PLModule $table_editor->describe('ext','extension du screenshot',false); $table_editor->apply($page, $action, $id); } + function handler_postfix_blacklist(&$page, $action = 'list', $id = null) { $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Blacklist'); $page->assign('title', 'Blacklist de postfix'); @@ -938,7 +1034,7 @@ class AdminModule extends PLModule } } } - + if ($action == 'delete' && $wikipage != '') { if (wiki_delete_page($wikipage)) { $page->trig("La page ".$wikipage." a été supprimée."); @@ -946,7 +1042,7 @@ class AdminModule extends PLModule $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 '.$wikipage.' a été déplacée en '.$wikipage2.'.'; @@ -993,9 +1089,9 @@ class AdminModule extends PLModule } 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', @@ -1005,21 +1101,23 @@ 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(), {?}, {?})', - 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')); + 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 = {?}, mask = {?} + WHERE ip = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), + ip_to_uint(Post::v('maskN')), 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') { @@ -1028,22 +1126,29 @@ 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.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 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()) { + 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, @@ -1057,21 +1162,22 @@ 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') + 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()) { + 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, @@ -1086,7 +1192,7 @@ class AdminModule extends PLModule $page->assign('ip', $props); } } - + function handler_icons(&$page) { $page->changeTpl('admin/icons.tpl');