X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=829bec468f84543d5d46d209c5eee1036099ba15;hb=bc0903c71a064931efd8677b246e7f31c194fb82;hp=d905cc5d50a7eba18a0e1a21939bce05e9ddead4;hpb=099b92fc62909e63f61bd1367a553a557743ba95;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index d905cc5..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'); @@ -93,20 +101,253 @@ class AdminModule extends PLModule $page->assign('bre', XDB::iterator("SELECT * FROM emails_bounces_re ORDER BY pos")); } - function handler_logger(&$page) { - require_once dirname(__FILE__).'/../classes/LoggerView.php'; + // {{{ logger view + + /** Retrieves the available days for a given year and month. + * Obtain a list of days of the given month in the given year + * that are within the range of dates that we have log entries for. + * + * @param integer year + * @param integer month + * @return array days in that month we have log entries covering. + * @private + */ + function _getDays($year, $month) + { + // give a 'no filter' option + $months[0] = "----"; + + if ($year && $month) { + $day_max = Array(-1, 31, checkdate(2, 29, $year) ? 29 : 28 , 31, + 30, 31, 30, 31, 31, 30, 31, 30, 31); + $res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)), + MONTH(MAX(start)), MONTH(MIN(start)), + DAYOFMONTH(MAX(start)), + DAYOFMONTH(MIN(start)) + FROM logger.sessions"); + list($ymax, $ymin, $mmax, $mmin, $dmax, $dmin) = $res->fetchOneRow(); + + if (($year < $ymin) || ($year == $ymin && $month < $mmin)) { + return array(); + } + + if (($year > $ymax) || ($year == $ymax && $month > $mmax)) { + return array(); + } + + $min = ($year==$ymin && $month==$mmin) ? intval($dmin) : 1; + $max = ($year==$ymax && $month==$mmax) ? intval($dmax) : $day_max[$month]; - if (!Env::has('logauth')) { - $_REQUEST['logauth'] = 'native'; + for($i = $min; $i<=$max; $i++) { + $days[$i] = $i; + } } + return $days; + } + + + /** Retrieves the available months for a given year. + * Obtains a list of month numbers that are within the timeframe that + * we have log entries for. + * + * @param integer year + * @return array List of month numbers we have log info for. + * @private + */ + function _getMonths($year) + { + // give a 'no filter' option + $months[0] = "----"; + + if ($year) { + $res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)), + MONTH(MAX(start)), MONTH(MIN(start)) + FROM logger.sessions"); + list($ymax, $ymin, $mmax, $mmin) = $res->fetchOneRow(); + + if (($year < $ymin) || ($year > $ymax)) { + return array(); + } - $logview = new LoggerView; - $logview->run($page); + $min = $year == $ymin ? intval($mmin) : 1; + $max = $year == $ymax ? intval($mmax) : 12; + + for($i = $min; $i<=$max; $i++) { + $months[$i] = $i; + } + } + return $months; + } + + + /** Retrieves the available years. + * Obtains a list of years that we have log entries covering. + * + * @return array years we have log entries for. + * @private + */ + function _getYears() + { + // give a 'no filter' option + $years[0] = "----"; + + // retrieve available years + $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM logger.sessions"); + list($max, $min) = $res->fetchOneRow(); + + for($i = intval($min); $i<=$max; $i++) { + $years[$i] = $i; + } + return $years; + } + + + /** Make a where clause to get a user's sessions. + * Prepare the where clause request that will retrieve the sessions. + * + * @param $year INTEGER Only get log entries made during the given year. + * @param $month INTEGER Only get log entries made during the given month. + * @param $day INTEGER Only get log entries made during the given day. + * @param $uid INTEGER Only get log entries referring to the given user ID. + * + * @return STRING the WHERE clause of a query, including the 'WHERE' keyword + * @private + */ + function _makeWhere($year, $month, $day, $uid) + { + // start constructing the "where" clause + $where = array(); + + if ($uid) + array_push($where, "uid='$uid'"); + + // we were given at least a year + if ($year) { + if ($day) { + $dmin = mktime(0, 0, 0, $month, $day, $year); + $dmax = mktime(0, 0, 0, $month, $day+1, $year); + } elseif ($month) { + $dmin = mktime(0, 0, 0, $month, 1, $year); + $dmax = mktime(0, 0, 0, $month+1, 1, $year); + } else { + $dmin = mktime(0, 0, 0, 1, 1, $year); + $dmax = mktime(0, 0, 0, 1, 1, $year+1); + } + $where[] = "start >= " . date("Ymd000000", $dmin); + $where[] = "start < " . date("Ymd000000", $dmax); + } + + if (!empty($where)) { + return ' WHERE ' . implode($where, " AND "); + } else { + return ''; + } + // WE know it's totally reversed, so better use array_reverse than a SORT BY start DESC + } + + // }}} + + function handler_logger(&$page, $action = null, $arg = null) { + if ($action == 'session') { + + // we are viewing a session + $res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer + FROM logger.sessions AS ls + LEFT JOIN aliases AS a ON (a.id = ls.uid AND a.type='a_vie') + LEFT JOIN aliases AS sa ON (sa.id = ls.suid AND sa.type='a_vie') + WHERE ls.id = {?}", $arg); + + $page->assign('session', $a = $res->fetchOneAssoc()); + + $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); + while ($myarr = $res->next()) { + $page->append('events', $myarr); + } + + } else { + $loguser = $action == 'user' ? $arg : Env::v('loguser'); + + $res = XDB::query('SELECT id FROM aliases WHERE alias={?}', + $loguser); + $loguid = $res->fetchOneCell(); + + if ($loguid) { + $year = Env::i('year'); + $month = Env::i('month'); + $day = Env::i('day'); + } else { + $year = Env::i('year', intval(date('Y'))); + $month = Env::i('month', intval(date('m'))); + $day = Env::i('day', intval(date('d'))); + } + + if (!$year) + $month = 0; + if (!$month) + $day = 0; + + // smarty assignments + // retrieve available years + $page->assign('years', $this->_getYears()); + $page->assign('year', $year); + + // retrieve available months for the current year + $page->assign('months', $this->_getMonths($year)); + $page->assign('month', $month); + + // retrieve available days for the current year and month + $page->assign('days', $this->_getDays($year, $month)); + $page->assign('day', $day); + + $page->assign('loguser', $loguser); + // smarty assignments + + if ($loguid || $year) { + + // get the requested sessions + $where = $this->_makeWhere($year, $month, $day, $loguid); + $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') + $where + ORDER BY start DESC"; + $res = XDB::iterator($select); + + $sessions = array(); + while ($mysess = $res->next()) { + $mysess['events'] = array(); + $sessions[$mysess['id']] = $mysess; + } + array_reverse($sessions); + + // attach events + $sql = "SELECT s.id, a.text + FROM logger.sessions AS s + LEFT JOIN logger.events AS e ON(e.session=s.id) + INNER JOIN logger.actions AS a ON(a.id=e.action) + $where"; + + $res = XDB::iterator($sql); + while ($event = $res->next()) { + array_push($sessions[$event['id']]['events'], $event['text']); + } + $page->assign_by_ref('sessions', $sessions); + } else { + $page->assign('msg_nofilters', "Sélectionner une annuée et/ou un utilisateur"); + } + } + + $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"); @@ -117,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) { @@ -141,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) { @@ -169,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é"); } @@ -227,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')); @@ -238,13 +497,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; @@ -252,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')); @@ -263,32 +523,89 @@ 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'); require_once("homonymes.inc.php"); - + if ($target) { if (! list($prenom,$nom,$forlife,$loginbis) = select_if_homonyme($target)) { $target=0; @@ -299,30 +616,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, @@ -342,11 +659,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 @@ -357,7 +674,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 @@ -365,58 +682,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) @@ -428,16 +745,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')); @@ -447,30 +764,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; @@ -481,11 +802,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'); @@ -495,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'); @@ -506,35 +825,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'); @@ -544,10 +859,12 @@ 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') { + } + + function handler_wiki(&$page, $action='list') + { require_once 'wiki.inc.php'; - + // update wiki perms if ($action == 'update') { $perms_read = Post::v('read'); @@ -556,7 +873,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) @@ -565,9 +882,9 @@ class AdminModule extends PLModule } } } - + $perms = wiki_perms_options(); - + // list wiki pages and their perms $wiki_pages = array(); $dir = wiki_work_dir(); @@ -581,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); } }