Editor: Avoid trailing dot in export filename

Context: https://sourceforge.net/p/adminer/discussion/960418/thread/ca36ed7b66/

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 0dc2a8fae53fe9f3ce96dc2e06ae15fb42124f01..2f681b1faa10d4f47b2814b6a600e59f0bbd9176 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -1115,7 +1115,7 @@ function dump_headers($identifier, $multi_table = false) {
        $return = $adminer->dumpHeaders($identifier, $multi_table);
        $output = $_POST["output"];
        if ($output != "text") {
-               header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && !preg_match('~[^0-9a-z]~', $output) ? ".$output" : ""));
+               header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && preg_match('~^[0-9a-z]+$~', $output) ? ".$output" : ""));
        }
        session_write_close();
        ob_flush();

diff --git a/changes.txt b/changes.txt
index 61658cf039fa541be0ba340ca68e5d9cbf3c3699..3892e879c136be79a7ba4a3c38a261c42d32abfb 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -21,6 +21,7 @@ MS SQL: Don't truncate comments to 30 chars (PR #376)
 Elasticsearch 6: Fix displaying type mapping (PR #402)
 MongoDB: Fix password-less check in the mongo extension (PR #405)
 Editor: Cast to string when searching (bug #325)
+Editor: Avoid trailing dot in export filename
 Re-enable PHP warnings (regression from 4.7.8)
 
 Adminer 4.7.8 (released 2020-12-06):