Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix CustomHtml block class

Browse Source 
[MAILPOET-6287]
This commit is contained in:
Pavel Dohnal
2024-10-18 12:29:36 +02:00
committed by Rostislav Wolný
parent c3df5d4685
commit ebcfca9a56
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mailpoet/lib/Form/Block/BlockRendererHelper.php
View File

@ -216,10 +216,11 @@ class BlockRendererHelper {
// return field name depending on block data
public function getFieldName(array $block = []): string {
if ((int)$block['id'] > 0) {
return 'cf_' . $block['id'];
$blockId = $this->wp->escAttr($block['id']);
if ((int)$blockId > 0) {
return 'cf_' . $blockId;
} elseif (isset($block['params']['obfuscate']) && !$block['params']['obfuscate']) {
return $block['id'];
return $blockId;
} else {
return $this->fieldNameObfuscator->obfuscate($block['id']);//obfuscate field name for spambots
}

2
mailpoet/lib/Form/Block/Html.php
View File

@ -31,7 +31,7 @@ class Html {
}
$classes = isset($block['params']['class_name']) ? " " . $block['params']['class_name'] : '';
$html .= '<div class="mailpoet_paragraph' . $classes . '" ' . $this->rendererHelper->renderFontStyle($formSettings) . '>';
$html .= '<div class="mailpoet_paragraph' . $this->wp->escAttr($classes) . '" ' . $this->rendererHelper->renderFontStyle($formSettings) . '>';
$html .= $this->wp->wpKsesPost($text);
$html .= '</div>';

8
mailpoet/tests/integration/Form/Block/SanitisationHtmlTest.php
View File

@ -36,4 +36,12 @@ class SanitisationHtmlTest extends \MailPoetTest {
$html = $this->html->render($block, []);
verify($html)->equals("<div class=\"mailpoet_paragraph\" ><p class=\"my-p\">Hello</p><img src=\"x\"></div>");
}
public function testItSanitisesClassName(): void {
$block = $this->block;
$block['params']['class_name'] = 'my_clas"s1 class2';
$block['params']['text'] = 'line1';
$html = $this->html->render($block, []);
verify($html)->equals("<div class=\"mailpoet_paragraph my_clas&quot;s1 class2\" >line1</div>");
}
}

1
mailpoet/tests/unit/Form/Block/HtmlTest.php
View File

@ -26,6 +26,7 @@ class HtmlTest extends \MailPoetUnitTest {
parent::_before();
$wpMock = $this->createMock(WPFunctions::class);
$wpMock->method('wpKsesPost')->willReturnArgument(0);
$wpMock->method('escAttr')->willReturnArgument(0);
$this->html = new Html(
$this->createMock(BlockRendererHelper::class),
$wpMock