Mailman don't understand UTF8 (Closes #761)
[platal.git] / modules / admin.php
index 9ab54fa..5afa055 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,28 +24,38 @@ class AdminModule extends PLModule
     function handlers()
     {
         return array(
-            'admin'                        => $this->make_hook('default',   AUTH_MDP, 'admin'),
-            'admin/postfix/delayed'        => $this->make_hook('postfix_delayed', AUTH_MDP, 'admin'),
-            'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_MDP, 'admin'),
-            'admin/logger'                 => $this->make_hook('logger', AUTH_MDP, 'admin'),
-            'admin/logger/actions'         => $this->make_hook('logger_action', AUTH_MDP, 'admin'),
-            'admin/user'                  => $this->make_hook('user', AUTH_MDP, 'admin'),
-            'admin/homonyms'               => $this->make_hook('homonyms', 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/dead-but-active'        => $this->make_hook('dead_but_active', AUTH_MDP, 'admin'),
             'admin/deaths'                 => $this->make_hook('deaths', AUTH_MDP, 'admin'),
+            'admin/downtime'               => $this->make_hook('downtime', AUTH_MDP, 'admin'),
+            'admin/homonyms'               => $this->make_hook('homonyms', AUTH_MDP, 'admin'),
+            'admin/logger'                 => $this->make_hook('logger', AUTH_MDP, 'admin'),
+            'admin/logger/actions'         => $this->make_hook('logger_actions', AUTH_MDP, 'admin'),
+            'admin/postfix/blacklist'      => $this->make_hook('postfix_blacklist', AUTH_MDP, 'admin'),
+            'admin/postfix/delayed'        => $this->make_hook('postfix_delayed', AUTH_MDP, 'admin'),
+            'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_MDP, 'admin'),
+            'admin/postfix/whitelist'      => $this->make_hook('postfix_whitelist', AUTH_MDP, 'admin'),
+            'admin/mx/broken'              => $this->make_hook('mx_broken', AUTH_MDP, 'admin'),
+            'admin/skins'                  => $this->make_hook('skins', AUTH_MDP, 'admin'),
             'admin/synchro_ax'             => $this->make_hook('synchro_ax', AUTH_MDP, 'admin'),
-            'admin/events'                 => $this->make_hook('events', AUTH_MDP, 'admin'),
-            'admin/formations'             => $this->make_hook('formations', AUTH_MDP, 'admin'),
-            'admin/newsletter'             => $this->make_hook('newsletter', AUTH_MDP, 'admin'),
-            'admin/newsletter/edit'        => $this->make_hook('newsletter_edit', AUTH_MDP, 'admin'),
-            'admin/lists'                  => $this->make_hook('lists', 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/geoloc'                 => $this->make_hook('geoloc', AUTH_MDP, 'admin'),
-            'admin/geoloc/dynamap'         => $this->make_hook('geoloc_dynamap', AUTH_MDP, 'admin'),
-            'admin/trombino'               => $this->make_hook('trombino', AUTH_MDP, 'admin'),
+            'admin/validate/answers'       => $this->make_hook('validate_answers', AUTH_MDP, 'admin'),
+            'admin/wiki'                   => $this->make_hook('wiki', AUTH_MDP, 'admin'),
+            'admin/ipwatch'                => $this->make_hook('ipwatch', AUTH_MDP, 'admin'),
+            'admin/icons'                  => $this->make_hook('icons', AUTH_MDP, 'admin'),
         );
     }
 
+    function handler_phpinfo(&$page)
+    {
+        phpinfo();
+        exit;
+    }
+
     function handler_default(&$page)
     {
         $page->changeTpl('admin/index.tpl');
@@ -55,12 +65,12 @@ class AdminModule extends PLModule
     function handler_postfix_delayed(&$page)
     {
         $page->changeTpl('admin/postfix_delayed.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Retardés');
+        $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Retardés');
 
         if (Env::has('del')) {
             $crc = Env::v('crc');
             XDB::execute("UPDATE postfix_mailseen SET release = 'del' WHERE crc = {?}", $crc);
-            $page->trig($crc." verra tous ses mails supprimés !");
+            $page->trig($crc." verra tous ses mails supprimés !");
         } elseif (Env::has('ok')) {
             $crc = Env::v('crc');
             XDB::execute("UPDATE postfix_mailseen SET release = 'ok' WHERE crc = {?}", $crc);
@@ -95,39 +105,274 @@ class AdminModule extends PLModule
         $page->assign('bre', XDB::iterator("SELECT * FROM emails_bounces_re ORDER BY pos"));
     }
 
-    function handler_logger(&$page) {
-        $page->changeTpl('logger-view.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Administration - Logs des sessions');
-        require_once('diogenes/diogenes.logger-view.inc.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];
+
+            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();
+            }
+
+            $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) {
 
-        if (!Env::has('logauth')) {
-            $_REQUEST['logauth'] = 'native';
+                // 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");
+            }
         }
 
-        $logview = new DiogenesLoggerView;
-        $logview->run($page);
+        $page->changeTpl('admin/logger-view.tpl');
 
-        $page->fakeDiogenes();
+        $page->assign('xorg_title','Polytechnique.org - Administration - Logs des sessions');
     }
 
-    function handler_user(&$page, $login = false) {
+    function handler_user(&$page, $login = false)
+    {
+        global $globals;
         $page->changeTpl('admin/utilisateurs.tpl');
         $page->assign('xorg_title','Polytechnique.org - Administration - Edit/Su/Log');
         require_once("emails.inc.php");
         require_once("user.func.inc.php");
 
         if (S::has('suid')) {
-            $page->kill("déjà en SUID !!!");
+            $page->kill("Déjà en SUID !!!");
         }
 
         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) {
@@ -139,21 +384,37 @@ class AdminModule extends PLModule
             $_SESSION['suid'] = $_SESSION;
             $r = XDB::query("SELECT id FROM aliases WHERE alias={?}", $login);
             if($uid = $r->fetchOneCell()) {
-                start_connexion($uid,true);
+                start_connexion($uid, true);
                 pl_redirect("");
             }
         }
 
         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,
+                                        FIND_IN_SET('watch', u.flags) AS watch, FIND_IN_SET('femme', 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,
+                                          FIND_IN_SET('watch', u.flags) AS watch, FIND_IN_SET('femme', 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']);
+            // Checks the user has a forlife, as non-registered user can't have redirections.
+            if ($mr['forlife']) {
+                $redirect = new Redirect($mr['user_id']);
+            }
 
             // Check if there was a submission
             foreach($_POST as $key => $val) {
+                S::assert_xsrf_token();
+
                 switch ($key) {
                     case "add_fwd":
                         $email = trim(Env::v('email'));
@@ -161,7 +422,7 @@ class AdminModule extends PLModule
                             $page->trig("invalid email $email");
                         } else {
                             $redirect->add_email($email);
-                            $page->trig("Ajout de $email effectué");
+                            $page->trig("Ajout de $email effectué");
                         }
                         break;
 
@@ -173,25 +434,66 @@ 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é");
+                            $page->trig($val." a été supprimé");
+                        }
+                        break;
+                    case "activate_fwd":
+                        if (!empty($val)) {
+                            $redirect->modify_one_email($val, true);
+                        }
+                        break;
+                    case "deactivate_fwd":
+                        if (!empty($val)) {
+                            $redirect->modify_one_email($val, false);
+                        }
+                        break;
+                    case "disable_fwd":
+                        $redirect->disable();
+                        break;
+                    case "enable_fwd":
+                        $redirect->enable();
+                        break;
+                    case "clean_fwd":
+                        if (!empty($val)) {
+                            $redirect->clean_errors($val);
                         }
                         break;
-                case "activate_fwd":
-                if (!empty($val)) {
-                    $redirect->modify_one_email($val, true);
-                }
-                break;
-                case "deactivate_fwd":
-                if (!empty($val)) {
-                    $redirect->modify_one_email($val, false);
-                }
-                break;
                     case "add_alias":
-                        XDB::execute("INSERT INTO  aliases (id,alias,type) VALUES  ({?}, {?}, 'alias')",
-                                $mr['user_id'], Env::v('email'));
+                        global $globals;
+                        $alias = trim(Env::v('email'));
+                        if (strpos($alias, '@') !== false) {
+                            list($alias, $domain) = explode('@', $alias);
+                        } else {
+                            $domain = $globals->mail->domain;
+                        }
+                        if (!preg_match('/[-a-z0-9\.]+/s', $alias)) {
+                            $page->trig("'$alias' n'est pas un alias valide");
+                        }
+                        if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) {
+                            $req = new AliasReq($mr['user_id'], $alias, 'Admin request', false);
+                            if ($req->commit()) {
+                                $page->trig("Nouvel alias '$alias@$domain' attribué");
+                            } else {
+                                $page->trig("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué");
+                            }
+                        } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) {
+                            if (XDB::execute("INSERT INTO  aliases (id,alias,type) VALUES  ({?}, {?}, 'alias')",
+                                    $mr['user_id'], $alias)) {
+                                $page->trig("Nouvel alias '$alias' ajouté");
+                            } else {
+                                $page->trig("Impossible d'ajouter l'alias '$alias', il est probablement déjà attribué");
+                            }
+                        } else {
+                            $page->trig("Le domaine '$domain' n'est pas valide");
+                        }
                         break;
 
                     case "best":
@@ -206,91 +508,229 @@ class AdminModule extends PLModule
 
                     // Editer un profil
                     case "u_edit":
-                    require_once('secure_hash.inc.php');
-                    $pass_encrypted = Env::v('newpass_clair') != "********" ? hash_encrypt(Env::v('newpass_clair')) : Env::v('passw');
-                    $naiss = Env::v('naissanceN');
-                    $perms = Env::v('permsN');
-                    $prenm = Env::v('prenomN');
-                    $nom   = Env::v('nomN');
-                    $promo = Env::i('promoN');
-                    $sexe  = Env::v('sexeN');
-                    $comm  = Env::v('commentN');
-
-                    $query = "UPDATE auth_user_md5 SET
-                            naissance = '$naiss',
-                            password  = '$pass_encrypted',
-                            perms     = '$perms',
-                            prenom    = '".addslashes($prenm)."',
-                            nom       = '".addslashes($nom)."',
-                            flags     = '$sexe',
-                            promo     = $promo,
-                            comment   = '".addslashes($comm)."'
-                        WHERE user_id = '{$mr['user_id']}'";
-                    if (XDB::execute($query)) {
+                        require_once('secure_hash.inc.php');
+                        $pass_encrypted = Env::v('newpass_clair') != "********" ? hash_encrypt(Env::v('newpass_clair')) : Env::v('passw');
+                        $naiss    = Env::v('naissanceN');
+                        $deces    = Env::v('decesN');
+                        $perms    = Env::v('permsN');
+                        $prenm    = Env::v('prenomN');
+                        $nom      = Env::v('nomN');
+                        $nomusage = Env::v('nomusageN');
+                        $promo    = Env::i('promoN');
+                        $sexe     = Env::v('sexeN');
+                        $comm     = trim(Env::v('commentN'));
+                        $watch    = Env::v('watchN');
+                        $flags    = '';
+                        if ($sexe) {
+                            $flags = 'femme';
+                        }
+                        if ($watch) {
+                            if ($flags) {
+                                $flags .= ',';
+                            }
+                            $flags .= 'watch';
+                        }
+
+                        if ($watch && !$comm) {
+                            $page->trig("Il est nécessaire de mettre un commentaire pour surveiller un compte");
+                            break;
+                        }
+
+                        $watch = 'SELECT naissance, deces, password, perms, nom_usage,
+                                         prenom, nom, flags, promo, comment
+                                    FROM auth_user_md5
+                                   WHERE user_id = ' . $mr['user_id'];
+                        $res = XDB::query($watch);
+                        $old_fields = $res->fetchOneAssoc();
+                        $query = "UPDATE auth_user_md5 SET
+                                         naissance = '$naiss',
+                                         deces     = '$deces',
+                                         password  = '$pass_encrypted',
+                                         perms     = '$perms',
+                                         prenom    = '".addslashes($prenm)."',
+                                         nom       = '".addslashes($nom)."',
+                                         nom_usage = '".addslashes($nomusage)."',
+                                         flags     = '$flags',
+                                         promo     = $promo,
+                                         comment   = '".addslashes($comm)."'
+                                   WHERE user_id = '{$mr['user_id']}'";
+                        if ($perms == 'disabled' && $old_fields['perms'] != 'disabled') {
+                            // A user has been banned ==> ensure his php session has been killed
+                            // This solution is ugly and overkill, but, it should be efficient.
+                            kill_sessions();
+                        }
+                        if (XDB::execute($query)) {
                             user_reindex($mr['user_id']);
 
-                            require_once("diogenes/diogenes.hermes.inc.php");
-                            $mailer = new HermesMailer();
-                            $mailer->setFrom("webmaster@polytechnique.org");
-                            $mailer->addTo("web@polytechnique.org");
-                            $mailer->setSubject("INTERVENTION de ".S::v('forlife'));
-                            $mailer->setTxtBody(preg_replace("/[ \t]+/", ' ', $query));
+                            $res = XDB::query($watch);
+                            $new_fields = $res->fetchOneAssoc();
+
+                            $mailer = new PlMailer("admin/useredit.mail.tpl");
+                            $mailer->assign("admin", S::v('forlife'));
+                            $mailer->assign("user", $mr['forlife']);
+                            $mailer->assign('old', $old_fields);
+                            $mailer->assign('new', $new_fields);
                             $mailer->send();
 
-                            $page->trig("updaté correctement.");
+                            // update number of subscribers (perms or deceased may have changed)
+                            update_NbIns();
+
+                            $page->trig("updaté correctement.");
                         }
                         if (Env::v('nomusageN') != $mr['nom_usage']) {
-                            require_once('nomusage.inc.php');
+                            require_once "xorg.misc.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']) {
+                            require_once 'notifs.inc.php';
+                            register_watch_op($mr['user_id'], WATCH_DEATH, $mr['deces']);
+                            user_clear_all_subs($mr['user_id'], false);
+                        }
+                        $r = XDB::query("SELECT *, a.alias AS forlife,
+                                                FIND_IN_SET('watch', u.flags) AS watch, FIND_IN_SET('femme', 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();
+
+                        // If GoogleApps is enabled, the user did choose to use synchronized passwords,
+                        // and the password was changed, updates the Google Apps password as well.
+                        if ($globals->mailstorage->googleapps_domain && Env::v('newpass_clair') != "********") {
+                            require_once 'googleapps.inc.php';
+                            $account = new GoogleAppsAccount($mr['user_id'], $mr['forlife']);
+                            if ($account->active() && $account->sync_password) {
+                                $account->set_password($pass_encrypted);
+                            }
+                        }
+
+                        // If GoogleApps is enabled, and the user is now disabled, disables the Google Apps account as well.
+                        if ($globals->mailstorage->googleapps_domain &&
+                            $new_fields['perms'] == 'disabled' &&
+                            $new_fields['perms'] != $old_fields['perms']) {
+                            require_once 'googleapps.inc.php';
+                            $account = new GoogleAppsAccount($mr['user_id'], $mr['forlife']);
+                            $account->suspend();
+                        }
                         break;
 
                     // DELETE FROM auth_user_md5
                     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->setFrom("webmaster@polytechnique.org");
-                        $mailer->addTo("web@polytechnique.org");
-                        $mailer->setSubject("INTERVENTION de ".S::v('forlife'));
-                        $mailer->setTxtBody("\nUtilisateur $login effacé");
+                        // update number of subscribers (perms or deceased may have changed)
+                        update_NbIns();
+                        $page->trig("'{$mr['user_id']}' a été désinscrit !");
+                        $mailer = new PlMailer("admin/useredit.mail.tpl");
+                        $mailer->assign("admin", S::v('forlife'));
+                        $mailer->assign("user", $mr['forlife']);
+                        $mailer->assign("deletion", true);
                         $mailer->send();
                         break;
+
+                    case "b_edit":
+                        XDB::execute("DELETE FROM forums.innd WHERE uid = {?}", $mr['user_id']);
+                        if (Env::v('write_perm') != "" || Env::v('read_perm') != ""  || Env::v('commentaire') != "" ) {
+                          XDB::execute("INSERT INTO forums.innd
+                                                SET ipmin = '0',
+                                                    ipmax = '4294967295',
+                                                    write_perm = {?},
+                                                    read_perm = {?},
+                                                    comment = {?},
+                                                    priority = '200',
+                                                    uid = {?}",
+                                       Env::v('write_perm'), Env::v('read_perm'), Env::v('comment'), $mr['user_id']);
+                        }
+                        break;
                 }
             }
 
-            $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::iterator("SELECT  alias
+                                    FROM  virtual
+                              INNER JOIN  virtual_redirect USING(vid)
+                                   WHERE  type = 'user' AND redirect LIKE '" . $mr['forlife'] . "@%'");
+            $page->assign('virtuals', $res);
+
             $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' && isset($redirect)) {
+                $page->assign('emails', $redirect->emails);
+            }
 
             $page->assign('mr',$mr);
+
+            // Bans forums
+            $res = XDB::query("SELECT  write_perm, read_perm, comment
+                                 FROM  forums.innd
+                                WHERE  uid = {?}", $mr['user_id']);
+            $bans = $res->fetchOneAssoc();
+            $page->assign('bans', $bans);
+        }
+    }
+
+    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', 'naissance_ini',
+                            '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;
@@ -301,30 +741,34 @@ class AdminModule extends PLModule
                 $page->assign('loginbis',$loginbis);
             }
         }
-        
-        $page->assign('op',$op);
-        $page->assign('target',$target);
-        
+
+        $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);
+                    S::assert_xsrf_token();
+
+                    send_warning_homonyme($prenom, $nom, $forlife, $loginbis);
+                    switch_bestalias($target, $loginbis);
                     $op = 'list';
                     break;
+
                 case 'correct':
-                   switch_bestalias($target, $loginbis);
+                    S::assert_xsrf_token();
+
+                    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,
@@ -344,12 +788,12 @@ 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
+
+        // 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
                    FROM  auth_user_md5 AS u
@@ -359,66 +803,86 @@ 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
+
+        // gens à l'ax mais pas chez nous
         $res = XDB::query(
                 'SELECT  ia.promo,ia.nom,ia.nom_patro,ia.prenom
                    FROM  identification_ax as ia
               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
+
+        // 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) {
+            S::assert_xsrf_token();
+
             $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' || 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_dead_but_active(&$page) {
+        $page->changeTpl('admin/dead_but_active.tpl');
+        $page->assign('xorg_title','Polytechnique.org - Administration - Décédés');
+
+        $res = XDB::iterator(
+                "SELECT  u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, a.alias, DATE(MAX(s.start)) AS last
+                   FROM  auth_user_md5 AS u
+              LEFT JOIN  aliases AS a ON (a.id = u.user_id AND a.type = 'a_vie')
+              LEFT JOIN  logger.sessions AS s ON (s.uid = u.user_id AND suid = 0)
+                  WHERE  perms IN ('admin', 'user') AND deces <> 0
+               GROUP BY  u.user_id
+               ORDER BY  u.promo, u.nom");
+        $page->assign('dead', $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)
@@ -430,16 +894,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'));
@@ -449,268 +913,334 @@ 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_events(&$page, $arch) {
-        $page->changeTpl('admin/evenements.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Administration - Evenements');
-        
-        $arch = $arch == 'archives';
-        $evid = Post::i('evt_id');
-        $page->assign('arch', $arch);
-        
-        switch(Post::v('action')) {
-            case "Proposer":
-                XDB::execute('UPDATE evenements SET titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?} WHERE id = {?}', 
-                        Post::v('titre'), Post::v('texte'), Post::v('peremption'), Post::v('promo_min'), Post::v('promo_max'), $evid);
-                break;
-        
-            case "Valider":
-                XDB::execute('UPDATE evenements SET creation_date = creation_date, flags = CONCAT(flags,",valide") WHERE id = {?}', $evid);
-                break;
-        
-            case "Invalider":
-                XDB::execute('UPDATE evenements SET creation_date = creation_date, flags = REPLACE(flags,"valide", "") WHERE id = {?}', $evid);
-                break;
-        
-            case "Supprimer":
-                XDB::execute('DELETE from evenements WHERE id = {?}', $evid);
-                break;
-        
-            case "Archiver":
-                XDB::execute('UPDATE evenements SET creation_date = creation_date, flags = CONCAT(flags,",archive") WHERE id = {?}', $evid);
-                break;
-        
-            case "Desarchiver":
-                XDB::execute('UPDATE evenements SET creation_date = creation_date, flags = REPLACE(flags,"archive","") WHERE id = {?}', $evid);
-                break;
-        
-            case "Editer":
-                $res = XDB::query('SELECT titre, texte, peremption, promo_min, promo_max FROM evenements WHERE id={?}', $evid);
-                list($titre, $texte, $peremption, $promo_min, $promo_max) = $res->fetchOneRow();
-                $page->assign('mode', 'edit');
-                $page->assign('titre',$titre);
-                $page->assign('texte',$texte);
-                $page->assign('promo_min',$promo_min);
-                $page->assign('promo_max',$promo_max);
-                $page->assign('peremption',$peremption);
-        
-                $select = "";
-                for ($i = 1 ; $i < 30 ; $i++) {
-                    $p_stamp=date("Ymd",time()+3600*24*$i);
-                    $year=substr($p_stamp,0,4);
-                    $month=substr($p_stamp,4,2);
-                    $day=substr($p_stamp,6,2);
-        
-                    $select .= "<option value=\"$p_stamp\"" . (($p_stamp == strtr($peremption, array("-" => ""))) ? " selected" : "")."> $day / $month / $year</option>\n";
+
+    function handler_validate(&$page, $action = 'list', $id = null)
+    {
+        $page->changeTpl('admin/valider.tpl');
+        $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande');
+                $page->addCssLink('nl.css');
+        $page->addJsLink('ajax.js');
+        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')) {
+            S::assert_xsrf_token();
+
+            $req = Validate::get_typed_request(Env::v('uid'), Env::v('type'), Env::v('stamp'));
+            $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)
+                if (!Post::v($cat)) {
+                    $hidden[$cat] = 1;
+                    $hide[] = $cat;
                 }
-                $page->assign('select',$select);
-        
-                break;
-        }
-        
-        if ($action != "Editer") {
-        
-            $sql = "SELECT  e.id, e.titre, e.texte,
-                            DATE_FORMAT(e.creation_date,'%d/%m/%Y %T') AS creation_date,
-                            DATE_FORMAT(e.peremption,'%d/%m/%Y') AS peremption,
-                            e.promo_min, e.promo_max,
-                            FIND_IN_SET('valide', e.flags) AS fvalide,
-                            FIND_IN_SET('archive', e.flags) AS farch,
-                            u.promo, u.nom, u.prenom, a.alias AS forlife
-                      FROM  evenements    AS e
-                INNER JOIN  auth_user_md5 AS u ON(e.user_id = u.user_id)
-                INNER JOIN  aliases AS a ON (u.user_id = a.id AND a.type='a_vie')
-                     WHERE  ".($arch ? "" : "!")."FIND_IN_SET('archive',e.flags)
-                  ORDER BY  FIND_IN_SET('valide',e.flags), peremption";
-            $page->assign('evs', XDB::iterator($sql));
+            setcookie('hide_requests', join(',',$hide), time()+(count($hide)?25920000:(-3600)), '/', '', 0);
+        } elseif (Env::has('hide_requests'))  {
+            foreach (explode(',',Env::v('hide_requests')) as $hide_type)
+                $hidden[$hide_type] = true;
         }
+        $page->assign('hide_requests', $hidden);
+
+        // Update the count of item to validate here... useful in development configuration
+        // where several copies of the site use the same DB, but not the same "dynamic configuration"
+        update_NbValid();
+        $page->assign('vit', new ValidateIterator());
+    }
+
+    function handler_validate_answers(&$page, $action = 'list', $id = null) {
+        $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');
+        $table_editor->describe('category','catégorie',true);
+        $table_editor->describe('title','titre',true);
+        $table_editor->describe('answer','texte',false);
+        $table_editor->apply($page, $action, $id);
     }
-    
-    function handler_newsletter(&$page, $new = false) {
-        $page->changeTpl('admin/newsletter.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : liste');
-        require_once("newsletter.inc.php");
-        
-        if($new) {
-           insert_new_nl();
-           pl_redirect("admin/newsletter");
-        }
-        
-        $page->assign_by_ref('nl_list', get_nl_slist());
+    function handler_skins(&$page, $action = 'list', $id = null) {
+        $page->assign('xorg_title','Polytechnique.org - Administration - Skins');
+        $page->assign('title', 'Gestion des skins');
+        $table_editor = new PLTableEditor('admin/skins','skins','id');
+        $table_editor->describe('name','nom',true);
+        $table_editor->describe('skin_tpl','nom du template',true);
+        $table_editor->describe('auteur','auteur',false);
+        $table_editor->describe('comment','commentaire',true);
+        $table_editor->describe('date','date',false);
+        $table_editor->describe('ext','extension du screenshot',false);
+        $table_editor->apply($page, $action, $id);
     }
-    
-    function handler_newsletter_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
-        $page->changeTpl('admin/newsletter_edit.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Administration - Newsletter : Edition'); 
-        require_once("newsletter.inc.php");
-        
-        $nl  = new NewsLetter($nid);
-        
-        if($action == 'delete') {
-            $nl->delArticle($aid);
-            pl_redirect("admin/newsletter/edit/$nid");
-        }
-        
-        if($aid == 'update') {
-            $nl->_title = Post::v('title');
-            $nl->_date  = Post::v('date');
-            $nl->_head  = Post::v('head');
-            $nl->save();
-        }
-        
-        if(Post::v('save')) {
-            $art  = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
-                    $aid, Post::v('cid'), Post::v('pos'));
-            $nl->saveArticle($art);
-            pl_redirect("admin/newsletter/edit/$nid");
-        }
-        
-        if($action == 'edit') {
-            $eaid = $aid;
-            if(Post::has('title')) {
-                $art  = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
-                        $eaid, Post::v('cid'), Post::v('pos'));
+
+    function handler_postfix_blacklist(&$page, $action = 'list', $id = null) {
+        $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) {
+        $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_mx_broken(&$page, $action = 'list', $id = null) {
+        $page->assign('xorg_title', 'Polytechnique.org - Administration - MX Défaillants');
+        $page->assign('title', 'MX Défaillant');
+        $table_editor = new PLTableEditor('admin/mx/broken', 'mx_watch', 'host', true);
+        $table_editor->describe('host', 'Masque', true);
+        $table_editor->describe('state', 'Niveau', true);
+        $table_editor->describe('text', 'Description du problème', false);
+        $table_editor->apply($page, $action, $id);
+    }
+    function handler_logger_actions(&$page, $action = 'list', $id = null) {
+        $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) {
+        $page->assign('xorg_title','Polytechnique.org - Administration - Coupures');
+        $page->assign('title', 'Gestion des coupures');
+        $table_editor = new PLTableEditor('admin/downtime','coupures','id');
+        $table_editor->describe('debut','date',true);
+        $table_editor->describe('duree','durée',false);
+        $table_editor->describe('resume','résumé',true);
+        $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', $wikipage='', $wikipage2='')
+    {
+        require_once 'wiki.inc.php';
+
+        if (S::v('core_rss_hash')) {
+           $page->setRssLink('Changement Récents',
+                             '/Site/AllRecentChanges?action=rss&user=' . S::v('forlife') . '&hash=' . S::v('core_rss_hash'));
+        }
+
+        // update wiki perms
+        if ($action == 'update') {
+            S::assert_xsrf_token();
+
+            $perms_read = Post::v('read');
+            $perms_edot = Post::v('edit');
+            if ($perms_read || $perms_edit) {
+                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);
+                    if ($perms_read)
+                        $perms0 = $perms_read;
+                    if ($perms_edit)
+                        $perms1 = $perms_edit;
+                    wiki_set_perms($wiki_page, $perms0, $perms1);
+                }
+            }
+        }
+
+        if ($action == 'delete' && $wikipage != '') {
+            S::assert_xsrf_token();
+
+            if (wiki_delete_page($wikipage)) {
+                $page->trig("La page ".$wikipage." a été supprimée.");
             } else {
-                  $art = ($eaid == 'new') ? new NLArticle() : $nl->getArt($eaid);
+                $page->trig("Impossible de supprimer la page ".$wikipage.".");
             }
-            $page->assign('art', $art);
         }
-        
-        $page->assign_by_ref('nl',$nl);
-    }
-    
-    function handler_lists(&$page) {
-        $page->changeTpl('admin/lists.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Administration - Mailing lists');
-        require_once 'lists.inc.php';
-        
-        $client =& lists_xmlrpc(S::v('uid'), S::v('password'));
-        $listes = $client->get_all_lists();
-        $page->assign_by_ref('listes',$listes);
-    }
-    
-    function handler_validate(&$page) {
-        $page->changeTpl('admin/valider.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande');
-        require_once("validations.inc.php");
-        
-        if(Env::has('uid') && Env::has('type') && Env::has('stamp')) {
-            $req = Validate::get_request(Env::v('uid'), Env::v('type'), Env::v('stamp'));
-            if($req) { $req->handle_formu(); }
+
+        if ($action == 'rename' && $wikipage != '' && $wikipage2 != '' && $wikipage != $wikipage2) {
+            S::assert_xsrf_token();
+
+            if ($changedLinks = wiki_rename_page($wikipage, $wikipage2)) {
+                $s = 'La page <em>'.$wikipage.'</em> a été déplacée en <em>'.$wikipage2.'</em>.';
+                if (is_numeric($changedLinks)) {
+                    $s .= $changedLinks.' lien'.(($changedLinks>1)?'s ont été modifiés.':' a été modifié.');
+                }
+                $page->trig($s);
+            } else {
+                $page->trig("Impossible de déplacer la page ".$wikipage);
+            }
         }
-        
-        $page->assign('vit', new ValidateIterator());
-    }
-    
-    function handler_geoloc(&$page, $action = false) {
-        $page->changeTpl('admin/geoloc.tpl');
-        require_once("geoloc.inc.php");
-        $page->assign('xorg_title','Polytechnique.org - Administration - Geolocalisation');
-        
-        $nb_synchro = 0;
-        
-        if (Env::has('id') && is_numeric(Env::v('id'))) {
-            if (synchro_city(Env::v('id'))) $nb_synchro ++;
-        }
-        
-        if ($action == 'missinglat') {
-            $res = XDB::iterRow("SELECT id FROM geoloc_city WHERE lat = 0 AND lon = 0");
-            while ($a = $res->next()) if (synchro_city($a[0])) $nb_synchro++;
-        }
-        
-        if ($nb_synchro) 
-            $page->trig(($nb_synchro > 1)?($nb_synchro." villes ont été synchronisées"):"Une ville a été synchronisée");
-        
-        $res = XDB::query("SELECT COUNT(*) FROM geoloc_city WHERE lat = 0 AND lon = 0");
-        $page->assign("nb_missinglat", $res->fetchOneCell());
+
+        $perms = wiki_perms_options();
+
+        // list wiki pages and their perms
+        $wiki_pages = array();
+        $dir = wiki_work_dir();
+        if (is_dir($dir)) {
+            if ($dh = opendir($dir)) {
+                while (($file = readdir($dh)) !== false) if (substr($file,0,1) >= 'A' && substr($file,0,1) <= 'Z') {
+                    list($read,$edit) = wiki_get_perms($file);
+                    $wiki_pages[$file] = array('read' => $perms[$read], 'edit' => $perms[$edit]);
+                    if (is_file($dir . '/cache_' . wiki_filename($file) . '.tpl')) {
+                        $wiki_pages[$file]['cached'] = true;
+                    }
+                }
+                closedir($dh);
+            }
+        }
+        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->addJsLink('jquery.js');
+        $page->assign('wiki_pages', $wiki_tree);
+        $page->assign('perms_opts', $perms);
     }
-    
-    function handler_geoloc_dynamap(&$page, $action = false) {
-        $page->changeTpl('admin/geoloc_dynamap.tpl');
-        
-        if ($action == 'cities_not_on_map') {
-            require_once('geoloc.inc.php');
-            if (!fix_cities_not_on_map(20))
-                $page->trig("Impossible d'accéder au webservice");
-            else
-                $refresh = true;
-        }
-        
-        if ($action == 'smallest_maps') {
-            require_once('geoloc.inc.php');
-            set_smallest_levels();
-        }
-        
-        if ($action == 'precise_coordinates') {
-            XDB::execute("UPDATE adresses AS a INNER JOIN geoloc_city AS c ON(a.cityid = c.id) SET a.glat = c.lat / 100000, a.glng = c.lon / 100000");
-        }
-        
-        if ($action == 'newmaps') {
-            require_once('geoloc.inc.php');
-            if (!get_new_maps(Env::v('url')))
-                $page->trig("Impossible d'accéder aux nouvelles cartes");
-        }
-        
-        $countMissing = XDB::query("SELECT COUNT(*) FROM geoloc_city AS c LEFT JOIN geoloc_city_in_maps AS m ON(c.id = m.city_id) WHERE m.city_id IS NULL");
-        $missing = $countMissing->fetchOneCell();
-        
-        $countNoSmallest = XDB::query("SELECT SUM(IF(infos = 'smallest',1,0)) AS n FROM geoloc_city_in_maps GROUP BY city_id ORDER BY n");
-        $noSmallest = $countNoSmallest->fetchOneCell() == 0;
-        
-        $countNoCoordinates = XDB::query("SELECT COUNT(*) FROM adresses WHERE cityid IS NOT NULL AND glat = 0 AND glng = 0");
-        $noCoordinates = $countNoCoordinates->fetchOneCell();
-        
-        if (isset($refresh) && $missing) {
-            $page->assign("xorg_extra_header", "<meta http-equiv='Refresh' content='3'/>");
-        }
-        $page->assign("nb_cities_not_on_map", $missing);
-        $page->assign("no_smallest", $noSmallest);
-        $page->assign("no_coordinates", $noCoordinates);
+
+    function handler_ipwatch(&$page, $action = 'list', $ip = null)
+    {
+        $page->changeTpl('admin/ipwatcher.tpl');
+
+        $states = array('safe'      => 'Ne pas surveiller',
+                        'unsafe'    => 'Surveiller les inscriptions',
+                        'dangerous' => 'Surveiller tous les accès',
+                        'ban'       => 'Bannir cette adresse');
+        $page->assign('states', $states);
+
+        switch (Post::v('action')) {
+          case 'create':
+            if (trim(Post::v('ipN')) != '') {
+                S::assert_xsrf_token();
+                Xdb::execute('INSERT IGNORE INTO ip_watch (ip, mask, state, detection, last, uid, description)
+                                          VALUES ({?}, {?}, {?}, CURDATE(), NOW(), {?}, {?})',
+                             ip_to_uint(trim(Post::v('ipN'))), ip_to_uint(trim(Post::v('maskN'))),
+                             Post::v('stateN'), S::i('uid'), Post::v('descriptionN'));
+            };
+            break;
+
+          case 'edit':
+            S::assert_xsrf_token();
+            Xdb::execute('UPDATE ip_watch
+                             SET state = {?}, last = NOW(), uid = {?}, description = {?}, mask = {?}
+                           WHERE ip = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'),
+                          ip_to_uint(Post::v('maskN')), ip_to_uint(Post::v('ipN')));
+            break;
+
+          default:
+            if ($action == 'delete' && !is_null($ip)) {
+                S::assert_xsrf_token();
+                Xdb::execute('DELETE FROM ip_watch WHERE ip = {?}', ip_to_uint($ip));
+            }
+        }
+        if ($action != 'create' && $action != 'edit') {
+            $action = 'list';
+        }
+        $page->assign('action', $action);
+
+        if ($action == 'list') {
+            $sql = "SELECT  w.ip, IF(s.ip IS NULL,
+                                     IF(w.ip = s2.ip, s2.host, s2.forward_host),
+                                     IF(w.ip = s.ip, s.host, s.forward_host)),
+                            w.mask, w.detection, w.state, a.alias AS forlife
+                      FROM  ip_watch        AS w
+                 LEFT JOIN  logger.sessions AS s  ON (s.ip = w.ip)
+                 LEFT JOIN  logger.sessions AS s2 ON (s2.forward_ip = w.ip)
+                 LEFT JOIN  aliases         AS a  ON (a.id = s.uid AND a.type = 'a_vie')
+                  GROUP BY  w.ip, a.alias
+                  ORDER BY  w.state, w.ip, a.alias";
+            $it = Xdb::iterRow($sql);
+
+            $table = array();
+            $props = array();
+            while (list($ip, $host, $mask, $date, $state, $forlife) = $it->next()) {
+                $ip = uint_to_ip($ip);
+                $mask = uint_to_ip($mask);
+                if (count($props) == 0 || $props['ip'] != $ip) {
+                    if (count($props) > 0) {
+                        $table[] = $props;
+                    }
+                    $props = array('ip'        => $ip,
+                                   'mask'      => $mask,
+                                   'host'      => $host,
+                                   'detection' => $date,
+                                   'state'     => $state,
+                                   'users'     => array($forlife));
+                } else {
+                    $props['users'][] = $forlife;
+                }
+            }
+            if (count($props) > 0) {
+                $table[] = $props;
+            }
+            $page->assign('table', $table);
+        } elseif ($action == 'edit') {
+            $sql = "SELECT  w.detection, w.state, w.last, w.description, w.mask,
+                            a1.alias AS edit, a2.alias AS forlife, s.host
+                      FROM  ip_watch        AS w
+                 LEFT JOIN  aliases         AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie')
+                 LEFT JOIN  logger.sessions AS s  ON (w.ip = s.ip)
+                 LEFT JOIN  aliases         AS a2 ON (a2.id = s.uid AND a2.type = 'a_vie')
+                     WHERE  w.ip = {?}
+                  GROUP BY  a2.alias
+                  ORDER BY  a2.alias";
+            $it = Xdb::iterRow($sql, ip_to_uint($ip));
+
+            $props = array();
+            while (list($detection, $state, $last, $description, $mask, $edit, $forlife, $host) = $it->next()) {
+                if (count($props) == 0) {
+                    $props = array('ip'          => $ip,
+                                   'mask'        => uint_to_ip($mask),
+                                   'host'        => $host,
+                                   'detection'   => $detection,
+                                   'state'       => $state,
+                                   'last'        => $last,
+                                   'description' => $description,
+                                   'edit'        => $edit,
+                                   'users'       => array($forlife));
+                } else {
+                    $props['users'][] = $forlife;
+                }
+            }
+            $page->assign('ip', $props);
+        }
     }
-    
-    function handler_trombino(&$page, $uid = null, $action = null) {
-        $page->changeTpl('admin/admin_trombino.tpl');
-        $page->assign('xorg_title','Polytechnique.org - Administration - Trombino');
-        $page->assign('uid', $uid);
-        
-        $q   = XDB::query(
-                "SELECT  a.alias,promo
-                  FROM  auth_user_md5 AS u
-            INNER JOIN  aliases       AS a ON ( u.user_id = a.id AND type='a_vie' )
-                 WHERE  user_id = {?}", $uid);
-        list($forlife, $promo) = $q->fetchOneRow();
-        
-        switch ($action) {
-        
-            case "original":
-                header("Content-type: image/jpeg");
-               readfile("/home/web/trombino/photos".$promo."/".$forlife.".jpg");
-                exit;
-               break;
-        
-            case "new":
-                $data = file_get_contents($_FILES['userfile']['tmp_name']);
-               list($x, $y) = getimagesize($_FILES['userfile']['tmp_name']);
-               $mimetype = substr($_FILES['userfile']['type'], 6);
-               unlink($_FILES['userfile']['tmp_name']);
-                XDB::execute(
-                        "REPLACE INTO photo SET uid={?}, attachmime = {?}, attach={?}, x={?}, y={?}",
-                        $uid, $mimetype, $data, $x, $y);
-               break;
-        
-            case "delete":
-                XDB::execute('DELETE FROM photo WHERE uid = {?}', $uid);
-                break;
-        }
-        
-        $page->assign('forlife', $forlife);
+
+    function handler_icons(&$page)
+    {
+        $page->changeTpl('admin/icons.tpl');
+        $dh = opendir('../htdocs/images/icons');
+        if (!$dh) {
+            $page->trig('Dossier des icones introuvables.');
+        }
+        $icons = array();
+        while (($file = readdir($dh)) !== false) {
+            if (strlen($file) > 4 && substr($file,-4) == '.gif') {
+                array_push($icons, substr($file, 0, -4));
+            }
+        }
+        sort($icons);
+        $page->assign('icons', $icons);
     }
-    
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>