← All changes | formidable.php +76 -26 6.3.2 → 6.22.2 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.3.2
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.22.2
	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
52		-if ( is_array( spl_autoload_functions() ) && in_array( '__autoload', spl_autoload_functions() ) ) {
	53	+// If __autoload is active, put it on the spl_autoload stack.
	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,10 +77,11 @@
75	77	*
76	78	* @return void
77	79	*/
78	80	function frm_class_autoloader( $class_name, $filepath ) {
79		- $deprecated = array( 'FrmEntryFormat', 'FrmPointers', 'FrmEDD_SL_Plugin_Updater' );
80		- $is_deprecated = in_array( $class_name, $deprecated ) || preg_match( '/^.+Deprecate/', $class_name );
	81	+ $deprecated = array( 'FrmEDD_SL_Plugin_Updater' );
	82	+ $is_deprecated = in_array( $class_name, $deprecated, true ) || preg_match( '/^.+Deprecate/', $class_name );
	83	+ $original_filepath = $filepath;
81	84
82	85	if ( $is_deprecated ) {
83	86	$filepath .= '/deprecated/';
84	87	} else {
		@@ -84,12 +87,14 @@
84	87	} else {
85	88	$filepath .= '/classes/';
86	89	if ( preg_match( '/^.+Helper$/', $class_name ) ) {
87	90	$filepath .= 'helpers/';
88		- } else if ( preg_match( '/^.+Controller$/', $class_name ) ) {
	91	+ } elseif ( preg_match( '/^.+Controller$/', $class_name ) ) {
89	92	$filepath .= 'controllers/';
90		- } else if ( preg_match( '/^.+Factory$/', $class_name ) ) {
	93	+ } elseif ( preg_match( '/^.+Factory$/', $class_name ) ) {
91	94	$filepath .= 'factories/';
	95	+ } elseif ( preg_match( '/^.+StyleComponent$/', $class_name ) ) {
	96	+ $filepath .= 'views/styles/components/';
92	97	} else {
93	98	$filepath .= 'models/';
94	99	if ( strpos( $class_name, 'Field' ) && ! file_exists( $filepath . $class_name . '.php' ) ) {
95	100	$filepath .= 'fields/';
		@@ -96,28 +101,73 @@
96	101	}
97	102	}
98	103	}
99	104
100		- $filepath .= $class_name . '.php';
	105	+ if ( file_exists( $filepath . $class_name . '.php' ) ) {
	106	+ require $filepath . $class_name . '.php';
	107	+ return;
	108	+ }
101	109
102		- if ( file_exists( $filepath ) ) {
103		- require( $filepath );
	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	+
	127	+ return;
104	128	}
	129	+
	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	+ }
	139	+
	140	+ $filepath .= $class_name . '.php';
	141	+
	142	+ if ( file_exists( $filepath ) ) {
	143	+ require $filepath;
	144	+ }
	145	+ }
105	146	}
106	147
107	148	add_action( 'activate_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'frm_maybe_install' );
	149	+
108	150	/**
	151	+ * This function is triggered when Formidable is activated.
	152	+ *
109	153	* @return void
110	154	*/
111	155	function frm_maybe_install() {
112		- if ( get_transient( FrmWelcomeController::$option_name ) !== 'no' ) {
113		- 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	+ );
114	162	}
	163	+
	164	+ FrmAppController::handle_activation();
115	165	}
116	166
117	167	register_deactivation_hook(
118	168	__FILE__,
119		- function() {
	169	+ function () {
120	170	if ( ! class_exists( 'FrmCronController', false ) ) {
121	171	require_once __DIR__ . '/classes/controllers/FrmCronController.php';
122	172	}
123	173