smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed handling of hashed opening php-tags inside strip-blocks

Browse Source 
(reported by titi_rafa)
This commit is contained in:
messju
2005-01-30 21:54:39 +00:00
parent 5740bbd371
commit bd2abcbbcd
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -1,3 +1,4 @@
- fix handling of hashed opening php-tags inside strip-blocks (messju)
- change escape:url use rawurlencode() instead of urlencode() (messju)
- make $smarty.const.FOO compile to "FOO", and not to "constant('foo')".
this is less code and a little faster execution. note that undefined

37
libs/Smarty_Compiler.class.php
View File

@@ -318,6 +318,32 @@ class Smarty_Compiler extends Smarty {
return;
}
/* Reformat $text_blocks between 'strip' and '/strip' tags,
removing spaces, tabs and newlines. */
$strip = false;
for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
if ($compiled_tags[$i] == '{strip}') {
$compiled_tags[$i] = '';
$strip = true;
}
if ($strip) {
/* strip all $text_blocks before the next '/strip' */
for ($j = $i + 1; $j < $for_max; $j++) {
/* remove leading and trailing whitespaces of each line */
$text_blocks[$j] = preg_replace('!\s+$|^\s+!m', '', $text_blocks[$j]);
/* remove carriage return and newline between each line */
$text_blocks[$j] = preg_replace('![\r\n]+!m', '', $text_blocks[$j]);
$text_blocks[$j] = "<?php echo '" . strtr($text_blocks[$j], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>";
if ($compiled_tags[$j] == '{/strip}') {
$compiled_tags[$j] = "\n"; /* slurped by php, but necessary
if a newline is following the closing strip-tag */
$strip = false;
$i = $j;
break;
}
}
}
}
$compiled_content = '';
/* Interleave the compiled contents and text blocks to get the final result. */
@@ -330,17 +356,6 @@ class Smarty_Compiler extends Smarty {
}
$compiled_content .= $text_blocks[$i];
/* Reformat data between 'strip' and '/strip' tags, removing spaces, tabs and newlines. */
if (preg_match_all("~{$ldq}strip{$rdq}.*?{$ldq}/strip{$rdq}~s", $compiled_content, $_match)) {
$strip_tags = $_match[0];
$strip_tags_modified = preg_replace("~{$ldq}/?strip{$rdq}|[\t ]+$|^[\t ]+~m", '', $strip_tags);
$strip_tags_modified = preg_replace('~[\r\n]+~m', '', $strip_tags_modified);
for ($i = 0, $for_max = count($strip_tags); $i < $for_max; $i++)
$compiled_content = preg_replace("~{$ldq}strip{$rdq}.*?{$ldq}/strip{$rdq}~s",
$this->_quote_replace($strip_tags_modified[$i]),
$compiled_content, 1);
}
// remove \n from the end of the file, if any
if (($_len=strlen($compiled_content)) && ($compiled_content{$_len - 1} == "\n" )) {
$compiled_content = substr($compiled_content, 0, -1);