From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 25 Jan 2009 21:15:31 +0000 (+0100)
Subject: Merge commit 'origin/platal-0.10.0'
X-Git-Tag: xorg/0.10.1~147
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=59bec5bc5512a4f962ebac7b0346f59cdf56f901;p=platal.git

Merge commit 'origin/platal-0.10.0'

Conflicts:

	modules/platal.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

59bec5bc5512a4f962ebac7b0346f59cdf56f901
diff --cc modules/platal.php
index 1f1a643,c9b4287..3591fff
--- a/modules/platal.php
+++ b/modules/platal.php
@@@ -439,11 -446,17 +439,13 @@@ Adresse de secours : " . Post::v('email
          }
  
          if ($level == 'forgetuid' || $level == 'forgetall') {
 -            setcookie('ORGuid', '', time() - 3600, '/', '', 0);
 -            Cookie::kill('ORGuid');
 -            setcookie('ORGdomain', '', time() - 3600, '/', '', 0);
 -            Cookie::kill('ORGdomain');
 +            Platal::session()->killLoginFormCookies();
          }
  
-         S::logger()->log('deconnexion', @$_SERVER['HTTP_REFERER']);
-         Platal::session()->destroy();
+         if (S::logged()) {
 -            $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
 -            S::logger()->log('deconnexion', $ref);
++            S::logger()->log('deconnexion', @$_SERVER['HTTP_REFERER']);
++            Platal::session()->destroy();
+         }
 -        Platal::session()->destroy();
  
          if (Get::has('redirect')) {
              http_redirect(rawurldecode(Get::v('redirect')));