X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=829bec468f84543d5d46d209c5eee1036099ba15;hb=bc0903c71a064931efd8677b246e7f31c194fb82;hp=6a3990fbc376e7ec915ed6e2d90c20b58689aa4b;hpb=74c55fd634f1398c62a3621f395dfbe2916381fc;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 6a3990f..829bec4 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'), @@ -38,12 +39,19 @@ class AdminModule extends PLModule 'admin/skins' => $this->make_hook('skins', AUTH_MDP, 'admin'), 'admin/synchro_ax' => $this->make_hook('synchro_ax', AUTH_MDP, 'admin'), 'admin/user' => $this->make_hook('user', AUTH_MDP, 'admin'), + 'admin/promo' => $this->make_hook('promo', AUTH_MDP, 'admin'), 'admin/validate' => $this->make_hook('validate', AUTH_MDP, 'admin'), 'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_MDP, 'admin'), 'admin/wiki' => $this->make_hook('wiki', AUTH_MDP, 'admin'), ); } + function handler_phpinfo(&$page) + { + phpinfo(); + exit; + } + function handler_default(&$page) { $page->changeTpl('admin/index.tpl'); @@ -251,7 +259,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 +309,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') @@ -333,12 +341,13 @@ class AdminModule extends PLModule } } - $page->changeTpl('logger-view.tpl'); + $page->changeTpl('admin/logger-view.tpl'); $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"); @@ -349,13 +358,16 @@ class AdminModule extends PLModule } if (Env::has('user_id')) { - $login = get_user_login(Env::i('user_id')); + $login = get_user_forlife(Env::i('user_id')); + if (empty($login)) { + $login = Env::i('user_id'); + } } elseif (Env::has('login')) { - $login = get_user_login(Env::v('login')); + $login = get_user_forlife(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 +385,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 +424,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 +487,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')); @@ -472,10 +499,13 @@ 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']); + 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; @@ -483,8 +513,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')); @@ -494,27 +523,84 @@ 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); + $res = XDB::query("SELECT alias + FROM virtual + INNER JOIN virtual_redirect USING(vid) + WHERE type = 'user' AND redirect LIKE '" . $login . "@%'"); + if ($res->numRows()) { + $page->assign('virtual', $res->fetchOneCell()); + } + $page->assign('aliases', XDB::iterator( "SELECT alias, type='a_vie' AS for_life,FIND_IN_SET('bestalias',flags) AS best,expire 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); } } + + function getMatricule($line, $key) + { + $mat = $line['matricule']; + $year = intval(substr($mat, 0, 3)); + $rang = intval(substr($mat, 3, 3)); + if ($year > 200) { $year /= 10; }; + if ($year < 96) { + return null; + } else { + return sprintf('%04u%04u', 1900+$year, $rang); + } + } + + function handler_promo(&$page, $action = null, $promo = null) + { + if (Env::has('promo')) { + if(Env::i('promo') > 1900 && Env::i('promo') < 2050) { + $action = Env::v('valid_promo') == 'Ajouter des membres' ? 'add' : 'ax'; + pl_redirect('admin/promo/' . $action . '/' . Env::i('promo')); + } else { + $page->trig('Promo non valide'); + } + } + + $page->changeTpl('admin/promo.tpl'); + if ($promo > 1900 && $promo < 2050 && ($action == 'add' || $action == 'ax')) { + $page->assign('promo', $promo); + } else { + return; + } + + $importer = new CSVImporter('auth_user_md5', 'matricule'); + $importer->registerFunction('matricule', 'matricle Ecole vers X.org', array($this, 'getMatricule')); + switch ($action) { + case 'add': + $fields = array('nom', 'nom_ini', 'prenom', + 'prenom_ini', 'promo', 'promo_sortie', 'flags', + 'matricule', 'matricule_ax', 'perms'); + $importer->forceValue('promo', $promo); + $importer->forceValue('promo_sortie', $promo + 3); + break; + case 'ax': + $fields = array('matricule', 'matricule_ax'); + break; + } + $importer->apply($page, "admin/promo/$action/$promo", $fields); + } + function handler_homonyms(&$page, $op = 'list', $target = null) { $page->changeTpl('admin/homonymes.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Homonymes'); @@ -540,15 +626,15 @@ class AdminModule extends PLModule // 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; } @@ -620,15 +706,15 @@ class AdminModule extends PLModule $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); } @@ -684,13 +770,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(); } } @@ -716,7 +806,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'); @@ -726,7 +815,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'); @@ -739,7 +827,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); @@ -748,7 +835,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); @@ -756,7 +842,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'); @@ -765,7 +850,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'); @@ -776,7 +860,9 @@ class AdminModule extends PLModule $table_editor->describe('description','description',false); $table_editor->apply($page, $action, $id); } - function handler_wiki(&$page, $action='list') { + + function handler_wiki(&$page, $action='list') + { require_once 'wiki.inc.php'; // update wiki perms @@ -812,9 +898,19 @@ class AdminModule extends PLModule } } ksort($wiki_pages); + $wiki_tree = array(); + foreach ($wiki_pages as $file => $desc) { + list($cat, $name) = explode('.', $file); + if (!isset($wiki_tree[$cat])) { + $wiki_tree[$cat] = array(); + } + $wiki_tree[$cat][$name] = $desc; + } + + $page->changeTpl('admin/wiki.tpl'); - $page->assign('wiki_pages', $wiki_pages); + $page->assign('wiki_pages', $wiki_tree); $page->assign('perms_opts', $perms); } }