← All changes | core/utils/hints.php +42 -90 4.1.4 → 3.32.0-dev2 View file →

		@@ -4,9 +4,8 @@
4	4	if ( ! defined( 'ABSPATH' ) ) {
5	5	exit; // Exit if accessed directly.
6	6	}
7	7
8		-use Elementor\Plugin;
9	8	use Elementor\User;
10	9	use Elementor\Utils;
11	10	use Elementor\Core\Admin\Admin_Notices;
12	11
		@@ -24,13 +23,8 @@
24	23	const PLUGIN_INSTALLED = 'plugin_installed';
25	24	const PLUGIN_ACTIVE = 'plugin_active';
26	25	const NOT_HAS_OPTION = 'not_has_option';
27	26
28		- const INSTALL = 'install';
29		- const ACTIVATE = 'activate';
30		- const CONNECT = 'connect';
31		- const CUSTOMIZE = 'customize';
32		-
33	27	/**
34	28	* Get_notice_types
35	29	*
36	30	* @return string[]
		@@ -110,13 +104,13 @@
110	104	*
111	105	* Print or Retrieve the notice template.
112	106	*
113	107	* @param array $notice
114		- * @param bool $should_return
	108	+ * @param bool $return
115	109	*
116	110	* @return string|void
117	111	*/
118		- public static function get_notice_template( array $notice, bool $should_return = false ) {
	112	+ public static function get_notice_template( array $notice, bool $return = false ) {
119	113	$default_settings = [
120	114	'type' => 'info',
121	115	'icon' => false,
122	116	'heading' => '',
		@@ -187,9 +181,9 @@
187	181	$dismissible,
188	182	$notice_settings['display']
189	183	);
190	184
191		- if ( $should_return ) {
	185	+ if ( $return ) {
192	186	return $notice_template;
193	187	}
194	188	echo wp_kses( $notice_template, self::get_notice_allowed_html() );
195	189	}
		@@ -344,12 +338,8 @@
344	338	*
345	339	* @return bool
346	340	*/
347	341	public static function is_plugin_installed( $plugin ): bool {
348		- if ( ! function_exists( 'get_plugins' ) ) {
349		- require_once ABSPATH . 'wp-admin/includes/plugin.php';
350		- }
351		-
352	342	$plugins = get_plugins();
353	343	$plugin = self::ensure_plugin_folder( $plugin );
354	344	return ! empty( $plugins[ $plugin ] );
355	345	}
		@@ -448,94 +438,56 @@
448	438	public static function is_plugin_connected( $option_prefix ): bool {
449	439	return ! empty( get_option( $option_prefix . '_access_token' ) );
450	440	}
451	441
452		- public static function is_plugin_connected_to_one_subscription(): bool {
453		- return self::is_plugin_connected( 'elementor_one' );
454		- }
455		-
456		- private static function get_all_widget_content( $step, $one_subscription = false ) {
457		- if ( $one_subscription ) {
458		- $steps = [
459		- self::INSTALL => esc_html__( 'Want to create an inclusive experience? Install Ally, included in ONE, and add an accessibility widget to your site.', 'elementor' ),
460		- self::ACTIVATE => esc_html__( 'Your ONE subscription includes Ally. Activate it to place an accessibility widget on your site.', 'elementor' ),
461		- self::CONNECT => esc_html__( "Connect the Ally plugin to your account to access all of it's accessibility features.", 'elementor' ),
462		- self::CUSTOMIZE => esc_html__( "Customize the widget's look, position and the capabilities available for your visitors.", 'elementor' ),
463		- ];
464		- } else {
465		- $steps = [
466		- self::INSTALL => esc_html__( 'Install Ally to add an accessibility widget visitors can use to navigate your site.', 'elementor' ),
467		- self::ACTIVATE => esc_html__( 'Activate the Ally plugin to turn its accessibility features on across your site.', 'elementor' ),
468		- self::CONNECT => esc_html__( "Connect the Ally plugin to your account to access all of it's accessibility features.", 'elementor' ),
469		- self::CUSTOMIZE => esc_html__( "Customize the widget's look, position and the capabilities available for your visitors.", 'elementor' ),
470		- ];
471		- }
472		- return $steps[ $step ];
473		- }
474		-
475		- private static function get_all_widget_action_button( $step ) {
476		- $steps = [
477		- self::INSTALL => esc_html__( 'Install now', 'elementor' ),
478		- self::ACTIVATE => esc_html__( 'Activate now', 'elementor' ),
479		- self::CONNECT => esc_html__( 'Connect now', 'elementor' ),
480		- self::CUSTOMIZE => esc_html__( 'Customize', 'elementor' ),
481		- ];
482		- return $steps[ $step ];
483		- }
484		-
485		- private static function get_all_widget_action_url( $step, $one_subscription = false ) {
486		- if ( in_array( $step, [ self::INSTALL, self::ACTIVATE ], true ) ) {
487		- $action = ( self::INSTALL === $step ? 'install' : 'activate' );
488		- if ( $one_subscription ) {
489		- $campaign_data = [
490		- 'name' => 'elementor_ea11y_campaign',
491		- 'campaign' => 'acc-usability-widget-plg-ally-one-' . $action,
492		- 'source' => 'editor-ally-widget-one-' . $action,
493		- 'medium' => 'editor-one',
494		- ];
495		- } else {
496		- $campaign_data = [
497		- 'name' => 'elementor_ea11y_campaign',
498		- 'campaign' => 'acc-usability-widget-plg-ally',
499		- 'source' => 'editor-ally-widget',
500		- 'medium' => 'editor',
501		- ];
502		- }
503		- return Admin_Notices::add_plg_campaign_data( self::get_plugin_action_url( 'pojo-accessibility' ), $campaign_data );
504		- }
505		- return self::CONNECT === $step ? admin_url( 'admin.php?page=accessibility-settings' ) : admin_url( 'admin.php?page=accessibility-settings#design' );
506		- }
507		-
508		- private static function get_ally_cta_button( $step, $one_subscription = false ) {
509		- return [
510		- 'text' => self::get_all_widget_action_button( $step ),
511		- 'url' => self::get_all_widget_action_url( $step, $one_subscription ),
512		- 'classes' => [ 'elementor-button' ],
513		- ];
514		- }
515		-
516	442	public static function get_ally_action_data(): array {
517	443	$plugin_slug = 'pojo-accessibility';
518	444	$is_installed = self::is_plugin_installed( $plugin_slug );
519	445	$is_active = self::is_plugin_active( $plugin_slug );
520	446	$is_connected = self::is_plugin_connected( 'ea11y' );
521		- $one_subscription = self::is_plugin_connected_to_one_subscription();
522	447
	448	+ $data = [
	449	+ 'title' => __( 'Ally web accessibility', 'elementor' ),
	450	+ ];
	451	+
	452	+ $campaign_data = [
	453	+ 'name' => 'elementor_ea11y_campaign',
	454	+ 'campaign' => 'acc-usability-widget-plg-ally',
	455	+ 'source' => 'editor-ally-widget',
	456	+ 'medium' => 'editor',
	457	+ ];
	458	+
523	459	if ( ! $is_installed ) {
524		- $step = self::INSTALL;
525		- } elseif ( ! $is_active ) {
526		- $step = self::ACTIVATE;
527		- } elseif ( ! $is_connected ) {
528		- $step = self::CONNECT;
	460	+ $url = Admin_Notices::add_plg_campaign_data( self::get_plugin_action_url( $plugin_slug ), $campaign_data );
	461	+ $data['content'] = esc_html__( 'Install Ally to add an accessibility widget visitors can use to navigate your site.', 'elementor' );
	462	+ $data['action_button'] = [
	463	+ 'text' => esc_html__( 'install Now', 'elementor' ),
	464	+ 'url' => $url,
	465	+ 'classes' => [ 'elementor-button' ],
	466	+ ];
	467	+ } else if ( ! $is_active ) {
	468	+ $url = Admin_Notices::add_plg_campaign_data( self::get_plugin_action_url( $plugin_slug ), $campaign_data );
	469	+ $data['content'] = esc_html__( 'Activate the Ally plugin to turn its accessibility features on across your site.', 'elementor' );
	470	+ $data['action_button'] = [
	471	+ 'text' => esc_html__( 'Activate', 'elementor' ),
	472	+ 'url' => $url,
	473	+ 'classes' => [ 'elementor-button' ],
	474	+ ];
	475	+ } else if ( ! $is_connected ) {
	476	+ $data['content'] = esc_html__( "Connect the Ally plugin to your account to access all of it's accessibility features.", 'elementor' );
	477	+ $data['action_button'] = [
	478	+ 'text' => esc_html__( 'Connect', 'elementor' ),
	479	+ 'url' => admin_url( 'admin.php?page=accessibility-settings' ),
	480	+ 'classes' => [ 'elementor-button' ],
	481	+ ];
529	482	} else {
530		- $step = self::CUSTOMIZE;
	483	+ $data['content'] = esc_html__( "Customize the widget's look, position and the capabilities available for your visitors.", 'elementor' );
	484	+ $data['action_button'] = [
	485	+ 'text' => esc_html__( 'Customize', 'elementor' ),
	486	+ 'url' => admin_url( 'admin.php?page=accessibility-settings#design' ),
	487	+ 'classes' => [ 'elementor-button' ],
	488	+ ];
531	489	}
532		-
533		- $data = [
534		- 'title' => __( 'Ally web accessibility', 'elementor' ),
535		- 'content' => self::get_all_widget_content( $step, $one_subscription ),
536		- 'action_button' => self::get_ally_cta_button( $step, $one_subscription ),
537		- ];
538	490
539	491	return $data;
540	492	}
541	493	}