Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bf91aed
)
API CHANGE for cms integration. Instead of calling cms_get() which should return...
author
Jason Woofenden
<jason283@herkamire.com>
Fri, 10 Apr 2009 05:12:54 +0000
(
01:12
-0400)
committer
Jason Woofenden
<jason283@herkamire.com>
Fri, 10 Apr 2009 05:12:54 +0000
(
01:12
-0400)
run.php
patch
|
blob
|
history
diff --git
a/run.php
b/run.php
index
b5b91a1
..
09b51b5
100644
(file)
--- a/
run.php
+++ b/
run.php
@@
-84,12
+84,24
@@
function run_php($dest = false) {
$html_exists = file_exists($html_file);
$php_exists = file_exists($php_file);
$html_exists = file_exists($html_file);
$php_exists = file_exists($php_file);
+ if(file_exists('template.html')) {
+ $GLOBALS['wfpl_main_template'] = new tem();
+ $GLOBALS['wfpl_main_template']->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
# 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_get')) {
- $cms_content = cms_get($basename);
+ if(function_exists('cms_display')) {
+ $cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
if(is_string($cms_content)) {
run_php($cms_content);
return;
if(is_string($cms_content)) {
run_php($cms_content);
return;
@@
-134,24
+146,13
@@
function run_php($dest = false) {
# Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
if($GLOBALS['wfpl_template']) {
# 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);
- }
+ if(isset($GLOBALS['wfpl_main_template'])) {
$sections = tem_top_subs();
if($sections) foreach($sections as $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_main_template']->append($name, $val);
}
}
- $GLOBALS['wfpl_template'] = $tem;
+ $GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
}
if(function_exists('display_messages')) {
}
if(function_exists('display_messages')) {