bump Smarty to v3.1.32 (possible security fix, numerous bugs listed at https://github.com/smarty-php/smarty/blob/master/change_log.txt
David Goodwin
8 years ago
parent
9a07772626
commit
2ba2802774
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Smarty plugin
|
||||||
|
*
|
||||||
|
* @package Smarty
|
||||||
|
* @subpackage PluginsModifier
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* Smarty wordwrap modifier plugin
|
||||||
|
* Type: modifier
|
||||||
|
* Name: mb_wordwrap
|
||||||
|
* Purpose: Wrap a string to a given number of characters
|
||||||
|
*
|
||||||
|
|
||||||
|
* @link http://php.net/manual/en/function.wordwrap.php for similarity
|
||||||
|
*
|
||||||
|
* @param string $str the string to wrap
|
||||||
|
* @param int $width the width of the output
|
||||||
|
* @param string $break the character used to break the line
|
||||||
|
* @param boolean $cut ignored parameter, just for the sake of
|
||||||
|
*
|
||||||
|
* @return string wrapped string
|
||||||
|
* @author Rodney Rehm
|
||||||
|
*/
|
||||||
|
function smarty_modifier_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
|
||||||
|
{
|
||||||
|
// break words into tokens using white space as a delimiter
|
||||||
|
$tokens = preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, -1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
|
||||||
|
$length = 0;
|
||||||
|
$t = '';
|
||||||
|
$_previous = false;
|
||||||
|
$_space = false;
|
||||||
|
|
||||||
|
foreach ($tokens as $_token) {
|
||||||
|
$token_length = mb_strlen($_token, Smarty::$_CHARSET);
|
||||||
|
$_tokens = array($_token);
|
||||||
|
if ($token_length > $width) {
|
||||||
|
if ($cut) {
|
||||||
|
$_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER,
|
||||||
|
$_token,
|
||||||
|
-1,
|
||||||
|
PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($_tokens as $token) {
|
||||||
|
$_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
|
||||||
|
$token_length = mb_strlen($token, Smarty::$_CHARSET);
|
||||||
|
$length += $token_length;
|
||||||
|
|
||||||
|
if ($length > $width) {
|
||||||
|
// remove space before inserted break
|
||||||
|
if ($_previous) {
|
||||||
|
$t = mb_substr($t, 0, -1, Smarty::$_CHARSET);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$_space) {
|
||||||
|
// add the break before the token
|
||||||
|
if (!empty($t)) {
|
||||||
|
$t .= $break;
|
||||||
|
}
|
||||||
|
$length = $token_length;
|
||||||
|
}
|
||||||
|
} else if ($token === "\n") {
|
||||||
|
// hard break must reset counters
|
||||||
|
$length = 0;
|
||||||
|
}
|
||||||
|
$_previous = $_space;
|
||||||
|
// add the token
|
||||||
|
$t .= $token;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $t;
|
||||||
|
}
|
||||||
@ -1,55 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* Smarty shared plugin
|
|
||||||
* @package Smarty
|
|
||||||
* @subpackage plugins
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function: smarty_needle
|
|
||||||
* Purpose: Used to find a string in a string
|
|
||||||
* Options: enter "case" to make case senstative
|
|
||||||
* Example: needle( 'Gabe-was-here', 'here' ) returns true
|
|
||||||
* Example2: needle( 'Gabe was here', 'gabe' ) returns true
|
|
||||||
* Example: needle ('Gabe was there', 'sde') returns false
|
|
||||||
* Smarty Sample: {$haystack|needle:"string"}
|
|
||||||
* Smarty Sample: {$haystack|needle:"string":"case"}
|
|
||||||
* @author Gabe LeBlanc "raven"
|
|
||||||
* @param string
|
|
||||||
* @return boolean
|
|
||||||
*/
|
|
||||||
function smarty_modifier_needle($haystack, $needle, $cases = "nocase") {
|
|
||||||
if(!empty($haystack) ) {
|
|
||||||
|
|
||||||
if($cases == "nocase") {
|
|
||||||
|
|
||||||
if(stristr($haystack, $needle)) {
|
|
||||||
|
|
||||||
return true;
|
|
||||||
|
|
||||||
}else{
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
}elseif($cases == "case") {
|
|
||||||
|
|
||||||
if(strstr($haystack, $needle)) {
|
|
||||||
|
|
||||||
return true;
|
|
||||||
|
|
||||||
}else{
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}else{
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* Smarty shared plugin
|
|
||||||
*
|
|
||||||
* @package Smarty
|
|
||||||
* @subpackage PluginsShared
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!function_exists('smarty_mb_wordwrap')) {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Wrap a string to a given number of characters
|
|
||||||
*
|
|
||||||
* @link http://php.net/manual/en/function.wordwrap.php for similarity
|
|
||||||
*
|
|
||||||
* @param string $str the string to wrap
|
|
||||||
* @param int $width the width of the output
|
|
||||||
* @param string $break the character used to break the line
|
|
||||||
* @param boolean $cut ignored parameter, just for the sake of
|
|
||||||
*
|
|
||||||
* @return string wrapped string
|
|
||||||
* @author Rodney Rehm
|
|
||||||
*/
|
|
||||||
function smarty_mb_wordwrap($str, $width = 75, $break = "\n", $cut = false)
|
|
||||||
{
|
|
||||||
// break words into tokens using white space as a delimiter
|
|
||||||
$tokens =
|
|
||||||
preg_split('!(\s)!S' . Smarty::$_UTF8_MODIFIER, $str, - 1, PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
|
|
||||||
$length = 0;
|
|
||||||
$t = '';
|
|
||||||
$_previous = false;
|
|
||||||
$_space = false;
|
|
||||||
|
|
||||||
foreach ($tokens as $_token) {
|
|
||||||
$token_length = mb_strlen($_token, Smarty::$_CHARSET);
|
|
||||||
$_tokens = array($_token);
|
|
||||||
if ($token_length > $width) {
|
|
||||||
if ($cut) {
|
|
||||||
$_tokens = preg_split('!(.{' . $width . '})!S' . Smarty::$_UTF8_MODIFIER, $_token, - 1,
|
|
||||||
PREG_SPLIT_NO_EMPTY + PREG_SPLIT_DELIM_CAPTURE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($_tokens as $token) {
|
|
||||||
$_space = !!preg_match('!^\s$!S' . Smarty::$_UTF8_MODIFIER, $token);
|
|
||||||
$token_length = mb_strlen($token, Smarty::$_CHARSET);
|
|
||||||
$length += $token_length;
|
|
||||||
|
|
||||||
if ($length > $width) {
|
|
||||||
// remove space before inserted break
|
|
||||||
if ($_previous) {
|
|
||||||
$t = mb_substr($t, 0, - 1, Smarty::$_CHARSET);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$_space) {
|
|
||||||
// add the break before the token
|
|
||||||
if (!empty($t)) {
|
|
||||||
$t .= $break;
|
|
||||||
}
|
|
||||||
$length = $token_length;
|
|
||||||
}
|
|
||||||
} elseif ($token == "\n") {
|
|
||||||
// hard break must reset counters
|
|
||||||
$_previous = 0;
|
|
||||||
$length = 0;
|
|
||||||
}
|
|
||||||
$_previous = $_space;
|
|
||||||
// add the token
|
|
||||||
$t .= $token;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $t;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,77 @@
|
|||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* This file is part of Smarty.
|
||||||
|
*
|
||||||
|
* (c) 2015 Uwe Tews
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Smarty Internal Plugin Compile Child Class
|
||||||
|
*
|
||||||
|
* @author Uwe Tews <uwe.tews@googlemail.com>
|
||||||
|
*/
|
||||||
|
class Smarty_Internal_Compile_Child extends Smarty_Internal_CompileBase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Attribute definition: Overwrites base class.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
* @see Smarty_Internal_CompileBase
|
||||||
|
*/
|
||||||
|
public $optional_attributes = array('assign');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tag name
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $tag = 'child';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Block type
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $blockType = 'Child';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compiles code for the {child} tag
|
||||||
|
*
|
||||||
|
* @param array $args array with attributes from parser
|
||||||
|
* @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object
|
||||||
|
* @param array $parameter array with compilation parameter
|
||||||
|
*
|
||||||
|
* @return string compiled code
|
||||||
|
* @throws \SmartyCompilerException
|
||||||
|
*/
|
||||||
|
public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
|
||||||
|
{
|
||||||
|
// check and get attributes
|
||||||
|
$_attr = $this->getAttributes($compiler, $args);
|
||||||
|
$tag = isset($parameter[0]) ? "'{$parameter[0]}'" : "'{{$this->tag}}'";
|
||||||
|
if (!isset($compiler->_cache[ 'blockNesting' ])) {
|
||||||
|
$compiler->trigger_template_error("{$tag} used outside {block} tags ",
|
||||||
|
$compiler->parser->lex->taglineno);
|
||||||
|
}
|
||||||
|
$compiler->has_code = true;
|
||||||
|
$compiler->suppressNocacheProcessing = true;
|
||||||
|
if ($this->blockType === 'Child') {
|
||||||
|
$compiler->_cache[ 'blockParams' ][ $compiler->_cache[ 'blockNesting' ] ][ 'callsChild' ] = 'true';
|
||||||
|
}
|
||||||
|
$_assign = isset($_attr[ 'assign' ]) ? $_attr[ 'assign' ] : null;
|
||||||
|
$output = "<?php \n";
|
||||||
|
if (isset($_assign)) {
|
||||||
|
$output .= "ob_start();\n";
|
||||||
|
}
|
||||||
|
$output .= '$_smarty_tpl->inheritance->call' . $this->blockType . '($_smarty_tpl, $this' .
|
||||||
|
($this->blockType === 'Child' ? '' : ", {$tag}"). ");\n";
|
||||||
|
if (isset($_assign)) {
|
||||||
|
$output .= "\$_smarty_tpl->assign({$_assign}, ob_get_clean());\n";
|
||||||
|
}
|
||||||
|
$output .="?>\n";
|
||||||
|
return $output;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* This file is part of Smarty.
|
||||||
|
*
|
||||||
|
* (c) 2015 Uwe Tews
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Smarty Internal Plugin Compile Parent Class
|
||||||
|
*
|
||||||
|
* @author Uwe Tews <uwe.tews@googlemail.com>
|
||||||
|
*/
|
||||||
|
class Smarty_Internal_Compile_Parent extends Smarty_Internal_Compile_Child
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tag name
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $tag = 'parent';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Block type
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $blockType = 'Parent';
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,112 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Smarty error handler
|
||||||
|
*
|
||||||
|
*
|
||||||
|
* @package Smarty
|
||||||
|
* @subpackage PluginsInternal
|
||||||
|
* @author Uwe Tews
|
||||||
|
*
|
||||||
|
* @deprecated
|
||||||
|
Smarty does no longer use @filemtime()
|
||||||
|
*/
|
||||||
|
class Smarty_Internal_ErrorHandler
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* contains directories outside of SMARTY_DIR that are to be muted by muteExpectedErrors()
|
||||||
|
*/
|
||||||
|
public static $mutedDirectories = array();
|
||||||
|
/**
|
||||||
|
* error handler returned by set_error_handler() in self::muteExpectedErrors()
|
||||||
|
*/
|
||||||
|
private static $previousErrorHandler = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable error handler to mute expected messages
|
||||||
|
*
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
|
public static function muteExpectedErrors()
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
error muting is done because some people implemented custom error_handlers using
|
||||||
|
http://php.net/set_error_handler and for some reason did not understand the following paragraph:
|
||||||
|
|
||||||
|
It is important to remember that the standard PHP error handler is completely bypassed for the
|
||||||
|
error types specified by error_types unless the callback function returns FALSE.
|
||||||
|
error_reporting() settings will have no effect and your error handler will be called regardless -
|
||||||
|
however you are still able to read the current value of error_reporting and act appropriately.
|
||||||
|
Of particular note is that this value will be 0 if the statement that caused the error was
|
||||||
|
prepended by the @ error-control operator.
|
||||||
|
|
||||||
|
Smarty deliberately uses @filemtime() over file_exists() and filemtime() in some places. Reasons include
|
||||||
|
- @filemtime() is almost twice as fast as using an additional file_exists()
|
||||||
|
- between file_exists() and filemtime() a possible race condition is opened,
|
||||||
|
which does not exist using the simple @filemtime() approach.
|
||||||
|
*/
|
||||||
|
$error_handler = array('Smarty_Internal_ErrorHandler', 'mutingErrorHandler');
|
||||||
|
$previous = set_error_handler($error_handler);
|
||||||
|
// avoid dead loops
|
||||||
|
if ($previous !== $error_handler) {
|
||||||
|
self::$previousErrorHandler = $previous;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error Handler to mute expected messages
|
||||||
|
*
|
||||||
|
* @link http://php.net/set_error_handler
|
||||||
|
*
|
||||||
|
* @param integer $errno Error level
|
||||||
|
* @param $errstr
|
||||||
|
* @param $errfile
|
||||||
|
* @param $errline
|
||||||
|
* @param $errcontext
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public static function mutingErrorHandler($errno, $errstr, $errfile, $errline, $errcontext)
|
||||||
|
{
|
||||||
|
$_is_muted_directory = false;
|
||||||
|
// add the SMARTY_DIR to the list of muted directories
|
||||||
|
if (!isset(self::$mutedDirectories[ SMARTY_DIR ])) {
|
||||||
|
$smarty_dir = realpath(SMARTY_DIR);
|
||||||
|
if ($smarty_dir !== false) {
|
||||||
|
self::$mutedDirectories[ SMARTY_DIR ] =
|
||||||
|
array('file' => $smarty_dir, 'length' => strlen($smarty_dir),);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// walk the muted directories and test against $errfile
|
||||||
|
foreach (self::$mutedDirectories as $key => &$dir) {
|
||||||
|
if (!$dir) {
|
||||||
|
// resolve directory and length for speedy comparisons
|
||||||
|
$file = realpath($key);
|
||||||
|
if ($file === false) {
|
||||||
|
// this directory does not exist, remove and skip it
|
||||||
|
unset(self::$mutedDirectories[ $key ]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$dir = array('file' => $file, 'length' => strlen($file),);
|
||||||
|
}
|
||||||
|
if (!strncmp($errfile, $dir[ 'file' ], $dir[ 'length' ])) {
|
||||||
|
$_is_muted_directory = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// pass to next error handler if this error did not occur inside SMARTY_DIR
|
||||||
|
// or the error was within smarty but masked to be ignored
|
||||||
|
if (!$_is_muted_directory || ($errno && $errno & error_reporting())) {
|
||||||
|
if (self::$previousErrorHandler) {
|
||||||
|
return call_user_func(self::$previousErrorHandler,
|
||||||
|
$errno,
|
||||||
|
$errstr,
|
||||||
|
$errfile,
|
||||||
|
$errline,
|
||||||
|
$errcontext);
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue