X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=template.php;h=fa0affbe3268535879395d2c8bf2402049784542;hp=5d35ff7731aa1d095808d03fd33b3fa44789fd8c;hb=062d46e16429f2e55573567518cb01c83b319ac4;hpb=571c58fff7b139f590b5c4862761092bc1045436

diff --git a/template.php b/template.php
index 5d35ff7..fa0affb 100644
--- a/template.php
+++ b/template.php
@@ -37,9 +37,9 @@
 # tem_auto_* function to munge the data, automating certain common use 
 # cases.  See the comments on the tem_auto functions for more details.
 
-require_once(__DIR__ . '/encode.php');
-require_once(__DIR__ . '/file.php');
-require_once(__DIR__ . '/misc.php');
+require_once(__DIR__.'/'.'encode.php');
+require_once(__DIR__.'/'.'file.php');
+require_once(__DIR__.'/'.'misc.php');
 
 
 # Top-Level Functions
@@ -73,14 +73,14 @@ function &parse_template($string) {
 			if(count($args) == 1 and $args[0] == '}') $name = '';
 			else $name = array_shift($args);
 
-			if(last($args) == '{') {  # open block
+			if(count($args) && $args[count($args)-1] == '{') {  # open block
 				array_pop($args);  # drop '{'
 				$tem =& tem_push($tem);              # create a new sub-template
 				$tem['parent']['pieces'][] =& $tem;  # as a piece of the parent
 				$tem['name'] = $name;
 				$tem['pieces'] = array();
 				$tem['args'] = $args;
-			} elseif(last($args) == '}') {  # close block
+			} elseif(count($args) && $args[count($args)-1] == '}') {  # close block
 				array_pop($args);  # drop '}'
 				$cur = $tem['name'];
 				if($name && $name != $cur) {
@@ -100,10 +100,11 @@ function &parse_template($string) {
 function fill_template($template, &$data, &$context = NULL) {
 	$context =& tem_push($context);
 	$context['data'] =& $data;
+	$output = '';
 
 	foreach($template['pieces'] as $tem) {
 		if(is_string($tem)) $output .= $tem;
-		elseif($tem['pieces']) {  # sub-template
+		elseif(isset($tem['pieces'])) {  # sub-template
 			$rows =& tem_row_data($tem, $context);
 			$context['rows'] =& $rows;
 			foreach($rows as $key => &$row) {
@@ -185,19 +186,19 @@ function tem_data_scope($key, $context) {
 		if(array_key_exists($key, $scope['data'])) {
 			return $scope;
 		}
-	} while($scope = $scope['parent']);
+	} while($scope = isset($scope['parent']) ? $scope['parent'] : null);
 
 	# not found; return empty scope.
 	$refs[] = array();
 	$ret = array();
 	$ret['parent'] =& $context;
-	$ret['data'] =& last($refs);
+	$ret['data'] =& $refs[count($refs) - 1];
 	return $ret;
 }
 
 function tem_get_data($key, $context) {
 	$scope = tem_data_scope($key, $context);
-	if($scope) return $scope['data'][$key];
+	if($scope) return isset($scope['data'][$key]) ? $scope['data'][$key] : null;
 }
 
 # Return the value for a tag as a set of rows to fill a sub-template.
@@ -206,6 +207,7 @@ function &tem_row_data($tem, $context)
 {
 	$key = $tem['name'];
 	$scope = tem_data_scope($key, $context);
+	$auto_func = false;
 
 	if(count($tem['args'])) {
 		$auto_func = "tem_auto_" . $tem['args'][0];
@@ -214,13 +216,15 @@ function &tem_row_data($tem, $context)
 		}
 		# NAMESPACIFY $auto_func
 	}
+	$value = isset($scope['data'][$key]) ? $scope['data'][$key] : null;
 	if ($auto_func) {
-		$value = $auto_func($scope['data'][$key], $key, $scope, $tem['args']);
+		$value = $auto_func($value, $key, $scope, $tem['args']);
 	}
-	else $value = $scope['data'][$key];
 
 	$rows = tem_data_as_rows($value, $key);
-	if(is_array($value)) $scope['data'][$key] = $rows;
+	if(is_array($value)) {
+		$scope['data'][$key] = $rows;
+	}
 
 	return $rows;
 }
@@ -244,11 +248,11 @@ function tem_encoded_data($tag, $context)
 
 
 function is_sub_template(&$piece) {
-	return is_array($piece) and $piece['pieces'];
+	return is_array($piece) && isset($piece['pieces']);
 }
 
 function is_value_slot(&$piece) {
-	return is_array($piece) and !$piece['pieces'];
+	return is_array($piece) && !isset($piece['pieces']);
 }
 
 # Return a hash containing the top-level sub-templates of tem.
@@ -267,20 +271,20 @@ function top_sub_templates($tem, $is_sub = 'is_sub_template') {
 function merge_sub_templates(&$main, &$subs) {
 	foreach($main['pieces'] as &$piece) {
 		if(is_array($piece)) { # not just text
-			if($piece['pieces']) {
+			if(isset($piece['pieces']) && $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') {
+				$sub = isset($subs[$piece['name']]) ? $subs[$piece['name']] : null;
+				$arg0 = isset($sub['args'][0]) ? $sub['args'][0] : null;
+				if($sub && $arg0 != 'hide') {
 					$piece = $subs[$piece['name']];
 					$piece['parent'] =& $main;
 				}
 			}
 		}
 	}
-	return $out;
 }
 
 # Replace values in $main with top-level templates from $tem.
@@ -398,7 +402,7 @@ function tem_auto_once_else(&$value) {
 # ----------------------
 
 function is_shown($piece) {
-	return $piece['args'][0] == 'hide';
+	return isset($piece['args'][0]) && $piece['args'][0] == 'hide';
 }
 
 function is_shown_sub_template($piece) {
@@ -453,6 +457,9 @@ class tem {
 	}
 
 	function append($key, $value) {
+		if (!isset($this->data[$key])) {
+			$this->data[$key] = '';
+		}
 		$this->data[$key] .= $value;
 	}
 
@@ -471,6 +478,9 @@ class tem {
 	function show($name) {
 		$tem = tem_is_old_sub($name, $this->template);
 		if($tem) {
+			if (!isset($this->data[$name])) {
+				$this->data[$name] = '';
+			}
 			$this->data[$name] .= fill_template($tem, $this->data);
 		}
 	}
@@ -622,7 +632,7 @@ function tem_top_sub_names() {
 }
 
 function tem_load_new($filename) {
-	$old = $GLOBALS['wfpl_template'];
+	$old = isset($GLOBALS['wfpl_template']) ? $GLOBALS['wfpl_template'] : null;
 	$GLOBALS['wfpl_template'] = new tem();
 	$GLOBALS['wfpl_template']->load($filename);
 	return $old;