X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=bc6f097520ad8d460882d33f77e30adb79359a58;hb=035de9c1782e689f6cb6424ba6dc0525729fed55;hp=341d21c0112233d4938af4ae6f3f3ec91483a604;hpb=34465ab035104f739a54ec62660f04f874448627;p=platal.git

diff --git a/modules/admin.php b/modules/admin.php
index 341d21c..bc6f097 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -132,7 +132,8 @@ class AdminModule extends PLModule
     function _getDays($year, $month)
     {
         // give a 'no filter' option
-        $months[0] = "----";
+        $days = array();
+        $days[0] = "----";
 
         if ($year && $month) {
             $day_max = Array(-1, 31, checkdate(2, 29, $year) ? 29 : 28 , 31,
@@ -174,6 +175,7 @@ class AdminModule extends PLModule
     function _getMonths($year)
     {
         // give a 'no filter' option
+        $months = array();
         $months[0] = "----";
 
         if ($year) {
@@ -206,6 +208,7 @@ class AdminModule extends PLModule
     function _getYears()
     {
         // give a 'no filter' option
+        $years = array();
         $years[0] = "----";
 
         // retrieve available years
@@ -236,7 +239,7 @@ class AdminModule extends PLModule
         $where = array();
 
         if ($uid)
-            array_push($where, "uid='$uid'");
+            array_push($where, "s.uid='$uid'");
 
         // we were given at least a year
         if ($year) {
@@ -374,8 +377,10 @@ class AdminModule extends PLModule
         }
 
         // Loads the user identity using the environment.
-        $user = User::get($login);
-        if (!$user) {
+        if ($login) {
+            $user = User::get($login);
+        }
+        if (empty($user)) {
             return;
         }
 
@@ -391,11 +396,11 @@ class AdminModule extends PLModule
         }
 
         // Handles specific requests (AX sync, su, ...).
-        if(Post::has('logs_account')) {
+        if(Post::has('log_account')) {
             pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m'));
         }
 
-        if(Post::has('su_button') && $registered) {
+        if(Post::has('su_account') && $registered) {
             if (!Platal::session()->startSUID($user)) {
                 $page->trigError('Impossible d\'effectuer un SUID sur ' . $user->login());
             } else {
@@ -433,8 +438,8 @@ class AdminModule extends PLModule
             if (Post::i('token_access', 0) != ($user->token_access ? 1 : 0)) {
                 $to_update['token'] = Post::i('token_access') ? rand_url_id(16) : null;
             }
-            if (Post::i('skin', 0) != $user->skin) {
-                $to_update['skin'] = Post::i('skin', 0);
+            if (Post::i('skin') != $user->skin) {
+                $to_update['skin'] = Post::i('skin');
                 if ($to_update['skin'] == 0) {
                     $to_update['skin'] = null;
                 }
@@ -853,8 +858,8 @@ class AdminModule extends PLModule
         if ($op == 'list') {
             $res = XDB::iterator(
                     "SELECT  a.alias AS homonyme, s.alias AS forlife,
-                             IF(h.homonyme_id = s.id, a.expire, NULL) AS expire,
-                             IF(h.homonyme_id = s.id, a.type, NULL) AS type, ac.uid
+                             IF(h.homonyme_id = s.uid, a.expire, NULL) AS expire,
+                             IF(h.homonyme_id = s.uid, a.type, NULL) AS type, ac.uid
                        FROM  aliases       AS a
                   LEFT JOIN  homonyms      AS h  ON (h.homonyme_id = a.uid)
                  INNER JOIN  aliases       AS s  ON (s.uid = h.uid AND s.type = 'a_vie')
@@ -935,7 +940,7 @@ class AdminModule extends PLModule
 
     function handler_validate(&$page, $action = 'list', $id = null)
     {
-        $page->changeTpl('admin/valider.tpl');
+        $page->changeTpl('admin/validation.tpl');
         $page->setTitle('Administration - Valider une demande');
                 $page->addCssLink('nl.css');
         $page->addJsLink('ajax.js');