From 4b0277a30dd53f263440a5aec42f74bcb7aaecd2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 7 May 2017 19:54:08 +0200 Subject: [PATCH] REL-0.9 Updating Adminer to latest version --- .devilbox/www/htdocs/assets/css/custom.css | 13 + .../htdocs/vendor/adminer-4.3.1/.travis.yml | 5 + .../adminer/call.inc.php | 2 +- .../adminer/create.inc.php | 1 - .../adminer/database.inc.php | 0 .../adminer/db.inc.php | 13 +- .../adminer/download.inc.php | 0 .../adminer/drivers/elastic.inc.php | 9 +- .../adminer/drivers/firebird.inc.php | 0 .../adminer/drivers/mongo.inc.php | 0 .../adminer/drivers/mssql.inc.php | 27 +- .../adminer/drivers/mysql.inc.php | 31 +- .../adminer/drivers/oracle.inc.php | 0 .../adminer/drivers/pgsql.inc.php | 154 +++- .../adminer/drivers/simpledb.inc.php | 0 .../adminer/drivers/sqlite.inc.php | 0 .../adminer/dump.inc.php | 0 .../adminer/edit.inc.php | 0 .../adminer/event.inc.php | 0 .../adminer/file.inc.php | 3 +- .../adminer/foreign.inc.php | 20 +- .../adminer/include/adminer.inc.php | 76 +- .../adminer/include/auth.inc.php | 3 +- .../adminer/include/bootstrap.inc.php | 0 .../adminer/include/connect.inc.php | 10 +- .../adminer/include/coverage.inc.php | 0 .../adminer/include/design.inc.php | 12 +- .../adminer/include/driver.inc.php | 0 .../adminer/include/editing.inc.php | 41 +- .../adminer/include/functions.inc.php | 57 +- .../adminer/include/lang.inc.php | 2 +- .../adminer/include/pdo.inc.php | 4 +- .../adminer/include/tmpfile.inc.php | 0 .../adminer/include/version.inc.php | 2 + .../adminer/include/xxtea.inc.php | 0 .../adminer/index.php | 6 +- .../adminer/indexes.inc.php | 17 +- .../adminer/lang/ar.inc.php | 1 - .../adminer/lang/bg.inc.php | 4 +- .../adminer/lang/bn.inc.php | 1 - .../adminer/lang/bs.inc.php | 1 - .../adminer/lang/ca.inc.php | 1 - .../adminer/lang/cs.inc.php | 14 +- .../adminer/lang/da.inc.php | 1 - .../adminer/lang/de.inc.php | 1 - .../adminer/lang/el.inc.php | 4 +- .../adminer/lang/en.inc.php | 0 .../adminer/lang/es.inc.php | 1 - .../adminer/lang/et.inc.php | 1 - .../adminer/lang/fa.inc.php | 4 +- .../adminer/lang/fi.inc.php | 4 +- .../adminer/lang/fr.inc.php | 4 +- .../adminer/lang/gl.inc.php | 4 +- .../adminer/lang/hu.inc.php | 1 - .../adminer/lang/id.inc.php | 99 ++- .../adminer/lang/it.inc.php | 1 - .../adminer/lang/ja.inc.php | 1 - .../adminer/lang/ko.inc.php | 1 - .../adminer/lang/lt.inc.php | 1 - .../adminer/lang/nl.inc.php | 3 +- .../adminer/lang/no.inc.php | 1 - .../adminer/lang/pl.inc.php | 4 +- .../adminer/lang/pt-br.inc.php | 1 - .../adminer/lang/pt.inc.php | 1 - .../adminer/lang/ro.inc.php | 1 - .../adminer/lang/ru.inc.php | 61 +- .../adminer/lang/sk.inc.php | 1 - .../adminer/lang/sl.inc.php | 1 - .../adminer/lang/sr.inc.php | 1 - .../adminer/lang/ta.inc.php | 1 - .../adminer/lang/th.inc.php | 1 - .../adminer/lang/tr.inc.php | 1 - .../adminer/lang/uk.inc.php | 1 - .../adminer/lang/vi.inc.php | 1 - .../adminer/lang/xx.inc.php | 10 +- .../adminer/lang/zh-tw.inc.php | 1 - .../adminer/lang/zh.inc.php | 1 - .../adminer/plugin.php | 0 .../adminer/privileges.inc.php | 4 +- .../adminer/procedure.inc.php | 0 .../adminer/processlist.inc.php | 0 .../adminer-4.3.1/adminer/replication.inc.php | 30 + .../adminer/schema.inc.php | 0 .../adminer/scheme.inc.php | 0 .../adminer/script.inc.php | 0 .../adminer/select.inc.php | 7 +- .../adminer/sequence.inc.php | 0 .../adminer/sql.inc.php | 4 +- .../vendor/adminer-4.3.1/adminer/sqlite.php | 8 + .../adminer/static/arrow.gif | Bin .../adminer/static/cross.gif | Bin .../adminer/static/default.css | 8 +- .../adminer/static/down.gif | Bin .../adminer/static/editing.js | 16 + .../adminer/static/favicon.ico | Bin .../adminer/static/functions.js | 21 +- .../adminer/static/plus.gif | Bin .../adminer/static/up.gif | Bin .../adminer/table.inc.php | 29 +- .../adminer/trigger.inc.php | 0 .../adminer/type.inc.php | 0 .../adminer/user.inc.php | 0 .../adminer/variables.inc.php | 0 .../adminer/view.inc.php | 21 +- .../{adminer => adminer-4.3.1}/changes.txt | 20 + .../{adminer => adminer-4.3.1}/compile.php | 10 +- .../{adminer => adminer-4.3.1}/composer.json | 2 +- .../{adminer => adminer-4.3.1}/coverage.php | 0 .../designs/brade/adminer.css | 2 +- .../designs/bueltge/adminer.css | 2 +- .../designs/cvicebni-ubor/adminer.css | 5 +- .../adminer-4.3.1/designs/flat/adminer.css | 108 +++ .../designs/galkaev/adminer.css | 2 +- .../designs/haeckel/adminer.css | 11 +- .../designs/hever/adminer.css | 6 +- .../designs/jukin/adminer.css | 7 +- .../designs/kahi/adminer.css | 0 .../designs/konya/adminer.css | 2 +- .../designs/lucas-sandery/adminer.css | 709 ++++++++++++++++++ .../designs/nette/adminer.css | 2 +- .../designs/ng9/adminer.css | 0 .../designs/nicu/adminer.css | 2 +- .../designs/pappu687/adminer.css | 16 +- .../designs/paranoiq/adminer.css | 6 +- .../designs/pepa-linha/adminer.css | 6 +- .../designs/pilot/adminer.css | 15 +- .../designs/pokorny/adminer.css | 7 +- .../designs/price/adminer.css | 10 +- .../designs/readme.txt | 0 .../editor/db.inc.php | 2 +- .../editor/example.php | 0 .../editor/include/adminer.inc.php | 0 .../editor/include/connect.inc.php | 0 .../editor/include/editing.inc.php | 0 .../editor/index.php | 2 +- .../editor/script.inc.php | 0 .../editor/static/editing.js | 0 .../externals/JsShrink/jsShrink.php | 0 .../externals/jush/jush.css | 0 .../externals/jush/modules/jush-cnf.js | 0 .../externals/jush/modules/jush-css.js | 0 .../externals/jush/modules/jush-htm.js | 0 .../externals/jush/modules/jush-http.js | 0 .../externals/jush/modules/jush-js.js | 19 +- .../externals/jush/modules/jush-mssql.js | 0 .../externals/jush/modules/jush-oracle.js | 0 .../externals/jush/modules/jush-pgsql.js | 0 .../externals/jush/modules/jush-php.js | 0 .../externals/jush/modules/jush-simpledb.js | 0 .../externals/jush/modules/jush-sql.js | 0 .../externals/jush/modules/jush-sqlite.js | 0 .../externals/jush/modules/jush-textarea.js | 2 +- .../externals/jush/modules/jush-txt.js | 0 .../externals/jush/modules/jush.js | 0 .../{adminer => adminer-4.3.1}/lang.php | 0 .../plugins/database-hide.php | 2 +- .../plugins/dump-alter.php | 2 +- .../plugins/dump-bz2.php | 2 +- .../plugins/dump-date.php | 2 +- .../plugins/dump-json.php | 2 +- .../plugins/dump-php.php | 0 .../plugins/dump-xml.php | 2 +- .../plugins/dump-zip.php | 2 +- .../plugins/edit-calendar.php | 6 +- .../plugins/edit-foreign.php | 8 +- .../plugins/edit-textarea.php | 2 +- .../plugins/email-table.php | 2 +- .../plugins/enum-option.php | 2 +- .../adminer-4.3.1/plugins/enum-types.php | 50 ++ .../plugins/file-upload.php | 2 +- .../plugins/foreign-system.php | 2 +- .../plugins/frames.php | 2 +- .../plugins/json-column.php | 2 +- .../plugins/links-direct.php | 2 +- .../plugins/login-servers.php | 2 +- .../adminer-4.3.1/plugins/login-sqlite.php | 36 + .../plugins/login-table.php | 2 +- .../plugins/master-slave.php | 2 +- .../plugins/plugin.php | 17 +- .../plugins/readme.txt | 0 .../plugins/slugify.php | 2 +- .../plugins/sql-log.php | 10 +- .../adminer-4.3.1/plugins/struct-comments.php | 14 + .../plugins/table-indexes-structure.php | 33 + .../adminer-4.3.1/plugins/table-structure.php | 31 + .../adminer-4.3.1/plugins/tables-filter.php | 68 ++ .../plugins/tinymce.php | 2 +- .../plugins/translation.php | 2 +- .../plugins/version-noverify.php | 2 +- .../plugins/wymeditor.php | 2 +- .../{adminer => adminer-4.3.1}/readme.txt | 3 +- .../tests/0-login.html | 0 .../tests/1-create-database.html | 2 +- .../tests/10-clone.html | 0 .../tests/11-reference.html | 0 .../tests/12-update.html | 0 .../tests/13-delete.html | 0 .../tests/14-truncate.html | 0 .../tests/15-privileges.html | 0 .../tests/16-processlist.html | 0 .../tests/17-export.html | 0 .../tests/18-events.html | 0 .../tests/19-procedures.html | 0 .../tests/2-create-table.html | 0 .../tests/20-partitioning.html | 0 .../tests/21-variables.html | 0 .../tests/22-history.html | 0 .../tests/23-editor.html | 0 .../tests/24-explain.html | 0 .../tests/3-create-index.html | 0 .../tests/4-create-table-2.html | 0 .../tests/5-foreign-key.html | 0 .../tests/6-alter-table.html | 0 .../tests/7-create-trigger.html | 0 .../tests/8-create-view.html | 0 .../tests/9-insert.html | 0 .../tests/iexplore.bat | 0 .../tests/logout.html | 0 .../tests/selenium.html | 0 .../{adminer => adminer-4.3.1}/todo.txt | 1 + .../adminer/adminer/include/version.inc.php | 2 - .../vendor/adminer/plugins/tables-filter.php | 34 - .devilbox/www/include/navbar.php | 2 +- 223 files changed, 1802 insertions(+), 434 deletions(-) create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/.travis.yml rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/call.inc.php (94%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/create.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/database.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/db.inc.php (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/download.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/elastic.inc.php (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/firebird.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/mongo.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/mssql.inc.php (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/mysql.inc.php (96%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/oracle.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/pgsql.inc.php (75%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/simpledb.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/drivers/sqlite.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/dump.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/edit.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/event.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/file.inc.php (80%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/foreign.inc.php (87%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/adminer.inc.php (92%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/auth.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/bootstrap.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/connect.inc.php (91%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/coverage.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/design.inc.php (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/driver.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/editing.inc.php (92%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/functions.inc.php (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/lang.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/pdo.inc.php (94%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/tmpfile.inc.php (100%) mode change 100755 => 100644 create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/include/version.inc.php rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/include/xxtea.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/index.php (92%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/indexes.inc.php (88%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/ar.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/bg.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/bn.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/bs.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/ca.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/cs.inc.php (96%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/da.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/de.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/el.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/en.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/es.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/et.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/fa.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/fi.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/fr.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/gl.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/hu.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/id.inc.php (80%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/it.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/ja.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/ko.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/lt.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/nl.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/no.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/pl.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/pt-br.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/pt.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/ro.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/ru.inc.php (80%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/sk.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/sl.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/sr.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/ta.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/th.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/tr.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/uk.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/vi.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/xx.inc.php (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/zh-tw.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/lang/zh.inc.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/plugin.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/privileges.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/procedure.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/processlist.inc.php (100%) mode change 100755 => 100644 create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/replication.inc.php rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/schema.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/scheme.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/script.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/select.inc.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/sequence.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/sql.inc.php (98%) mode change 100755 => 100644 create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/sqlite.php rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/arrow.gif (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/cross.gif (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/default.css (93%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/down.gif (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/editing.js (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/favicon.ico (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/functions.js (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/plus.gif (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/static/up.gif (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/table.inc.php (67%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/trigger.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/type.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/user.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/variables.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/adminer/view.inc.php (76%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/changes.txt (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/compile.php (96%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/composer.json (93%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/coverage.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/brade/adminer.css (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/bueltge/adminer.css (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/cvicebni-ubor/adminer.css (98%) mode change 100755 => 100644 create mode 100755 .devilbox/www/htdocs/vendor/adminer-4.3.1/designs/flat/adminer.css rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/galkaev/adminer.css (93%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/haeckel/adminer.css (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/hever/adminer.css (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/jukin/adminer.css (90%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/kahi/adminer.css (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/konya/adminer.css (99%) mode change 100755 => 100644 create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/designs/lucas-sandery/adminer.css rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/nette/adminer.css (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/ng9/adminer.css (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/nicu/adminer.css (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/pappu687/adminer.css (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/paranoiq/adminer.css (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/pepa-linha/adminer.css (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/pilot/adminer.css (82%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/pokorny/adminer.css (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/price/adminer.css (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/designs/readme.txt (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/editor/db.inc.php (90%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/editor/example.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/editor/include/adminer.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/editor/include/connect.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/editor/include/editing.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/editor/index.php (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/editor/script.inc.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/editor/static/editing.js (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/JsShrink/jsShrink.php (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/jush.css (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-cnf.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-css.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-htm.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-http.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-js.js (52%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-mssql.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-oracle.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-pgsql.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-php.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-simpledb.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-sql.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-sqlite.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-textarea.js (98%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush-txt.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/externals/jush/modules/jush.js (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/lang.php (100%) rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/database-hide.php (94%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/dump-alter.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/dump-bz2.php (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/dump-date.php (92%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/dump-json.php (96%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/dump-php.php (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/dump-xml.php (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/dump-zip.php (96%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/edit-calendar.php (87%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/edit-foreign.php (76%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/edit-textarea.php (92%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/email-table.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/enum-option.php (96%) mode change 100755 => 100644 create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/enum-types.php rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/file-upload.php (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/foreign-system.php (99%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/frames.php (93%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/json-column.php (96%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/links-direct.php (91%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/login-servers.php (97%) mode change 100755 => 100644 create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/login-sqlite.php rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/login-table.php (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/master-slave.php (96%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/plugin.php (95%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/readme.txt (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/slugify.php (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/sql-log.php (84%) mode change 100755 => 100644 create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/struct-comments.php create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/table-indexes-structure.php create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/table-structure.php create mode 100644 .devilbox/www/htdocs/vendor/adminer-4.3.1/plugins/tables-filter.php rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/tinymce.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/translation.php (97%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/version-noverify.php (90%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/plugins/wymeditor.php (98%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/readme.txt (85%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/0-login.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/1-create-database.html (96%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/10-clone.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/11-reference.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/12-update.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/13-delete.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/14-truncate.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/15-privileges.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/16-processlist.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/17-export.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/18-events.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/19-procedures.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/2-create-table.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/20-partitioning.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/21-variables.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/22-history.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/23-editor.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/24-explain.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/3-create-index.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/4-create-table-2.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/5-foreign-key.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/6-alter-table.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/7-create-trigger.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/8-create-view.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/9-insert.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/iexplore.bat (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/logout.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/tests/selenium.html (100%) mode change 100755 => 100644 rename .devilbox/www/htdocs/vendor/{adminer => adminer-4.3.1}/todo.txt (98%) mode change 100755 => 100644 delete mode 100755 .devilbox/www/htdocs/vendor/adminer/adminer/include/version.inc.php delete mode 100755 .devilbox/www/htdocs/vendor/adminer/plugins/tables-filter.php diff --git a/.devilbox/www/htdocs/assets/css/custom.css b/.devilbox/www/htdocs/assets/css/custom.css index f9f5973c..0ab85e74 100644 --- a/.devilbox/www/htdocs/assets/css/custom.css +++ b/.devilbox/www/htdocs/assets/css/custom.css @@ -177,3 +177,16 @@ td.break-word { word-break: break-word; } + +/* adminer.php; +-------------------------------------------------- */ +#menu { + position: absolute; + margin: 76px 0 0 !important; +} +#breadcrumb { + top: 60px !important; +} +#lang { + top: 53px !important; +} diff --git a/.devilbox/www/htdocs/vendor/adminer-4.3.1/.travis.yml b/.devilbox/www/htdocs/vendor/adminer-4.3.1/.travis.yml new file mode 100644 index 00000000..f6f3acab --- /dev/null +++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/.travis.yml @@ -0,0 +1,5 @@ +language: php +php: + - '5.3' + - '7.1' +script: git diff --name-only $TRAVIS_COMMIT_RANGE | grep '\.php$' | xargs -n1 -P8 php -l | grep -v 'No syntax errors'; test $? -eq 1 diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/call.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/call.inc.php old mode 100755 new mode 100644 similarity index 94% rename from .devilbox/www/htdocs/vendor/adminer/adminer/call.inc.php rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/call.inc.php index 09592544..cc64027a --- a/.devilbox/www/htdocs/vendor/adminer/adminer/call.inc.php +++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/call.inc.php @@ -29,7 +29,7 @@ if (!$error && $_POST) { $call[] = (isset($out[$key]) ? "@" . idf_escape($field["field"]) : $val); } - $query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . idf_escape($PROCEDURE) . "(" . implode(", ", $call) . ")"; + $query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")"; echo "

" . h($query) . " " . lang('Edit') . "\n"; if (!$connection->multi_query($query)) { diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/create.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/create.inc.php old mode 100755 new mode 100644 similarity index 99% rename from .devilbox/www/htdocs/vendor/adminer/adminer/create.inc.php rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/create.inc.php index 7af80dd8..19ae3f53 --- a/.devilbox/www/htdocs/vendor/adminer/adminer/create.inc.php +++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/create.inc.php @@ -35,7 +35,6 @@ if ($_POST && !process_fields($row["fields"]) && !$error) { $all_fields = array(); $use_all_fields = false; $foreign = array(); - ksort($row["fields"]); $orig_field = reset($orig_fields); $after = " FIRST"; diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/database.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/database.inc.php old mode 100755 new mode 100644 similarity index 100% rename from .devilbox/www/htdocs/vendor/adminer/adminer/database.inc.php rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/database.inc.php diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/db.inc.php b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/db.inc.php old mode 100755 new mode 100644 similarity index 95% rename from .devilbox/www/htdocs/vendor/adminer/adminer/db.inc.php rename to .devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/db.inc.php index 42cfd8fc..36c62737 --- a/.devilbox/www/htdocs/vendor/adminer/adminer/db.inc.php +++ b/.devilbox/www/htdocs/vendor/adminer-4.3.1/adminer/db.inc.php @@ -62,10 +62,9 @@ if ($adminer->homepage()) { search_tables(); } } - echo "\n"; - - echo '
'; $doc_link = doc_link(array('sql' => 'show-table-status.html')); + echo "\n"; + echo ' - + 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 @@ - - -

-\n"; - foreach ($tables as $table => $type) { - echo '" . lang('select') . " "; - echo '" . h($table) . "
\n"; - } - return true; - } - -} diff --git a/.devilbox/www/include/navbar.php b/.devilbox/www/include/navbar.php index 5e78d4b6..9d1571d4 100644 --- a/.devilbox/www/include/navbar.php +++ b/.devilbox/www/include/navbar.php @@ -80,7 +80,7 @@ } $files = array( 'vendor/phpmyadmin-'.$phpmyadmin.'/index.php' => 'phpMyAdmin', - 'vendor/adminer/adminer/index.php' => 'Adminer', + 'vendor/adminer-4.3.1/adminer/index.php' => 'Adminer', 'opcache.php' => 'Opcache GUI' ); $active = (in_array($script, array_keys($files))) ? 'active' : '';

'; echo '' . 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'));
clickAndWaitlink=Create new databaselink=Create database