X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=a310e3f7728c2daa3a4c3f0b6765a96c0bbb2605;hb=51cf6721f37220e1277c71545b87dcc01fbf7e81;hp=7f8abd82a90788f9f03c83ff3c2154edcf2ebbee;hpb=aed28998bb6d6be4f35ccc300de8a004507849c9;p=wfpl.git
diff --git a/run.php b/run.php
index 7f8abd8..a310e3f 100644
--- a/run.php
+++ b/run.php
@@ -72,13 +72,13 @@ function run_php($dest = false) {
} else { # no dest arg
$basename = $_SERVER['REDIRECT_URL'];
$basename = ereg_replace('.*/', '', $basename);
- $basename = ereg_replace('\.html$', '', $basename);
+ $basename = ereg_replace('\.html?$', '', $basename);
if($basename == '') {
$basename = 'index';
}
}
- $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('$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 '404404 File Not Found
';
+ echo '404404 File Not Found
';
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);
@@ -161,14 +155,13 @@ function run_php($dest = false) {
$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.
+
+ # 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();
}