← All changes | classes/controllers/FrmEntriesController.php +23 -35 6.5 → 5.0.14 View file →

		@@ -23,9 +23,9 @@
23	23	/**
24	24	* @since 2.05.07
25	25	*/
26	26	private static function load_manage_entries_hooks() {
27		- if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show', 'new', 'duplicate' ), true ) ) {
	27	+ if ( ! in_array( FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' ), array( 'edit', 'show', 'new' ) ) ) {
28	28	$menu_name = FrmAppHelper::get_menu_name();
29	29	$base = self::base_column_key( $menu_name );
30	30
31	31	add_filter( 'manage_' . $base . '_columns', 'FrmEntriesController::manage_columns' );
		@@ -80,14 +80,13 @@
80	80
81	81	if ( $form_id ) {
82	82	self::get_columns_for_form( $form_id, $columns );
83	83	} else {
84		- $columns[ $form_id . '_form_id' ] = esc_html__( 'Form', 'formidable' );
85		- $columns[ $form_id . '_name' ] = esc_html__( 'Entry Name', 'formidable' );
86		- $columns[ $form_id . '_user_id' ] = esc_html__( 'Created By', 'formidable' );
	84	+ $columns[ $form_id . '_form_id' ] = __( 'Form', 'formidable' );
	85	+ $columns[ $form_id . '_name' ] = __( 'Entry Name', 'formidable' );
	86	+ $columns[ $form_id . '_user_id' ] = __( 'Created By', 'formidable' );
87	87	}
88	88
89		- $columns[ $form_id . '_is_draft' ] = esc_html__( 'Entry Status', 'formidable' );
90	89	$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
91	90	$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
92	91	self::maybe_add_ip_col( $form_id, $columns );
93	92
		@@ -97,9 +96,9 @@
97	96	if ( FrmAppHelper::is_admin_page( 'formidable-entries' ) && in_array( $action, array( '', 'list', 'destroy' ) ) ) {
98	97	add_screen_option(
99	98	'per_page',
100	99	array(
101		- 'label' => esc_html__( 'Entries', 'formidable' ),
	100	+ 'label' => __( 'Entries', 'formidable' ),
102	101	'default' => 20,
103	102	'option' => 'formidable_page_formidable_entries_per_page',
104	103	)
105	104	);
		@@ -306,20 +305,9 @@
306	305	$is_sortable = 'checkbox' !== $field->type && empty( $field->field_options['post_field'] );
307	306	return apply_filters( 'frm_field_column_is_sortable', $is_sortable, $field );
308	307	}
309	308
310		- /**
311		- * @param mixed $result Option value from database for hidden columns in entries table.
312		- * @return array
313		- */
314	309	public static function hidden_columns( $result ) {
315		- if ( ! is_array( $result ) ) {
316		- // Force an unexpected value to be an array.
317		- // Since $result is a filtered option and gets saved to the database, it's possible it could be a string.
318		- // Since this code expects an array it would break with a "Uncaught Error: [] operator not supported for strings" error.
319		- $result = array();
320		- }
321		-
322	310	$form_id = FrmForm::get_current_form_id();
323	311
324	312	$hidden = self::user_hidden_columns_for_form( $form_id, $result );
325	313
		@@ -473,19 +461,10 @@
473	461
474	462	include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/show.php' );
475	463	}
476	464
477		- /**
478		- * Destroy an entry from the admin page.
479		- * This is triggered from the entries list from the "Delete" row action, and also from the "Delete Entry" trigger in the view/edit entry sidebar.
480		- *
481		- * @return void
482		- */
483	465	public static function destroy() {
484		- $permission_error = FrmAppHelper::permission_nonce_error( 'frm_delete_entries', '_wpnonce', -1 );
485		- if ( false !== $permission_error ) {
486		- wp_die( esc_html( $permission_error ) );
487		- }
	466	+ FrmAppHelper::permission_check( 'frm_delete_entries' );
488	467
489	468	$params = FrmForm::get_admin_params();
490	469
491	470	if ( isset( $params['keep_post'] ) && $params['keep_post'] ) {
		@@ -493,9 +472,9 @@
493	472	}
494	473
495	474	$message = '';
496	475	if ( FrmEntry::destroy( $params['id'] ) ) {
497		- $message = __( 'Entry was successfully deleted', 'formidable' );
	476	+ $message = __( 'Entry was Successfully Deleted', 'formidable' );
498	477	}
499	478
500	479	self::display_list( $message );
501	480	}
		@@ -686,15 +665,8 @@
686	665	$data = $entry->description;
687	666	if ( isset( $data['browser'] ) ) {
688	667	$browser = FrmEntriesHelper::get_browser( $data['browser'] );
689	668	}
690		- /**
691		- * Add or remove information in the entry sidebar.
692		- *
693		- * @since 5.5.2
694		- * @param array $data
695		- */
696		- $data = apply_filters( 'frm_sidebar_data', $data, compact( 'entry' ) );
697	669	}
698	670
699	671	include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-shared.php' );
700	672	}
		@@ -704,6 +676,22 @@
704	676	*/
705	677	public static function contextual_help( $help, $screen_id, $screen ) {
706	678	_deprecated_function( __METHOD__, '4.0' );
707	679	return $help;
	680	+ }
	681	+
	682	+ /**
	683	+ * @deprecated 1.07.05
	684	+ * @codeCoverageIgnore
	685	+ */
	686	+ public static function show_form( $id = '', $key = '', $title = false, $description = false ) {
	687	+ return FrmDeprecated::show_form( $id, $key, $title, $description );
	688	+ }
	689	+
	690	+ /**
	691	+ * @deprecated 1.07.05
	692	+ * @codeCoverageIgnore
	693	+ */
	694	+ public static function get_form( $filename, $form, $title, $description ) {
	695	+ return FrmDeprecated::get_form( $filename, $form, $title, $description );
708	696	}
709	697	}