do not check asso() in X.org

[platal.git] / modules / admin.php

diff --git a/modules/admin.php b/modules/admin.php
index ab1a129..0c5ff0c 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -39,6 +39,7 @@ 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'),
@@ -340,7 +341,7 @@ class AdminModule extends PLModule
             }
         }
 
-        $page->changeTpl('logger-view.tpl');
+        $page->changeTpl('admin/logger-view.tpl');
 
         $page->assign('xorg_title','Polytechnique.org - Administration - Logs des sessions');
     }
@@ -516,7 +517,7 @@ class AdminModule extends PLModule
                         $mailer->setFrom("webmaster@polytechnique.org");
                         $mailer->addTo("web@polytechnique.org");
                         $mailer->setSubject("INTERVENTION de ".S::v('forlife'));
-                        $mailer->setTxtBody("\nUtilisateur $login effacé");
+                        $mailer->setTxtBody("\nUtilisateur $login désinscrit");
                         $mailer->send();
                         break;
                 }
@@ -551,6 +552,55 @@ class AdminModule extends PLModule
             $page->assign('mr',$mr);
         }
     }
+
+    function getMatricule($line, $key)
+    {
+        $mat = $line['matricule'];
+        $year = intval(substr($mat, 0, 3));
+        $rang = intval(substr($mat, 3, 3));
+        if ($year > 200) { $year /= 10; };
+        if ($year < 96) {
+            return null;
+        } else {
+            return sprintf('%04u%04u', 1900+$year, $rang);
+        }
+    }
+
+    function handler_promo(&$page, $action = null, $promo = null)
+    {
+        if (Env::has('promo')) {
+            if(Env::i('promo') > 1900 && Env::i('promo') < 2050) {
+                $action = Env::v('valid_promo') == 'Ajouter des membres' ? 'add' : 'ax'; 
+                pl_redirect('admin/promo/' . $action . '/' . Env::i('promo'));
+            } else {
+                $page->trig('Promo non valide');
+            }
+        }
+
+        $page->changeTpl('admin/promo.tpl');
+        if ($promo > 1900 && $promo < 2050 && ($action == 'add' || $action == 'ax')) {
+            $page->assign('promo', $promo);
+        } else {
+            return;
+        }
+
+        $importer = new CSVImporter('auth_user_md5', 'matricule');
+        $importer->registerFunction('matricule', 'matricle Ecole vers X.org', array($this, 'getMatricule'));
+        switch ($action) {
+          case 'add':
+            $fields = array('nom', 'nom_ini', 'prenom',
+                            'prenom_ini', 'promo', 'promo_sortie', 'flags',
+                            'matricule', 'matricule_ax', 'perms');
+            $importer->forceValue('promo', $promo);
+            $importer->forceValue('promo_sortie', $promo + 3);
+            break;
+          case 'ax':
+            $fields = array('matricule', 'matricule_ax');
+            break;
+        }
+        $importer->apply($page, "admin/promo/$action/$promo", $fields);
+    }
+
     function handler_homonyms(&$page, $op = 'list', $target = null) {
         $page->changeTpl('admin/homonymes.tpl');
         $page->assign('xorg_title','Polytechnique.org - Administration - Homonymes');
@@ -810,7 +860,9 @@ class AdminModule extends PLModule
         $table_editor->describe('description','description',false);
         $table_editor->apply($page, $action, $id);
     }
-    function handler_wiki(&$page, $action='list') {
+
+    function handler_wiki(&$page, $action='list')
+    {
         require_once 'wiki.inc.php';
 
         // update wiki perms
@@ -846,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);
     }
 }