X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=03d849afb636727f2ce6643556b539633eb8a358;hb=21c47e88810e97fe5b727c9c2689f64533bf6452;hp=79a05dc661c5c40b0b6a0b19647262cb50a0ede3;hpb=22d5fb7ab7d4ee86bd59e194387dca268bd577a1;p=wfpl.git

diff --git a/run.php b/run.php
index 79a05dc..03d849a 100644
--- a/run.php
+++ b/run.php
@@ -53,9 +53,10 @@
 
 # RewriteEngine  on
 # RewriteRule    ^$  /foo/run.php
-# RewriteRule    ^/foo/[^/]*\.html$  /foo/run.php
+# RewriteRule    ^foo/[^/]*\.html$  /foo/run.php
 
 require_once('code/wfpl/file_run.php');
+require_once('code/wfpl/http.php');
 
 function run_php($basename = false) {
 	if($basename) {
@@ -71,9 +72,16 @@ function run_php($basename = false) {
 	}
 	if($php_file != $html_file && file_exists($php_file)) {
 		require_once('code/wfpl/template.php');
-		if(file_exists($html_file)) tem_load($html_file);
+		if(file_exists($html_file)) {
+			$GLOBALS['wfpl_template'] = new tem();
+			tem_load($html_file);
+		}
 		$other = file_run($php_file);
 		if($other) {
+			if(strpos($other, ':')) {
+				redirect($other);
+				exit();
+			}
 			run_php($other);
 			return;
 		}