jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

template proc: remove unused function and commented out code

Browse source
This commit is contained in:
Fabio Comuni 2012-03-02 12:36:22 +01:00
parent 60e5dda1b5
commit 0bf087c895
1 changed files with 1 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
include/template_processor.php
View file

@ -28,19 +28,6 @@
die(); 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(){ private function _push_stack(){
$this->stack[] = array($this->r, $this->nodes); $this->stack[] = array($this->r, $this->nodes);
@ -170,30 +157,6 @@
return $s; 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){ private function var_replace($s){
$m = array(); $m = array();
@ -209,12 +172,7 @@
public function replace($s, $r) { public function replace($s, $r) {
$this->r = $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 = $this->_build_nodes($s);
$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s); $s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
@ -222,13 +180,12 @@
// remove comments block // remove comments block
$s = preg_replace('/{#[^#]*#}/', "" , $s); $s = preg_replace('/{#[^#]*#}/', "" , $s);
// replace strings recursively (limit to 10 loops) // replace strings recursively (limit to 10 loops)
$os = ""; $count=0; $os = ""; $count=0;
while($os!=$s && $count<10){ while($os!=$s && $count<10){
$os=$s; $count++; $os=$s; $count++;
//$s = $this->_str_replace($s);
$s = $this->var_replace($s); $s = $this->var_replace($s);
//$s = str_replace($this->search, $this->replace, $s);
} }
return template_unescape($s); return template_unescape($s);
} }