X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=7f8abd82a90788f9f03c83ff3c2154edcf2ebbee;hb=aed28998bb6d6be4f35ccc300de8a004507849c9;hp=b5b91a18a1d66893802619a98b82056567587e27;hpb=856f805c6cbb6e712c662214f3b5821442f808a0;p=wfpl.git diff --git a/run.php b/run.php index b5b91a1..7f8abd8 100644 --- a/run.php +++ b/run.php @@ -1,8 +1,8 @@ -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'); + } + } + # 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(key,value) on the template - if(function_exists('cms_get')) { - $cms_content = cms_get($basename); + # 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; @@ -100,11 +114,13 @@ function run_php($dest = false) { if(!$php_exists && !$html_exists && !$cms_content) { header('HTTP/1.0 404 File Not Found'); - if(file_exists('404.php') || file_exists('404.html')) { - run_php('404'); + if(file_exists('error_404.php') || file_exists('error_404.html')) { + $GLOBALS['error_basename'] = $basename; + run_php('error_404'); return; } else { echo '