Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  template proc: allow isolation of var name between [ and ]
  group: fix create new group form
  templates: fix tags
  template proc: remove unused function and commented out code
  template proc: first optimization

* master:

include/template_processor.php

@@ -1,5 +1,5 @@
 <?php
-
+	define ("KEY_NOT_EXISTS", '^R_key_not_Exists^');
 
 	class Template {
 		var $r;
@@ -28,30 +28,18 @@
 			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->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){
+		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);
@@ -169,40 +157,24 @@
 			return $s;
 		}
 		
-        /*
+
-		private function _str_replace($str){
+		private function var_replace($s){
-			#$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)){
+			if (preg_match_all('/\$\[{0,1}([a-zA-Z0-9-_]+\.*)+\]{0,1}/', $s,$m)){
-					foreach ($m[0] as $match){
+				foreach($m[0] as $var){
-						$toks = explode("|",$match);
+					$varn = str_replace(array("[","]"), array("",""), $var);
-						$val = $this->_get_var($toks[0]);
+					$val = $this->_get_var($varn, true);
-						for($k=1; $k<count($toks); $k++){
+					if ($val!=KEY_NOT_EXISTS)
-							$func = $toks[$k];
+						$s = str_replace($var, $val, $s);
-							if (function_exists($func)) $val = $func($val);
-						}
-						if (count($toks)>1){
-							$str = str_replace( $match, $val, $str);
-						} 
 				}
 			}
 			
+			return $s;
 		}
-			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);
@@ -210,12 +182,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);
 		}

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;
 
 }}
 

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',
 		));
 
 

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 }}
+			{{ for $item.tags as $tag }}
-				<span class='tag'>$item.tag</span>
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>

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 }}
+						{{ for $item.tags as $tag }}
-							<span class='tag'>$item.tag</span>
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>

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 }}
+						{{ for $item.tags as $tag }}
-							<span class='tag'>$item.tag</span>
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>			
 			</div>

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 }}
+						{{ for $item.tags as $tag }}
-							<span class='tag'>$item.tag</span>
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>

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 }}
+						{{ for $item.tags as $tag }}
-							<span class='tag'>$item.tag</span>
+							<span class='tag'>$tag</span>
 						{{ endfor }}
 					</div>
 			</div>

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 }}
+			{{ for $item.tags as $tag }}
-				<span class='tag'>$item.tag</span>
+				<span class='tag'>$tag</span>
 			{{ endfor }}
+
 		</div>
 	</div>
 	<div class="wall-item-bottom">

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 }}
+			{{ for $item.tags as $tag }}
-				<span class='tag'>$item.tag</span>
+				<span class='tag'>$tag</span>
 			{{ endfor }}
+
 		</div>
 	</div>
 	<div class="wall-item-bottom">

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 }}
+			{{ for $item.tags as $tag }}
-				<span class='tag'>$item.tag</span>
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>	

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 }}
+			{{ for $item.tags as $tag }}
-				<span class='tag'>$item.tag</span>
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>

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 }}
+			{{ for $item.tags as $tag }}
-				<span class='tag'>$item.tag</span>
+				<span class='tag'>$tag</span>
 			{{ endfor }}
 		</div>
 	</div>