← All changes | modules/scan/class-admin-sidebar-link.php +7 -53 16.3-a.5 → 16.3-a.7 View file →

		@@ -1,7 +1,7 @@
1	1	<?php
2	2	/**
3		- * A class that adds a scan and backup link to the admin sidebar.
	3	+ * A class that adds a scan link to the admin sidebar.
4	4	*
5	5	* @package automattic/jetpack
6	6	*/
7	7
		@@ -7,9 +7,8 @@
7	7
8	8	namespace Automattic\Jetpack\Scan;
9	9
10	10	use Automattic\Jetpack\Admin_UI\Admin_Menu;
11		-use Automattic\Jetpack\My_Jetpack\Products\Backup;
12	11	use Automattic\Jetpack\Redirect;
13	12	use Automattic\Jetpack\Status\Host;
14	13	use Jetpack_Core_Json_Api_Endpoints;
15	14
		@@ -60,9 +59,9 @@
60	59	add_action( self::SCHEDULE_ACTION_HOOK, array( $this, 'refresh_state_cache' ) );
61	60	}
62	61
63	62	/**
64		- * Adds a link to the Scan and Backup page.
	63	+ * Adds a link to the Scan page.
65	64	*/
66	65	public function maybe_add_admin_link() {
67	66	if ( ! $this->should_show_link() ) {
68	67	return;
		@@ -95,25 +94,15 @@
95	94	$position,
96	95	array( 'key' => 'jetpack-scan-cloud' )
97	96	);
98	97	}
99		-
100		- if ( $this->should_show_backup() ) {
101		- Admin_Menu::add_menu(
102		- /** "VaultPress Backup" is a product name, do not translate. */
103		- 'VaultPress Backup',
104		- 'VaultPress Backup <span aria-hidden="true">↗</span>',
105		- 'manage_options',
106		- esc_url( Redirect::get_url( 'calypso-backups' ) ),
107		- null,
108		- $position,
109		- array( 'key' => 'jetpack-backup-cloud' )
110		- );
111		- }
112	98	}
113	99
114	100	/**
115	101	* Refreshes the state cache via API call. Called via cron.
	102	+ *
	103	+ * Still warms the rewind state, which this class no longer reads itself:
	104	+ * Jetpack_Core_Json_Api_Endpoints::rewind_data() serves it from that cache.
116	105	*/
117	106	public function refresh_state_cache() {
118	107	Jetpack_Core_Json_Api_Endpoints::get_scan_state();
119	108	Jetpack_Core_Json_Api_Endpoints::get_rewind_data();
		@@ -124,9 +113,9 @@
124	113	*
125	114	* @return boolean
126	115	*/
127	116	private function should_show_link() {
128		- // Jetpack Scan/Backup is currently not supported on multisite.
	117	+ // Jetpack Scan is currently not supported on multisite.
129	118	if ( is_multisite() ) {
130	119	return false;
131	120	}
132	121
		@@ -135,9 +124,9 @@
135	124	if ( class_exists( 'VaultPress' ) ) {
136	125	return false;
137	126	}
138	127
139		- return $this->should_show_scan() || $this->should_show_backup() || $this->should_show_scan_history_only();
	128	+ return $this->should_show_scan() || $this->should_show_scan_history_only();
140	129	}
141	130
142	131	/**
143	132	* Check if we should display the Scan menu item.
		@@ -161,19 +150,8 @@
161	150	return $this->has_scan() && ( new Host() )->is_woa_site() && get_option( 'wpcom_admin_interface' ) === 'wp-admin';
162	151	}
163	152
164	153	/**
165		- * Check if we should display the Backup menu item.
166		- *
167		- * It will only be displayed if site has Backup enabled and the stand-alone Backup plugin is not active, because it will have a menu item of its own.
168		- *
169		- * @return boolean
170		- */
171		- private function should_show_backup() {
172		- return $this->has_backup() && ! $this->has_backup_plugin();
173		- }
174		-
175		- /**
176	154	* Detects if Scan is enabled.
177	155	*
178	156	* @return boolean
179	157	*/
		@@ -193,32 +171,8 @@
193	171	* @return boolean
194	172	*/
195	173	private function has_protect_plugin() {
196	174	return class_exists( 'Jetpack_Protect' );
197		- }
198		-
199		- /**
200		- * Detects if Backup is enabled.
201		- *
202		- * @return boolean
203		- */
204		- private function has_backup() {
205		- $this->maybe_refresh_transient_cache();
206		- $rewind_state = get_transient( 'jetpack_rewind_state' );
207		- if ( ! $rewind_state ) {
208		- return false;
209		- }
210		-
211		- return isset( $rewind_state->state ) && 'unavailable' !== $rewind_state->state;
212		- }
213		-
214		- /**
215		- * Detects if Backup plugin is active.
216		- *
217		- * @return boolean
218		- */
219		- private function has_backup_plugin() {
220		- return Backup::is_standalone_plugin_active();
221	175	}
222	176
223	177	/**
224	178	* Triggers a cron job to refresh the Scan and Rewind state cache.