X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=3d0b1d4d5e2bbe66a7d9b7dc1a6d7bef69e349c9;hb=27f182546d729a9d297091799fcf1a1922da0c5e;hp=b5b91a18a1d66893802619a98b82056567587e27;hpb=856f805c6cbb6e712c662214f3b5821442f808a0;p=wfpl.git

diff --git a/run.php b/run.php
index b5b91a1..3d0b1d4 100644
--- a/run.php
+++ b/run.php
@@ -54,7 +54,7 @@ if(file_exists('code/config.php')) {
 # pass http://foo.com/bar.html to redirect to a full directory
 function run_php($dest = false) {
 	if($dest) {
-		# if it's got a : it must be a full URL, redirect
+		# if it has a : it must be a full URL, redirect
 		if(strpos($dest, ':')) {
 			redirect($dest);
 			exit();
@@ -86,19 +86,27 @@ function run_php($dest = false) {
 
 	# cms_get can return one of:
 	# 1) false to indicate that there's no cms content for this basename
-	# 2) a string to indicate a soft/full redirect just as foo_main()
-	# 3) a hash of key/value pairs to be tem_set(key,value) on the template
+	# 2) a string to request a soft/full redirect just like foo_main()
+	# 3) a hash of key/value pairs to be added to the template
 	if(function_exists('cms_get')) {
 		$cms_content = cms_get($basename);
 		if(is_string($cms_content)) {
 			run_php($cms_content);
 			return;
 		}
-	} else {
-		$cms_content = false;
 	}
 
-	if(!$php_exists && !$html_exists && !$cms_content) {
+	if($php_exists) {
+		# files can return a basename or URL of a page to be run/displayed
+		$other = file_run($php_file);
+		if($other) {
+			run_php($other);
+			return;
+		}
+	} elseif($html_exists) {
+		readfile($html_file);
+		exit();
+	} elseif(!$cms_content) {
 		header('HTTP/1.0 404 File Not Found');
 		if(file_exists('404.php') || file_exists('404.html')) {
 			run_php('404');
@@ -108,57 +116,28 @@ function run_php($dest = false) {
 		}
 	}
 
-	# If there's no template.html we don't want to parse $html_file.
-	if($html_exists && !$php_exists && !file_exists('template.html')) {
-		readfile($html_file);
-		exit();
+	$data = &$GLOBALS['wfpl_tem_data'];
+	$data['basename'] = $basename;
+	if(function_exists('display_messages')) {
+		display_messages();
 	}
-
-	if($html_exists) {
-		tem_load_new($html_file);
+	if($cms_content) foreach($cms_content as $name => $value) {
+		$data[$name] .= $value;
 	}
-
-	if($php_exists) {
-		# files can return a basename or URL of a page to be run/displayed
-		$other = file_run($php_file);
-		if($other) {
-			run_php($other);
-			return;
-		}
-	} else {
-		$sub_names = tem_top_sub_names();
-		foreach($sub_names as $sub_name) {
-			tem_sub($sub_name);
-		}
+	if(file_exists("$basename.css")) {
+		$data['css_link'] = "$basename.css";
 	}
 
-	# Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
-	if($GLOBALS['wfpl_template']) {
-		if(file_exists('template.html')) {
-			$tem = new tem();
-			$tem->load("template.html");
-			$tem->set('basename', $basename);
-			if($cms_content) foreach($cms_content as $name => $val) {
-				$tem->append($name, $val);
-			}
-			$sections = tem_top_subs();
-			if($sections) foreach($sections as $name => $val) {
-				$tem->append($name, $val);
-			}
-
-			if(file_exists("$basename.css")) {
-				$tem->set('css_link', "$basename.css");
-				$tem->sub('css_links');
-			}
-
-			$GLOBALS['wfpl_template'] = $tem;
-		}
-
-		if(function_exists('display_messages')) {
-			display_messages();
+	if(file_exists("template.html")) {
+		$template = parse_template_file("template.html");
+		if($html_exists) {
+			$subs = parse_template_file($html_file);
+			$template = merge_templates($template, $subs);
 		}
-		tem_output();
+	} elseif($html_exists) {
+		$template = parse_template_file("$html_file");
 	}
+	if($template) print fill_template($template, $data);
 }
 
 run_php();