X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=template.php;h=24252757a919ab5e1a25bc1bc317d3dfb76c1e5a;hb=7add2ea3f61e40c5f0f5539ac6e02533c9390db4;hp=43cceae9aa420938498602d32a01cd8f61b094ab;hpb=848c8a4d215f9cce1db0a7d37e733b5959b8210f;p=wfpl.git

diff --git a/template.php b/template.php
index 43cceae..2425275 100644
--- a/template.php
+++ b/template.php
@@ -36,7 +36,8 @@
 # them is run
 
 require_once('code/wfpl/encode.php');
-require_once('code/wfpl/misc.php'); # to get read_whole_file()
+require_once('code/wfpl/misc.php');
+require_once('code/wfpl/file.php');
 
 class tem {
 	var $keyval;        # an array containing key/value pairs 
@@ -129,40 +130,46 @@ class tem {
 		} #repeat
 	}
 
+	# like load() except you pass a string instead of a filename
+	function load_str($str) {
+		$this->template = '';
+		$parents = array('top_level_subs' => array());
+		$parent = 'top_level_subs';
+		$this->_load($str, $this->template, $parents, $parent);
+	}
+
 	# This is useful when you have sub-templates that you want to mess with
 	# before the main template is run. But can also be used to simply specify
 	# the filename ahead of time.
 	function load($filename) {
 		$this->filename = $filename;
-		$tmp = read_whole_file($filename);
-		$this->template = '';
-		$parents = array('top_level_subs' => array());
-		$parent = 'top_level_subs';
-		$this->_load($tmp, $this->template, $parents, $parent);
+		$this->load_str(read_whole_file($filename));
 	}
 		
 	# Run the template. Pass a filename, or a string, unless you've already
 	# specified a template with load()
 	function run($templ = false) {
+		$template_string = $this->template;
+		$template_file = $this->file;
 		if($templ !== false) {
 			if(strlen($templ) < 150 && file_exists($templ)) {
-				$this->filename = $templ;
-				unset($this->template);
+				$template_file = $templ;
+				unset($template_string);
 			} else {
-				$this->template = $templ;
+				$template_string = $templ;
 			}
 		}
 
-		if(!$this->template) {
-			if(!$this->filename) {
+		if(!$template_string) {
+			if(!$template_file) {
 				print "sorry, no template to run\n";
 				exit(1);
 			}
 
-			$this->template = read_whole_file($this->filename);
+			$template_string = read_whole_file($template_file);
 		}
 		
-		return template_run($this->template, $this->keyval);
+		return template_run($template_string, $this->keyval);
 	}	
 
 	# same as run() except the output is print()ed
@@ -239,7 +246,7 @@ function template_filler($matches) {
 		foreach($encs as $enc) {
 			$enc = "enc_$enc";
 			if(function_exists($enc)) {
-				$value = $enc($value);
+				$value = $enc($value, $tag);
 			} else {
 				print "ERROR: encoder function '$enc' not found.<br>\n";
 				exit(1);