From e14d5851a76e73675800787dcbcc7582b4dbd5ed Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 13 Jun 2011 12:53:41 +0200 Subject: fix template's {{ for }} variable lookup --- include/template_processor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/template_processor.php') diff --git a/include/template_processor.php b/include/template_processor.php index d8dfbaedb..3dc249c40 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -58,7 +58,8 @@ list($keyname, $varname) = explode("=>",$m[1]); if (is_null($varname)) { $varname=$keyname; $keyname=""; } if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ; - $vals = $this->r[$m[0]]; + //$vals = $this->r[$m[0]]; + $vals = $this->_get_var($m[0]); $ret=""; if (!is_array($vals)) return $ret; foreach ($vals as $k=>$v){ -- cgit v1.2.3 From f80521923d35d15dfd2f0ea24359a08a02638845 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 13 Jun 2011 18:02:40 +0200 Subject: Add {{ if a==b }} and {{ if a!=b }} to templates --- include/template_processor.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'include/template_processor.php') diff --git a/include/template_processor.php b/include/template_processor.php index 3dc249c40..a2c24b00b 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -41,9 +41,24 @@ * IF node * * {{ if <$var> }}...{{ endif }} + * {{ if <$var>== }}...{{ endif }} + * {{ if <$var>!= }}...{{ endif }} */ private function _replcb_if($args){ - $val = $this->_get_var($args[2]); + + if (strpos($args[2],"==")>0){ + 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); + } else if (strpos($args[2],"!=")>0){ + list($a,$b) = explode("!=",$args[2]); + $a = $this->_get_var($a); + if ($b[0]=="$") $b = $this->_get_var($b); + $val = ($a != $b); + } else { + $val = $this->_get_var($args[2]); + } return ($val?$args[3]:""); } -- cgit v1.2.3 From 63390aa8001a9d8f28f66c8e8686f406b28d6cbc Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 16 Jun 2011 12:02:05 +0200 Subject: {{ if }} {{ else }} support in templates --- include/template_processor.php | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) (limited to 'include/template_processor.php') diff --git a/include/template_processor.php b/include/template_processor.php index a2c24b00b..be40a31ab 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -8,6 +8,18 @@ var $nodes = array(); var $done = false; + private function _preg_error(){ + switch(preg_last_error()){ + case PREG_INTERNAL_ERROR: die('PREG_INTERNAL_ERROR'); break; + case PREG_BACKTRACK_LIMIT_ERROR: die('PREG_BACKTRACK_LIMIT_ERROR'); break; + case PREG_RECURSION_LIMIT_ERROR: die('PREG_RECURSION_LIMIT_ERROR'); break; + case PREG_BAD_UTF8_ERROR: die('PREG_BAD_UTF8_ERROR'); break; + case PREG_BAD_UTF8_OFFSET_ERROR: die('PREG_BAD_UTF8_OFFSET_ERROR'); break; + default: + die("Unknown preg error."); + } + } + private function _build_replace($r, $prefix){ if(is_array($r) && count($r)) { @@ -40,9 +52,9 @@ /** * IF node * - * {{ if <$var> }}...{{ endif }} - * {{ if <$var>== }}...{{ endif }} - * {{ if <$var>!= }}...{{ endif }} + * {{ if <$var> }}...[{{ else }} ...] {{ endif }} + * {{ if <$var>== }}...[{{ else }} ...]{{ endif }} + * {{ if <$var>!= }}...[{{ else }} ...]{{ endif }} */ private function _replcb_if($args){ @@ -59,7 +71,13 @@ } else { $val = $this->_get_var($args[2]); } - return ($val?$args[3]:""); + if (isset($args[4])) { + list($strue, $sfalse)= explode($args[4], $args[3]); + } else { + $strue = $args[3]; $sfalse = ""; + } + + return ($val?$strue:$sfalse); } /** @@ -112,13 +130,17 @@ private function _replcb_node($m) { $node = $this->nodes[$m[1]]; if (method_exists($this, "_replcb_".$node[1])){ - return call_user_func(array($this, "_replcb_".$node[1]), $node); + $s = call_user_func(array($this, "_replcb_".$node[1]), $node); } else { - return ""; + $s = ""; } + $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); + if ($s==Null) $this->_preg_error() + return $s; } private function _replcb($m){ + //var_dump(array_map('htmlspecialchars', $m)); $this->done = false; $this->nodes[] = (array) $m; return "||". (count($this->nodes)-1) ."||"; @@ -128,8 +150,10 @@ $this->done = false; while (!$this->done){ $this->done=true; - $s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*){{ *end\1 *}}|', array($this, "_replcb"), $s); + $s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s); + if ($s==Null) $this->_preg_error(); } + //({{ *else *}}[^{]*)? krsort($this->nodes); return $s; } @@ -144,6 +168,7 @@ #$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() $s = str_replace($this->search,$this->replace, $s); return $s; -- cgit v1.2.3 From ede011cc32b34b9da797813a0a901847d2a68a7a Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 16 Jun 2011 14:56:43 +0200 Subject: Admin users page. some fix to template processor. --- include/template_processor.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'include/template_processor.php') diff --git a/include/template_processor.php b/include/template_processor.php index be40a31ab..3f79ed593 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -71,11 +71,7 @@ } else { $val = $this->_get_var($args[2]); } - if (isset($args[4])) { - list($strue, $sfalse)= explode($args[4], $args[3]); - } else { - $strue = $args[3]; $sfalse = ""; - } + list($strue, $sfalse)= preg_split("|{{ *else *}}|", $args[3]); return ($val?$strue:$sfalse); } @@ -135,7 +131,6 @@ $s = ""; } $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); - if ($s==Null) $this->_preg_error() return $s; } @@ -168,7 +163,7 @@ #$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() + if ($s==Null) $this->_preg_error(); $s = str_replace($this->search,$this->replace, $s); return $s; -- cgit v1.2.3