← All changes | includes/Plugin.php +56 -167 3.6.6 → trunk View file →

		@@ -9,47 +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	13	use Templately\Utils\Base;
22	14	use Templately\Utils\Enqueue;
23	15
24	16	use Templately\Core\Admin;
25		-use Templately\Core\Module;
	17	+use Templately\Core\Platform_Registry;
	18	+use Templately\Core\Modules_Manager;
	19	+use Templately\Core\Capability_Seed;
26	20
27		-use Templately\API\Tags;
28		-use Templately\API\Items;
29		-use Templately\API\Login;
30		-use Templately\API\Checkout;
31		-use Templately\API\SignUp;
32		-use Templately\API\Profile;
33		-use Templately\API\Import;
34		-use Templately\API\MyClouds;
35		-use Templately\API\WorkSpaces;
36		-use Templately\API\Categories;
37		-use Templately\API\Dependencies;
38		-use Templately\API\TemplateTypes;
39		-use Templately\API\SavedTemplates;
40	21	use Templately\API\Sites;
41		-use Templately\API\Tour;
42	22	use Templately\Core\Maintenance;
43	23	use Templately\Core\Migrator;
44		-use Templately\Core\Platform\Gutenberg;
45		-use Templately\Core\Platform\Elementor;
	24	+use Templately\Utils\Response\RestEnvelope;
46	25
47	26	final class Plugin extends Base {
48		- public $version = '3.6.6';
	27	+ public $version = '3.8.0';
49	28
50	29	public $admin;
51		- public $settings;
52	30	/**
53	31	* Enqueue class responsible for assets
54	32	* @var Enqueue
55	33	*/
		@@ -55,18 +33,21 @@
55	33	*/
56	34	public $assets;
57	35
58	36	/**
59		- * @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
60	46	*/
61	47	public $theme_builder;
62	48
63	49	/**
64		- * @var Developer
65		- */
66		- public $developer;
67		-
68		- /**
69	50	* Plugin constructor.
70	51	* Initializing Templately plugin.
71	52	*
72	53	* @access private
		@@ -78,19 +59,18 @@
78	59	Maintenance::init();
79	60
80	61	$this->assets = Enqueue::get_instance( TEMPLATELY_URL, TEMPLATELY_PATH, $this->version );
81	62	$this->admin = Admin::get_instance();
82		- $this->settings = Settings::get_instance();
83		- $this->theme_builder = ThemeBuilder::get_instance();
84	63
85		- // Initialize developer functionality if available
86		- $this->init_developer_functionality();
87		-
88	64	add_action( 'plugins_loaded', [ $this, 'plugins_loaded' ] );
89	65	add_action( 'rest_api_init', [ $this, 'register_routes' ] );
90	66
91		- 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();
92	71
	72	+
93	73	/**
94	74	* Initialize.
95	75	*/
96	76	do_action( 'templately_init' );
		@@ -102,9 +82,9 @@
102	82	*
103	83	* @since 2.0
104	84	*/
105	85	public function __clone() {
106		- _doing_it_wrong( __FUNCTION__, __( 'Cloning is forbidden.', 'templately' ), '2.0' );
	86	+ _doing_it_wrong( __FUNCTION__, esc_html__( 'Cloning is forbidden.', 'templately' ), '2.0' );
107	87	}
108	88
109	89	/**
110	90	* Un-serializing instances of this class is forbidden.
		@@ -111,9 +91,9 @@
111	91	*
112	92	* @since 2.0
113	93	*/
114	94	public function __wakeup() {
115		- _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' );
116	96	}
117	97
118	98	/**
119	99	* Initializing Things on Plugins Loaded
		@@ -119,91 +99,54 @@
119	99	* Initializing Things on Plugins Loaded
120	100	* @return void
121	101	*/
122	102	public function plugins_loaded() {
123		- $this->platforms(); // PLATFORMS LOADED
124	103	$this->apis(); // APIs LOADED
125	104
126	105	/**
127		- * 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.
128	109	*/
129		- Migrator::get_instance();
	110	+ Capability_Seed::register_all();
130	111
131	112	/**
132		- * 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.
133	115	*/
134		- FullSiteImport::get_instance();
	116	+ Modules_Manager::get_instance()->boot();
	117	+
	118	+ /**
	119	+ * Migrator for Templately
	120	+ */
	121	+ Migrator::get_instance();
135	122	}
136	123
137	124	/**
138		- * Initialize developer functionality if available
	125	+ * All the API instantiated
139	126	*
140		- * This method safely loads developer functionality only if the developer
141		- * 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.
142	133	*
143		- * @return void
144		- */
145		- private function init_developer_functionality() {
146		- $developer_file = TEMPLATELY_PATH . 'includes/Core/Developer/Developer.php';
147		-
148		- // Check if developer file exists before attempting to load
149		- if ( file_exists( $developer_file ) ) {
150		- // Include the developer class file
151		- require_once $developer_file;
152		-
153		- // Check if the class exists after including the file
154		- if ( class_exists( '\\Templately\\Core\\Developer\\Developer' ) ) {
155		- $this->developer = \Templately\Core\Developer\Developer::get_instance();
156		- }
157		- }
158		-
159		- // If developer functionality is not available, set to null
160		- if ( ! isset( $this->developer ) ) {
161		- $this->developer = null;
162		- }
163		- }
164		-
165		-
166		-
167		- /**
168		- * Initialize all platforms
169		- * @return void
170		- */
171		- public function platforms() {
172		- Gutenberg::get_instance();
173		- Elementor::get_instance();
174		- }
175		-
176		- /**
177		- * 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.
178	139	*
179	140	* @return void
180	141	*/
181	142	private function apis() {
182		- Conditions::get_instance();
183		- Categories::get_instance();
184		- TemplateTypes::get_instance();
185		- Dependencies::get_instance();
186		- Tags::get_instance();
187		- ThemeBuilderApi::get_instance();
188		-
189		- AIContent::get_instance();
190		- LogoGeneration::get_instance();
191		- Items::get_instance();
192		- SavedTemplates::get_instance();
193		-
194		- Login::get_instance();
195		- Checkout::get_instance();
196		- SignUp::get_instance();
197		- Import::get_instance();
198		- Profile::get_instance();
199		- MyClouds::get_instance();
200		- WorkSpaces::get_instance();
201	143	Sites::get_instance();
202		- Tour::get_instance();
203	144
204		- APISettings::get_instance();
205	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().
206	149	}
207	150
208	151	/**
209	152	* Register all REST API endpoints
		@@ -209,10 +152,17 @@
209	152	* Register all REST API endpoints
210	153	* @return void
211	154	*/
212	155	public function register_routes() {
213		- if ( ! empty( $modules = Module::get_instance()->get( 'API' ) ) ) {
	156	+ if ( ! empty( $modules = Platform_Registry::get_instance()->get( 'API' ) ) ) {
214	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	+ }
215	165	$module->object->register_routes();
216	166	}
217	167	}
218	168	}
		@@ -264,66 +214,5 @@
