From c8ab90e7934e9621b4c84b37e047855b9cab72d2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Wed, 27 Oct 2010 00:18:24 +0200
Subject: [PATCH] Improve fixes on admin/logger page; remove smarty warnings.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 modules/admin.php               | 13 +++++++++----
 templates/admin/logger-view.tpl |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/admin.php b/modules/admin.php
index 85b28dd..567895a 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -313,10 +313,15 @@ class AdminModule extends PLModule
                $page->append('events', $myarr);
             }
 
-        } else if ($action != null || Env::has('logger')) {
+        } else {
             $loguser = $action == 'user' ? $arg : Env::v('loguser');
-            $user = User::get($loguser);
-            $loguid  = $user->id();
+
+            if ($loguser) {
+                $user = User::get($loguser);
+                $loguid = $user->id();
+            } else {
+                $loguid = null;
+            }
 
             if ($loguid) {
                 $year  = Env::i('year');
@@ -381,7 +386,7 @@ class AdminModule extends PLModule
                 }
                 $page->assign_by_ref('sessions', $sessions);
             } else {
-                $page->assign('msg_nofilters', "Sélectionner une annuée et/ou un utilisateur");
+                $page->assign('msg_nofilters', "Sélectionner une année et/ou un utilisateur");
             }
         }
 
diff --git a/templates/admin/logger-view.tpl b/templates/admin/logger-view.tpl
index b488379..7dd7ff8 100644
--- a/templates/admin/logger-view.tpl
+++ b/templates/admin/logger-view.tpl
@@ -22,7 +22,7 @@
 
 <h1>Parcours des logs du site</h1>
 
-{if $events}
+{if t($events)}
 
 <table class="bicol">
 <tr>
@@ -127,7 +127,7 @@
     </td>
   </tr>
   {/foreach}
-{if $msg_nofilters}
+{if t($msg_nofilters)}
 <tr>
   <td>{$msg_nofilters}</td>
 </tr>
-- 
2.1.4