From: moodler <moodler>
Date: Thu, 30 Jan 2003 15:52:38 +0000 (+0000)
Subject: Improved me() function
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=fced815cd77546b398df16a7116f36e186436367;p=moodle.git

Improved me() function
---

diff --git a/lib/weblib.php b/lib/weblib.php
index 15277e1aaf..ffbadc1240 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -133,14 +133,20 @@ function me() {
     if (!empty($_SERVER["REQUEST_URI"])) {
         return $_SERVER["REQUEST_URI"];
 
-    } else if (!empty($_SERVER["PATH_INFO"])) {
-        return $_SERVER["PATH_INFO"];
-
     } else if (!empty($_SERVER["PHP_SELF"])) {
+        if (!empty($_SERVER["QUERY_STRING"])) {
+            return $_SERVER["PHP_SELF"]."?".$_SERVER["QUERY_STRING"];
+        }
         return $_SERVER["PHP_SELF"];
 
+    } else if (!empty($_SERVER["SCRIPT_NAME"])) {
+        if (!empty($_SERVER["QUERY_STRING"])) {
+            return $_SERVER["SCRIPT_NAME"]."?".$_SERVER["QUERY_STRING"];
+        }
+        return $_SERVER["SCRIPT_NAME"];
+
     } else {
-        notify("Warning: Could not find any of these web server variables: \$REQUEST_URI, \$PATH_INFO or \$PHP_SELF");
+        notify("Warning: Could not find any of these web server variables: \$REQUEST_URI, \$PHP_SELF or \$SCRIPT_NAME");
     }
 }