← All changes | flywp.php +34 -2 1.5.2 → 1.8.0 View file →

		@@ -2,9 +2,9 @@
2	2	/**
3	3	* Plugin Name: FlyWP
4	4	* Plugin URI: https://flywp.com
5	5	* Description: Helper plugin for FlyWP
6		- * Version: 1.5.2
	6	+ * Version: 1.8.0
7	7	* Author: FlyWP
8	8	* Author URI: https://flywp.com/?utm_source=wporg&utm_medium=banner&utm_campaign=author-uri
9	9	* License: GPL2
10	10	*/
		@@ -40,9 +40,9 @@
40	40	* Plugin version.
41	41	*
42	42	* @var string
43	43	*/
44		- public $version = '1.5.2';
	44	+ public $version = '1.8.0';
45	45
46	46	/**
47	47	* Plugin Constructor.
48	48	*
		@@ -70,8 +70,12 @@
70	70
71	71	if ( ! defined( 'FLYWP_API_KEY' ) ) {
72	72	define( 'FLYWP_API_KEY', '' );
73	73	}
	74	+
	75	+ if ( ! defined( 'FLYWP_LOGIN_PUBLIC_KEY' ) ) {
	76	+ define( 'FLYWP_LOGIN_PUBLIC_KEY', '' );
	77	+ }
74	78	}
75	79
76	80	/**
77	81	* Plugin activation hook.
		@@ -82,8 +86,10 @@
82	86	$router = new FlyWP\Router();
83	87	$router->register_routes();
84	88
85	89	flush_rewrite_rules( false );
	90	+
	91	+ FlyWP\StaticSite\Bootstrap::install();
86	92	}
87	93
88	94	/**
89	95	* Plugin deactivation hook.
		@@ -102,8 +108,15 @@
102	108	*
103	109	* @return void
104	110	*/
105	111	public function init_plugin() {
	112	+ // Loaded ahead of the API-key gate below, as it does not use the API key. It answers
	113	+ // one POST path and does nothing on any other request.
	114	+ new FlyWP\Frontend\MagicLogin();
	115	+
	116	+ // The static site CLI commands do not use the API key.
	117	+ FlyWP\StaticSite\Bootstrap::register_cli();
	118	+
106	119	if ( ! $this->has_key() ) {
107	120	$this->add_action( 'admin_notices', 'admin_notice' );
108	121
109	122	return;
		@@ -123,8 +136,9 @@
123	136	$this->email = new FlyWP\Email();
124	137	$this->optimize = new FlyWP\Optimizations();
125	138	$this->litespeed = new FlyWP\Litespeed();
126	139	$this->updates_data = new FlyWP\Api\UpdatesData();
	140	+ $this->static_site = new FlyWP\StaticSite\Bootstrap();
127	141	}
128	142
129	143	/**
130	144	* Show admin notice if API key is not set.
		@@ -152,8 +166,26 @@
152	166	* @return string
153	167	*/
154	168	public function get_key() {
155	169	return FLYWP_API_KEY;
	170	+ }
	171	+
	172	+ /**
	173	+ * Public key used to verify magic-login tokens.
	174	+ *
	175	+ * Set as a constant on classic WordPress. On Bedrock it may only be present in the
	176	+ * environment, so fall back to `getenv()`.
	177	+ *
	178	+ * @return string
	179	+ */
	180	+ public function get_login_public_key() {
	181	+ if ( FLYWP_LOGIN_PUBLIC_KEY !== '' ) {
	182	+ return FLYWP_LOGIN_PUBLIC_KEY;
	183	+ }
	184	+
	185	+ $from_env = getenv( 'FLYWP_LOGIN_PUBLIC_KEY' );
	186	+
	187	+ return $from_env === false ? '' : $from_env;
156	188	}
157	189	}
158	190
159	191	/**