From 91b80006b99e5f8804e922b6a58f5a5a9c6ed833 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Wed, 26 Aug 2015 20:02:15 +0200 Subject: [PATCH] =?UTF-8?q?Task=20#1159=20-=20D=C3=A9connexion/reconnexion?= =?UTF-8?q?=20-=20pop-up=3F=20Bug=20#1151Bug=20cannot=20display=20properly?= =?UTF-8?q?=20when=20only=20one=20submenu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/do.php | 4 +++- html/index.php | 17 ++++++++++++----- html/login.php | 10 +++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/html/do.php b/html/do.php index 9417f6598..51671d18b 100644 --- a/html/do.php +++ b/html/do.php @@ -42,7 +42,9 @@ if ( ! isset($_REQUEST['gDossier'])) if ( ! isset ($_SESSION['g_theme'])) { echo "

"._('Vous êtes déconnecté')."

"; - redirect('user_login.php'); + $backurl=$_SERVER['REQUEST_URI']; + $url="index.php?".http_build_query(array('reconnect'=>1,'backurl'=>urlencode($backurl))); + redirect($url); exit(); } diff --git a/html/index.php b/html/index.php index 8bc66e7d8..e008e5666 100644 --- a/html/index.php +++ b/html/index.php @@ -207,7 +207,9 @@ background-repeat: repeat-x repeat-y; '; $my_domain=""; require_once '../include/constant.php'; -require_once ('config.inc.php'); +require_once '../include/config.inc.php'; +require_once NOALYSS_INCLUDE.'/ac_common.php'; + if ( strlen(domaine) > 0 ) { $my_domain="Domaine : ".domaine; @@ -217,6 +219,11 @@ if (defined("RECOVER") && isset ($_REQUEST['recover']) ) { require_once '../include/recover.php'; } +// reconnect , create a variable to reconnect properly in login.php +$goto=""; +if (isset ($_REQUEST['reconnect']) && isset ($_REQUEST['backurl'])) { + $goto=''; +} echo ' version 6.8.1.6 - '.$my_domain.' @@ -232,8 +239,9 @@ version 6.8.1.6 - '.$my_domain.'

-
-
+'. + $goto . +'
@@ -244,8 +252,7 @@ version 6.8.1.6 - '.$my_domain.' '; -require_once('constant.php'); -require_once('ac_common.php'); + if ( $g_captcha == true ) { diff --git a/html/login.php b/html/login.php index e39c9a27b..2bae3551e 100644 --- a/html/login.php +++ b/html/login.php @@ -53,7 +53,7 @@ if ( isset ($_POST["p_user"] ) ) echo ""; exit(); } - include_once ("class_user.php"); + include_once NOALYSS_INCLUDE."/class_user.php"; $User=new User($rep); $User->Check(false,'LOGIN'); if ($g_captcha == true) @@ -68,8 +68,12 @@ if ( isset ($_POST["p_user"] ) ) exit(); } } - echo ""; - + $backurl='user_login.php'; + if ( isset ($_POST['backurl'])) { + $backurl=urldecode($_POST['backurl']); + } + echo ""; + exit(); } else {
Utilisateur