diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 993e16c8..bbf788b1 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -1010,7 +1010,14 @@ class Adminer { if ($password !== null) { $dbs = $_SESSION["db"][$vendor][$server][$username]; foreach (($dbs ? array_keys($dbs) : array("")) as $db) { - $output .= "
  • ($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "\n"; + $output .= "
  • " + . h($drivers[$vendor]) + . ($username != "" || $server != "" ? " - " : "") + . h($username) + . ($username != "" && $server != "" ? "@" : "") + . ($server != "" ? h($this->serverName($server)) : "") + . ($db != "" ? h(" - $db") : "") + . "
    • \n"; } } } diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php index 60035044..c63e3ebf 100644 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@ -6,7 +6,7 @@ * @param string used after colon in title and heading, should be HTML escaped * @return null */ -function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") { +function page_header($title, $error = "", $breadcrumb = [], $title2 = "") { global $LANG, $VERSION, $adminer, $drivers, $jush; page_headers(); if (is_ajax() && $error) { @@ -67,32 +67,46 @@ var thousandsSeparator = '';
    '; + $link = substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1); - echo '

    $title_all

    \n"; echo "\n"; restart_session(); diff --git a/adminer/lang/ar.inc.php b/adminer/lang/ar.inc.php index 065ccebf..8dee9bb0 100644 --- a/adminer/lang/ar.inc.php +++ b/adminer/lang/ar.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'تسجيل الدخول', 'Logout successful.' => 'تم تسجيل الخروج بنجاح.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/bg.inc.php b/adminer/lang/bg.inc.php index c83182d9..ba667251 100644 --- a/adminer/lang/bg.inc.php +++ b/adminer/lang/bg.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Система', 'Server' => 'Сървър', 'Username' => 'Потребител', diff --git a/adminer/lang/bn.inc.php b/adminer/lang/bn.inc.php index afef94bb..7ef06070 100644 --- a/adminer/lang/bn.inc.php +++ b/adminer/lang/bn.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'লগইন', 'Logout successful.' => 'সফলভাবে লগআউট হয়েছে।', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/bs.inc.php b/adminer/lang/bs.inc.php index f89f2182..303f4bec 100644 --- a/adminer/lang/bs.inc.php +++ b/adminer/lang/bs.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Sistem', 'Server' => 'Server', 'Username' => 'Korisničko ime', diff --git a/adminer/lang/ca.inc.php b/adminer/lang/ca.inc.php index e0105851..80355009 100644 --- a/adminer/lang/ca.inc.php +++ b/adminer/lang/ca.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Inicia la sessió', 'Logout successful.' => 'Desconnexió correcta.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php index 9e69a78c..5911ca89 100644 --- a/adminer/lang/cs.inc.php +++ b/adminer/lang/cs.inc.php @@ -1,6 +1,7 @@ 'Domů', 'System' => 'Systém', 'Server' => 'Server', 'Username' => 'Uživatel', diff --git a/adminer/lang/da.inc.php b/adminer/lang/da.inc.php index a669e3a9..0934ca74 100644 --- a/adminer/lang/da.inc.php +++ b/adminer/lang/da.inc.php @@ -1,5 +1,6 @@ null, 'System' => 'System', 'Server' => 'Server', 'Username' => 'Brugernavn', diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php index 7a46ae02..3a88e180 100644 --- a/adminer/lang/de.inc.php +++ b/adminer/lang/de.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Login', 'Logout successful.' => 'Abmeldung erfolgreich.', 'Thanks for using Adminer, consider donating.' => 'Danke, dass Sie Adminer genutzt haben. Spenden willkommen!', diff --git a/adminer/lang/el.inc.php b/adminer/lang/el.inc.php index 8bde22ed..15c407a9 100644 --- a/adminer/lang/el.inc.php +++ b/adminer/lang/el.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Σύστημα', 'Server' => 'Διακομιστής', 'Username' => 'Όνομα Χρήστη', diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php index 7e69fb6c..5278272c 100644 --- a/adminer/lang/es.inc.php +++ b/adminer/lang/es.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Login', 'Logout successful.' => 'Sesión finalizada con éxito.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php index 5012303a..e74acf81 100644 --- a/adminer/lang/et.inc.php +++ b/adminer/lang/et.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Logi sisse', 'Logout successful.' => 'Väljalogimine õnnestus.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/fa.inc.php b/adminer/lang/fa.inc.php index 0b9435d5..7cbfded9 100644 --- a/adminer/lang/fa.inc.php +++ b/adminer/lang/fa.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'سیستم', 'Server' => 'سرور', 'Username' => 'نام کاربری', diff --git a/adminer/lang/fi.inc.php b/adminer/lang/fi.inc.php index 7efedf1a..e95dac28 100644 --- a/adminer/lang/fi.inc.php +++ b/adminer/lang/fi.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Järjestelmä', 'Server' => 'Palvelin', 'Username' => 'Käyttäjänimi', diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php index 7e206907..a67c404c 100644 --- a/adminer/lang/fr.inc.php +++ b/adminer/lang/fr.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Authentification', 'Logout successful.' => 'Au revoir !', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/gl.inc.php b/adminer/lang/gl.inc.php index 168a4240..a3a286ee 100644 --- a/adminer/lang/gl.inc.php +++ b/adminer/lang/gl.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Conectar', 'Logout successful.' => 'Pechouse a sesión con éxito.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/he.inc.php b/adminer/lang/he.inc.php index 7ef2a40a..a7c02a9d 100644 --- a/adminer/lang/he.inc.php +++ b/adminer/lang/he.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'התחברות', 'Logout successful.' => 'ההתחברות הצליחה', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/hu.inc.php b/adminer/lang/hu.inc.php index 038939d5..f4f7a469 100644 --- a/adminer/lang/hu.inc.php +++ b/adminer/lang/hu.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Belépés', 'Logout successful.' => 'Sikeres kilépés.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/id.inc.php b/adminer/lang/id.inc.php index 1071095a..b239af75 100644 --- a/adminer/lang/id.inc.php +++ b/adminer/lang/id.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Sistem', 'Server' => 'Server', 'Username' => 'Pengguna', diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php index c649e3b4..03eca0cd 100644 --- a/adminer/lang/it.inc.php +++ b/adminer/lang/it.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Autenticazione', 'Logout successful.' => 'Uscita effettuata con successo.', 'Invalid server or credentials.' => 'Server o credenziali non valide.', diff --git a/adminer/lang/ja.inc.php b/adminer/lang/ja.inc.php index fb3f7fef..8698cdc9 100644 --- a/adminer/lang/ja.inc.php +++ b/adminer/lang/ja.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'ログイン', 'Logout successful.' => 'ログアウト', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/ka.inc.php b/adminer/lang/ka.inc.php index 17a6fe05..4751d113 100644 --- a/adminer/lang/ka.inc.php +++ b/adminer/lang/ka.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'შესვლა', 'Logout successful.' => 'გამოხვედით სისტემიდან.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/ko.inc.php b/adminer/lang/ko.inc.php index 10cc865e..4f26fa65 100644 --- a/adminer/lang/ko.inc.php +++ b/adminer/lang/ko.inc.php @@ -1,5 +1,6 @@ null, '$1-$3-$5' => '$1-$3-$5', '%.3f s' => '%.3f 초', '%d byte(s)' => '%d 바이트', diff --git a/adminer/lang/lt.inc.php b/adminer/lang/lt.inc.php index c1dde21a..cf86daf0 100644 --- a/adminer/lang/lt.inc.php +++ b/adminer/lang/lt.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Sistema', 'Server' => 'Serveris', 'Username' => 'Vartotojas', diff --git a/adminer/lang/lv.inc.php b/adminer/lang/lv.inc.php index e58b7f05..fbc7c243 100644 --- a/adminer/lang/lv.inc.php +++ b/adminer/lang/lv.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Ieiet', 'Logout successful.' => 'Jūs veiksmīgi izgājāt no sistēmas.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/ms.inc.php b/adminer/lang/ms.inc.php index b02c35de..8c9d568f 100644 --- a/adminer/lang/ms.inc.php +++ b/adminer/lang/ms.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Sistem', 'Server' => 'Pelayan', 'Username' => 'Nama pengguna', diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php index ae1e5c3b..ceb77cce 100644 --- a/adminer/lang/nl.inc.php +++ b/adminer/lang/nl.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Aanmelden', 'Logout successful.' => 'Successvol afgemeld.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/no.inc.php b/adminer/lang/no.inc.php index 56c5c1fb..6702f8e0 100644 --- a/adminer/lang/no.inc.php +++ b/adminer/lang/no.inc.php @@ -1,5 +1,6 @@ null, 'System' => 'System', 'Server' => 'Server', 'Username' => 'Brukernavn', diff --git a/adminer/lang/pl.inc.php b/adminer/lang/pl.inc.php index a8032f42..d9745e2d 100644 --- a/adminer/lang/pl.inc.php +++ b/adminer/lang/pl.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Rodzaj bazy', 'Server' => 'Serwer', 'Username' => 'Użytkownik', diff --git a/adminer/lang/pt-br.inc.php b/adminer/lang/pt-br.inc.php index cc4885da..3d412810 100644 --- a/adminer/lang/pt-br.inc.php +++ b/adminer/lang/pt-br.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Entrar', 'Logout successful.' => 'Saída bem sucedida.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/pt.inc.php b/adminer/lang/pt.inc.php index 9df9476f..17a754f9 100644 --- a/adminer/lang/pt.inc.php +++ b/adminer/lang/pt.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Entrar', 'Logout successful.' => 'Sessão terminada com sucesso.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/ro.inc.php b/adminer/lang/ro.inc.php index becf541e..b8a18afd 100644 --- a/adminer/lang/ro.inc.php +++ b/adminer/lang/ro.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Intră', 'Logout successful.' => 'Ați ieșit cu succes.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php index 9be6060b..89a47440 100644 --- a/adminer/lang/ru.inc.php +++ b/adminer/lang/ru.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'Войти', 'Logout successful.' => 'Вы успешно покинули систему.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php index 7c83ae29..15ddc9e3 100644 --- a/adminer/lang/sk.inc.php +++ b/adminer/lang/sk.inc.php @@ -1,5 +1,6 @@ 'Domov', 'Login' => 'Prihlásiť sa', 'Logout successful.' => 'Odhlásenie prebehlo v poriadku.', 'Invalid server or credentials.' => 'Neplatný server alebo prihlasovacie údaje.', diff --git a/adminer/lang/sl.inc.php b/adminer/lang/sl.inc.php index 36a18ea9..31404e07 100644 --- a/adminer/lang/sl.inc.php +++ b/adminer/lang/sl.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Sistem', 'Server' => 'Strežnik', 'Username' => 'Uporabniško ime', diff --git a/adminer/lang/sr.inc.php b/adminer/lang/sr.inc.php index fa07274b..c68ce29d 100644 --- a/adminer/lang/sr.inc.php +++ b/adminer/lang/sr.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Систем', 'Server' => 'Сервер', 'Username' => 'Корисничко име', diff --git a/adminer/lang/sv.inc.php b/adminer/lang/sv.inc.php index 63e19e1d..ccb0cdce 100644 --- a/adminer/lang/sv.inc.php +++ b/adminer/lang/sv.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'System', 'Server' => 'Server', 'Username' => 'Användarnamn', diff --git a/adminer/lang/ta.inc.php b/adminer/lang/ta.inc.php index e7fb3782..cf51e12d 100644 --- a/adminer/lang/ta.inc.php +++ b/adminer/lang/ta.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'நுழை', 'Logout successful.' => 'வெற்றிக‌ர‌மாய் வெளியேறியாயிற்று.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/th.inc.php b/adminer/lang/th.inc.php index c8de602e..79756fd1 100644 --- a/adminer/lang/th.inc.php +++ b/adminer/lang/th.inc.php @@ -1,5 +1,6 @@ null, 'Login' => 'เข้าสู่ระบบ', 'Logout successful.' => 'ออกจากระบบเรียบร้อยแล้ว.', 'Invalid server or credentials.' => null, diff --git a/adminer/lang/tr.inc.php b/adminer/lang/tr.inc.php index dbe15190..d8a87c76 100644 --- a/adminer/lang/tr.inc.php +++ b/adminer/lang/tr.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Sistem', 'Server' => 'Sunucu', 'Username' => 'Kullanıcı', diff --git a/adminer/lang/uk.inc.php b/adminer/lang/uk.inc.php index fc77e264..801acc49 100644 --- a/adminer/lang/uk.inc.php +++ b/adminer/lang/uk.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Система Бази Даних', 'Server' => 'Сервер', 'Username' => 'Користувач', diff --git a/adminer/lang/vi.inc.php b/adminer/lang/vi.inc.php index ff58ced0..22d0229f 100644 --- a/adminer/lang/vi.inc.php +++ b/adminer/lang/vi.inc.php @@ -1,6 +1,7 @@ null, 'System' => 'Hệ thống', 'Server' => 'Máy chủ', 'Username' => 'Tên người dùng', diff --git a/adminer/lang/xx.inc.php b/adminer/lang/xx.inc.php index eebae228..c6fd517e 100644 --- a/adminer/lang/xx.inc.php +++ b/adminer/lang/xx.inc.php @@ -1,6 +1,7 @@ 'Xx', 'System' => 'Xx', 'Server' => 'Xx', 'Username' => 'Xx', diff --git a/adminer/lang/zh-tw.inc.php b/adminer/lang/zh-tw.inc.php index 1f45f228..f00edc6d 100644 --- a/adminer/lang/zh-tw.inc.php +++ b/adminer/lang/zh-tw.inc.php @@ -1,6 +1,7 @@ null, 'System' => '資料庫系統', 'Server' => '伺服器', 'Username' => '帳號', diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php index 21e65e90..52a7499c 100644 --- a/adminer/lang/zh.inc.php +++ b/adminer/lang/zh.inc.php @@ -1,6 +1,7 @@ null, 'System' => '系统', 'Server' => '服务器', 'Username' => '用户名',