← All changes | includes/widgets/heading.php +25 -142 4.2.0-dev2 → 3.28.4 View file →

		@@ -7,10 +7,8 @@
7	7
8	8	use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
9	9	use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
10	10	use Elementor\Modules\ContentSanitizer\Interfaces\Sanitizable;
11		-use Elementor\Core\Utils\Hints;
12		-use Elementor\Core\Admin\Admin_Notices;
13	11	use Elementor\Modules\Promotions\Controls\Promotion_Control;
14	12
15	13	/**
16	14	* Elementor heading widget.
		@@ -141,29 +139,8 @@
141	139	return wp_kses( $content, $allowed_tags_for_heading );
142	140	}
143	141
144	142	/**
145		- * Get widget upsale data.
146		- *
147		- * Retrieve the widget promotion data.
148		- *
149		- * @since 3.18.0
150		- * @access protected
151		- *
152		- * @return array Widget promotion data.
153		- */
154		- protected function get_upsale_data() {
155		- return [
156		- 'condition' => ! Utils::has_pro(),
157		- 'image' => esc_url( ELEMENTOR_ASSETS_URL . 'images/go-pro.svg' ),
158		- 'image_alt' => esc_attr__( 'Upgrade', 'elementor' ),
159		- 'description' => esc_html__( 'Create captivating headings that rotate with the Animated Headline Widget.', 'elementor' ),
160		- 'upgrade_url' => esc_url( 'https://go.elementor.com/go-pro-heading-widget/' ),
161		- 'upgrade_text' => esc_html__( 'Upgrade Now', 'elementor' ),
162		- ];
163		- }
164		-
165		- /**
166	143	* Register heading widget controls.
167	144	*
168	145	* Adds different input fields to allow the user to change and customize the widget settings.
169	146	*
		@@ -247,9 +224,17 @@
247	224	'default' => 'h2',
248	225	]
249	226	);
250	227
251		- $this->maybe_add_ally_heading_hint();
	228	+ if ( ! Utils::has_pro() ) {
	229	+ $this->add_control(
	230	+ Utils::ANIMATED_HEADLINE . '_promotion',
	231	+ [
	232	+ 'label' => esc_html__( 'Animated Headline widget', 'elementor' ),
	233	+ 'type' => Promotion_Control::TYPE,
	234	+ ]
	235	+ );
	236	+ }
252	237
253	238	$this->end_controls_section();
254	239
255	240	$this->start_controls_section(
		@@ -265,10 +250,10 @@
265	250	[
266	251	'label' => esc_html__( 'Alignment', 'elementor' ),
267	252	'type' => Controls_Manager::CHOOSE,
268	253	'options' => [
269		- 'start' => [
270		- 'title' => esc_html__( 'Start', 'elementor' ),
	254	+ 'left' => [
	255	+ 'title' => esc_html__( 'Left', 'elementor' ),
271	256	'icon' => 'eicon-text-align-left',
272	257	],
273	258	'center' => [
274	259	'title' => esc_html__( 'Center', 'elementor' ),
		@@ -273,10 +258,10 @@
273	258	'center' => [
274	259	'title' => esc_html__( 'Center', 'elementor' ),
275	260	'icon' => 'eicon-text-align-center',
276	261	],
277		- 'end' => [
278		- 'title' => esc_html__( 'End', 'elementor' ),
	262	+ 'right' => [
	263	+ 'title' => esc_html__( 'Right', 'elementor' ),
279	264	'icon' => 'eicon-text-align-right',
280	265	],
281	266	'justify' => [
282	267	'title' => esc_html__( 'Justified', 'elementor' ),
		@@ -282,13 +267,8 @@
282	267	'title' => esc_html__( 'Justified', 'elementor' ),
283	268	'icon' => 'eicon-text-align-justify',
284	269	],
285	270	],
286		- 'classes' => 'elementor-control-start-end',
287		- 'selectors_dictionary' => [
288		- 'left' => is_rtl() ? 'end' : 'start',
289		- 'right' => is_rtl() ? 'start' : 'end',
290		- ],
291	271	'default' => '',
292	272	'selectors' => [
293	273	'{{WRAPPER}}' => 'text-align: {{VALUE}};',
294	274	],
		@@ -445,9 +425,9 @@
445	425	}
446	426
447	427	$this->add_inline_editing_attributes( 'title' );
448	428
449		- $title = wp_kses_post( $settings['title'] );
	429	+ $title = $this->should_sanitize( $settings ) ? wp_kses_post( $settings['title'] ) : $settings['title'];
450	430
451	431	if ( ! empty( $settings['link']['url'] ) ) {
452	432	$this->add_link_attributes( 'url', $settings['link'] );
453	433
		@@ -459,114 +439,8 @@
459	439	// PHPCS - the variable $title_html holds safe data.
460	440	echo $title_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
461	441	}
462	442
463		- public function render_markdown(): string {
464		- $settings = $this->get_settings_for_display();
465		-
466		- if ( '' === $settings['title'] ) {
467		- return '';
468		- }
469		-
470		- $tag = $settings['header_size'] ?? 'h2';
471		- $level_map = [
472		- 'h1' => 1,
473		- 'h2' => 2,
474		- 'h3' => 3,
475		- 'h4' => 4,
476		- 'h5' => 5,
477		- 'h6' => 6,
478		- ];
479		- $level = $level_map[ $tag ] ?? 2;
480		- $title = Utils::html_to_plain_text( $settings['title'] );
481		-
482		- $md = str_repeat( '#', $level ) . ' ' . $title;
483		-
484		- if ( ! empty( $settings['link']['url'] ) ) {
485		- $md = str_repeat( '#', $level ) . ' [' . $title . '](' . esc_url( $settings['link']['url'] ) . ')';
486		- }
487		-
488		- return $md;
489		- }
490		-
491		- public function maybe_add_ally_heading_hint() {
492		- $notice_id = 'ally_heading_notice';
493		- $plugin_slug = 'pojo-accessibility';
494		-
495		- if ( ! Hints::should_display_hint( $notice_id ) ) {
496		- return;
497		- }
498		-
499		- $one_subscription = Hints::is_plugin_connected_to_one_subscription();
500		- $is_installed = Hints::is_plugin_installed( $plugin_slug );
501		- $is_active = Hints::is_plugin_active( $plugin_slug );
502		-
503		- if ( $is_active ) {
504		- return;
505		- }
506		-
507		- if ( $one_subscription ) {
508		- if ( ! $is_installed ) {
509		- $notice_content = esc_html__( 'Want to ensure this heading is accessible? Your ONE subscription includes Ally. Install it and scan your page.', 'elementor' );
510		- $button_text = esc_html__( 'Install now', 'elementor' );
511		- $button_url = Hints::get_plugin_install_url( $plugin_slug );
512		- $campaign_data = [
513		- 'name' => 'elementor_ea11y_campaign',
514		- 'campaign' => 'acc-scanner-plg-heading-one-install',
515		- 'source' => 'editor-heading-widget-one-install',
516		- 'medium' => 'editor-one',
517		- ];
518		- } elseif ( ! $is_active ) {
519		- $notice_content = esc_html__( 'Keep your content accessible. Activate Ally, included in ONE, to scan this page.', 'elementor' );
520		- $button_text = esc_html__( 'Activate now', 'elementor' );
521		- $button_url = Hints::get_plugin_activate_url( $plugin_slug );
522		- $campaign_data = [
523		- 'name' => 'elementor_ea11y_campaign',
524		- 'campaign' => 'acc-scanner-plg-heading-one-activate',
525		- 'source' => 'editor-heading-widget-one-non-activate',
526		- 'medium' => 'editor-one',
527		- ];
528		- }
529		- } else {
530		- $notice_content = esc_html__( 'Make sure your page is structured with accessibility in mind. Ally helps detect and fix common issues across your site.', 'elementor' );
531		- if ( ! $is_installed ) {
532		- $button_text = esc_html__( 'Install now', 'elementor' );
533		- $button_url = Hints::get_plugin_install_url( $plugin_slug );
534		- } elseif ( ! $is_active ) {
535		- $button_text = esc_html__( 'Activate now', 'elementor' );
536		- $button_url = Hints::get_plugin_activate_url( $plugin_slug );
537		- }
538		- $campaign_data = [
539		- 'name' => 'elementor_ea11y_campaign',
540		- 'campaign' => 'acc-scanner-plg-heading',
541		- 'source' => 'editor-heading-widget',
542		- 'medium' => 'editor',
543		- ];
544		- }
545		-
546		- $notice_heading = esc_html__( 'Accessible structure matters', 'elementor' );
547		-
548		- $this->add_control(
549		- $notice_id,
550		- [
551		- 'type' => Controls_Manager::RAW_HTML,
552		- 'raw' => Hints::get_notice_template( [
553		- 'display' => ! Hints::is_dismissed( $notice_id ),
554		- 'heading' => $notice_heading,
555		- 'type' => 'info',
556		- 'content' => $notice_content,
557		- 'icon' => true,
558		- 'dismissible' => $notice_id,
559		- 'button_text' => $button_text,
560		- 'button_event' => $notice_id,
561		- 'button_data' => [
562		- 'action_url' => Admin_Notices::add_plg_campaign_data( $button_url, $campaign_data ),
563		- ],
564		- ], true ),
565		- ]
566		- );
567		- }
568		-
569	443	/**
570	444	* Render heading widget output in the editor.
571	445	*
572	446	* Written as a Backbone JavaScript template and used to generate the live preview.
		@@ -578,10 +452,10 @@
578	452	?>
579	453	<#
580	454	let title = elementor.helpers.sanitize( settings.title, { ALLOW_DATA_ATTR: false } );
581	455
582		- if ( '' !== settings.link?.url ) {
583		- title = '<a href="' + elementor.helpers.sanitizeUrl( settings.link?.url ) + '">' + title + '</a>';
	456	+ if ( '' !== settings.link.url ) {
	457	+ title = '<a href="' + elementor.helpers.sanitizeUrl( settings.link.url ) + '">' + title + '</a>';
584	458	}
585	459
586	460	view.addRenderAttribute( 'title', 'class', [ 'elementor-heading-title' ] );
587	461
		@@ -598,6 +472,15 @@
598	472
599	473	print( title_html );
600	474	#>
601	475	<?php
	476	+ }
	477	+
	478	+ /**
	479	+ * Check if the content should be sanitized. Sanitizing should be applied for non-admin users in the editor and for shortcodes.
	480	+ *
	481	+ * @return bool
	482	+ */
	483	+ private function should_sanitize( array $settings ): bool {
	484	+ return ( is_admin() && ! current_user_can( 'manage_options' ) ) || ! empty( $settings['isShortcode'] );
602	485	}
603	486	}