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