X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=a310e3f7728c2daa3a4c3f0b6765a96c0bbb2605;hb=4d60646f1351c4ec8707d783ca6922dbe455edcc;hp=09b51b56b5d7068e93fc7261348af4977b48a504;hpb=7596b1ca035ff09e584e915a6e5572ffb46d7625;p=wfpl.git
diff --git a/run.php b/run.php
index 09b51b5..a310e3f 100644
--- a/run.php
+++ b/run.php
@@ -1,8 +1,8 @@
-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)) {
@@ -112,11 +108,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
';
+ echo '404404 File Not Found
';
+ exit();
}
}
@@ -137,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);
@@ -145,19 +143,28 @@ 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(isset($GLOBALS['wfpl_main_template'])) {
- $sections = tem_top_subs();
- if($sections) foreach($sections as $name => $val) {
- $GLOBALS['wfpl_main_template']->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']);
}
$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
}
+
+ # 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();
}
+
tem_output();
}
}