X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=template.php;h=45857afcecde5532be9c7651ac7a7bbb552bf29a;hb=0c70f6a8cdf46b61c8d30f918833b8f2d8522009;hp=1667cdead3e1c59287a0f422311b3c5b748e406e;hpb=dfd0f158f89020b3142e41127d21e48c8512aa1e;p=wfpl.git

diff --git a/template.php b/template.php
index 1667cde..45857af 100644
--- a/template.php
+++ b/template.php
@@ -57,15 +57,14 @@ function parse_template_file($filename) {
 	return parse_template(file_get_contents($filename));
 }
 
-# We parse the template string into a tree of strings and sub-templates.  
+# We parse the template string into a tree of strings and sub-templates.
 # A template is a hash with a name string, a pieces array, and possibly 
 # an args array.
 
 function parse_template($string) {
 	$tem =& tem_push();
 	$tem['pieces'] = array();
-	# note: for some reason this captures '<!--' but not '-->'.
-	$matches = preg_split("/(<!--)?(~[^~]*~)(?(1)-->)/", $string, -1, PREG_SPLIT_DELIM_CAPTURE);
+	$matches = preg_split('/(<!--)?(~[^~]*~)(?(1)-->)/', preg_replace('/<!--(~[^~]*~)-->/', '$1', $string), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 	foreach($matches as $match) {
 		if($match == '~~') $match = '~';
 		if(substr($match,0,1) == '~' and strlen($match) > 2) {
@@ -85,13 +84,13 @@ function parse_template($string) {
 				array_pop($args);  # drop '}'
 				$cur = $tem['name'];
 				if($name && $name != $cur) {
-				   	die("Invalid template: tried to close '$name', but '$cur' is current.");
+					die("Invalid template: tried to close '$name', but '$cur' is current.");
 				}
 				$tem =& $tem['parent'];
 			} else {  # value slot
 				$tem['pieces'][] = array('name' => $name, 'args' => $args);
 			}
-		} elseif($match and $match != '<!--') {  # static string
+		} else {  # static string
 			$tem['pieces'][] = $match;
 		}
 	}
@@ -209,7 +208,7 @@ function &tem_row_data($tem, $context)
 	if(count($tem['args'])) {
 		$auto_func = "tem_auto_" . $tem['args'][0];
 		function_exists($auto_func)
-		   	or die("ERROR: template auto function '$auto_func' not found.<br>\n");
+			or die("ERROR: template auto function '$auto_func' not found.<br>\n");
 	}
 	if($auto_func) $value = $auto_func($scope['data'][$key], $key, $scope);
 	else $value = $scope['data'][$key];
@@ -244,7 +243,7 @@ function top_sub_templates($tem, $is_sub = 'is_sub_template') {
 	$subs = array();
 	foreach($tem['pieces'] as $piece) {
 		if($is_sub($piece)) {
-		   	$subs[$piece['name']] = $piece;
+			$subs[$piece['name']] = $piece;
 		}
 	}
 	return $subs;
@@ -279,18 +278,32 @@ function merge_templates($main, $tem) {
 # 	<!--~rows {~-->
 # 		<!--~row {~-->
 # 			row content...
-# 			<!--~separator sep {~--><hr><!--~}"-->
+# 			<!--~separator sep {~--><hr><!--~}~-->
 # 		<!--~}~-->
 # 	<!--~}~-->
 #
 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 $value = 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
+}
+
+# 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
 }
 
 # 'show' sections will be shown unless the corresponding data value
-# is false.  We check only for false; 0 or '' will not work.
+# is false (only false, not 0 or '' or array()).
 
 function tem_auto_show(&$value) {
 	if($value !== false) $value = array(array());
@@ -301,8 +314,8 @@ function tem_auto_show(&$value) {
 # alternates between 'even' and 'odd'.
 
 function tem_auto_evenodd(&$values) {
-	$even = false;
-	foreach($values as &$value) {
+	$even = true;
+	if($values) foreach($values as &$value) {
 		$value['evenodd'] = $even ? 'even' : 'odd';
 		$even = !$even;
 	}
@@ -359,7 +372,7 @@ class tem {
 	function tem() {
 		$this->template = array('pieces' => array());
 		$this->data = array();
-   	}
+	}
 	
 	function set($key, $value) {
 		$this->data[$key] = $value;