X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;fp=run.php;h=26a8b36fffc9a14d1937b48380eb829e57fe9b19;hb=ba50d9a564ca3b8637212c634b5a61a38e6feb9f;hp=52aac2e943aca9e7f84dba5afab2f9407b570e10;hpb=fa74cebf2b6bec017dbcc5e19121f10adbaf3aec;p=wfpl.git
diff --git a/run.php b/run.php
index 52aac2e..26a8b36 100644
--- a/run.php
+++ b/run.php
@@ -54,7 +54,7 @@ if(file_exists('code/config.php')) {
# pass http://foo.com/bar.html to redirect to a full directory
function run_php($dest = false) {
if($dest) {
- # if it's got a : it must be a full URL, redirect
+ # if it has a : it must be a full URL, redirect
if(strpos($dest, ':')) {
redirect($dest);
exit();
@@ -78,60 +78,22 @@ function run_php($dest = false) {
}
}
- $GLOBALS['basename'] = $basename;
-
$html_file = "$basename.html";
$php_file = "$basename.php";
$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');
- }
- }
-
# 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_display')) {
- $cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
+ # 2) a string to request a soft/full redirect just like foo_main()
+ # 3) a hash of key/value pairs to be added to the template
+ if(function_exists('cms_get')) {
+ $cms_content = cms_get($basename);
if(is_string($cms_content)) {
run_php($cms_content);
return;
}
- } else {
- $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 {
- echo '404404 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) {
@@ -141,42 +103,41 @@ function run_php($dest = false) {
run_php($other);
return;
}
- } else {
- $sub_names = tem_top_sub_names();
- foreach($sub_names as $sub_name) {
- tem_sub($sub_name);
+ } elseif($html_exists) {
+ readfile($html_file);
+ exit();
+ } elseif(!$cms_content) {
+ header('HTTP/1.0 404 File Not Found');
+ if(file_exists('404.php') || file_exists('404.html')) {
+ run_php('404');
+ return;
+ } else {
+ echo '404404 File Not Found
';
}
}
- # 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']) {
- $sections = tem_top_subs();
- if($sections) foreach($sections as $name => $val) {
- $GLOBALS['wfpl_main_template']->append($name, $val);
- }
- }
-
- $GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
- }
+ $data = &$GLOBALS['wfpl_template'];
+ $data['basename'] = $basename;
+ if(function_exists('display_messages')) {
+ display_messages();
+ }
+ if($cms_content) foreach($cms_content as $name => $value) {
+ $data[$name] .= $value;
+ }
+ if(file_exists("$basename.css")) {
+ $data['css_link'] = "$basename.css";
+ }
- # 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();
+ if(file_exists("template.html")) {
+ $template = parse_template_file("template.html");
+ if($html_exists) {
+ $subs = parse_template_file($html_file);
+ $template = merge_templates($template, $subs);
}
-
- tem_output();
+ } elseif($html_exists) {
+ $template = parse_template_file("$html_file");
}
+ if($template) print fill_template($data, $template);
}
run_php();