diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php index d5afe07557442247e8be834455b5fee83a5d98c5..088834e79519a039ffb91df3904f6e196923b318 100644 --- a/extension/Classes/Core/AbstractBuildForm.php +++ b/extension/Classes/Core/AbstractBuildForm.php @@ -3398,7 +3398,7 @@ abstract class AbstractBuildForm { $paragraphToken = 'p[align]'; $strong = 'strong'; - $htmlAllowArray = explode(',',$formElement[FE_HTML_ALLOW]); + $htmlAllowArray = explode(',', $formElement[FE_HTML_ALLOW]); $formatDropdownElements = array(); $customEditorToolbar = 'code |'; @@ -3408,49 +3408,49 @@ abstract class AbstractBuildForm { $formatDropdownFlag = false; $customEditorToolbarFlags = array(); - foreach($htmlAllowArray as $htmlToken => $value) { - switch($value) { + foreach ($htmlAllowArray as $htmlToken => $value) { + switch ($value) { case 'a': $htmlAllowArray[$htmlToken] = $url; self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'link'); - break; + break; case 'table': $htmlAllowArray[$htmlToken] = $table; self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'table'); - break; + break; case 'textDecoration': case 'u': case 'ins': case 's': case 'del': - if(!$decorationFlag) { + if (!$decorationFlag) { $htmlAllowArray[$htmlToken] = $textDecoration; self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'textDecoration', 'underline strikethrough'); $decorationFlag = true; } - break; + break; case 'img': $htmlAllowArray[$htmlToken] = $imgToken; self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'image'); - break; + break; case 'ul': - if(!$listFlag) { + if (!$listFlag) { $htmlAllowArray[$htmlToken] = 'ul,li'; $listFlag = true; } else { $htmlAllowArray[$htmlToken] = 'ul'; } self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'bullist'); - break; + break; case 'ol': - if(!$listFlag) { + if (!$listFlag) { $htmlAllowArray[$htmlToken] = 'ol,li'; $listFlag = true; } else { $htmlAllowArray[$htmlToken] = 'ol'; } self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'numlist'); - break; + break; case 'b': case 'strong': $htmlAllowArray[$htmlToken] = $strong; @@ -3462,10 +3462,10 @@ abstract class AbstractBuildForm { break; case 'sub': self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'subscript'); - break; + break; case 'sup': self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'supscript'); - break; + break; case 'h1': case 'h2': case 'h3': @@ -3475,31 +3475,31 @@ abstract class AbstractBuildForm { case 'p': case 'div': case 'pre': - if($value === 'p') { - $htmlAllowArray[$htmlToken] = $paragraphToken; - } + if ($value === 'p') { + $htmlAllowArray[$htmlToken] = $paragraphToken; + } self::setTinymceBlockFormats($value, $formatDropdownElements); - if(!$formatDropdownFlag) { - $formatDropdownFlag = true; - } + if (!$formatDropdownFlag) { + $formatDropdownFlag = true; + } break; } } // set format dropdown at the end of the toolbar if its used - if($formatDropdownFlag) { + if ($formatDropdownFlag) { self::setTinymceEditorToolbarAttributes($customEditorToolbarFlags, $customEditorToolbar, 'formatselect'); } // If htmlAllow is used: toolbar will be overwritten with the customized one - if(!empty($customEditorToolbarFlags)) { + if (!empty($customEditorToolbarFlags)) { $formElement[FE_EDITOR_PREFIX . 'toolbar'] = $customEditorToolbar; } // Set allowed values and corrected dropdown from formats if (isset($formElement[FE_HTML_ALLOW])) { - $formElement[FE_EDITOR_PREFIX . 'valid_elements'] = implode(',',$htmlAllowArray); - $formElement[FE_TINYMCE_DROPDOWN_FORMATS] = implode(';',$formatDropdownElements); + $formElement[FE_EDITOR_PREFIX . 'valid_elements'] = implode(',', $htmlAllowArray); + $formElement[FE_TINYMCE_DROPDOWN_FORMATS] = implode(';', $formatDropdownElements); $formElement[FE_EDITOR_PREFIX . 'block_formats'] = $formElement[FE_TINYMCE_DROPDOWN_FORMATS]; } @@ -3531,11 +3531,11 @@ abstract class AbstractBuildForm { * @return void */ private function setTinymceEditorToolbarAttributes(&$toolbarFlags, &$attributeList, $attributeName, $specialAttributeName = '') { - if(!$toolbarFlags[$attributeName]) { - if($specialAttributeName === '') { - $attributeList.= ' '.$attributeName; + if (!$toolbarFlags[$attributeName]) { + if ($specialAttributeName === '') { + $attributeList .= ' ' . $attributeName; } else { - $attributeList .= ' '.$specialAttributeName; + $attributeList .= ' ' . $specialAttributeName; } $toolbarFlags[$attributeName] = true; }