X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=http.php;fp=http.php;h=94dbff17b302e4ebd36047498e1d4304f8e8dda9;hb=4f94560f060a7305ea791def3950adb1bda092ec;hp=c7c457a21ccb5b946d60d09e60c52df7945a1f85;hpb=a11c234de210c655511de6e841eaf87d4787b3f5;p=wfpl.git

diff --git a/http.php b/http.php
index c7c457a..94dbff1 100644
--- a/http.php
+++ b/http.php
@@ -19,8 +19,8 @@
 #  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-# return our best guess at the url used to access this page
-function this_url() {
+# return our best guess at the url used to access this page, without the path or query string
+function this_url_sans_path() {
 	list($protocol, $version) = explode('/', $_SERVER['SERVER_PROTOCOL']);
 	$url = strtolower($protocol);
 
@@ -42,15 +42,37 @@ function this_url() {
 		}
 	}
 
+	return $url;
+}
+
+# return our best guess at the url used to access this page
+function this_url() {
+	$url = this_url_sans_path();
+
 	$url .= $_SERVER['REQUEST_URI'];
 
 	return $url;
 }
 
+# sends an HTTP redirect
+#
+# $url can be:
+#   1) a full URL
+#   2) an absolute path
+#   3) a filename (you can pass a directory/file.html and such, but "../" prefix is not supported)
 function redirect($url, $status = '302 Moved Temporarily', $message = '') {
+	if(!strpos($url, ':')) {
+		if(substr($url, 0, 1) == '/') {
+			$url = this_url_sans_path() . $url;
+		} else {
+			$url = ereg_replace('/[^/]*([?].*)?$', "/$url", this_url());
+		}
+	}
+			
 	if(function_exists('session_save_messages')) {
 		session_save_messages();
 	}
+
 	header("HTTP/1.0 $status");
 	header("Location: $url");
 	echo($message);