← All changes | includes/Plugin.php +56 -207 3.7.2 → 3.8.0 View file →

		@@ -9,49 +9,25 @@
9	9	*/
10	10
11	11	namespace Templately;
12	12
13		-use Templately\Admin\API\Settings as APISettings;
14		-use Templately\Admin\Settings;
15		-use Templately\API\AIContent;
16		-use Templately\API\LogoGeneration;
17		-use Templately\API\Conditions;
18		-use Templately\API\ThemeBuilderApi;
19		-use Templately\Builder\ThemeBuilder;
20		-use Templately\Core\Importer\FullSiteImport;
21		-use Templately\Utils\AuthErrorCode;
22	13	use Templately\Utils\Base;
23		-use Templately\Utils\Database;
24	14	use Templately\Utils\Enqueue;
25	15
26	16	use Templately\Core\Admin;
27		-use Templately\Core\Module;
	17	+use Templately\Core\Platform_Registry;
	18	+use Templately\Core\Modules_Manager;
	19	+use Templately\Core\Capability_Seed;
28	20
29		-use Templately\API\Tags;
30		-use Templately\API\Items;
31		-use Templately\API\Login;
32		-use Templately\API\Checkout;
33		-use Templately\API\SignUp;
34		-use Templately\API\Profile;
35		-use Templately\API\Import;
36		-use Templately\API\MyClouds;
37		-use Templately\API\WorkSpaces;
38		-use Templately\API\Categories;
39		-use Templately\API\Dependencies;
40		-use Templately\API\TemplateTypes;
41		-use Templately\API\SavedTemplates;
42	21	use Templately\API\Sites;
43		-use Templately\API\Tour;
44	22	use Templately\Core\Maintenance;
45	23	use Templately\Core\Migrator;
46		-use Templately\Core\Platform\Gutenberg;
47		-use Templately\Core\Platform\Elementor;
	24	+use Templately\Utils\Response\RestEnvelope;
