diff --git a/js/ajax.js b/js/ajax.js index f484d522a7..55a74ce316 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -358,6 +358,19 @@ var AJAX = { return; } if (typeof data.success !== 'undefined' && data.success) { + + if(typeof data.user_changed !== 'undefined' && data.user_changed == 1) { + window.location.reload(); + PMA_ajaxShowMessage("Loading...", false); + AJAX.active = false; + AJAX.xhr = null; + return; + } else if(typeof data.logged_in !== 'undefined' && data.logged_in == 1) { + if($("#modalOverlay")) { + $("#modalOverlay").remove(); + } + } + $('html, body').animate({ scrollTop: 0 }, 'fast'); PMA_ajaxRemoveMessage(AJAX.$msgbox); @@ -411,6 +424,7 @@ var AJAX = { .not('#pma_demo') .not('#pma_console_container') .not('#prefs_autoload') + .not("#modalOverlay") .remove(); // Replace #page_content with new content if (data.message && data.message.length > 0) { @@ -505,6 +519,45 @@ var AJAX = { } AJAX._callback = function () {}; }); + } else if(typeof data.logged_in !== 'undefined' && data.logged_in == 0) { + // window.location.reload(); + // console.log(data.error) + PMA_ajaxRemoveMessage(AJAX.$msgbox); + AJAX.scriptHandler.reset(function(){ + if (data._selflink) { + var source = data._selflink.split('?')[0]; + // Check for faulty links + $selflink_replace = { + 'import.php': 'tbl_sql.php', + 'tbl_chart.php': 'sql.php', + 'tbl_gis_visualization.php': 'sql.php' + }; + if ($selflink_replace[source]) { + var replacement = $selflink_replace[source]; + data._selflink = data._selflink.replace(source, replacement); + } + $('#selflink').find('> a').attr('href', data._selflink); + } + if (data._params) { + PMA_commonParams.setAll(data._params); + } + if (data._scripts) { + AJAX.scriptHandler.load(data._scripts); + } + if (data._selflink && data._scripts && data._menuHash && data._params) { + if (! (history && history.pushState)) { + PMA_MicroHistory.add( + data._selflink, + data._scripts, + data._menuHash, + data._params, + AJAX.source.attr('rel') + ); + } + } + }); + $("#modalOverlay").replaceWith(data.error); + // alert("asdf"); } else { PMA_ajaxShowMessage(data.error, false); AJAX.active = false; diff --git a/js/functions.js b/js/functions.js index f3a66b5a13..6ad3b8f542 100644 --- a/js/functions.js +++ b/js/functions.js @@ -949,7 +949,8 @@ AJAX.registerOnload('functions.js', function () { 'server' : PMA_commonParams.get('server'), 'db' : PMA_commonParams.get('db'), 'guid': guid, - 'access_time':_idleSecondsCounter + 'access_time': _idleSecondsCounter, + 'check_timeout': 1 }; $.ajax({ type: 'POST', @@ -972,13 +973,20 @@ AJAX.registerOnload('functions.js', function () { // max value for setInterval() function interval = Math.min((remaining - 1) * 1000, Math.pow(2, 31) - 1); } + // console.log(_idleSecondsCounter); updateTimeout = window.setTimeout(UpdateIdleTime, interval); } else { // timeout occurred clearInterval(IncInterval); if (isStorageSupported('sessionStorage')) { window.sessionStorage.clear(); } - window.location.reload(true); + // window.location.reload(true); + if ($("#modalOverlay").length) { + $("#modalOverlay").replaceWith(data.error); + } else { + $('body').append(data.error); + } + _idleSecondsCounter = 0; } } }); diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php index 0120bda179..ffaa0c15a1 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -86,13 +86,24 @@ class AuthenticationCookie extends AuthenticationPlugin global $conn_error; $response = Response::getInstance(); - if ($response->loginPage()) { + $xyz = isset($_REQUEST['check_timeout']) || isset($_REQUEST['login_aftertimeout']); + if (!$xyz && $response->loginPage()) { if (defined('TESTSUITE')) { return true; } else { exit; } } + if($xyz) { + $response->setRequestStatus(false); + } + + if(isset($_REQUEST['login_aftertimeout'])) { + $response->addJSON( + 'logged_in', + 0 + ); + } // No recall if blowfish secret is not configured as it would produce // garbage @@ -108,9 +119,7 @@ class AuthenticationCookie extends AuthenticationPlugin // skip the IE autocomplete feature. $autocomplete = ' autocomplete="off"'; } - - echo $this->template->render('login/header', ['theme' => $GLOBALS['PMA_Theme']]); - + echo $this->template->render('login/header', ['theme' => $GLOBALS['PMA_Theme'], 'add_class' => $xyz ? ' modal_form' : '', 'check_timeout' => $xyz ? 1 : 0]); if ($GLOBALS['cfg']['DBG']['demo']) { echo '
'; echo '' , __('phpMyAdmin Demo Server') , ''; @@ -148,10 +157,13 @@ class AuthenticationCookie extends AuthenticationPlugin
+ ' class="' . ($xyz ? "" : "disableAjax hide ") . 'login js-show">
'; echo ''; + if($xyz) { + echo ''; + } echo __('Log in'); echo Util::showDocu('index'); echo ''; @@ -236,8 +248,11 @@ class AuthenticationCookie extends AuthenticationPlugin $GLOBALS['error_handler']->dispErrors(); echo ''; } - echo $this->template->render('login/footer'); + + echo $this->template->render('login/footer', ['check_timeout' => $xyz ? 1 : 0]); + echo Config::renderFooter(); + if (! defined('TESTSUITE')) { exit; } else { @@ -472,6 +487,7 @@ class AuthenticationCookie extends AuthenticationPlugin { // Name and password cookies need to be refreshed each time // Duration = one month for username + $user_changed = !hash_equals($_COOKIE['pmaUserHashed-' . $GLOBALS['server']], crypt($this->user, "SillYSAlTstRInG")); $this->storeUsernameCookie($this->user); // Duration = as configured @@ -480,28 +496,50 @@ class AuthenticationCookie extends AuthenticationPlugin if (! isset($_POST['change_pw'])) { $this->storePasswordCookie($this->password); } + // URL where to go: + $redirect_url = './index.php'; + // any parameters to pass? + $url_params = array(); + if (strlen($GLOBALS['db']) > 0) { + $url_params['db'] = $GLOBALS['db']; + } + if (strlen($GLOBALS['table']) > 0) { + $url_params['table'] = $GLOBALS['table']; + } + // any target to pass? + if (! empty($GLOBALS['target']) + && $GLOBALS['target'] != 'index.php' + ) { + $url_params['target'] = $GLOBALS['target']; + } + + if(isset($_REQUEST['login_aftertimeout'])) { + $response = Response::getInstance(); + $response->addJSON( + 'logged_in', + 1 + ); + $response->addJSON( + 'success', + 1 + ); + if($user_changed) { + $response->addJSON( + 'user_changed', + 1 + ); + } + if (! defined('TESTSUITE')) { + exit; + } else { + return false; + } + } // Set server cookies if required (once per session) and, in this case, // force reload to ensure the client accepts cookies if (! $GLOBALS['from_cookie']) { - // URL where to go: - $redirect_url = './index.php'; - - // any parameters to pass? - $url_params = []; - if (strlen($GLOBALS['db']) > 0) { - $url_params['db'] = $GLOBALS['db']; - } - if (strlen($GLOBALS['table']) > 0) { - $url_params['table'] = $GLOBALS['table']; - } - // any target to pass? - if (! empty($GLOBALS['target']) - && $GLOBALS['target'] != 'index.php' - ) { - $url_params['target'] = $GLOBALS['target']; - } - + /** * Clear user cache. */ @@ -542,6 +580,10 @@ class AuthenticationCookie extends AuthenticationPlugin $this->_getEncryptionSecret() ) ); + $GLOBALS['PMA_Config']->setCookie( + 'pmaUserHashed-' . $GLOBALS['server'], + crypt($username, "SillYSAlTstRInG") + ); } /** @@ -598,7 +640,6 @@ class AuthenticationCookie extends AuthenticationPlugin // needed for PHP-CGI (not need for FastCGI or mod-php) $response->header('Cache-Control: no-store, no-cache, must-revalidate'); $response->header('Pragma: no-cache'); - $this->showLoginForm(); } diff --git a/libraries/classes/Response.php b/libraries/classes/Response.php index 142ae0f6b1..138f38f465 100644 --- a/libraries/classes/Response.php +++ b/libraries/classes/Response.php @@ -350,7 +350,7 @@ class Response unset($this->_JSON['message']); } - if ($this->_isSuccess) { + if ($this->_isSuccess || (array_key_exists("logged_in", $this->_JSON) && $this->_JSON["logged_in"] == 0)) { $this->addJSON('_title', $this->getHeader()->getTitleTag()); if (isset($GLOBALS['dbi'])) { diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ed9e7a93dc..9d70238d0a 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -441,10 +441,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { ); exit; } + } // load user preferences $GLOBALS['PMA_Config']->loadUserPreferences(); /* Tell tracker that it can actually work */ -Tracker::enable(); +Tracker::enable(); \ No newline at end of file diff --git a/templates/login/footer.twig b/templates/login/footer.twig index 04f5b84499..6b2bf0f192 100644 --- a/templates/login/footer.twig +++ b/templates/login/footer.twig @@ -1 +1,4 @@ +{% if check_timeout == true %} + +{% endif %} \ No newline at end of file diff --git a/templates/login/header.twig b/templates/login/header.twig index e274ebc941..290c640c24 100644 --- a/templates/login/header.twig +++ b/templates/login/header.twig @@ -1,4 +1,7 @@ -
+{% if check_timeout == true %} +
+{% endif %} +
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 3e94921be6..3d37fcd797 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -621,6 +621,15 @@ body#loginform div.container { margin: 0 auto; } +div.container.overlay { + text-align: center; + position: fixed; + top: 10%; + left: 40%; + background: #fff; + z-index: 999; +} + form.login label { float: ; width: 10em; diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 132989e9c0..fe656dff49 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -901,6 +901,24 @@ body#loginform div.container { margin: 0 auto; } +div.container.modal_form { + margin: 0 auto; + width: 30em; + text-align: center; + background: #fff; + z-index: 999; +} + +div#modalOverlay { + position: fixed; + top: 0; + left: 0; + height: 100%; + width: 100%; + background: #fff; + z-index: 900; +} + form.login label { float: ; width: 10em;