JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
metaform: fix download_tar() (stylus not less)
[wfpl.git] / run.php
diff --git a/run.php b/run.php
index 4e56e98..a310e3f 100644 (file)
--- 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
@@ -72,28 +72,60 @@ function run_php($dest = false) {
        } else { # no dest arg
                $basename = $_SERVER['REDIRECT_URL'];
                $basename = ereg_replace('.*/', '', $basename);
-               $basename = ereg_replace('\.html$', '', $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);
+       }
+
        # cms_get can return one of:
-       # 1) false to indicate that there's no cms content for this basename
-       # 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);
+       # 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 {
+               $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();
+               }
+       }
+
+       # 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) {
@@ -104,40 +136,37 @@ function run_php($dest = false) {
                        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');
-                       return;
-               } 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>';
+               $sub_names = tem_top_sub_names();
+               foreach($sub_names as $sub_name) {
+                       tem_sub($sub_name);
                }
        }
 
-       $data = &$GLOBALS['wfpl_template'];
-       $data['basename'] = $basename;
-       if(function_exists('display_messages')) {
-               display_messages();
-       }
-       if($cms_content) foreach($cms_content as $name => $value) {
-               $data[$name] .= $value;
-       }
-       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'] || $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(file_exists("template.html")) {
-               $template = parse_template_file("template.html");
-               if($html_exists) {
-                       $subs = parse_template_file($html_file);
-                       $template = merge_templates($template, $subs);
+
+               # You'll probably want to require_once('code/wfpl/messages.php') or
+               # require_once('code/wfpl/session_messages.php') in code/config.php
+               if(function_exists('display_messages')) {
+                       if(function_exists('atexit_now')) {
+                               atexit_now();
+                       }
+                       display_messages();
                }
-       } elseif($html_exists) {
-               $template = parse_template_file("$html_file");
+
+               tem_output();
        }
-       if($template) print fill_template($template, $data);
 }
 
 run_php();