backport : bug geoloc pour afficher toutes les adresses

[platal.git] / modules / admin.php

diff --git a/modules/admin.php b/modules/admin.php
index 6a3990f..2e8f01a 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -24,7 +24,8 @@ class AdminModule extends PLModule
     function handlers()
     {
         return array(
-            'admin'                        => $this->make_hook('default',   AUTH_MDP, 'admin'),
+            'phpinfo'                      => $this->make_hook('phpinfo', AUTH_MDP, 'admin'),
+            'admin'                        => $this->make_hook('default', AUTH_MDP, 'admin'),
             'admin/ax-xorg'                => $this->make_hook('ax_xorg', AUTH_MDP, 'admin'),
             'admin/deaths'                 => $this->make_hook('deaths', AUTH_MDP, 'admin'),
             'admin/downtime'               => $this->make_hook('downtime', AUTH_MDP, 'admin'),
@@ -44,6 +45,12 @@ class AdminModule extends PLModule
         );
     }
 
+    function handler_phpinfo(&$page)
+    {
+        phpinfo();
+        exit;
+    }
+
     function handler_default(&$page)
     {
         $page->changeTpl('admin/index.tpl');
@@ -403,6 +410,10 @@ class AdminModule extends PLModule
                         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("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é");
                         }
@@ -508,8 +519,6 @@ class AdminModule extends PLModule
                            FROM  aliases
                           WHERE  id = {?} AND type!='homonyme'
                        ORDER BY  type!= 'a_vie'", $mr["user_id"]));
-            $page->assign('xorgmails', $xorgmails);
-            $page->assign('email_panne', $email_panne);
             $page->assign('emails',$redirect->emails);
 
             $page->assign('mr',$mr);
@@ -684,11 +693,15 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_validate(&$page) {
+    function handler_validate(&$page, $action = 'list', $id = null) {
         $page->changeTpl('admin/valider.tpl');
         $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande');
         require_once("validations.inc.php");
 
+        if ($action == 'edit' and !is_null($id)) {
+            $page->assign('preview_id', $id);
+        }
+
         if(Env::has('uid') && Env::has('type') && Env::has('stamp')) {
             $req = Validate::get_request(Env::v('uid'), Env::v('type'), Env::v('stamp'));
             if($req) { $req->handle_formu(); }
@@ -716,7 +729,6 @@ class AdminModule extends PLModule
         $page->assign('vit', new ValidateIterator());
     }
     function handler_validate_answers(&$page, $action = 'list', $id = null) {
-        require_once('../classes/PLTableEditor.php');
         $page->assign('xorg_title','Polytechnique.org - Administration - Réponses automatiques de validation');
         $page->assign('title', 'Gestion des réponses automatiques');
         $table_editor = new PLTableEditor('admin/validate/answers','requests_answers','id');
@@ -726,7 +738,6 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
     function handler_skins(&$page, $action = 'list', $id = null) {
-        require_once('../classes/PLTableEditor.php');
         $page->assign('xorg_title','Polytechnique.org - Administration - Skins');
         $page->assign('title', 'Gestion des skins');
         $table_editor = new PLTableEditor('admin/skins','skins','id');
@@ -739,7 +750,6 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
     function handler_postfix_blacklist(&$page, $action = 'list', $id = null) {
-        require_once('../classes/PLTableEditor.php');
         $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Blacklist');
         $page->assign('title', 'Blacklist de postfix');
         $table_editor = new PLTableEditor('admin/postfix/blacklist','postfix_blacklist','email', true);
@@ -748,7 +758,6 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
     function handler_postfix_whitelist(&$page, $action = 'list', $id = null) {
-        require_once('../classes/PLTableEditor.php');
         $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Whitelist');
         $page->assign('title', 'Whitelist de postfix');
         $table_editor = new PLTableEditor('admin/postfix/whitelist','postfix_whitelist','email', true);
@@ -756,7 +765,6 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
     function handler_logger_actions(&$page, $action = 'list', $id = null) {
-        require_once('../classes/PLTableEditor.php');
         $page->assign('xorg_title','Polytechnique.org - Administration - Actions');
         $page->assign('title', 'Gestion des actions de logger');
         $table_editor = new PLTableEditor('admin/logger/actions','logger.actions','id');
@@ -765,7 +773,6 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
     function handler_downtime(&$page, $action = 'list', $id = null) {
-        require_once('../classes/PLTableEditor.php');
         $page->assign('xorg_title','Polytechnique.org - Administration - Coupures');
         $page->assign('title', 'Gestion des coupures');
         $table_editor = new PLTableEditor('admin/downtime','coupures','id');