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