← All changes | wp-data-access.php +152 -37 5.5.34 → 5.5.84 View file →

		@@ -3,9 +3,9 @@
3	3	/**
4	4	* Plugin Name: WP Data Access
5	5	* Plugin URI: https://wpdataaccess.com/
6	6	* Description: A powerful data-driven App Builder with an intuitive Table Builder, a highly customizable Form Builder and interactive Chart support in 35 languages
7		- * Version: 5.5.34
	7	+ * Version: 5.5.84
8	8	* Author: Passionate Programmers B.V.
9	9	* Author URI: https://wpdataaccess.com/
10	10	* Text Domain: wp-data-access
11	11	* License: GPL-2.0+
		@@ -38,26 +38,27 @@
38	38	if ( !isset( $wpda_freemius ) ) {
39	39	// Create a helper function for easy SDK access.
40	40	require_once dirname( __FILE__ ) . '/vendor/freemius/start.php';
41	41	$wpda_freemius = fs_dynamic_init( array(
42		- 'id' => '6189',
43		- 'slug' => 'wp-data-access',
44		- 'type' => 'plugin',
45		- 'public_key' => 'pk_fc2d1714ca61c930152f6e326b575',
46		- 'is_premium' => false,
47		- 'premium_suffix' => 'Premium',
48		- 'has_addons' => false,
49		- 'has_paid_plans' => true,
50		- 'trial' => array(
	42	+ 'id' => '6189',
	43	+ 'slug' => 'wp-data-access',
	44	+ 'type' => 'plugin',
	45	+ 'public_key' => 'pk_fc2d1714ca61c930152f6e326b575',
	46	+ 'is_premium' => false,
	47	+ 'premium_suffix' => 'Premium',
	48	+ 'has_addons' => false,
	49	+ 'has_paid_plans' => true,
	50	+ 'trial' => array(
51	51	'days' => 14,
52	52	'is_require_payment' => false,
53	53	),
54		- 'menu' => array(
	54	+ 'menu' => array(
55	55	'slug' => 'wpda_navi',
56	56	'contact' => false,
57	57	'network' => true,
58	58	),
59		- 'is_live' => true,
	59	+ 'is_live' => true,
	60	+ 'is_org_compliant' => true,
60	61	) );
61	62	}
62	63	return $wpda_freemius;
63	64	}
		@@ -66,21 +67,67 @@
66	67	wpda_freemius();
67	68	// Signal that SDK was initiated.
68	69	do_action( 'wpda_freemius_loaded' );
69	70	/**
70		- * Change plugin settings info
71		- *
	71	+ * Check if legacy tools are currently used on this server.
	72	+ * @return bool
	73	+ */
	74	+ function wpda_has_legacy_tools_inuse() {
	75	+ $option_legacy_tools = WPDA::get_option( WPDA::OPTION_PLUGIN_LEGACY_TOOLS );
	76	+ $has_legacy_tools = false;
	77	+ if ( !empty( $option_legacy_tools ) && is_array( $option_legacy_tools ) ) {
	78	+ foreach ( $option_legacy_tools as $tool ) {
	79	+ if ( isset( $tool[0] ) && $tool[0] === true && isset( $tool[1] ) && $tool[1] > 0 ) {
	80	+ $has_legacy_tools = true;
	81	+ break;
	82	+ }
	83	+ }
	84	+ }
	85	+ return $has_legacy_tools;
	86	+ }
	87	+
	88	+ /**
	89	+ * Hook into the plugin_row_meta filter.
72	90	* @param mixed $links Links.
73	91	* @param mixed $file File.
	92	+ * @param mixed $data Data.
74	93	* @return mixed
75	94	*/
76		- function wpda_row_meta( $links, $file ) {
77		- if ( strpos( $file, plugin_basename( __FILE__ ) ) !== false ) {
	95	+ function wpda_row_meta( $links, $file, $data ) {
	96	+ if ( plugin_basename( __FILE__ ) == $file ) {
78	97	// Add settings link.
79	98	$settings_url = admin_url( 'options-general.php' ) . '?page=wpdataaccess';
80		- $settings_link = "<a href='{$settings_url}'>Settings</a>";
	99	+ $settings_link = '<a href="' . esc_url( $settings_url ) . '">Settings</a>';
81	100	array_push( $links, $settings_link );
82		- //phpcs:ignore - 8.1 proof
	101	+ // phpcs:ignore -- 8.1 proof
	102	+ // Add comment for legacy users only
	103	+ if ( wpda_has_legacy_tools_inuse() ) {
	104	+ if ( isset( $data['new_version'] ) ) {
	105	+ $new_version = $data['new_version'];
	106	+ if ( version_compare( $new_version, '6.0', '>=' ) ) {
	107	+ $notice = '
	108	+ <p style="margin-top: 10px; margin-bottom: 0; padding: 6px 10px; border-radius: 2px;"
	109	+ class="update-message notice inline notice-warning notice-alt"
	110	+ >
	111	+ <span class="dashicons dashicons-warning" style="color: #f0b849;"></span>
	112	+ <strong>Warning for legacy users:</strong> Version ' . esc_html( $new_version ) . ' (available now) removes legacy tools.
	113	+ <strong style="color: #cc1818;">Stay on Version 5.x</strong> to keep using them.
	114	+ <a href="https://docs.legacy.wpdataaccess.com/docs/deprecating/" target="_blank">Read more →</a>
	115	+ </p>';
	116	+ } else {
	117	+ $notice = '
	118	+ <p style="margin-top: 10px; margin-bottom: 0; padding: 6px 10px; border-radius: 2px;"
	119	+ class="update-message notice inline notice-info notice-alt"
	120	+ >
	121	+ <span class="dashicons dashicons-info" style="color: #3858e9;"></span>
	122	+ <strong>Info for legacy users:</strong> Version 6 is coming soon and removes legacy tools.
	123	+ <strong>Stay on Version 5.x</strong> to keep using them.
	124	+ <a href="https://docs.legacy.wpdataaccess.com/docs/deprecating/" target="_blank">Read more →</a>
	125	+ </p>';
	126	+ }
	127	+ $links[] = $notice;
	128	+ }
	129	+ }
83	130	}
84	131	return $links;
85	132	}
86	133
		@@ -87,22 +134,75 @@
87	134	add_filter(
88	135	'plugin_row_meta',
89	136	'wpda_row_meta',
90	137	10,
91		- 2
	138	+ 3
92	139	);
93	140	/**
	141	+ * Remove last | character from plugin links.
	142	+ * @return void
	143	+ */
	144	+ function wpda_clean_plugin_row_script() {
	145	+ if ( !wpda_has_legacy_tools_inuse() ) {
	146	+ return;
	147	+ }
	148	+ ?>
	149	+ <script type="text/javascript">
	150	+ jQuery(document).ready(function($) {
	151	+ var $row = $('tr[data-slug="wp-data-access"] .plugin-version-author-uri');
	152	+ if ($row.length) {
	153	+ $row.contents().each(function(index) {
	154	+ if (this.nodeType === 3 && index === 6) {
	155	+ this.nodeValue = this.nodeValue.replace(/\|/g, '');
	156	+ }
	157	+ });
	158	+ }
	159	+ });
	160	+ </script>
	161	+ <?php
	162	+ }
	163	+
	164	+ add_action( 'admin_footer-plugins.php', 'wpda_clean_plugin_row_script' );
	165	+ /**
	166	+ * Show legacy tools info widget.
	167	+ * @return void
	168	+ */
	169	+ function wpda_legacy_tools_notice_widget() {
	170	+ // Add widget for legacy users only
	171	+ if ( wpda_has_legacy_tools_inuse() ) {
	172	+ wp_add_dashboard_widget( 'wporg_dashboard_widget', 'WP Data Access - Info for legacy tools users', function () {
	173	+ ?>
	174	+ <p>
	175	+ Version 6 is coming soon and removes legacy tools.
	176	+ </p>
	177	+ <p>
	178	+ <strong>To keep using the legacy tools:</strong><br>
	179	+ ✓ Stay on the latest Version 5.x<br>
	180	+ ✓ Disable auto-updates<br>
	181	+ ✓ Do not update manually to Version 6
	182	+ </p>
	183	+ <p>
	184	+ <a href="https://docs.legacy.wpdataaccess.com/docs/deprecating/" target="_blank">Read more →</a>
	185	+ </p>
	186	+ <?php
	187	+ } );
	188	+ }
	189	+ }
	190	+
	191	+ add_action( 'wp_dashboard_setup', 'wpda_legacy_tools_notice_widget' );
	192	+ /**
94	193	* Activate plugin
95	194	*
96	195	* @author Peter Schulz
97	196	* @since 1.0.0
98	197	*/
99		- function activate_wp_data_access() {
	198	+ function wpda_activate() {
	199	+ // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
100	200	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wp-data-access-switch.php';
101	201	WP_Data_Access_Switch::activate();
102	202	}
103	203
104		- register_activation_hook( __FILE__, 'activate_wp_data_access' );
	204	+ register_activation_hook( __FILE__, 'wpda_activate' );
105	205	/**
106	206	* Deactivate plugin
107	207	*
108	208	* @author Peter Schulz
		@@ -107,14 +207,15 @@
107	207	*
108	208	* @author Peter Schulz
109	209	* @since 1.0.0
110	210	*/
111		- function deactivate_wp_data_access() {
	211	+ function wpda_deactivate() {
	212	+ // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
112	213	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wp-data-access-switch.php';
113	214	WP_Data_Access_Switch::deactivate();
114	215	}
115	216
116		- register_deactivation_hook( __FILE__, 'deactivate_wp_data_access' );
	217	+ register_deactivation_hook( __FILE__, 'wpda_deactivate' );
117	218	/**
118	219	* Check if database needs to be updated
119	220	*
120	221	* @author Peter Schulz
		@@ -121,9 +222,9 @@
121	222	* @since 1.5.2
122	223	*/
123	224	function wpda_update_db_check() {
124	225	if ( get_option( WPDataAccess\WPDA::OPTION_WPDA_VERSION[0] ) !== WPDataAccess\WPDA::OPTION_WPDA_VERSION[1] ) {
125		- activate_wp_data_access();
	226	+ wpda_activate();
126	227	}
127	228	}
128	229
129	230	add_action( 'plugins_loaded', 'wpda_update_db_check' );
		@@ -132,8 +233,9 @@
132	233	*
133	234	* This functions is called when the plugin is uninstalled. The following actions are performed:
134	235	* + Drop plugin tables (unless settings indicate not to)
135	236	* + Delete plugin options from $wpdb->options (unless settings indicate not to)
	237	+ * + Unscheduled all WP Data Access events
136	238	*
137	239	* Actions are processed on the current blog and are repeated for every blog on a multisite installation. Must be
138	240	* called from the dashboard (WP_UNINSTALL_PLUGIN defined). User must have the proper privileges (activate_plugins).
139	241	*
		@@ -142,8 +244,9 @@
142	244	*/
143	245	function wpda_uninstall_blog() {
144	246	global $wpdb;
145	247	$drop_tables = get_option( 'wpda_uninstall_tables' );
	248	+ // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQLPlaceholders, WordPress.DB.DirectDatabaseQuery.SchemaChange
146	249	if ( 'on' === $drop_tables ) {
147	250	// Get all plugin table names (without WP prefix).
148	251	$plugin_tables = WPDataAccess\WPDA::get_wpda_tables();
149	252	foreach ( $plugin_tables as $plugin_table ) {
		@@ -148,13 +251,9 @@
148	251	$plugin_tables = WPDataAccess\WPDA::get_wpda_tables();
149	252	foreach ( $plugin_tables as $plugin_table ) {
150	253	// Loop through plugin tables.
151	254	// Drop plugin table.
152		- $wpdb->query( $wpdb->prepare(
153		- 'DROP TABLE IF EXISTS `%1s`',
154		- // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders, WordPress.DB.DirectDatabaseQuery.SchemaChange
155		- WPDataAccess\WPDA::remove_backticks( $plugin_table )
156		- ) );
	255	+ $wpdb->query( $wpdb->prepare( 'DROP TABLE IF EXISTS `%1s`', WPDataAccess\WPDA::remove_backticks( $plugin_table ) ) );
157	256	// db call ok; no-cache ok.
158	257	// Get plugin backup tables (if applicable).
159	258	$backup_tables = $wpdb->get_results( $wpdb->prepare( '
160	259	select table_name as table_name from information_schema.tables
		@@ -163,13 +262,9 @@
163	262	', array($wpdb->dbname, "{$plugin_table}_BACKUP_%") ), 'ARRAY_A' );
164	263	// db call ok; no-cache ok.
165	264	foreach ( $backup_tables as $backup_table ) {
166	265	// Drop plugin backup table.
167		- $wpdb->query( $wpdb->prepare(
168		- 'DROP TABLE IF EXISTS `%1s`',
169		- // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders, WordPress.DB.DirectDatabaseQuery.SchemaChange
170		- WPDataAccess\WPDA::remove_backticks( $backup_table['table_name'] )
171		- ) );
	266	+ $wpdb->query( $wpdb->prepare( 'DROP TABLE IF EXISTS `%1s`', WPDataAccess\WPDA::remove_backticks( $backup_table['table_name'] ) ) );
172	267	// db call ok; no-cache ok.
173	268	}
174	269	}
175	270	}
		@@ -180,10 +275,24 @@
180	275	// db call ok; no-cache ok.
181	276	$wpdb->query( "\n\t\t\t\t\tDELETE FROM {$wpdb->usermeta}\n\t\t\t\t\tWHERE meta_key LIKE 'wpda%'\n\t\t\t\t\t OR meta_key LIKE '%wp-data-access%'\n\t\t\t\t" );
182	277	// db call ok; no-cache ok.
183	278	}
	279	+ // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQLPlaceholders, WordPress.DB.DirectDatabaseQuery.SchemaChange
184	280	}
185	281
	282	+ function wpda_unschedule_event( $hook ) {
	283	+ $crons = _get_cron_array();
	284	+ foreach ( $crons as $timestamp => $cron ) {
	285	+ if ( isset( $cron[$hook] ) ) {
	286	+ foreach ( $cron[$hook] as $event ) {
	287	+ if ( isset( $event['args'] ) ) {
	288	+ wp_unschedule_event( $timestamp, $hook, $event['args'] );
	289	+ }
	290	+ }
	291	+ }
	292	+ }
	293	+ }
	294	+
186	295	/**
187	296	* Uninstall WP Data Access tables, options and meta keys
188	297	*
189	298	* @return void
		@@ -191,10 +300,11 @@
191	300	function wpda_uninstall() {
192	301	if ( is_multisite() ) {
193	302	global $wpdb;
194	303	// Uninstall plugin for all blogs one by one (will fail silently for blogs having no plugin tables/options).
	304	+ // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQLPlaceholders, WordPress.DB.DirectDatabaseQuery.SchemaChange
195	305	$blogids = $wpdb->get_col( "select blog_id from {$wpdb->blogs}" );
196		- // db call ok; no-cache ok.
	306	+ // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQLPlaceholders, WordPress.DB.DirectDatabaseQuery.SchemaChange
197	307	foreach ( $blogids as $blog_id ) {
198	308	// Uninstall blog.
199	309	switch_to_blog( $blog_id );
200	310	wpda_uninstall_blog();
		@@ -204,8 +314,12 @@
204	314	// Uninstall on single site installation.
205	315	wpda_uninstall_blog();
206	316	}
207	317	WPDA::wpda_delete_content_folder();
	318	+ // Unscheduled all WP Data Access events
	319	+ wpda_unschedule_event( 'wpda_data_backup' );
	320	+ wpda_unschedule_event( \WPDataAccess\Query_Builder\WPDA_Query_Builder_Scheduler::SCHEDULER_HOOK_NAME );
	321	+ wpda_unschedule_event( \WPDataAccess\Utilities\WPDA_Export_Scheduler::SCHEDULER_HOOK_NAME );
208	322	}
209	323
210	324	wpda_freemius()->add_action( 'after_uninstall', 'wpda_uninstall' );
211	325	/**
		@@ -223,12 +337,13 @@
223	337	*
224	338	* @author Peter Schulz
225	339	* @since 1.0.0
226	340	*/
227		- function run_wp_data_access() {
	341	+ function wpda_run() {
	342	+ // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound
228	343	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wp-data-access.php';
229	344	$wpdataaccess = new WP_Data_Access();
230	345	$wpdataaccess->run();
231	346	}
232	347
233		- run_wp_data_access();
	348	+ wpda_run();
234	349	}