From 9bef113f12822e79e4f0dfc62c27fee7351ffd80 Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Tue, 15 Jun 2010 23:59:20 +0200
Subject: [PATCH] Fixes see logger in admin interface

---
 modules/admin.php               | 9 ++++++---
 templates/admin/logger-view.tpl | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/admin.php b/modules/admin.php
index 76f7d12..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) {
@@ -393,7 +396,7 @@ 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'));
         }
 
diff --git a/templates/admin/logger-view.tpl b/templates/admin/logger-view.tpl
index 8600534..b488379 100644
--- a/templates/admin/logger-view.tpl
+++ b/templates/admin/logger-view.tpl
@@ -121,7 +121,9 @@
     </td>
     <td class="action">
       <a href="admin/logger/session/{$mysess.id}">session</a>
+      {if !$loguser || ($loguser neq $mysess.username) || $year || $month || $day}
       <a href="admin/logger/user/{$mysess.username}">user's log</a>
+      {/if}
     </td>
   </tr>
   {/foreach}
-- 
2.1.4