← All changes | formidable.php +33 -57 6.25 → 6.7 View file →

		@@ -1,16 +1,14 @@
1	1	<?php
2		-/**
3		- * Plugin Name: Formidable Forms
4		- * Description: Quickly and easily create drag-and-drop forms
5		- * Version: 6.25
6		- * Plugin URI: https://formidableforms.com/
7		- * Author URI: https://formidableforms.com/
8		- * Author: Strategy11 Form Builder Team
9		- * Text Domain: formidable
10		- *
11		- * @package Formidable
12		- */
	2	+/*
	3	+Plugin Name: Formidable Forms
	4	+Description: Quickly and easily create drag-and-drop forms
	5	+Version: 6.7
	6	+Plugin URI: https://formidableforms.com/
	7	+Author URI: https://formidableforms.com/
	8	+Author: Strategy11 Form Builder Team
	9	+Text Domain: formidable
	10	+*/
13	11
14	12	/*
15	13	Copyright 2010 Formidable Forms
16	14
		@@ -41,22 +39,22 @@
41	39	'pro_is_authorized' => false,
42	40	);
43	41
44	42	// For reverse compatibility. Load Pro if it's still nested.
45		- $frm_path = __DIR__;
	43	+ $frm_path = dirname( __FILE__ );
46	44	if ( file_exists( $frm_path . '/pro/formidable-pro.php' ) ) {
47		- include $frm_path . '/pro/formidable-pro.php';
	45	+ include( $frm_path . '/pro/formidable-pro.php' );
48	46	}
49	47
50	48	FrmHooksController::trigger_load_hook();
51	49	}
52	50
53		-// If __autoload is active, put it on the spl_autoload stack.
	51	+// if __autoload is active, put it on the spl_autoload stack
54	52	if ( is_array( spl_autoload_functions() ) && in_array( '__autoload', spl_autoload_functions(), true ) ) {
55	53	spl_autoload_register( '__autoload' );
56	54	}
57	55
58		-// Add the autoloader.
	56	+// Add the autoloader
59	57	spl_autoload_register( 'frm_forms_autoloader' );
60	58
61	59	/**
62	60	* @return void
		@@ -61,14 +59,14 @@
61	59	/**
62	60	* @return void
63	61	*/
64	62	function frm_forms_autoloader( $class_name ) {
65		- // Only load Frm classes here.
	63	+ // Only load Frm classes here
66	64	if ( ! preg_match( '/^Frm.+$/', $class_name ) || preg_match( '/^FrmPro.+$/', $class_name ) ) {
67	65	return;
68	66	}
69	67
70		- frm_class_autoloader( $class_name, __DIR__ );
	68	+ frm_class_autoloader( $class_name, dirname( __FILE__ ) );
71	69	}
72	70
73	71	/**
74	72	* Autoload the Formidable and Pro classes
		@@ -77,9 +75,9 @@
77	75	*
78	76	* @return void
79	77	*/
80	78	function frm_class_autoloader( $class_name, $filepath ) {
81		- $deprecated = array( 'FrmEDD_SL_Plugin_Updater' );
	79	+ $deprecated = array( 'FrmPointers', 'FrmEDD_SL_Plugin_Updater' );
82	80	$is_deprecated = in_array( $class_name, $deprecated, true ) || preg_match( '/^.+Deprecate/', $class_name );
83	81	$original_filepath = $filepath;
84	82
85	83	if ( $is_deprecated ) {
		@@ -91,10 +89,8 @@
91	89	} elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
92	90	$filepath .= 'controllers/';
93	91	} elseif ( preg_match( '/^.+Factory$/', $class_name ) ) {
94	92	$filepath .= 'factories/';
95		- } elseif ( preg_match( '/^.+StyleComponent$/', $class_name ) ) {
96		- $filepath .= 'views/styles/components/';
97	93	} else {
98	94	$filepath .= 'models/';
99	95	if ( strpos( $class_name, 'Field' ) && ! file_exists( $filepath . $class_name . '.php' ) ) {
100	96	$filepath .= 'fields/';
		@@ -106,43 +102,27 @@
106	102	require $filepath . $class_name . '.php';
107	103	return;
108	104	}
109	105
110		- if ( preg_match( '/^FrmStrpLite.+$/', $class_name ) || preg_match( '/^FrmTransLite.+$/', $class_name ) ) {
111		- // Autoload for /stripe/ folder.
112		- $filepath = $original_filepath . '/stripe/';
113		- if ( preg_match( '/^.+Helper$/', $class_name ) ) {
114		- $filepath .= 'helpers/';
115		- } elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
116		- $filepath .= 'controllers/';
117		- } else {
118		- $filepath .= 'models/';
119		- }
120		-
121		- $filepath .= $class_name . '.php';
122		-
123		- if ( file_exists( $filepath ) ) {
124		- require $filepath;
125		- }
126		-
	106	+ if ( ! preg_match( '/^FrmStrpLite.+$/', $class_name ) && ! preg_match( '/^FrmTransLite.+$/', $class_name ) ) {
	107	+ // Exit early if the class does not match the Stripe Lite prefix.
127	108	return;
128	109	}
129	110
130		- if ( preg_match( '/^FrmSquareLite.+$/', $class_name ) ) {
131		- $filepath = $original_filepath . '/square/';
132		- if ( preg_match( '/^.+Helper$/', $class_name ) ) {
133		- $filepath .= 'helpers/';
134		- } elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
135		- $filepath .= 'controllers/';
136		- } else {
137		- $filepath .= 'models/';
138		- }
	111	+ // Autoload for /stripe/ folder.
	112	+ $filepath = $original_filepath . '/stripe/';
	113	+ if ( preg_match( '/^.+Helper$/', $class_name ) ) {
	114	+ $filepath .= 'helpers/';
	115	+ } elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
	116	+ $filepath .= 'controllers/';
	117	+ } else {
	118	+ $filepath .= 'models/';
	119	+ }
139	120
140		- $filepath .= $class_name . '.php';
	121	+ $filepath .= $class_name . '.php';
141	122
142		- if ( file_exists( $filepath ) ) {
143		- require $filepath;
144		- }
	123	+ if ( file_exists( $filepath ) ) {
	124	+ require $filepath;
145	125	}
146	126	}
147	127
148	128	add_action( 'activate_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'frm_maybe_install' );
		@@ -152,14 +132,10 @@
152	132	*
153	133	* @return void
154	134	*/
155	135	function frm_maybe_install() {
156		- if ( get_transient( FrmOnboardingWizardController::TRANSIENT_NAME ) !== 'no' ) {
157		- set_transient(
158		- FrmOnboardingWizardController::TRANSIENT_NAME,
159		- FrmOnboardingWizardController::TRANSIENT_VALUE,
160		- 60
161		- );
	136	+ if ( get_transient( FrmWelcomeController::$option_name ) !== 'no' ) {
	137	+ set_transient( FrmWelcomeController::$option_name, FrmWelcomeController::$menu_slug, 60 );
162	138	}
163	139
164	140	FrmAppController::handle_activation();
165	141	}
		@@ -165,9 +141,9 @@
165	141	}
166	142
167	143	register_deactivation_hook(
168	144	__FILE__,
169		- function () {
	145	+ function() {
170	146	if ( ! class_exists( 'FrmCronController', false ) ) {
171	147	require_once __DIR__ . '/classes/controllers/FrmCronController.php';
172	148	}
173	149