From 60e5dda1b5e1be36a15c45ded2635340087a0b0f Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 2 Mar 2012 12:24:35 +0100
Subject: [PATCH 1/5] template proc: first optimization

---
 include/template_processor.php | 31 ++++++++++++++++++++++---------
 include/text.php               |  8 +++++++-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/include/template_processor.php b/include/template_processor.php
index b4d444e1c6..a80a3997af 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -1,5 +1,5 @@
 <?php
-
+	define ("KEY_NOT_EXISTS", '^R_key_not_Exists^');
 
 	class Template {
 		var $r;
@@ -43,15 +43,16 @@
 		} 
 		
 		private function _push_stack(){
-			$this->stack[] = array($this->r, $this->search, $this->replace, $this->nodes);
+			$this->stack[] = array($this->r, $this->nodes);
 		}
 		private function _pop_stack(){
-			list($this->r, $this->search, $this->replace, $this->nodes) = array_pop($this->stack);
+			list($this->r, $this->nodes) = array_pop($this->stack);
 			
 		}
 		
-		private function _get_var($name){
-			$keys = array_map('trim',explode(".",$name));		
+		private function _get_var($name, $retNoKey=false){
+			$keys = array_map('trim',explode(".",$name));
+			if ($retNoKey && !array_key_exists($keys[0], $this->r)) return KEY_NOT_EXISTS;
 			$val = $this->r;
 			foreach($keys as $k) {
 				$val = (isset($val[$k]) ? $val[$k] : null);
@@ -194,13 +195,24 @@
 			return str_replace($this->search,$this->replace, $str);
 		}*/
 
+		private function var_replace($s){
+			$m = array();
+			if (preg_match_all('/\$([a-zA-Z0-9-_]+\.*)+/', $s,$m)){
+				foreach($m[0] as $var){
+					$val = $this->_get_var($var, true);
+					if ($val!=KEY_NOT_EXISTS)
+						$s = str_replace($var, $val, $s);
+				}
+			}
+			return $s;
+		}
 	
 		public function replace($s, $r) {
 			$this->r = $r;
-			$this->search = array();
-			$this->replace = array();
+			/*$this->search = array();
+			$this->replace = array();*/
 
-			$this->_build_replace($r, "");
+			//$this->_build_replace($r, "");
 			
 			#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
 			$s = $this->_build_nodes($s);
@@ -215,7 +227,8 @@
 			while($os!=$s && $count<10){
 				$os=$s; $count++;
 				//$s = $this->_str_replace($s);
-				$s = str_replace($this->search, $this->replace, $s);
+				$s = $this->var_replace($s);
+				//$s = str_replace($this->search, $this->replace, $s);
 			}
 			return template_unescape($s);
 		}
diff --git a/include/text.php b/include/text.php
index 4276b7fcb3..042ee982cb 100755
--- a/include/text.php
+++ b/include/text.php
@@ -14,7 +14,13 @@ if(! function_exists('replace_macros')) {
 function replace_macros($s,$r) {
 	global $t;
 	
-	return $t->replace($s,$r);
+	//$ts = microtime();
+	$r =  $t->replace($s,$r);
+	//$tt = microtime() - $ts;
+	
+	//$a = get_app();
+	//$a->page['debug'] .= "$tt <br>\n";
+	return $r;
 
 }}
 

From 0bf087c8957ba28b76b7bc96345908735418a71f Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 2 Mar 2012 12:36:22 +0100
Subject: [PATCH 2/5] template proc: remove unused function and commented out
 code

---
 include/template_processor.php | 45 +---------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/include/template_processor.php b/include/template_processor.php
index a80a3997af..9ac0a13131 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -28,19 +28,6 @@
 			die();
 		}
 		
-		private function _build_replace($r, $prefix){
-	
-			if(is_array($r) && count($r)) {
-				foreach ($r as $k => $v ) {
-					if (is_array($v)) {
-						$this->_build_replace($v, "$prefix$k.");
-					} else {
-						$this->search[] =  $prefix . $k;
-						$this->replace[] = $v;
-					}
-				}
-			}
-		} 
 		
 		private function _push_stack(){
 			$this->stack[] = array($this->r, $this->nodes);
@@ -170,30 +157,6 @@
 			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);
-		}*/
 
 		private function var_replace($s){
 			$m = array();
@@ -209,12 +172,7 @@
 	
 		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);
@@ -222,13 +180,12 @@
 			
 			// 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 = $this->_str_replace($s);
 				$s = $this->var_replace($s);
-				//$s = str_replace($this->search, $this->replace, $s);
 			}
 			return template_unescape($s);
 		}

From ef3484750137707287c6482e1def07cb7aec54a7 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 2 Mar 2012 12:41:34 +0100
Subject: [PATCH 3/5] templates: fix tags

