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 52aac2e..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
@@ -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();
@@ -72,13 +72,13 @@ 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['basename'] = $basename;
+       $GLOBALS['wfpl_basename'] = $basename;
 
        $html_file = "$basename.html";
        $php_file = "$basename.php";
@@ -89,19 +89,13 @@ function run_php($dest = false) {
        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');
-               }
+               $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 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
+       # 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)) {
@@ -119,7 +113,7 @@ function run_php($dest = false) {
                        run_php('error_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>';
+                       echo '<!DOCTYPE html><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
                        exit();
                }
        }
@@ -141,7 +135,7 @@ function run_php($dest = false) {
                        run_php($other);
                        return;
                }
-       } else {
+       } elseif($html_exists) {
                $sub_names = tem_top_sub_names();
                foreach($sub_names as $sub_name) {
                        tem_sub($sub_name);
@@ -155,23 +149,19 @@ function run_php($dest = false) {
                        # site, copy all template sections that have been show()n to the
                        # site-wide template
                        if($GLOBALS['wfpl_template']) {
-                               $sections = tem_top_subs();
-                               if($sections) foreach($sections as $name => $val) {
-                                       $GLOBALS['wfpl_main_template']->append($name, $val);
-                               }
+                               $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.
+
+               # 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();
                }