← All changes | classes/helpers/FrmFormMigratorsHelper.php +16 -33 6.32 → 6.13 View file →

		@@ -5,11 +5,8 @@
5	5
6	6	class FrmFormMigratorsHelper {
7	7
8	8	/**
9		- * @param array $form
10		- * @param array|null $dismissed
11		- *
12	9	* @return bool
13	10	*/
14	11	private static function is_dismissed( $form, $dismissed = null ) {
15	12	if ( $dismissed === null ) {
		@@ -14,10 +11,14 @@
14	11	private static function is_dismissed( $form, $dismissed = null ) {
15	12	if ( $dismissed === null ) {
16	13	$dismissed = get_option( 'frm_dismissed' );
17	14	}
18		- // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
19		- return $dismissed && in_array( $form['class'], $dismissed );
	15	+
	16	+ if ( ! empty( $dismissed ) && in_array( $form['class'], $dismissed ) ) {
	17	+ return true;
	18	+ }
	19	+
	20	+ return false;
20	21	}
21	22
22	23	/**
23	24	* @return void
		@@ -23,18 +24,16 @@
23	24	* @return void
24	25	*/
25	26	public static function maybe_show_download_link() {
26	27	$forms = self::import_links();
27		-
28	28	foreach ( $forms as $form ) {
29	29	if ( ! self::is_dismissed( $form ) ) {
30	30	self::install_banner( $form );
31		- continue;
	31	+ } else {
	32	+ echo '<span>';
	33	+ self::install_button( $form, 'auto' );
	34	+ echo '</span>';
32	35	}
33		-
34		- echo '<span>';
35		- self::install_button( $form, 'auto' );
36		- echo '</span>';
37	36	}
38	37	}
39	38
40	39	/**
		@@ -43,15 +42,13 @@
43	42	* @return void
44	43	*/
45	44	public static function maybe_add_to_inbox() {
46	45	$forms = self::import_links();
47		-
48	46	if ( ! $forms ) {
49	47	return;
50	48	}
51	49
52	50	$inbox = new FrmInbox();
53		-
54	51	foreach ( $forms as $form ) {
55	52	$inbox->add_message(
56	53	array(
57	54	'key' => $form['class'],
		@@ -56,9 +53,9 @@
56	53	array(
57	54	'key' => $form['class'],
58	55	'subject' => 'You have new importable forms',
59	56	'message' => 'Did you know you can import your forms created in ' . esc_html( $form['name'] ) . '?',
60		- 'cta' => '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-import' ) ) . '" class="button-primary frm-button-primary">' . esc_html__( 'Learn More', 'formidable' ) . '</a>', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	57	+ 'cta' => '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-import' ) ) . '" class="button-primary frm-button-primary">' . esc_html__( 'Learn More', 'formidable' ) . '</a>',
61	58	'icon' => 'frm_cloud_upload_solid_icon',
62	59	'type' => 'news',
63	60	)
64	61	);
		@@ -73,9 +70,8 @@
73	70	return array();
74	71	}
75	72
76	73	$forms = array();
77		-
78	74	foreach ( self::importable_forms() as $form ) {
79	75	if ( class_exists( $form['class'] ) || ! is_plugin_active( $form['plugin'] ) ) {
80	76	// Either the importer is installed or the source plugin isn't.
81	77	continue;
		@@ -86,9 +82,8 @@
86	82	$form['link'] = $installer->get_activate_link();
87	83
88	84	$forms[] = $form;
89	85	}
90		-
91	86	return $forms;
92	87	}
93	88
94	89	/**
		@@ -112,19 +107,13 @@
112	107	),
113	108	);
114	109	}
115	110
116		- /**
117		- * @param array $install
118		- *
119		- * @return string|null
120		- */
121	111	private static function install_banner( $install ) {
122	112	if ( empty( $install['link'] ) ) {
123	113	return '';
124	114	}
125	115
126		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
127	116	?>
128	117	<div class="frm-feature-banner">
129	118	<a href="#" class="dismiss alignright" id="<?php echo esc_attr( $install['class'] ); ?>" title="<?php esc_attr_e( 'Dismiss this message', 'formidable' ); ?>">
130	119	<?php FrmAppHelper::icon_by_class( 'frmfont frm_close_icon', array( 'aria-label' => 'Dismiss' ) ); ?>
		@@ -135,10 +124,8 @@
135	124	<p>Did you know you can import your forms created in <?php echo esc_html( $install['name'] ); ?>?</p>
136	125	<?php self::install_button( $install ); ?>
137	126	</div>
138	127	<?php
139		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
140		- return null;
141	128	}
142	129
143	130	/**
144	131	* @param array $install
		@@ -148,17 +135,16 @@
148	135	*/
149	136	private static function install_button( $install, $label = '' ) {
150	137	$primary = 'button-secondary frm-button-secondary ';
151	138
152		- if ( ! $label ) {
	139	+ if ( empty( $label ) ) {
153	140	$label = __( 'Get Started', 'formidable' );
154	141	$primary = 'button-primary frm-button-primary ';
155	142	}
156	143
157		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
158	144	if ( $install['installed'] ) {
159	145	?>
160		- <a rel="<?php echo esc_attr( $install['importer'] ); ?>" class="button frm-activate-addon <?php echo esc_attr( $primary . ( ! empty( $install['link'] ) ? '' : 'frm_hidden' ) ); ?>"><?php // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong ?>
	146	+ <a rel="<?php echo esc_attr( $install['importer'] ); ?>" class="button frm-activate-addon <?php echo esc_attr( $primary . ( empty( $install['link'] ) ? 'frm_hidden' : '' ) ); ?>">
161	147	<?php
162	148	if ( $label === 'auto' ) {
163	149	/* translators: %s: Name of the plugin */
164	150	$label = sprintf( __( 'Activate %s', 'formidable' ), $install['name'] );
		@@ -164,9 +150,9 @@
164	150	$label = sprintf( __( 'Activate %s', 'formidable' ), $install['name'] );
165	151	}
166	152	} else {
167	153	?>
168		- <a rel="<?php echo esc_attr( $install['package'] ); ?>" class="frm-install-addon button <?php echo esc_attr( $primary ); ?>" aria-label="<?php esc_attr_e( 'Install', 'formidable' ); ?>"><?php // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong ?>
	154	+ <a rel="<?php echo esc_attr( $install['package'] ); ?>" class="frm-install-addon button <?php echo esc_attr( $primary ); ?>" aria-label="<?php esc_attr_e( 'Install', 'formidable' ); ?>">
169	155	<?php
170	156	if ( $label === 'auto' ) {
171	157	/* translators: %s: Name of the plugin */
172	158	$label = sprintf( __( 'Install %s Importer', 'formidable' ), $install['name'] );
		@@ -175,9 +161,8 @@
175	161	?>
176	162	<?php echo esc_html( $label ); ?>
177	163	</a>
178	164	<?php
179		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
180	165	}
181	166
182	167	/**
183	168	* @return void
		@@ -184,14 +169,12 @@
184	169	*/
185	170	public static function dismiss_migrator() {
186	171	check_ajax_referer( 'frm_ajax', 'nonce' );
187	172	$dismissed = get_option( 'frm_dismissed' );
188		-
189		- if ( ! $dismissed ) {
	173	+ if ( empty( $dismissed ) ) {
190	174	$dismissed = array();
191	175	}
192		-
193	176	$dismissed[] = FrmAppHelper::get_param( 'plugin', '', 'post', 'sanitize_text_field' );
194		- update_option( 'frm_dismissed', array_filter( $dismissed ), false );
	177	+ update_option( 'frm_dismissed', array_filter( $dismissed ), 'no' );
195	178	wp_die();
196	179	}
197	180	}