X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=8c780de35483623f8a74c0a36b90b081909f0b63;hb=7da703686e6dd157999a52aa021a4dde6417a4ea;hp=716e3643be804ab6afcf032c811c820db4fa164b;hpb=f303b9521b6ea3195ccdedfbdb9edd39fcd649f7;p=wfpl.git diff --git a/run.php b/run.php index 716e364..8c780de 100644 --- a/run.php +++ b/run.php @@ -1,24 +1,9 @@ -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'); + } } - 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 '