fixed pulldowns, metaform suppors zip and decimal, run.php supports straight html...

[wfpl.git] / template.php

diff --git a/template.php b/template.php
index 2425275..822738b 100644 (file)
--- a/template.php
+++ b/template.php
@@ -177,6 +177,15 @@ class tem {
                print($this->run($templ));
        }
 
+       # return the names of the top level subs, or an empty array
+       function top_sub_names() {
+               if(isset($this->sub_subs['top_level_subs'])) {
+                       return $this->sub_subs['top_level_subs'];
+               } else {
+                       return array();
+               }
+       }
+
        # return the contents of the top-level sub-templates
        #
        # this does not run the sub-templates, so if you've not called tem_sub() on them, they will be blank.
@@ -186,10 +195,9 @@ class tem {
        #     values: contents of said sub-template.
        function top_subs() {
                $ret = array();
-               if(isset($this->sub_subs['top_level_subs'])) {
-                       foreach($this->sub_subs['top_level_subs'] as $name) {
-                               $ret[$name] = $this->get($name);
-                       }
+               $names = $this->top_sub_names();
+               foreach($names as $name) {
+                       $ret[$name] = $this->get($name);
                }
                return $ret;
        }
@@ -264,9 +272,22 @@ function template_run($template, &$keyval) {
        return preg_replace_callback(array('|<!--~([^~]*)~-->|', '|~([^~]*)~|', '|<span class="template">([^<]*)</span>|', '|<p class="template">([^<]*)</p>|'), 'template_filler', $template);
 }
 
+function tem_top_sub_names() {
+       tem_init();
+       return $GLOBALS['wfpl_template']->top_sub_names();
+}
+
 function tem_top_subs() {
        tem_init();
        return $GLOBALS['wfpl_template']->top_subs();
 }
 
+# replaces currently set template, and returns the old.
+function tem_load_new($file) {
+       $old = $GLOBALS['wfpl_template'];
+       $GLOBALS['wfpl_template'] = new tem();
+       $GLOBALS['wfpl_template']->load($file);
+       return $old;
+}
+
 ?>