X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=a310e3f7728c2daa3a4c3f0b6765a96c0bbb2605;hb=eecd5e3576866afc8091abe9b74352130fd8e6cc;hp=d3fab6bfc37defe7529c10f73c0293a5349a726e;hpb=5c420c3747d026ef4645283bff65d4413ade21a3;p=wfpl.git diff --git a/run.php b/run.php index d3fab6b..a310e3f 100644 --- a/run.php +++ b/run.php @@ -1,24 +1,9 @@ -load("template.html"); + $GLOBALS['wfpl_main_template']->set('$basename', $basename); } - if($php_file != $html_file && file_exists($php_file)) { - require_once('code/wfpl/template.php'); - if(file_exists($html_file)) tem_load($html_file); - require $php_file; - if(file_exists($html_file)) tem_output(); + + # 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 '404

404 File Not Found

'; + echo '404

404 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(); } }