X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=b0ac1efcf5b71dc6497fb5926a8f0e523b615bd8;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=8d59296cb2fa112ead85d3078881e7f8c63a406f;hpb=d91e720ffdc93b634290e9769c6fe6f4a5cab65a;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 8d59296..b0ac1ef 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'); @@ -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,9 @@ 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({?}, '@%')", @@ -476,10 +499,10 @@ class AdminModule extends PLModule if (Env::v('nomusageN') != $mr['nom_usage']) { 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']); + $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; @@ -512,9 +535,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); } @@ -688,13 +711,17 @@ class AdminModule extends PLModule } } - 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(); } } @@ -720,7 +747,6 @@ class AdminModule extends PLModule $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'); @@ -730,7 +756,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'); @@ -743,7 +768,6 @@ class AdminModule extends PLModule $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); @@ -752,7 +776,6 @@ class AdminModule extends PLModule $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); @@ -760,7 +783,6 @@ class AdminModule extends PLModule $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'); @@ -769,7 +791,6 @@ class AdminModule extends PLModule $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');