From 0aa186b0fd30693015aa182026984f7a09aaac66 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Sat, 25 Mar 2017 13:28:53 +0100
Subject: [PATCH] =?UTF-8?q?Task=20#1419:=20D=C3=A9connexion=20dans=20le=20?=
 =?UTF-8?q?popup=20Add=20a=20close=20window=20button=20for=20the=20ajax=20?=
 =?UTF-8?q?disconnect=20Fix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/popup.php            | 13 ++++++++-----
 include/lib/ac_common.php |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/html/popup.php b/html/popup.php
index 2ba3a0b5d..21ef8397d 100644
--- a/html/popup.php
+++ b/html/popup.php
@@ -27,13 +27,10 @@ require_once NOALYSS_INCLUDE.'/class/class_user.php';
 require_once NOALYSS_INCLUDE.'/class/class_periode.php';
 
 
-html_page_start($_SESSION['g_theme']);
-echo '<div style="float:left;">';
-global $g_user;
 /*
  * Check if the user is still connected
  */
-if ( $g_user == null || ! isset ($_SESSION['g_user'] ) )
+if (  ! isset ($_SESSION['g_user'] ) )
 {
     echo "<h2>"._('Vous  êtes déconnecté')."</h2>";
     $backurl=$_SERVER['REQUEST_URI'];
@@ -41,6 +38,13 @@ if ( $g_user == null || ! isset ($_SESSION['g_user'] ) )
     redirect($url);
     exit();
 }
+
+
+html_page_start($_SESSION['g_theme']);
+echo '<div style="float:left;">';
+
+global $g_user;
+$g_user=new User($cn);
 $g_user->Check();
 $g_user->check_dossier(Dossier::id());
 
@@ -49,7 +53,6 @@ if ( basename($_GET['op']) == 'history' )
     $href=dossier::get();
     $cn=Dossier::connect();
     /* current year  */
-    $g_user=new User($cn);
     $exercice=$g_user->get_exercice();
 
     /* get date limit */
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index e4fbd333c..d902b9154 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -834,6 +834,7 @@ function ajax_disconnected($div)
                 _('Cliquez ici pour vous reconnecter dans une autre page').
                 '</a>';
         $html.=$reload->input();
+        $html.=HtmlInput::button_close($div);
         $html.='</p>';
 	$html = escape_xml($html);
 	header('Content-type: text/xml; charset=UTF-8');