← All changes | WPDataAccess/API/WPDA_Apps.php +689 -187 5.5.23 → 5.5.84 View file →

		@@ -8,8 +8,9 @@
8	8	use WPDataAccess\Plugin_Table_Models\WPDA_App_Container_Model;
9	9	use WPDataAccess\Plugin_Table_Models\WPDA_App_Apps_Model;
10	10	use WPDataAccess\Plugin_Table_Models\WPDA_App_Model;
11	11	use WPDataAccess\Plugin_Table_Models\WPDA_Table_Settings_Model;
	12	+use WPDataAccess\Utilities\WPDA_App_Localization;
12	13	use WPDataAccess\WPDA;
13	14	class WPDA_Apps extends WPDA_API_Core {
14	15	const METHODS = array('httpGet', 'httpPost', 'httpRequest');
15	16
		@@ -26,8 +27,9 @@
26	27	$value->{$property_name} = $this->sanitize_settings( $property_value );
27	28	}
28	29	} else {
29	30	// Allow HTML and onclick for computed fields
	31	+ // phpcs:disable WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
30	32	$value = apply_filters(
31	33	'wp_kses_post',
32	34	$value,
33	35	"",
		@@ -32,8 +34,9 @@
32	34	$value,
33	35	"",
34	36	["onclick"]
35	37	);
	38	+ // phpcs:enable WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
36	39	}
37	40	return $value;
38	41	}
39	42
		@@ -267,14 +270,32 @@
267	270	'required' => false,
268	271	'type' => 'string',
269	272	'description' => __( 'App settings - JSON string', 'wp-data-access' ),
270	273	'sanitize_callback' => function ( $param ) {
271		- $satitized_settings = $this->sanitize_settings( json_decode( (string) $param, true ) );
	274	+ $sanitized_settings = $this->sanitize_settings( json_decode( (string) $param, true ) );
272	275	// Save sanitized JSON as string
273		- return json_encode( $satitized_settings );
	276	+ return json_encode( $sanitized_settings );
274	277	},
275	278	'validate_callback' => 'rest_validate_request_arg',
276	279	),
	280	+ 'map' => array(
	281	+ 'required' => false,
	282	+ 'type' => 'string',
	283	+ 'description' => __( 'Map settings - JSON string', 'wp-data-access' ),
	284	+ 'sanitize_callback' => function ( $param ) {
	285	+ $sanitized_settings = $this->sanitize_settings( json_decode( (string) $param, true ) );
	286	+ // Save sanitized JSON as string
	287	+ return json_encode( $sanitized_settings );
	288	+ },
	289	+ 'validate_callback' => 'rest_validate_request_arg',
	290	+ ),
	291	+ 'chart' => array(
	292	+ 'required' => false,
	293	+ 'type' => 'string',
	294	+ 'description' => __( 'Chart settings - JSON string', 'wp-data-access' ),
	295	+ 'sanitize_callback' => 'sanitize_text_field',
	296	+ 'validate_callback' => 'rest_validate_request_arg',
	297	+ ),
277	298	'theme' => array(
278	299	'required' => false,
279	300	'type' => 'string',
280	301	'description' => __( 'Theme settings - JSON string', 'wp-data-access' ),
		@@ -307,8 +328,33 @@
307	328	'row_count' => $this->get_param( 'row_count' ),
308	329	'row_count_estimate' => $this->get_param( 'row_count_estimate' ),
309	330	'media' => $this->get_param( 'media' ),
310	331	'rel_tab' => $this->get_param( 'rel_tab' ),
	332	+ 'client_side' => $this->get_param( 'client_side' ),
	333	+ 'geo_radius' => array(
	334	+ 'required' => false,
	335	+ 'type' => 'mixed',
	336	+ 'description' => __( 'Geo radius segment', 'wp-data-access' ),
	337	+ 'sanitize_callback' => function ( $param ) {
	338	+ $geo_radius = array();
	339	+ if ( isset(
	340	+ $param['col']['lat'],
	341	+ $param['col']['lng'],
	342	+ $param['loc']['lat'],
	343	+ $param['loc']['lng'],
	344	+ $param['radius'],
	345	+ $param['unit']
	346	+ ) && is_numeric( $param['loc']['lat'] ) && is_numeric( $param['loc']['lng'] ) && is_numeric( $param['radius'] ) && ('km' === $param['unit'] || 'miles' === $param['unit']) ) {
	347	+ $geo_radius['col']['lat'] = WPDA::remove_backticks( sanitize_text_field( $param['col']['lat'] ) );
	348	+ $geo_radius['col']['lng'] = WPDA::remove_backticks( sanitize_text_field( $param['col']['lng'] ) );
	349	+ $geo_radius['loc']['lat'] = (float) sanitize_text_field( $param['loc']['lat'] );
	350	+ $geo_radius['loc']['lng'] = (float) sanitize_text_field( $param['loc']['lng'] );
	351	+ $geo_radius['radius'] = (float) sanitize_text_field( $param['radius'] );
	352	+ $geo_radius['unit'] = sanitize_text_field( $param['unit'] );
	353	+ }
	354	+ return $geo_radius;
	355	+ },
	356	+ ),
311	357	),
312	358	) );
313	359	register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/get', array(
314	360	'methods' => array('POST'),
		@@ -417,8 +463,9 @@
417	463	'search_params' => $this->get_param( 'search_params' ),
418	464	'shortcode_params' => $this->get_param( 'search_params' ),
419	465	'md' => $this->get_param( 'md' ),
420	466	'cascade' => $this->get_param( 'cascade' ),
	467	+ 'values' => $this->get_param( 'md' ),
421	468	),
422	469	) );
423	470	register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/lookup/dbs', array(
424	471	'methods' => array('POST'),
		@@ -459,9 +506,11 @@
459	506	'methods' => array('POST'),
460	507	'callback' => array($this, 'app_chart_data'),
461	508	'permission_callback' => '__return_true',
462	509	'args' => array(
463		- 'app_id' => $this->get_param( 'app_id' ),
	510	+ 'app_id' => $this->get_param( 'app_id' ),
	511	+ 'search_custom' => $this->get_param( 'search_custom' ),
	512	+ 'shortcode_params' => $this->get_param( 'search_params' ),
464	513	),
465	514	) );
466	515	register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/dbs/rename', array(
467	516	'methods' => array('POST'),
		@@ -469,12 +518,195 @@
469	518	'permission_callback' => '__return_true',
470	519	'args' => array(
471	520	'dbs_source' => $this->get_param( 'dbs' ),
472	521	'dbs_destination' => $this->get_param( 'dbs' ),
	522	+ 'appDbId' => array(
	523	+ 'required' => false,
	524	+ 'type' => 'integer',
	525	+ 'description' => __( 'App Id', 'wp-data-access' ),
	526	+ 'sanitize_callback' => 'absint',
	527	+ 'validate_callback' => 'rest_validate_request_arg',
	528	+ ),
473	529	),
474	530	) );
	531	+ register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/lang/get', array(
	532	+ 'methods' => array('POST'),
	533	+ 'callback' => array($this, 'app_lang_get'),
	534	+ 'permission_callback' => '__return_true',
	535	+ ) );
	536	+ register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/lang/set', array(
	537	+ 'methods' => array('POST'),
	538	+ 'callback' => array($this, 'app_lang_set'),
	539	+ 'permission_callback' => '__return_true',
	540	+ 'args' => array(
	541	+ 'localizations' => array(
	542	+ 'required' => true,
	543	+ 'type' => 'mixed',
	544	+ 'description' => __( 'Custom side translations (JSON as string)', 'wp-data-access' ),
	545	+ 'sanitize_callback' => 'sanitize_text_field',
	546	+ 'validate_callback' => 'rest_validate_request_arg',
	547	+ ),
	548	+ ),
	549	+ ) );
	550	+ register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/call', array(
	551	+ 'methods' => array('POST'),
	552	+ 'callback' => array($this, 'app_call'),
	553	+ 'permission_callback' => '__return_true',
	554	+ 'args' => array(
	555	+ 'app_id' => $this->get_param( 'app_id' ),
	556	+ 'cls' => array(
	557	+ 'required' => true,
	558	+ 'type' => 'string',
	559	+ 'description' => __( 'Class name', 'wp-data-access' ),
	560	+ 'sanitize_callback' => 'sanitize_text_field',
	561	+ 'validate_callback' => 'rest_validate_request_arg',
	562	+ ),
	563	+ 'fnc' => array(
	564	+ 'required' => true,
	565	+ 'type' => 'string',
	566	+ 'description' => __( 'Function name', 'wp-data-access' ),
	567	+ 'sanitize_callback' => 'sanitize_text_field',
	568	+ 'validate_callback' => 'rest_validate_request_arg',
	569	+ ),
	570	+ 'arg' => array(
	571	+ 'required' => true,
	572	+ 'type' => 'mixed',
	573	+ 'description' => __( 'Arguments', 'wp-data-access' ),
	574	+ 'sanitize_callback' => 'sanitize_text_field',
	575	+ 'validate_callback' => 'rest_validate_request_arg',
	576	+ ),
	577	+ ),
	578	+ ) );
	579	+ // PWA
	580	+ register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/pwa/get', array(
	581	+ 'methods' => array('POST'),
	582	+ 'callback' => array($this, 'app_wpa_get'),
	583	+ 'permission_callback' => '__return_true',
	584	+ 'args' => array(
	585	+ 'app_id' => $this->get_param( 'app_id' ),
	586	+ ),
	587	+ ) );
	588	+ register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/pwa/activate', array(
	589	+ 'methods' => array('POST'),
	590	+ 'callback' => array($this, 'app_wpa_activate'),
	591	+ 'permission_callback' => '__return_true',
	592	+ 'args' => array(
	593	+ 'app_id' => $this->get_param( 'app_id' ),
	594	+ ),
	595	+ ) );
	596	+ register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/pwa/deactivate', array(
	597	+ 'methods' => array('POST'),
	598	+ 'callback' => array($this, 'app_wpa_deactivate'),
	599	+ 'permission_callback' => '__return_true',
	600	+ 'args' => array(
	601	+ 'app_id' => $this->get_param( 'app_id' ),
	602	+ ),
	603	+ ) );
	604	+ register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/upload', array(
	605	+ 'methods' => array('POST'),
	606	+ 'callback' => array($this, 'app_upload'),
	607	+ 'permission_callback' => '__return_true',
	608	+ 'args' => array(
	609	+ 'app_id' => $this->get_param( 'app_id' ),
	610	+ 'cnt_id' => $this->get_param( 'cnt_id' ),
	611	+ 'pk' => array(
	612	+ 'required' => true,
	613	+ 'type' => 'string',
	614	+ 'description' => __( 'Primary key in JSON format', 'wp-data-access' ),
	615	+ 'sanitize_callback' => 'sanitize_text_field',
	616	+ 'validate_callback' => 'rest_validate_request_arg',
	617	+ ),
	618	+ 'col' => $this->get_param( 'col' ),
	619	+ ),
	620	+ ) );
	621	+ register_rest_route( WPDA_API::WPDA_NAMESPACE, 'app/download', array(
	622	+ 'methods' => array('POST'),
	623	+ 'callback' => array($this, 'app_download'),
	624	+ 'permission_callback' => '__return_true',
	625	+ 'args' => array(
	626	+ 'app_id' => $this->get_param( 'app_id' ),
	627	+ 'cnt_id' => $this->get_param( 'cnt_id' ),
	628	+ 'pk' => array(
	629	+ 'required' => true,
	630	+ 'type' => 'string',
	631	+ 'description' => __( 'Primary key in JSON format', 'wp-data-access' ),
	632	+ 'sanitize_callback' => 'sanitize_text_field',
	633	+ 'validate_callback' => 'rest_validate_request_arg',
	634	+ ),
	635	+ 'col' => $this->get_param( 'col' ),
	636	+ ),
	637	+ ) );
