← All changes
|
app/Services/FormBuilder/Components/CustomHtml.php
+42
-18
3.6.61
→
6.2.15
View file →
| @@ -5,28 +5,52 @@ | ||
| 5 | 5 | use FluentForm\Framework\Helpers\ArrayHelper; |
| 6 | 6 | |
| 7 | 7 | class CustomHtml extends BaseComponent |
| 8 | 8 | { |
| 9 | - /** | |
| 10 | - * Compile and echo the html element | |
| 11 | - * @param array $data [element data] | |
| 12 | - * @param stdClass $form [Form Object] | |
| 13 | - * @return viod | |
| 14 | - */ | |
| 15 | - public function compile($data, $form) | |
| 16 | - { | |
| 9 | + /** | |
| 10 | + * Compile and echo the html element | |
| 11 | + * | |
| 12 | + * @param array $data [element data] | |
| 13 | + * @param \stdClass $form [Form Object] | |
| 14 | + * | |
| 15 | + * @return void | |
| 16 | + */ | |
| 17 | + public function compile($data, $form) | |
| 18 | + { | |
| 17 | 19 | $elementName = $data['element']; |
| 18 | - $data = apply_filters('fluenform_rendering_field_data_'.$elementName, $data, $form); | |
| 20 | + $data = apply_filters_deprecated( | |
| 21 | + 'fluentform_rendering_field_data_' . $elementName, | |
| 22 | + [ | |
| 23 | + $data, | |
| 24 | + $form | |
| 25 | + ], | |
| 26 | + FLUENTFORM_FRAMEWORK_UPGRADE, | |
| 27 | + 'fluentform/rendering_field_data_' . $elementName, | |
| 28 | + 'Use fluentform/rendering_field_data_' . $elementName . ' instead of fluentform_rendering_field_data_' . $elementName | |
| 29 | + ); | |
| 30 | + $data = apply_filters('fluentform/rendering_field_data_' . $elementName, $data, $form); | |
| 19 | 31 | |
| 20 | 32 | $hasConditions = $this->hasConditions($data) ? 'has-conditions ' : ''; |
| 21 | - $cls = trim($this->getDefaultContainerClass() .' '.$hasConditions); | |
| 22 | - if($containerClass = ArrayHelper::get($data, 'settings.container_class')) { | |
| 23 | - $cls .= ' '.$containerClass; | |
| 33 | + $cls = trim($this->getDefaultContainerClass() . ' ff-' . $elementName . ' ' . $hasConditions); | |
| 34 | + if ($containerClass = ArrayHelper::get($data, 'settings.container_class')) { | |
| 35 | + $cls .= ' ' . $containerClass; | |
| 24 | 36 | } |
| 25 | - $atts = $this->buildAttributes( | |
| 26 | - ArrayHelper::except($data['attributes'], 'name') | |
| 27 | - ); | |
| 28 | - $html = "<div class='{$cls}' {$atts}>{$data['settings']['html_codes']}</div>"; | |
| 29 | - $html = apply_filters('fluenform_rendering_field_html_'.$elementName, $html, $data, $form); | |
| 30 | - echo $html; | |
| 37 | + $atts = $this->buildAttributes( | |
| 38 | + ArrayHelper::except($data['attributes'], 'name') | |
| 39 | + ); | |
| 40 | + $html = "<div class='" . esc_attr($cls) . "' tabindex='-1' {$atts}>" . fluentform_sanitize_html($data['settings']['html_codes']) . '</div>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- $atts is escaped before being passed in. | |
| 41 | + | |
| 42 | + $html = apply_filters_deprecated( | |
| 43 | + 'fluentform_rendering_field_html_' . $elementName, | |
| 44 | + [ | |
| 45 | + $html, | |
| 46 | + $data, | |
| 47 | + $form | |
| 48 | + ], | |
| 49 | + FLUENTFORM_FRAMEWORK_UPGRADE, | |
| 50 | + 'fluentform/rendering_field_html_' . $elementName, | |
| 51 | + 'Use fluentform/rendering_field_html_' . $elementName . ' instead of fluentform_rendering_field_html_' . $elementName | |
| 52 | + ); | |
| 53 | + | |
| 54 | + $this->printContent('fluentform/rendering_field_html_' . $elementName, $html, $data, $form); | |
| 31 | 55 | } |
| 32 | 56 | } |