Fix more PHP 8 warnings (bug #781)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 5d0aebb64e3e6f0501e2157f09ffbef45fa03b9f..4990399cafd9f9b98567d5aa55f32a79e11d0821 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -956,6 +956,7 @@ class Adminer {
                                echo "<ul id='logins'>\n$output</ul>\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 b8ce053fd17ad11e9c055cbe6a912a5f58193ee9..ed104154aea9d065ea078d86c94a35d423007d4b 100644 (file)
--- 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 a7275a521431b812e1d1979fab98d4745d64f35e..d5211cc16ea66a5d900ce54b8b7055f798d4fac2 100644 (file)
--- 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)