← All changes | classes/models/FrmUsage.php +9 -55 6.26 → 6.16.1.2 View file →

		@@ -44,11 +44,8 @@
44	44	}
45	45
46	46	/**
47	47	* @since 3.06.04
48		- *
49		- * @param bool $regenerate
50		- *
51	48	* @return string
52	49	*/
53	50	public function uuid( $regenerate = false ) {
54	51	$uuid_key = 'frm-usage-uuid';
		@@ -65,9 +62,8 @@
65	62	}
66	63
67	64	/**
68	65	* @since 3.06.04
69		- *
70	66	* @return array
71	67	*/
72	68	public function snapshot() {
73	69	global $wpdb, $wp_version;
		@@ -99,18 +95,13 @@
99	95	'fields' => $this->fields(),
100	96	'actions' => $this->actions(),
101	97
102	98	'onboarding-wizard' => $this->onboarding_wizard(),
103		- 'welcome-tour' => FrmWelcomeTourController::get_usage_data(),
104	99	'flows' => FrmUsageController::get_flows_data(),
105	100	'payments' => $this->payments(),
106	101	'subscriptions' => $this->payments( 'frm_subscriptions' ),
107	102	);
108	103
109		- if ( method_exists( 'FrmProAddonsController', 'get_readable_license_type' ) ) {
110		- $snap['active_license'] = FrmProAddonsController::get_readable_license_type();
111		- }
112		-
113	104	return apply_filters( 'frm_usage_snapshot', $snap );
114	105	}
115	106
116	107	/**
		@@ -142,22 +133,16 @@
142	133	*
143	134	* @since 6.16.1
144	135	*
145	136	* @param string $table Database table name.
146		- *
147	137	* @return array
148	138	*/
149	139	private function payments( $table = 'frm_payments' ) {
150	140	$allowed_tables = array( 'frm_payments', 'frm_subscriptions' );
151		-
152	141	if ( ! in_array( $table, $allowed_tables, true ) ) {
153	142	return array();
154	143	}
155	144
156		- if ( ! FrmTransLiteAppHelper::payments_table_exists() ) {
157		- return array();
158		- }
159		-
160	145	global $wpdb;
161	146	$rows = $wpdb->get_results(
162	147	$wpdb->prepare(
163	148	'SELECT amount, status, paysys, created_at FROM %1$s',
		@@ -165,9 +150,8 @@
165	150	)
166	151	);
167	152
168	153	$payments = array();
169		-
170	154	foreach ( $rows as $row ) {
171	155	$payments[] = array(
172	156	'amount' => (float) $row->amount,
173	157	'status' => $row->status,
		@@ -180,9 +164,8 @@
180	164	}
181	165
182	166	/**
183	167	* @since 3.06.04
184		- *
185	168	* @return array
186	169	*/
187	170	private function plugins() {
188	171	$plugin_list = FrmAppHelper::get_plugins();
		@@ -187,9 +170,8 @@
187	170	private function plugins() {
188	171	$plugin_list = FrmAppHelper::get_plugins();
189	172
190	173	$plugins = array();
191		-
192	174	foreach ( $plugin_list as $slug => $info ) {
193	175	$plugins[] = array(
194	176	'name' => $info['Name'],
195	177	'slug' => $slug,
		@@ -204,9 +186,8 @@
204	186	/**
205	187	* Add global settings to tracking data.
206	188	*
207	189	* @since 3.06.04
208		- *
209	190	* @return array
210	191	*/
211	192	private function settings() {
212	193	$settings_list = FrmAppHelper::get_settings();
		@@ -215,9 +196,11 @@
215	196	'permissions' => $this->permissions( $settings_list ),
216	197	);
217	198	$pass_settings = array(
218	199	'load_style',
	200	+ 'use_html',
219	201	'fade_form',
	202	+ 'jquery_css',
220	203	're_type',
221	204	're_lang',
222	205	're_multi',
223	206	'menu',
		@@ -222,20 +205,11 @@
222	205	're_multi',
223	206	'menu',
224	207	'mu_menu',
225	208	'no_ips',
226		- 'custom_header_ip',
227		- 'enable_gdpr',
228		- 'no_gdpr_cookies',
229	209	'btsp_css',
230		- 'btsp_version',
	210	+ 'btsp_errors',
231	211	'admin_bar',
232		- 'summary_emails',
233		- 'active_captcha',
234		- 'honeypot',
235		- 'wp_spam_check',
236		- 'denylist_check',
237		- 'email_style',
238	212	);
239	213
240	214	foreach ( $pass_settings as $setting ) {
241	215	if ( isset( $settings_list->$setting ) ) {
		@@ -256,9 +230,8 @@
256	230	*
257	231	* @since 3.06.04
258	232	*
259	233	* @param FrmSettings $settings_list
260		- *
261	234	* @return array
262	235	*/
263	236	private function messages( $settings_list ) {
264	237	$messages = array(
		@@ -271,14 +244,11 @@
271	244	'login_msg',
272	245	'admin_permission',
273	246	);
274	247
275		- $default = $settings_list->default_options();
276		-
277	248	$message_settings = array();
278		-
279	249	foreach ( $messages as $message ) {
280		- $message_settings[ 'changed-' . $message ] = $settings_list->$message === $default[ $message ] ? 0 : 1;
	250	+ $message_settings[ $message ] = $settings_list->$message;
281	251	}
282	252
283	253	return $message_settings;
284	254	}
		@@ -288,9 +258,8 @@
288	258	*
289	259	* @since 3.06.04
290	260	*
291	261	* @param FrmSettings $settings_list
292		- *
293	262	* @return array
294	263	*/
295	264	private function permissions( $settings_list ) {
296	265	$permissions = array();
		@@ -306,9 +275,8 @@
306	275	}
307	276
308	277	/**
309	278	* @since 3.06.04
310		- *
311	279	* @return array
312	280	*/
313	281	private function forms() {
314	282	$s_query = array(
		@@ -323,10 +291,10 @@
323	291	$forms = array();
324	292	$settings = array(
325	293	'form_class',
326	294	'akismet',
	295	+ 'honeypot',
327	296	'antispam',
328		- 'stopforumspam',
329	297	'custom_style',
330	298	'success_action',
331	299	'show_form',
332	300	'no_save',
		@@ -356,9 +324,8 @@
356	324	'submit_conditions',
357	325	);
358	326
359	327	$style = new FrmStyle();
360		-
361	328	foreach ( $saved_forms as $form ) {
362	329	$new_form = array(
363	330	'form_id' => $form->id,
364	331	'description' => $form->description,
		@@ -399,17 +366,14 @@
399	366	}
400	367
401	368	/**
402	369	* @since 3.06.04
403		- *
404		- * @param int|string $form_id Form ID.
405		- *
406	370	* @return int
407	371	*/
408	372	private function form_field_count( $form_id ) {
409	373	global $wpdb;
410	374
411		- $join = $wpdb->prefix . 'frm_fields fi JOIN ' . $wpdb->prefix . 'frm_forms fo ON (fi.form_id=fo.id)';
	375	+ $join = $wpdb->prefix . 'frm_fields fi LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fo ON (fi.form_id=fo.id)';
412	376
413	377	$field_query = array(
414	378	'or' => 1,
415	379	'fi.form_id' => $form_id,
		@@ -420,11 +384,8 @@
420	384	}
421	385
422	386	/**
423	387	* @since 3.06.04
424		- *
425		- * @param int|string $form_id Form ID.
426		- *
427	388	* @return int
428	389	*/
429	390	private function form_action_count( $form_id ) {
430	391	$args = array(
		@@ -440,9 +401,8 @@
440	401	/**
441	402	* Get the last 100 fields created.
442	403	*
443	404	* @since 3.06.04
444		- *
445	405	* @return array
446	406	*/
447	407	private function fields() {
448	408	$args = array(
		@@ -449,10 +409,9 @@
449	409	'limit' => 50,
450	410	'order_by' => 'id DESC',
451	411	);
452	412
453		- $fields = FrmDb::get_results( 'frm_fields', array(), 'id, form_id, name, type, field_options', $args );
454		-
	413	+ $fields = FrmDb::get_results( 'frm_fields', array(), 'form_id, name, type, field_options', $args );
455	414	foreach ( $fields as $k => $field ) {
456	415	FrmAppHelper::unserialize_or_decode( $field->field_options );
457	416	$fields[ $k ]->field_options = json_encode( $field->field_options );
458	417	}
		@@ -460,9 +419,8 @@
460	419	}
461	420
462	421	/**
463	422	* @since 3.06.04
464		- *
465	423	* @return array
466	424	*/
467	425	private function actions() {
468	426	$args = array(
		@@ -472,9 +430,8 @@
472	430
473	431	$actions = array();
474	432
475	433	$saved_actions = FrmDb::check_cache( json_encode( $args ), 'frm_actions', $args, 'get_posts' );
476		-
477	434	foreach ( $saved_actions as $action ) {
478	435	$actions[] = array(
479	436	'form_id' => $action->menu_order,
480	437	'type' => $action->post_excerpt,
		@@ -487,20 +444,17 @@
487	444	}
488	445
489	446	/**
490	447	* @since 3.06.04
491		- *
492	448	* @return bool
493	449	*/
494	450	private function tracking_allowed() {
495		- return FrmUsageController::tracking_allowed();
	451	+ $settings = FrmAppHelper::get_settings();
	452	+ return $settings->tracking;
496	453	}
497	454
498	455	/**
499	456	* @since 3.06.04
500		- *
501		- * @param mixed $value Value.
502		- *
503	457	* @return string
504	458	*/
505	459	private function maybe_json( $value ) {
506	460	return is_array( $value ) ? json_encode( $value ) : $value;