tobias/friendica
1
0
Fork 0
Code Pull requests Activity

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

Browse source 
* 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:
This commit is contained in:
Simon L'nu 2012-03-02 10:55:59 -05:00
parent bcadd873ee a3dcf491f1
commit 725daf2a5d
13 changed files with 51 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
include/template_processor.php
View file

@ -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){
#$this->search,$this->replace,
$searchs = $this->search;
foreach($searchs as $search){
$search = "|".preg_quote($search)."(\|[a-zA-Z0-9_]*)*|";
private function var_replace($s){
$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);
}
if (preg_match_all('/\$\[{0,1}([a-zA-Z0-9-_]+\.*)+\]{0,1}/', $s,$m)){
foreach($m[0] as $var){
$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;
}
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 = str_replace($this->search, $this->replace, $s);
$s = $this->var_replace($s);
}
return template_unescape($s);
}

8
include/text.php
View file

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

1
mod/group.php
View file

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

4
view/search_item.tpl
View file

@ -31,8 +31,8 @@
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $item.tag }}
<span class='tag'>$item.tag</span>
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>

4
view/theme/dispy/wall_item.tpl
View file

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

4
view/theme/dispy/wallwall_item.tpl
View file

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

4
view/theme/duepuntozero/wall_item.tpl
View file

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

4
view/theme/duepuntozero/wallwall_item.tpl
View file

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

5
view/theme/vier/search_item.tpl
View file

@ -37,9 +37,10 @@
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $item.tag }}
<span class='tag'>$item.tag</span>
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom">

5
view/theme/vier/wall_item.tpl
View file

@ -38,9 +38,10 @@
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $item.tag }}
<span class='tag'>$item.tag</span>
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>
<div class="wall-item-bottom">

4
view/theme/vier/wallwall_item.tpl
View file

@ -45,8 +45,8 @@
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $item.tag }}
<span class='tag'>$item.tag</span>
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>

4
view/wall_item.tpl
View file

@ -31,8 +31,8 @@
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $item.tag }}
<span class='tag'>$item.tag</span>
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>

4
view/wallwall_item.tpl
View file

@ -35,8 +35,8 @@
<div class="wall-item-links">
</div>
<div class="wall-item-tags">
{{ for $item.tags as $item.tag }}
<span class='tag'>$item.tag</span>
{{ for $item.tags as $tag }}
<span class='tag'>$tag</span>
{{ endfor }}
</div>
</div>