Change $jush to constant

diff --git a/adminer/check.inc.php b/adminer/check.inc.php
index d75b0be4bf2bc5bc56b752aba65287dd08d82402..6dd64831cb3263fb69e2729189e46fa1f63ce022 100644 (file)
--- 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) {
 
 <form action="" method="post">
 <p><?php
-if ($jush != "sqlite") {
+if (JUSH != "sqlite") {
        echo lang('Name') . ': <input name="name" value="' . h($row["name"]) . '" data-maxlength="64" autocapitalize="off"> ';
 }
 echo doc_link(array(

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index cf7c81d47c362a8e47341f205d9dd507177243fc..0015748b8a5113f37b64e9f61db00d253d46e586 100644 (file)
--- 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) {
 <?php if (support("columns") || $TABLE == "") { ?>
 <?php echo lang('Table name'); ?>: <input name="name"<?php echo ($TABLE == "" && !$_POST ? " autofocus" : ""); ?> data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
 <?php echo ($engines ? "<select name='Engine'>" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
- <?php echo ($collations && !preg_match("~sqlite|mssql~", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
+ <?php echo ($collations && !preg_match("~sqlite|mssql~", JUSH) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 

diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index 341d2d0f1d219f74fbd35a412d147510a07a8d44..fed0964e85ade305c36b1e922b992404a04008c3 100644 (file)
--- 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 06b5b60beda3c0669782cfdbe3f9d2044df859fe..563b71f5105c5e053f932016ab5a620f632290e4 100644 (file)
--- 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 .= "<b>" . h($table) . "</b>: " . h($row["integrity_check"]) . "<br>";
                        }
                }
-       } 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 "<tr><td><th>" . lang('%d in total', count($tables_list));
-                       echo "<td>" . h($jush == "sql" ? $connection->result("SELECT @@default_storage_engine") : "");
+                       echo "<td>" . h(JUSH == "sql" ? $connection->result("SELECT @@default_storage_engine") : "");
                        echo "<td>" . h(db_collation(DB, collations()));
                        foreach (array("Data_length", "Index_length", "Data_free") as $key) {
                                echo "<td align='right' id='sum-$key'>";
@@ -135,19 +135,19 @@ if ($adminer->homepage()) {
                        if (!information_schema(DB)) {
                                echo "<div class='footer'><div>\n";
                                $vacuum = "<input type='submit' value='" . lang('Vacuum') . "'> " . on_help("'VACUUM'");
-                               $optimize = "<input type='submit' name='optimize' value='" . lang('Optimize') . "'> " . on_help($jush == "sql" ? "'OPTIMIZE TABLE'" : "'VACUUM OPTIMIZE'");
+                               $optimize = "<input type='submit' name='optimize' value='" . lang('Optimize') . "'> " . on_help(JUSH == "sql" ? "'OPTIMIZE TABLE'" : "'VACUUM OPTIMIZE'");
                                echo "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>"
-                               . ($jush == "sqlite" ? $vacuum . "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'PRAGMA integrity_check'")
-                               : ($jush == "pgsql" ? $vacuum . $optimize
-                               : ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . on_help("'ANALYZE TABLE'")
+                               . (JUSH == "sqlite" ? $vacuum . "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'PRAGMA integrity_check'")
+                               : (JUSH == "pgsql" ? $vacuum . $optimize
+                               : (JUSH == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'> " . on_help("'ANALYZE TABLE'")
                                        . $optimize
                                        . "<input type='submit' name='check' value='" . lang('Check') . "'> " . on_help("'CHECK TABLE'")
                                        . "<input type='submit' name='repair' value='" . lang('Repair') . "'> " . on_help("'REPAIR TABLE'")
                                : "")))
-                               . "<input type='submit' name='truncate' value='" . lang('Truncate') . "'> " . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . confirm()
+                               . "<input type='submit' name='truncate' value='" . lang('Truncate') . "'> " . on_help(JUSH == "sqlite" ? "'DELETE'" : "'TRUNCATE" . (JUSH == "pgsql" ? "'" : " TABLE'")) . confirm()
                                . "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . 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 "<p>" . lang('Move to other database') . ": ";
                                        echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '" autocapitalize="off">');

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 8c57c83e673a67a738b75a42d55246d8abab890e..8fc961838259cdfca80e3445a4ec8073b5d49f77 100644 (file)
--- 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 "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dump
 
 echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio
 
-echo ($jush == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
+echo (JUSH == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . 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 7df63cf341aee3ff1059e29eed40e293ef4d74f2..7014853517f26bd13a58f0d7c3a0c9e3b8e750b6 100644 (file)
--- 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 0d9227915ad9e845e352ffce4821ac881986b641..72ef1f1a96b3eb1b475cbb7701370ee3ca568561 100644 (file)
--- 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 f7de73a3d2fe82fe5a4c0d8852f3e779477bf00b..79e1a2bbf1b4bb4c9c8b3cb692e6d769a6a219c1 100644 (file)
--- 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 '<p class="links">';
                $links = array("select" => lang('Select data'));
                if (support("table") || support("indexes")) {
@@ -198,7 +198,7 @@ class Adminer {
                foreach ($links as $key => $val) {
                        echo " <a href='" . h(ME) . "$key=" . urlencode($name) . ($key == "edit" ? $set : "") . "'" . bold(isset($_GET[$key])) . ">$val</a>";
                }
-               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 = "</p>\n"; // required for IE9 inline edit
                if (!$failed && ($warnings = $driver->warnings())) {
                        $id = "warnings";
@@ -242,7 +242,7 @@ class Adminer {
                                . "$return<div id='$id' class='hidden'>\n$warnings</div>\n"
                        ;
                }
-               return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
+               return "<p><code class='jush-" . JUSH . "'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
                        . (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
                        . $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 = "<a href='#$id' class='toggle'>" . lang('Warnings') . "</a>, $return<div id='$id' class='hidden'>\n$warnings</div>\n";
                }
                return " <span class='time'>" . @date("H:i:s") . "</span>" // @ - time zone may be not set
-                       . " $return<div id='$sql_id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . "</code></pre>"
+                       . " $return<div id='$sql_id' class='hidden'><pre><code class='jush-" . JUSH . "'>" . shorten_utf8($query, 1000) . "</code></pre>"
                        . ($time ? " <span class='time'>($time)</span>" : '')
                        . (support("sql") ? '<p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a>' : '')
                        . '</div>'
@@ -827,9 +827,9 @@ class Adminer {
        * @return null prints data
        */
        function dumpData($table, $style, $query) {
-               global $connection, $jush;
+               global $connection;
                if ($style) {
-                       $max_packet = ($jush == "sqlite" ? 0 : 1048576); // default, minimum is 1024
+                       $max_packet = (JUSH == "sqlite" ? 0 : 1048576); // default, minimum is 1024
                        $fields = array();
                        $identity_insert = false;
                        if ($_POST["format"] == "sql") {
@@ -837,7 +837,7 @@ class Adminer {
                                        echo truncate_sql($table) . ";\n";
                                }
                                $fields = fields($table);
-                               if ($jush == "mssql") {
+                               if (JUSH == "mssql") {
                                        foreach ($fields as $field) {
                                                if ($field["auto_increment"]) {
                                                        echo "SET IDENTITY_INSERT " . table($table) . " ON;\n";
@@ -964,7 +964,7 @@ class Adminer {
        * @return null
        */
        function navigation($missing) {
-               global $VERSION, $jush, $drivers, $connection;
+               global $VERSION, $drivers, $connection;
                ?>
 <h1>
 <?php echo $this->name(); ?>
@@ -1003,7 +1003,7 @@ class Adminer {
                        echo script_src("../externals/jush/modules/jush-txt.js");
                        echo script_src("../externals/jush/modules/jush-js.js");
                        if (support("sql")) {
-                               echo script_src("../externals/jush/modules/jush-$jush.js");
+                               echo script_src("../externals/jush/modules/jush-" . JUSH . ".js");
                                ?>
 <script<?php echo nonce(); ?>>
 <?php
@@ -1012,9 +1012,9 @@ class Adminer {
                                        foreach ($tables as $table => $type) {
                                                $links[] = preg_quote($table, '/');
                                        }
-                                       echo "var jushLinks = { $jush: [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
+                                       echo "var jushLinks = { " . JUSH . ": [ '" . js_escape(ME) . (support("table") ? "table=" : "select=") . "\$&', /\\b(" . implode("|", $links) . ")\\b/g ] };\n";
                                        foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
-                                               echo "jushLinks.$val = jushLinks.$jush;\n";
+                                               echo "jushLinks.$val = jushLinks." . JUSH . ";\n";
                                        }
                                }
                                $server_info = $connection->server_info;

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 73bd26d8739f5c85ccf96cd379076118dc34b367..ca5a780987447817c235e09866bcfd35d0a805ad 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -35,7 +35,7 @@ if ($_GET["script"] == "version") {
        exit;
 }
 
-global $adminer, $connection, $driver, $drivers, $error, $HTTPS, $jush, $LANG, $langs, $permanent, $has_token, $token, $translations, $VERSION; // allows including Adminer inside a function
+global $adminer, $connection, $driver, $drivers, $error, $HTTPS, $LANG, $langs, $permanent, $has_token, $token, $translations, $VERSION; // allows including Adminer inside a function
 
 if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
        $_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"];
@@ -78,8 +78,7 @@ include "./include/adminer.inc.php";
 $adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
 
-$jush = Driver::$jush;
-
+define('Adminer\JUSH', Driver::$jush);
 define('Adminer\SERVER', $_GET[DRIVER]); // read from pgsql=localhost
 define('Adminer\DB', $_GET["db"]); // for the sake of speed and size
 define(

diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 55ca6baad50b1958a6db386a71967d34b266ba5c..48a2fcacf71539e78e5802b03336e1c01a90438a 100644 (file)
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -13,7 +13,7 @@ if (!ob_get_level()) {
 * @return null
 */
 function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
-       global $LANG, $VERSION, $adminer, $drivers, $jush;
+       global $LANG, $VERSION, $adminer, $drivers;
        page_headers();
        if (is_ajax() && $error) {
                page_messages($error);
@@ -68,7 +68,7 @@ var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
 var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 </script>
 
-<div id="help" class="jush-<?php echo $jush; ?> jsonly hidden"></div>
+<div id="help" class="jush-<?php echo JUSH; ?> jsonly hidden"></div>
 <?php echo script("mixin(qs('#help'), {onmouseover: function () { helpOpen = 1; }, onmouseout: helpMouseout});"); ?>
 
 <div id="content">

diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php
index 0b8bd91b647145cb6c6e1603494a50c791a0596e..f066ebcbcb3d3e642d22cf634d08639741242429 100644 (file)
--- a/adminer/include/driver.inc.php
+++ b/adminer/include/driver.inc.php
@@ -70,12 +70,12 @@ abstract class SqlDriver {
        * @return Result
        */
        function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-               global $adminer, $jush;
+               global $adminer;
                $is_group = (count($group) < count($select));
                $query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
                if (!$query) {
                        $query = "SELECT" . limit(
-                               ($_GET["page"] != "last" && $limit != "" && $group && $is_group && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
+                               ($_GET["page"] != "last" && $limit != "" && $group && $is_group && JUSH == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
                                ($where ? "\nWHERE " . implode(" AND ", $where) : "") . ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : ""),
                                ($limit != "" ? +$limit : null),
                                ($page ? $limit * $page : 0),

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 3d16d35ce1cd1fdce859bec1e945d5b2eb3447b7..a676448fedda0ece907530dfb33d12ceffa8b1c4 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -11,7 +11,6 @@ namespace Adminer;
 * @return array $orgtables
 */
 function select($result, $connection2 = null, $orgtables = array(), $limit = 0) {
-       global $jush;
        $links = array(); // colno => orgtable - create links from these columns
        $indexes = array(); // orgtable => array(column => colno) - primary keys
        $columns = array(); // orgtable => array(column => ) - not selected columns in primary key
@@ -29,7 +28,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
                                $orgtable = $field->orgtable;
                                $orgname = $field->orgname;
                                $return[$field->table] = $orgtable;
-                               if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
+                               if ($orgtables && JUSH == "sql") { // MySQL EXPLAIN
                                        $links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
                                } elseif ($orgtable != "") {
                                        if (!isset($indexes[$orgtable])) {
@@ -66,7 +65,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
                foreach ($row as $key => $val) {
                        $link = "";
                        if (isset($links[$key]) && !$columns[$links[$key]]) {
-                               if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
+                               if ($orgtables && JUSH == "sql") { // MySQL EXPLAIN
                                        $table = $row[array_search("table=", $links)];
                                        $link = ME . $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
                                } else {
@@ -153,8 +152,7 @@ function set_adminer_settings($settings) {
 * @return null
 */
 function textarea($name, $value, $rows = 10, $cols = 80) {
-       global $jush;
-       echo "<textarea name='" . h($name) . "' rows='$rows' cols='$cols' class='sqlarea jush-$jush' spellcheck='false' wrap='off'>";
+       echo "<textarea name='" . h($name) . "' rows='$rows' cols='$cols' class='sqlarea jush-" . JUSH . "' spellcheck='false' wrap='off'>";
        if (is_array($value)) {
                foreach ($value as $val) { // not implode() to save memory
                        echo h($val[0]) . "\n\n\n"; // $val == array($query, $time, $elapsed)
@@ -269,11 +267,11 @@ function process_length($length) {
 * @return string
 */
 function process_type($field, $collate = "COLLATE") {
-       global $driver, $jush;
+       global $driver;
        return " $field[type]"
                . process_length($field["length"])
                . (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $driver->unsigned) ? " $field[unsigned]" : "")
-               . (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . ($jush == "mssql" ? $field["collation"] : q($field["collation"])) : "")
+               . (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . (JUSH == "mssql" ? $field["collation"] : q($field["collation"])) : "")
        ;
 }
 
@@ -303,11 +301,10 @@ function process_field($field, $type_field) {
 * @return string
 */
 function default_value($field) {
-       global $jush;
        $default = $field["default"];
        return ($default === null ? "" : " DEFAULT " .
                (!preg_match('~^GENERATED ~i', $default) && (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default))
-               ? q($default) : str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", ($jush == "sqlite" ? "($default)" : $default)))
+               ? q($default) : str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", (JUSH == "sqlite" ? "($default)" : $default)))
        );
 }
 
@@ -505,11 +502,10 @@ function drop_create($drop, $create, $drop_created, $test, $drop_test, $location
 * @return string
 */
 function create_trigger($on, $row) {
-       global $jush;
        $timing_event = " $row[Timing] $row[Event]" . (preg_match('~ OF~', $row["Event"]) ? " $row[Of]" : ""); // SQL injection
        return "CREATE TRIGGER "
                . idf_escape($row["Trigger"])
-               . ($jush == "mssql" ? $on . $timing_event : $timing_event . $on)
+               . (JUSH == "mssql" ? $on . $timing_event : $timing_event . $on)
                . rtrim(" $row[Type]\n$row[Statement]", ";")
                . ";"
        ;
@@ -521,7 +517,7 @@ function create_trigger($on, $row) {
 * @return string
 */
 function create_routine($routine, $row) {
-       global $driver, $jush;
+       global $driver;
        $set = array();
        $fields = (array) $row["fields"];
        ksort($fields); // enforce fields order
@@ -536,7 +532,7 @@ function create_routine($routine, $row) {
                . " (" . implode(", ", $set) . ")"
                . ($routine == "FUNCTION" ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
                . ($row["language"] ? " LANGUAGE $row[language]" : "")
-               . ($jush == "pgsql" ? " AS " . q($definition) : "\n$definition;")
+               . (JUSH == "pgsql" ? " AS " . q($definition) : "\n$definition;")
        ;
 }
 
@@ -602,12 +598,12 @@ function ini_bytes($ini) {
 }
 
 /** Create link to database documentation
-* @param array $jush => $path
+* @param array JUSH => $path
 * @param string HTML code
 * @return string HTML code
 */
 function doc_link($paths, $text = "<sup>?</sup>") {
-       global $jush, $connection;
+       global $connection;
        $server_info = $connection->server_info;
        $version = preg_replace('~^(\d\.?\d).*~s', '\1', $server_info); // two most significant digits
        $urls = array(
@@ -621,7 +617,7 @@ function doc_link($paths, $text = "<sup>?</sup>") {
                $urls['sql'] = "https://mariadb.com/kb/en/";
                $paths['sql'] = (isset($paths['mariadb']) ? $paths['mariadb'] : str_replace(".html", "/", $paths['sql']));
        }
-       return ($paths[$jush] ? "<a href='" . h($urls[$jush] . $paths[$jush] . ($jush == 'mssql' ? "?view=sql-server-ver$version" : "")) . "'" . target_blank() . ">$text</a>" : "");
+       return ($paths[JUSH] ? "<a href='" . h($urls[JUSH] . $paths[JUSH] . (JUSH == 'mssql' ? "?view=sql-server-ver$version" : "")) . "'" . target_blank() . ">$text</a>" : "");
 }
 
 /** Wrap gzencode() for usage in ob_start()

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index e11707c02777df1c0d1afcf2465dc787886f1c8b..b188522129c685b41526615bbac47aaf70611604 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -437,19 +437,19 @@ function escape_key($key) {
 * @return string
 */
 function where($where, $fields = array()) {
-       global $connection, $jush;
+       global $connection;
        $return = array();
        foreach ((array) $where["where"] as $key => $val) {
                $key = bracket_escape($key, 1); // 1 - back
                $column = escape_key($key);
                $return[] = $column
-                       . ($jush == "sql" && $fields[$key]["type"] == "json" ? " = CAST(" . q($val) . " AS JSON)"
-                               : ($jush == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
-                               : ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
+                       . (JUSH == "sql" && $fields[$key]["type"] == "json" ? " = CAST(" . q($val) . " AS JSON)"
+                               : (JUSH == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
+                               : (JUSH == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
                                : " = " . unconvert_field($fields[$key], q($val))
                        )))
                ; //! enum and set
-               if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
+               if (JUSH == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
                        $return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
                }
        }
@@ -878,13 +878,13 @@ function column_foreign_keys($table) {
 * @return null
 */
 function enum_input($type, $attrs, $field, $value, $empty = null) {
-       global $adminer, $jush;
+       global $adminer;
        preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
        $return = ($empty !== null ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
        foreach ($matches[1] as $i => $val) {
                $val = stripcslashes(str_replace("''", "'", $val));
                $checked = (is_int($value) ? $value == $i+1 : (is_array($value) ? in_array($i+1, $value) : $value === $val));
-               $return .= " <label><input type='$type'$attrs value='" . ($jush == "sql" ? $i+1 : h($val)) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
+               $return .= " <label><input type='$type'$attrs value='" . (JUSH == "sql" ? $i+1 : h($val)) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
        }
        return $return;
 }
@@ -896,7 +896,7 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 * @return null
 */
 function input($field, $value, $function) {
-       global $driver, $adminer, $jush;
+       global $driver, $adminer;
        $name = h(bracket_escape($field["field"]));
        echo "<td class='function'>";
        if (is_array($value) && !$function) {
@@ -907,7 +907,7 @@ function input($field, $value, $function) {
                $value = call_user_func_array('json_encode', $args); //! requires PHP 5.2
                $function = "json";
        }
-       $reset = ($jush == "mssql" && $field["auto_increment"]);
+       $reset = (JUSH == "mssql" && $field["auto_increment"]);
        if ($reset && !$_POST["save"]) {
                $function = null;
        }
@@ -949,7 +949,7 @@ function input($field, $value, $function) {
                } elseif (preg_match('~blob|bytea|raw|file~', $field["type"]) && ini_bool("file_uploads")) {
                        echo "<input type='file' name='fields-$name'>";
                } elseif (($text = preg_match('~text|lob|memo~i', $field["type"])) || preg_match("~\n~", $value)) {
-                       if ($text && $jush != "sqlite") {
+                       if ($text && JUSH != "sqlite") {
                                $attrs .= " cols='50' rows='12'";
                        } else {
                                $rows = min(12, substr_count($value, "\n") + 1);
@@ -964,7 +964,7 @@ function input($field, $value, $function) {
                                ? ((preg_match("~binary~", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0))
                                : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0)
                        );
-                       if ($jush == 'sql' && min_version(5.6) && preg_match('~time~', $field["type"])) {
+                       if (JUSH == 'sql' && min_version(5.6) && preg_match('~time~', $field["type"])) {
                                $maxlength += 7; // microtime
                        }
                        // type='date' and type='time' display localized value which may be confusing, type='datetime' uses 'T' as date and time separator
@@ -1286,9 +1286,8 @@ function is_shortable($field) {
 * @return string
 */
 function count_rows($table, $where, $is_group, $group) {
-       global $jush;
        $query = " FROM " . table($table) . ($where ? " WHERE " . implode(" AND ", $where) : "");
-       return ($is_group && ($jush == "sql" || count($group) == 1)
+       return ($is_group && (JUSH == "sql" || count($group) == 1)
                ? "SELECT COUNT(DISTINCT " . implode(", ", $group) . ")$query"
                : "SELECT COUNT(*)" . ($is_group ? " FROM (SELECT 1$query GROUP BY " . implode(", ", $group) . ") x" : $query)
        );
@@ -1398,7 +1397,7 @@ function on_help($command, $side = 0) {
 * @return null
 */
 function edit_form($table, $fields, $row, $update) {
-       global $adminer, $jush, $token, $error;
+       global $adminer, $token, $error;
        $table_name = $adminer->tableName(table_status1($table, true));
        page_header(
                ($update ? lang('Edit') : lang('Insert')),
@@ -1429,7 +1428,7 @@ function edit_form($table, $fields, $row, $update) {
                                }
                        }
                        $value = ($row !== null
-                               ? ($row[$name] != "" && $jush == "sql" && preg_match("~enum|set~", $field["type"])
+                               ? ($row[$name] != "" && JUSH == "sql" && preg_match("~enum|set~", $field["type"])
                                        ? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name])
                                        : (is_bool($row[$name]) ? +$row[$name] : $row[$name])
                                )

diff --git a/adminer/indexes.inc.php b/adminer/indexes.inc.php
index 1e91b51497fd913e049c6eb17be5eca37fbd7f7e..8e3b585ee1d3c844811da4cf6525ea77c530b5b4 100644 (file)
--- a/adminer/indexes.inc.php
+++ b/adminer/indexes.inc.php
@@ -12,7 +12,7 @@ if (preg_match('~MyISAM|M?aria' . (min_version(5.7, '10.2.2') ? '|InnoDB' : '')
 }
 $indexes = indexes($TABLE);
 $primary = array();
-if ($jush == "mongo") { // doesn't support primary key
+if (JUSH == "mongo") { // doesn't support primary key
        $primary = $indexes["_id_"];
        unset($index_types[0]);
        unset($indexes["_id_"]);
@@ -96,7 +96,7 @@ if (!$row) {
        $indexes[] = array("columns" => array(1 => ""));
        $row["indexes"] = $indexes;
 }
-$lengths = ($jush == "sql" || $jush == "mssql");
+$lengths = (JUSH == "sql" || JUSH == "mssql");
 $show_options = ($_POST ? $_POST["options"] : adminer_setting("index_options"));
 ?>
 
@@ -136,7 +136,7 @@ foreach ($row["indexes"] as $index) {
                                " name='indexes[$j][columns][$i]' title='" . lang('Column') . "'",
                                ($fields ? array_combine($fields, $fields) : $fields),
                                $column,
-                               "partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "')"
+                               "partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape(JUSH == "sql" ? "" : $_GET["indexes"] . "_") . "')"
                        );
                        echo "<span class='idxopts" . ($show_options ? "" : " hidden") . "'>";
                        echo ($lengths ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");

diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index 43b3d4e27058e20062bf8e4ad509e76dbcf4c598..ed0d007e6aa8b22e38ece0b1cc7913704f1145b9 100644 (file)
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -46,7 +46,7 @@ $routine_languages = routine_languages();
 edit_fields($row["fields"], $collations, $routine);
 if (isset($_GET["function"])) {
        echo "<tr><td>" . lang('Return type');
-       edit_type("returns", $row["returns"], $collations, array(), ($jush == "pgsql" ? array("void", "trigger") : array()));
+       edit_type("returns", $row["returns"], $collations, array(), (JUSH == "pgsql" ? array("void", "trigger") : array()));
 }
 ?>
 </table>

diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index 70566872837935ee7d35b01af6145a35bc020362..1bf479b1ec239d7ec7616766e87dcd5c810d9972 100644 (file)
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -35,13 +35,13 @@ foreach (process_list() as $i => $row) {
                }
                echo "</thead>\n";
        }
-       echo "<tr>" . (support("kill") ? "<td>" . checkbox("kill[]", $row[$jush == "sql" ? "Id" : "pid"], 0) : "");
+       echo "<tr>" . (support("kill") ? "<td>" . checkbox("kill[]", $row[JUSH == "sql" ? "Id" : "pid"], 0) : "");
        foreach ($row as $key => $val) {
                echo "<td>" . (
-                       ($jush == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
-                       ($jush == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
-                       ($jush == "oracle" && $key == "sql_text" && $val != "")
-                       ? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Clone') . '</a>'
+                       (JUSH == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
+                       (JUSH == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
+                       (JUSH == "oracle" && $key == "sql_text" && $val != "")
+                       ? "<code class='jush-" . JUSH . "'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Clone') . '</a>'
                        : h($val)
                );
        }

diff --git a/adminer/script.inc.php b/adminer/script.inc.php
index 6420ac210ed218111a972ca783b53175bc1e924e..f0898e91fde31369d80a7759595ddd711f898225 100644 (file)
--- a/adminer/script.inc.php
+++ b/adminer/script.inc.php
@@ -15,7 +15,7 @@ if ($_GET["script"] == "db") {
                                if ($table_status[$key] != "") {
                                        $val = format_number($table_status[$key]);
                                        if ($val >= 0) {
-                                               json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($jush == "pgsql" ? "table" : "InnoDB")
+                                               json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == (JUSH == "pgsql" ? "table" : "InnoDB")
                                                        ? "~ $val"
                                                        : $val
                                                ));

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index e8a494f1edc61f0eec566479257e6ca25bb4c8b7..5eaff0fac6b58d9be879fc19807d0199b554a77d 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -291,21 +291,21 @@ if (!$columns && support("table")) {
        if (!$result) {
                echo "<p class='error'>" . error() . "\n";
        } else {
-               if ($jush == "mssql" && $page) {
+               if (JUSH == "mssql" && $page) {
                        $result->seek($limit * $page);
                }
                $email_fields = array();
                echo "<form action='' method='post' enctype='multipart/form-data'>\n";
                $rows = array();
                while ($row = $result->fetch_assoc()) {
-                       if ($page && $jush == "oracle") {
+                       if ($page && JUSH == "oracle") {
                                unset($row["RNUM"]);
                        }
                        $rows[] = $row;
                }
 
                // use count($rows) without LIMIT, COUNT(*) without grouping, FOUND_ROWS otherwise (slowest)
-               if ($_GET["page"] != "last" && $limit != "" && $group && $is_group && $jush == "sql") {
+               if ($_GET["page"] != "last" && $limit != "" && $group && $is_group && JUSH == "sql") {
                        $found_rows = $connection->result(" SELECT FOUND_ROWS()"); // space to allow mysql.trace_mode
                }
 
@@ -379,9 +379,9 @@ if (!$columns && support("table")) {
                                }
                                $unique_idf = "";
                                foreach ($unique_array as $key => $val) {
-                                       if (($jush == "sql" || $jush == "pgsql") && preg_match('~char|text|enum|set~', $fields[$key]["type"]) && strlen($val) > 64) {
+                                       if ((JUSH == "sql" || JUSH == "pgsql") && preg_match('~char|text|enum|set~', $fields[$key]["type"]) && strlen($val) > 64) {
                                                $key = (strpos($key, '(') ? $key : idf_escape($key)); //! columns looking like functions
-                                               $key = "MD5(" . ($jush != 'sql' || preg_match("~^utf8~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset($connection) . ")") . ")";
+                                               $key = "MD5(" . (JUSH != 'sql' || preg_match("~^utf8~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset($connection) . ")") . ")";
                                                $val = md5($val);
                                        }
                                        $unique_idf .= "&" . ($val !== null ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val === false ? "f" : $val) : "null%5B%5D=" . urlencode($key));
@@ -472,7 +472,7 @@ if (!$columns && support("table")) {
                                if ($_GET["page"] != "last") {
                                        if ($limit == "" || (count($rows) < $limit && ($rows || !$page))) {
                                                $found_rows = ($page ? $page * $limit : 0) + count($rows);
-                                       } elseif ($jush != "sql" || !$is_group) {
+                                       } elseif (JUSH != "sql" || !$is_group) {
                                                $found_rows = ($is_group ? false : found_rows($table_status, $where));
                                                if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) {
                                                        // slow with big tables
@@ -503,7 +503,7 @@ if (!$columns && support("table")) {
                                                : floor(($found_rows - 1) / $limit)
                                        );
                                        echo "<fieldset>";
-                                       if ($jush != "simpledb") {
+                                       if (JUSH != "simpledb") {
                                                echo "<legend><a href='" . h(remove_from_uri("page")) . "'>" . lang('Page') . "</a></legend>";
                                                echo script("qsl('a').onclick = function () { pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "')); return false; };");
                                                echo pagination(0, $page) . ($page > 5 ? " …" : "");

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index e6ccb0c66954ff014a15430ffd4885ecb3a61475..28884a7f83c5f9216481cbe6921a56c0c52481c9 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -61,7 +61,7 @@ if (!$error && $_POST) {
                }
                $commands = 0;
                $errors = array();
-               $parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . ($jush == "pgsql" ? '|\$[^$]*\$' : '');
+               $parse = '[\'"' . (JUSH == "sql" ? '`#' : (JUSH == "sqlite" ? '`[' : (JUSH == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . (JUSH == "pgsql" ? '|\$[^$]*\$' : '');
                $total_start = microtime(true);
                parse_str($_COOKIE["adminer_export"], $adminer_export);
                $dump_format = $adminer->dumpFormat();
@@ -83,7 +83,7 @@ if (!$error && $_POST) {
                                        $offset = $pos + strlen($found);
 
                                        if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
-                                               $c_style_escapes = $driver->hasCStyleEscapes() || ($jush == "pgsql" && ($pos > 0 && strtolower($query[$pos - 1]) == "e"));
+                                               $c_style_escapes = $driver->hasCStyleEscapes() || (JUSH == "pgsql" && ($pos > 0 && strtolower($query[$pos - 1]) == "e"));
 
                                                $pattern = ($found == '/*' ? '\*/'
                                                        : ($found == '[' ? ']'
@@ -107,8 +107,8 @@ if (!$error && $_POST) {
                                                $empty = false;
                                                $q = substr($query, 0, $pos);
                                                $commands++;
-                                               $print = "<pre id='sql-$commands'><code class='jush-$jush'>" . $adminer->sqlCommandQuery($q) . "</code></pre>\n";
-                                               if ($jush == "sqlite" && preg_match("~^$space*+ATTACH\\b~i", $q, $match)) {
+                                               $print = "<pre id='sql-$commands'><code class='jush-" . JUSH . "'>" . $adminer->sqlCommandQuery($q) . "</code></pre>\n";
+                                               if (JUSH == "sqlite" && preg_match("~^$space*+ATTACH\\b~i", $q, $match)) {
                                                        // PHP doesn't support setting SQLITE_LIMIT_ATTACHED
                                                        echo $print;
                                                        echo "<p class='error'>" . lang('ATTACH queries are not supported.') . "\n";
@@ -265,7 +265,7 @@ if (!isset($_GET["import"]) && $history) {
                list($q, $time, $elapsed) = $val;
                echo '<a href="' . h(ME . "sql=&history=$key") . '">' . lang('Edit') . "</a>"
                        . " <span class='time' title='" . @date('Y-m-d', $time) . "'>" . @date("H:i:s", $time) . "</span>" // @ - time zone may be not set
-                       . " <code class='jush-$jush'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $q)))), 80, "</code>")
+                       . " <code class='jush-" . JUSH . "'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $q)))), 80, "</code>")
                        . ($elapsed ? " <span class='time'>($elapsed)</span>" : "")
                        . "<br>\n"
                ;

diff --git a/adminer/table.inc.php b/adminer/table.inc.php
index 2709b72db595010df2d96fd225af9e70629a7d6e..b459816b8ba21b8ae0057d956e2cf1ed99d61ed5 100644 (file)
--- a/adminer/table.inc.php
+++ b/adminer/table.inc.php
@@ -69,7 +69,7 @@ if (!is_view($table_status)) {
                        echo "<table>\n";
                        foreach ($check_constraints as $key => $val) {
                                echo "<tr title='" . h($key) . "'>";
-                               echo "<td><code class='jush-$jush'>" . h($val);
+                               echo "<td><code class='jush-" . JUSH . "'>" . h($val);
                                echo "<td><a href='" . h(ME . 'check=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>";
                                echo "\n";
                        }

diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php
index bf0a72337f7918140f47e451321a002be2978101..3b776940ee23dfee3e02480b1321d5064e328b3f 100644 (file)
--- a/adminer/trigger.inc.php
+++ b/adminer/trigger.inc.php
@@ -10,7 +10,7 @@ if ($_POST) {
        if (!$error && in_array($_POST["Timing"], $trigger_options["Timing"]) && in_array($_POST["Event"], $trigger_options["Event"]) && in_array($_POST["Type"], $trigger_options["Type"])) {
                // don't use drop_create() because there may not be more triggers for the same action
                $on = " ON " . table($TABLE);
-               $drop = "DROP TRIGGER " . idf_escape($name) . ($jush == "pgsql" ? $on : "");
+               $drop = "DROP TRIGGER " . idf_escape($name) . (JUSH == "pgsql" ? $on : "");
                $location = ME . "table=" . urlencode($TABLE);
                if ($_POST["drop"]) {
                        query_redirect($drop, $location, lang('Trigger has been dropped.'));

diff --git a/adminer/type.inc.php b/adminer/type.inc.php
index bfdb76bb04741a58e6ef7a6f1156615aacc5b058..da252cd84ff32d5887e4518169f80db6ec3d6d8f 100644 (file)
--- a/adminer/type.inc.php
+++ b/adminer/type.inc.php
@@ -27,7 +27,7 @@ if ($TYPE != "") {
        $types = $driver->types();
        $enums = type_values($types[$TYPE]);
        if ($enums) {
-               echo "<code class='jush-$jush'>ENUM (" . h($enums) . ")</code>\n<p>";
+               echo "<code class='jush-" . JUSH . "'>ENUM (" . h($enums) . ")</code>\n<p>";
        }
        echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $TYPE)) . "\n";
 } else {

diff --git a/adminer/variables.inc.php b/adminer/variables.inc.php
index 7b561a830bd69110a4c92a0cb2a738774437c56b..ba3c76b917643854d532daa6ff347f310d0f8ac9 100644 (file)
--- a/adminer/variables.inc.php
+++ b/adminer/variables.inc.php
@@ -11,7 +11,7 @@ if (!$variables) {
        echo "<table>\n";
        foreach ($variables as $key => $val) {
                echo "<tr>";
-               echo "<th><code class='jush-" . $jush . ($status ? "status" : "set") . "'>" . h($key) . "</code>";
+               echo "<th><code class='jush-" . JUSH . ($status ? "status" : "set") . "'>" . h($key) . "</code>";
                echo "<td>" . nl_br(h($val));
        }
        echo "</table>\n";

diff --git a/adminer/view.inc.php b/adminer/view.inc.php
index 47105cb110025a4393eadfd87e6fc1b2f30bf6a9..ce44e65c642588666837112e7a5527aa5f6466ae 100644 (file)
--- a/adminer/view.inc.php
+++ b/adminer/view.inc.php
@@ -4,7 +4,7 @@ namespace Adminer;
 $TABLE = $_GET["view"];
 $row = $_POST;
 $orig_type = "VIEW";
-if ($jush == "pgsql" && $TABLE != "") {
+if (JUSH == "pgsql" && $TABLE != "") {
        $status = table_status($TABLE);
        $orig_type = strtoupper($status["Engine"]);
 }
@@ -17,8 +17,8 @@ if ($_POST && !$error) {
 
        $type = ($_POST["materialized"] ? "MATERIALIZED VIEW" : "VIEW");
 
-       if (!$_POST["drop"] && $TABLE == $name && $jush != "sqlite" && $type == "VIEW" && $orig_type == "VIEW") {
-               query_redirect(($jush == "mssql" ? "ALTER" : "CREATE OR REPLACE") . " VIEW " . table($name) . $as, $location, $message);
+       if (!$_POST["drop"] && $TABLE == $name && JUSH != "sqlite" && $type == "VIEW" && $orig_type == "VIEW") {
+               query_redirect((JUSH == "mssql" ? "ALTER" : "CREATE OR REPLACE") . " VIEW " . table($name) . $as, $location, $message);
        } else {
                $temp_name = $name . "_adminer_" . uniqid();
                drop_create(

diff --git a/compile.php b/compile.php
index a28083b050786f0b2febcaee74dbc63ab342faf5..0d7dcb6332c6be84c9d9e22a6b982ee9e6240d64 100755 (executable)
--- a/compile.php
+++ b/compile.php
@@ -470,7 +470,7 @@ if ($_SESSION["lang"]) {
        $file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 }
 $file = str_replace('<?php echo script_src("static/editing.js"); ?>' . "\n", "", $file);
-$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|\$jush)\.js"\);~', '', $file);
+$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|" \. JUSH \. ")\.js"\);~', '', $file);
 $file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
 $replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . $VERSION . '"';