Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allowing to add multiple style properties per element [CKEditor] #91

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allowing to add multiple style properties per element [CKEditor] #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions h5p.classes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3633,6 +3633,8 @@ public function validateText(&$text, $semantics) {
$stylePatterns = array();
// All styles must be start to end patterns (^...$)
if (isset($semantics->font)) {
$stylePatterns[] = '/^font-style: *(italic|normal|oblique);?$/i'; // allow font-style property
$stylePatterns[] = '/^font-weight: *[0-9.]+;?$/i'; // allow font-weight property
if (isset($semantics->font->size) && $semantics->font->size) {
$stylePatterns[] = '/^font-size: *[0-9.]+(em|px|%) *;?$/i';
}
Expand All @@ -3655,6 +3657,14 @@ public function validateText(&$text, $semantics) {

// Alignment is allowed for all wysiwyg texts
$stylePatterns[] = '/^text-align: *(center|left|right);?$/i';
// other necessary style tags - allowing additional tags
$stylePatterns[] = "/^width: *[0-9.]+(px|%) *;?$/i";
$stylePatterns[] = "/^height: *[0-9.]+(px|%) *;?$/i";
$stylePatterns[] = "/^margin: *[0-9.]+(em|px|%)+(\s(#?)([a-z0-9]{3,6})){0,3} *;?$/i";
$stylePatterns[] = "/^padding: *[0-9.]+(em|px|%)+(\s(#?)([a-z0-9]{3,6})){0,3} *;?$/i";
$stylePatterns[] = "/^padding(-(top|bottom|right|left)): *[0-9.]+(em|px|%) *;?$/i";
$stylePatterns[] = "/^margin(-(top|bottom|right|left)): *[0-9.]+(em|px|%) *;?$/i";
$stylePatterns[] = "/^border(-(top|bottom|right|left)|):(\s?)(([0-9.]*)+(em|px|%))+(\s(#?)[a-z0-9]{3,6}){0,2} *;?$/i";

// Strip invalid HTML tags.
$text = $this->filter_xss($text, $tags, $stylePatterns);
Expand Down Expand Up @@ -4342,14 +4352,23 @@ private function _filter_xss_attributes($attr, $allowedStyles = FALSE) {
// Attribute value, a URL after href= for instance.
if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) {
if ($allowedStyles && $attrName === 'style') {
$matches = explode(";", $match[1]); // get all the style properties
// Allow certain styles
$styleArr = [];
foreach ($allowedStyles as $pattern) {
if (preg_match($pattern, $match[1])) {
// All patterns are start to end patterns, and CKEditor adds one span per style
$attrArr[] = 'style="' . $match[1] . '"';
break;
foreach ($matches as $match) { // loop through each style property of an element
if (preg_match($pattern, trim($match))) { // add the property in styleArr if exist in allowed style array
// All patterns are start to end patterns, and CKEditor adds one span per style
// overriding the CKEditor one style per span logic - as some addon might add multiple style attributes per element
$styleArr[] = $match;
// break; this break not needed anymore for allowing multiple style properties per element
}
}
}
// if style array has some style properties then prepare final style attribute for element
if (!empty($styleArr)) {
$attrArr[] = 'style="' . implode(";", $styleArr) . '"';
}
break;
}

Expand Down