X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=b0ac1efcf5b71dc6497fb5926a8f0e523b615bd8;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=f867d95f64f1ec1ae36fd45692e9451ef7841ee4;hpb=42a50827dc2ac2b13ddaf77ea16c0989cd8b960d;p=platal.git

diff --git a/modules/admin.php b/modules/admin.php
index f867d95..b0ac1ef 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'),
@@ -44,6 +45,12 @@ class AdminModule extends PLModule
         );
     }
 
+    function handler_phpinfo(&$page)
+    {
+        phpinfo();
+        exit;
+    }
+
     function handler_default(&$page)
     {
         $page->changeTpl('admin/index.tpl');
@@ -338,7 +345,8 @@ class AdminModule extends PLModule
         $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");
@@ -350,12 +358,15 @@ class AdminModule extends PLModule
 
         if (Env::has('user_id')) {
             $login = get_user_login(Env::i('user_id'));
+            if (empty($login)) {
+                $login = Env::i('user_id');
+            }
         } elseif (Env::has('login')) {
             $login = get_user_login(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) {
@@ -373,12 +384,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) {
@@ -401,8 +423,9 @@ 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({?}, '@%')",
@@ -476,10 +499,10 @@ 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')));
                         }
-                        $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']);
+                        $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;
 
@@ -512,9 +535,9 @@ 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);
+            if ($mr['perms'] != 'pending') {
+                $page->assign('emails',$redirect->emails);
+            }
 
             $page->assign('mr',$mr);
         }
@@ -698,7 +721,7 @@ class AdminModule extends PLModule
         }
 
         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(); }
         }