Merge commit 'origin/platal-0.10.0'

Conflicts:

	modules/platal.php

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

diff --cc include/notifs.inc.php
Simple merge

diff --cc include/user.func.inc.php
Simple merge

diff --cc modules/platal.php
index 1f1a643,c9b4287..3591fff
--- 1/modules/platal.php
--- 2/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')));

diff --cc modules/xnetevents/xnetevents.inc.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge

diff --cc modules/xnetlists.php
Simple merge