Improve SQLite login error message

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 0a2c98f35c973469e096651599e90d1f17366554..e1159149a3bbfd0fbb8ecb1848155f39e2c20912 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -110,7 +110,7 @@ focus(document.getElementById('username'));
        function login($login, $password) {
                global $jush;
                if ($jush == "sqlite") {
-                       return lang('Implement %s method to use SQLite.', 'login()');
+                       return lang('<a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to use SQLite.', '<code>login()</code>');
                }
                return true;
        }

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index 8f48c2c6db18f85e09fe2f529044e2535cce0654..7e83bdb8564c11bb2363abfeee279c7610c55fa2 100644 (file)
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -120,7 +120,6 @@ function unset_permanent() {
 */
 function auth_error($error) {
        global $adminer, $has_token;
-       $error = h($error);
        $session_name = session_name();
        if (isset($_GET["username"])) {
                header("HTTP/1.1 403 Forbidden"); // 401 requires sending WWW-Authenticate header
@@ -168,7 +167,7 @@ if (isset($_GET["username"])) {
 $driver = new Min_Driver($connection);
 
 if (!is_object($connection) || ($login = $adminer->login($_GET["username"], get_password())) !== true) {
-       auth_error((is_string($connection) ? $connection : (is_string($login) ? $login : lang('Invalid credentials.'))));
+       auth_error((is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid credentials.'))));
 }
 
 if ($auth && $_POST["token"]) {

diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php
index 251b90384a3fb8475554ef51e7ff20d76888f756..5aef6a5de0a88ff4d389e2dd8544970803d229e7 100644 (file)
--- a/adminer/include/pdo.inc.php
+++ b/adminer/include/pdo.inc.php
@@ -16,7 +16,7 @@ if (extension_loaded('pdo')) {
                        try {
                                parent::__construct($dsn, $username, $password);
                        } catch (Exception $ex) {
-                               auth_error($ex->getMessage());
+                               auth_error(h($ex->getMessage()));
                        }
                        $this->setAttribute(13, array('Min_PDOStatement')); // 13 - PDO::ATTR_STATEMENT_CLASS
                        $this->server_info = @$this->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION

diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index 1a75c280e4705f1b61a46e5ff06d10cf6c69b14f..7e9bae3f49ca4c652ceb0eb85469b9c789e1389c 100644 (file)
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -11,7 +11,7 @@ $translations = array(
        'Logged as: %s' => 'Přihlášen jako: %s',
        'Logout successful.' => 'Odhlášení proběhlo v pořádku.',
        'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
-       'Implement %s method to use SQLite.' => 'Pro přihlášení k SQLite implementujte metodu %s.',
+       '<a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to use SQLite.' => 'Pro přihlášení k SQLite <a href="https://www.adminer.org/cs/extension/" target="_blank">implementujte</a> metodu %s.',
        'Too many unsuccessful logins, try again in %d minute(s).' => array('Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minutu.', 'Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minuty.', 'Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minut.'),
        'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Platnost hlavního hesla vypršela. <a href="https://www.adminer.org/cs/extension/" target="_blank">Implementujte</a> metodu %s, aby platilo stále.',
        'Language' => 'Jazyk',

diff --git a/adminer/lang/xx.inc.php b/adminer/lang/xx.inc.php
index 680bcb6eb1c59ce9d938fe454707d4245fe76a65..0851b21e0d0abb6d4ed426dd0b1e415e6e247ffa 100644 (file)
--- a/adminer/lang/xx.inc.php
+++ b/adminer/lang/xx.inc.php
@@ -11,7 +11,7 @@ $translations = array(
        'Logged as: %s' => 'Xx',
        'Logout successful.' => 'Xx.',
        'Invalid credentials.' => 'Xx.',
-       'Implement %s method to use SQLite.' => 'Xx.',
+       '<a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to use SQLite.' => 'Xx.',
        'Too many unsuccessful logins, try again in %d minute(s).' => array('Xx.', 'Xx.'),
        'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Xx.',
        'Language' => 'Xx',