X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=7f8abd82a90788f9f03c83ff3c2154edcf2ebbee;hb=aed28998bb6d6be4f35ccc300de8a004507849c9;hp=f9c514e32512b12948813f0128c55e7f3a3464bd;hpb=1214af8fb0ee00f35f565b276998d42b9af0246f;p=wfpl.git
diff --git a/run.php b/run.php
index f9c514e..7f8abd8 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
-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_get')) {
- $cms_content = cms_get($basename);
+ # 3) a hash of key/value pairs to be tem_set() on the template
+ if(function_exists('cms_display')) {
+ $cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
if(is_string($cms_content)) {
run_php($cms_content);
return;
@@ -114,11 +114,13 @@ function run_php($dest = 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');
+ if(file_exists('error_404.php') || file_exists('error_404.html')) {
+ $GLOBALS['error_basename'] = $basename;
+ run_php('error_404');
return;
} else {
echo '404404 File Not Found
';
+ exit();
}
}
@@ -147,30 +149,29 @@ function run_php($dest = false) {
}
# 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($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']);
}
- if(file_exists("$basename.css")) {
- $tem->set('css_link', "$basename.css");
- $tem->sub('css_links');
- }
-
- $GLOBALS['wfpl_template'] = $tem;
+ $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.
if(function_exists('display_messages')) {
display_messages();
}
+
tem_output();
}
}