X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=60e4eab7812ef9da39aa8b6d44956f99d87c1ac2;hb=43012e4a2333ae92d2ac1b51b6b9c1e481a64ec0;hp=79a05dc661c5c40b0b6a0b19647262cb50a0ede3;hpb=22d5fb7ab7d4ee86bd59e194387dca268bd577a1;p=wfpl.git

diff --git a/run.php b/run.php
index 79a05dc..60e4eab 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
-<?php
+<?php  # Transitional; supports both template APIs
 
-#  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 its
+#  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
@@ -53,42 +39,137 @@
 
 # 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');
+require_once('code/wfpl/template.php');
+
+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 has 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);
+		if($basename == '') {
+			$basename = 'index';
+		}
+	}
+
+	$GLOBALS['wfpl_basename'] = $basename;
+
+	$html_file = "$basename.html";
+	$php_file = "$basename.php";
+
+	$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);
+		if(preg_match('/([.]l(ocal)?$)|^[0-9.]*$/', $_SERVER['HTTP_HOST'])) {
+			$GLOBALS['wfpl_main_template']->set('$running_locally');
+		}
+	}
 
-function run_php($basename = false) {
-	if($basename) {
-		$html_file = "$basename.html";
-		$php_file = "$basename.php";
+	# cms_get can return one of:
+	# 1) true to indicate that there is cms content (so no 404)
+	# 2) false to indicate that there's no cms content for this basename
+	# 3) a string to indicate a soft/full redirect just as foo_main()
+	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 {
-		$html_file = $_SERVER['REDIRECT_URL'];
-		$html_file = ereg_replace('.*/', '', $html_file);
-		if($html_file == '') {
-			$html_file = 'index.html';
+		$cms_content = false;
+	}
+
+	if(!$php_exists && !$html_exists && !$cms_content) {
+		header('HTTP/1.0 404 File Not Found');
+		if(file_exists('error_404.php') || file_exists('error_404.html')) {
+			$GLOBALS['error_basename'] = $basename;
+			run_php('error_404');
+			return;
+		} else {
+			echo '<!DOCTYPE html><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
+			exit();
 		}
-		$php_file = ereg_replace('\.html$', '.php', $html_file);
 	}
-	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 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($html_exists) {
+		tem_load_new($html_file);
+	}
+
+	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;
 		}
-		if(file_exists($html_file)) tem_output();
-	} else {
-		if(file_exists($html_file)) {
-			readfile($html_file);
-		} 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>';
+	} elseif($html_exists) {
+		$sub_names = tem_top_sub_names();
+		foreach($sub_names as $sub_name) {
+			tem_sub($sub_name);
+		}
+	}
+
+	# Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
+	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();
 	}
 }