diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 0a2c98f3..e1159149 100644 --- 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('Implement %s method to use SQLite.', 'login()'); } return true; } diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php index 8f48c2c6..7e83bdb8 100644 --- 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 251b9038..5aef6a5d 100644 --- 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 1a75c280..7e9bae3f 100644 --- 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.', + 'Implement %s method to use SQLite.' => 'Pro přihlášení k SQLite implementujte 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. Implement %s method to make it permanent.' => 'Platnost hlavního hesla vypršela. Implementujte metodu %s, aby platilo stále.', 'Language' => 'Jazyk', diff --git a/adminer/lang/xx.inc.php b/adminer/lang/xx.inc.php index 680bcb6e..0851b21e 100644 --- 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.', + 'Implement %s method to use SQLite.' => 'Xx.', 'Too many unsuccessful logins, try again in %d minute(s).' => array('Xx.', 'Xx.'), 'Master password expired. Implement %s method to make it permanent.' => 'Xx.', 'Language' => 'Xx',