← All changes | classes/controllers/FrmEntriesController.php +52 -124 6.25 → 6.8 View file →

		@@ -9,14 +9,11 @@
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();
	13	+ $views_installed = is_callable( 'FrmProAppHelper::views_is_installed' ) ? FrmProAppHelper::views_is_installed() : FrmAppHelper::pro_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();
19	16	}
20	17
21	18	if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) ) {
22	19	self::load_manage_entries_hooks();
		@@ -23,73 +20,8 @@
23	20	}
24	21	}
25	22
26	23	/**
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		- /**
92	24	* @since 2.05.07
93	25	*/
94	26	private static function load_manage_entries_hooks() {
95	27	if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show', 'new', 'duplicate' ), true ) ) {
		@@ -99,9 +31,9 @@
99	31	add_filter( 'manage_' . $base . '_columns', 'FrmEntriesController::manage_columns' );
100	32	add_filter( 'get_user_option_' . self::hidden_column_key( $menu_name ), 'FrmEntriesController::hidden_columns' );
101	33	add_filter( 'manage_' . $base . '_sortable_columns', 'FrmEntriesController::sortable_columns' );
102	34	} else {
103		- add_filter( 'screen_options_show_screen', self::class . '::remove_screen_options', 10, 2 );
	35	+ add_filter( 'screen_options_show_screen', __CLASS__ . '::remove_screen_options', 10, 2 );
104	36	}
105	37	}
106	38
107	39	/**
		@@ -132,12 +64,10 @@
132	64	*
133	65	* @since 3.0
134	66	*/
135	67	public static function remove_screen_options( $show_screen, $screen ) {
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	+ $menu_name = sanitize_title( FrmAppHelper::get_menu_name() );
	69	+ if ( $screen->id == $menu_name . '_page_formidable-entries' ) {
140	70	$show_screen = false;
141	71	}
142	72
143	73	return $show_screen;
		@@ -197,9 +127,9 @@
197	127	if ( FrmField::is_no_save_field( $form_col->type ) ) {
198	128	continue;
199	129	}
200	130
201		- $has_child_fields = $form_col->type === 'form' && ! empty( $form_col->field_options['form_select'] );
	131	+ $has_child_fields = $form_col->type == 'form' && isset( $form_col->field_options['form_select'] ) && ! empty( $form_col->field_options['form_select'] );
202	132	if ( $has_child_fields ) {
203	133	self::add_subform_cols( $form_col, $form_id, $columns );
204	134	} else {
205	135	self::add_field_cols( $form_col, $form_id, $columns );
		@@ -235,9 +165,9 @@
235	165	$col_id .= '-_-form' . $field->form_id;
236	166	}
237	167
238	168	$has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' );
239		- $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status';
	169	+ $is_post_status = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] == 'post_status';
240	170	if ( $has_separate_value && ! $is_post_status ) {
241	171	$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 );
242	172	}
243	173
		@@ -261,9 +191,9 @@
261	191	}
262	192
263	193	global $frm_vars;
264	194	// 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;
	195	+ $frm_vars['prev_hidden_cols'] = ( isset( $frm_vars['prev_hidden_cols'] ) && $frm_vars['prev_hidden_cols'] ) ? false : $prev_value;
266	196
267	197	return $check;
268	198	}
269	199
		@@ -334,15 +264,13 @@
334	264	if ( empty( $menu_name ) ) {
335	265	$menu_name = FrmAppHelper::get_menu_name();
336	266	}
337	267
338		- $unread_count = FrmEntriesHelper::get_visible_unread_inbox_count();
339		-
340		- return sanitize_title( $menu_name ) . ( $unread_count ? '-' . $unread_count : '' ) . '_page_formidable-entries';
	268	+ return sanitize_title( $menu_name ) . '_page_formidable-entries';
