' . lang('Table');
echo ' ' . lang('Engine') . doc_link(array('sql' => 'storage-engines.html'));
echo ' ' . lang('Collation') . doc_link(array('sql' => 'charset-mysql.html'));
@@ -80,10 +79,11 @@ if ($adminer->homepage()) {
$tables = 0;
foreach ($tables_list as $name => $type) {
$view = ($type !== null && !preg_match('~table~i', $type));
- echo '' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');");
- echo ' ' . (support("table") || support("indexes") ? '' . h($name) . ' ' : h($name));
+ $id = h("Table-" . $name);
+ echo '' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');", "", $id);
+ echo ' ' . (support("table") || support("indexes") ? "" . h($name) . ' ' : h($name));
if ($view) {
- echo ' ' . (preg_match('~materialized~i', $type) ? lang('Materialized View') : lang('View')) . ' ';
+ echo '' . (preg_match('~materialized~i', $type) ? lang('Materialized view') : lang('View')) . ' ';
echo '? ';
} else {
foreach (array(
@@ -145,7 +145,6 @@ if ($adminer->homepage()) {
echo '' . lang('Create table') . " \n";
echo (support("view") ? '' . lang('Create view') . " \n" : "");
- echo (support("materializedview") ? '' . lang('Create materialized view') . " \n" : "");
if (support("routine")) {
echo "
" . lang('Routines') . " \n";
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/download.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/download.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/download.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/download.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/elastic.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/elastic.inc.php
old mode 100755
new mode 100644
similarity index 97%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/elastic.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/elastic.inc.php
index 4ab29c22..3ab5c43d
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/elastic.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/elastic.inc.php
@@ -59,7 +59,8 @@ if (isset($_GET["elastic"])) {
}
function connect($server, $username, $password) {
- $this->_url = "http://$username:$password@$server/";
+ preg_match('~^(https?://)?(.*)~', $server, $match);
+ $this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]/";
$return = $this->query('');
if ($return) {
$this->server_info = $return['version']['number'];
@@ -257,9 +258,9 @@ if (isset($_GET["elastic"])) {
"Engine" => "table",
"Rows" => $table["count"],
);
- }
- if ($name != "" && $name == $table["term"]) {
- return $return[$name];
+ if ($name != "" && $name == $table["term"]) {
+ return $return[$name];
+ }
}
}
return $return;
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/firebird.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/firebird.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/firebird.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/firebird.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/mongo.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/mongo.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/mongo.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/mongo.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/mssql.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/mssql.inc.php
old mode 100755
new mode 100644
similarity index 95%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/mssql.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/mssql.inc.php
index 790ac3f3..d99e5092
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/mssql.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/mssql.inc.php
@@ -8,7 +8,7 @@
$drivers["mssql"] = "MS SQL";
if (isset($_GET["mssql"])) {
- $possible_drivers = array("SQLSRV", "MSSQL");
+ $possible_drivers = array("SQLSRV", "MSSQL", "PDO_DBLIB");
define("DRIVER", "mssql");
if (extension_loaded("sqlsrv")) {
class Min_DB {
@@ -109,11 +109,11 @@ if (isset($_GET["mssql"])) {
}
function fetch_assoc() {
- return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC, SQLSRV_SCROLL_NEXT));
+ return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC));
}
function fetch_row() {
- return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC, SQLSRV_SCROLL_NEXT));
+ return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC));
}
function fetch_field() {
@@ -164,7 +164,7 @@ if (isset($_GET["mssql"])) {
}
function query($query, $unbuffered = false) {
- $result = mssql_query($query, $this->_link); //! $unbuffered
+ $result = @mssql_query($query, $this->_link); //! $unbuffered
$this->error = "";
if (!$result) {
$this->error = mssql_get_last_message();
@@ -186,7 +186,7 @@ if (isset($_GET["mssql"])) {
}
function next_result() {
- return mssql_next_result($this->_result);
+ return mssql_next_result($this->_result->_result);
}
function result($query, $field = 0) {
@@ -234,8 +234,21 @@ if (isset($_GET["mssql"])) {
}
}
- }
+ } elseif (extension_loaded("pdo_dblib")) {
+ class Min_DB extends Min_PDO {
+ var $extension = "PDO_DBLIB";
+ function connect($server, $username, $password) {
+ $this->dsn("dblib:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
+ return true;
+ }
+
+ function select_db($database) {
+ // database selection is separated from the connection so dbname in DSN can't be used
+ return $this->query("USE " . idf_escape($database));
+ }
+ }
+ }
class Min_Driver extends Min_SQL {
@@ -288,7 +301,7 @@ if (isset($_GET["mssql"])) {
}
function get_databases() {
- return get_vals("EXEC sp_databases");
+ return get_vals("SELECT name FROM sys.databases WHERE name NOT IN ('master', 'tempdb', 'model', 'msdb')");
}
function limit($query, $where, $limit, $offset = 0, $separator = " ") {
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/mysql.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/mysql.inc.php
old mode 100755
new mode 100644
similarity index 96%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/mysql.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/mysql.inc.php
index d400f26f..f38853ae
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/mysql.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/mysql.inc.php
@@ -301,12 +301,16 @@ if (!defined("DRIVER")) {
* @return mixed Min_DB or string for error
*/
function connect() {
- global $adminer;
+ global $adminer, $types, $structured_types;
$connection = new Min_DB;
$credentials = $adminer->credentials();
if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
$connection->set_charset(charset($connection)); // available in MySQLi since PHP 5.0.5
$connection->query("SET sql_quote_show_create = 1, autocommit = 1");
+ if (version_compare($connection->server_info, '5.7.8') >= 0) {
+ $structured_types[lang('Strings')][] = "json";
+ $types["json"] = 4294967295;
+ }
return $connection;
}
$return = $connection->error;
@@ -429,7 +433,7 @@ if (!defined("DRIVER")) {
global $connection;
$return = array();
foreach (get_rows($fast && $connection->server_info >= 5
- ? "SELECT TABLE_NAME AS Name, Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
+ ? "SELECT TABLE_NAME AS Name, ENGINE AS Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
: "SHOW TABLE STATUS" . ($name != "" ? " LIKE " . q(addcslashes($name, "%_\\")) : "")
) as $row) {
if ($row["Engine"] == "InnoDB") {
@@ -500,10 +504,11 @@ if (!defined("DRIVER")) {
function indexes($table, $connection2 = null) {
$return = array();
foreach (get_rows("SHOW INDEX FROM " . table($table), $connection2) as $row) {
- $return[$row["Key_name"]]["type"] = ($row["Key_name"] == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? "INDEX" : "UNIQUE")));
- $return[$row["Key_name"]]["columns"][] = $row["Column_name"];
- $return[$row["Key_name"]]["lengths"][] = $row["Sub_part"];
- $return[$row["Key_name"]]["descs"][] = null;
+ $name = $row["Key_name"];
+ $return[$name]["type"] = ($name == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? ($row["Index_type"] == "SPATIAL" ? "SPATIAL" : "INDEX") : "UNIQUE")));
+ $return[$name]["columns"][] = $row["Column_name"];
+ $return[$name]["lengths"][] = ($row["Index_type"] == "SPATIAL" ? null : $row["Sub_part"]);
+ $return[$name]["descs"][] = null;
}
return $return;
}
@@ -972,6 +977,14 @@ if (!defined("DRIVER")) {
return get_key_vals("SHOW STATUS");
}
+ /** Get replication status of master or slave
+ * @param string
+ * @return array ($name => $value)
+ */
+ function replication_status($type) {
+ return get_rows("SHOW $type STATUS");
+ }
+
/** Convert field in select and edit
* @param array one element from fields()
* @return string
@@ -1012,13 +1025,17 @@ if (!defined("DRIVER")) {
*/
function support($feature) {
global $connection;
- return !preg_match("~scheme|sequence|type|view_trigger" . ($connection->server_info < 5.1 ? "|event|partitioning" . ($connection->server_info < 5 ? "|routine|trigger|view" : "") : "") . "~", $feature);
+ return !preg_match("~scheme|sequence|type|view_trigger|materializedview" . ($connection->server_info < 5.1 ? "|event|partitioning" . ($connection->server_info < 5 ? "|routine|trigger|view" : "") : "") . "~", $feature);
}
function kill_process($val) {
return queries("KILL " . number($val));
}
+ function connection_id(){
+ return "SELECT CONNECTION_ID()";
+ }
+
function max_connections() {
global $connection;
return $connection->result("SELECT @@max_connections");
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/oracle.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/oracle.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/oracle.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/oracle.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/pgsql.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/pgsql.inc.php
old mode 100755
new mode 100644
similarity index 75%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/pgsql.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/pgsql.inc.php
index eb59bd83..ad699b73
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/pgsql.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/pgsql.inc.php
@@ -186,12 +186,20 @@ if (isset($_GET["pgsql"])) {
}
function connect() {
- global $adminer;
+ global $adminer, $types, $structured_types;
$connection = new Min_DB;
$credentials = $adminer->credentials();
if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
if ($connection->server_info >= 9) {
$connection->query("SET application_name = 'Adminer'");
+ if ($connection->server_info >= 9.2) {
+ $structured_types[lang('Strings')][] = "json";
+ $types["json"] = 4294967295;
+ if ($connection->server_info >= 9.4) {
+ $structured_types[lang('Strings')][] = "jsonb";
+ $types["jsonb"] = 4294967295;
+ }
+ }
}
return $connection;
}
@@ -199,7 +207,7 @@ if (isset($_GET["pgsql"])) {
}
function get_databases() {
- return get_vals("SELECT datname FROM pg_database ORDER BY datname");
+ return get_vals("SELECT datname FROM pg_database WHERE has_database_privilege(datname, 'CONNECT') ORDER BY datname");
}
function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -244,11 +252,11 @@ ORDER BY 1";
function table_status($name = "") {
$return = array();
- foreach (get_rows("SELECT relname AS \"Name\", CASE relkind WHEN 'r' THEN 'table' WHEN 'mv' THEN 'materialized view' WHEN 'f' THEN 'foreign table' ELSE 'view' END AS \"Engine\", pg_relation_size(oid) AS \"Data_length\", pg_total_relation_size(oid) - pg_relation_size(oid) AS \"Index_length\", obj_description(oid, 'pg_class') AS \"Comment\", relhasoids::int AS \"Oid\", reltuples as \"Rows\"
-FROM pg_class
-WHERE relkind IN ('r','v','mv','f')
-AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())
-" . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")
+ foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_relation_size(c.oid) AS \"Data_length\", pg_total_relation_size(c.oid) - pg_relation_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", c.relhasoids::int AS \"Oid\", c.reltuples as \"Rows\", n.nspname
+FROM pg_class c
+JOIN pg_namespace n ON(n.nspname = current_schema() AND n.oid = c.relnamespace)
+WHERE relkind IN ('r', 'm', 'v')
+" . ($name != "" ? "AND relname = " . q($name) : "ORDER BY c.oid")
) as $row) { //! Index_length, Auto_increment
$return[$row["Name"]] = $row;
}
@@ -311,9 +319,9 @@ ORDER BY a.attnum"
$return = array();
$table_oid = $connection2->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($table));
$columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2);
- foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) {
+ foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption , (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) {
$relname = $row["relname"];
- $return[$relname]["type"] = ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX"));
+ $return[$relname]["type"] = ($row["indispartial"] ? "INDEX" : ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX")));
$return[$relname]["columns"] = array();
foreach (explode(" ", $row["indkey"]) as $indkey) {
$return[$relname]["columns"][] = $columns[$indkey];
@@ -330,7 +338,7 @@ ORDER BY a.attnum"
function foreign_keys($table) {
global $on_actions;
$return = array();
- foreach (get_rows("SELECT conname, pg_get_constraintdef(oid) AS definition
+ foreach (get_rows("SELECT conname, condeferrable::int AS deferrable, pg_get_constraintdef(oid) AS definition
FROM pg_constraint
WHERE conrelid = (SELECT pc.oid FROM pg_class AS pc INNER JOIN pg_namespace AS pn ON (pn.oid = pc.relnamespace) WHERE pc.relname = " . q($table) . " AND pn.nspname = current_schema())
AND contype = 'f'::char
@@ -352,7 +360,7 @@ ORDER BY conkey, conname") as $row) {
function view($name) {
global $connection;
- return array("select" => $connection->result("SELECT pg_get_viewdef(" . q($name) . ")"));
+ return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . q($name) . ")")));
}
function collations() {
@@ -488,7 +496,7 @@ ORDER BY conkey, conname") as $row) {
function drop_tables($tables) {
foreach ($tables as $table) {
- $status = table_status($table);
+ $status = table_status($table);
if (!queries("DROP " . strtoupper($status["Engine"]) . " " . table($table))) {
return false;
}
@@ -506,18 +514,21 @@ ORDER BY conkey, conname") as $row) {
return true;
}
- function trigger($name) {
+ function trigger($name, $table = null) {
if ($name == "") {
return array("Statement" => "EXECUTE PROCEDURE ()");
}
- $rows = get_rows('SELECT trigger_name AS "Trigger", condition_timing AS "Timing", event_manipulation AS "Event", \'FOR EACH \' || action_orientation AS "Type", action_statement AS "Statement" FROM information_schema.triggers WHERE event_object_table = ' . q($_GET["trigger"]) . ' AND trigger_name = ' . q($name));
+ if ($table === null) {
+ $table = $_GET['trigger'];
+ }
+ $rows = get_rows('SELECT t.trigger_name AS "Trigger", t.action_timing AS "Timing", (SELECT STRING_AGG(event_manipulation, \' OR \') FROM information_schema.triggers WHERE event_object_table = t.event_object_table AND trigger_name = t.trigger_name ) AS "Events", t.event_manipulation AS "Event", \'FOR EACH \' || t.action_orientation AS "Type", t.action_statement AS "Statement" FROM information_schema.triggers t WHERE t.event_object_table = ' . q($table) . ' AND t.trigger_name = ' . q($name));
return reset($rows);
}
function triggers($table) {
$return = array();
foreach (get_rows("SELECT * FROM information_schema.triggers WHERE event_object_table = " . q($table)) as $row) {
- $return[$row["trigger_name"]] = array($row["condition_timing"], $row["event_manipulation"]);
+ $return[$row["trigger_name"]] = array($row["action_timing"], $row["event_manipulation"]);
}
return $return;
}
@@ -606,6 +617,111 @@ AND typelem = 0"
return $return;
}
+ /** Get SQL command to create table
+ * @param string
+ * @param bool
+ * @return string
+ */
+ function create_sql($table, $auto_increment) {
+ global $connection;
+ $return = '';
+ $return_parts = array();
+ $sequences = array();
+
+ $status = table_status($table);
+ $fields = fields($table);
+ $indexes = indexes($table);
+ ksort($indexes);
+ $fkeys = foreign_keys($table);
+ ksort($fkeys);
+ $triggers = triggers($table);
+
+ if (!$status || empty($fields)) {
+ return false;
+ }
+
+ $return = "CREATE TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " (\n ";
+
+ // fields' definitions
+ foreach ($fields as $field_name => $field) {
+ $part = idf_escape($field['field']) . ' ' . $field['full_type']
+ . (is_null($field['default']) ? "" : " DEFAULT $field[default]")
+ . ($field['attnotnull'] ? " NOT NULL" : "");
+ $return_parts[] = $part;
+
+ // sequences for fields
+ if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
+ $sequence_name = $matches[1];
+ $sq = reset(get_rows("SELECT * FROM $sequence_name"));
+ $sequences[] = "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value] START " . ($auto_increment ? $sq['last_value'] : 1) . " CACHE $sq[cache_value];";
+ }
+ }
+
+ // adding sequences before table definition
+ if (!empty($sequences)) {
+ $return = implode("\n\n", $sequences) . "\n\n$return";
+ }
+
+ // primary + unique keys
+ foreach ($indexes as $index_name => $index) {
+ switch($index['type']) {
+ case 'UNIQUE': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " UNIQUE (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
+ case 'PRIMARY': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
+ }
+ }
+
+ // foreign keys
+ foreach ($fkeys as $fkey_name => $fkey) {
+ $return_parts[] = "CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE');
+ }
+
+ $return .= implode(",\n ", $return_parts) . "\n) WITH (oids = " . ($status['Oid'] ? 'true' : 'false') . ");";
+
+ // "basic" indexes after table definition
+ foreach ($indexes as $index_name => $index) {
+ if ($index['type'] == 'INDEX') {
+ $return .= "\n\nCREATE INDEX " . idf_escape($index_name) . " ON " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " USING btree (" . implode(', ', array_map('idf_escape', $index['columns'])) . ");";
+ }
+ }
+
+ // coments for table & fields
+ if ($status['Comment']) {
+ $return .= "\n\nCOMMENT ON TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " IS " . q($status['Comment']) . ";";
+ }
+
+ foreach ($fields as $field_name => $field) {
+ if ($field['comment']) {
+ $return .= "\n\nCOMMENT ON COLUMN " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . "." . idf_escape($field_name) . " IS " . q($field['comment']) . ";";
+ }
+ }
+
+ // triggers
+ foreach ($triggers as $trg_id => $trg) {
+ $trigger = trigger($trg_id, $status['Name']);
+ $return .= "\n\nCREATE TRIGGER " . idf_escape($trigger['Trigger']) . " $trigger[Timing] $trigger[Events] ON " . idf_escape($status["nspname"]) . "." . idf_escape($status['Name']) . " $trigger[Type] $trigger[Statement];";
+ }
+
+ return rtrim($return, ';');
+ }
+
+ /** Get SQL commands to create triggers
+ * @param string
+ * @param string
+ * @return string
+ */
+ //@TODO
+ function trigger_sql($table, $style) {
+ $return = "";
+ //foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\")), null, "-- ") as $row) {
+ // $return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
+ // . "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
+ //}
+ //return $return;
+
+ return false;
+ }
+
+
function use_sql($database) {
return "\connect " . idf_escape($database);
}
@@ -631,11 +747,15 @@ AND typelem = 0"
function support($feature) {
global $connection;
- return preg_match('~^(database|table|columns|sql|indexes|comment|view|' . ($connection->server_info >= 9.3 ? 'materializedview|' : '') . 'scheme|processlist|sequence|trigger|type|variables|drop_col|kill)$~', $feature); //! routine|
+ return preg_match('~^(database|table|columns|sql|indexes|comment|view|' . ($connection->server_info >= 9.3 ? 'materializedview|' : '') . 'scheme|processlist|sequence|trigger|type|variables|drop_col|kill|dump)$~', $feature); //! routine|
}
function kill_process($val) {
- return queries("SELECT pg_terminate_backend(" . number($val).")");
+ return queries("SELECT pg_terminate_backend(" . number($val) . ")");
+ }
+
+ function connection_id(){
+ return "SELECT pg_backend_pid()";
}
function max_connections() {
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/simpledb.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/simpledb.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/simpledb.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/simpledb.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/drivers/sqlite.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/sqlite.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/drivers/sqlite.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/drivers/sqlite.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/dump.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/dump.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/dump.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/dump.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/edit.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/edit.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/edit.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/edit.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/event.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/event.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/event.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/event.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/file.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/file.inc.php
old mode 100755
new mode 100644
similarity index 80%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/file.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/file.inc.php
index 219fac01..1a561037
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/file.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/file.inc.php
@@ -6,6 +6,7 @@ if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Cache-Control: immutable");
if ($_GET["file"] == "favicon.ico") {
header("Content-Type: image/x-icon");
@@ -18,7 +19,7 @@ if ($_GET["file"] == "favicon.ico") {
echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
} elseif ($_GET["file"] == "jush.js") {
header("Content-Type: text/javascript; charset=utf-8");
- echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+ echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
} else {
header("Content-Type: image/gif");
switch ($_GET["file"]) {
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/foreign.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/foreign.inc.php
old mode 100755
new mode 100644
similarity index 87%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/foreign.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/foreign.inc.php
index bad28c2b..07602db4
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/foreign.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/foreign.inc.php
@@ -7,13 +7,15 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-
$message = ($_POST["drop"] ? lang('Foreign key has been dropped.') : ($name != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.')));
$location = ME . "table=" . urlencode($TABLE);
- $row["source"] = array_filter($row["source"], 'strlen');
- ksort($row["source"]); // enforce input order
- $target = array();
- foreach ($row["source"] as $key => $val) {
- $target[$key] = $row["target"][$key];
+ if (!$_POST["drop"]) {
+ $row["source"] = array_filter($row["source"], 'strlen');
+ ksort($row["source"]); // enforce input order
+ $target = array();
+ foreach ($row["source"] as $key => $val) {
+ $target[$key] = $row["target"][$key];
+ }
+ $row["target"] = $target;
}
- $row["target"] = $target;
if ($jush == "sqlite") {
queries_redirect($location, $message, recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($_POST["drop"] ? "" : " " . format_foreign_key($row)))));
@@ -60,13 +62,13 @@ $referencable = array_keys(array_filter(table_status('', true), 'fk_support'));
-";
- echo "" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow(this);" : 1));
- echo " " . html_select("target[" . (+$key) . "]", $target, $row["target"][$key]);
+ echo " " . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow(this);" : 1), "label-source");
+ echo " " . html_select("target[" . (+$key) . "]", $target, $row["target"][$key], 1, "label-target");
$j++;
}
?>
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/include/adminer.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/include/adminer.inc.php
old mode 100755
new mode 100644
similarity index 92%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/include/adminer.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/include/adminer.inc.php
index 4b861248..d8a672dd
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/include/adminer.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/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;
}
@@ -197,6 +197,15 @@ focus(document.getElementById('username'));
;
}
+ /** Query printed in SQL command before execution
+ * @param string query to be executed
+ * @return string escaped query to be printed
+ */
+ function sqlCommandQuery($query)
+ {
+ return shorten_utf8(trim($query), 1000);
+ }
+
/** Description of a row in a table
* @param string
* @return string SQL expression, empty string for no description
@@ -232,7 +241,10 @@ focus(document.getElementById('username'));
function selectVal($val, $link, $field, $original) {
$return = ($val === null ? "NULL " : (preg_match("~char|binary~", $field["type"]) && !preg_match("~var~", $field["type"]) ? "$val" : $val));
if (preg_match('~blob|bytea|raw|file~', $field["type"]) && !is_utf8($val)) {
- $return = lang('%d byte(s)', strlen($original));
+ $return = "" . lang('%d byte(s)', strlen($original)) . " ";
+ }
+ if (preg_match('~json~', $field["type"])) {
+ $return = "$return";
}
return ($link ? "$return " : $return);
}
@@ -246,6 +258,45 @@ focus(document.getElementById('username'));
return $val;
}
+ /** Print table structure in tabular format
+ * @param array data about individual fields
+ * @return null
+ */
+ function tableStructurePrint($fields) {
+ echo "\n";
+ echo "" . lang('Column') . " " . lang('Type') . (support("comment") ? " " . lang('Comment') : "") . " " . h($field["field"]);
+ echo " " . h($field["full_type"]) . " ";
+ echo ($field["null"] ? " NULL " : "");
+ echo ($field["auto_increment"] ? " " . lang('Auto Increment') . " " : "");
+ echo (isset($field["default"]) ? " [" . h($field["default"]) . " ] " : "");
+ echo (support("comment") ? "" . nbsp($field["comment"]) : "");
+ echo "\n";
+ }
+ echo "
\n";
+ }
+
+ /** Print list of indexes on table in tabular format
+ * @param array data about all indexes on a table
+ * @return null
+ */
+ function tableIndexesPrint($indexes) {
+ echo "\n";
+ foreach ($indexes as $name => $index) {
+ ksort($index["columns"]); // enforce correct columns order
+ $print = array();
+ foreach ($index["columns"] as $key => $val) {
+ $print[] = "" . h($val) . " "
+ . ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
+ . ($index["descs"][$key] ? " DESC" : "")
+ ;
+ }
+ echo "$index[type] " . implode(", ", $print) . "\n";
+ }
+ echo "
\n";
+ }
+
/** Print columns box in select
* @param array result of selectColumnsProcess()[0]
* @param array selectable columns
@@ -352,8 +403,9 @@ focus(document.getElementById('username'));
echo "var indexColumns = ";
$columns = array();
foreach ($indexes as $index) {
- if ($index["type"] != "FULLTEXT") {
- $columns[reset($index["columns"])] = 1;
+ $current_key = reset($index["columns"]);
+ if ($index["type"] != "FULLTEXT" && $current_key) {
+ $columns[$current_key] = 1;
}
}
$columns[""] = 1;
@@ -806,11 +858,14 @@ focus(document.getElementById('username'));
$connection->select_db(DB);
$tables = table_status('', true);
}
- if (support("sql")) {
- ?>
+ ?>
+
+
-
-
-
-
+
@@ -138,5 +136,5 @@ function page_footer($missing = "") {
-
+/* devilbox edit */ echo loadClass('Html')->getFooter(); error_reporting(6135);
+}
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/include/driver.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/include/driver.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/include/driver.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/include/driver.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/include/editing.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/include/editing.inc.php
old mode 100755
new mode 100644
similarity index 92%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/include/editing.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/include/editing.inc.php
index 230b3960..715d7f3e
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/include/editing.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/include/editing.inc.php
@@ -141,7 +141,7 @@ function edit_type($key, $field, $collations, $foreign_keys = array()) {
global $structured_types, $types, $unsigned, $on_actions;
$type = $field["type"];
?>
- > aria-labelledby="label-type">
-(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '';
echo ($unsigned ? "' . optionlist($unsigned, $field["unsigned"]) . ' ' . optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), $field["on_update"]) . ' ' : '');
@@ -238,20 +238,20 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
?>
-
-
-
-
+
+
+
+
- NULL
- AI NULL
+AI "example-auto-increment.html",
'sqlite' => "autoinc.html",
'pgsql' => "datatype.html#DATATYPE-SERIAL",
'mssql' => "ms186775.aspx",
)); ?>
-
-" . lang('Comment') : ""); ?>
+
+" . lang('Comment') : ""); ?>
"; ?>
>
" . html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]) : ""); ?>
-
-
+ " . optionlist($options, $value) . " ";
+ return "" . optionlist($options, $value) . " ";
}
$return = "";
foreach ($options as $key => $val) {
@@ -237,7 +243,7 @@ function json_row($key, $val = null) {
echo "{";
}
if ($key != "") {
- echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'undefined');
+ echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
$first = false;
} else {
echo "\n}\n";
@@ -406,10 +412,10 @@ function where($where, $fields = array()) {
$key = bracket_escape($key, 1); // 1 - back
$column = escape_key($key);
$return[] = $column
- . (($jush == "sql" && preg_match('~^[0-9]*\\.[0-9]*$~', $val)) || $jush == "mssql"
- ? " LIKE " . q(addcslashes($val, "%_\\"))
+ . ($jush == "sql" && preg_match('~^[0-9]*\\.[0-9]*$~', $val) ? " LIKE " . q(addcslashes($val, "%_\\"))
+ : ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val))
: " = " . unconvert_field($fields[$key], q($val))
- ) // LIKE because of floats but slow with ints, in MS SQL because of text
+ )) // LIKE because of floats but slow with ints, in MS SQL because of text
; //! 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
$return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
@@ -471,18 +477,12 @@ function convert_fields($columns, $fields, $select = array()) {
*/
function cookie($name, $value, $lifetime = 2592000) { // 2592000 - 30 days
global $HTTPS;
- $params = array(
- $name,
- (preg_match("~\n~", $value) ? "" : $value), // HTTP Response Splitting protection in PHP < 5.1.2
- ($lifetime ? time() + $lifetime : 0),
- preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]),
- "",
- $HTTPS
- );
- if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
- $params[] = true; // HttpOnly
- }
- return call_user_func_array('setcookie', $params);
+ return header("Set-Cookie: $name=" . urlencode($value)
+ . ($lifetime ? "; expires=" . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT" : "")
+ . "; path=" . preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"])
+ . ($HTTPS ? "; secure" : "")
+ . "; HttpOnly; SameSite=lax",
+ false);
}
/** Restart stopped session
@@ -744,7 +744,7 @@ function is_utf8($val) {
* @return string escaped string with appended ...
*/
function shorten_utf8($string, $length = 80, $suffix = "") {
- if (!preg_match("(^(" . repeat_pattern("[\t\r\n -\x{FFFF}]", $length) . ")($)?)u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions, (.|\n) is slow
+ if (!preg_match("(^(" . repeat_pattern("[\t\r\n -\x{10FFFF}]", $length) . ")($)?)u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions, (.|\n) is slow
preg_match("(^(" . repeat_pattern("[\t\r\n -~]", $length) . ")($)?)", $string, $match);
}
return h($match[1]) . $suffix . (isset($match[2]) ? "" : "... ");
@@ -884,6 +884,9 @@ function input($field, $value, $function) {
$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
if ($input != "") {
echo $input;
+ } elseif (preg_match('~bool~', $field["type"])) {
+ echo "" . h($value) . '';
- } elseif ($function == "json") {
+ } elseif ($function == "json" || preg_match('~^jsonb?$~', $field["type"])) {
echo "" . h($value) . '';
} else {
// int(3) is only a display hint
@@ -911,8 +914,8 @@ function input($field, $value, $function) {
}
// type='date' and type='time' display localized value which may be confusing, type='datetime' uses 'T' as date and time separator
echo " 20 ? " size='40'" : "")
. "$attrs>"
;
@@ -1135,7 +1138,7 @@ function select_value($val, $link, $field, $text_length) {
$link = "mailto:$val";
}
if ($protocol = is_url($val)) {
- $link = (($protocol == "http" && $HTTPS) || preg_match('~WebKit~i', $_SERVER["HTTP_USER_AGENT"]) // WebKit supports noreferrer since 2009
+ $link = (($protocol == "http" && $HTTPS) || preg_match('~WebKit|Firefox~i', $_SERVER["HTTP_USER_AGENT"]) // WebKit supports noreferrer since 2009, Firefox since version 38
? $val // HTTP links from HTTPS pages don't receive Referer automatically
: "https://www.adminer.org/redirect/?url=" . urlencode($val) // intermediate page to hide Referer
);
@@ -1181,7 +1184,7 @@ function is_url($string) {
* @return bool
*/
function is_shortable($field) {
- return preg_match('~char|text|lob|geometry|point|linestring|polygon|string~', $field["type"]);
+ return preg_match('~char|text|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
}
/** Get query to compute number of found rows
@@ -1209,7 +1212,7 @@ function slow_query($query) {
$db = $adminer->database();
$timeout = $adminer->queryTimeout();
if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
- $kill = $connection2->result("SELECT CONNECTION_ID()"); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
+ $kill = $connection2->result(connection_id()); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
?>
\n");
+ echo ($_POST ? "" : "\n");
echo "$execute\n";
echo lang('Limit rows') . ":
\n";
- echo "" . lang('Column') . " " . lang('Type') . (support("comment") ? " " . lang('Comment') : "") . " " . h($field["field"]);
- echo " " . h($field["full_type"]) . " ";
- echo ($field["null"] ? " NULL " : "");
- echo ($field["auto_increment"] ? " " . lang('Auto Increment') . " " : "");
- echo (isset($field["default"]) ? " [" . h($field["default"]) . " ] " : "");
- echo (support("comment") ? "" . nbsp($field["comment"]) : "");
- echo "\n";
- }
- echo "
\n";
+ $adminer->tableStructurePrint($fields);
}
if (!is_view($table_status)) {
@@ -34,19 +23,7 @@ if (!is_view($table_status)) {
echo "" . lang('Indexes') . " \n";
$indexes = indexes($TABLE);
if ($indexes) {
- echo "\n";
- foreach ($indexes as $name => $index) {
- ksort($index["columns"]); // enforce correct columns order
- $print = array();
- foreach ($index["columns"] as $key => $val) {
- $print[] = "" . h($val) . " "
- . ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
- . ($index["descs"][$key] ? " DESC" : "")
- ;
- }
- echo "$index[type] " . implode(", ", $print) . "\n";
- }
- echo "
\n";
+ $adminer->tableIndexesPrint($indexes);
}
echo '' . lang('Alter indexes') . " \n";
}
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/trigger.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/trigger.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/trigger.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/trigger.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/type.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/type.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/type.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/type.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/user.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/user.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/user.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/user.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/variables.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/variables.inc.php
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/variables.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/variables.inc.php
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/view.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/view.inc.php
old mode 100755
new mode 100644
similarity index 76%
rename from .devilbox/www/htdocs/vendor/adminer/adminer/view.inc.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/view.inc.php
index 3bc38bfe..9c09a546
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/view.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/view.inc.php
@@ -1,6 +1,11 @@
:
\n";
- echo '' . lang('Table') . ' ' . lang('Rows') . " ' . lang('Table') . ' ' . lang('Rows') . " value
* @link https://www.adminer.org/plugins/#use
-* @author Jakub Vrana, http://www.vrana.cz/
+* @author Jakub Vrana, https://www.vrana.cz/
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/
diff --git a/.devilbox/www/htdocs/vendor/adminer/plugins/dump-zip.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/dump-zip.php
old mode 100755
new mode 100644
similarity index 96%
rename from .devilbox/www/htdocs/vendor/adminer/plugins/dump-zip.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/dump-zip.php
index d1c4f276..cff25dd3
--- a/.devilbox/www/htdocs/vendor/adminer/plugins/dump-zip.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/dump-zip.php
@@ -3,7 +3,7 @@
/** Dump to ZIP format
* @link https://www.adminer.org/plugins/#use
* @uses ZipArchive, tempnam("")
-* @author Jakub Vrana, http://www.vrana.cz/
+* @author Jakub Vrana, https://www.vrana.cz/
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/
diff --git a/.devilbox/www/htdocs/vendor/adminer/plugins/edit-calendar.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/edit-calendar.php
old mode 100755
new mode 100644
similarity index 87%
rename from .devilbox/www/htdocs/vendor/adminer/plugins/edit-calendar.php
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/edit-calendar.php
index ea8dd11c..c485af3d
--- a/.devilbox/www/htdocs/vendor/adminer/plugins/edit-calendar.php
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/edit-calendar.php
@@ -4,7 +4,7 @@
* @link https://www.adminer.org/plugins/#use
* @uses jQuery-Timepicker, http://trentrichardson.com/examples/timepicker/
* @uses jQuery UI: core, widget, mouse, slider, datepicker
-* @author Jakub Vrana, http://www.vrana.cz/
+* @author Jakub Vrana, https://www.vrana.cz/
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/
@@ -36,8 +36,8 @@ class AdminerEditCalendar {
function editInput($table, $field, $attrs, $value) {
if (preg_match("~date|time~", $field["type"])) {
$dateFormat = "changeYear: true, dateFormat: 'yy-mm-dd'"; //! yy-mm-dd regional
- $timeFormat = "showSecond: true, timeFormat: 'hh:mm:ss'";
- return "" . lang('Name') . " " . lang('Type') . " " . lang('Columns') . " " . h($name) . " " . $index['type'];
+ ksort($index["columns"]); // enforce correct columns order
+ $print = array();
+ foreach ($index["columns"] as $key => $val) {
+ $print[] = "" . h($val) . " "
+ . ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
+ . ($index["descs"][$key] ? " DESC" : "")
+ ;
+ }
+ echo " " . implode(", ", $print) . "\n";
+ }
+ echo "
\n";
+ return true;
+ }
+}
diff --git a/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/table-structure.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/table-structure.php
new file mode 100644
index 00000000..5d8e5c05
--- /dev/null
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/table-structure.php
@@ -0,0 +1,31 @@
+\n";
+ echo "" . lang('Column') . " " . lang('Type') . " " . lang('Nullable') . " " . lang('Default') . (support("comment") ? " " . lang('Comment') : "") . " " . h($field["field"]) . ($field["primary"] ? " (PRIMARY)" : "");
+ echo " " . h($field["full_type"]) . " ";
+ echo ($field["auto_increment"] ? " " . lang('Auto Increment') . " " : "");
+ echo ($field["collation"] ? " " . h($field["collation"]) . " " : "");
+ echo "" . ($field["null"] ? lang('Yes') : lang('No'));
+ echo " " . (isset($field["default"]) ? h($field["default"]) : " ");
+ echo (support("comment") ? " " . nbsp($field["comment"]) : "");
+ echo "\n";
+ }
+ echo "
\n";
+ return true;
+ }
+}
diff --git a/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/tables-filter.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/tables-filter.php
new file mode 100644
index 00000000..115d2a29
--- /dev/null
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/tables-filter.php
@@ -0,0 +1,68 @@
+
+
+ $type) {
+ echo '".lang('select')." ";
+ echo '".h($table)."
clickAndWait
- link=Create new database
+ link=Create database
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/10-clone.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/10-clone.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/10-clone.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/10-clone.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/11-reference.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/11-reference.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/11-reference.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/11-reference.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/12-update.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/12-update.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/12-update.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/12-update.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/13-delete.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/13-delete.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/13-delete.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/13-delete.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/14-truncate.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/14-truncate.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/14-truncate.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/14-truncate.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/15-privileges.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/15-privileges.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/15-privileges.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/15-privileges.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/16-processlist.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/16-processlist.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/16-processlist.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/16-processlist.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/17-export.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/17-export.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/17-export.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/17-export.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/18-events.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/18-events.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/18-events.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/18-events.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/19-procedures.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/19-procedures.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/19-procedures.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/19-procedures.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/2-create-table.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/2-create-table.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/2-create-table.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/2-create-table.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/20-partitioning.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/20-partitioning.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/20-partitioning.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/20-partitioning.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/21-variables.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/21-variables.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/21-variables.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/21-variables.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/22-history.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/22-history.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/22-history.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/22-history.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/23-editor.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/23-editor.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/23-editor.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/23-editor.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/24-explain.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/24-explain.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/24-explain.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/24-explain.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/3-create-index.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/3-create-index.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/3-create-index.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/3-create-index.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/4-create-table-2.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/4-create-table-2.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/4-create-table-2.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/4-create-table-2.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/5-foreign-key.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/5-foreign-key.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/5-foreign-key.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/5-foreign-key.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/6-alter-table.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/6-alter-table.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/6-alter-table.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/6-alter-table.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/7-create-trigger.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/7-create-trigger.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/7-create-trigger.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/7-create-trigger.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/8-create-view.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/8-create-view.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/8-create-view.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/8-create-view.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/9-insert.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/9-insert.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/9-insert.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/9-insert.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/iexplore.bat b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/iexplore.bat
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/iexplore.bat
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/iexplore.bat
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/logout.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/logout.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/logout.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/logout.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/tests/selenium.html b/.devilbox/www/htdocs/vendor/adminer-4.3.1/tests/selenium.html
old mode 100755
new mode 100644
similarity index 100%
rename from .devilbox/www/htdocs/vendor/adminer/tests/selenium.html
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/tests/selenium.html
diff --git a/.devilbox/www/htdocs/vendor/adminer/todo.txt b/.devilbox/www/htdocs/vendor/adminer-4.3.1/todo.txt
old mode 100755
new mode 100644
similarity index 98%
rename from .devilbox/www/htdocs/vendor/adminer/todo.txt
rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/todo.txt
index 9661f6a0..bd43359e
--- a/.devilbox/www/htdocs/vendor/adminer/todo.txt
+++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/todo.txt
@@ -20,6 +20,7 @@ Joining tables - PRIMARY KEY (table, joining)
Rank, Tree structure
MySQL:
+Generated columns (MySQL >= 5.7.6)
Data longer than max_allowed_packet can be sent by mysqli_stmt_send_long_data()
SQLite:
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/include/version.inc.php b/.devilbox/www/htdocs/vendor/adminer/adminer/include/version.inc.php
deleted file mode 100755
index 03606df1..00000000
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/include/version.inc.php
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
-" . lang('select') . " ";
- echo '" . h($table) . "