X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=ecb35d7cfcf88bc476a18b22dd99a40d6944fdc9;hb=8b1f8e12d444062ef63a0db3a8fa94582a9778c3;hp=b3f459f2db75e535b7655fb3ddb58e5fa87dd343;hpb=1e33266a2f91e1af7a5cb3e8fbbc1c49ff9341f3;p=platal.git

diff --git a/modules/admin.php b/modules/admin.php
index b3f459f..ecb35d7 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -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');
     }
@@ -357,12 +358,12 @@ class AdminModule extends PLModule
         }
 
         if (Env::has('user_id')) {
-            $login = get_user_login(Env::i('user_id'));
+            $login = get_user_forlife(Env::i('user_id'));
             if (empty($login)) {
                 $login = Env::i('user_id');
             }
         } elseif (Env::has('login')) {
-            $login = get_user_login(Env::v('login'));
+            $login = get_user_forlife(Env::v('login'));
         }
 
         if(Env::has('logs_button') && $login) {
@@ -498,6 +499,9 @@ class AdminModule extends PLModule
                         if (Env::v('nomusageN') != $mr['nom_usage']) {
                             set_new_usage($mr['user_id'], Env::v('nomusageN'), make_username(Env::v('prenomN'), Env::v('nomusageN')));
                         }
+                        if (Env::v('decesN') != $mr['deces']) {
+                            user_clear_all_subs($mr['user_id'], false);
+                        }
                         $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe
                                            FROM auth_user_md5 AS u
                                       LEFT JOIN aliases       AS a ON (a.id = u.user_id AND type= 'a_vie')
@@ -528,6 +532,14 @@ class AdminModule extends PLModule
             $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
@@ -540,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');