X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=52aac2e943aca9e7f84dba5afab2f9407b570e10;hb=1920aba45e9151c51e555709e0d05da9aac01fc3;hp=09b51b56b5d7068e93fc7261348af4977b48a504;hpb=7596b1ca035ff09e584e915a6e5572ffb46d7625;p=wfpl.git
diff --git a/run.php b/run.php
index 09b51b5..52aac2e 100644
--- a/run.php
+++ b/run.php
@@ -78,6 +78,8 @@ function run_php($dest = false) {
}
}
+ $GLOBALS['basename'] = $basename;
+
$html_file = "$basename.html";
$php_file = "$basename.php";
@@ -112,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();
}
}
@@ -145,19 +149,32 @@ 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']) {
+ $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 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();
}
}