← All changes | classes/controllers/FrmEntriesController.php +121 -44 6.5 → 6.19 View file →

		@@ -9,11 +9,14 @@
9	9	FrmAppHelper::force_capability( 'frm_view_entries' );
10	10
11	11	add_submenu_page( 'formidable', 'Formidable | ' . __( 'Entries', 'formidable' ), __( 'Entries', 'formidable' ), 'frm_view_entries', 'formidable-entries', 'FrmEntriesController::route' );
12	12
13		- $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) ? FrmProAppHelper::views_is_installed() : FrmAppHelper::pro_is_installed();
	13	+ $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) && FrmProAppHelper::views_is_installed();
14	14	if ( ! $views_installed ) {
15	15	add_submenu_page( 'formidable', 'Formidable | ' . __( 'Views', 'formidable' ), __( 'Views', 'formidable' ), 'frm_view_entries', 'formidable-views', 'FrmFormsController::no_views' );
	16	+ self::maybe_redirect_to_views_upsell();
	17	+ } else {
	18	+ self::maybe_redirect_to_views_index();
16	19	}
17	20
18	21	if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) ) {
19	22	self::load_manage_entries_hooks();
		@@ -20,8 +23,73 @@
20	23	}
21	24	}
22	25
23	26	/**
	27	+ * This function is called when views is installed.
	28	+ * The Views add-on uses a different URL for the Views tab than the upsell page.
	29	+ * If the user is on the upsell page, instead of showing a permission error on reload,
	30	+ * redirect to the views index page.
	31	+ *
	32	+ * @since 6.14.1
	33	+ *
	34	+ * @return void
	35	+ */
	36	+ private static function maybe_redirect_to_views_index() {
	37	+ if ( ! FrmAppHelper::is_admin_page( 'formidable-views' ) ) {
	38	+ return;
	39	+ }
	40	+
	41	+ $query_args = array(
	42	+ 'post_type' => 'frm_display',
	43	+ );
	44	+ $query_args = self::add_url_params_to_views_redirect_query_args( $query_args );
	45	+
	46	+ wp_safe_redirect( add_query_arg( $query_args, admin_url( 'edit.php' ) ) );
	47	+ die();
	48	+ }
	49	+
	50	+ /**
	51	+ * This function is called when views is inactive.
	52	+ * A user may deactivate views but then try to reload the views index.
	53	+ * Instead of showing a permission error, redirect to the views upsell page.
	54	+ *
	55	+ * @since 6.14.1
	56	+ *
	57	+ * @return void
	58	+ */
	59	+ private static function maybe_redirect_to_views_upsell() {
	60	+ global $pagenow;
	61	+ if ( 'edit.php' !== $pagenow || 'frm_display' !== FrmAppHelper::simple_get( 'post_type' ) ) {
	62	+ return;
	63	+ }
	64	+
	65	+ $query_args = array(
	66	+ 'page' => 'formidable-views',
	67	+ );
	68	+ $query_args = self::add_url_params_to_views_redirect_query_args( $query_args );
	69	+
	70	+ wp_safe_redirect( add_query_arg( $query_args, admin_url( 'admin.php' ) ) );
	71	+ die();
	72	+ }
	73	+
	74	+ /**
	75	+ * @since 6.14.1
	76	+ *
	77	+ * @param array $query_args
	78	+ * @return array
	79	+ */
	80	+ private static function add_url_params_to_views_redirect_query_args( $query_args ) {
	81	+ $query_args['show_nav'] = FrmAppHelper::simple_get( 'show_nav', 'absint', 0 );
	82	+
	83	+ $form_id = FrmAppHelper::simple_get( 'form', 'absint', 0 );
	84	+ if ( $form_id ) {
	85	+ $query_args['form'] = $form_id;
	86	+ }
	87	+
	88	+ return $query_args;
	89	+ }
	90	+
	91	+ /**
24	92	* @since 2.05.07
25	93	*/
26	94	private static function load_manage_entries_hooks() {
27	95	if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show', 'new', 'duplicate' ), true ) ) {
		@@ -35,9 +103,11 @@
35	103	add_filter( 'screen_options_show_screen', __CLASS__ . '::remove_screen_options', 10, 2 );
36	104	}
37	105	}
38	106
39		- /* Display in Back End */
	107	+ /**
	108	+ * Display in Back End.
	109	+ */
