← All changes | plugin-loader.php +20 -31 2.7.0 → 1.6.0 View file →

		@@ -9,10 +9,9 @@
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	15	use SRFM\Inc\Admin_Ajax;
17	16	use SRFM\Inc\AI_Form_Builder\AI_Auth;
18	17	use SRFM\Inc\AI_Form_Builder\AI_Form_Builder;
		@@ -19,15 +18,12 @@
19	18	use SRFM\Inc\AI_Form_Builder\AI_Helper;
20	19	use SRFM\Inc\AI_Form_Builder\Field_Mapping;
21	20	use SRFM\Inc\Background_Process;
22	21	use SRFM\Inc\Blocks\Register;
23		-use SRFM\Inc\Compatibility\Themes\Astra;
24	22	use SRFM\Inc\Create_New_Form;
25	23	use SRFM\Inc\Database\Register as DatabaseRegister;
26		-use SRFM\Inc\Duplicate_Form;
27	24	use SRFM\Inc\Events_Scheduler;
28	25	use SRFM\Inc\Export;
29		-use SRFM\Inc\Form_Restriction;
30	26	use SRFM\Inc\Form_Submit;
31	27	use SRFM\Inc\Forms_Data;
32	28	use SRFM\Inc\Frontend_Assets;
33	29	use SRFM\Inc\Generate_Form_Markup;
		@@ -34,12 +30,11 @@
34	30	use SRFM\Inc\Global_Settings\Email_Summary;
35	31	use SRFM\Inc\Global_Settings\Global_Settings;
36	32	use SRFM\Inc\Gutenberg_Hooks;
37	33	use SRFM\Inc\Helper;
38		-use SRFM\Inc\Learn;
39		-use SRFM\Inc\Onboarding;
	34	+use SRFM\Inc\Lib\SRFM_Nps_Survey;
	35	+use SRFM\Inc\Nps_Notice;
40	36	use SRFM\Inc\Page_Builders\Page_Builders;
41		-use SRFM\Inc\Payments\Payments;
42	37	use SRFM\Inc\Post_Types;
43	38	use SRFM\Inc\Rest_Api;
44	39	use SRFM\Inc\Single_Form_Settings\Compliance_Settings;
45	40	use SRFM\Inc\Smart_Tags;
		@@ -141,24 +136,18 @@
141	136	[ '', '$1-$2', '-', DIRECTORY_SEPARATOR ],
142	137	$class
143	138	);
144	139
145		- if ( ! is_string( $filename ) ) {
146		- return;
147		- }
	140	+ if ( is_string( $filename ) ) {
148	141
149		- // Check for directory traversal.
150		- if ( strpos( $filename, '..' ) !== false ) {
151		- return;
152		- }
	142	+ $filename = strtolower( $filename );
153	143
154		- $filename = strtolower( $filename );
	144	+ $file = SRFM_DIR . $filename . '.php';
155	145
156		- $file = SRFM_DIR . $filename . '.php';
157		-
158		- // if the file is readable, include it.
159		- if ( is_readable( $file ) ) {
160		- require_once $file;
	146	+ // if the file is readable, include it.
	147	+ if ( is_readable( $file ) ) {
	148	+ require_once $file;
	149	+ }
161	150	}
162	151	}
163	152
164	153	/**
		@@ -209,14 +198,9 @@
209	198
210	199	Register::get_instance();
211	200	if ( is_admin() ) {
212	201	Admin::get_instance();
213		- // phpcs:ignore /** @phpstan-ignore-next-line */ -- Class is loaded dynamically in WordPress
214		- Notice_Manager::get_instance();
215	202	}
216		- Payments::get_instance();
217		- Duplicate_Form::get_instance();
218		- Learn::get_instance();
219	203	}
220	204
221	205	/**
222	206	* Load Plugin Text Domain.
		@@ -281,8 +265,9 @@
281	265	*/
282	266	public function load_plugin() {
283	267	Post_Types::get_instance();
284	268	Form_Submit::get_instance();
	269	+ Block_Patterns::get_instance();
285	270	Gutenberg_Hooks::get_instance();
286	271	Frontend_Assets::get_instance();
287	272	Helper::get_instance();
288	273	Activator::get_instance();
		@@ -303,14 +288,18 @@
303	288	Rest_Api::get_instance();
304	289	AI_Helper::get_instance();
305	290	AI_Auth::get_instance();
306	291	Updater::get_instance();
307		- Onboarding::get_instance();
308	292	DatabaseRegister::init();
309		- Form_Restriction::get_instance();
310		- Abilities_Registrar::get_instance();
311		- // Initializing Compatibilities.
312		- 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	+ }
313	302
314	303	/**
315	304	* Load core files necessary for the Spectra block.
316	305	* This method is called in the Spectra block loader to ensure core files are loaded during the 'plugins_loaded' action.