diff --git a/alerts.php b/alerts.php index 0948045a97..fc27e130fe 100755 --- a/alerts.php +++ b/alerts.php @@ -359,18 +359,6 @@ function ExtTransports($obj) { }//end ExtTransports() -/** - * Escape certain characters in template string - * @param string $tpl Template - * @return string - */ -function TplEscape($tpl) { - // theoretically like addslashes(), but don't escape single quote (') and do escape $ - // FIXME: is there still a way to break out of the double-quoted string, maybe with a unicode char? - return preg_replace('(["\\\\$\\0])','\\0',$tpl); -} - - /** * Format Alert * @param array $obj Alert-Array @@ -378,7 +366,7 @@ function TplEscape($tpl) { */ function FormatAlertTpl($obj) { $tpl = $obj["template"]; - $msg = '$ret .= "'.str_replace(array('{else}', '{/if}', '{/foreach}'), array('"; } else { $ret .= "', '"; } $ret .= "', '"; } $ret .= "'), TplEscape($tpl)).'";'; + $msg = '$ret .= "'.str_replace(array('{else}', '{/if}', '{/foreach}'), array('"; } else { $ret .= "', '"; } $ret .= "', '"; } $ret .= "'), addslashes($tpl)).'";'; $parsed = $msg; $s = strlen($msg); $x = $pos = -1;