Emulate REQUEST_URI

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@934 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 5aa4a932489125483d95b5a433f6720d8970cae2..843551f380d5e605470aabf80e6167ad94d58627 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -64,7 +64,10 @@ if (get_magic_quotes_gpc()) {
 }
 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()
 
 include "../adminer/include/version.inc.php";

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 0c15ca607891df826b2870fe316543d0b49caec1..9202a43e831a02b86f397afb0511aac3edf29062 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -56,7 +56,7 @@ function type_class($type) {
 }
 
 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;
        foreach ($fields as $field) {
                if (strlen($field["comment"])) {

diff --git a/compile.php b/compile.php
index e4b30622d18ff91e7c80d793eeedf11a526eea54..fc8b87b061aef4a85c325cc041c2f82e7787088f 100644 (file)
--- a/compile.php
+++ b/compile.php
@@ -177,7 +177,7 @@ if ($_COOKIE["adminer_lang"]) {
 }
 $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
-$replace = 'htmlspecialchars(preg_replace("~\\\\\\\\?.*~", "", $SELF), ENT_QUOTES) . "?file=\\1&amp;version=' . $VERSION;
+$replace = 'htmlspecialchars(preg_replace("~\\\\\\\\?.*~", "", $_SERVER["REQUEST_URI"]), ENT_QUOTES) . "?file=\\1&amp;version=' . $VERSION;
 $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 = str_replace("../externals/jush/", "http://jush.sourceforge.net/", $file);

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index a232592ab7fe38cb19c8eacecf93fae14bfd59ae..81262ccce4f669fb9f364a2328ef4a30d83cbfb9 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -108,7 +108,6 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
        }
        
        function selectVal($val, $link, $field) {
-               global $SELF; // used by compiled images
                $return = ($val == "<i>NULL</i>" ? "&nbsp;" : $val);
                if (ereg('blob|binary', $field["type"]) && !is_utf8($val)) {
                        $return = lang('%d byte(s)', strlen($val));