X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=template.php;h=a20fd64b775964f4ee78e1165961d3ce335f5873;hb=66b97fc1bbcae31d1f503d491cb23d01659b7b4b;hp=af66590a84928c4455590f3b7cec8df0992ac3b1;hpb=8d25453fae8f4d0d49f45942417cab339ead58d0;p=wfpl.git

diff --git a/template.php b/template.php
index af66590..a20fd64 100644
--- a/template.php
+++ b/template.php
@@ -53,7 +53,7 @@ function template_file($filename, $data) {
 	return fill_template(parse_template_file($filename), $data);
 }
 
-function parse_template_file($filename) {
+function &parse_template_file($filename) {
 	return parse_template(file_get_contents($filename));
 }
 
@@ -61,7 +61,7 @@ function parse_template_file($filename) {
 # A template is a hash with a name string, a pieces array, and possibly 
 # an args array.
 
-function parse_template($string) {
+function &parse_template($string) {
 	$tem =& tem_push();
 	$tem['pieces'] = array();
 	$matches = preg_split('/(<!--)?(~[^~]*~)(?(1)-->)/', preg_replace('/<!--(~[^~]*~)-->/', '$1', $string), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
@@ -157,13 +157,15 @@ function &tem_push(&$stack = NULL) {
 
 # The middle form will be converted to the last form as we use it.
 
-function tem_data_as_rows($value) {
+function tem_data_as_rows($value, $key) {
 	if(is_array($value)) {
-		# numeric keys, is already array of arrays -- expand sub-template for each.
-		if(array_key_exists(0, $value)) return $value;
+		# numeric keys
+		if(array_key_exists(0, $value)) {
+			if(is_array($value[0])) return $value;  # already array of hashes.
+			else return columnize($value, $key);
 		# key/value pairs -- expand sub-template once.
-		else return array($value);
-	} elseif($value) {
+		} else return array($value);
+	} elseif($value || $value === 0 || $value === '0' || $value === '') {
 		# value -- expand sub-template once using only parent values
 		return array(array());
 	} else {
@@ -213,7 +215,7 @@ function &tem_row_data($tem, $context)
 	if($auto_func) $value = $auto_func($scope['data'][$key], $key, $scope);
 	else $value = $scope['data'][$key];
 
-	$rows = tem_data_as_rows($value);
+	$rows = tem_data_as_rows($value, $key);
 	if(is_array($value)) $scope['data'][$key] = $rows;
 
 	return $rows;
@@ -233,10 +235,14 @@ function tem_encoded_data($tag, $context)
 }
 
 
-function is_sub_template($piece) {
+function is_sub_template(&$piece) {
 	return is_array($piece) and $piece['pieces'];
 }
 
+function is_value_slot(&$piece) {
+	return is_array($piece) and !$piece['pieces'];
+}
+
 # Return a hash containing the top-level sub-templates of tem.
 function top_sub_templates($tem, $is_sub = 'is_sub_template') {
 	function_exists($is_sub) or die("no such function '$is_sub'.");
@@ -249,22 +255,33 @@ function top_sub_templates($tem, $is_sub = 'is_sub_template') {
 	return $subs;
 }
 
-# Replace top-level values in $main with top-level templates from $tem.
-function merge_templates($main, $tem) {
-	$out = array('name' => $main['name'], 'pieces' => array());
-
-	$subs = top_sub_templates($tem);
-
-	foreach($main['pieces'] as $piece) {
-		$sub = $subs[$piece['name']];
-		if(is_array($piece) and !$piece['pieces'] and $sub and $sub['args'][0] != 'hide') {
-			$piece = $subs[$piece['name']];
+# merge $subs (sub_templates) into variables in $main (template)
+function merge_sub_templates(&$main, &$subs) {
+	foreach($main['pieces'] as &$piece) {
+		if(is_array($piece)) { # not just text
+			if($piece['pieces']) {
+				# a sub-template in main
+				merge_sub_templates($piece, $subs);
+			} else {
+				# a value-slot in main
+				$sub = $subs[$piece['name']];
+				if($sub and $sub['args'][0] != 'hide') {
+					$piece = $subs[$piece['name']];
+					$piece['parent'] =& $main;
+				}
+			}
 		}
-		$out['pieces'][] = $piece;
 	}
 	return $out;
 }
 
+# Replace values in $main with top-level templates from $tem.
+function merge_templates(&$main, &$tem) {
+	$subs = top_sub_templates($tem);
+
+	merge_sub_templates($main, $subs);
+}
+
 
 
 # tem_auto functions
@@ -285,34 +302,56 @@ function merge_templates($main, $tem) {
 function tem_auto_sep(&$value, $key, $context) {
 	$rows =& $context['parent']['parent'];
 	if($rows['cur'] != count($rows['rows'])-1)  # last row?
-		return $value = true;  # show once
+		return true;  # show once
 }
 
 # auto-show once, only when this is the first row of the parent
 function tem_auto_last(&$value, $key, $context) {
 	$rows =& $context['parent']['parent'];
 	if($rows['cur'] == count($rows['rows'])-1)  # last row?
-		return $value = true;  # show once
+		return true;  # show once
 }
 
 # auto-show once, only when this is the last row of the parent
 function tem_auto_first(&$value, $key, $context) {
 	$rows =& $context['parent']['parent'];
 	if($rows['cur'] == 0)  # first row?
-		return $value = true;  # show once
+		return true;  # show once
 }
 
-# 'show' sections will be shown unless the corresponding data value
-# is false (only false, not 0 or '' or array()).
-
+# 'show' sections will be shown unless the corresponding data
+# value === false
 function tem_auto_show(&$value) {
-	if($value !== false) $value = array(array());
+	if($value === null) return true;
+	return $value;
+}
+
+# 'empty' sections will be shown only if the corresponding data value is the
+# empty string
+function tem_auto_empty(&$value) {
+	if($value === '') return true;
+	return null;
+}
+
+# 'nonempty' sections will not be shown if the corresponding data
+# value is the empty string
+function tem_auto_nonempty(&$value) {
+	if($value === '') return null;
 	return $value;
 }
 
+# 'unset' sections will not be shown if the corresponding data
+# value is not set (opposite of default)
+function tem_auto_unset(&$value) {
+	if($value === null) {
+		return '';
+	} else {
+		return null;
+	}
+}
+
 # 'evenodd' sections are given an 'evenodd' attribute whose value
 # alternates between 'even' and 'odd'.
-
 function tem_auto_evenodd(&$values) {
 	$even = true;
 	if($values) foreach($values as &$value) {
@@ -322,6 +361,27 @@ function tem_auto_evenodd(&$values) {
 	return $values;
 }
 
+# 'once' sections are shown exactly once if the value is set (and not at all
+# otherwise.) This is useful when an array value would otherwise cause the
+# section to be displayed multiple times.
+function tem_auto_once(&$value) {
+	if($value === null) return null;
+	return true;
+}
+
+function tem_auto_once_if(&$value) {
+	if($value) return true;
+	return null;
+}
+
+# 'once' sections are shown exactly once if php evaluates the value to false
+# (and not at all otherwise.) This is useful when an array value would
+# otherwise cause the section to be displayed multiple times.
+function tem_auto_once_else(&$value) {
+	if($value) return null;
+	return true;;
+}
+
 
 
 
@@ -374,10 +434,16 @@ class tem {
 		$this->data = array();
 	}
 	
-	function set($key, $value) {
+	function set($key, $value = true) {
 		$this->data[$key] = $value;
 	}
 
+	function sets($hash) {
+		foreach($hash as $key => $value) {
+			$this->set($key, $value);
+		}
+	}
+
 	function append($key, $value) {
 		$this->data[$key] .= $value;
 	}
@@ -409,11 +475,11 @@ class tem {
 	}
 
 	function load_str($str) {
-		$this->template = parse_template($str);
+		$this->template =& parse_template($str);
 	}
 
 	function load($filename) {
-		$this->template = parse_template_file($filename);
+		$this->template =& parse_template_file($filename);
 	}
 
 	function run($tem = false) {
@@ -442,7 +508,7 @@ class tem {
 
 		# merge the data arrays and template trees (new style)
 		$this->data = array_merge($this->data, $tem->data);
-		$this->template = merge_templates($this->template, $tem->template);
+		merge_templates($this->template, $tem->template);
 	}
 
 	# see merge() above
@@ -487,11 +553,16 @@ function tem_prepend($key, $value) {
 	$GLOBALS['wfpl_template']->prepend($key, $value);
 }
 
-function tem_set($key, $value) {
+function tem_set($key, $value = true) {
 	tem_init();
 	$GLOBALS['wfpl_template']->set($key, $value);
 }
 
+function tem_sets($hash) {
+	tem_init();
+	$GLOBALS['wfpl_template']->sets($hash);
+}
+
 function tem_get($key) {
 	tem_init();
 	return $GLOBALS['wfpl_template']->get($key);