X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=run.php;h=09b51b56b5d7068e93fc7261348af4977b48a504;hb=7596b1ca035ff09e584e915a6e5572ffb46d7625;hp=f77e7d026c710aa061551bbc60ee73dd8bb856d0;hpb=d98d81886649a863d0e902f7c4e63b1257217e1f;p=wfpl.git
diff --git a/run.php b/run.php
index f77e7d0..09b51b5 100644
--- a/run.php
+++ b/run.php
@@ -1,23 +1,9 @@
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']);
+ 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('404.php') || file_exists('404.html')) {
run_php('404');
+ return;
} else {
echo '404404 File Not Found
';
}
@@ -102,14 +134,6 @@ function run_php($basename = false) {
# 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;
}
@@ -122,20 +146,13 @@ function run_php($basename = false) {
# 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(isset($GLOBALS['wfpl_main_template'])) {
$sections = tem_top_subs();
if($sections) foreach($sections as $name => $val) {
- $tem->set($name, $val);
- }
-
- if(file_exists("$basename.css")) {
- $tem->set('css_link', "$basename.css");
- $tem->sub('css_links');
+ $GLOBALS['wfpl_main_template']->append($name, $val);
}
- $GLOBALS['wfpl_template'] = $tem;
+ $GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
}
if(function_exists('display_messages')) {