holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also quote quotes in variables surounded by curly brackets, eg. '{[nm][path]}'

Browse Source
This commit is contained in:
Ralf Becker 2010-09-14 16:33:33 +00:00
parent 34e51b19e8
commit 201f0d33e3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/inc/class.boetemplate.inc.php
View File

@ -178,8 +178,9 @@ class boetemplate extends soetemplate
$col_row_cont = $cont[$col.$row]; $col_row_cont = $cont[$col.$row];
// check if name is enclosed in single quotes as argument eg. to an event handler or // check if name is enclosed in single quotes as argument eg. to an event handler or
// variable name is contained in quotes and curly brackets, eg. "'{$cont[nm][path]}'" or
// used as name for a button like "delete[$row_cont[something]]" --> quote contained quotes (' or ") // used as name for a button like "delete[$row_cont[something]]" --> quote contained quotes (' or ")
if (in_array($name[$pos_var-1],array('[',"'")) && preg_match('/[\'\[]('.self::PHP_VAR_PREG.')[\'\]]+/',$name,$matches)) if (in_array($name[$pos_var-1],array('[',"'",'{')) && preg_match('/[\'\[]{?('.self::PHP_VAR_PREG.')}?[\'\]]+/',$name,$matches))
{ {
eval('$value = '.$matches[1].';'); eval('$value = '.$matches[1].';');
if (is_array($value) && $name[$pos_var-1] == "'") // arrays are only supported for ' if (is_array($value) && $name[$pos_var-1] == "'") // arrays are only supported for '
@ -194,7 +195,7 @@ class boetemplate extends soetemplate
else else
{ {
$value = str_replace(array("'",'"'),array('\\\'','"'),$value); $value = str_replace(array("'",'"'),array('\\\'','"'),$value);
$name = str_replace($matches[1],$value,$name); $name = str_replace(array('{'.$matches[1].'}',$matches[1]),$value,$name);
} }
} }
// check if name is assigned in an url --> urlendcode contained & as %26, as egw::link explodes it on & // check if name is assigned in an url --> urlendcode contained & as %26, as egw::link explodes it on &