X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=1b5b19bd4bb07a76874a9d3d74ed4eaaf8b24118;hb=1b701682c788072eb0d469fc77b2925fc8ef16b5;hp=716e3643be804ab6afcf032c811c820db4fa164b;hpb=f303b9521b6ea3195ccdedfbdb9edd39fcd649f7;p=wfpl.git

diff --git a/run.php b/run.php
index 716e364..1b5b19b 100644
--- a/run.php
+++ b/run.php
@@ -56,9 +56,20 @@ function run_php($basename = false) {
 		$html_file = "$basename.html";
 		$php_file = "$basename.php";
 	} else {
-		chdir('../..');
-		$html_file = $_SERVER['REDIRECT_URL'];
-		$html_file = ereg_replace('.*/', '', $html_file);
+
+		# first we must find the file and directory that was actually requested
+		# (before we messed it up with mod_rewrite)
+		$fs_path = $_SERVER['DOCUMENT_ROOT'] . $_SERVER['REDIRECT_URL'];
+		$split = strrpos($fs_path, '/'); # find the last slash
+		$directory = substr($fs_path, 0, $split);
+		$file = substr($fs_path, $split + 1);
+
+		if($file == '') {
+			$file = 'index.html';
+		}
+
+		chdir($directory);
+		$html_file = $file;
 		$php_file = ereg_replace('\.html$', '.php', $html_file);
 	}
 	if($php_file != $html_file && file_exists($php_file)) {