← All changes | plugin-loader.php +20 -34 2.9.0 → 1.7.3 View file →

		@@ -9,12 +9,10 @@
9	9	namespace SRFM;
10	10
11	11	use SRFM\Admin\Admin;
12	12	use SRFM\Admin\Analytics;
13		-use SRFM\Admin\Notice_Manager;
14		-use SRFM\Inc\Abilities\Abilities_Registrar;
	13	+use SRFM\API\Block_Patterns;
15	14	use SRFM\Inc\Activator;
16		-use SRFM\Inc\Admin\Editor_Nudge;
17	15	use SRFM\Inc\Admin_Ajax;
18	16	use SRFM\Inc\AI_Form_Builder\AI_Auth;
19	17	use SRFM\Inc\AI_Form_Builder\AI_Form_Builder;
20	18	use SRFM\Inc\AI_Form_Builder\AI_Helper;
		@@ -23,12 +21,10 @@
23	21	use SRFM\Inc\Blocks\Register;
24	22	use SRFM\Inc\Compatibility\Themes\Astra;
25	23	use SRFM\Inc\Create_New_Form;
26	24	use SRFM\Inc\Database\Register as DatabaseRegister;
27		-use SRFM\Inc\Duplicate_Form;
28	25	use SRFM\Inc\Events_Scheduler;
29	26	use SRFM\Inc\Export;
30		-use SRFM\Inc\Form_Restriction;
31	27	use SRFM\Inc\Form_Submit;
32	28	use SRFM\Inc\Forms_Data;
33	29	use SRFM\Inc\Frontend_Assets;
34	30	use SRFM\Inc\Generate_Form_Markup;
		@@ -33,19 +29,16 @@
33	29	use SRFM\Inc\Frontend_Assets;
34	30	use SRFM\Inc\Generate_Form_Markup;
35	31	use SRFM\Inc\Global_Settings\Email_Summary;
36	32	use SRFM\Inc\Global_Settings\Global_Settings;
37		-use SRFM\Inc\Global_Settings\Global_Settings_Defaults;
38	33	use SRFM\Inc\Gutenberg_Hooks;
39	34	use SRFM\Inc\Helper;
40		-use SRFM\Inc\Learn;
41		-use SRFM\Inc\Onboarding;
	35	+use SRFM\Inc\Lib\SRFM_Nps_Survey;
	36	+use SRFM\Inc\Nps_Notice;
42	37	use SRFM\Inc\Page_Builders\Page_Builders;
43		-use SRFM\Inc\Payments\Payments;
44	38	use SRFM\Inc\Post_Types;
45	39	use SRFM\Inc\Rest_Api;
46	40	use SRFM\Inc\Single_Form_Settings\Compliance_Settings;
47		-use SRFM\Inc\Single_Form_Settings\Form_Settings_Api;
48	41	use SRFM\Inc\Smart_Tags;
49	42	use SRFM\Inc\Updater;
50	43
51	44	if ( ! defined( 'ABSPATH' ) ) {
		@@ -144,24 +137,18 @@
144	137	[ '', '$1-$2', '-', DIRECTORY_SEPARATOR ],
145	138	$class
146	139	);
147	140
148		- if ( ! is_string( $filename ) ) {
149		- return;
150		- }
	141	+ if ( is_string( $filename ) ) {
151	142
152		- // Check for directory traversal.
153		- if ( strpos( $filename, '..' ) !== false ) {
154		- return;
155		- }
	143	+ $filename = strtolower( $filename );
156	144
157		- $filename = strtolower( $filename );
	145	+ $file = SRFM_DIR . $filename . '.php';
158	146
159		- $file = SRFM_DIR . $filename . '.php';
160		-
161		- // if the file is readable, include it.
162		- if ( is_readable( $file ) ) {
163		- require_once $file;
	147	+ // if the file is readable, include it.
	148	+ if ( is_readable( $file ) ) {
	149	+ require_once $file;
	150	+ }
164	151	}
165	152	}
166	153
167	154	/**
		@@ -212,15 +199,9 @@
212	199
213	200	Register::get_instance();
214	201	if ( is_admin() ) {
215	202	Admin::get_instance();
216		- // phpcs:ignore /** @phpstan-ignore-next-line */ -- Class is loaded dynamically in WordPress
217		- Notice_Manager::get_instance();
218		- Editor_Nudge::get_instance();
219	203	}
220		- Payments::get_instance();
221		- Duplicate_Form::get_instance();
222		- Learn::get_instance();
223	204	}
224	205
225	206	/**
226	207	* Load Plugin Text Domain.
		@@ -285,8 +266,9 @@
285	266	*/
286	267	public function load_plugin() {
287	268	Post_Types::get_instance();
288	269	Form_Submit::get_instance();
	270	+ Block_Patterns::get_instance();
289	271	Gutenberg_Hooks::get_instance();
290	272	Frontend_Assets::get_instance();
291	273	Helper::get_instance();
292	274	Activator::get_instance();
		@@ -296,12 +278,10 @@
296	278	Smart_Tags::get_instance();
297	279	Generate_Form_Markup::get_instance();
298	280	Create_New_Form::get_instance();
299	281	Global_Settings::get_instance();
300		- Global_Settings_Defaults::get_instance();
301	282	Email_Summary::get_instance();
302	283	Compliance_Settings::get_instance();
303		- Form_Settings_Api::get_instance();
304	284	Events_Scheduler::get_instance();
305	285	AI_Form_Builder::get_instance();
306	286	Field_Mapping::get_instance();
307	287	Background_Process::get_instance();
		@@ -309,14 +289,20 @@
309	289	Rest_Api::get_instance();
310	290	AI_Helper::get_instance();
311	291	AI_Auth::get_instance();
312	292	Updater::get_instance();
313		- Onboarding::get_instance();
314	293	DatabaseRegister::init();
315		- Form_Restriction::get_instance();
316		- Abilities_Registrar::get_instance();
317	294	// Initializing Compatibilities.
318	295	Astra::get_instance();
	296	+ /**
	297	+ * Required to add the if check for the class existence to resolve phpstan error,
	298	+ * as the phpstan configuration ignores the inc/lib directory which gives error
	299	+ * unknown class.
	300	+ */
	301	+ if ( class_exists( 'SRFM\Inc\Lib\SRFM_Nps_Survey' ) && ! apply_filters( 'srfm_disable_nps_survey', false ) ) {
	302	+ SRFM_Nps_Survey::get_instance(); // Inits the NPS Survey class for which inits the NPS Survey plugin.
	303	+ Nps_Notice::get_instance(); // Responsible for displaying the NPS Survey: keeping the line out of the check will also work.
	304	+ }
319	305
320	306	/**
321	307	* Load core files necessary for the Spectra block.
322	308	* This method is called in the Spectra block loader to ensure core files are loaded during the 'plugins_loaded' action.