48	25
49	26	final class Plugin extends Base {
50		- public $version = '3.7.2';
	27	+ public $version = '3.8.0';
51	28
52	29	public $admin;
53		- public $settings;
54	30	/**
55	31	* Enqueue class responsible for assets
56	32	* @var Enqueue
57	33	*/
		@@ -57,18 +33,21 @@
57	33	*/
58	34	public $assets;
59	35
60	36	/**
61		- * @var ThemeBuilder
	37	+ * Set by modules/theme-builder/module.php's init_hooks() (during
	38	+ * Modules_Manager::boot(), inside plugins_loaded()) — NOT here in the
	39	+ * constructor. ThemeBuilder is now a module-namespaced class
	40	+ * (Templately\Modules\ThemeBuilder\ThemeBuilder); eagerly instantiating it
	41	+ * in the constructor (which runs before plugins_loaded even fires) would
	42	+ * fatal on class-not-found, since Modules_Manager hasn't registered that
	43	+ * module's autoloader yet.
	44	+ *
	45	+ * @var \Templately\Modules\ThemeBuilder\ThemeBuilder
62	46	*/
63	47	public $theme_builder;
64	48
65	49	/**
66		- * @var Developer
67		- */
68		- public $developer;
69		-
70		- /**
71	50	* Plugin constructor.
72	51	* Initializing Templately plugin.
73	52	*
74	53	* @access private
		@@ -80,19 +59,18 @@
80	59	Maintenance::init();
81	60
82	61	$this->assets = Enqueue::get_instance( TEMPLATELY_URL, TEMPLATELY_PATH, $this->version );
83	62	$this->admin = Admin::get_instance();
84		- $this->settings = Settings::get_instance();
85		- $this->theme_builder = ThemeBuilder::get_instance();
86	63
87		- // Initialize developer functionality if available
88		- $this->init_developer_functionality();
89		-
90	64	add_action( 'plugins_loaded', [ $this, 'plugins_loaded' ] );
91	65	add_action( 'rest_api_init', [ $this, 'register_routes' ] );
92	66
93		- add_action( 'init', [ $this, 'google_login_handler' ] );
	67	+ // 043 — the single response envelope, applied on rest_post_dispatch so
	68	+ // every route in the namespace is covered by construction rather than by
	69	+ // each endpoint remembering to opt in.
	70	+ RestEnvelope::init();
94	71
	72	+
95	73	/**
96	74	* Initialize.
97	75	*/
98	76	do_action( 'templately_init' );
		@@ -104,9 +82,9 @@
104	82	*
105	83	* @since 2.0
106	84	*/
107	85	public function __clone() {
108		- _doing_it_wrong( __FUNCTION__, __( 'Cloning is forbidden.', 'templately' ), '2.0' );
	86	+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Cloning is forbidden.', 'templately' ), '2.0' );
109	87	}
110	88
111	89	/**
112	90	* Un-serializing instances of this class is forbidden.
		@@ -113,9 +91,9 @@
113	91	*
114	92	* @since 2.0
115	93	*/
116	94	public function __wakeup() {
117		- _doing_it_wrong( __FUNCTION__, __( 'Un-serializing instances of this class is forbidden.', 'templately' ), '2.0' );
	95	+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Un-serializing instances of this class is forbidden.', 'templately' ), '2.0' );
118	96	}
119	97
120	98	/**
121	99	* Initializing Things on Plugins Loaded
		@@ -121,91 +99,54 @@
121	99	* Initializing Things on Plugins Loaded
122	100	* @return void
123	101	*/
124	102	public function plugins_loaded() {
125		- $this->platforms(); // PLATFORMS LOADED
126	103	$this->apis(); // APIs LOADED
127	104
128	105	/**
129		- * Migrator for Templately
	106	+ * Host capability registry (spec 053): the seed set MUST exist before any
	107	+ * module boots so is_active()/sub-feature gates can consult it. Registration
	108	+ * is metadata-only — no probe runs here.
130	109	*/
131		- Migrator::get_instance();
	110	+ Capability_Seed::register_all();
132	111
133	112	/**
134		- * Full Site Import
	113	+ * Feature modules (spec 004): auto-discovered from modules/*, booted after the
	114	+ * legacy API registration so a module may depend on it.
135	115	*/
136		- FullSiteImport::get_instance();
	116	+ Modules_Manager::get_instance()->boot();
	117	+
	118	+ /**
	119	+ * Migrator for Templately
	120	+ */
	121	+ Migrator::get_instance();
137	122	}
138	123
139	124	/**
140		- * Initialize developer functionality if available
	125	+ * All the API instantiated
141	126	*
142		- * This method safely loads developer functionality only if the developer
143		- * directory and class exist, preventing fatal errors in production builds.
	127	+ * Every other legacy API endpoint (ThemeBuilderApi, Tour, Conditions, ...)
	128	+ * migrated to its own module's register_rest_routes(), booted lazily on
	129	+ * rest_api_init (Phase 2 extraction, specs 013-037 — see
	130	+ * docs/modularization-prd.md). Sites is the one REST endpoint with no
	131	+ * owning feature spec (site-connection migration is cross-cutting
	132	+ * infrastructure, not a bounded feature) — it stays here as core.
144	133	*
145		- * @return void
146		- */
147		- private function init_developer_functionality() {
148		- $developer_file = TEMPLATELY_PATH . 'includes/Core/Developer/Developer.php';
149		-
150		- // Check if developer file exists before attempting to load
151		- if ( file_exists( $developer_file ) ) {
152		- // Include the developer class file
153		- require_once $developer_file;
154		-
155		- // Check if the class exists after including the file
156		- if ( class_exists( '\\Templately\\Core\\Developer\\Developer' ) ) {
157		- $this->developer = \Templately\Core\Developer\Developer::get_instance();
158		- }
159		- }
160		-
161		- // If developer functionality is not available, set to null
162		- if ( ! isset( $this->developer ) ) {
163		- $this->developer = null;
164		- }
165		- }
166		-
167		-
168		-
169		- /**
170		- * Initialize all platforms
171		- * @return void
172		- */
173		- public function platforms() {
174		- Gutenberg::get_instance();
175		- Elementor::get_instance();
176		- }
177		-
178		- /**
179		- * All the API instantiated
	134	+ * Both Elementor and Gutenberg platform drivers are now self-registered by
	135	+ * their own module's init_hooks() (modules/elementor-integration/module.php,
	136	+ * modules/gutenberg-integration/module.php) — the former platforms() method
	137	+ * that used to run before this one is gone; there is nothing left to boot
	138	+ * before Modules_Manager::boot() runs.
180	139	*
181	140	* @return void
182	141	*/
183	142	private function apis() {
184		- Conditions::get_instance();
185		- Categories::get_instance();
186		- TemplateTypes::get_instance();
187		- Dependencies::get_instance();
188		- Tags::get_instance();
189		- ThemeBuilderApi::get_instance();
190		-
191		- AIContent::get_instance();
192		- LogoGeneration::get_instance();
193		- Items::get_instance();
194		- SavedTemplates::get_instance();
195		-
196		- Login::get_instance();
197		- Checkout::get_instance();
198		- SignUp::get_instance();
199		- Import::get_instance();
200		- Profile::get_instance();
201		- MyClouds::get_instance();
202		- WorkSpaces::get_instance();
203	143	Sites::get_instance();
204		- Tour::get_instance();
205	144
206		- APISettings::get_instance();
207	145	// Note: DeveloperSettings::get_instance() is called in Developer::init_modules() when developer functionality is available and enabled
	146	+
	147	+ // MCP Abilities (specs/041-mcp-abilities) now boots via modules/mcp-abilities/
	148	+ // module.php (Modules_Manager auto-discovery, spec 004) — see Plugin::plugins_loaded().
208	149	}
209	150
210	151	/**
211	152	* Register all REST API endpoints
		@@ -211,10 +152,17 @@
211	152	* Register all REST API endpoints
212	153	* @return void
213	154	*/
214	155	public function register_routes() {
215		- if ( ! empty( $modules = Module::get_instance()->get( 'API' ) ) ) {
	156	+ if ( ! empty( $modules = Platform_Registry::get_instance()->get( 'API' ) ) ) {
216	157	foreach ( $modules as $module ) {
	158	+ // Module-owned endpoints (Templately\Modules\*) register explicitly via
	159	+ // Modules_Manager::boot_rest_routes (constitution §VIII). They can still
	160	+ // land in this legacy registry through the shared API base constructor if
	161	+ // something instantiates them early — skip them so routes register once.
	162	+ if ( 0 === strpos( get_class( $module->object ), 'Templately\\Modules\\' ) ) {
	163	+ continue;
	164	+ }
217	165	$module->object->register_routes();
218	166	}
219	167	}
220	168	}
		@@ -266,104 +214,5 @@
266	214	public function load_textdomain() {
267	215	load_plugin_textdomain( 'templately', false, dirname( TEMPLATELY_PLUGIN_BASENAME ) . '/languages' );
268	216	}
269	217
270		- public function google_login_handler() {
271		- // Stop if not a templately google login request
272		- if ( empty( $_GET['templately_google_login'] ) ) {
273		- return;
274		- }
275		-
276		- if ( wp_doing_ajax() || wp_doing_cron() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
277		- return;
278		- }
279		-
280		- // Checked before the token is consumed: the callback can land while the
281		- // auth cookie is missing (expired session, cookie not yet set), and WP
282		- // will bounce the user through wp-login and back to this same URL.
283		- // Burning the token here would fail that legitimate retry.
284		- if ( ! is_user_logged_in() ) {
285		- return;
286		- }
287		-
288		- $state = '';
289		- if ( ! empty( $_GET['templately_state'] ) ) {
290		- $state = sanitize_text_field( wp_unslash( $_GET['templately_state'] ) );
291		- } elseif ( ! empty( $_GET['state'] ) ) {
292		- $state = sanitize_text_field( wp_unslash( $_GET['state'] ) );
293		- }
294		-
295		- $state_user_id = false;
296		- if ( ! empty( $state ) ) {
297		- $state_user_id = Database::get_transient( 'google_state_' . $state );
298		- Database::delete_transient( 'google_state_' . $state );
299		- }
300		-
301		- $is_authorized = false !== $state_user_id
302		- && intval( $state_user_id ) === get_current_user_id()
303		- && current_user_can( 'delete_posts' );
304		-
305		- $redirect_url = remove_query_arg( [ 'templately_google_login', 'templately_state', 'api_key', 'error', 'state', 'redirect-to' ] );
306		-
307		- if ( ! $is_authorized ) {
308		- $error_code = AuthErrorCode::AUTH_STATE_INVALID;
309		- } elseif ( ! empty( $_GET['error'] ) ) {
310		- // Google's own reason is deliberately dropped rather than forwarded:
311		- // everything on this query string is attacker-controlled, and the
312		- // screen that displays it must never be handed prose from the URL.
313		- $error_code = AuthErrorCode::AUTH_PROVIDER_FAILED;
314		- } elseif ( ! empty( $_GET['api_key'] ) ) {
315		- $request = new \WP_REST_Request( 'POST', '/templately/v1/login' );
316		- $request->set_param( 'viaAPI', true );
317		- $request->set_param( 'api_key', sanitize_text_field( $_GET['api_key'] ) );
318		-
319		- /**
320		- * @var Login $login
321		- */
322		- $login = Login::get_instance();
323		- $login->permission_check( $request );
324		-
325		- // login() pins the write target to the acting user itself — no pin
326		- // here, or its finally would release ours mid-request.
327		- $response = $login->login();
328		-
329		- if ( ! is_wp_error( $response ) && ! empty( $response['user'] ) ) {
330		- $redirect_path = ! empty( $_GET['redirect-to'] ) ? sanitize_text_field( wp_unslash( $_GET['redirect-to'] ) ) : '';
331		- if ( ! empty( $redirect_path ) ) {
332		- if ( filter_var( $redirect_path, FILTER_VALIDATE_URL ) ) {
333		- $redirect_url = $redirect_path;
334		- } else {
335		- $is_templately = strpos( $redirect_url, 'page=templately' ) !== false;
336		- $is_elementor = strpos( $redirect_url, 'action=elementor' ) !== false;
337		- // Gutenberg editor usually has action=edit or is a block editor page
338		- $is_gutenberg = ( strpos( $redirect_url, 'action=edit' ) !== false || strpos( $redirect_url, 'post_type=' ) !== false ) && ! $is_elementor;
339		-
340		- if ( $is_templately || $is_elementor || $is_gutenberg ) {
341		- $redirect_url = add_query_arg( 'path', ltrim( $redirect_path, '/' ), $redirect_url );
342		-
343		- // Always open the modal in editors after google login
344		- if ( $is_elementor || $is_gutenberg ) {
345		- $redirect_url = add_query_arg( 'templately_open_modal', '1', $redirect_url );
346		- }
347		- }
348		- }
349		- }
350		-
351		- wp_safe_redirect( $redirect_url );
352		- exit;
353		- } else {
354		- // The cloud's own wording stays server-side; the screen resolves
355		- // its copy from the code.
356		- $error_code = AuthErrorCode::INVALID_API_KEY;
357		- }
358		- } else {
359		- $error_code = AuthErrorCode::AUTH_MISSING_API_KEY;
360		- }
361		-
362		- $redirect_url = add_query_arg( [
363		- 'templately_error' => $error_code,
364		- ], $redirect_url );
365		-
366		- wp_safe_redirect( $redirect_url );
367		- exit;
368		- }
369	218	}