264	214	public function load_textdomain() {
265	215	load_plugin_textdomain( 'templately', false, dirname( TEMPLATELY_PLUGIN_BASENAME ) . '/languages' );
266	216	}
267	217
268		- public function google_login_handler() {
269		- // Stop if not a templately google login request
270		- if ( empty( $_GET['templately_google_login'] ) ) {
271		- return;
272		- }
273		-
274		- $redirect_url = remove_query_arg( [ 'templately_google_login', 'api_key', 'error', 'state', 'redirect-to' ] );
275		-
276		- if ( ! empty( $_GET['error'] ) ) {
277		- $error_message = sanitize_text_field( $_GET['error'] );
278		- } elseif ( ! empty( $_GET['api_key'] ) ) {
279		- $request = new \WP_REST_Request( 'POST', '/templately/v1/login' );
280		- $request->set_param( 'viaAPI', true );
281		- $request->set_param( 'api_key', sanitize_text_field( $_GET['api_key'] ) );
282		-
283		- /**
284		- * @var Login $login
285		- */
286		- $login = Login::get_instance();
287		- $login->permission_check( $request );
288		- $response = $login->login();
289		-
290		- if ( ! is_wp_error( $response ) && ! empty( $response['user'] ) ) {
291		- $redirect_path = ! empty( $_GET['redirect-to'] ) ? sanitize_text_field( wp_unslash( $_GET['redirect-to'] ) ) : '';
292		- if ( ! empty( $redirect_path ) ) {
293		- if ( filter_var( $redirect_path, FILTER_VALIDATE_URL ) ) {
294		- $redirect_url = $redirect_path;
295		- } else {
296		- $is_templately = strpos( $redirect_url, 'page=templately' ) !== false;
297		- $is_elementor = strpos( $redirect_url, 'action=elementor' ) !== false;
298		- // Gutenberg editor usually has action=edit or is a block editor page
299		- $is_gutenberg = ( strpos( $redirect_url, 'action=edit' ) !== false || strpos( $redirect_url, 'post_type=' ) !== false ) && ! $is_elementor;
300		-
301		- if ( $is_templately || $is_elementor || $is_gutenberg ) {
302		- $redirect_url = add_query_arg( 'path', ltrim( $redirect_path, '/' ), $redirect_url );
303		-
304		- // Always open the modal in editors after google login
305		- if ( $is_elementor || $is_gutenberg ) {
306		- $redirect_url = add_query_arg( 'templately_open_modal', '1', $redirect_url );
307		- }
308		- }
309		- }
310		- }
311		-
312		- wp_safe_redirect( $redirect_url );
313		- exit;
314		- } else {
315		- $error_message = ( is_wp_error( $response ) ) ? $response->get_error_message() : __( 'Login failed.', 'templately' );
316		- }
317		- } else {
318		- $error_message = __( 'Missing API Key.', 'templately' );
319		- }
320		-
321		- $redirect_url = add_query_arg( [
322		- 'templately_error' => 'login_failed',
323		- 'error_message' => urlencode( $error_message ),
324		- ], $redirect_url );
325		-
326		- wp_safe_redirect( $redirect_url );
327		- exit;
328		- }
329	218	}