From 54e73532f787629c1b9b98b0700aa37b75e01d33 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 17 Dec 2008 21:51:27 +0100
Subject: [PATCH] Fix some logging issues again.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 classes/xorgsession.php      | 10 ++++------
 modules/platal.php           | 10 ++++------
 modules/profile/page.inc.php |  1 -
 modules/register.php         |  1 +
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index aa57647..91cda51 100644
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -37,7 +37,7 @@ class XorgSession extends PlSession
             }
         }
         if ((check_ip('dangerous') && S::has('uid')) || check_account()) {
-            $_SESSION['log']->log("view_page", $_SERVER['REQUEST_URI']);
+            S::logger()->log("view_page", $_SERVER['REQUEST_URI']);
         }
         return true;
     }
@@ -199,8 +199,8 @@ class XorgSession extends PlSession
         }
         if ($level == AUTH_SUID) {
             S::set('auth', AUTH_MDP);
+            unset($_SESSION['log']);
         }
-        unset($_SESSION['log']);
 
         // Retrieves main user properties.
         $res  = XDB::query("SELECT  u.user_id AS uid, u.hruid, prenom, prenom_ini, nom, nom_ini, nom_usage, perms, promo, promo_sortie,
@@ -234,14 +234,12 @@ class XorgSession extends PlSession
             if (S::i('auth_by_cookie') == $uid || Post::v('remember', 'false') == 'true') {
                 $cookie = hash_encrypt($sess['password']);
                 setcookie('ORGaccess', $cookie, (time() + 25920000), '/', '', 0);
-                if ($logger && S::i('auth_by_cookie') != $uid) {
+                if (S::i('auth_by_cookie') != $uid) {
                     $logger->log("cookie_on");
                 }
             } else {
                 setcookie('ORGaccess', '', time() - 3600, '/', '', 0);
-                if ($logger) {
-                    $logger->log("cookie_off");
-                }
+                $logger->log("cookie_off");
             }
         }
 
diff --git a/modules/platal.php b/modules/platal.php
index 27fd7ff..cf73869 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -234,6 +234,7 @@ class PlatalModule extends PLModule
 
             if (Cookie::v('ORGaccess')) {
                 setcookie('ORGaccess', hash_encrypt($password), (time()+25920000), '/', '' ,0);
+                S::logger()->log('cookie_on', '');
             }
 
             $page->changeTpl('platal/motdepasse.success.tpl');
@@ -441,8 +442,7 @@ Adresse de secours : " . Post::v('email') : ""));
         if ($level == 'forget' || $level == 'forgetall') {
             setcookie('ORGaccess', '', time() - 3600, '/', '', 0);
             Cookie::kill('ORGaccess');
-            if (isset($_SESSION['log']))
-                S::logger()->log("cookie_off");
+            S::logger()->log("cookie_off");
         }
 
         if ($level == 'forgetuid' || $level == 'forgetall') {
@@ -452,10 +452,8 @@ Adresse de secours : " . Post::v('email') : ""));
             Cookie::kill('ORGdomain');
         }
 
-        if (isset($_SESSION['log'])) {
-            $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
-            S::logger()->log('deconnexion',$ref);
-        }
+        $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+        S::logger()->log('deconnexion',$ref);
         Platal::session()->destroy();
 
         if (Get::has('redirect')) {
diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php
index 433947e..35a1f97 100644
--- a/modules/profile/page.inc.php
+++ b/modules/profile/page.inc.php
@@ -253,7 +253,6 @@ abstract class ProfilePage implements PlWizardPage
             register_watch_op(S::i('uid'), WATCH_FICHE);
         }
         global $platal;
-        $log =& $_SESSION['log'];
         S::logger()->log('profil', $platal->pl_self(1));
     }
 
diff --git a/modules/register.php b/modules/register.php
index f77841c..9089244 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -446,6 +446,7 @@ class RegisterModule extends PLModule
             if (Cookie::v('ORGaccess')) {
                 require_once('secure_hash.inc.php');
                 setcookie('ORGaccess', hash_encrypt($password), (time()+25920000), '/', '' ,0);
+                S::logger()->log('cookie_on', '');
             }
 
             $page->assign('mdpok', true);
-- 
2.1.4