X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftemplate_processor.php;h=4088ddab60840864c6b111c81c81615b1371cc94;hb=429870015fc9b1d94b24234152ad236f433e7f5a;hp=7f7b0b55bd727c16524d03ebef5ed045f5a7a691;hpb=acc4bbeb6ebc832da2a8b5a37b764a6a53dd1214;p=friendica.git

diff --git a/include/template_processor.php b/include/template_processor.php
old mode 100755
new mode 100644
index 7f7b0b55bd..4088ddab60
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -13,12 +13,14 @@
 		var $debug=false;
 		
 		private function _preg_error(){
+			
 			switch(preg_last_error()){
 			    case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break;
 			    case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break;
 			    case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break;
 			    case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break;
-			    case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+// This is only valid for php > 5.3, not certain how to code around it for unit tests
+//			    case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
 			    default:
 					//die("Unknown preg error.");
 					return;
@@ -61,7 +63,7 @@
 				if ($b[0]=="$") $b =  $this->_get_var($b);
 				$val = ($a == $b);
 			} else if (strpos($args[2],"!=")>0){
-				list($a,$b) = explode("!=",$args[2]);
+				list($a,$b) = array_map("trim", explode("!=",$args[2]));
 				$a = $this->_get_var($a);
 				if ($b[0]=="$") $b =  $this->_get_var($b);
 				$val = ($a != $b);
@@ -96,7 +98,7 @@
 				$this->_push_stack();
 				$r = $this->r;
 				$r[$varname] = $v;
-				if ($keyname!='') $r[$keyname] = $k;
+				if ($keyname!='') $r[$keyname] = (($k === 0) ? '0' : $k);
 				$ret .=  $this->replace($args[3], $r);
 				$this->_pop_stack();
 			}
@@ -131,6 +133,26 @@
 			return $ret;
 			
 		}
+		
+		/**
+		 * DEBUG node
+		 * 
+		 * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
+		 * 
+		 * replace node with <pre>var_dump($var, $var, ...);</pre>
+		 */
+		private function _replcb_debug($args){
+			$vars = array_map('trim', explode(" ",$args[2]));
+			$vars[] = $args[1];
+
+			$ret = "<pre>";
+			foreach ($vars as $var){
+				$ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
+				$ret .= "\n";
+			}
+			$ret .= "</pre>";
+			return $ret;
+		}
 
 		private function _replcb_node($m) {
 			$node = $this->nodes[$m[1]];
@@ -203,7 +225,7 @@
 				$os=$s; $count++;
 				$s = $this->var_replace($s);
 			}
-			return template_unescape($s);
+			return $s;
 		}
 	}