[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 08/08: Task #1419: Déconnexion dans le popup
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 08/08: Task #1419: Déconnexion dans le popup Add a close window button for the ajax disconnect Fix bug |
Date: |
Sat, 25 Mar 2017 08:29:41 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 0aa186b0fd30693015aa182026984f7a09aaac66
Author: Dany De Bontridder <address@hidden>
Date: Sat Mar 25 13:28:53 2017 +0100
Task #1419: Déconnexion dans le popup
Add a close window button for the ajax disconnect
Fix bug
---
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 2ba3a0b..21ef839 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 e4fbd33..d902b91 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');
- [Noalyss-commit] [noalyss] branch master updated (70e0a4e -> 0aa186b), Dany De Bontridder, 2017/03/25
- [Noalyss-commit] [noalyss] 01/08: Task #0001421: Détail fiche : recherche poste comptable, Dany De Bontridder, 2017/03/25
- [Noalyss-commit] [noalyss] 08/08: Task #1419: Déconnexion dans le popup Add a close window button for the ajax disconnect Fix bug,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 07/08: Security : improve a potential weakness, Dany De Bontridder, 2017/03/25
- [Noalyss-commit] [noalyss] 02/08: task #1420: Fonction error_log manquante, Dany De Bontridder, 2017/03/25
- [Noalyss-commit] [noalyss] 06/08: task #0001422: Installation : améliorer la page, Dany De Bontridder, 2017/03/25
- [Noalyss-commit] [noalyss] 05/08: 1418: Affichage Balance - soldes et sous-totaux, Dany De Bontridder, 2017/03/25
- [Noalyss-commit] [noalyss] 03/08: Task #1420: Fonction error_log manquante Generalisation de la fonction, Dany De Bontridder, 2017/03/25
- [Noalyss-commit] [noalyss] 04/08: Update translation, Dany De Bontridder, 2017/03/25