diff --git a/adminer/check.inc.php b/adminer/check.inc.php index d75b0be4..6dd64831 100644 --- a/adminer/check.inc.php +++ b/adminer/check.inc.php @@ -6,7 +6,7 @@ $name = $_GET["name"]; $row = $_POST; if ($row && !$error) { - if ($jush == "sqlite") { + if (JUSH == "sqlite") { $result = recreate_table($TABLE, $TABLE, array(), array(), array(), 0, array(), $name, ($row["drop"] ? "" : $row["clause"])); } else { $result = ($name == "" || queries("ALTER TABLE " . table($TABLE) . " DROP CONSTRAINT " . idf_escape($name))); @@ -31,7 +31,7 @@ if (!$row) {

'; } echo doc_link(array( diff --git a/adminer/create.inc.php b/adminer/create.inc.php index cf7c81d4..0015748b 100644 --- a/adminer/create.inc.php +++ b/adminer/create.inc.php @@ -60,7 +60,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) { } } if ($foreign_key !== null) { - $foreign[idf_escape($field["field"])] = ($TABLE != "" && $jush != "sqlite" ? "ADD" : " ") . format_foreign_key(array( + $foreign[idf_escape($field["field"])] = ($TABLE != "" && JUSH != "sqlite" ? "ADD" : " ") . format_foreign_key(array( 'table' => $foreign_keys[$field["type"]], 'source' => array($field["field"]), 'target' => array($type_field["field"]), @@ -126,7 +126,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) { queries_redirect(ME . (support("table") ? "table=" : "select=") . urlencode($name), $message, alter_table( $TABLE, $name, - ($jush == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields), + (JUSH == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields), $foreign, ($row["Comment"] != $table_status["Comment"] ? $row["Comment"] : null), ($row["Engine"] && $row["Engine"] != $table_status["Engine"] ? $row["Engine"] : ""), @@ -183,7 +183,7 @@ foreach ($engines as $engine) { : data-maxlength="64" value="" autocapitalize="off"> " . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?> - "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?> + "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?> diff --git a/adminer/database.inc.php b/adminer/database.inc.php index 341d2d0f..fed0964e 100644 --- a/adminer/database.inc.php +++ b/adminer/database.inc.php @@ -46,7 +46,7 @@ if ($_POST) { $name = $row["name"]; } elseif (DB != "") { $row["collation"] = db_collation(DB, $collations); -} elseif ($jush == "sql") { +} elseif (JUSH == "sql") { // propose database name with limited privileges foreach (get_vals("SHOW GRANTS") as $grant) { if (preg_match('~ ON (`(([^\\\\`]|``|\\\\.)*)%`\.\*)?~', $grant, $match) && $match[1]) { diff --git a/adminer/db.inc.php b/adminer/db.inc.php index 06b5b60b..563b71f5 100644 --- a/adminer/db.inc.php +++ b/adminer/db.inc.php @@ -6,7 +6,7 @@ $tables_views = array_merge((array) $_POST["tables"], (array) $_POST["views"]); if ($tables_views && !$error && !$_POST["search"]) { $result = true; $message = ""; - if ($jush == "sql" && $_POST["tables"] && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) { + if (JUSH == "sql" && $_POST["tables"] && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) { queries("SET foreign_key_checks = 0"); // allows to truncate or drop several tables at once } @@ -29,14 +29,14 @@ if ($tables_views && !$error && !$_POST["search"]) { $result = drop_tables($_POST["tables"]); } $message = lang('Tables have been dropped.'); - } elseif ($jush == "sqlite" && $_POST["check"]) { + } elseif (JUSH == "sqlite" && $_POST["check"]) { foreach ((array) $_POST["tables"] as $table) { foreach (get_rows("PRAGMA integrity_check(" . q($table) . ")") as $row) { $message .= "" . h($table) . ": " . h($row["integrity_check"]) . "
"; } } - } elseif ($jush != "sql") { - $result = ($jush == "sqlite" + } elseif (JUSH != "sql") { + $result = (JUSH == "sqlite" ? queries("VACUUM") : apply_queries("VACUUM" . ($_POST["optimize"] ? "" : " ANALYZE"), $_POST["tables"]) ); @@ -123,7 +123,7 @@ if ($adminer->homepage()) { } echo "" . lang('%d in total', count($tables_list)); - echo "" . h($jush == "sql" ? $connection->result("SELECT @@default_storage_engine") : ""); + echo "" . h(JUSH == "sql" ? $connection->result("SELECT @@default_storage_engine") : ""); echo "" . h(db_collation(DB, collations())); foreach (array("Data_length", "Index_length", "Data_free") as $key) { echo ""; @@ -135,19 +135,19 @@ if ($adminer->homepage()) { if (!information_schema(DB)) { echo "

\n"; $vacuum = " " . on_help("'VACUUM'"); - $optimize = " " . on_help($jush == "sql" ? "'OPTIMIZE TABLE'" : "'VACUUM OPTIMIZE'"); + $optimize = " " . on_help(JUSH == "sql" ? "'OPTIMIZE TABLE'" : "'VACUUM OPTIMIZE'"); echo "
" . lang('Selected') . "
" - . ($jush == "sqlite" ? $vacuum . " " . on_help("'PRAGMA integrity_check'") - : ($jush == "pgsql" ? $vacuum . $optimize - : ($jush == "sql" ? " " . on_help("'ANALYZE TABLE'") + . (JUSH == "sqlite" ? $vacuum . " " . on_help("'PRAGMA integrity_check'") + : (JUSH == "pgsql" ? $vacuum . $optimize + : (JUSH == "sql" ? " " . on_help("'ANALYZE TABLE'") . $optimize . " " . on_help("'CHECK TABLE'") . " " . on_help("'REPAIR TABLE'") : ""))) - . " " . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . confirm() + . " " . on_help(JUSH == "sqlite" ? "'DELETE'" : "'TRUNCATE" . (JUSH == "pgsql" ? "'" : " TABLE'")) . confirm() . "" . on_help("'DROP TABLE'") . confirm() . "\n"; $databases = (support("scheme") ? $adminer->schemas() : $adminer->databases()); - if (count($databases) != 1 && $jush != "sqlite") { + if (count($databases) != 1 && JUSH != "sqlite") { $db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB)); echo "

" . lang('Move to other database') . ": "; echo ($databases ? html_select("target", $databases, $db) : ''); diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php index 8c57c83e..8fc96183 100644 --- a/adminer/dump.inc.php +++ b/adminer/dump.inc.php @@ -18,7 +18,7 @@ if ($_POST && !$error) { if ($is_sql) { echo "-- Adminer $VERSION " . $drivers[DRIVER] . " " . str_replace("\n", " ", $connection->server_info) . " dump\n\n"; - if ($jush == "sql") { + if (JUSH == "sql") { echo "SET NAMES utf8; SET time_zone = '+00:00'; SET foreign_key_checks = 0; @@ -85,7 +85,7 @@ SET foreign_key_checks = 0; } } - echo ($out && $jush == 'sql' ? "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n" : $out); + echo ($out && JUSH == 'sql' ? "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n" : $out); } if ($_POST["table_style"] || $_POST["data_style"]) { @@ -155,7 +155,7 @@ page_header(lang('Export'), $error, ($_GET["export"] != "" ? array("table" => $_ $db_style = array('', 'USE', 'DROP+CREATE', 'CREATE'); $table_style = array('', 'DROP+CREATE', 'CREATE'); $data_style = array('', 'TRUNCATE+INSERT', 'INSERT'); -if ($jush == "sql") { //! use insertUpdate() in all drivers +if (JUSH == "sql") { //! use insertUpdate() in all drivers $data_style[] = 'INSERT+UPDATE'; } parse_str($_COOKIE["adminer_export"], $row); @@ -171,7 +171,7 @@ echo "" . lang('Output') . "" . html_select("output", $adminer->dump echo "" . lang('Format') . "" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio -echo ($jush == "sqlite" ? "" : "" . lang('Database') . "" . html_select('db_style', $db_style, $row["db_style"]) +echo (JUSH == "sqlite" ? "" : "" . lang('Database') . "" . html_select('db_style', $db_style, $row["db_style"]) . (support("type") ? checkbox("types", 1, $row["types"], lang('User types')) : "") . (support("routine") ? checkbox("routines", 1, $row["routines"], lang('Routines')) : "") . (support("event") ? checkbox("events", 1, $row["events"], lang('Events')) : "") diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php index 7df63cf3..70148535 100644 --- a/adminer/edit.inc.php +++ b/adminer/edit.inc.php @@ -72,7 +72,7 @@ if ($_POST["save"]) { if ($_POST["clone"] && $field["auto_increment"]) { $as = "''"; } - if ($jush == "sql" && preg_match("~enum|set~", $field["type"])) { + if (JUSH == "sql" && preg_match("~enum|set~", $field["type"])) { $as = "1*" . idf_escape($name); } $select[] = ($as ? "$as AS " : "") . idf_escape($name); diff --git a/adminer/foreign.inc.php b/adminer/foreign.inc.php index 0d922791..72ef1f1a 100644 --- a/adminer/foreign.inc.php +++ b/adminer/foreign.inc.php @@ -16,11 +16,11 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change- $row["target"] = $target; } - if ($jush == "sqlite") { + if (JUSH == "sqlite") { $result = recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($row["drop"] ? "" : " " . format_foreign_key($row)))); } else { $alter = "ALTER TABLE " . table($TABLE); - $result = ($name == "" || queries("$alter DROP " . ($jush == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name))); + $result = ($name == "" || queries("$alter DROP " . (JUSH == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name))); if (!$row["drop"]) { $result = queries("$alter ADD" . format_foreign_key($row)); } @@ -76,7 +76,7 @@ if (support("scheme")) { if ($row["ns"] != "") { set_schema($orig_schema); } -} elseif ($jush != "sqlite") { +} elseif (JUSH != "sqlite") { $dbs = array(); foreach ($adminer->databases() as $db) { if (!information_schema($db)) { diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index f7de73a3..79e1a2bb 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -176,7 +176,7 @@ class Adminer { * @return null */ function selectLinks($tableStatus, $set = "") { - global $jush, $driver; + global $driver; echo '

'; $links = array("select" => lang('Select data')); if (support("table") || support("indexes")) { @@ -198,7 +198,7 @@ class Adminer { foreach ($links as $key => $val) { echo " $val"; } - echo doc_link(array($jush => $driver->tableHelp($name, $is_view)), "?"); + echo doc_link(array(JUSH => $driver->tableHelp($name, $is_view)), "?"); echo "\n"; } @@ -234,7 +234,7 @@ class Adminer { * @return string */ function selectQuery($query, $start, $failed = false) { - global $jush, $driver; + global $driver; $return = "

\n"; // required for IE9 inline edit if (!$failed && ($warnings = $driver->warnings())) { $id = "warnings"; @@ -242,7 +242,7 @@ class Adminer { . "$return\n" ; } - return "

" . h(str_replace("\n", " ", $query)) . " (" . format_time($start) . ")" + return "

" . h(str_replace("\n", " ", $query)) . " (" . format_time($start) . ")" . (support("sql") ? " " . lang('Edit') . "" : "") . $return ; @@ -645,7 +645,7 @@ class Adminer { * @return string */ function messageQuery($query, $time, $failed = false) { - global $jush, $driver; + global $driver; restart_session(); $history = &get_session("queries"); if (!$history[$_GET["db"]]) { @@ -662,7 +662,7 @@ class Adminer { $return = "" . lang('Warnings') . ", $return

\n"; } return " " . @date("H:i:s") . "" // @ - time zone may be not set - . " $return