From ccb7442d1b6542c553186f6fc06b538b1133fb52 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 12 Feb 2021 09:53:20 +0100 Subject: [PATCH] Fix more PHP 8 warnings (bug #781) --- adminer/include/adminer.inc.php | 1 + adminer/include/auth.inc.php | 2 +- changes.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 5d0aebb6..4990399c 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -956,6 +956,7 @@ class Adminer { echo "\n" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});"); } } else { + $tables = array(); if ($_GET["ns"] !== "" && !$missing && DB != "") { $connection->select_db(DB); $tables = table_status('', true); diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php index b8ce053f..ed104154 100644 --- a/adminer/include/auth.inc.php +++ b/adminer/include/auth.inc.php @@ -41,7 +41,7 @@ function add_invalid_login() { function check_invalid_login() { global $adminer; $invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist - $invalid = $invalids[$adminer->bruteForceKey()]; + $invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : array()); $next_attempt = ($invalid[1] > 29 ? $invalid[0] - time() : 0); // allow 30 invalid attempts if ($next_attempt > 0) { //! do the same with permanent login auth_error(lang('Too many unsuccessful logins, try again in %d minute(s).', ceil($next_attempt / 60))); diff --git a/changes.txt b/changes.txt index a7275a52..d5211cc1 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,5 @@ Adminer 4.8.1-dev: +Fix more PHP 8 warnings (bug #781) Adminer 4.8.0 (released 2021-02-10): Support function default values in insert (bug #713)