X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=a310e3f7728c2daa3a4c3f0b6765a96c0bbb2605;hb=5a2ac791b1c0ae217a7dba9f972d22b900303932;hp=1b5b19bd4bb07a76874a9d3d74ed4eaaf8b24118;hpb=1b701682c788072eb0d469fc77b2925fc8ef16b5;p=wfpl.git
diff --git a/run.php b/run.php
index 1b5b19b..a310e3f 100644
--- a/run.php
+++ b/run.php
@@ -1,24 +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 {
- if(file_exists($html_file)) {
- require $html_file;
+ $cms_content = false;
+ }
+
+ if(!$php_exists && !$html_exists && !$cms_content) {
+ header('HTTP/1.0 404 File Not Found');
+ if(file_exists('error_404.php') || file_exists('error_404.html')) {
+ $GLOBALS['error_basename'] = $basename;
+ run_php('error_404');
+ return;
} else {
- header('HTTP/1.0 404 File Not Found');
- if(file_exists('404.php') || file_exists('404.html')) {
- run_php('404');
- } else {
- echo '
404404 File Not Found
';
+ echo '404404 File Not Found
';
+ exit();
+ }
+ }
+
+ # If there's no template.html we don't want to parse $html_file.
+ if($html_exists && !$php_exists && !file_exists('template.html')) {
+ readfile($html_file);
+ exit();
+ }
+
+ if($html_exists) {
+ tem_load_new($html_file);
+ }
+
+ if($php_exists) {
+ # files can return a basename or URL of a page to be run/displayed
+ $other = file_run($php_file);
+ if($other) {
+ run_php($other);
+ return;
+ }
+ } elseif($html_exists) {
+ $sub_names = tem_top_sub_names();
+ foreach($sub_names as $sub_name) {
+ tem_sub($sub_name);
+ }
+ }
+
+ # Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
+ 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();
}
}