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