Report invalid schema
This commit is contained in:
parent
09327efdaf
commit
d49903b21d
|
@ -491,7 +491,7 @@ document.getElementById('username').focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Prints navigation after Adminer title
|
/** Prints navigation after Adminer title
|
||||||
* @param string can be "auth" if there is no database connection or "db" if there is no database selected
|
* @param string can be "auth" if there is no database connection, "db" if there is no database selected, "ns" with invalid schema
|
||||||
* @return null
|
* @return null
|
||||||
*/
|
*/
|
||||||
function navigation($missing) {
|
function navigation($missing) {
|
||||||
|
@ -544,7 +544,7 @@ document.getElementById('username').focus();
|
||||||
set_schema($_GET["ns"]);
|
set_schema($_GET["ns"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($_GET["ns"] !== "") {
|
if ($_GET["ns"] !== "" && $missing != "ns") {
|
||||||
$tables = tables_list();
|
$tables = tables_list();
|
||||||
if (!$tables) {
|
if (!$tables) {
|
||||||
echo "<p class='message'>" . lang('No tables.') . "\n";
|
echo "<p class='message'>" . lang('No tables.') . "\n";
|
||||||
|
|
|
@ -60,6 +60,13 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (support("scheme") && DB != "" && $_GET["ns"] !== "" && (!isset($_GET["ns"]) || !set_schema($_GET["ns"]))) {
|
if (support("scheme") && DB != "" && $_GET["ns"] !== "") {
|
||||||
|
if (!isset($_GET["ns"])) {
|
||||||
redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
|
redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
|
||||||
|
}
|
||||||
|
if (!set_schema($_GET["ns"])) {
|
||||||
|
page_header(lang('Schema') . ": " . h($_GET["ns"]), lang('Invalid schema.'), true);
|
||||||
|
page_footer("ns");
|
||||||
|
exit;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,7 +73,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Print HTML footer
|
/** Print HTML footer
|
||||||
* @param string auth|db
|
* @param string "auth", "db", "ns"
|
||||||
* @return null
|
* @return null
|
||||||
*/
|
*/
|
||||||
function page_footer($missing = "") {
|
function page_footer($missing = "") {
|
||||||
|
|
|
@ -262,6 +262,7 @@ $translations = array(
|
||||||
'Schema has been altered.' => 'Schéma bylo změněno.',
|
'Schema has been altered.' => 'Schéma bylo změněno.',
|
||||||
'schema' => 'schéma',
|
'schema' => 'schéma',
|
||||||
'Schema' => 'Schéma',
|
'Schema' => 'Schéma',
|
||||||
|
'Invalid schema.' => 'Nesprávné schéma.',
|
||||||
|
|
||||||
// PostgreSQL sequences support
|
// PostgreSQL sequences support
|
||||||
'Sequences' => 'Sekvence',
|
'Sequences' => 'Sekvence',
|
||||||
|
|
|
@ -463,7 +463,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
|
||||||
</p>
|
</p>
|
||||||
</form>
|
</form>
|
||||||
<?php
|
<?php
|
||||||
if ($missing != "db") {
|
if ($missing != "db" && $missing != "ns") {
|
||||||
$table_status = table_status();
|
$table_status = table_status();
|
||||||
if (!$table_status) {
|
if (!$table_status) {
|
||||||
echo "<p class='message'>" . lang('No tables.') . "\n";
|
echo "<p class='message'>" . lang('No tables.') . "\n";
|
||||||
|
|
Loading…
Reference in a new issue