40	110	public static function route() {
41	111	$action = FrmAppHelper::get_param( 'frm_action', '', 'get', 'sanitize_title' );
42	112	FrmAppHelper::include_svg();
43	113
		@@ -62,10 +132,12 @@
62	132	*
63	133	* @since 3.0
64	134	*/
65	135	public static function remove_screen_options( $show_screen, $screen ) {
66		- $menu_name = sanitize_title( FrmAppHelper::get_menu_name() );
67		- if ( $screen->id == $menu_name . '_page_formidable-entries' ) {
	136	+ $menu_name = sanitize_title( FrmAppHelper::get_menu_name() );
	137	+ $unread_count = FrmEntriesHelper::get_visible_unread_inbox_count();
	138	+
	139	+ if ( $screen->id === $menu_name . ( $unread_count ? '-' . $unread_count : '' ) . '_page_formidable-entries' ) {
68	140	$show_screen = false;
69	141	}
70	142
71	143	return $show_screen;
		@@ -125,9 +197,9 @@
125	197	if ( FrmField::is_no_save_field( $form_col->type ) ) {
126	198	continue;
127	199	}
128	200
129		- $has_child_fields = $form_col->type == 'form' && isset( $form_col->field_options['form_select'] ) && ! empty( $form_col->field_options['form_select'] );
	201	+ $has_child_fields = $form_col->type === 'form' && ! empty( $form_col->field_options['form_select'] );
130	202	if ( $has_child_fields ) {
131	203	self::add_subform_cols( $form_col, $form_id, $columns );
132	204	} else {
133	205	self::add_field_cols( $form_col, $form_id, $columns );
		@@ -163,9 +235,9 @@
163	235	$col_id .= '-_-form' . $field->form_id;
164	236	}
165	237
166	238	$has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' );
167		- $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] == 'post_status';
	239	+ $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status';
168	240	if ( $has_separate_value && ! $is_post_status ) {
169	241	$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 );
170	242	}
171	243
		@@ -188,10 +260,10 @@
188	260	$prev_value = get_metadata( 'user', $object_id, $meta_key, true );
189	261	}
190	262
191	263	global $frm_vars;
192		- //add a check so we don't create a loop
193		- $frm_vars['prev_hidden_cols'] = ( isset( $frm_vars['prev_hidden_cols'] ) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
	264	+ // Add a check so we don't create a loop.
	265	+ $frm_vars['prev_hidden_cols'] = ! empty( $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
194	266
195	267	return $check;
196	268	}
197	269
		@@ -205,9 +277,10 @@
205	277	}
206	278
207	279	global $frm_vars;
208	280	if ( ! isset( $frm_vars['prev_hidden_cols'] ) || ! $frm_vars['prev_hidden_cols'] ) {
209		- return; // Don't continue if there's no previous value.
	281	+ // Don't continue if there's no previous value.
	282	+ return;
210	283	}
211	284
212	285	foreach ( $meta_value as $mk => $mv ) {
213	286	// Remove blank values.
		@@ -261,13 +334,15 @@
261	334	if ( empty( $menu_name ) ) {
262	335	$menu_name = FrmAppHelper::get_menu_name();
263	336	}
264	337
265		- return sanitize_title( $menu_name ) . '_page_formidable-entries';
	338	+ $unread_count = FrmEntriesHelper::get_visible_unread_inbox_count();
	339	+
	340	+ return sanitize_title( $menu_name ) . ( $unread_count ? '-' . $unread_count : '' ) . '_page_formidable-entries';
266	341	}
267	342
268	343	public static function save_per_page( $save, $option, $value ) {
269		- if ( $option == 'formidable_page_formidable_entries_per_page' ) {
	344	+ if ( $option === 'formidable_page_formidable_entries_per_page' ) {
270	345	$save = (int) $value;
271	346	}
272	347
273	348	return $save;
		@@ -285,8 +360,14 @@
285	360	$form_id . '_item_key' => 'item_key',
286	361	$form_id . '_is_draft' => 'is_draft',
287	362	);
288	363
	364	+ if ( ! $form_id ) {
	365	+ $columns[ $form_id . '_user_id' ] = 'user_id';
	366	+ $columns[ $form_id . '_name' ] = 'name';
	367	+ $columns[ $form_id . '_form_id' ] = 'form_id';
	368	+ }
	369	+
289	370	foreach ( $fields as $field ) {
290	371	if ( self::field_supports_sorting( $field ) ) {
291	372	$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
292	373	}
		@@ -351,9 +432,9 @@
351	432	foreach ( (array) $result as $r ) {
352	433	if ( ! empty( $r ) ) {
353	434	list( $form_prefix, $field_key ) = explode( '_', $r );
354	435
355		- if ( (int) $form_prefix == (int) $form_id ) {
	436	+ if ( (int) $form_prefix === (int) $form_id ) {
356	437	$hidden[] = $r;
357	438	}
358	439
359	440	unset( $form_prefix );
		@@ -385,9 +466,9 @@
385	466	}
386	467
387	468	if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) {
388	469	$result[] = $col_key;
389		- $i--;
	470	+ --$i;
390	471	}
391	472
392	473	unset( $col_key, $col );
393	474	}
		@@ -432,18 +513,20 @@
432	513	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/list.php';
433	514	}
434	515
435	516	private static function get_delete_form_time( $form, &$errors ) {
436		- if ( 'trash' == $form->status ) {
	517	+ if ( 'trash' === $form->status ) {
437	518	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
438		- $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? ( $form->options['trash_time'] ) : time() ) );
	519	+ $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? $form->options['trash_time'] : time() ) );
