From ab5d8d4e07bb3c8230d0285ef8902ef1979fce51 Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 18 Oct 2018 02:39:34 +0200 Subject: Updating Smarty --- lib/smarty/plugins/modifier.regex_replace.php | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'lib/smarty/plugins/modifier.regex_replace.php') diff --git a/lib/smarty/plugins/modifier.regex_replace.php b/lib/smarty/plugins/modifier.regex_replace.php index f9fd5fa..7eb5506 100644 --- a/lib/smarty/plugins/modifier.regex_replace.php +++ b/lib/smarty/plugins/modifier.regex_replace.php @@ -2,39 +2,41 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsModifier */ - /** * Smarty regex_replace modifier plugin - * - * Type: modifier
- * Name: regex_replace
+ * Type: modifier + * Name: regex_replace * Purpose: regular expression search/replace * - * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php + * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php * regex_replace (Smarty online manual) * @author Monte Ohrt - * @param string $string input string - * @param string|array $search regular expression(s) to search for - * @param string|array $replace string(s) that should be replaced + * + * @param string $string input string + * @param string|array $search regular expression(s) to search for + * @param string|array $replace string(s) that should be replaced + * @param int $limit the maximum number of replacements + * * @return string */ -function smarty_modifier_regex_replace($string, $search, $replace) +function smarty_modifier_regex_replace($string, $search, $replace, $limit = -1) { - if(is_array($search)) { - foreach($search as $idx => $s) { - $search[$idx] = _smarty_regex_replace_check($s); + if (is_array($search)) { + foreach ($search as $idx => $s) { + $search[ $idx ] = _smarty_regex_replace_check($s); } } else { $search = _smarty_regex_replace_check($search); } - return preg_replace($search, $replace, $string); + return preg_replace($search, $replace, $string, $limit); } /** * @param string $search string(s) that should be replaced + * * @return string * @ignore */ @@ -42,14 +44,12 @@ function _smarty_regex_replace_check($search) { // null-byte injection detection // anything behind the first null-byte is ignored - if (($pos = strpos($search,"\0")) !== false) { - $search = substr($search,0,$pos); + if (($pos = strpos($search, "\0")) !== false) { + $search = substr($search, 0, $pos); } // remove eval-modifier from $search - if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) { - $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]); + if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[ 1 ], 'e') !== false)) { + $search = substr($search, 0, -strlen($match[ 1 ])) . preg_replace('![e\s]+!', '', $match[ 1 ]); } return $search; } - -?> \ No newline at end of file -- cgit v1.2.3