X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=4e56e98237ed5c00654293628c479996e991e9bf;hb=2fddd1bc2f365493413587107c742e00a92e0af0;hp=24072029821ecc46929272b9cf8a7dce902e9435;hpb=bdcec472dcd1e9fc6ff9df137f838f1f3124ec9c;p=wfpl.git
diff --git a/run.php b/run.php
index 2407202..4e56e98 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
404404 File Not Found
';
+ if(is_string($cms_content)) {
+ run_php($cms_content);
+ return;
}
}
- # 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();
- }
- if(substr($other, 0, 2) == './') {
- redirect(ereg_replace('/[^/]*$', substr($other, 1), this_url()));
- exit();
- }
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']) {
- if(file_exists('template.html')) {
- $tem = new tem();
- $tem->load("template.html");
- 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;
- }
+ $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(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($template, $data);
}
run_php();