Display notification about performing action after relogin

This commit is contained in:
Jakub Vrana 2018-02-08 16:49:56 +01:00
parent 60e5d24116
commit cf7fe88990
5 changed files with 11 additions and 3 deletions

View file

@ -138,10 +138,12 @@ function auth_error($error) {
cookie("adminer_key", ($_COOKIE["adminer_key"] ? $_COOKIE["adminer_key"] : rand_string()), $params["lifetime"]);
page_header(lang('Login'), $error, null);
echo "<form action='' method='post'>\n";
$adminer->loginForm();
echo "<div>";
hidden_fields($_POST, array("auth")); // expired session
if (hidden_fields($_POST, array("auth"))) { // expired session
echo "<p class='message'>" . lang('The action will be performed after successful login with the same credentials.') . "\n";
}
echo "</div>\n";
$adminer->loginForm();
echo "</form>\n";
page_footer("auth");
exit;

View file

@ -848,9 +848,10 @@ function friendly_url($val) {
/** Print hidden fields
* @param array
* @param array
* @return null
* @return bool
*/
function hidden_fields($process, $ignore = array()) {
$return = false;
while (list($key, $val) = each($process)) {
if (!in_array($key, $ignore)) {
if (is_array($val)) {
@ -858,10 +859,12 @@ function hidden_fields($process, $ignore = array()) {
$process[$key . "[$k]"] = $v;
}
} else {
$return = true;
echo '<input type="hidden" name="' . h($key) . '" value="' . h($val) . '">';
}
}
}
return $return;
}
/** Print hidden fields for GET forms

View file

@ -23,6 +23,7 @@ $translations = array(
'Connecting to privileged ports is not allowed.' => 'Připojování k privilegovaným portům není povoleno.',
'Session support must be enabled.' => 'Session proměnné musí být povolené.',
'Session expired, please login again.' => 'Session vypršela, přihlašte se prosím znovu.',
'The action will be performed after successful login with the same credentials.' => 'Akce bude provedena po úspěšném přihlášení se stejnými přihlašovacími údaji.',
'%s version: %s through PHP extension %s' => 'Verze %s: %s přes PHP rozšíření %s',
'Refresh' => 'Obnovit',

View file

@ -23,6 +23,7 @@ $translations = array(
'Connecting to privileged ports is not allowed.' => 'Xx.',
'Session support must be enabled.' => 'Xx.',
'Session expired, please login again.' => 'Xx.',
'The action will be performed after successful login with the same credentials.' => 'Xx.',
'%s version: %s through PHP extension %s' => '%s xx: %s xx %s',
'Refresh' => 'Xx',

View file

@ -1,6 +1,7 @@
Adminer 4.6.1-dev:
Sticky position of table actions
Speed up rendering of long tables (regression from 4.4.0)
Display notification about performing action after relogin
Add system tables help links
MySQL: Support non-utf8 charset in search in column
MySQL: Support geometry in MySQL 8 (bug #574)