From e1bc7af8f3f145e40067f1a04ae2a832e5d4da6e Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Sat, 13 Jun 2009 20:55:19 +0000 Subject: [PATCH] Change directory structure git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@682 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- arrow.gif => adminer/arrow.gif | Bin call.inc.php => adminer/call.inc.php | 0 create.inc.php => adminer/create.inc.php | 0 createv.inc.php => adminer/createv.inc.php | 0 cross.gif => adminer/cross.gif | Bin database.inc.php => adminer/database.inc.php | 0 db.inc.php => adminer/db.inc.php | 0 default.css => adminer/default.css | 0 down.gif => adminer/down.gif | Bin download.inc.php => adminer/download.inc.php | 0 dump.inc.php => adminer/dump.inc.php | 0 edit.inc.php => adminer/edit.inc.php | 0 event.inc.php => adminer/event.inc.php | 0 favicon.ico => adminer/favicon.ico | Bin foreign.inc.php => adminer/foreign.inc.php | 0 functions.js => adminer/functions.js | 4 +-- {include => adminer/include}/auth.inc.php | 0 {include => adminer/include}/connect.inc.php | 0 {include => adminer/include}/design.inc.php | 0 {include => adminer/include}/editing.inc.php | 0 {include => adminer/include}/export.inc.php | 0 .../include}/functions.inc.php | 0 {include => adminer/include}/lang.inc.php | 0 {include => adminer/include}/mysql.inc.php | 0 {include => adminer/include}/pdo.inc.php | 0 {include => adminer/include}/sqlite.inc.php | 0 {include => adminer/include}/version.inc.php | 0 index.php => adminer/index.php | 0 indexes.inc.php => adminer/indexes.inc.php | 0 {lang => adminer/lang}/cs.inc.php | 0 {lang => adminer/lang}/de.inc.php | 0 {lang => adminer/lang}/en.inc.php | 0 {lang => adminer/lang}/es.inc.php | 0 {lang => adminer/lang}/et.inc.php | 0 {lang => adminer/lang}/fr.inc.php | 0 {lang => adminer/lang}/it.inc.php | 0 {lang => adminer/lang}/nl.inc.php | 0 {lang => adminer/lang}/ru.inc.php | 0 {lang => adminer/lang}/sk.inc.php | 0 {lang => adminer/lang}/zh.inc.php | 0 plus.gif => adminer/plus.gif | Bin .../privileges.inc.php | 0 .../procedure.inc.php | 0 .../processlist.inc.php | 0 schema.inc.php => adminer/schema.inc.php | 0 select.inc.php => adminer/select.inc.php | 0 sql.inc.php => adminer/sql.inc.php | 0 table.inc.php => adminer/table.inc.php | 0 trigger.inc.php => adminer/trigger.inc.php | 0 up.gif => adminer/up.gif | Bin user.inc.php => adminer/user.inc.php | 0 view.inc.php => adminer/view.inc.php | 0 _compile.php => compile.php | 34 +++++++++--------- _coverage.php => coverage.php | 25 +++++++------ _lang.php => lang.php | 8 ++--- tests/0-login.html | 4 +-- tests/1-create-database.html | 2 +- tests/10-clone.html | 2 +- tests/11-reference.html | 2 +- tests/12-update.html | 2 +- tests/13-delete.html | 2 +- tests/14-truncate.html | 2 +- tests/15-privileges.html | 2 +- tests/16-processlist.html | 2 +- tests/17-export.html | 2 +- tests/18-events.html | 2 +- tests/19-procedures.html | 2 +- tests/2-create-table.html | 2 +- tests/20-partitioning.html | 2 +- tests/3-create-index.html | 2 +- tests/4-create-table-2.html | 2 +- tests/5-foreign-key.html | 2 +- tests/6-alter-table.html | 2 +- tests/7-create-trigger.html | 2 +- tests/8-create-view.html | 2 +- tests/9-insert.html | 4 +-- tests/logout.html | 4 +-- 77 files changed, 60 insertions(+), 61 deletions(-) rename arrow.gif => adminer/arrow.gif (100%) rename call.inc.php => adminer/call.inc.php (100%) rename create.inc.php => adminer/create.inc.php (100%) rename createv.inc.php => adminer/createv.inc.php (100%) rename cross.gif => adminer/cross.gif (100%) rename database.inc.php => adminer/database.inc.php (100%) rename db.inc.php => adminer/db.inc.php (100%) rename default.css => adminer/default.css (100%) rename down.gif => adminer/down.gif (100%) rename download.inc.php => adminer/download.inc.php (100%) rename dump.inc.php => adminer/dump.inc.php (100%) rename edit.inc.php => adminer/edit.inc.php (100%) rename event.inc.php => adminer/event.inc.php (100%) rename favicon.ico => adminer/favicon.ico (100%) rename foreign.inc.php => adminer/foreign.inc.php (100%) rename functions.js => adminer/functions.js (98%) rename {include => adminer/include}/auth.inc.php (100%) rename {include => adminer/include}/connect.inc.php (100%) rename {include => adminer/include}/design.inc.php (100%) rename {include => adminer/include}/editing.inc.php (100%) rename {include => adminer/include}/export.inc.php (100%) rename {include => adminer/include}/functions.inc.php (100%) rename {include => adminer/include}/lang.inc.php (100%) rename {include => adminer/include}/mysql.inc.php (100%) rename {include => adminer/include}/pdo.inc.php (100%) rename {include => adminer/include}/sqlite.inc.php (100%) rename {include => adminer/include}/version.inc.php (100%) rename index.php => adminer/index.php (100%) rename indexes.inc.php => adminer/indexes.inc.php (100%) rename {lang => adminer/lang}/cs.inc.php (100%) rename {lang => adminer/lang}/de.inc.php (100%) rename {lang => adminer/lang}/en.inc.php (100%) rename {lang => adminer/lang}/es.inc.php (100%) rename {lang => adminer/lang}/et.inc.php (100%) rename {lang => adminer/lang}/fr.inc.php (100%) rename {lang => adminer/lang}/it.inc.php (100%) rename {lang => adminer/lang}/nl.inc.php (100%) rename {lang => adminer/lang}/ru.inc.php (100%) rename {lang => adminer/lang}/sk.inc.php (100%) rename {lang => adminer/lang}/zh.inc.php (100%) rename plus.gif => adminer/plus.gif (100%) rename privileges.inc.php => adminer/privileges.inc.php (100%) rename procedure.inc.php => adminer/procedure.inc.php (100%) rename processlist.inc.php => adminer/processlist.inc.php (100%) rename schema.inc.php => adminer/schema.inc.php (100%) rename select.inc.php => adminer/select.inc.php (100%) rename sql.inc.php => adminer/sql.inc.php (100%) rename table.inc.php => adminer/table.inc.php (100%) rename trigger.inc.php => adminer/trigger.inc.php (100%) rename up.gif => adminer/up.gif (100%) rename user.inc.php => adminer/user.inc.php (100%) rename view.inc.php => adminer/view.inc.php (100%) rename _compile.php => compile.php (86%) rename _coverage.php => coverage.php (69%) rename _lang.php => lang.php (71%) diff --git a/arrow.gif b/adminer/arrow.gif similarity index 100% rename from arrow.gif rename to adminer/arrow.gif diff --git a/call.inc.php b/adminer/call.inc.php similarity index 100% rename from call.inc.php rename to adminer/call.inc.php diff --git a/create.inc.php b/adminer/create.inc.php similarity index 100% rename from create.inc.php rename to adminer/create.inc.php diff --git a/createv.inc.php b/adminer/createv.inc.php similarity index 100% rename from createv.inc.php rename to adminer/createv.inc.php diff --git a/cross.gif b/adminer/cross.gif similarity index 100% rename from cross.gif rename to adminer/cross.gif diff --git a/database.inc.php b/adminer/database.inc.php similarity index 100% rename from database.inc.php rename to adminer/database.inc.php diff --git a/db.inc.php b/adminer/db.inc.php similarity index 100% rename from db.inc.php rename to adminer/db.inc.php diff --git a/default.css b/adminer/default.css similarity index 100% rename from default.css rename to adminer/default.css diff --git a/down.gif b/adminer/down.gif similarity index 100% rename from down.gif rename to adminer/down.gif diff --git a/download.inc.php b/adminer/download.inc.php similarity index 100% rename from download.inc.php rename to adminer/download.inc.php diff --git a/dump.inc.php b/adminer/dump.inc.php similarity index 100% rename from dump.inc.php rename to adminer/dump.inc.php diff --git a/edit.inc.php b/adminer/edit.inc.php similarity index 100% rename from edit.inc.php rename to adminer/edit.inc.php diff --git a/event.inc.php b/adminer/event.inc.php similarity index 100% rename from event.inc.php rename to adminer/event.inc.php diff --git a/favicon.ico b/adminer/favicon.ico similarity index 100% rename from favicon.ico rename to adminer/favicon.ico diff --git a/foreign.inc.php b/adminer/foreign.inc.php similarity index 100% rename from foreign.inc.php rename to adminer/foreign.inc.php diff --git a/functions.js b/adminer/functions.js similarity index 98% rename from functions.js rename to adminer/functions.js index f9d4e4b5..825c938b 100644 --- a/functions.js +++ b/adminer/functions.js @@ -23,9 +23,9 @@ function verify_version(version) { function load_jush() { var script = document.createElement('script'); - script.src = 'externals/jush/jush.js'; + script.src = '../externals/jush/jush.js'; script.onload = function () { - jush.style('externals/jush/jush.css'); + jush.style('../externals/jush/jush.css'); jush.highlight_tag('pre'); jush.highlight_tag('code'); } diff --git a/include/auth.inc.php b/adminer/include/auth.inc.php similarity index 100% rename from include/auth.inc.php rename to adminer/include/auth.inc.php diff --git a/include/connect.inc.php b/adminer/include/connect.inc.php similarity index 100% rename from include/connect.inc.php rename to adminer/include/connect.inc.php diff --git a/include/design.inc.php b/adminer/include/design.inc.php similarity index 100% rename from include/design.inc.php rename to adminer/include/design.inc.php diff --git a/include/editing.inc.php b/adminer/include/editing.inc.php similarity index 100% rename from include/editing.inc.php rename to adminer/include/editing.inc.php diff --git a/include/export.inc.php b/adminer/include/export.inc.php similarity index 100% rename from include/export.inc.php rename to adminer/include/export.inc.php diff --git a/include/functions.inc.php b/adminer/include/functions.inc.php similarity index 100% rename from include/functions.inc.php rename to adminer/include/functions.inc.php diff --git a/include/lang.inc.php b/adminer/include/lang.inc.php similarity index 100% rename from include/lang.inc.php rename to adminer/include/lang.inc.php diff --git a/include/mysql.inc.php b/adminer/include/mysql.inc.php similarity index 100% rename from include/mysql.inc.php rename to adminer/include/mysql.inc.php diff --git a/include/pdo.inc.php b/adminer/include/pdo.inc.php similarity index 100% rename from include/pdo.inc.php rename to adminer/include/pdo.inc.php diff --git a/include/sqlite.inc.php b/adminer/include/sqlite.inc.php similarity index 100% rename from include/sqlite.inc.php rename to adminer/include/sqlite.inc.php diff --git a/include/version.inc.php b/adminer/include/version.inc.php similarity index 100% rename from include/version.inc.php rename to adminer/include/version.inc.php diff --git a/index.php b/adminer/index.php similarity index 100% rename from index.php rename to adminer/index.php diff --git a/indexes.inc.php b/adminer/indexes.inc.php similarity index 100% rename from indexes.inc.php rename to adminer/indexes.inc.php diff --git a/lang/cs.inc.php b/adminer/lang/cs.inc.php similarity index 100% rename from lang/cs.inc.php rename to adminer/lang/cs.inc.php diff --git a/lang/de.inc.php b/adminer/lang/de.inc.php similarity index 100% rename from lang/de.inc.php rename to adminer/lang/de.inc.php diff --git a/lang/en.inc.php b/adminer/lang/en.inc.php similarity index 100% rename from lang/en.inc.php rename to adminer/lang/en.inc.php diff --git a/lang/es.inc.php b/adminer/lang/es.inc.php similarity index 100% rename from lang/es.inc.php rename to adminer/lang/es.inc.php diff --git a/lang/et.inc.php b/adminer/lang/et.inc.php similarity index 100% rename from lang/et.inc.php rename to adminer/lang/et.inc.php diff --git a/lang/fr.inc.php b/adminer/lang/fr.inc.php similarity index 100% rename from lang/fr.inc.php rename to adminer/lang/fr.inc.php diff --git a/lang/it.inc.php b/adminer/lang/it.inc.php similarity index 100% rename from lang/it.inc.php rename to adminer/lang/it.inc.php diff --git a/lang/nl.inc.php b/adminer/lang/nl.inc.php similarity index 100% rename from lang/nl.inc.php rename to adminer/lang/nl.inc.php diff --git a/lang/ru.inc.php b/adminer/lang/ru.inc.php similarity index 100% rename from lang/ru.inc.php rename to adminer/lang/ru.inc.php diff --git a/lang/sk.inc.php b/adminer/lang/sk.inc.php similarity index 100% rename from lang/sk.inc.php rename to adminer/lang/sk.inc.php diff --git a/lang/zh.inc.php b/adminer/lang/zh.inc.php similarity index 100% rename from lang/zh.inc.php rename to adminer/lang/zh.inc.php diff --git a/plus.gif b/adminer/plus.gif similarity index 100% rename from plus.gif rename to adminer/plus.gif diff --git a/privileges.inc.php b/adminer/privileges.inc.php similarity index 100% rename from privileges.inc.php rename to adminer/privileges.inc.php diff --git a/procedure.inc.php b/adminer/procedure.inc.php similarity index 100% rename from procedure.inc.php rename to adminer/procedure.inc.php diff --git a/processlist.inc.php b/adminer/processlist.inc.php similarity index 100% rename from processlist.inc.php rename to adminer/processlist.inc.php diff --git a/schema.inc.php b/adminer/schema.inc.php similarity index 100% rename from schema.inc.php rename to adminer/schema.inc.php diff --git a/select.inc.php b/adminer/select.inc.php similarity index 100% rename from select.inc.php rename to adminer/select.inc.php diff --git a/sql.inc.php b/adminer/sql.inc.php similarity index 100% rename from sql.inc.php rename to adminer/sql.inc.php diff --git a/table.inc.php b/adminer/table.inc.php similarity index 100% rename from table.inc.php rename to adminer/table.inc.php diff --git a/trigger.inc.php b/adminer/trigger.inc.php similarity index 100% rename from trigger.inc.php rename to adminer/trigger.inc.php diff --git a/up.gif b/adminer/up.gif similarity index 100% rename from up.gif rename to adminer/up.gif diff --git a/user.inc.php b/adminer/user.inc.php similarity index 100% rename from user.inc.php rename to adminer/user.inc.php diff --git a/view.inc.php b/adminer/view.inc.php similarity index 100% rename from view.inc.php rename to adminer/view.inc.php diff --git a/_compile.php b/compile.php similarity index 86% rename from _compile.php rename to compile.php index ad77f440..237d74e8 100644 --- a/_compile.php +++ b/compile.php @@ -1,5 +1,5 @@ $val) { if (!isset($lang_ids[$key])) { @@ -37,7 +37,7 @@ function put_file($match) { } } } - foreach (glob(dirname(__FILE__) . "/lang/*.inc.php") as $filename) { + foreach (glob(dirname(__FILE__) . "/adminer/lang/*.inc.php") as $filename) { include $filename; $translation_ids = array_flip($lang_ids); foreach ($translations as $key => $val) { @@ -51,7 +51,7 @@ function put_file($match) { } return "switch (\$LANG) {\n$return}\n"; } - $return = file_get_contents(dirname(__FILE__) . "/$match[2]"); + $return = file_get_contents(dirname(__FILE__) . "/adminer/$match[2]"); if ($match[2] != "./include/lang.inc.php" || !$_COOKIE["lang"]) { $tokens = token_get_all($return); return "?>\n$return" . (in_array($tokens[count($tokens) - 1][0], array(T_CLOSE_TAG, T_INLINE_HTML), true) ? " 1) { $_COOKIE["lang"] = $_SERVER["argv"][1]; - include dirname(__FILE__) . "/include/lang.inc.php"; + include dirname(__FILE__) . "/adminer/include/lang.inc.php"; if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["lang"]])) { - echo "Usage: php _compile.php [lang]\nPurpose: Compile adminer[-lang].php from index.php.\n"; + echo "Usage: php compile.php [lang]\nPurpose: Compile adminer[-lang].php from index.php.\n"; exit(1); } - include dirname(__FILE__) . "/lang/$_COOKIE[lang].inc.php"; + include dirname(__FILE__) . "/adminer/lang/$_COOKIE[lang].inc.php"; } $filename = "adminer" . ($_COOKIE["lang"] ? "-$_COOKIE[lang]" : "") . ".php"; -$file = file_get_contents(dirname(__FILE__) . "/index.php"); +$file = file_get_contents(dirname(__FILE__) . "/adminer/index.php"); $file = preg_replace_callback('~\\b(include|require) "([^"]*)";~', 'put_file', $file); $file = preg_replace("~if \\(isset\\(\\\$_SESSION\\[\"coverage.*\n}\n| && !isset\\(\\\$_SESSION\\[\"coverage\"\\]\\)~sU", '', $file); if ($_COOKIE["lang"]) { @@ -182,26 +182,26 @@ if (isset($_GET["file"])) { header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT"); if ($_GET["file"] == "favicon.ico") { header("Content-Type: image/x-icon"); - echo base64_decode("' . base64_encode(file_get_contents(dirname(__FILE__) . "/favicon.ico")) . '"); + echo base64_decode("' . base64_encode(file_get_contents(dirname(__FILE__) . "/adminer/favicon.ico")) . '"); } elseif ($_GET["file"] == "default.css") { header("Content-Type: text/css"); - ?>' . preg_replace('~\\s*([:;{},])\\s*~', '\\1', file_get_contents(dirname(__FILE__) . "/default.css")) . '' . preg_replace('~\\s*([:;{},])\\s*~', '\\1', file_get_contents(dirname(__FILE__) . "/adminer/default.css")) . '' . JSMin::minify(file_get_contents(dirname(__FILE__) . "/functions.js")) . '' . JSMin::minify(file_get_contents(dirname(__FILE__) . "/adminer/functions.js")) . '\n?|\\?>\n?<\\?php~", '', $file); $file = php_shrink($file); fwrite(fopen($filename, "w"), $file); diff --git a/_coverage.php b/coverage.php similarity index 69% rename from _coverage.php rename to coverage.php index 8363ca46..30ea9e4b 100644 --- a/_coverage.php +++ b/coverage.php @@ -26,12 +26,12 @@ if (!extension_loaded("xdebug")) { if ($_GET["start"]) { xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE); $_SESSION["coverage"] = array(); - include "./index.php"; + include "./adminer/index.php"; header("Location: ."); exit; } -if ($_GET["filename"]) { - $filename = basename($_GET["filename"]); +if (preg_match('~^(include/)?[-_.a-z0-9]+$~i', $_GET["filename"])) { + $filename = "adminer/$_GET[filename]"; $cov = $_SESSION["coverage"][realpath($filename)]; $file = explode("
", highlight_file($filename, true)); unset($prev_color); @@ -61,17 +61,16 @@ if ($_GET["filename"]) { } } else { echo "\n"; - foreach (glob("*.php") as $filename) { - if ($filename{0} != "_") { - $cov = $_SESSION["coverage"][realpath($filename)]; - $ratio = 0; - if (isset($cov)) { - $values = array_count_values($cov); - $ratio = round(100 - 100 * $values[-1] / count($cov)); - } - echo "\n"; + foreach (array_merge(glob("adminer/*.php"), glob("adminer/include/*.php")) as $filename) { + $cov = $_SESSION["coverage"][realpath($filename)]; + $filename = substr($filename, 8); + $ratio = 0; + if (isset($cov)) { + $values = array_count_values($cov); + $ratio = round(100 - 100 * $values[-1] / count($cov)); } + echo "\n"; } echo "
$ratio%$filename
$ratio%$filename
\n"; - echo "

Start new coverage (requires Xdebug)

\n"; + echo "

Start new coverage (requires Xdebug)

\n"; } diff --git a/_lang.php b/lang.php similarity index 71% rename from _lang.php rename to lang.php index 4be0f33d..f9de597b 100644 --- a/_lang.php +++ b/lang.php @@ -2,22 +2,22 @@ error_reporting(E_ALL & ~E_NOTICE); if ($_SERVER["argc"] > 1) { $_COOKIE["lang"] = $_SERVER["argv"][1]; - include dirname(__FILE__) . "/include/lang.inc.php"; + include dirname(__FILE__) . "/adminer/include/lang.inc.php"; if ($_SERVER["argc"] != 2 || !isset($langs[$_COOKIE["lang"]])) { - echo "Usage: php _lang.php [lang]\nPurpose: Update lang/*.inc.php from source code messages.\n"; + echo "Usage: php lang.php [lang]\nPurpose: Update lang/*.inc.php from source code messages.\n"; exit(1); } } $messages_all = array(); -foreach (array_merge(glob(dirname(__FILE__) . "/*.php"), glob(dirname(__FILE__) . "/include/*.php")) as $filename) { +foreach (array_merge(glob(dirname(__FILE__) . "/adminer/*.php"), glob(dirname(__FILE__) . "/adminer/include/*.php")) as $filename) { $file = file_get_contents($filename); if (preg_match_all("~lang\\(('(?:[^\\\\']+|\\\\.)*')([),])~", $file, $matches)) { $messages_all += array_combine($matches[1], $matches[2]); } } -foreach (glob(dirname(__FILE__) . "/lang/" . ($_COOKIE["lang"] ? $_COOKIE["lang"] : "*") . ".inc.php") as $filename) { +foreach (glob(dirname(__FILE__) . "/adminer/lang/" . ($_COOKIE["lang"] ? $_COOKIE["lang"] : "*") . ".inc.php") as $filename) { $messages = $messages_all; preg_match_all("~^(\\s*)(?:// )?(('(?:[^\\\\']+|\\\\.)*') => .*[^,\n]),?~m", file_get_contents($filename), $matches, PREG_SET_ORDER); $s = ""; diff --git a/tests/0-login.html b/tests/0-login.html index bf3dfc40..aac7c98a 100644 --- a/tests/0-login.html +++ b/tests/0-login.html @@ -13,12 +13,12 @@ open - /adminer/_coverage.php?start=1 + /adminer/coverage.php?start=1 open - /adminer/?lang=en&username= + /adminer/adminer/?lang=en&username= diff --git a/tests/1-create-database.html b/tests/1-create-database.html index 91068c6c..6d841511 100644 --- a/tests/1-create-database.html +++ b/tests/1-create-database.html @@ -13,7 +13,7 @@ open - /adminer/ + /adminer/adminer/ diff --git a/tests/10-clone.html b/tests/10-clone.html index 953c3942..3f6ad33b 100644 --- a/tests/10-clone.html +++ b/tests/10-clone.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&select=albums + /adminer/adminer/?db=selenium&select=albums diff --git a/tests/11-reference.html b/tests/11-reference.html index d196aefb..184a66c0 100644 --- a/tests/11-reference.html +++ b/tests/11-reference.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&select=albums + /adminer/adminer/?db=selenium&select=albums diff --git a/tests/12-update.html b/tests/12-update.html index 4c607802..cea1564b 100644 --- a/tests/12-update.html +++ b/tests/12-update.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&edit=albums&where%5Bid%5D=2 + /adminer/adminer/?db=selenium&edit=albums&where%5Bid%5D=2 diff --git a/tests/13-delete.html b/tests/13-delete.html index 4c7f9f50..9e5585a0 100644 --- a/tests/13-delete.html +++ b/tests/13-delete.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&edit=albums&where%5Bid%5D=2 + /adminer/adminer/?db=selenium&edit=albums&where%5Bid%5D=2 diff --git a/tests/14-truncate.html b/tests/14-truncate.html index 1ee23570..5fed08fd 100644 --- a/tests/14-truncate.html +++ b/tests/14-truncate.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&select=albums + /adminer/adminer/?db=selenium&select=albums diff --git a/tests/15-privileges.html b/tests/15-privileges.html index ebbd948b..5f5b7519 100644 --- a/tests/15-privileges.html +++ b/tests/15-privileges.html @@ -13,7 +13,7 @@ open - /adminer/?user= + /adminer/adminer/?user= diff --git a/tests/16-processlist.html b/tests/16-processlist.html index 3af8f801..e9c58348 100644 --- a/tests/16-processlist.html +++ b/tests/16-processlist.html @@ -13,7 +13,7 @@ open - /adminer/?processlist= + /adminer/adminer/?processlist= diff --git a/tests/17-export.html b/tests/17-export.html index b3aa14d5..07b5a805 100644 --- a/tests/17-export.html +++ b/tests/17-export.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&dump= + /adminer/adminer/?db=selenium&dump= diff --git a/tests/18-events.html b/tests/18-events.html index 1c501c48..dfbd4fa2 100644 --- a/tests/18-events.html +++ b/tests/18-events.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&event= + /adminer/adminer/?db=selenium&event= diff --git a/tests/19-procedures.html b/tests/19-procedures.html index 0d09e087..0d249ee3 100644 --- a/tests/19-procedures.html +++ b/tests/19-procedures.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&procedure= + /adminer/adminer/?db=selenium&procedure= diff --git a/tests/2-create-table.html b/tests/2-create-table.html index 3ced7a21..1c1e02f7 100644 --- a/tests/2-create-table.html +++ b/tests/2-create-table.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium + /adminer/adminer/?db=selenium diff --git a/tests/20-partitioning.html b/tests/20-partitioning.html index 37fea341..2e459cec 100644 --- a/tests/20-partitioning.html +++ b/tests/20-partitioning.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&table=interprets + /adminer/adminer/?db=selenium&table=interprets diff --git a/tests/3-create-index.html b/tests/3-create-index.html index 2c22dbbb..fe858b2e 100644 --- a/tests/3-create-index.html +++ b/tests/3-create-index.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&table=interprets + /adminer/adminer/?db=selenium&table=interprets diff --git a/tests/4-create-table-2.html b/tests/4-create-table-2.html index 628c1e16..87afb8bd 100644 --- a/tests/4-create-table-2.html +++ b/tests/4-create-table-2.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&table=interprets&lang=en + /adminer/adminer/?db=selenium&table=interprets&lang=en diff --git a/tests/5-foreign-key.html b/tests/5-foreign-key.html index 0c357dbc..1eabcee8 100644 --- a/tests/5-foreign-key.html +++ b/tests/5-foreign-key.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&table=albums + /adminer/adminer/?db=selenium&table=albums diff --git a/tests/6-alter-table.html b/tests/6-alter-table.html index eb8a1f91..37703ab0 100644 --- a/tests/6-alter-table.html +++ b/tests/6-alter-table.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&table=interprets + /adminer/adminer/?db=selenium&table=interprets diff --git a/tests/7-create-trigger.html b/tests/7-create-trigger.html index fd7aaa71..92e1c3a1 100644 --- a/tests/7-create-trigger.html +++ b/tests/7-create-trigger.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&trigger=albums + /adminer/adminer/?db=selenium&trigger=albums diff --git a/tests/8-create-view.html b/tests/8-create-view.html index f0e24f5b..ff9d30a8 100644 --- a/tests/8-create-view.html +++ b/tests/8-create-view.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&createv= + /adminer/adminer/?db=selenium&createv= diff --git a/tests/9-insert.html b/tests/9-insert.html index 48b8c990..ce639aac 100644 --- a/tests/9-insert.html +++ b/tests/9-insert.html @@ -13,7 +13,7 @@ open - /adminer/?db=selenium&edit=interprets + /adminer/adminer/?db=selenium&edit=interprets @@ -33,7 +33,7 @@ open - /adminer/?db=selenium&edit=albums + /adminer/adminer/?db=selenium&edit=albums diff --git a/tests/logout.html b/tests/logout.html index 45398feb..1e1480cd 100644 --- a/tests/logout.html +++ b/tests/logout.html @@ -13,7 +13,7 @@ open - /adminer/ + /adminer/adminer/ @@ -38,7 +38,7 @@ open - /adminer/_coverage.php + /adminer/coverage.php