X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=b5b91a18a1d66893802619a98b82056567587e27;hb=4a25d3b6318f7f361df3adfac17366452fe3ed49;hp=8d8d1dfcda0fd6db30d58d2bf068b413a60fba0a;hpb=15fa6e23941fd5497ca19266adaede5c19e3836a;p=wfpl.git

diff --git a/run.php b/run.php
index 8d8d1df..b5b91a1 100644
--- a/run.php
+++ b/run.php
@@ -1,24 +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 General Public License as published by
-#  the Free Software Foundation; either version 2, 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
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with wfpl; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-#  MA 02111-1307, 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
@@ -53,37 +38,126 @@
 # http://example.com/foo/bar.html
 
 # RewriteEngine  on
-# RewriteBase    /foo/
-# RewriteRule    .*\.html$  /foo/run.php
+# RewriteRule    ^$  /foo/run.php
+# RewriteRule    ^foo/[^/]*\.html$  /foo/run.php
 
-function run_php($basename = false) {
-	if($basename) {
-		$html_file = "$basename.html";
-		$php_file = "$basename.php";
-	} else {
-		$html_file = $_SERVER['REDIRECT_URL'];
-		$html_file = ereg_replace('.*/', '', $html_file);
-		if($html_file == '') {
-			$html_file = 'index.html';
+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'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);
+		if($basename == '') {
+			$basename = 'index';
 		}
-		$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);
-		require $php_file;
-		if(file_exists($html_file)) tem_output();
+
+	$html_file = "$basename.html";
+	$php_file = "$basename.php";
+
+	$html_exists = file_exists($html_file);
+	$php_exists = file_exists($php_file);
+
+	# 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_get')) {
+		$cms_content = cms_get($basename);
+		if(is_string($cms_content)) {
+			run_php($cms_content);
+			return;
+		}
 	} else {
-		if(file_exists($html_file)) {
-			require $html_file;
+		$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($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;
+		}
+	} else {
+		$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']) {
+		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();
 		}
+		tem_output();
 	}
 }