X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=7f8abd82a90788f9f03c83ff3c2154edcf2ebbee;hb=aed28998bb6d6be4f35ccc300de8a004507849c9;hp=bbf2ce691ba71e781317be0064cc569691df4f21;hpb=de71c4c4768f8f464ff61cfda3f8e31d20d2b0b0;p=wfpl.git

diff --git a/run.php b/run.php
index bbf2ce6..7f8abd8 100644
--- a/run.php
+++ b/run.php
@@ -1,8 +1,8 @@
-<?php
+<?php  # Transitional; supports both template APIs
 
 #  2006 Public Domain
 #
-#  This file was placed into the public domain on November 16th, 2008 by it's
+#  This file was placed into the public domain on November 16th, 2008 by its
 #  sole author Jason Woofenden
 
 # This file facilitates making a site with mixed PHP and html files. All URLs
@@ -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();
@@ -101,7 +101,7 @@ 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
+	# 3) a hash of key/value pairs to be tem_set() on the template
 	if(function_exists('cms_display')) {
 		$cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
 		if(is_string($cms_content)) {
@@ -149,19 +149,29 @@ function run_php($dest = false) {
 	}
 
 	# Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
-	if($GLOBALS['wfpl_template']) {
-		if(isset($GLOBALS['wfpl_main_template'])) {
-			$sections = tem_top_subs();
-			if($sections) foreach($sections as $name => $val) {
-				$GLOBALS['wfpl_main_template']->append($name, $val);
+	if($GLOBALS['wfpl_template'] || $GLOBALS['wfpl_main_template']) {
+		if($GLOBALS['wfpl_main_template']) {
+			# if there was a template for that page, and one for the whole
+			# site, copy all template sections that have been show()n to the
+			# site-wide template
+			if($GLOBALS['wfpl_template']) {
+				$GLOBALS['wfpl_main_template']->merge($GLOBALS['wfpl_template']);
 			}
 
 			$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
 		}
 
+		# If you have a site-wide template (template.html) then messages will
+		# be displayed there. If you instead want messages displayed on your
+		# page, call display_messages() from your page_main().
+		#
+		# Either way, you'll need to require_once('code/wfpl/messages.php')
+		# or require_once('code/wfpl/session_messages.php'). code/config.php
+		# is a nice place to do this.
 		if(function_exists('display_messages')) {
 			display_messages();
 		}
+
 		tem_output();
 	}
 }