admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task #1419: Déconnexion dans le popup

Browse source 
Add a close window button for the ajax disconnect
Fix bug
This commit is contained in:
Dany De Bontridder 2017-03-25 13:28:53 +01:00
parent 561bd84f43
commit 0aa186b0fd
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
html/popup.php
View file

@ -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 */

1
include/lib/ac_common.php
View file

@ -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');