Merge pull request #317 from CatoTH/master

[friendica.git] / include / template_processor.php

diff --git a/include/template_processor.php b/include/template_processor.php
old mode 100755 (executable)
new mode 100644 (file)
index a80a399..46252c3
--- 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;
@@ -28,19 +30,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);
@@ -93,8 +82,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]);
@@ -104,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();
                        }
@@ -170,51 +164,33 @@
                        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();
-                       if (preg_match_all('/\$([a-zA-Z0-9-_]+\.*)+/', $s,$m)){
+                       /** regexp:
+                        * \$                                           literal $
+                        * (\[)?                                        optional open square bracket
+                        * ([a-zA-Z0-9-_]+\.?)+         var name, followed by optional
+                        *                                                      dot, repeated at least 1 time
+                        * (?(1)\])                                     if there was opened square bracket
+                        *                                                      (subgrup 1), match close bracket
+                        */
+                       if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(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;
                }
        
                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,15 +198,14 @@
                        
                        // 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);
+                       return $s;
                }
        }