X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=b5b91a18a1d66893802619a98b82056567587e27;hb=4a25d3b6318f7f361df3adfac17366452fe3ed49;hp=3eca719d96dcad15b698a0123855a2eedd6a6f87;hpb=a4e42e7c89f4c256ff2512902fb539a2279785ce;p=wfpl.git
diff --git a/run.php b/run.php
index 3eca719..b5b91a1 100644
--- a/run.php
+++ b/run.php
@@ -1,24 +1,9 @@
404404 File Not Found
';
}
- $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);
+
+ # 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;
}
- if(file_exists($html_file)) tem_output();
} else {
- if(file_exists($html_file)) {
- readfile($html_file);
- } else {
- header('HTTP/1.0 404 File Not Found');
- if(file_exists('404.php') || file_exists('404.html')) {
- run_php('404');
- } else {
- echo '404404 File Not Found
';
+ $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']) {
+ if(file_exists('template.html')) {
+ $tem = new tem();
+ $tem->load("template.html");
+ $tem->set('basename', $basename);
+ if($cms_content) foreach($cms_content as $name => $val) {
+ $tem->append($name, $val);
}
+ $sections = tem_top_subs();
+ if($sections) foreach($sections as $name => $val) {
+ $tem->append($name, $val);
+ }
+
+ if(file_exists("$basename.css")) {
+ $tem->set('css_link', "$basename.css");
+ $tem->sub('css_links');
+ }
+
+ $GLOBALS['wfpl_template'] = $tem;
+ }
+
+ if(function_exists('display_messages')) {
+ display_messages();
}
+ tem_output();
}
}