X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=8c780de35483623f8a74c0a36b90b081909f0b63;hb=7b2c07787abcab33f2e38f1662fc2287befb2794;hp=3d26e492ca73753714fcb8400286998df4bb1a4f;hpb=35e4253b00be3446ee4ff00c28b1cf7240dbf334;p=wfpl.git
diff --git a/run.php b/run.php
index 3d26e49..8c780de 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
-
404404 File Not Found
';
- }
+ $html_exists = file_exists($html_file);
+ $php_exists = file_exists($php_file);
+
+ 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');
}
- exit();
}
- if(file_exists($html_file)) {
- $GLOBALS['wfpl_template'] = new tem();
- tem_load($html_file);
+ # 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;
}
- $other = file_run($php_file);
- if($other) {
- if(strpos($other, ':')) {
- redirect($other);
+ 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 {
+ echo '404404 File Not Found
';
exit();
}
- run_php($other);
- return;
}
- if($GLOBALS['wfpl_template']) {
- if(file_exists('template.html')) {
- $tem = new tem();
- $tem->load("template.html");
- $sections = tem_top_subs();
- if($sections) foreach($sections as $name => $val) {
- $tem->set($name, $val);
- }
+ # 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(file_exists("$basename.css")) {
- $tem->set('basename', $basename);
- $tem->sub('css_links');
+ 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'] = $tem;
+ $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();
}
}