X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=bb9bed55f42fff4e23fccac457cb0558a1e1876d;hb=a6f8b885180ef3e009e28d723dd05734eb0d4ef5;hp=d3fab6bfc37defe7529c10f73c0293a5349a726e;hpb=5c420c3747d026ef4645283bff65d4413ade21a3;p=wfpl.git diff --git a/run.php b/run.php index d3fab6b..bb9bed5 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'); } - $php_file = ereg_replace('\.html$', '.php', $html_file); } - 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) false to indicate that there's no cms content for this basename + # 2) a string to indicate a soft/full redirect just as foo_main() + # 3) a hash of key/value pairs to be tem_set() on the template + 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 '