X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=09b51b56b5d7068e93fc7261348af4977b48a504;hb=7596b1ca035ff09e584e915a6e5572ffb46d7625;hp=3d26e492ca73753714fcb8400286998df4bb1a4f;hpb=35e4253b00be3446ee4ff00c28b1cf7240dbf334;p=wfpl.git

diff --git a/run.php b/run.php
index 3d26e49..09b51b5 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
 <?php
 
-#  Copyright (C) 2006 Jason Woofenden
+#  2006 Public Domain
 #
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+#  This file was placed into the public domain on November 16th, 2008 by it's
+#  sole author Jason Woofenden
 
 # This file facilitates making a site with mixed PHP and html files. All URLs
 # have the .html extension. One benefit of this is that you can change static
@@ -59,8 +45,31 @@ require_once('code/wfpl/file_run.php');
 require_once('code/wfpl/http.php');
 require_once('code/wfpl/template.php');
 
-function run_php($basename = false) {
-	if(!$basename) {
+if(file_exists('code/config.php')) {
+	file_run('code/config.php');
+}
+
+# pass the basename of the page you want for normal execution
+# pass ./page.html to redirect to page.html in this directory
+# 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(strpos($dest, ':')) {
+			redirect($dest);
+			exit();
+		}
+
+		# if it starts with './' then it's a relative URL, redirect
+		if(substr($dest, 0, 2) == './') {
+			redirect(ereg_replace('/[^/]*$', substr($dest, 1), this_url()));
+			exit();
+		}
+
+		# otherwise, it's a normal basename, display that content
+		$basename = $dest;
+
+	} else { # no dest arg
 		$basename = $_SERVER['REDIRECT_URL'];
 		$basename = ereg_replace('.*/', '', $basename);
 		$basename = ereg_replace('\.html$', '', $basename);
@@ -72,50 +81,78 @@ function run_php($basename = false) {
 	$html_file = "$basename.html";
 	$php_file = "$basename.php";
 
-	if(!file_exists($php_file)) {
-		if(file_exists($html_file)) {
-			readfile($html_file);
+	$html_exists = file_exists($html_file);
+	$php_exists = file_exists($php_file);
+
+	if(file_exists('template.html')) {
+		$GLOBALS['wfpl_main_template'] = new tem();
+		$GLOBALS['wfpl_main_template']->load("template.html");
+		$GLOBALS['wfpl_main_template']->set('basename', $basename);
+
+		# This helps put in a stylesheet link if you have pages with custom css
+		if(file_exists("$basename.css")) {
+			$GLOBALS['wfpl_main_template']->set('css_link', "$basename.css");
+			$GLOBALS['wfpl_main_template']->sub('css_links');
+		}
+	}
+
+	# 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
+	if(function_exists('cms_display')) {
+		$cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
+		if(is_string($cms_content)) {
+			run_php($cms_content);
+			return;
+		}
+	} else {
+		$cms_content = false;
+	}
+
+	if(!$php_exists && !$html_exists && !$cms_content) {
+		header('HTTP/1.0 404 File Not Found');
+		if(file_exists('404.php') || file_exists('404.html')) {
+			run_php('404');
+			return;
 		} else {
-			header('HTTP/1.0 404 File Not Found');
-			if(file_exists('404.php') || file_exists('404.html')) {
-				run_php('404');
-			} else {
-				echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
-			}
+			echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
 		}
+	}
+
+	# 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();
 	}
 
-	if(file_exists($html_file)) {
-		$GLOBALS['wfpl_template'] = new tem();
-		tem_load($html_file);
+	if($html_exists) {
+		tem_load_new($html_file);
 	}
 
-	$other = file_run($php_file);
-	if($other) {
-		if(strpos($other, ':')) {
-			redirect($other);
-			exit();
+	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);
 		}
-		run_php($other);
-		return;
 	}
 
+	# 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");
+		if(isset($GLOBALS['wfpl_main_template'])) {
 			$sections = tem_top_subs();
 			if($sections) foreach($sections as $name => $val) {
-				$tem->set($name, $val);
-			}
-
-			if(file_exists("$basename.css")) {
-				$tem->set('basename', $basename);
-				$tem->sub('css_links');
+				$GLOBALS['wfpl_main_template']->append($name, $val);
 			}
 
-			$GLOBALS['wfpl_template'] = $tem;
+			$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
 		}
 
 		if(function_exists('display_messages')) {