* template.php: changed arg order, new context stack implementation.

[wfpl.git] / run.php

diff --git a/run.php b/run.php
index 09b51b5..4e56e98 100644 (file)
--- a/run.php
+++ b/run.php
@@ -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();
@@ -84,33 +84,29 @@ function run_php($dest = false) {
        $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);
-
-               # 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');
-               }
-       }
-
        # 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_display')) {
-               $cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
+       # 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);
                if(is_string($cms_content)) {
                        run_php($cms_content);
                        return;
                }
-       } else {
-               $cms_content = false;
        }
 
-       if(!$php_exists && !$html_exists && !$cms_content) {
+       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;
+               }
+       } 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');
@@ -120,46 +116,28 @@ function run_php($dest = false) {
                }
        }
 
-       # 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();
+       $data = &$GLOBALS['wfpl_template'];
+       $data['basename'] = $basename;
+       if(function_exists('display_messages')) {
+               display_messages();
        }
-
-       if($html_exists) {
-               tem_load_new($html_file);
+       if($cms_content) foreach($cms_content as $name => $value) {
+               $data[$name] .= $value;
        }
-
-       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);
-               }
+       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']) {
-               if(isset($GLOBALS['wfpl_main_template'])) {
-                       $sections = tem_top_subs();
-                       if($sections) foreach($sections as $name => $val) {
-                               $GLOBALS['wfpl_main_template']->append($name, $val);
-                       }
-
-                       $GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
-               }
-
-               if(function_exists('display_messages')) {
-                       display_messages();
+       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);
                }
-               tem_output();
+       } elseif($html_exists) {
+               $template = parse_template_file("$html_file");
        }
+       if($template) print fill_template($template, $data);
 }
 
 run_php();