Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-01 10:01:26 +01:00
Code Issues Packages Projects Releases Activity

Fixed |safe_email filter to return safe and escaped UTF-8 HTML [#3072]

Browse Source
This commit is contained in:
Matias Griese
2020-11-24 19:36:35 +02:00
parent 75f9c0a892
commit 068de42e83
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -41,6 +41,7 @@
* Fixed `system://` stream is causing issues in Admin, making Media tab to disappear and possibly causing other issues [#3072](https://github.com/getgrav/grav/issues/3072)
* Fixed CLI self-upgrade from Grav 1.6 [#3079](https://github.com/getgrav/grav/issues/3079)
* Fixed `bin/grav yamllinter -a` and `-f` not following symlinks [#3080](https://github.com/getgrav/grav/issues/3080)
* Fixed `|safe_email` filter to return safe and escaped UTF-8 HTML [#3072](https://github.com/getgrav/grav/issues/3072)
# v1.7.0-rc.17
## 10/07/2020

21
system/src/Grav/Common/Twig/TwigExtension.php
View File

@@ -129,7 +129,7 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
new TwigFilter('rtrim', [$this, 'rtrimFilter']),
new TwigFilter('pad', [$this, 'padFilter']),
new TwigFilter('regex_replace', [$this, 'regexReplace']),
new TwigFilter('safe_email', [$this, 'safeEmailFilter']),
new TwigFilter('safe_email', [$this, 'safeEmailFilter'], ['is_safe' => ['html']]),
new TwigFilter('safe_truncate', ['\Grav\Common\Utils', 'safeTruncate']),
new TwigFilter('safe_truncate_html', ['\Grav\Common\Utils', 'safeTruncateHTML']),
new TwigFilter('sort_by_key', [$this, 'sortByKeyFilter']),
@@ -267,14 +267,23 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
*/
public function safeEmailFilter($str)
{
$email = '';
for ($i = 0, $len = strlen($str); $i < $len; $i++) {
$j = random_int(0, 1);
static $list = [
'"' => '&#34;',
"'" => '&#39;',
'&' => '&amp;',
'<' => '&lt;',
'>' => '&gt;',
'@' => '&#64;'
];
$email .= $j === 0 ? '&#' . ord($str[$i]) . ';' : $str[$i];
$characters = mb_str_split($str, 1, 'UTF-8');
$encoded = '';
foreach ($characters as $chr) {
$encoded .= $list[$chr] ?? (random_int(0, 1) ? '&#' . mb_ord($chr) . ';' : $chr);
}
return str_replace('@', '&#64;', $email);
return $encoded;
}
/**