X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=b5b91a18a1d66893802619a98b82056567587e27;hb=4a25d3b6318f7f361df3adfac17366452fe3ed49;hp=dac7bc4d6fb95ec96d48e860c0fcfab1421548b9;hpb=a679272cb862dd647da227cc720cd4d4853887c0;p=wfpl.git
diff --git a/run.php b/run.php
index dac7bc4..b5b91a1 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
404404 File Not Found
';
- }
+ echo '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(file_exists($html_file)) {
- $GLOBALS['wfpl_template'] = new tem();
- tem_load($html_file);
+ if($html_exists) {
+ tem_load_new($html_file);
}
- $other = file_run($php_file);
- if($other) {
- if(strpos($other, ':')) {
- redirect($other);
- exit();
+ 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;
+ }
+ } else {
+ $sub_names = tem_top_sub_names();
+ foreach($sub_names as $sub_name) {
+ tem_sub($sub_name);
}
- run_php($other);
- return;
}
+ # 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->set($name, $val);
+ $tem->append($name, $val);
}
if(file_exists("$basename.css")) {