475	638	}
476	639
	640	+ public function app_download( $request ) {
	641	+ return $this->WPDA_Rest_Response( 'OK' );
	642	+ }
	643	+
	644	+ public function app_upload( $request ) {
	645	+ return $this->WPDA_Rest_Response( 'OK' );
	646	+ }
	647	+
	648	+ public function app_wpa_deactivate( $request ) {
	649	+ if ( !$this->current_user_can_access() ) {
	650	+ // Only admins
	651	+ return $this->unauthorized();
	652	+ }
	653	+ if ( !$this->current_user_token_valid( $request ) ) {
	654	+ return $this->invalid_nonce();
	655	+ }
	656	+ return $this->WPDA_Rest_Response( 'OK' );
	657	+ }
	658	+
	659	+ public function app_wpa_activate( $request ) {
	660	+ if ( !$this->current_user_can_access() ) {
	661	+ // Only admins
	662	+ return $this->unauthorized();
	663	+ }
	664	+ if ( !$this->current_user_token_valid( $request ) ) {
	665	+ return $this->invalid_nonce();
	666	+ }
	667	+ return $this->WPDA_Rest_Response( 'OK' );
	668	+ }
	669	+
	670	+ public function app_wpa_get( $request ) {
	671	+ if ( !$this->current_user_can_access() ) {
	672	+ // Only admins
	673	+ return $this->unauthorized();
	674	+ }
	675	+ if ( !$this->current_user_token_valid( $request ) ) {
	676	+ return $this->invalid_nonce();
	677	+ }
	678	+ return $this->WPDA_Rest_Response( 'NOT FOUND' );
	679	+ }
	680	+
	681	+ public function app_call( $request ) {
	682	+ return $this->bad_request();
	683	+ }
	684	+
	685	+ public function app_lang_get( $request ) {
	686	+ if ( !$this->current_user_can_access() ) {
	687	+ // Only admins
	688	+ return $this->unauthorized();
	689	+ }
	690	+ if ( !$this->current_user_token_valid( $request ) ) {
	691	+ return $this->invalid_nonce();
	692	+ }
	693	+ return $this->WPDA_Rest_Response( '', WPDA_App_Localization::get() );
	694	+ }
	695	+
	696	+ public function app_lang_set( $request ) {
	697	+ if ( !$this->current_user_can_access() ) {
	698	+ // Only admins
	699	+ return $this->unauthorized();
	700	+ }
	701	+ if ( !$this->current_user_token_valid( $request ) ) {
	702	+ return $this->invalid_nonce();
	703	+ }
	704	+ $localizations = $request->get_param( 'localizations' );
	705	+ WPDA_App_Localization::set( $localizations );
	706	+ return $this->WPDA_Rest_Response( 'Translation successfully saved' );
	707	+ }
	708	+
