Emulate REQUEST_URI
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@934 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
parent
8f525c4ac5
commit
d31d4e9e52
|
@ -64,7 +64,10 @@ if (get_magic_quotes_gpc()) {
|
||||||
}
|
}
|
||||||
set_magic_quotes_runtime(false);
|
set_magic_quotes_runtime(false);
|
||||||
|
|
||||||
$SELF = (isset($_SERVER["REQUEST_URI"]) ? preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) : $_SERVER["ORIG_PATH_INFO"]) . '?' . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen($_GET["db"]) ? 'db=' . urlencode($_GET["db"]) . '&' : '');
|
if (!isset($_SERVER["REQUEST_URI"])) {
|
||||||
|
$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"] . (strlen($_SERVER["QUERY_STRING"]) ? "?$_SERVER[QUERY_STRING]" : "");
|
||||||
|
}
|
||||||
|
$SELF = preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?' . (strlen($_GET["server"]) ? 'server=' . urlencode($_GET["server"]) . '&' : '') . (strlen($_GET["db"]) ? 'db=' . urlencode($_GET["db"]) . '&' : '');
|
||||||
$on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); // used in foreign_keys()
|
$on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); // used in foreign_keys()
|
||||||
|
|
||||||
include "../adminer/include/version.inc.php";
|
include "../adminer/include/version.inc.php";
|
||||||
|
|
|
@ -56,7 +56,7 @@ function type_class($type) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $foreign_keys = array()) {
|
function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $foreign_keys = array()) {
|
||||||
global $inout, $SELF; // $SELF is used by compiled images
|
global $inout;
|
||||||
$column_comments = false;
|
$column_comments = false;
|
||||||
foreach ($fields as $field) {
|
foreach ($fields as $field) {
|
||||||
if (strlen($field["comment"])) {
|
if (strlen($field["comment"])) {
|
||||||
|
|
|
@ -177,7 +177,7 @@ if ($_COOKIE["adminer_lang"]) {
|
||||||
}
|
}
|
||||||
$file = str_replace('<script type="text/javascript" src="editing.js"></script>' . "\n", "", $file);
|
$file = str_replace('<script type="text/javascript" src="editing.js"></script>' . "\n", "", $file);
|
||||||
$file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files
|
$file = preg_replace_callback("~compile_file\\('([^']+)', '([^']+)'\\);~", 'compile_file', $file); // integrate static files
|
||||||
$replace = 'htmlspecialchars(preg_replace("~\\\\\\\\?.*~", "", $SELF), ENT_QUOTES) . "?file=\\1&version=' . $VERSION;
|
$replace = 'htmlspecialchars(preg_replace("~\\\\\\\\?.*~", "", $_SERVER["REQUEST_URI"]), ENT_QUOTES) . "?file=\\1&version=' . $VERSION;
|
||||||
$file = preg_replace('~\\.\\./adminer/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
|
$file = preg_replace('~\\.\\./adminer/(default\\.css|functions\\.js|favicon\\.ico)~', '<?php echo ' . $replace . '"; ?>', $file);
|
||||||
$file = preg_replace('~\\.\\./adminer/((plus|cross|up|down|arrow)\\.gif)~', '" . ' . $replace, $file);
|
$file = preg_replace('~\\.\\./adminer/((plus|cross|up|down|arrow)\\.gif)~', '" . ' . $replace, $file);
|
||||||
$file = str_replace("../externals/jush/", "http://jush.sourceforge.net/", $file);
|
$file = str_replace("../externals/jush/", "http://jush.sourceforge.net/", $file);
|
||||||
|
|
|
@ -108,7 +108,6 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectVal($val, $link, $field) {
|
function selectVal($val, $link, $field) {
|
||||||
global $SELF; // used by compiled images
|
|
||||||
$return = ($val == "<i>NULL</i>" ? " " : $val);
|
$return = ($val == "<i>NULL</i>" ? " " : $val);
|
||||||
if (ereg('blob|binary', $field["type"]) && !is_utf8($val)) {
|
if (ereg('blob|binary', $field["type"]) && !is_utf8($val)) {
|
||||||
$return = lang('%d byte(s)', strlen($val));
|
$return = lang('%d byte(s)', strlen($val));
|
||||||
|
|
Loading…
Reference in a new issue