X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftemplate_processor.php;h=7a4cba64e93b4e5aab9f5d817d315cb4e410faed;hb=5bb8ed4b8b5310acc8556ef2fba7b3958284b2a6;hp=63d75eaa4eda15fb9dfe2a1e3e01a223bf219179;hpb=273594af62c960b5a52da5ec1cf6d6bd450415ba;p=friendica.git

diff --git a/include/template_processor.php b/include/template_processor.php
old mode 100644
new mode 100755
index 63d75eaa4e..7a4cba64e9
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -10,7 +10,7 @@
 		var $done = false;
 		var $d = false;
 		var $lang = null;
-		
+		var $debug=false;
 		
 		private function _preg_error(){
 			switch(preg_last_error()){
@@ -32,11 +32,12 @@
 	
 			if(is_array($r) && count($r)) {
 				foreach ($r as $k => $v ) {
-					if (is_array($v))
+					if (is_array($v)) {
 						$this->_build_replace($v, "$prefix$k.");
-					
-					$this->search[] =  $prefix . $k;
-					$this->replace[] = $v;
+					} else {
+						$this->search[] =  $prefix . $k;
+						$this->replace[] = $v;
+					}
 				}
 			}
 		} 
@@ -53,7 +54,7 @@
 			$keys = array_map('trim',explode(".",$name));		
 			$val = $this->r;
 			foreach($keys as $k) {
-				$val = $val[$k];
+				$val = (isset($val[$k]) ? $val[$k] : null);
 			}
 			return $val;
 		}
@@ -79,8 +80,8 @@
 			} else {
 				$val = $this->_get_var($args[2]);
 			}
-			list($strue, $sfalse)= preg_split("|{{ *else *}}|", $args[3]);
-			return ($val?$strue:$sfalse);
+			$x = preg_split("|{{ *else *}}|", $args[3]);
+			return ( $val ? $x[0] : (isset($x[1]) ? $x[1] : ""));
 		}
 		
 		/**
@@ -91,8 +92,13 @@
 		 */
 		private function _replcb_for($args){
 			$m = array_map('trim', explode(" as ", $args[2]));
-			list($keyname, $varname) = explode("=>",$m[1]);
-			if (is_null($varname)) { $varname=$keyname; $keyname=""; }
+			$x = explode("=>",$m[1]);
+			if (count($x) == 1) {
+				$varname = $x[0];
+				$keyname = "";
+			} else {
+				list($keyname, $varname) = $x;
+			}
 			if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
 			//$vals = $this->r[$m[0]];
 			$vals = $this->_get_var($m[0]);
@@ -159,28 +165,54 @@
 			krsort($this->nodes);
 			return $s;
 		}
+		
+        /*
+		private function _str_replace($str){
+			#$this->search,$this->replace,
+			$searchs = $this->search;
+			foreach($searchs as $search){
+				$search = "|".preg_quote($search)."(\|[a-zA-Z0-9_]*)*|";
+				$m = array();
+				if (preg_match_all($search, $str,$m)){
+					foreach ($m[0] as $match){
+						$toks = explode("|",$match);
+						$val = $this->_get_var($toks[0]);
+						for($k=1; $k<count($toks); $k++){
+							$func = $toks[$k];
+							if (function_exists($func)) $val = $func($val);
+						}
+						if (count($toks)>1){
+							$str = str_replace( $match, $val, $str);
+						} 
+					}
+				}
+				
+			}
+			return str_replace($this->search,$this->replace, $str);
+		}*/
 
 	
 		public function replace($s, $r) {
 			$this->r = $r;
 			$this->search = array();
 			$this->replace = array();
-	
+
 			$this->_build_replace($r, "");
 			
 			#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
 			$s = $this->_build_nodes($s);
+
 			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
 			if ($s==Null) $this->_preg_error();
 			
 			// remove comments block
 			$s = preg_replace('/{#[^#]*#}/', "" , $s);
-						
 			// replace strings recursively (limit to 10 loops)
 			$os = ""; $count=0;
 			while($os!=$s && $count<10){
 				$os=$s; $count++;
-				$s = str_replace($this->search,$this->replace, $s);
+				//$s = $this->_str_replace($s);
+				$s = str_replace($this->search, $this->replace, $s);
 			}
 			return template_unescape($s);
 		}