477	709	private function get_app_columns( $columns ) {
478	710	if ( !is_array( $columns ) ) {
479	711	return false;
480	712	}
		@@ -589,9 +821,9 @@
589	821	$tbl,
590	822	$msg,
591	823	$settings
592	824	) ) {
593		- $container = WPDA_App_Container_Model::get_container( $cnt_id );
	825	+ $container = WPDA_App_Container_Model::get_container( $app_id, $cnt_id );
594	826	if ( !isset( $container[0] ) ) {
595	827	return $this->bad_request();
596	828	}
597	829	return $this->get_app_container_meta( $app_id, $container, $rel_tab );
		@@ -618,17 +850,17 @@
618	850	$tbl,
619	851	$msg,
620	852	$settings
621	853	) ) {
622		- $container = WPDA_App_Container_Model::get_container( $cnt_id_from );
	854	+ $container = WPDA_App_Container_Model::get_container( $app_id, $cnt_id_from );
623	855	if ( !isset( $container[0] ) ) {
624	856	return $this->bad_request();
625	857	}
626		- $container = WPDA_App_Container_Model::get_container( $cnt_id_to );
	858	+ $container = WPDA_App_Container_Model::get_container( $app_id, $cnt_id_to );
627	859	if ( !isset( $container[0] ) ) {
628	860	return $this->bad_request();
629	861	}
630		- return $this->reorder_details( $cnt_id_from, $cnt_id_to );
	862	+ return $this->reorder_details( $app_id, $cnt_id_from, $cnt_id_to );
631	863	} else {
632	864	if ( 'rest_cookie_invalid_nonce' === $msg ) {
633	865	return $this->invalid_nonce();
634	866	} else {
		@@ -708,8 +940,9 @@
708	940	$search_column_fns,
709	941	&$default_where,
710	942	&$lookups
711	943	) {
	944	+ return $this->bad_request();
712	945	}
713	946
714	947	private function build_relationships(
715	948	$container,
		@@ -716,8 +949,9 @@
716	949	&$m2m_relationship,
717	950	$tbl,
718	951	&$default_where
719	952	) {
	953	+ return $this->bad_request();
720	954	}
721	955
722	956	public function app_select( $request ) {
723	957	$app_id = $request->get_param( 'app_id' );
		@@ -738,12 +972,20 @@
738	972	$row_count = $request->get_param( 'row_count' );
739	973	$row_count_estimate = $request->get_param( 'row_count_estimate' );
740	974	$media = $request->get_param( 'media' );
741	975	$rel_tab = $request->get_param( 'rel_tab' );
	976	+ $client_side = '1' === $request->get_param( 'client_side' );
	977	+ $geo_radius = $request->get_param( 'geo_radius' );
	978	+ $docs = array();
742	979	$default_where = '';
743	980	$default_orderby = '';
744	981	$lookups = array();
745	982	$m2m_relationship = array();
	983	+ if ( $client_side ) {
	984	+ // Delete search values on refresh
	985	+ $search = '';
	986	+ $search_columns = array();
	987	+ }
746	988	if ( $this->check_app_access(
747	989	$app_id,
748	990	$cnt_id,
749	991	'select',
		@@ -751,27 +993,57 @@
751	993	$tbl,
752	994	$msg,
753	995	$settings
754	996	) ) {
755		- $container = WPDA_App_Container_Model::get_container( $cnt_id );
756		- if ( '1' === $rel_tab ) {
	997	+ $container = WPDA_App_Container_Model::get_container( $app_id, $cnt_id );
	998	+ $app = WPDA_App_Model::get_by_id( $app_id );
	999	+ if ( isset( $app[0]['app_type'], $container[0]['cnt_map'] ) && '2' == $app[0]['app_type'] && null !== $container[0]['cnt_map'] ) {
	1000	+ // App = Map
	1001	+ // Get default where map
	1002	+ $map_json = json_decode( (string) $container[0]['cnt_map'], true );
	1003	+ if ( isset( $map_json['setup']['defaultWhere'] ) && null !== $map_json['setup']['defaultWhere'] && '' !== trim( $map_json['setup']['defaultWhere'] ) ) {
	1004	+ $default_where = $map_json['setup']['defaultWhere'];
	1005	+ }
757	1006	} else {
758		- $table_settings = $settings['table'] ?? array();
759		- // Get default where clause
760		- if ( isset( $table_settings['table']['defaultWhere'] ) ) {
761		- $default_where = $table_settings['table']['defaultWhere'];
	1007	+ // All other apps (not being a map)
	1008	+ if ( '1' === $rel_tab ) {
	1009	+ } else {
	1010	+ $table_settings = $settings['table'] ?? array();
	1011	+ // Get default where clause
	1012	+ if ( isset( $table_settings['table']['defaultWhere'] ) ) {
	1013	+ $default_where = $table_settings['table']['defaultWhere'];
	1014	+ }
	1015	+ // Get default order by
	1016	+ if ( isset( $table_settings['table']['defaultOrderBy'] ) ) {
	1017	+ $default_orderby_db = $table_settings['table']['defaultOrderBy'];
	1018	+ if ( is_array( $default_orderby_db ) ) {
	1019	+ foreach ( $default_orderby_db as $orderby ) {
	1020	+ if ( isset( $orderby['columnName'], $orderby['order'] ) && '' !== trim( $orderby['columnName'] ) ) {
	1021	+ $default_orderby .= (( '' === $default_orderby ? 'order by ' : ',' )) . '`' . WPDA::remove_backticks( $orderby['columnName'] ) . '` ' . (( 'desc' === $orderby['order'] ? 'desc' : 'asc' ));
	1022	+ }
	1023	+ }
	1024	+ }
	1025	+ }
762	1026	}
763		- // Get default order by
764		- if ( isset( $table_settings['table']['defaultOrderBy'] ) ) {
765		- $default_orderby_db = $table_settings['table']['defaultOrderBy'];
766		- if ( is_array( $default_orderby_db ) ) {
767		- foreach ( $default_orderby_db as $orderby ) {
768		- if ( isset( $orderby['columnName'], $orderby['order'] ) && '' !== trim( $orderby['columnName'] ) ) {
769		- $default_orderby .= (( '' === $default_orderby ? 'order by ' : ',' )) . '`' . WPDA::remove_backticks( $orderby['columnName'] ) . '` ' . (( 'desc' === $orderby['order'] ? 'desc' : 'asc' ));
770		- }
	1027	+ }
	1028	+ if ( isset( $settings['columns'] ) && is_array( $settings['columns'] ) && '1' !== $rel_tab ) {
	1029	+ $queryable_columns = array();
	1030	+ if ( isset( $settings['table']['columns'] ) && is_array( $settings['table']['columns'] ) ) {
	1031	+ foreach ( $settings['table']['columns'] as $column ) {
	1032	+ if ( isset( $column['queryable'] ) && $column['queryable'] ) {
	1033	+ $queryable_columns[] = $column['columnName'];
771	1034	}
772	1035	}
773	1036	}
	1037	+ $app_columns = array();
	1038	+ foreach ( $settings['columns'] as $column ) {
	1039	+ if ( isset( $column['columnName'], $column['isSelected'] ) && $column['isSelected'] ) {
	1040	+ $app_columns[$column['columnName']] = in_array( $column['columnName'], $queryable_columns );
	1041	+ }
	1042	+ }
	1043	+ if ( 0 < count( $app_columns ) ) {
	1044	+ $col = $app_columns;
	1045	+ }
774	1046	}
775	1047	$table_api = new WPDA_Table();
776	1048	return $table_api->select(
777	1049	$dbs,
		@@ -795,9 +1067,12 @@
795	1067	$default_orderby,
796	1068	$lookups,
797	1069	$md,
798	1070	$m2m_relationship,
799		- $search_data_types
	1071	+ $search_data_types,
	1072	+ $client_side,
	1073	+ $geo_radius,
	1074	+ $docs
800	1075	);
801	1076	} else {
802	1077	if ( 'rest_cookie_invalid_nonce' === $msg ) {
803	1078	return $this->invalid_nonce();
		@@ -821,8 +1096,9 @@
821	1096	return array_map( function ( $value ) {
822	1097	if ( true === $value['isSelected'] ) {
823	1098	return $value['columnName'];
824	1099	}
	1100	+ return null;
825	1101	}, $columns );
826	1102	}
827	1103
828	1104	public function app_get( $request ) {
		@@ -830,8 +1106,9 @@
830	1106	$cnt_id = $request->get_param( 'cnt_id' );
831	1107	$key = $request->get_param( 'key' );
832	1108	$media = $request->get_param( 'media' );
833	1109	$rel_tab = $request->get_param( 'rel_tab' );
	1110	+ $docs = array();
834	1111	if ( $this->check_app_access(
835	1112	$app_id,
836	1113	$cnt_id,
837	1114	'select',
		@@ -851,9 +1128,10 @@
851	1128	$tbl,
852	1129	$key,
853	1130	$media,
854	1131	$column_names,
855		- $default_where
	1132	+ $default_where,
	1133	+ $docs
856	1134	);
857	1135	} else {
858	1136	if ( 'rest_cookie_invalid_nonce' === $msg ) {
859	1137	return $this->invalid_nonce();
		@@ -942,53 +1220,9 @@
942	1220	}
943	1221	}
944	1222
945	1223	public function app_update_inline( $request ) {
946		- $app_id = $request->get_param( 'app_id' );
947		- $cnt_id = $request->get_param( 'cnt_id' );
948		- $key = $request->get_param( 'key' );
949		- $val = $request->get_param( 'val' );
950		- if ( $this->check_app_access(
951		- $app_id,
952		- $cnt_id,
953		- 'select',
954		- $dbs,
955		- $tbl,
956		- $msg,
957		- $settings
958		- ) ) {
959		- foreach ( $val as $column_name => $column ) {
960		- $found = false;
961		- if ( isset( $settings['table']['columns'] ) ) {
962		- foreach ( $settings['table']['columns'] as $settings_column ) {
963		- if ( isset( $settings_column['columnName'] ) && $column_name === $settings_column['columnName'] ) {
964		- $found = true;
965		- }
966		- }
967		- if ( !$found ) {
968		- return $this->unauthorized();
969		- }
970		- }
971		- }
972		- $column_names = $this->get_app_form_columns( $settings );
973		- if ( false === $column_names ) {
974		- $column_names = array();
975		- }
976		- $table_api = new WPDA_Table();
977		- return $table_api->update(
978		- $dbs,
979		- $tbl,
980		- $key,
981		- $val,
982		- $column_names
983		- );
984		- } else {
985		- if ( 'rest_cookie_invalid_nonce' === $msg ) {
986		- return $this->invalid_nonce();
987		- } else {
988		- return $this->unauthorized();
989		- }
990		- }
	1224	+ return $this->bad_request();
991	1225	}
992	1226
993	1227	public function app_delete( $request ) {
994	1228	$app_id = $request->get_param( 'app_id' );
		@@ -1037,8 +1271,9 @@
1037	1271	$search_params = $request->get_param( 'search_params' );
1038	1272	$shortcode_params = $request->get_param( 'shortcode_params' );
1039	1273	$md = $request->get_param( 'md' );
1040	1274	$cascade = $request->get_param( 'cascade' );
	1275	+ $values = $request->get_param( 'values' );
1041	1276	$default_where = '';
1042	1277	$default_where_lookup = '';
1043	1278	$lookups = array();
1044	1279	$m2m_relationship = array();
		@@ -1050,9 +1285,9 @@
1050	1285	$tbl,
1051	1286	$msg,
1052	1287	$settings
1053	1288	) ) {
1054		- $container = WPDA_App_Container_Model::get_container( $cnt_id );
	1289	+ $container = WPDA_App_Container_Model::get_container( $app_id, $cnt_id );
1055	1290	if ( !isset( $container[0] ) ) {
1056	1291	return $this->bad_request();
1057	1292	}
1058	1293	$lookup = array();
		@@ -1103,9 +1338,10 @@
1103	1338	$this->process_params(
1104	1339	$default_where_lookup,
1105	1340	$search_custom,
1106	1341	$search_params,
1107		- $shortcode_params
	1342	+ $shortcode_params,
	1343	+ $values
1108	1344	),
1109	1345	'1' === $cascade,
1110	1346	$tbl,
1111	1347	$col,
		@@ -1112,9 +1348,10 @@
1112	1348	$this->process_params(
1113	1349	$default_where,
1114	1350	$search_custom,
1115	1351	$search_params,
1116		- $shortcode_params
	1352	+ $shortcode_params,
	1353	+ $values
1117	1354	),
1118	1355	$search,
1119	1356	$cols,
1120	1357	$search_columns,
		@@ -1135,8 +1372,12 @@
1135	1372	}
1136	1373	}
1137	1374
1138	1375	public function app_lookup_dbs( $request ) {
	1376	+ // Only admins are allowed to configre lookups
	1377	+ if ( !$this->current_user_can_access() ) {
	1378	+ return $this->unauthorized();
	1379	+ }
1139	1380	$app_id = $request->get_param( 'app_id' );
1140	1381	$cnt_id = $request->get_param( 'cnt_id' );
1141	1382	if ( $this->check_app_access(
1142	1383	$app_id,
		@@ -1159,8 +1400,12 @@
1159	1400	}
1160	1401	}
1161	1402
1162	1403	public function app_lookup_tbl( $request ) {
	1404	+ // Only admins are allowed to configre lookups
	1405	+ if ( !$this->current_user_can_access() ) {
	1406	+ return $this->unauthorized();
	1407	+ }
1163	1408	$app_id = $request->get_param( 'app_id' );
1164	1409	$cnt_id = $request->get_param( 'cnt_id' );
1165	1410	$dbs = $request->get_param( 'dbs' );
1166	1411	if ( $this->check_app_access(
		@@ -1184,8 +1429,12 @@
1184	1429	}
1185	1430	}
1186	1431
1187	1432	public function app_lookup_cls( $request ) {
	1433	+ // Only admins are allowed to configre lookups
	1434	+ if ( !$this->current_user_can_access() ) {
	1435	+ return $this->unauthorized();
	1436	+ }
1188	1437	$app_id = $request->get_param( 'app_id' );
1189	1438	$cnt_id = $request->get_param( 'cnt_id' );
1190	1439	$dbs = $request->get_param( 'dbs' );
1191	1440	$tbl = $request->get_param( 'tbl' );
		@@ -1210,23 +1459,14 @@
1210	1459	}
1211	1460	}
1212	1461
1213	1462	public function app_qb_list( $request ) {
1214		- if ( !$this->current_user_can_access() ) {
1215		- return $this->unauthorized();
1216		- }
1217		- if ( !$this->current_user_token_valid( $request ) ) {
1218		- return $this->invalid_nonce();
1219		- }
1220		- $queries = get_user_meta( WPDA::get_current_user_id(), 'wpda_query_builder' );
1221		- if ( false === $queries ) {
1222		- $queries = array();
1223		- }
1224		- return $this->WPDA_Rest_Response( '', $queries );
	1463	+ $qb = new WPDA_QB();
	1464	+ return $qb->open( $request );
1225	1465	}
1226	1466
1227	1467	public function app_dbs_rename( $request ) {
1228		- if ( !$this->current_user_can_access( true ) ) {
	1468	+ if ( !$this->current_user_can_access() ) {
1229	1469	// Only admins
1230	1470	return $this->unauthorized();
1231	1471	}
1232	1472	if ( !$this->current_user_token_valid( $request ) ) {
		@@ -1240,8 +1480,71 @@
1240	1480	));
1241	1481	}
1242	1482	global $wpdb;
1243	1483	$renamed = 0;
	1484	+ $debug_mode = 'on' === WPDA::get_option( WPDA::OPTION_PLUGIN_DEBUG );
	1485	+ $debug = array();
	1486	+ $errors = array();
	1487	+ if ( $request->get_param( 'appDbId' ) ) {
	1488	+ // Update app only
	1489	+ $appDbId = $request->get_param( 'appDbId' );
	1490	+ // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared -- plugin table
	1491	+ $sql = $wpdb->prepare( "update `{$wpdb->prefix}wpda_app_container` set `cnt_dbs` = %s where `cnt_dbs` = %s and app_id = %d", array($dbs_destination, $dbs_source, $appDbId) );
	1492	+ $result = $wpdb->query( $sql );
	1493	+ // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared
	1494	+ $renamed += $result;
	1495	+ if ( $debug_mode ) {
	1496	+ $debug[] = array(
	1497	+ 'sql' => $sql,
	1498	+ 'result' => $result,
	1499	+ );
	1500	+ }
	1501	+ if ( '' !== $wpdb->last_error ) {
	1502	+ $errors[] = array(
	1503	+ 'sql' => $sql,
	1504	+ 'error' => $wpdb->last_error,
	1505	+ );
	1506	+ }
	1507	+ $sql_content = array("update `{$wpdb->prefix}wpda_app_container` set `cnt_table` = replace(`cnt_table`, '\"dbs\":\"%1s\"', '\"dbs\":\"%1s\"') where `cnt_table` like '%\"dbs\":\"%1s\"%' and app_id = %d", "update `{$wpdb->prefix}wpda_app_container` set `cnt_form` = replace(`cnt_form`, '\"dbs\":\"%1s\"', '\"dbs\":\"%1s\"') where `cnt_form` like '%\"dbs\":\"%1s\"%' and app_id = %d");
	1508	+ foreach ( $sql_content as $sql ) {
	1509	+ // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared -- plugin table
	1510	+ $result = $wpdb->query( $wpdb->prepare( $sql, array(
	1511	+ $dbs_source,
	1512	+ $dbs_destination,
	1513	+ $dbs_source,
	1514	+ $appDbId
	1515	+ ) ) );
	1516	+ $renamed += $result;
	1517	+ if ( $debug_mode ) {
	1518	+ $debug[] = array(
	1519	+ 'sql' => $sql,
	1520	+ 'result' => $result,
	1521	+ );
	1522	+ }
	1523	+ if ( '' !== $wpdb->last_error ) {
	1524	+ $errors[] = array(
	1525	+ 'sql' => $sql,
	1526	+ 'error' => $wpdb->last_error,
	1527	+ );
	1528	+ }
	1529	+ }
	1530	+ $context = array();
	1531	+ if ( $debug_mode ) {
	1532	+ $context['debug'] = $debug;
	1533	+ }
	1534	+ if ( 0 < count( $errors ) ) {
	1535	+ $context['errors'] = $errors;
	1536	+ return new \WP_Error('error', 'Failed renaming database', array(
	1537	+ 'status' => 401,
	1538	+ 'context' => $context,
	1539	+ ));
	1540	+ }
	1541	+ return $this->WPDA_Rest_Response( sprintf(
	1542	+ /* translators: %s = number of database substitutions */
	1543	+ __( 'Successfully renamed %s database occurrences', 'wp-data-access' ),
	1544	+ $renamed
	1545	+ ), null, $context );
	1546	+ }
1244	1547	// Rename all occurrences in repository tables and apps
1245	1548	$sqls = array(
1246	1549	"update `{$wpdb->prefix}wpda_publisher` set `pub_schema_name` = %s where `pub_schema_name` = %s",
1247	1550	"update `{$wpdb->prefix}wpda_project_page` set `page_schema_name` = %s where `page_schema_name` = %s",
		@@ -1249,22 +1552,68 @@
1249	1552	"update `{$wpdb->prefix}wpda_media` set `media_schema_name` = %s where `media_schema_name` = %s",
1250	1553	"update `{$wpdb->prefix}wpda_menus` set `menu_schema_name` = %s where `menu_schema_name` = %s",
1251	1554	"update `{$wpdb->prefix}wpda_table_design` set `wpda_schema_name` = %s where `wpda_schema_name` = %s",
1252	1555	"update `{$wpdb->prefix}wpda_table_settings` set `wpda_schema_name` = %s where `wpda_schema_name` = %s",
1253		- "update `{$wpdb->prefix}wpda_container` set `cnt_dbs` = %s where `cnt_dbs` = %s"
	1556	+ "update `{$wpdb->prefix}wpda_app_container` set `cnt_dbs` = %s where `cnt_dbs` = %s"
1254	1557	);
1255	1558	foreach ( $sqls as $sql ) {
1256		- $renamed += $wpdb->query( $wpdb->prepare( $sql, array($dbs_destination, $dbs_source) ) );
	1559	+ // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared -- plugin table
	1560	+ $result = $wpdb->query( $wpdb->prepare( $sql, array($dbs_destination, $dbs_source) ) );
	1561	+ // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared
	1562	+ $renamed += $result;
	1563	+ if ( $debug_mode ) {
	1564	+ $debug[] = array(
	1565	+ 'sql' => $sql,
	1566	+ 'result' => $result,
	1567	+ );
	1568	+ }
	1569	+ if ( '' !== $wpdb->last_error ) {
	1570	+ $errors[] = array(
	1571	+ 'sql' => $sql,
	1572	+ 'error' => $wpdb->last_error,
	1573	+ );
	1574	+ }
1257	1575	}
1258		- $sql_content = array("update `{$wpdb->prefix}wpda_container` set `cnt_table` = replace(`cnt_table`, '\"dbs\":\"%1s\"', '\"dbs\":\"%1s\"') where `cnt_table` like '%\"dbs\":\"%1s\"%'", "update `{$wpdb->prefix}wpda_container` set `cnt_form` = replace(`cnt_form`, '\"dbs\":\"%1s\"', '\"dbs\":\"%1s\"') where `cnt_form` like '%\"dbs\":\"%1s\"%'");
	1576	+ $sql_content = array("update `{$wpdb->prefix}wpda_app_container` set `cnt_table` = replace(`cnt_table`, '\"dbs\":\"%1s\"', '\"dbs\":\"%1s\"') where `cnt_table` like '%\"dbs\":\"%1s\"%'", "update `{$wpdb->prefix}wpda_app_container` set `cnt_form` = replace(`cnt_form`, '\"dbs\":\"%1s\"', '\"dbs\":\"%1s\"') where `cnt_form` like '%\"dbs\":\"%1s\"%'");
1259	1577	foreach ( $sql_content as $sql ) {
1260		- $renamed += $wpdb->query( $wpdb->prepare( $sql, array($dbs_source, $dbs_destination, $dbs_source) ) );
	1578	+ // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared -- plugin table
	1579	+ $result = $wpdb->query( $wpdb->prepare( $sql, array($dbs_source, $dbs_destination, $dbs_source) ) );
	1580	+ $renamed += $result;
	1581	+ if ( $debug_mode ) {
	1582	+ $debug[] = array(
	1583	+ 'sql' => $sql,
	1584	+ 'result' => $result,
	1585	+ );
	1586	+ }
	1587	+ if ( '' !== $wpdb->last_error ) {
	1588	+ $errors[] = array(
	1589	+ 'sql' => $sql,
	1590	+ 'error' => $wpdb->last_error,
	1591	+ );
	1592	+ }
1261	1593	}
1262		- return $this->WPDA_Rest_Response( sprintf( __( 'Successfully renamed %s database occurrences', 'wp-data-access' ), $renamed ) );
	1594	+ $context = array();
	1595	+ if ( $debug_mode ) {
	1596	+ $context['debug'] = $debug;
	1597	+ }
	1598	+ if ( 0 < count( $errors ) ) {
	1599	+ $context['errors'] = $errors;
	1600	+ return new \WP_Error('error', 'Failed renaming database', array(
	1601	+ 'status' => 401,
	1602	+ 'context' => $context,
	1603	+ ));
	1604	+ }
	1605	+ return $this->WPDA_Rest_Response( sprintf(
	1606	+ /* translators: %s = number of database substitutions */
	1607	+ __( 'Successfully renamed %s database occurrences', 'wp-data-access' ),
	1608	+ $renamed
	1609	+ ), null, $context );
1263	1610	}
1264	1611
1265	1612	public function app_chart_data( $request ) {
1266	1613	$app_id = $request->get_param( 'app_id' );
	1614	+ $search_custom = $request->get_param( 'search_custom' );
	1615	+ $shortcode_params = $request->get_param( 'shortcode_params' );
1267	1616	if ( !$this->main_app_access( $app_id, $msg ) ) {
1268	1617	if ( 'rest_cookie_invalid_nonce' === $msg ) {
1269	1618	return $this->invalid_nonce();
1270	1619	}
		@@ -1276,8 +1625,15 @@
1276	1625	$app_container = WPDA_App_Container_Model::select( $app_id, 0 );
1277	1626	if ( 1 === count( $app_container ) && null !== $app_container[0]['cnt_query'] && '' !== trim( (string) $app_container[0]['cnt_query'] ) ) {
1278	1627	$dbs = $app_container[0]['cnt_dbs'];
1279	1628	$query = $app_container[0]['cnt_query'];
	1629	+ // Process shortcode and url parameters
	1630	+ $query = $this->process_params(
	1631	+ $query,
	1632	+ $search_custom,
	1633	+ null,
	1634	+ $shortcode_params
	1635	+ );
1280	1636	$wpdadb = WPDADB::get_db_connection( $dbs );
1281	1637	if ( null === $wpdadb ) {
1282	1638	// Error connecting.
1283	1639	return new \WP_Error('error', "Error connecting to database {$dbs}", array(
		@@ -1285,14 +1641,23 @@
1285	1641	));
1286	1642	}
1287	1643	$suppress = $wpdadb->suppress_errors( true );
1288	1644	$chart_data = $wpdadb->get_results( $query, 'ARRAY_A' );
	1645	+ // Add an * before each label to support numeric labels
	1646	+ $chart_data_converted = array();
	1647	+ foreach ( $chart_data as $data ) {
	1648	+ $row = array();
	1649	+ foreach ( $data as $key => $value ) {
	1650	+ $row['*' . $key] = $value;
	1651	+ }
	1652	+ $chart_data_converted[] = $row;
	1653	+ }
1289	1654	$wpdadb->get_results( "create temporary table `wpda_chart_data_types` as {$query}", 'ARRAY_A' );
1290	1655	$explain = $wpdadb->get_results( "desc `wpda_chart_data_types`", 'ARRAY_A' );
1291	1656	$wpdadb->get_results( "drop temporary table `wpda_chart_data_types`", 'ARRAY_A' );
1292	1657	$wpdadb->suppress_errors( $suppress );
1293	1658	return array(
1294		- 'data' => $chart_data,
	1659	+ 'data' => $chart_data_converted,
1295	1660	'explain' => $explain,
1296	1661	);
1297	1662	} else {
1298	1663	return new \WP_Error('error', $msg, array(
		@@ -1337,8 +1702,10 @@
1337	1702	$app_id = $request->get_param( 'app_id' );
1338	1703	$cnt_id = $request->get_param( 'cnt_id' );
1339	1704	$target = $request->get_param( 'target' );
1340	1705	$settings = $request->get_param( 'settings' );
	1706	+ $chart = $request->get_param( 'chart' );
	1707	+ $map = $request->get_param( 'map' );
1341	1708	$theme = $request->get_param( 'theme' );
1342	1709	return $this->do_app_settings(
1343	1710	$app_id,
1344	1711	$cnt_id,
		@@ -1343,8 +1710,10 @@
1343	1710	$app_id,
1344	1711	$cnt_id,
1345	1712	$target,
1346	1713	$settings,
	1714	+ $chart,
	1715	+ $map,
1347	1716	$theme
1348	1717	);
1349	1718	}
1350	1719
		@@ -1507,11 +1876,13 @@
1507	1876	$app_id,
1508	1877	$cnt_id,
1509	1878	$target,
1510	1879	$settings,
	1880	+ $chart,
	1881	+ $map,
1511	1882	$theme
1512	1883	) {
1513		- if ( 1 > $app_id || 1 > $cnt_id || 'table' !== $target && 'form' !== $target && 'rform' !== $target && 'theme' !== $target && 'chart' !== $target ) {
	1884	+ if ( 1 > $app_id || 1 > $cnt_id || 'table' !== $target && 'form' !== $target && 'rform' !== $target && 'theme' !== $target && 'chart' !== $target && 'map' !== $target && 'dashboard' !== $target ) {
1514	1885	return $this->bad_request();
1515	1886	}
1516	1887	if ( null === $settings || '' === $settings ) {
1517	1888	// Perform reset
		@@ -1531,8 +1902,24 @@
1531	1902	'status' => 403,
1532	1903	));
1533	1904	}
1534	1905	break;
	1906	+ case 'chart':
	1907	+ $error_msg = WPDA_App_Container_Model::update_chart_settings( $cnt_id, null );
	1908	+ if ( '' !== $error_msg ) {
	1909	+ return new \WP_Error('error', $error_msg, array(
	1910	+ 'status' => 403,
	1911	+ ));
	1912	+ }
	1913	+ break;
	1914	+ case 'map':
	1915	+ $error_msg = WPDA_App_Container_Model::update_map_settings( $cnt_id, null );
	1916	+ if ( '' !== $error_msg ) {
	1917	+ return new \WP_Error('error', $error_msg, array(
	1918	+ 'status' => 403,
	1919	+ ));
	1920	+ }
	1921	+ break;
1535	1922	case 'theme':
1536	1923	$error_msg = WPDA_App_Model::update_theme( $app_id, null );
1537	1924	if ( '' !== $error_msg ) {
1538	1925	return new \WP_Error('error', $error_msg, array(
		@@ -1539,8 +1926,16 @@
1539	1926	'status' => 403,
1540	1927	));
1541	1928	}
1542	1929	break;
	1930	+ case 'dashboard':
	1931	+ $error_msg = WPDA_App_Container_Model::update_dashboard_settings( $app_id, null );
	1932	+ if ( '' !== $error_msg ) {
	1933	+ return new \WP_Error('error', $error_msg, array(
	1934	+ 'status' => 403,
	1935	+ ));
	1936	+ }
	1937	+ break;
1543	1938	default:
1544	1939	return $this->bad_request();
1545	1940	}
1546	1941	return $this->WPDA_Rest_Response( __( 'Reset was successful', 'wp-data-access' ) );
		@@ -1552,8 +1947,22 @@
1552	1947	return new \WP_Error('error', $error_msg, array(
1553	1948	'status' => 403,
1554	1949	));
1555	1950	}
	1951	+ // Update chart settings
	1952	+ $error_msg = WPDA_App_Container_Model::update_chart_settings( $cnt_id, $chart );
	1953	+ if ( '' !== $error_msg ) {
	1954	+ return new \WP_Error('error', $error_msg, array(
	1955	+ 'status' => 403,
	1956	+ ));
	1957	+ }
	1958	+ // Update map settings
	1959	+ $error_msg = WPDA_App_Container_Model::update_map_settings( $cnt_id, $map );
	1960	+ if ( '' !== $error_msg ) {
	1961	+ return new \WP_Error('error', $error_msg, array(
	1962	+ 'status' => 403,
	1963	+ ));
	1964	+ }
1556	1965	} else {
1557	1966	if ( 'rform' === $target ) {
1558	1967	// Update rform settings
1559	1968	$error_msg = WPDA_App_Container_Model::update_rform_settings( $cnt_id, $settings );
		@@ -1571,14 +1980,35 @@
1571	1980	'status' => 403,
1572	1981	));
1573	1982	}
1574	1983	} else {
1575		- // Update form settings
1576		- $error_msg = WPDA_App_Container_Model::update_form_settings( $cnt_id, $settings );
1577		- if ( '' !== $error_msg ) {
1578		- return new \WP_Error('error', $error_msg, array(
1579		- 'status' => 403,
1580		- ));
	1984	+ if ( 'map' === $target ) {
	1985	+ // Update chart settings
	1986	+ $error_msg = WPDA_App_Container_Model::update_map_settings( $cnt_id, $settings );
	1987	+ if ( '' !== $error_msg ) {
	1988	+ return new \WP_Error('error', $error_msg, array(
	1989	+ 'status' => 403,
	1990	+ ));
	1991	+ }
	1992	+ } else {
	1993	+ if ( 'form' === $target ) {
	1994	+ // Update form settings
	1995	+ $error_msg = WPDA_App_Container_Model::update_form_settings( $cnt_id, $settings );
	1996	+ if ( '' !== $error_msg ) {
	1997	+ return new \WP_Error('error', $error_msg, array(
	1998	+ 'status' => 403,
	1999	+ ));
	2000	+ }
	2001	+ } else {
	2002	+ if ( 'dashboard' === $target ) {
	2003	+ $error_msg = WPDA_App_Container_Model::update_dashboard_settings( $cnt_id, $settings );
	2004	+ if ( '' !== $error_msg ) {
	2005	+ return new \WP_Error('error', $error_msg, array(
	2006	+ 'status' => 403,
	2007	+ ));
	2008	+ }
	2009	+ }
	2010	+ }
1581	2011	}
1582	2012	}
1583	2013	}
1584	2014	}
		@@ -1699,9 +2129,9 @@
1699	2129	private function get_relation_columns( $container ) {
1700	2130	return null;
1701	2131	}
1702	2132
1703		- private function reorder_details( $cnt_id_from, $cnt_id_to ) {
	2133	+ private function reorder_details( $app_id, $cnt_id_from, $cnt_id_to ) {
1704	2134	return $this->bad_request();
1705	2135	}
1706	2136
1707	2137	private function get_app_apps_meta( $app, $apps ) {
		@@ -1708,8 +2138,9 @@
1708	2138	$app_id_details = array_map( function ( $e ) {
1709	2139	if ( isset( $e['app_id_detail'] ) ) {
1710	2140	return $e['app_id_detail'];
1711	2141	}
	2142	+ return null;
1712	2143	}, $apps );
1713	2144	$app_titles = array();
1714	2145	foreach ( $app_id_details as $app_id_detail ) {
1715	2146	$app_detail = WPDA_App_Model::get_by_id( $app_id_detail );
		@@ -1744,18 +2175,46 @@
1744	2175	}
1745	2176	$settings->env = $this->get_env();
1746	2177	global $wpdb;
1747	2178	$settings->wp = [
1748		- 'roles' => $this->get_wp_roles(),
1749		- 'users' => $this->get_wp_users(),
1750		- 'home' => admin_url( 'admin.php' ),
1751		- 'tables' => array_values( $wpdb->tables() ),
1752		- 'date_format' => get_option( 'date_format' ),
1753		- 'time_format' => get_option( 'time_format' ),
	2179	+ 'roles' => $this->get_wp_roles(),
	2180	+ 'users' => $this->get_wp_users(),
	2181	+ 'home' => admin_url( 'admin.php' ),
	2182	+ 'siteurl' => site_url(),
	2183	+ 'tables' => array_values( $wpdb->tables() ),
	2184	+ 'date_format' => get_option( 'date_format' ),
	2185	+ 'time_format' => get_option( 'time_format' ),
	2186	+ 'scroll_offset' => WPDA::get_option( WPDA::OPTION_APPS_SCROLL_OFFSET ),
	2187	+ 'upload' => @ini_get( 'upload_max_filesize' ),
	2188	+ 'uploadBytes' => $this->uploadToBytes( @ini_get( 'upload_max_filesize' ) ),
	2189	+ 'locale' => get_locale(),
1754	2190	];
1755	2191	return $settings;
1756	2192	}
1757	2193
	2194	+ /**
	2195	+ * Convert a PHP shorthand notation (e.g., "2M", "512K", "1G") to bytes.
	2196	+ *
	2197	+ * @param string $val The shorthand size string.
	2198	+ *
	2199	+ * @return int The size in bytes.
	2200	+ */
	2201	+ private function uploadToBytes( $val ) : int {
	2202	+ $val = trim( $val );
	2203	+ $lastChar = strtolower( $val[strlen( $val ) - 1] );
	2204	+ $num = (float) $val;
	2205	+ switch ( $lastChar ) {
	2206	+ case 'g':
	2207	+ $num *= 1024;
	2208	+ case 'm':
	2209	+ $num *= 1024;
	2210	+ case 'k':
	2211	+ $num *= 1024;
	2212	+ break;
	2213	+ }
	2214	+ return (int) round( $num );
	2215	+ }
	2216	+
1758	2217	private function get_app_container_meta( $app_id, $container, $rel_tab = false ) {
1759	2218	$app = WPDA_App_Model::get_by_id( $app_id );
1760	2219	if ( false === $app ) {
1761	2220	return $this->bad_request();
		@@ -1768,9 +2227,9 @@
1768	2227	$response = array(
1769	2228	'app' => array(
1770	2229	'app' => $app,
1771	2230	'container' => array_map( function ( $value ) {
1772		- $show = current_user_can( 'manage_options' );
	2231	+ $show = WPDA::current_user_is_admin();
1773	2232	if ( !$show ) {
1774	2233	// Hide database and table name in responses for non admin users.
1775	2234	unset($value['cnt_dbs']);
1776	2235	unset($value['cnt_tbl']);
		@@ -1786,10 +2245,18 @@
1786	2245	'update' => array(),
1787	2246	'delete' => array(),
1788	2247	);
1789	2248	$cls = WPDA_List_Columns_Cache::get_list_columns( $dbs, $tbl );
	2249	+ $columns = $cls->get_table_columns();
	2250	+ $columns_sorted = array();
	2251	+ foreach ( $columns as $column ) {
	2252	+ if ( isset( $column['column_name'] ) ) {
	2253	+ $columns_sorted[$column['column_name']] = $column;
	2254	+ }
	2255	+ }
1790	2256	$media = $this->get_media( $dbs, $tbl, $cls->get_table_columns() );
1791		- $response['columns'] = $cls->get_table_columns();
	2257	+ $response['columns'] = $columns;
	2258	+ $response['columns_sorted'] = $columns_sorted;
1792	2259	$response['table_labels'] = $cls->get_table_header_labels();
1793	2260	$response['form_labels'] = $cls->get_table_column_headers();
1794	2261	$response['primary_key'] = $cls->get_table_primary_key();
1795	2262	$response['access'] = $access;
		@@ -1805,9 +2272,9 @@
1805	2272	$response['table_info'] = $this->get_table_info( $dbs, $tbl, $default_where );
1806	2273	return $this->WPDA_Rest_Response( '', $response );
1807	2274	}
1808	2275
1809		- private function get_app_meta( $app_id ) {
	2276	+ public function get_app_meta( $app_id ) {
1810	2277	$app = WPDA_App_Model::get_by_id( $app_id );
1811	2278	if ( !isset( $app[0]['app_type'] ) ) {
1812	2279	return $this->bad_request();
1813	2280	}
		@@ -1824,30 +2291,46 @@
1824	2291	return $this->get_app_container_meta( $app_id, $container );
1825	2292	}
1826	2293	}
1827	2294
1828		- private function do_app_export_app( $app_id ) {
	2295	+ private function escapeUnicodeForExport( $str ) {
	2296	+ if ( empty( $str ) ) {
	2297	+ return $str;
	2298	+ }
	2299	+ return preg_replace_callback( '/\\\\(u[0-9a-fA-F]{4})/', function ( $matches ) {
	2300	+ return '\\\\' . $matches[1];
	2301	+ }, $str );
	2302	+ }
	2303	+
	2304	+ private function do_app_export_app( $app_id, $main_app_id ) {
1829	2305	global $wpdb;
1830	2306	$quotes = function ( $value ) {
1831	2307	return str_replace( array(
1832	2308	"'",
1833	2309	'\\"',
	2310	+ "\\\\t",
1834	2311	"\\t",
	2312	+ "\\\\n",
1835	2313	"\\n",
1836	2314	"\\r\\n",
1837		- "\\r"
	2315	+ "\\r",
	2316	+ "\\d"
1838	2317	), array(
1839	2318	"''",
1840	2319	'\\\\"',
	2320	+ "\\\\\\t",
1841	2321	"\\\\t",
	2322	+ "\\\\\\n",
1842	2323	"\\\\n",
1843	2324	"\\\\r\\\\n",
1844		- "\\\\r"
	2325	+ "\\\\r",
	2326	+ "\\\\\\\\\\d"
1845	2327	), $value );
1846	2328	};
1847	2329	$app = WPDA_App_Model::get_by_id( $app_id );
1848	2330	$app_settings = ( null === $app[0]['app_settings'] ? 'null' : "{$quotes( $app[0]['app_settings'] )}" );
1849	2331	$app_theme = ( null === $app[0]['app_theme'] ? 'null' : "{$quotes( $app[0]['app_theme'] )}" );
	2332	+ // phpcs:ignore PluginCheck.CodeAnalysis.Heredoc.NotAllowed
1850	2333	$app_sql = <<<SQL
1851	2334	# Import app
1852	2335	insert into `{wp_prefix}wpda_app`
1853	2336	\t(`app_name`
		@@ -1866,9 +2349,9 @@
1866	2349	\t,{$app[0]['app_add_to_menu']}
1867	2350	\t);
1868	2351
1869	2352	SET @APP_ID = LAST_INSERT_ID();
1870		-insert into `wpda_transfer_apps`
	2353	+insert into `wpda_transfer_apps_{$main_app_id}`
1871	2354	values
1872	2355	({$app[0]['app_id']}
1873	2356	,(select LAST_INSERT_ID(`app_id`) from `{wp_prefix}wpda_app` order by 1 desc limit 1)
1874	2357	);
		@@ -1877,15 +2360,23 @@
1877	2360	SQL;
1878	2361	$containers = WPDA_App_Container_Model::select_all( $app_id );
1879	2362	$containers_sql = '';
1880	2363	foreach ( $containers as $container ) {
1881		- $cnt_table = ( null === $container['cnt_table'] ? 'null' : "{$quotes( $container['cnt_table'] )}" );
1882		- $cnt_form = ( null === $container['cnt_form'] ? 'null' : "{$quotes( $container['cnt_form'] )}" );
1883		- $cnt_relation = ( null === $container['cnt_relation'] ? 'null' : "{$quotes( $container['cnt_relation'] )}" );
	2364	+ $cnt_table = ( null === $container['cnt_table'] ? 'null' : "'{$quotes( $container['cnt_table'] )}'" );
	2365	+ $cnt_form = ( null === $container['cnt_form'] ? 'null' : "'{$quotes( $container['cnt_form'] )}'" );
	2366	+ $cnt_relation = ( null === $container['cnt_relation'] ? 'null' : "'{$quotes( $container['cnt_relation'] )}'" );
	2367	+ $cnt_rform = ( null === $container['cnt_rform'] ? 'null' : "'{$quotes( $container['cnt_rform'] )}'" );
	2368	+ $cnt_chart = ( null === $container['cnt_chart'] ? 'null' : "'{$quotes( $container['cnt_chart'] )}'" );
	2369	+ $cnt_map = ( null === $container['cnt_map'] ? 'null' : "'{$quotes( $container['cnt_map'] )}'" );
	2370	+ $cnt_query = ( null === $container['cnt_query'] ? 'null' : "'{$quotes( $container['cnt_query'] )}'" );
1884	2371	// Replace default WordPress database with conversion string
1885	2372	$cnt_dbs = ( $wpdb->dbname === $container['cnt_dbs'] ? '{wp_schema}' : "{$quotes( $container['cnt_dbs'] )}" );
1886	2373	$cnt_table = str_replace( "\"dbs\":\"{$wpdb->dbname}\"", "\"dbs\":\"{wp_schema}\"", $cnt_table );
1887	2374	$cnt_form = str_replace( "\"dbs\":\"{$wpdb->dbname}\"", "\"dbs\":\"{wp_schema}\"", $cnt_form );
	2375	+ // Replace Unicode characters
	2376	+ $cnt_table = $this->escapeUnicodeForExport( $cnt_table );
	2377	+ $cnt_form = $this->escapeUnicodeForExport( $cnt_form );
	2378	+ // phpcs:ignore PluginCheck.CodeAnalysis.Heredoc.NotAllowed
1888	2379	$containers_sql .= <<<SQL
1889	2380	# Import app container
1890	2381	insert into `{wp_prefix}wpda_app_container`
1891	2382	\t(`cnt_dbs`
		@@ -1896,8 +2387,12 @@
1896	2387	\t,`cnt_seq_nr`
1897	2388	\t,`cnt_table`
1898	2389	\t,`cnt_form`
1899	2390	\t,`cnt_relation`
	2391	+ ,`cnt_rform`
	2392	+ ,`cnt_chart`
	2393	+ ,`cnt_map`
	2394	+ ,`cnt_query`
1900	2395	\t)
1901	2396	values
1902	2397	\t('{$cnt_dbs}'
1903	2398	\t,'{$quotes( $container['cnt_tbl'] )}'
		@@ -1904,14 +2399,18 @@
1904	2399	\t,'{$quotes( $container['cnt_cls'] )}'
1905	2400	\t,'{$quotes( $container['cnt_title'] )}'
1906	2401	\t,@APP_ID
1907	2402	\t,{$container['cnt_seq_nr']}
1908		-\t,'{$cnt_table}'
1909		-\t,'{$cnt_form}'
1910		-\t,'{$cnt_relation}'
	2403	+\t,{$cnt_table}
	2404	+\t,{$cnt_form}
	2405	+\t,{$cnt_relation}
	2406	+\t,{$cnt_rform}
	2407	+\t,{$cnt_chart}
	2408	+\t,{$cnt_map}
	2409	+\t,{$cnt_query}
1911	2410	\t);
1912	2411
1913		-insert into `wpda_transfer_containers`
	2412	+insert into `wpda_transfer_containers_{$main_app_id}`
1914	2413	values
1915	2414	({$container['cnt_id']}
1916	2415	,(select LAST_INSERT_ID(`cnt_id`) from `{wp_prefix}wpda_app_container` order by 1 desc limit 1)
1917	2416	);
		@@ -1919,24 +2418,24 @@
1919	2418
1920	2419	SQL;
1921	2420	}
1922	2421	// Post update: update master container ids
	2422	+ // phpcs:ignore PluginCheck.CodeAnalysis.Heredoc.NotAllowed
1923	2423	$containers_sql .= <<<SQL
1924	2424	# Update app master container IDs
1925		-update `{wp_prefix}wpda_app_container` c
1926		-set c.`cnt_relation` =
	2425	+update `{wp_prefix}wpda_app_container` as a
	2426	+set a.`cnt_relation` =
1927	2427	(
1928	2428	select replace(
1929		-\t\t\ta.`cnt_relation`,
1930		-\t\t\tconcat('"cnt_id_master":"', b.cnt_id_old, '"'),
1931		-\t\t\tconcat('"cnt_id_master":"', b.cnt_id_new, '"')
1932		-\t\t)
1933		-\t\tfrom `{wp_prefix}wpda_app_container` a, `wpda_transfer_containers` b
1934		-\t\twhere a.cnt_id = c.cnt_id
1935		-\t\t and a.`cnt_relation` like concat('%"cnt_id_master":"', b.cnt_id_old, '"%')
	2429	+ a.`cnt_relation`,
	2430	+ concat('"cnt_id_master":"', b.cnt_id_old, '"'),
	2431	+ concat('"cnt_id_master":"', b.cnt_id_new, '"')
	2432	+ )
	2433	+ from `wpda_transfer_containers_{$main_app_id}` as b
	2434	+ where a.`cnt_relation` like concat('%"cnt_id_master":"', b.cnt_id_old, '"%')
1936	2435	)
1937		-where c.`app_id` = @APP_ID
1938		- and c.`cnt_relation` is not null;
	2436	+where a.`app_id` = @APP_ID
	2437	+ and a.`cnt_relation` is not null;
1939	2438
1940	2439
1941	2440	SQL;
1942	2441	$apps = WPDA_App_Apps_Model::select_all( $app_id );
		@@ -1941,11 +2440,12 @@
1941	2440	SQL;
1942	2441	$apps = WPDA_App_Apps_Model::select_all( $app_id );
1943	2442	$apps_sql = '';
1944	2443	foreach ( $apps as $app ) {
1945		- $apps_sql .= $this->do_app_export_app( $app['app_id_detail'] );
	2444	+ $apps_sql .= $this->do_app_export_app( $app['app_id_detail'], $main_app_id );
1946	2445	}
1947	2446	foreach ( $apps as $app ) {
	2447	+ // phpcs:ignore PluginCheck.CodeAnalysis.Heredoc.NotAllowed
1948	2448	$apps_sql .= <<<SQL
1949	2449	# Import app relationships
1950	2450	insert into `{wp_prefix}wpda_app_apps`
1951	2451	\t(`app_id`
		@@ -1952,10 +2452,10 @@
1952	2452	\t,`app_id_detail`
1953	2453	\t,`seq_nr`\t\t\t\t\t
1954	2454	\t)
1955	2455	values
1956		-\t((select `app_id_new` from `wpda_transfer_apps` where `app_id_old` = {$app['app_id']})
1957		-\t,(select `app_id_new` from `wpda_transfer_apps` where `app_id_old` = {$app['app_id_detail']})
	2456	+\t((select `app_id_new` from `wpda_transfer_apps_{$main_app_id}` where `app_id_old` = {$app['app_id']})
	2457	+\t,(select `app_id_new` from `wpda_transfer_apps_{$main_app_id}` where `app_id_old` = {$app['app_id_detail']})
1958	2458	\t,{$app['seq_nr']}\t\t\t\t\t
1959	2459	\t);
1960	2460
1961	2461
		@@ -1966,8 +2466,9 @@
1966	2466
1967	2467	private function do_app_export( $app_id ) {
1968	2468	global $wpdb;
1969	2469	$sql = '';
	2470	+ // phpcs:ignore PluginCheck.CodeAnalysis.Heredoc.NotAllowed
1970	2471	$begin_sql = <<<SQL
1971	2472	/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
1972	2473	/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
1973	2474	/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
		@@ -1973,14 +2474,14 @@
1973	2474	/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
1974	2475	/*!40101 SET NAMES {$wpdb->charset} */;
1975	2476
1976	2477	# Create temporary table
1977		-CREATE TEMPORARY TABLE `wpda_transfer_containers`
	2478	+CREATE TABLE `wpda_transfer_containers_{$app_id}`
1978	2479	(cnt_id_old bigint(20) unsigned
1979	2480	,cnt_id_new bigint(20) unsigned
1980	2481	);
1981	2482
1982		-CREATE TEMPORARY TABLE `wpda_transfer_apps`
	2483	+CREATE TABLE `wpda_transfer_apps_{$app_id}`
1983	2484	(app_id_old bigint(20) unsigned
1984	2485	,app_id_new bigint(20) unsigned
1985	2486	);
1986	2487
		@@ -1987,13 +2488,14 @@
1987	2488	SET @APP_ID = NULL;
1988	2489
1989	2490
1990	2491	SQL;
1991		- $sql .= $this->do_app_export_app( $app_id );
	2492	+ $sql .= $this->do_app_export_app( $app_id, $app_id );
	2493	+ // phpcs:ignore PluginCheck.CodeAnalysis.Heredoc.NotAllowed
1992	2494	$end_sql = <<<SQL
1993	2495	# Drop temporary table
1994		-DROP TEMPORARY TABLE `wpda_transfer_containers`;
1995		-DROP TEMPORARY TABLE `wpda_transfer_apps`;
	2496	+DROP TABLE `wpda_transfer_containers_{$app_id}`;
	2497	+DROP TABLE `wpda_transfer_apps_{$app_id}`;
1996	2498
1997	2499	/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
1998	2500	/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
1999	2501	/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
		@@ -2082,9 +2584,9 @@
2082	2584	}
2083	2585	return $this->WPDA_Rest_Response( __( 'Changes successfully saved', 'wp-data-access' ) );
2084	2586	}
2085	2587
2086		- private function main_app_access( $app_id, &$msg = '' ) {
	2588	+ private function main_app_access( $app_id, &$msg = '', &$app = null ) {
2087	2589	// Get app info
2088	2590	$app = WPDA_App_Model::get_by_id( $app_id );
2089	2591	if ( false === $app ) {
2090	2592	// App not found
		@@ -2127,9 +2629,9 @@
2127	2629	if ( !$this->main_app_access( $app_id, $msg ) ) {
2128	2630	return false;
2129	2631	}
2130	2632	// Get container
2131		- $container = WPDA_App_Container_Model::get_container( $cnt_id );
	2633	+ $container = WPDA_App_Container_Model::get_container( $app_id, $cnt_id );
2132	2634	if ( !is_array( $container ) || 0 === count( $container ) ) {
2133	2635	// Container not found
2134	2636	$msg = __( 'Bad request', 'wp-data-access' );
2135	2637	return false;
		@@ -2136,12 +2638,14 @@
2136	2638	}
2137	2639	if ( 'select' !== $action ) {
2138	2640	$cnt_table = json_decode( (string) $container[0]['cnt_table'], true );
2139	2641	if ( !isset( $cnt_table['table']['transactions'][$action] ) || false === $cnt_table['table']['transactions'][$action] ) {
2140		- $cnt_relation = json_decode( (string) $container[0]['cnt_relation'], true );
2141		- if ( !(isset( $cnt_relation['cnt_id_master'] ) && $this->check_master_container_access( $cnt_relation['cnt_id_master'], $action )) ) {
2142		- $msg = __( 'Unauthorized', 'wp-data-access' );
2143		- return false;
	2642	+ if ( !isset( $cnt_table['table']['bulkActions'][$action] ) || false === $cnt_table['table']['bulkActions'][$action] ) {
	2643	+ $cnt_relation = json_decode( (string) $container[0]['cnt_relation'], true );
	2644	+ if ( !(isset( $cnt_relation['cnt_id_master'] ) && $this->check_master_container_access( $app_id, $cnt_relation['cnt_id_master'], $action )) ) {
	2645	+ $msg = __( 'Unauthorized', 'wp-data-access' );
	2646	+ return false;
	2647	+ }
2144	2648	}
2145	2649	}
2146	2650	}
2147	2651	// Return database name, table name and columns
		@@ -2154,10 +2658,10 @@
2154	2658	);
2155	2659	return true;
2156	2660	}
2157	2661
2158		- private function check_master_container_access( $cnt_id, $action ) {
2159		- $container = WPDA_App_Container_Model::get_container( $cnt_id );
	2662	+ private function check_master_container_access( $app_id, $cnt_id, $action ) {
	2663	+ $container = WPDA_App_Container_Model::get_container( $app_id, $cnt_id );
2160	2664	if ( !is_array( $container ) || 0 === count( $container ) ) {
2161	2665	// Container not found
2162	2666	return false;
2163	2667	}
		@@ -2163,9 +2667,9 @@
2163	2667	}
2164	2668	$cnt_table = json_decode( (string) $container[0]['cnt_table'], true );
2165	2669	if ( !isset( $cnt_table['table']['transactions'][$action] ) || false === $cnt_table['table']['transactions'][$action] ) {
2166	2670	$cnt_relation = json_decode( (string) $container[0]['cnt_relation'], true );
2167		- if ( !(isset( $cnt_relation['cnt_id_master'] ) && $this->check_master_container_access( $cnt_relation['cnt_id_master'], $action )) ) {
	2671	+ if ( !(isset( $cnt_relation['cnt_id_master'] ) && $this->check_master_container_access( $app_id, $cnt_relation['cnt_id_master'], $action )) ) {
2168	2672	return false;
2169	2673	}
2170	2674	}
2171	2675	return true;
		@@ -2174,18 +2678,21 @@
2174	2678	private function process_params(
2175	2679	$where,
2176	2680	$search_custom,
2177	2681	$search_params,
2178		- $shortcode_params
	2682	+ $shortcode_params,
	2683	+ $dynamic_params = array()
2179	2684	) {
2180	2685	// Process $search_custom > URL parameters
2181	2686	global $wpdb;
	2687	+ $replacements = array();
	2688	+ $nonce = bin2hex( random_bytes( 8 ) );
2182	2689	foreach ( self::METHODS as $method ) {
2183	2690	$offset = 0;
2184	2691	$search = $method . '[';
	2692	+ // Get filter
2185	2693	while ( ($pos_start = stripos( $where, $search, $offset )) !== false ) {
2186	2694	if ( ($pos_end = stripos( $where, ']', $pos_start )) !== false ) {
2187		- // Get filter
2188	2695	$filter = substr( $where, $pos_start, $pos_end - $pos_start + 1 );
2189	2696	// Get name
2190	2697	$arg_name = substr( $where, $pos_start + strlen( $search ), $pos_end - $pos_start - strlen( $search ) );
2191	2698	// Remove quotes from name
		@@ -2191,44 +2698,36 @@
2191	2698	// Remove quotes from name
2192	2699	if ( substr( $arg_name, 0, 1 ) === "'" && substr( $arg_name, -1 ) === "'" ) {
2193	2700	$arg_name = substr( $arg_name, 1, -1 );
2194	2701	}
2195		- // Remove double quotes from name
	2702	+ // Remove quotes from name
2196	2703	if ( substr( $arg_name, 0, 1 ) === '"' && substr( $arg_name, -1 ) === '"' ) {
2197	2704	$arg_name = substr( $arg_name, 1, -1 );
2198	2705	}
	2706	+ $arg_value = null;
2199	2707	// Handle GET args
2200		- if ( $method === self::METHODS[0] || $method === self::METHODS[2] ) {
	2708	+ if ( $method === self::METHODS[0] && isset( $search_custom['get'][$arg_name] ) ) {
	2709	+ $arg_value = sanitize_text_field( wp_unslash( $search_custom['get'][$arg_name] ) );
	2710	+ } elseif ( $method === self::METHODS[1] && isset( $search_custom['post'][$arg_name] ) ) {
	2711	+ $arg_value = sanitize_text_field( wp_unslash( $search_custom['post'][$arg_name] ) );
	2712	+ } elseif ( $method === self::METHODS[2] ) {
2201	2713	if ( isset( $search_custom['get'][$arg_name] ) ) {
2202	2714	$arg_value = sanitize_text_field( wp_unslash( $search_custom['get'][$arg_name] ) );
2203		- $where = $wpdb->prepare( substr_replace(
2204		- $where,
2205		- '%s',
2206		- $pos_start,
2207		- $pos_end - $pos_start + 1
2208		- ), $arg_value );
2209		- } else {
2210		- if ( $method === self::METHODS[0] ) {
2211		- $where = str_replace( $filter, 'null', $where );
2212		- }
	2715	+ } elseif ( isset( $search_custom['post'][$arg_name] ) ) {
	2716	+ $arg_value = sanitize_text_field( wp_unslash( $search_custom['post'][$arg_name] ) );
2213	2717	}
2214	2718	}
2215	2719	// Handle POST args
2216		- if ( $method === self::METHODS[1] || $method === self::METHODS[2] ) {
2217		- if ( isset( $search_custom['post'][$arg_name] ) ) {
2218		- $arg_value = sanitize_text_field( wp_unslash( $search_custom['post'][$arg_name] ) );
2219		- $where = $wpdb->prepare( substr_replace(
2220		- $where,
2221		- '%s',
2222		- $pos_start,
2223		- $pos_end - $pos_start + 1
2224		- ), $arg_value );
2225		- } else {
2226		- $where = str_replace( $filter, 'null', $where );
2227		- }
	2720	+ $placeholder = '###URL_PLACEHOLDER_' . $nonce . '_' . md5( $filter ) . '###';
	2721	+ $where = str_replace( $filter, $placeholder, $where );
	2722	+ // Handle REQUEST args
	2723	+ if ( $arg_value !== null ) {
	2724	+ $replacements[$placeholder] = $wpdb->prepare( '%s', $arg_value );
	2725	+ } else {
	2726	+ $replacements[$placeholder] = 'null';
2228	2727	}
2229	2728	}
2230		- $offset = $pos_start + 6;
	2729	+ $offset = $pos_start + 1;
2231	2730	if ( $offset > strlen( $where ) ) {
2232	2731	$offset = strlen( $where ) - 1;
2233	2732	}
2234	2733	}
		@@ -2237,21 +2736,16 @@
2237	2736	if ( is_array( $search_params ) && 1 === count( $search_params ) ) {
2238	2737	$filter_field_name = $this->sanitize_db_identifier( array_keys( $search_params )[0] );
2239	2738	$filter_field_value = sanitize_text_field( $search_params[$filter_field_name] );
2240	2739	$filter_field_name_array = array_map( 'trim', explode( ',', $filter_field_name ) );
2241		- //phpcs:ignore - 8.1 proof
2242	2740	$filter_field_value_array = array_map( 'trim', explode( ',', $filter_field_value ) );
2243		- //phpcs:ignore - 8.1 proof
2244	2741	if ( count( $filter_field_name_array ) === count( $filter_field_value_array ) ) {
2245		- //phpcs:ignore - 8.1 proof
2246	2742	// Add filter to where clause.
2247	2743	for ($i = 0; $i < count( $filter_field_name_array ); $i++) {
2248		- // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall, Squiz.PHP.DisallowSizeFunctionsInLoops
2249		- $where .= (( '' === $where ? '' : ' and ' )) . $wpdb->prepare(
2250		- ' `%1s` like %s ',
2251		- // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders
2252		- array($filter_field_name_array[$i], $filter_field_value_array[$i])
2253		- );
	2744	+ $where .= ( '' === $where ? '' : ' and ' );
	2745	+ $placeholder = '###SHORTCODE_PARAM_' . $nonce . '_' . md5( $filter_field_name_array[$i] ) . '###';
	2746	+ $where .= ' `' . $filter_field_name_array[$i] . '` like ' . $placeholder;
	2747	+ $replacements[$placeholder] = $wpdb->prepare( '%s', $filter_field_value_array[$i] );
2254	2748	}
2255	2749	}
2256	2750	}
2257	2751	// Substitute all shortcode parameters
		@@ -2258,13 +2752,11 @@
2258	2752	if ( is_array( $shortcode_params ) ) {
2259	2753	foreach ( $shortcode_params as $column_name => $column_value ) {
2260	2754	$occurences = substr_count( strtolower( $where ), strtolower( "shortcodeParam['{$column_name}']" ) );
2261	2755	if ( 0 < $occurences ) {
2262		- $column_values = array();
2263		- for ($i = 0; $i < $occurences; $i++) {
2264		- $column_values[] = sanitize_text_field( $column_value );
2265		- }
2266		- $where = $wpdb->prepare( str_ireplace( "shortcodeParam['{$column_name}']", '%s', $where ), $column_values );
	2756	+ $placeholder = '###SHORTCODE_PARAM_' . $nonce . '_' . md5( $column_name ) . '###';
	2757	+ $where = str_ireplace( "shortcodeParam['{$column_name}']", $placeholder, $where );
	2758	+ $replacements[$placeholder] = $wpdb->prepare( '%s', sanitize_text_field( $column_value ) );
2267	2759	}
2268	2760	}
2269	2761	}
2270	2762	// Substitute all unused shortcode parameter calls with null
		@@ -2279,8 +2771,18 @@
2279	2771	if ( $offset > strlen( $where ) ) {
2280	2772	$offset = strlen( $where ) - 1;
2281	2773	}
2282	2774	}
2283		- return $where;
	2775	+ // Substitute all dynamic parameters
	2776	+ if ( is_array( $dynamic_params ) && 0 < count( $dynamic_params ) ) {
	2777	+ foreach ( $dynamic_params as $column_name => $column_value ) {
	2778	+ if ( stripos( $where, "{:{$column_name}}" ) !== false ) {
	2779	+ $placeholder = '###DYNAMIC_PARAM_' . $nonce . '_' . md5( $column_name ) . '###';
	2780	+ $where = str_ireplace( "{:{$column_name}}", $placeholder, $where );
	2781	+ $replacements[$placeholder] = $wpdb->prepare( '%s', $column_value );
	2782	+ }
	2783	+ }
	2784	+ }
	2785	+ return strtr( $where, $replacements );
2284	2786	}
2285	2787
2286	2788	}