← All changes | plugin-loader.php +20 -40 2.10.1 → 1.7.4 View file →

		@@ -9,13 +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		-use SRFM\Inc\Admin\Html_Form_Detector;
18	15	use SRFM\Inc\Admin_Ajax;
19	16	use SRFM\Inc\AI_Form_Builder\AI_Auth;
20	17	use SRFM\Inc\AI_Form_Builder\AI_Form_Builder;
21	18	use SRFM\Inc\AI_Form_Builder\AI_Helper;
		@@ -24,12 +21,10 @@
24	21	use SRFM\Inc\Blocks\Register;
25	22	use SRFM\Inc\Compatibility\Themes\Astra;
26	23	use SRFM\Inc\Create_New_Form;
27	24	use SRFM\Inc\Database\Register as DatabaseRegister;
28		-use SRFM\Inc\Duplicate_Form;
29	25	use SRFM\Inc\Events_Scheduler;
30	26	use SRFM\Inc\Export;
31		-use SRFM\Inc\Form_Restriction;
32	27	use SRFM\Inc\Form_Submit;
33	28	use SRFM\Inc\Forms_Data;
34	29	use SRFM\Inc\Frontend_Assets;
35	30	use SRFM\Inc\Generate_Form_Markup;
		@@ -34,19 +29,16 @@
34	29	use SRFM\Inc\Frontend_Assets;
35	30	use SRFM\Inc\Generate_Form_Markup;
36	31	use SRFM\Inc\Global_Settings\Email_Summary;
37	32	use SRFM\Inc\Global_Settings\Global_Settings;
38		-use SRFM\Inc\Global_Settings\Global_Settings_Defaults;
39	33	use SRFM\Inc\Gutenberg_Hooks;
40	34	use SRFM\Inc\Helper;
41		-use SRFM\Inc\Learn;
42		-use SRFM\Inc\Onboarding;
	35	+use SRFM\Inc\Lib\SRFM_Nps_Survey;
	36	+use SRFM\Inc\Nps_Notice;
43	37	use SRFM\Inc\Page_Builders\Page_Builders;
44		-use SRFM\Inc\Payments\Payments;
45	38	use SRFM\Inc\Post_Types;
46	39	use SRFM\Inc\Rest_Api;
47	40	use SRFM\Inc\Single_Form_Settings\Compliance_Settings;
48		-use SRFM\Inc\Single_Form_Settings\Form_Settings_Api;
49	41	use SRFM\Inc\Smart_Tags;
50	42	use SRFM\Inc\Updater;
51	43
52	44	if ( ! defined( 'ABSPATH' ) ) {
		@@ -145,24 +137,18 @@
145	137	[ '', '$1-$2', '-', DIRECTORY_SEPARATOR ],
146	138	$class
147	139	);
148	140
149		- if ( ! is_string( $filename ) ) {
150		- return;
151		- }
	141	+ if ( is_string( $filename ) ) {
152	142
153		- // Check for directory traversal.
154		- if ( strpos( $filename, '..' ) !== false ) {
155		- return;
156		- }
	143	+ $filename = strtolower( $filename );
157	144
158		- $filename = strtolower( $filename );
	145	+ $file = SRFM_DIR . $filename . '.php';
159	146
160		- $file = SRFM_DIR . $filename . '.php';
161		-
162		- // if the file is readable, include it.
163		- if ( is_readable( $file ) ) {
164		- require_once $file;
	147	+ // if the file is readable, include it.
	148	+ if ( is_readable( $file ) ) {
	149	+ require_once $file;
	150	+ }
165	151	}
166	152	}
167	153
168	154	/**
		@@ -213,20 +199,9 @@
213	199
214	200	Register::get_instance();
215	201	if ( is_admin() ) {
216	202	Admin::get_instance();
217		- // phpcs:ignore /** @phpstan-ignore-next-line */ -- Class is loaded dynamically in WordPress
218		- Notice_Manager::get_instance();
219		- Editor_Nudge::get_instance();
220	203	}
221		- // Always instantiate — script enqueue is self-gated by `allow_load()`,
222		- // while the REST endpoint for converting HTML forms must register
223		- // outside the admin context (REST dispatch runs with `is_admin()` ===
224		- // false, so admin-only instantiation would 404 the endpoint).
225		- Html_Form_Detector::get_instance();
226		- Payments::get_instance();
227		- Duplicate_Form::get_instance();
228		- Learn::get_instance();
229	204	}
230	205
231	206	/**
232	207	* Load Plugin Text Domain.
		@@ -291,8 +266,9 @@
291	266	*/
292	267	public function load_plugin() {
293	268	Post_Types::get_instance();
294	269	Form_Submit::get_instance();
	270	+ Block_Patterns::get_instance();
295	271	Gutenberg_Hooks::get_instance();
296	272	Frontend_Assets::get_instance();
297	273	Helper::get_instance();
298	274	Activator::get_instance();
		@@ -302,12 +278,10 @@
302	278	Smart_Tags::get_instance();
303	279	Generate_Form_Markup::get_instance();
304	280	Create_New_Form::get_instance();
305	281	Global_Settings::get_instance();
306		- Global_Settings_Defaults::get_instance();
307	282	Email_Summary::get_instance();
308	283	Compliance_Settings::get_instance();
309		- Form_Settings_Api::get_instance();
310	284	Events_Scheduler::get_instance();
311	285	AI_Form_Builder::get_instance();
312	286	Field_Mapping::get_instance();
313	287	Background_Process::get_instance();
		@@ -315,14 +289,20 @@
315	289	Rest_Api::get_instance();
316	290	AI_Helper::get_instance();
317	291	AI_Auth::get_instance();
318	292	Updater::get_instance();
319		- Onboarding::get_instance();
320	293	DatabaseRegister::init();
321		- Form_Restriction::get_instance();
322		- Abilities_Registrar::get_instance();
323	294	// Initializing Compatibilities.
324	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	+ }
325	305
326	306	/**
327	307	* Load core files necessary for the Spectra block.
328	308	* This method is called in the Spectra block loader to ensure core files are loaded during the 'plugins_loaded' action.