metaform: new names for standard template sections

[wfpl.git] / run.php
diff --git a/run.php b/run.php

index 197dc76..2791852 100644 (file)
--- a/run.php
+++ b/run.php
@@ -1,4 +1,4 @@
-<?php
+<?php  # Transitional; supports both template APIs
  
  #  2006 Public Domain
  #
@@ -78,7 +78,7 @@ function run_php($dest = false) {
                 }
         }
  
-       $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('wfpl_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() 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);