X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=a70bcd3266426268b1550576de6e16573b847799;hb=c53b596408c72a60815ff7f35b10c8c082ffae42;hp=9bcea6feddca6ab7e3f6485360d7de49d9ff97a1;hpb=441e9e9824010d108e999e0a27eb85174cd2fe5a;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 9bcea6f..a70bcd3 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -24,7 +24,8 @@ class AdminModule extends PLModule function handlers() { return array( - 'admin' => $this->make_hook('default', AUTH_MDP, 'admin'), + '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/deaths' => $this->make_hook('deaths', AUTH_MDP, 'admin'), 'admin/downtime' => $this->make_hook('downtime', AUTH_MDP, 'admin'), @@ -44,6 +45,12 @@ class AdminModule extends PLModule ); } + function handler_phpinfo(&$page) + { + phpinfo(); + exit; + } + function handler_default(&$page) { $page->changeTpl('admin/index.tpl'); @@ -251,7 +258,7 @@ class AdminModule extends PLModule $page->assign('session', $a = $res->fetchOneAssoc()); - $res = XDB::iterator('SELECT a.text, e.data, UNIX_TIMESTAMP(e.stamp) AS stamp + $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 WHERE e.session={?}', $arg); @@ -301,7 +308,7 @@ class AdminModule extends PLModule // get the requested sessions $where = $this->_makeWhere($year, $month, $day, $loguid); - $select = "SELECT s.id, UNIX_TIMESTAMP(s.start) as start, s.uid, + $select = "SELECT s.id, s.start, s.uid, a.alias as username FROM logger.sessions AS s LEFT JOIN aliases AS a ON (a.id = s.uid AND a.type='a_vie') @@ -338,7 +345,8 @@ class AdminModule extends PLModule $page->assign('xorg_title','Polytechnique.org - Administration - Logs des sessions'); } - function handler_user(&$page, $login = false) { + function handler_user(&$page, $login = false) + { $page->changeTpl('admin/utilisateurs.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Edit/Su/Log'); require_once("emails.inc.php"); @@ -350,12 +358,15 @@ class AdminModule extends PLModule if (Env::has('user_id')) { $login = get_user_login(Env::i('user_id')); + if (empty($login)) { + $login = Env::i('user_id'); + } } elseif (Env::has('login')) { $login = get_user_login(Env::v('login')); } if(Env::has('logs_button') && $login) { - pl_redirect("admin/logger?login=$login&year=".date('Y')."&month=".date('m')); + pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m')); } if (Env::has('ax_button') && $login) { @@ -373,12 +384,23 @@ class AdminModule extends PLModule } if ($login) { - $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON ( a.id = u.user_id AND a.alias={?} AND type!='homonyme' )", $login); + if (is_numeric($login)) { + $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe, + (year(naissance) > promo - 15 or year(naissance) < promo - 25) AS naiss_err + FROM auth_user_md5 AS u + 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, 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(); - $redirect = new Redirect($mr['user_id']); + if (!is_numeric($login)) { //user has a forlife + $redirect = new Redirect($mr['user_id']); + } // Check if there was a submission foreach($_POST as $key => $val) { @@ -401,8 +423,13 @@ class AdminModule extends PLModule case "del_alias": if (!empty($val)) { - XDB::execute("DELETE FROM aliases WHERE id={?} AND alias={?} - AND type!='a_vie' AND type!='homonyme'", $mr['user_id'], $val); + XDB::execute("DELETE FROM aliases + WHERE id={?} AND alias={?} + AND type!='a_vie' AND type!='homonyme'", $mr['user_id'], $val); + XDB::execute("UPDATE emails + SET rewrite = '' + WHERE uid = {?} AND rewrite LIKE CONCAT({?}, '@%')", + $mr['user_id'], $val); fix_bestalias($mr['user_id']); $page->trig($val." a été supprimé"); } @@ -459,8 +486,7 @@ class AdminModule extends PLModule if (XDB::execute($query)) { user_reindex($mr['user_id']); - require_once("diogenes/diogenes.hermes.inc.php"); - $mailer = new HermesMailer(); + $mailer = new PlMailer(); $mailer->setFrom("webmaster@polytechnique.org"); $mailer->addTo("web@polytechnique.org"); $mailer->setSubject("INTERVENTION de ".S::v('forlife')); @@ -470,13 +496,15 @@ class AdminModule extends PLModule $page->trig("updaté correctement."); } if (Env::v('nomusageN') != $mr['nom_usage']) { - require_once('nomusage.inc.php'); set_new_usage($mr['user_id'], Env::v('nomusageN'), make_username(Env::v('prenomN'), Env::v('nomusageN'))); } - $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (u.user_id=a.id) - WHERE user_id = {?}", $mr['user_id']); + if (Env::v('decesN') != $mr['deces']) { + user_clear_all_subs($mr['user_id'], false); + } + $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe + FROM auth_user_md5 AS u + 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(); break; @@ -484,8 +512,7 @@ class AdminModule extends PLModule case "u_kill": user_clear_all_subs($mr['user_id']); $page->trig("'{$mr['user_id']}' a été désinscrit !"); - require_once("diogenes/diogenes.hermes.inc.php"); - $mailer = new HermesMailer(); + $mailer = new PlMailer(); $mailer->setFrom("webmaster@polytechnique.org"); $mailer->addTo("web@polytechnique.org"); $mailer->setSubject("INTERVENTION de ".S::v('forlife')); @@ -495,11 +522,11 @@ class AdminModule extends PLModule } } - $res = XDB::query("SELECT UNIX_TIMESTAMP(start), host - FROM logger.sessions - WHERE uid={?} AND suid=0 - ORDER BY start DESC - LIMIT 1", $mr['user_id']); + $res = XDB::query("SELECT start, host + FROM logger.sessions + WHERE uid={?} AND suid=0 + ORDER BY start DESC + LIMIT 1", $mr['user_id']); list($lastlogin,$host) = $res->fetchOneRow(); $page->assign('lastlogin', $lastlogin); $page->assign('host', $host); @@ -509,9 +536,9 @@ class AdminModule extends PLModule FROM aliases WHERE id = {?} AND type!='homonyme' ORDER BY type!= 'a_vie'", $mr["user_id"])); - $page->assign('xorgmails', $xorgmails); - $page->assign('email_panne', $email_panne); - $page->assign('emails',$redirect->emails); + if ($mr['perms'] != 'pending') { + $page->assign('emails',$redirect->emails); + } $page->assign('mr',$mr); } @@ -520,7 +547,7 @@ class AdminModule extends PLModule $page->changeTpl('admin/homonymes.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Homonymes'); require_once("homonymes.inc.php"); - + if ($target) { if (! list($prenom,$nom,$forlife,$loginbis) = select_if_homonyme($target)) { $target=0; @@ -531,30 +558,30 @@ class AdminModule extends PLModule $page->assign('loginbis',$loginbis); } } - + $page->assign('op',$op); $page->assign('target',$target); - + // on a un $target valide, on prepare les mails if ($target) { - + // on examine l'op a effectuer switch ($op) { case 'mail': - send_warning_homonyme($prenom, $nom, $forlife, $loginbis); - switch_bestalias($target, $loginbis); + send_warning_homonyme($prenom, $nom, $forlife, $loginbis); + switch_bestalias($target, $loginbis); $op = 'list'; break; case 'correct': - switch_bestalias($target, $loginbis); + switch_bestalias($target, $loginbis); XDB::execute("UPDATE aliases SET type='homonyme',expire=NOW() WHERE alias={?}", $loginbis); XDB::execute("REPLACE INTO homonymes (homonyme_id,user_id) VALUES({?},{?})", $target, $target); - send_robot_homonyme($prenom, $nom, $forlife, $loginbis); + send_robot_homonyme($prenom, $nom, $forlife, $loginbis); $op = 'list'; break; } } - + if ($op == 'list') { $res = XDB::iterator( "SELECT a.alias AS homonyme,s.id AS user_id,s.alias AS forlife, @@ -574,11 +601,11 @@ class AdminModule extends PLModule $page->assign_by_ref('hnymes',$hnymes); } } - + function handler_ax_xorg(&$page) { $page->changeTpl('admin/ax-xorg.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - AX/X.org'); - + // liste des différences $res = XDB::query( 'SELECT u.promo,u.nom AS nom,u.prenom AS prenom,ia.nom AS nomax,ia.prenom AS prenomax,u.matricule AS mat,ia.matricule_ax AS matax @@ -589,7 +616,7 @@ class AdminModule extends PLModule OR u.prenom != ia.prenom OR (u.promo != ia.promo AND u.promo != ia.promo+1 AND u.promo != ia.promo-1) ORDER BY u.promo,u.nom,u.prenom'); $page->assign('diffs', $res->fetchAllAssoc()); - + // gens à l'ax mais pas chez nous $res = XDB::query( 'SELECT ia.promo,ia.nom,ia.nom_patro,ia.prenom @@ -597,58 +624,58 @@ class AdminModule extends PLModule LEFT JOIN auth_user_md5 AS u ON u.matricule_ax = ia.matricule_ax WHERE u.nom IS NULL'); $page->assign('mank', $res->fetchAllAssoc()); - + // gens chez nous et pas à l'ax $res = XDB::query('SELECT promo,nom,prenom FROM auth_user_md5 WHERE matricule_ax IS NULL'); $page->assign('plus', $res->fetchAllAssoc()); } - + function handler_deaths(&$page, $promo = 0, $validate = false) { $page->changeTpl('admin/deces_promo.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Deces'); - + if (!$promo) $promo = Env::i('promo'); if (Env::has('sub10')) $promo -= 10; if (Env::has('sub01')) $promo -= 1; if (Env::has('add01')) $promo += 1; if (Env::has('add10')) $promo += 10; - + $page->assign('promo',$promo); - + if ($validate) { $new_deces = array(); $res = XDB::iterRow("SELECT user_id,matricule,nom,prenom,deces FROM auth_user_md5 WHERE promo = {?}", $promo); while (list($uid,$mat,$nom,$prenom,$deces) = $res->next()) { $val = Env::v($mat); - if($val == $deces || empty($val)) continue; - XDB::execute('UPDATE auth_user_md5 SET deces={?} WHERE matricule = {?}', $val, $mat); - $new_deces[] = array('name' => "$prenom $nom", 'date' => "$val"); - if($deces=='0000-00-00' or empty($deces)) { - require_once('notifs.inc.php'); - register_watch_op($uid, WATCH_DEATH, $val); - require_once('user.func.inc.php'); - user_clear_all_subs($uid, false); // by default, dead ppl do not loose their email - } + if($val == $deces || empty($val)) continue; + XDB::execute('UPDATE auth_user_md5 SET deces={?} WHERE matricule = {?}', $val, $mat); + $new_deces[] = array('name' => "$prenom $nom", 'date' => "$val"); + if($deces=='0000-00-00' or empty($deces)) { + require_once('notifs.inc.php'); + register_watch_op($uid, WATCH_DEATH, $val); + require_once('user.func.inc.php'); + user_clear_all_subs($uid, false); // by default, dead ppl do not loose their email + } } $page->assign('new_deces',$new_deces); } - + $res = XDB::iterator('SELECT matricule, nom, prenom, deces FROM auth_user_md5 WHERE promo = {?} ORDER BY nom,prenom', $promo); $page->assign('decedes', $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'); - + require_once('synchro_ax.inc.php'); - + if (is_ax_key_missing()) { $page->assign('no_private_key', true); $page->run(); } - + require_once('user.func.inc.php'); if ($user) @@ -660,16 +687,16 @@ class AdminModule extends PLModule return; } } - + if (Env::has('mat')) { $res = XDB::query( - "SELECT alias + "SELECT alias FROM aliases AS a INNER JOIN auth_user_md5 AS u ON (a.id=u.user_id AND a.type='a_vie') WHERE matricule={?}", Env::i('mat')); $login = $res->fetchOneCell(); } - + if ($login) { if ($action == 'import') { ax_synchronize($login, S::v('uid')); @@ -679,30 +706,34 @@ class AdminModule extends PLModule $userax= get_user_ax($user['matricule_ax']); require_once 'profil.func.inc.php'; $diff = diff_user_details($userax, $user, 'ax'); - + $page->assign('x', $user); $page->assign('diff', $diff); } } - - function handler_validate(&$page) { + + function handler_validate(&$page, $action = 'list', $id = null) { $page->changeTpl('admin/valider.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande'); require_once("validations.inc.php"); - + + if ($action == 'edit' and !is_null($id)) { + $page->assign('preview_id', $id); + } + if(Env::has('uid') && Env::has('type') && Env::has('stamp')) { - $req = Validate::get_request(Env::v('uid'), Env::v('type'), Env::v('stamp')); + $req = Validate::get_typed_request(Env::v('uid'), Env::v('type'), Env::v('stamp')); if($req) { $req->handle_formu(); } } - + $r = XDB::iterator('SHOW COLUMNS FROM requests_answers'); while (($a = $r->next()) && $a['Field'] != 'category'); $page->assign('categories', $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1)))); - + $hidden = array(); if (Post::has('hide')) { - $hide = array(); - foreach ($categories as $cat) + $hide = array(); + foreach ($categories as $cat) if (!Post::v($cat)) { $hidden[$cat] = 1; $hide[] = $cat; @@ -713,11 +744,10 @@ class AdminModule extends PLModule $hidden[$hide_type] = true; } $page->assign('hide_requests', $hidden); - + $page->assign('vit', new ValidateIterator()); } function handler_validate_answers(&$page, $action = 'list', $id = null) { - require_once('../classes/PLTableEditor.php'); $page->assign('xorg_title','Polytechnique.org - Administration - Réponses automatiques de validation'); $page->assign('title', 'Gestion des réponses automatiques'); $table_editor = new PLTableEditor('admin/validate/answers','requests_answers','id'); @@ -727,7 +757,6 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_skins(&$page, $action = 'list', $id = null) { - require_once('../classes/PLTableEditor.php'); $page->assign('xorg_title','Polytechnique.org - Administration - Skins'); $page->assign('title', 'Gestion des skins'); $table_editor = new PLTableEditor('admin/skins','skins','id'); @@ -738,35 +767,31 @@ class AdminModule extends PLModule $table_editor->describe('date','date',false); $table_editor->describe('ext','extension du screenshot',false); $table_editor->apply($page, $action, $id); - } + } function handler_postfix_blacklist(&$page, $action = 'list', $id = null) { - require_once('../classes/PLTableEditor.php'); $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Blacklist'); $page->assign('title', 'Blacklist de postfix'); $table_editor = new PLTableEditor('admin/postfix/blacklist','postfix_blacklist','email', true); $table_editor->describe('reject_text','Texte de rejet',true); $table_editor->describe('email','email',true); $table_editor->apply($page, $action, $id); - } + } function handler_postfix_whitelist(&$page, $action = 'list', $id = null) { - require_once('../classes/PLTableEditor.php'); $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Whitelist'); $page->assign('title', 'Whitelist de postfix'); $table_editor = new PLTableEditor('admin/postfix/whitelist','postfix_whitelist','email', true); $table_editor->describe('email','email',true); $table_editor->apply($page, $action, $id); - } + } function handler_logger_actions(&$page, $action = 'list', $id = null) { - require_once('../classes/PLTableEditor.php'); $page->assign('xorg_title','Polytechnique.org - Administration - Actions'); $page->assign('title', 'Gestion des actions de logger'); $table_editor = new PLTableEditor('admin/logger/actions','logger.actions','id'); $table_editor->describe('text','intitulé',true); $table_editor->describe('description','description',true); $table_editor->apply($page, $action, $id); - } + } function handler_downtime(&$page, $action = 'list', $id = null) { - require_once('../classes/PLTableEditor.php'); $page->assign('xorg_title','Polytechnique.org - Administration - Coupures'); $page->assign('title', 'Gestion des coupures'); $table_editor = new PLTableEditor('admin/downtime','coupures','id'); @@ -776,10 +801,10 @@ class AdminModule extends PLModule $table_editor->describe('services','services affectés',true); $table_editor->describe('description','description',false); $table_editor->apply($page, $action, $id); - } + } function handler_wiki(&$page, $action='list') { require_once 'wiki.inc.php'; - + // update wiki perms if ($action == 'update') { $perms_read = Post::v('read'); @@ -788,7 +813,7 @@ class AdminModule extends PLModule foreach ($_POST as $wiki_page => $val) if ($val == 'on') { $wiki_page = str_replace('_', '/', $wiki_page); if (!$perms_read || !$perms_edit) - list($perms0, $perms1) = wiki_get_perms($wiki_page); + list($perms0, $perms1) = wiki_get_perms($wiki_page); if ($perms_read) $perms0 = $perms_read; if ($perms_edit) @@ -797,9 +822,9 @@ class AdminModule extends PLModule } } } - + $perms = wiki_perms_options(); - + // list wiki pages and their perms $wiki_pages = array(); $dir = wiki_work_dir(); @@ -813,9 +838,9 @@ class AdminModule extends PLModule } } ksort($wiki_pages); - + $page->changeTpl('admin/wiki.tpl'); - $page->assign('wiki_pages', $wiki_pages); + $page->assign('wiki_pages', $wiki_pages); $page->assign('perms_opts', $perms); } }