X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=run.php;h=b5b91a18a1d66893802619a98b82056567587e27;hb=8ef1f36849dc9f50ad2d5c19bef126ab3c9e454b;hp=03d849afb636727f2ce6643556b539633eb8a358;hpb=d03e8554ee3e80a6333126e67dd4c20f54ec700e;p=wfpl.git
diff --git a/run.php b/run.php
index 03d849a..b5b91a1 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
404404 File Not Found
';
+ }
+ }
+
+ # 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) {
- if(strpos($other, ':')) {
- redirect($other);
- exit();
- }
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();
}
}