X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=0f348d1b5498dcbb185bde1b24cd63a706da3392;hb=5ddeb07cc787dd1dc3630a31f1528f5cc7c4d9b9;hp=b0ac1efcf5b71dc6497fb5926a8f0e523b615bd8;hpb=24b5c84da7ff577489e3018b82851221412f1bfe;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index b0ac1ef..0f348d1 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -1,6 +1,6 @@ $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'), @@ -258,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); @@ -308,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') @@ -340,7 +341,7 @@ 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'); } @@ -357,12 +358,12 @@ 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) { @@ -486,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')); @@ -499,6 +499,9 @@ 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'))); } + 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') @@ -510,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')); @@ -521,15 +523,23 @@ 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 @@ -542,6 +552,55 @@ class AdminModule extends PLModule $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'); @@ -567,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; } @@ -647,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); } @@ -801,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 @@ -837,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); } }