template proc: remove unused function and commented out code

diff --git a/include/template_processor.php b/include/template_processor.php
index a80a3997af601d7ac2b43a86b652fa2522cfeec2..9ac0a13131153ef9398bf2084c97755dd59f33b6 100755 (executable)
--- 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);
                }