341	269	}
342	270
343	271	public static function save_per_page( $save, $option, $value ) {
344		- if ( $option === 'formidable_page_formidable_entries_per_page' ) {
	272	+ if ( $option == 'formidable_page_formidable_entries_per_page' ) {
345	273	$save = (int) $value;
346	274	}
347	275
348	276	return $save;
		@@ -360,14 +288,8 @@
360	288	$form_id . '_item_key' => 'item_key',
361	289	$form_id . '_is_draft' => 'is_draft',
362	290	);
363	291
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		-
370	292	foreach ( $fields as $field ) {
371	293	if ( self::field_supports_sorting( $field ) ) {
372	294	$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
373	295	}
		@@ -392,10 +314,8 @@
392	314	* @param mixed $result Option value from database for hidden columns in entries table.
393	315	* @return array
394	316	*/
395	317	public static function hidden_columns( $result ) {
396		- global $frm_vars;
397		-
398	318	if ( ! is_array( $result ) ) {
399	319	// Force an unexpected value to be an array.
400	320	// Since $result is a filtered option and gets saved to the database, it's possible it could be a string.
401	321	// Since this code expects an array it would break with a "Uncaught Error: [] operator not supported for strings" error.
		@@ -401,16 +321,21 @@
401	321	// Since this code expects an array it would break with a "Uncaught Error: [] operator not supported for strings" error.
402	322	$result = array();
403	323	}
404	324
405		- $form_id = FrmForm::get_current_form_id();
406		- $hidden = self::user_hidden_columns_for_form( $form_id, $result );
407		- $i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0;
408		- $max_columns = 11;
	325	+ $form_id = FrmForm::get_current_form_id();
409	326
	327	+ $hidden = self::user_hidden_columns_for_form( $form_id, $result );
	328	+
	329	+ global $frm_vars;
	330	+ $i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0;
	331	+
410	332	if ( ! empty( $hidden ) ) {
411		- $result = $hidden;
412		- $i = $i - count( $result );
	333	+ $result = $hidden;
	334	+ $i = $i - count( $result );
	335	+ $max_columns = 11;
	336	+ } else {
	337	+ $max_columns = 8;
413	338	}
414	339
415	340	if ( $i <= $max_columns ) {
416	341	return $result;
		@@ -429,9 +354,9 @@
429	354	foreach ( (array) $result as $r ) {
430	355	if ( ! empty( $r ) ) {
431	356	list( $form_prefix, $field_key ) = explode( '_', $r );
432	357
433		- if ( (int) $form_prefix === (int) $form_id ) {
	358	+ if ( (int) $form_prefix == (int) $form_id ) {
434	359	$hidden[] = $r;
435	360	}
436	361
437	362	unset( $form_prefix );
		@@ -444,12 +369,8 @@
444	369	/**
445	370	* Remove some columns by default when there are too many
446	371	*
447	372	* @since 2.05.07
448		- *
449		- * @param array $atts
450		- * @param array $result
451		- * @return void
452	373	*/
453	374	private static function remove_excess_cols( $atts, &$result ) {
454	375	global $frm_vars;
455	376
		@@ -467,9 +388,9 @@
467	388	}
468	389
469	390	if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) {
470	391	$result[] = $col_key;
471		- --$i;
	392	+ $i--;
472	393	}
473	394
474	395	unset( $col_key, $col );
475	396	}
		@@ -514,14 +435,14 @@
514	435	require FrmAppHelper::plugin_path() . '/classes/views/frm-entries/list.php';
515	436	}
516	437
517	438	private static function get_delete_form_time( $form, &$errors ) {
518		- if ( 'trash' === $form->status ) {
	439	+ if ( 'trash' == $form->status ) {
519	440	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
520		- $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( $form->options['trash_time'] ?? time() ) );
	441	+ $time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, ( isset( $form->options['trash_time'] ) ? ( $form->options['trash_time'] ) : time() ) );
521	442
522	443	/* translators: %1$s: Time string */
523		- $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 );
	444	+ $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 );
524	445	}
525	446	}
526	447
527	448	/**
		@@ -539,15 +460,12 @@
539	460	}
540	461
541	462	$entry = FrmEntry::getOne( $id, true );
542	463	if ( ! $entry ) {
543		- FrmAppController::show_error_modal(
544		- array(
545		- 'title' => __( 'You can\'t view the entry', 'formidable' ),
546		- 'body' => __( 'You are trying to view an entry that does not exist', 'formidable' ),
547		- 'cancel_url' => admin_url( 'admin.php?page=formidable' ),
548		- )
549		- );
	464	+ echo '<div id="form_show_entry_page" class="wrap">' .
	465	+ esc_html__( 'You are trying to view an entry that does not exist.', 'formidable' ) .
	466	+ '</div>';
	467	+
550	468	return;
551	469	}
552	470
553	471	$data = $entry->description;
		@@ -557,9 +475,9 @@
557	475
558	476	$fields = FrmField::get_all_for_form( $entry->form_id, '', 'include' );
559	477	$form = FrmForm::getOne( $entry->form_id );
560	478
561		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php';
	479	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php' );
562	480	}
563	481
564	482	/**
565	483	* Destroy an entry from the admin page.
		@@ -570,11 +488,11 @@
570	488	public static function destroy() {
571	489	$permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_entries', '_wpnonce', -1 );
572	490	if ( false !== $permission_error ) {
573	491	$error_args = array(
574		- 'title' => __( 'Verification failed', 'formidable' ),
575		- 'body' => $permission_error,
576		- 'cancel_url' => admin_url( 'admin.php?page=formidable-entries' ),
	492	+ 'title' => __( 'Verification failed', 'formidable' ),
	493	+ 'body' => $permission_error,
	494	+ 'cancel_url' => admin_url( 'admin.php?page=formidable-entries' ),
577	495	);
578	496	FrmAppController::show_error_modal( $error_args );
579	497	return;
580	498	}
		@@ -592,8 +510,18 @@
592	510
593	511	self::display_list( $message );
594	512	}
595	513
	514	+ /**
	515	+ * @deprecated 4.02.04 - Moved to Pro since it was unused in Lite.
	516	+ */
	517	+ public static function destroy_all() {
	518	+ _deprecated_function( __METHOD__, '4.02.04', 'FrmProEntriesController::destroy_all' );
	519	+ if ( is_callable( 'FrmProEntriesController::destroy_all' ) ) {
	520	+ FrmProEntriesController::destroy_all();
	521	+ }
	522	+ }
	523	+
596	524	public static function process_entry( $errors = '', $ajax = false ) {
597	525	$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
598	526	if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
599	527	return;
		@@ -605,13 +533,8 @@
605	533	if ( ! $form ) {
606	534	return;
607	535	}
608	536
609		- $is_preview = 'frm_forms_preview' === FrmAppHelper::simple_get( 'action' );
610		- if ( $is_preview && FrmFormsHelper::should_block_preview( $form->form_key ) ) {
611		- return;
612		- }
613		-
614	537	$params = FrmForm::get_params( $form );
615	538
616	539	if ( ! isset( $frm_vars['form_params'] ) ) {
617	540	$frm_vars['form_params'] = array();
		@@ -734,9 +657,8 @@
734	657	'exclude_fields' => '',
735	658	'include_fields' => '',
736	659	'include_extras' => '',
737	660	'inline_style' => 1,
738		- 'table_style' => '',
739	661	// Return embedded fields as nested array.
740	662	'child_array' => false,
741	663	'line_breaks' => true,
742	664	'array_separator' => ', ',
		@@ -780,14 +702,20 @@
780	702	/**
781	703	* Add or remove information in the entry sidebar.
782	704	*
783	705	* @since 5.5.2
784		- *
785	706	* @param array $data
786		- * @param array{entry:\stdClass} $entry
787	707	*/
788	708	$data = apply_filters( 'frm_sidebar_data', $data, compact( 'entry' ) );
789	709	}
790	710
791		- include FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php';
	711	+ include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php' );
	712	+ }
	713	+
	714	+ /**
	715	+ * @deprecated 4.0
	716	+ */
	717	+ public static function contextual_help( $help, $screen_id, $screen ) {
	718	+ _deprecated_function( __METHOD__, '4.0' );
	719	+ return $help;
792	720	}
793	721	}