---
 view/search_item.tpl                      | 4 ++--
 view/theme/dispy/wall_item.tpl            | 4 ++--
 view/theme/dispy/wallwall_item.tpl        | 4 ++--
 view/theme/duepuntozero/wall_item.tpl     | 4 ++--
 view/theme/duepuntozero/wallwall_item.tpl | 4 ++--
 view/theme/vier/search_item.tpl           | 5 +++--
 view/theme/vier/wall_item.tpl             | 5 +++--
 view/theme/vier/wallwall_item.tpl         | 4 ++--
 view/wall_item.tpl                        | 4 ++--
 view/wallwall_item.tpl                    | 4 ++--
 10 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/view/search_item.tpl b/view/search_item.tpl
index a889062e06..80d6678fb3 100755
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -31,8 +31,8 @@
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $item.tag }}
-				<span class='tag'>$item.tag</span>
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 0dcd30f7b4..09cf643979 100755
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -53,8 +53,8 @@
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $item.tags as $item.tag }}
-							<span class='tag'>$item.tag</span>
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 31f046a76f..c3638094ce 100755
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -58,8 +58,8 @@
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $item.tags as $item.tag }}
-							<span class='tag'>$item.tag</span>
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>			
 			</div>
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index d165d98016..51e36b6f4f 100755
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -31,8 +31,8 @@
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $item.tags as $item.tag }}
-							<span class='tag'>$item.tag</span>
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index 75cd5f65e7..211906c934 100755
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -35,8 +35,8 @@
 			<div class="wall-item-title-end"></div>
 			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
 					<div class="body-tag">
-						{{ for $item.tags as $item.tag }}
-							<span class='tag'>$item.tag</span>
+						{{ for $item.tags as $tag }}
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>
diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl
index f2a3a3c8bb..fb87d76615 100755
--- a/view/theme/vier/search_item.tpl
+++ b/view/theme/vier/search_item.tpl
@@ -37,9 +37,10 @@
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $item.tag }}
-				<span class='tag'>$item.tag</span>
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
 			{{ endfor }}
+
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/vier/wall_item.tpl b/view/theme/vier/wall_item.tpl
index 8b06989fae..aa972937da 100644
--- a/view/theme/vier/wall_item.tpl
+++ b/view/theme/vier/wall_item.tpl
@@ -38,9 +38,10 @@
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $item.tag }}
-				<span class='tag'>$item.tag</span>
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
 			{{ endfor }}
+
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/vier/wallwall_item.tpl b/view/theme/vier/wallwall_item.tpl
index a8a46c34cd..c557b33f10 100644
--- a/view/theme/vier/wallwall_item.tpl
+++ b/view/theme/vier/wallwall_item.tpl
@@ -45,8 +45,8 @@
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $item.tag }}
-				<span class='tag'>$item.tag</span>
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>	
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index ddae5b609e..c990775106 100755
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -31,8 +31,8 @@
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $item.tag }}
-				<span class='tag'>$item.tag</span>
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 3fc704e350..be942f2619 100755
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -35,8 +35,8 @@
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $item.tag }}
-				<span class='tag'>$item.tag</span>
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>	

From 5fc3c3ab854d1e2100fc5fdeb82298c60e320c92 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 2 Mar 2012 15:40:17 +0100
Subject: [PATCH 4/5] group: fix create new group form

---
 mod/group.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/group.php b/mod/group.php
index f6f8e41733..13401ef0d9 100755
--- a/mod/group.php
+++ b/mod/group.php
@@ -84,6 +84,7 @@ function group_content(&$a) {
 		return replace_macros($tpl, $context + array(
 			'$title' => t('Create a group of contacts/friends.'),
 			'$gname' => array('groupname',t('Group Name: '),$group['name'], ''),
+			'$gid' => 'new',
 		));
 
 

From aef737f37637270b4f79ea390ee23a61f7fcb4ba Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 2 Mar 2012 15:53:48 +0100
Subject: [PATCH 5/5] template proc: allow isolation of var name between [ and
 ]

$var.name -> $[var.name]
---
 include/template_processor.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/template_processor.php b/include/template_processor.php
index 9ac0a13131..111fc5849a 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -160,13 +160,15 @@
 
 		private function var_replace($s){
 			$m = array();
-			if (preg_match_all('/\$([a-zA-Z0-9-_]+\.*)+/', $s,$m)){
+			if (preg_match_all('/\$\[{0,1}([a-zA-Z0-9-_]+\.*)+\]{0,1}/', $s,$m)){
 				foreach($m[0] as $var){
-					$val = $this->_get_var($var, true);
+					$varn = str_replace(array("[","]"), array("",""), $var);
+					$val = $this->_get_var($varn, true);
 					if ($val!=KEY_NOT_EXISTS)
 						$s = str_replace($var, $val, $s);
 				}
 			}
+			
 			return $s;
 		}