← All changes | classes/controllers/FrmAppController.php +31 -88 6.25.1 → 6.24 View file →

		@@ -375,9 +375,9 @@
375	375	* @return void
376	376	*/
377	377	public static function pro_get_started_headline() {
378	378	self::review_request();
379		- FrmAppHelper::min_pro_version_notice( '6.20' );
	379	+ FrmAppHelper::min_pro_version_notice( '6.0' );
380	380	}
381	381
382	382	/**
383	383	* Add admin notices as needed for reviews
		@@ -579,10 +579,10 @@
579	579
580	580	if ( 'formidable-pro-upgrade' === FrmAppHelper::get_param( 'page' ) && ! FrmAppHelper::pro_is_installed() && current_user_can( 'frm_view_forms' ) ) {
581	581	$redirect = FrmSalesApi::get_best_sale_value( 'menu_cta_link' );
582	582	$utm = array(
583		- 'campaign' => 'upgrade',
584		- 'content' => 'submenu-upgrade',
	583	+ 'medium' => 'upgrade',
	584	+ 'content' => 'submenu-upgrade',
585	585	);
586	586
587	587	if ( $redirect ) {
588	588	$redirect = FrmAppHelper::maybe_add_missing_utm( $redirect, $utm );
		@@ -731,10 +731,8 @@
731	731	$post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' );
732	732
733	733	global $pagenow;
734	734	if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) ) {
735		- self::enqueue_global_settings_scripts( $page );
736		-
737	735	wp_enqueue_script( 'admin-widgets' );
738	736	wp_enqueue_style( 'widgets' );
739	737	self::maybe_deregister_popper2();
740	738	wp_enqueue_script( 'formidable_admin' );
		@@ -811,20 +809,8 @@
811	809	wp_enqueue_script( 'formidable-settings-components' );
812	810	}
813	811
814	812	/**
815		- * Enqueues global settings scripts.
816		- *
817		- * @param string $page The `page` param in URL.
818		- */
819		- private static function enqueue_global_settings_scripts( $page ) {
820		- if ( 'formidable-settings' === $page ) {
821		- wp_enqueue_style( 'wp-color-picker' );
822		- wp_enqueue_script( 'formidable_settings' );
823		- }
824		- }
825		-
826		- /**
827	813	* Avoid loading dropzone CSS on the form list page. It isn't required there.
828	814	*
829	815	* @since 6.11
830	816	*
		@@ -854,21 +840,12 @@
854	840	if ( ! FrmAppHelper::is_formidable_branding() ) {
855	841	return false;
856	842	}
857	843
858		- $should_show = FrmAppHelper::is_formidable_admin() &&
	844	+ return FrmAppHelper::is_formidable_admin() &&
859	845	! FrmAppHelper::is_style_editor_page() &&
860	846	! FrmAppHelper::is_admin_page( 'formidable-views-editor' ) &&
861	847	! FrmAppHelper::simple_get( 'frm_action', 'sanitize_title' );
862		-
863		- /**
864		- * Filters whether the floating links should be displayed.
865		- *
866		- * @since 6.25.1
867		- *
868		- * @param bool $should_show Whether the floating links should be shown.
869		- */
870		- return apply_filters( 'frm_should_show_floating_links', $should_show );
871	848	}
872	849
873	850	/**
874	851	* @since 6.3.2
		@@ -1053,9 +1030,9 @@
1053	1030	public static function create_rest_routes() {
1054	1031	$args = array(
1055	1032	'methods' => 'GET',
1056	1033	'callback' => 'FrmAppController::api_install',
1057		- 'permission_callback' => self::class . '::can_update_db',
	1034	+ 'permission_callback' => __CLASS__ . '::can_update_db',
1058	1035	);
1059	1036
1060	1037	register_rest_route( 'frm-admin/v1', '/install', $args );
1061	1038
		@@ -1342,20 +1319,10 @@
1342	1319	if ( function_exists( 'wp_set_script_translations' ) ) {
1343	1320	wp_set_script_translations( 's11-floating-links-config', 's11-' );
1344	1321	}
1345	1322
1346		- $upgrade_utm = array(
1347		- 'campaign' => 'floating-links',
1348		- 'content' => 'floating-links-upgrade',
1349		- );
1350		- $docs_utm = array(
1351		- 'campaign' => 'floating-links',
1352		- 'content' => 'floating-links-docs',
1353		- );
1354	1323	$floating_links_data = array(
1355		- 'proIsInstalled' => FrmAppHelper::pro_is_installed(),
1356		- 'upgradeUrl' => FrmAppHelper::admin_upgrade_link( $upgrade_utm ),
1357		- 'documentationUrl' => FrmAppHelper::admin_upgrade_link( $docs_utm, 'knowledgebase/' ),
	1324	+ 'proIsInstalled' => FrmAppHelper::pro_is_installed(),
1358	1325	);
1359	1326	wp_localize_script( 's11-floating-links-config', 's11FloatingLinksData', $floating_links_data );
1360	1327
1361	1328	/**
		@@ -1440,50 +1407,43 @@
1440	1407	*
1441	1408	* @return void
1442	1409	*/
1443	1410	private static function remember_custom_sort() {
1444		- $meta_key = self::get_sort_pref_user_meta_key();
1445		- if ( false === $meta_key ) {
	1411	+ $screen = get_current_screen();
	1412	+ if ( ! $screen ) {
1446	1413	return;
1447	1414	}
1448	1415
1449		- $is_form_list = FrmAppHelper::is_admin_list_page();
1450		- $is_entry_list = FrmAppHelper::is_admin_list_page( 'formidable-entries' );
1451		- if ( ! $is_form_list && ! $is_entry_list ) {
	1416	+ if ( ! FrmAppHelper::is_admin_list_page() && ! FrmAppHelper::is_admin_list_page( 'formidable-entries' ) ) {
1452	1417	return;
1453	1418	}
1454	1419
1455	1420	$orderby = FrmAppHelper::get_param( 'orderby' );
	1421	+
1456	1422	if ( ! $orderby ) {
1457	1423	return;
1458	1424	}
1459	1425
1460		- $user_id = get_current_user_id();
1461		- $order = FrmAppHelper::get_param( 'order' );
1462		- $new_sort = array(
	1426	+ $user_id = get_current_user_id();
	1427	+ $meta_key = 'frm_preferred_list_sort_' . $screen->id;
	1428	+ $order = FrmAppHelper::get_param( 'order' );
	1429	+
	1430	+ $new_sort = array(
1463	1431	'orderby' => $orderby,
1464	1432	'order' => $order,
1465	1433	);
1466		- $previous_meta = get_user_meta( $user_id, $meta_key, true );
1467		- $current_sort = $previous_meta;
1468		- $form_id = $is_entry_list ? FrmAppHelper::simple_get( 'form', 'absint' ) : 0;
1469	1434
1470		- if ( is_array( $current_sort ) && $form_id && is_int( $form_id ) && isset( $current_sort[ $form_id ] ) ) {
1471		- $current_sort = $current_sort[ $form_id ];
1472		- }
	1435	+ $current_sort = get_user_meta( $user_id, $meta_key, true );
1473	1436
1474	1437	if ( $new_sort !== $current_sort ) {
1475		- $new_meta = $new_sort;
1476		-
1477		- if ( $is_entry_list && $form_id && is_int( $form_id ) ) {
1478		- // Index meta by form ID.
1479		- $temp_meta = is_array( $previous_meta ) ? $previous_meta : array();
1480		- $temp_meta[ $form_id ] = $new_meta;
1481		- $new_meta = $temp_meta;
1482		- unset( $temp_meta );
1483		- }
1484		-
1485		- update_user_meta( $user_id, $meta_key, $new_meta );
	1438	+ update_user_meta(
	1439	+ $user_id,
	1440	+ $meta_key,
	1441	+ array(
	1442	+ 'orderby' => $orderby,
	1443	+ 'order' => $order,
	1444	+ )
	1445	+ );
1486	1446	}
1487	1447	}
1488	1448
1489	1449	/**
		@@ -1495,21 +1455,20 @@
1495	1455	* @param string &$order Reference to the current 'order' parameter.
1496	1456	* @return void
1497	1457	*/
1498	1458	public static function apply_saved_sort_preference( &$orderby, &$order ) {
1499		- $meta_key = self::get_sort_pref_user_meta_key();
1500		- if ( false === $meta_key ) {
	1459	+ if ( ! function_exists( 'get_current_screen' ) ) {
1501	1460	return;
1502	1461	}
1503	1462
	1463	+ $screen = get_current_screen();
	1464	+ if ( ! $screen ) {
	1465	+ return;
	1466	+ }
	1467	+
1504	1468	$user_id = get_current_user_id();
1505		- $preferred_list_sort = get_user_meta( $user_id, $meta_key, true );
1506		- $form_id = FrmAppHelper::simple_get( 'form', 'absint' );
	1469	+ $preferred_list_sort = get_user_meta( $user_id, 'frm_preferred_list_sort_' . $screen->id, true );
1507	1470
1508		- if ( is_array( $preferred_list_sort ) && $form_id && is_int( $form_id ) && isset( $preferred_list_sort[ $form_id ] ) ) {
1509		- $preferred_list_sort = $preferred_list_sort[ $form_id ];
1510		- }
1511		-
1512	1471	if ( is_array( $preferred_list_sort ) && ! empty( $preferred_list_sort['orderby'] ) ) {
1513	1472	$orderby = $preferred_list_sort['orderby'];
1514	1473
1515	1474	if ( ! empty( $preferred_list_sort['order'] ) ) {
		@@ -1515,24 +1474,8 @@
1515	1474	if ( ! empty( $preferred_list_sort['order'] ) ) {
1516	1475	$order = $preferred_list_sort['order'];
1517	1476	}
1518	1477	}
1519		- }
1520		-
1521		- /**
1522		- * Get a simple user meta key that only includes the screen ID.
1523		- *
1524		- * @since 6.25.1
1525		- *
1526		- * @return false|string
1527		- */
1528		- private static function get_sort_pref_user_meta_key() {
1529		- if ( ! function_exists( 'get_current_screen' ) ) {
1530		- return false;
1531		- }
1532		-
1533		- $screen = get_current_screen();
1534		- return $screen ? 'frm_preferred_list_sort_' . $screen->id : false;
1535	1478	}
1536	1479
1537	1480	/**
1538	1481	* Validate that the callback name is ours not from third-party.