X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=a310e3f7728c2daa3a4c3f0b6765a96c0bbb2605;hb=47d8b4705be324d466c0c4d12c5f808f0a02d09b;hp=e861bb200ae014cf0bff178469da1166fd0aa0f0;hpb=b7aee26390165baf2ca97ea7de2c577cc2456748;p=wfpl.git
diff --git a/run.php b/run.php
index e861bb2..a310e3f 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
-load("template.html");
+ $GLOBALS['wfpl_main_template']->set('$basename', $basename);
+ }
+
+ # cms_get can return one of:
+ # 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)) {
+ run_php($cms_content);
+ return;
+ }
} else {
$cms_content = 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();
}
}
@@ -108,18 +132,10 @@ function run_php($basename = false) {
# files can return a basename or URL of a page to be run/displayed
$other = file_run($php_file);
if($other) {
- if(strpos($other, ':')) {
- redirect($other);
- exit();
- }
- if(substr($other, 0, 2) == './') {
- redirect(ereg_replace('/[^/]*$', substr($other, 1), this_url()));
- exit();
- }
run_php($other);
return;
}
- } else {
+ } elseif($html_exists) {
$sub_names = tem_top_sub_names();
foreach($sub_names as $sub_name) {
tem_sub($sub_name);
@@ -127,30 +143,28 @@ function run_php($basename = 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(file_exists("$basename.css")) {
- $tem->set('css_link', "$basename.css");
- $tem->sub('css_links');
+ 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'] = $tem;
+ $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();
}
}