439	520
440	521	/* translators: %1$s: Time string */
441		- $errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
	522	+ $errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
442	523	}
443	524	}
444	525
445		- /* Back End CRUD */
	526	+ /**
	527	+ * Back End CRUD.
	528	+ */
446	529	public static function show( $id = 0 ) {
447	530	FrmAppHelper::permission_check( 'frm_view_entries' );
448	531
449	532	if ( ! $id ) {
		@@ -455,12 +538,15 @@
455	538	}
456	539
457	540	$entry = FrmEntry::getOne( $id, true );
458	541	if ( ! $entry ) {
459		- echo '<div id="form_show_entry_page" class="wrap">' .
460		- esc_html__( 'You are trying to view an entry that does not exist.', 'formidable' ) .
461		- '</div>';
462		-
	542	+ FrmAppController::show_error_modal(
	543	+ array(
	544	+ 'title' => __( 'You can\'t view the entry', 'formidable' ),
	545	+ 'body' => __( 'You are trying to view an entry that does not exist', 'formidable' ),
	546	+ 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
	547	+ )
	548	+ );
463	549	return;
464	550	}
465	551
466	552	$data = $entry->description;
		@@ -470,9 +556,9 @@
470	556
471	557	$fields = FrmField::get_all_for_form( $entry->form_id, '', 'include' );
472	558	$form = FrmForm::getOne( $entry->form_id );
473	559
474		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php' );
	560	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php';
475	561	}
476	562
477	563	/**
478	564	* Destroy an entry from the admin page.
		@@ -482,9 +568,15 @@
482	568	*/
483	569	public static function destroy() {
484	570	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_entries', '_wpnonce', -1 );
485	571	if ( false !== $permission_error ) {
486		- wp_die( esc_html( $permission_error ) );
	572	+ $error_args = array(
	573	+ 'title' => __( 'Verification failed', 'formidable' ),
	574	+ 'body' => $permission_error,
	575	+ 'cancel_url' => admin_url( 'admin.php?page=formidable-entries' ),
	576	+ );
	577	+ FrmAppController::show_error_modal( $error_args );
	578	+ return;
487	579	}
488	580
489	581	$params = FrmForm::get_admin_params();
490	582
		@@ -499,18 +591,8 @@
499	591
500	592	self::display_list( $message );
501	593	}
502	594
503		- /**
504		- * @deprecated 4.02.04 - Moved to Pro since it was unused in Lite.
505		- */
506		- public static function destroy_all() {
507		- _deprecated_function( __METHOD__, '4.02.04', 'FrmProEntriesController::destroy_all' );
508		- if ( is_callable( 'FrmProEntriesController::destroy_all' ) ) {
509		- FrmProEntriesController::destroy_all();
510		- }
511		- }
512		-
513	595	public static function process_entry( $errors = '', $ajax = false ) {
514	596	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
515	597	if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
516	598	return;
		@@ -617,9 +699,9 @@
617	699	FrmEntry::clear_cache();
618	700	}
619	701
620	702	/**
621		- * @param $atts
	703	+ * @param array $atts
622	704	*
623	705	* @return array|string
624	706	*/
625	707	public static function show_entry_shortcode( $atts ) {
		@@ -646,9 +728,10 @@
646	728	'exclude_fields' => '',
647	729	'include_fields' => '',
648	730	'include_extras' => '',
649	731	'inline_style' => 1,
650		- 'child_array' => false, // return embedded fields as nested array
	732	+ // Return embedded fields as nested array.
	733	+ 'child_array' => false,
651	734	'line_breaks' => true,
652	735	'array_separator' => ', ',
653	736	);
654	737	$defaults = apply_filters( 'frm_show_entry_defaults', $defaults );
		@@ -690,20 +773,14 @@
690	773	/**
691	774	* Add or remove information in the entry sidebar.
692	775	*
693	776	* @since 5.5.2
	777	+ *
694	778	* @param array $data
	779	+ * @param array{entry:\stdClass} $entry
695	780	*/
696	781	$data = apply_filters( 'frm_sidebar_data', $data, compact( 'entry' ) );
697	782	}
698	783
699		- include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php' );
700		- }
701		-
702		- /**
703		- * @deprecated 4.0
704		- */
705		- public static function contextual_help( $help, $screen_id, $screen ) {
706		- _deprecated_function( __METHOD__, '4.0' );
707		- return $help;
	784	+ include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php';
708	785	}
709	786	}