← All changes | formidable.php +57 -33 6.5 → 6.23 View file →

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