← All changes | includes/class-wp-optimize-admin.php +431 -162 3.2.9 → 4.7.0 View file →

		@@ -1,11 +1,10 @@
1	1	<?php
2	2	if (!defined('ABSPATH')) die('No direct access allowed');
3	3
4	4	if (!class_exists('WP_Optimize_Admin')) :
5		-
6	5	class WP_Optimize_Admin {
7		-
	6	+
8	7	/**
9	8	* Class constructor
10	9	*/
11	10	public function __construct() {
		@@ -13,10 +12,11 @@
13	12	add_action('network_admin_menu', array($this, 'admin_menu'));
14	13	} else {
15	14	add_action('admin_menu', array($this, 'admin_menu'));
16	15	}
	16	+ add_action('admin_bar_menu', array($this, 'cache_admin_bar'), 100, 1);
17	17	}
18		-
	18	+
19	19	/**
20	20	* Returns singleton instance object
21	21	*
22	22	* @return WP_Optimize_Admin Returns `WP_Optimize_Admin` object
		@@ -28,12 +28,13 @@
28	28	}
29	29	return $_instance;
30	30	}
31	31
32		-
33	32	/**
34	33	* Builds the Tabs that should be displayed
35	34	*
	35	+ * @param string $page
	36	+ *
36	37	* @return array Returns all tabs specified array
37	38	*/
38	39	public function get_tabs($page) {
39	40	// define tabs for pages.
		@@ -38,14 +39,19 @@
38	39	public function get_tabs($page) {
39	40	// define tabs for pages.
40	41	$pages_tabs = array(
41	42	'WP-Optimize' => array(
	43	+ 'dashboard' => __('Overview', 'wp-optimize'),
	44	+ ),
	45	+ 'wpo_database' => array(
42	46	'optimize' => __('Optimizations', 'wp-optimize'),
43	47	'tables' => __('Tables', 'wp-optimize'),
44	48	'settings' => __('Settings', 'wp-optimize'),
	49	+ 'table_analysis' => __('Table usage', 'wp-optimize').'<span class="menu-pill premium-only">Premium</span>'
45	50	),
46	51	'wpo_images' => array(
47	52	'smush' => __('Compress images', 'wp-optimize'),
	53	+ 'dimensions' => __('Images dimensions', 'wp-optimize').'<span class="menu-pill premium-only">Premium</span>',
48	54	'unused' => __('Unused images and sizes', 'wp-optimize').'<span class="menu-pill premium-only">Premium</span>',
49	55	'lazyload' => __('Lazy-load', 'wp-optimize').'<span class="menu-pill premium-only">Premium</span>',
50	56	),
51	57	'wpo_cache' => array(
		@@ -50,8 +56,9 @@
50	56	),
51	57	'wpo_cache' => array(
52	58	'cache' => __('Page cache', 'wp-optimize'),
53	59	'preload' => __('Preload', 'wp-optimize'),
	60	+ 'lcp' => __('Auto LCP', 'wp-optimize').'<span class="menu-pill premium-only">Premium</span>',
54	61	'advanced' => __('Advanced settings', 'wp-optimize'),
55	62	'gzip' => __('Gzip compression', 'wp-optimize'),
56	63	'settings' => __('Static file headers', 'wp-optimize') // Adds a settings tab
57	64	),
		@@ -59,26 +66,35 @@
59	66	"status" => __('Minify status', 'wp-optimize'),
60	67	"js" => __('JavaScript', 'wp-optimize').'<span class="menu-pill disabled hidden">'.__('Disabled', 'wp-optimize').'</span>',
61	68	"css" => __('CSS', 'wp-optimize').'<span class="menu-pill disabled hidden">'.__('Disabled', 'wp-optimize').'</span>',
62	69	"font" => __('Fonts', 'wp-optimize'),
	70	+ "analytics" => __('Google Analytics', 'wp-optimize').'<span class="menu-pill premium-only">Premium</span>',
63	71	"settings" => __('Settings', 'wp-optimize'),
64	72	"preload" => __('Preload', 'wp-optimize'),
65	73	"advanced" => __('Advanced', 'wp-optimize')
66	74	),
	75	+ 'wpo_performance' => array(
	76	+ '404_detector' => __('Not found requests', 'wp-optimize'),
	77	+ ),
67	78	'wpo_settings' => array(
68	79	'settings' => array(
69	80	'title' => __('Settings', 'wp-optimize'),
70	81	),
	82	+// 'updraftcentral' => array(
	83	+// 'title' => 'UpdraftCentral'
	84	+// ),
	85	+ 'status' => __('System status', 'wp-optimize'),
71	86	),
72	87	'wpo_support' => array('support' => __('Support / FAQs', 'wp-optimize')),
73	88	'wpo_mayalso' => array('may_also' => __('Premium / Plugin family', 'wp-optimize')),
74	89	);
75		-
	90	+
76	91	$tabs = (array_key_exists($page, $pages_tabs)) ? $pages_tabs[$page] : array();
77		-
78		- return apply_filters('wp_optimize_admin_page_'.$page.'_tabs', $tabs);
	92	+ $filtered_tabs = apply_filters('wp_optimize_admin_page_'.$page.'_tabs', $tabs);
	93	+ if (!empty($filtered_tabs) && is_array($filtered_tabs)) return $filtered_tabs;
	94	+ return $tabs;
79	95	}
80		-
	96	+
81	97	/**
82	98	* Main page structure.
83	99	*/
84	100	public function display_admin() {
		@@ -84,39 +100,41 @@
84	100	public function display_admin() {
85	101	$capability_required = WP_Optimize()->capability_required();
86	102	$can_run_optimizations = WP_Optimize()->can_run_optimizations();
87	103	$can_manage_options = WP_Optimize()->can_manage_options();
88		-
	104	+
89	105	if (!current_user_can($capability_required) || (!$can_run_optimizations && !$can_manage_options)) {
90		- echo "Permission denied.";
	106	+ echo esc_html__('Permission denied.', 'wp-optimize');
91	107	return;
92	108	}
	109	+
	110	+ $this->register_admin_content();
93	111
94		- $this->register_admin_content();
	112	+ global $wp_version;
95	113
96		- echo '<div id="wp-optimize-wrap">';
	114	+ echo '<div id="wp-optimize-wrap" class="'.(version_compare($wp_version, '7.0', '>=') ? 'wp-version-7' : '').'">';
	115	+
	116	+ WP_Optimize()->include_template('admin-page-header.php', false, array('show_notices' => !(WP_Optimize()->get_install_or_update_notice()->show_current_notice())));
97	117
98		- WP_Optimize()->include_template('admin-page-header.php', false, array('show_notices' => !(WP_Optimize()->get_install_or_update_notice()->show_current_notice())));
99		-
100	118	do_action('wpo_admin_after_header');
101		-
	119	+
102	120	echo '<div id="actions-results-area"></div>';
103	121
104	122	$pages = $this->get_submenu_items();
105		-
	123	+
106	124	foreach ($pages as $page) {
107	125	if (isset($page['menu_slug'])) {
108	126	$this->display_admin_page($page['menu_slug']);
109	127	}
110	128	}
111		-
	129	+
112	130	do_action('wpo_admin_before_closing_wrap');
113		-
	131	+
114	132	// closes main plugin wrapper div. #wp-optimize-wrap
115	133	echo '</div><!-- END #wp-optimize-wrap -->';
116		-
	134	+
117	135	}
118		-
	136	+
119	137	/**
120	138	* Prepare and display admin page with $page id.
121	139	*
122	140	* @param string $page wp-optimize page id i.e. dashboard, database, images, cache, ...
		@@ -121,18 +139,17 @@
121	139	*
122	140	* @param string $page wp-optimize page id i.e. dashboard, database, images, cache, ...
123	141	*/
124	142	public function display_admin_page($page) {
125		-
126		- $active_page = !empty($_REQUEST['page']) ? $_REQUEST['page'] : '';
127		-
128		- echo '<div class="wpo-page' . ($active_page == $page ? ' active' : '') . '" data-whichpage="'.$page.'">';
129		-
	143	+ $active_page = TeamUpdraft\WP_Optimize\Includes\Fragments\fetch_superglobal('request', 'page', 'string', 'sanitize_text_field', '');
	144	+
	145	+ echo '<div class="wpo-page' . ($active_page === $page ? ' active' : '') . '" data-whichpage="'.esc_attr($page).'">';
	146	+
130	147	echo '<div class="wpo-main">';
131		-
	148	+
132	149	// get defined tabs for $page.
133	150	$tabs = $this->get_tabs($page);
134		-
	151	+
135	152	// if no tabs defined for $page then use $page as $active_tab for load template, doing related actions e t.c.
136	153	if (empty($tabs)) {
137	154	$active_tab = $page;
138	155	} else {
		@@ -137,71 +154,88 @@
137	154	$active_tab = $page;
138	155	} else {
139	156	$tab_keys = array_keys($tabs);
140	157	$default_tab = apply_filters('wp_optimize_admin_'.$page.'_default_tab', $tab_keys[0]);
141		- $active_tab = isset($_GET['tab']) ? substr($_GET['tab'], 12) : $default_tab;
	158	+ $active_tab = substr(TeamUpdraft\WP_Optimize\Includes\Fragments\fetch_superglobal('get', 'tab', null, 'sanitize_text_field', $default_tab), 12);
142	159	if (!in_array($active_tab, array_keys($tabs))) $active_tab = $default_tab;
143	160	}
144		-
	161	+
145	162	do_action('wp_optimize_admin_page_'.$page, $active_tab);
146		-
	163	+
147	164	// if tabs defined then display
148	165	if (!empty($tabs)) {
149	166	WP_Optimize()->include_template('admin-page-header-tabs.php', false, array('page' => $page, 'active_tab' => $active_tab, 'tabs' => $tabs, 'wpo_is_premium' => WP_Optimize::is_premium()));
150	167	}
151		-
	168	+
152	169	foreach ($tabs as $tab_id => $tab_description) {
153	170	// output wrap div for tab with id #wp-optimize-nav-tab-contents-'.$page.'-'.$tab_id
154		- echo '<div class="wp-optimize-nav-tab-contents" id="wp-optimize-nav-tab-'.$page.'-'.$tab_id.'-contents" '.(($tab_id == $active_tab) ? '' : 'style="display:none;"').'>';
	171	+ echo '<div class="wp-optimize-nav-tab-contents" id="wp-optimize-nav-tab-'.esc_attr($page).'-'.esc_attr($tab_id).'-contents" '.(($tab_id === $active_tab) ? '' : 'style="display:none;"').'>';
155	172
156	173	echo '<div class="postbox wpo-tab-postbox">';
157	174	// call action for generate tab content.
158	175
159	176	do_action('wp_optimize_admin_page_'.$page.'_'.$tab_id);
160		-
	177	+
161	178	// closes postbox.
162	179	echo '</div><!-- END .postbox -->';
163	180	// closes tab wrapper.
164	181	echo '</div><!-- END .wp-optimize-nav-tab-contents -->';
165	182	}
166		-
	183	+
167	184	echo '</div><!-- END .wpo-main -->';
168		-
	185	+
169	186	do_action('wp_optimize_admin_after_page_'.$page, $active_tab);
170		-
	187	+
171	188	echo '</div><!-- END .wpo-page -->';
172		-
	189	+
173	190	}
174		-
	191	+
175	192	/**
176	193	* Define required actions for admin pages.
177	194	*/
178	195	public function register_admin_content() {
179		-
	196	+
180	197	do_action('wp_optimize_register_admin_content');
181		-
	198	+
182	199	/**
183	200	* SETTINGS
184	201	*/
185	202	add_action('wp_optimize_admin_page_wpo_settings_settings', array($this, 'output_dashboard_settings_tab'), 20);
186		-
	203	+ add_action('wp_optimize_admin_page_wpo_settings_status', array($this, 'output_dashboard_status_tab'));
	204	+
187	205	/**
	206	+ * UpdraftCentral
	207	+ */
	208	+// add_action('wp_optimize_admin_page_wpo_settings_updraftcentral', array($this, 'output_dashboard_updraftcentral_tab'), 20);
	209	+
	210	+ /**
188	211	* Premium / other plugins
189	212	*/
190	213	add_action('wp_optimize_admin_page_wpo_mayalso_may_also', array($this, 'output_dashboard_other_plugins_tab'), 20);
191	214
192	215	/**
	216	+ * Dashboard
	217	+ */
	218	+ add_action('wp_optimize_admin_page_WP-Optimize_dashboard', array($this, 'output_dashboard'), 20);
	219	+
	220	+ /**
193	221	* DATABASE
194	222	*/
195		- add_action('wp_optimize_admin_page_WP-Optimize_optimize', array($this, 'output_database_optimize_tab'), 20);
196		- add_action('wp_optimize_admin_page_WP-Optimize_tables', array($this, 'output_database_tables_tab'), 20);
197		- add_action('wp_optimize_admin_page_WP-Optimize_settings', array($this, 'output_database_settings_tab'), 20);
	223	+ add_action('wp_optimize_admin_page_wpo_database_optimize', array($this, 'output_database_optimize_tab'), 20);
	224	+ add_action('wp_optimize_admin_page_wpo_database_tables', array($this, 'output_database_tables_tab'), 20);
	225	+ add_action('wp_optimize_admin_page_wpo_database_settings', array($this, 'output_database_settings_tab'), 20);
	226	+ add_action('wp_optimize_admin_page_wpo_database_table_analysis', array($this, 'output_table_usage_tab'), 20);
198	227
199	228	/**
	229	+ * PERFORMANCE
	230	+ */
	231	+ add_action('wp_optimize_admin_page_wpo_performance_404_detector', array($this, 'output_performance_404_requests'), 20);
	232	+
	233	+ /**
200	234	* CACHE
201	235	*/
202	236	add_action('wp_optimize_admin_page_wpo_cache_cache', array($this, 'output_page_cache_tab'), 20);
203		- if (!WP_Optimize()->does_server_handles_cache()) {
	237	+ if (!WP_Optimize()->get_server_compatibility_instance()->does_server_handle_cache()) {
204	238	add_action('wp_optimize_admin_page_wpo_cache_preload', array($this, 'output_page_cache_preload_tab'), 20);
205	239	add_action('wp_optimize_admin_page_wpo_cache_advanced', array($this, 'output_page_cache_advanced_tab'), 20);
206	240	}
207	241	add_action('wp_optimize_admin_page_wpo_cache_gzip', array($this, 'output_cache_gzip_tab'), 20);
		@@ -206,20 +240,22 @@
206	240	}
207	241	add_action('wp_optimize_admin_page_wpo_cache_gzip', array($this, 'output_cache_gzip_tab'), 20);
208	242	add_action('wp_optimize_admin_page_wpo_cache_settings', array($this, 'output_cache_settings_tab'), 20);
209	243	add_action('wpo_page_cache_advanced_settings', array($this, 'output_cloudflare_settings'), 20);
	244	+ add_action('wp_optimize_admin_page_wpo_cache_lcp', array($this, 'output_page_cache_lcp'), 20);
	245	+
210	246	/**
211	247	* SUPPORT
212	248	*/
213	249	add_action('wp_optimize_admin_page_wpo_support_support', array($this, 'output_dashboard_support_tab'), 20);
214	250	// Display Support page.
215		-
	251	+
216	252	if (!WP_Optimize::is_premium()) {
217	253	/**
218	254	* Add action for display Images > Unused images and sizes tab.
219	255	*/
220	256	add_action('wp_optimize_admin_page_wpo_images_unused', array($this, 'admin_page_wpo_images_unused'));
221		-
	257	+
222	258	/**
223	259	* Add action for display Dashboard > Lazyload tab.
224	260	*/
225	261	add_action('wp_optimize_admin_page_wpo_images_lazyload', array($this, 'admin_page_wpo_images_lazyload'));
		@@ -228,49 +264,94 @@
228	264	* Add filter for display footer review message and link.
229	265	*/
230	266	add_filter('admin_footer_text', array($this, 'display_footer_review_message'));
231	267	}
	268	+
	269	+ /**
	270	+ * Add action for display Images > Images dimensions tab.
	271	+ */
	272	+ add_action('wp_optimize_admin_page_wpo_images_dimensions', array($this, 'admin_page_wpo_images_dimensions'));
232	273	}
233		-
	274	+
234	275	/**
235	276	* Database settings
236	277	*/
237	278	public function output_database_settings_tab() {
238	279
239		- if (WP_Optimize()->can_manage_options()) {
240		- WP_Optimize()->include_template('database/settings.php');
	280	+ if (WP_Optimize()->can_run_optimizations()) {
	281	+ $wp_optimize_commands = new WP_Optimize_Commands();
	282	+ $settings_general_data = $wp_optimize_commands->get_widgets_data(array('widgets' => array('wp_optimize_general_settings')));
	283	+ $settings_cleanup_data = $wp_optimize_commands->get_widgets_data(array('widgets' => array('wp_optimize_schedule_cleanup_settings')));
	284	+
	285	+ WP_Optimize()->include_template('database/settings.php', false, array('settings_general_data' => $settings_general_data['data']['wp_optimize_general_settings'], 'settings_cleanup_data' => $settings_cleanup_data['data']['wp_optimize_schedule_cleanup_settings']));
241	286	} else {
242	287	$this->prevent_manage_options_info();
243	288	}
244	289	}
245		-
	290	+
246	291	/**
	292	+ * Table usage tab
	293	+ *
	294	+ * @return void
	295	+ */
	296	+ public function output_table_usage_tab() {
	297	+ if (WP_Optimize::is_premium()) {
	298	+ $extract = array('is_enabled' => (bool) WP_Optimize()->get_options()->get_option(WPO_DB_Table_Analysis::ENABLED_SETTING_NAME), 'dashboard' => WP_Optimize_Premium()->get_db_table_analysis_dashboard());
	299	+ } else {
	300	+ $extract = array('is_enabled' => false);
	301	+ }
	302	+ WP_Optimize()->include_template('database/table-analysis.php', false, $extract);
	303	+ }
	304	+
	305	+ /**
247	306	* Dashboard settings
248	307	*/
249	308	public function output_dashboard_settings_tab() {
250		- $options = WP_Optimize()->get_options();
251		-
252		- if ('POST' == $_SERVER['REQUEST_METHOD']) {
	309	+ if (isset($_SERVER['REQUEST_METHOD']) && 'POST' === $_SERVER['REQUEST_METHOD']) {
253	310	// Nonce check.
254	311	check_admin_referer('wpo_settings');
255	312
256		- $output = $options->save_settings($_POST);
257		-
258	313	if (isset($_POST['wp-optimize-settings'])) {
	314	+ $options = WP_Optimize()->get_options();
259	315	// save settings request sent.
260	316	$output = $options->save_settings($_POST);
	317	+
	318	+ $this->wpo_render_output_messages($output);
261	319	}
	320	+ }
	321	+
	322	+ if (WP_Optimize()->can_manage_options()) {
	323	+ $wp_optimize_commands = new WP_Optimize_Commands();
	324	+ $loggers_data = $wp_optimize_commands->get_widgets_data(array('widgets' => array('wp_optimize_logging_settings')));
	325	+ $settings_trackback_data = $wp_optimize_commands->get_widgets_data(array('widgets' => array('wp_optimize_trackback_toggle_settings')));
	326	+ $settings_comments_data = $wp_optimize_commands->get_widgets_data(array('widgets' => array('wp_optimize_comments_toggle_settings')));
	327	+ $settings_general_data = $wp_optimize_commands->get_widgets_data(array('widgets' => array('wp_optimize_general_settings')));
262	328
263		- $this->wpo_render_output_messages($output);
	329	+ WP_Optimize()->include_template('settings/settings.php', false, array('loggers_data' => $loggers_data['data']['wp_optimize_logging_settings'], 'settings_trackback_data' => $settings_trackback_data['data']['wp_optimize_trackback_toggle_settings'], 'settings_comments_data' => $settings_comments_data['data']['wp_optimize_comments_toggle_settings'], 'settings_general_data' => $settings_general_data['data']['wp_optimize_general_settings']));
	330	+ } else {
	331	+ $this->prevent_manage_options_info();
264	332	}
265		-
	333	+ }
	334	+
	335	+ /**
	336	+ * Outputs the system status page
	337	+ */
	338	+ public function output_dashboard_status_tab() {
	339	+ WP_Optimize()->include_template('status/status-page.php');
	340	+ }
	341	+
	342	+ /**
	343	+ * UpdraftCentral settings tab
	344	+ */
	345	+ public function output_dashboard_updraftcentral_tab() {
266	346	if (WP_Optimize()->can_manage_options()) {
267		- WP_Optimize()->include_template('settings/settings.php');
	347	+ global $updraftcentral_host_plugin;
	348	+ $updraftcentral_host_plugin->debugtools_dashboard();
268	349	} else {
269	350	$this->prevent_manage_options_info();
270	351	}
271	352	}
272		-
	353	+
273	354	/**
274	355	* Dashboard support tab
275	356	*/
276	357	public function output_dashboard_support_tab() {
		@@ -275,9 +356,9 @@
275	356	*/
276	357	public function output_dashboard_support_tab() {
277	358	WP_Optimize()->include_template('settings/support-and-faqs.php');
278	359	}
279		-
	360	+
280	361	/**
281	362	* Dashboard Other plugins / premium tab
282	363	*/
283	364	public function output_dashboard_other_plugins_tab() {
		@@ -282,9 +363,9 @@
282	363	*/
283	364	public function output_dashboard_other_plugins_tab() {
284	365	WP_Optimize()->include_template('settings/may-also-like.php');
285	366	}
286		-
	367	+
287	368	/**
288	369	* Cache tab
289	370	*/
290	371	public function output_page_cache_tab() {
		@@ -289,10 +370,11 @@
289	370	*/
290	371	public function output_page_cache_tab() {
291	372	$wpo_cache = WP_Optimize()->get_page_cache();
292	373	$wpo_cache_options = $wpo_cache->config->get();
293		- $display = $wpo_cache->is_enabled() ? "style='display:block'" : "style='display:none'";
294		-
	374	+ $display = $wpo_cache->is_enabled() ? "display: block;" : "display: none;";
	375	+ $error = is_wp_error(WP_Optimize()->get_init_page_cache_status()) ? WP_Optimize()->get_init_page_cache_status()->get_error_message() : '';
	376	+
295	377	WP_Optimize()->include_template('cache/page-cache.php', false, array(
296	378	'wpo_cache' => $wpo_cache,
297	379	'active_cache_plugins' => WP_Optimize_Detect_Cache_Plugins::instance()->get_active_cache_plugins(),
298	380	'wpo_cache_options' => $wpo_cache_options,
		@@ -297,13 +379,15 @@
297	379	'active_cache_plugins' => WP_Optimize_Detect_Cache_Plugins::instance()->get_active_cache_plugins(),
298	380	'wpo_cache_options' => $wpo_cache_options,
299	381	'cache_size' => $wpo_cache->get_cache_size(),
300	382	'display' => $display,
301		- 'can_purge_the_cache' => WP_Optimize()->can_purge_the_cache(),
302		- 'does_server_handles_cache' => WP_Optimize()->does_server_handles_cache(),
	383	+ 'can_purge_the_cache' => $wpo_cache->can_purge_cache(),
	384	+ 'auto_preload_purged_contents' => $wpo_cache_options['auto_preload_purged_contents'],
	385	+ 'does_server_handle_cache' => WP_Optimize()->get_server_compatibility_instance()->does_server_handle_cache(),
	386	+ 'error' => $error,
303	387	));
304	388	}
305		-
	389	+
306	390	/**
307	391	* Preload tab
308	392	*/
309	393	public function output_page_cache_preload_tab() {
		@@ -309,25 +393,30 @@
309	393	public function output_page_cache_preload_tab() {
310	394	$wpo_cache = WP_Optimize()->get_page_cache();
311	395	$wpo_cache_options = $wpo_cache->config->get();
312	396	$wpo_cache_preloader = WP_Optimize_Page_Cache_Preloader::instance();
313		- $is_running = $wpo_cache_preloader->is_running();
	397	+ $is_running = $wpo_cache_preloader->is_busy() && !$wpo_cache_preloader->is_cancelled();
314	398	$status = $wpo_cache_preloader->get_status_info();
315	399
	400	+ $scheduled_types = WP_Optimize::get_schedule_types();
	401	+ $scheduled_types = array_filter($scheduled_types, function($type) {
	402	+ return 'wpo_once' !== $type;
	403	+ }, ARRAY_FILTER_USE_KEY);
	404	+ $schedule_options = array_merge(
	405	+ array(
	406	+ 'wpo_use_cache_lifespan' => __('Same as cache lifespan', 'wp-optimize')
	407	+ ),
	408	+ $scheduled_types
	409	+ );
	410	+
316	411	WP_Optimize()->include_template('cache/page-cache-preload.php', false, array(
317	412	'wpo_cache_options' => $wpo_cache_options,
318	413	'is_running' => $is_running,
319		- 'status_message' => isset($status['message']) ? $status['message'] : '',
320		- 'schedule_options' => array(
321		- 'wpo_use_cache_lifespan' => __('Same as cache lifespan', 'wp-optimize'),
322		- 'wpo_daily' => __('Daily', 'wp-optimize'),
323		- 'wpo_weekly' => __('Weekly', 'wp-optimize'),
324		- 'wpo_fortnightly' => __('Fortnightly', 'wp-optimize'),
325		- 'wpo_monthly' => __('Monthly (approx. - every 30 days)', 'wp-optimize')
326		- )
	414	+ 'status_message' => $status['message'] ?? '',
	415	+ 'schedule_options' => $schedule_options
327	416	));
328	417	}
329		-
	418	+
330	419	/**
331	420	* Advanced tab
332	421	*/
333	422	public function output_page_cache_advanced_tab() {
		@@ -332,44 +421,72 @@
332	421	*/
333	422	public function output_page_cache_advanced_tab() {
334	423	$wpo_cache = WP_Optimize()->get_page_cache();
335	424	$wpo_cache_options = $wpo_cache->config->get();
336		-
	425	+
337	426	$cache_exception_conditional_tags = is_array($wpo_cache_options['cache_exception_conditional_tags']) ? join("\n", $wpo_cache_options['cache_exception_conditional_tags']) : '';
	427	+ $cache_include_urls = is_array($wpo_cache_options['cache_include_urls']) ? join("\n", $wpo_cache_options['cache_include_urls']) : '';
338	428	$cache_exception_urls = is_array($wpo_cache_options['cache_exception_urls']) ? join("\n", $wpo_cache_options['cache_exception_urls']) : '';
	429	+ $cache_ignore_query_variables = is_array($wpo_cache_options['cache_ignore_query_variables']) ? join("\n", $wpo_cache_options['cache_ignore_query_variables']) : '';
339	430	$cache_exception_cookies = is_array($wpo_cache_options['cache_exception_cookies']) ? join("\n", $wpo_cache_options['cache_exception_cookies']) : '';
340	431	$cache_exception_browser_agents = is_array($wpo_cache_options['cache_exception_browser_agents']) ? join("\n", $wpo_cache_options['cache_exception_browser_agents']) : '';
341		-
	432	+
342	433	WP_Optimize()->include_template('cache/page-cache-advanced.php', false, array(
343	434	'wpo_cache' => $wpo_cache,
344	435	'wpo_cache_options' => $wpo_cache_options,
	436	+ 'show_avatars' => (bool) get_option('show_avatars'),
	437	+ 'cache_include_urls' => $cache_include_urls,
345	438	'cache_exception_urls' => $cache_exception_urls,
	439	+ 'cache_ignore_query_variables' => $cache_ignore_query_variables,
346	440	'cache_exception_conditional_tags' => $cache_exception_conditional_tags,
347	441	'cache_exception_cookies' => $cache_exception_cookies,
348	442	'cache_exception_browser_agents' => $cache_exception_browser_agents,
349	443	));
350	444	}
351		-
	445	+
352	446	/**
353	447	* Gzip tab
354	448	*/
355	449	public function output_cache_gzip_tab() {
356	450	$wpo_gzip_compression = WP_Optimize()->get_gzip_compression();
357		- $wpo_gzip_compression_enabled = $wpo_gzip_compression->is_gzip_compression_enabled(true);
358		- $wpo_gzip_headers_information = $wpo_gzip_compression->get_headers_information();
359		- $is_cloudflare_site = $this->is_cloudflare_site();
	451	+ $wpo_gzip_compression_enabled = $wpo_gzip_compression->is_gzip_compression_enabled();
	452	+ $wpo_gzip_compression_test_results_html = $wpo_gzip_compression->get_compression_test_results_html(true);
	453	+
	454	+ WP_Optimize()->include_template('cache/gzip-compression.php', false, array(
	455	+ 'gzip_compression_control_panel' => $this->get_gzip_compression_control_panel($wpo_gzip_compression_enabled, true),
	456	+ 'wpo_gzip_compression_enabled' => $wpo_gzip_compression_enabled,
	457	+ 'compression_test_results_html' => $wpo_gzip_compression_test_results_html,
	458	+ 'info_link' => 'https://teamupdraft.com/documentation/wp-optimize/topics/caching/faqs/what-is-gzip-compression/?utm_source=wpo-plugin&utm_medium=referral&utm_campaign=paac&utm_content=gzip-compression-guide&utm_creative_format=text',
	459	+ ));
	460	+ }
	461	+
	462	+ /**
	463	+ * Get gzip compression control panel html content.
	464	+ *
	465	+ * @param bool|null $wpo_gzip_compression_enabled Pass gzip compression status if already known to avoid double check.
	466	+ *
	467	+ * @return string
	468	+ */
	469	+ public function get_gzip_compression_control_panel($wpo_gzip_compression_enabled = null, $use_cache = false) {
	470	+ $wpo_gzip_compression = WP_Optimize()->get_gzip_compression();
	471	+ $wpo_gzip_compression_enabled = is_null($wpo_gzip_compression_enabled) ? $wpo_gzip_compression->is_gzip_compression_enabled() : $wpo_gzip_compression_enabled;
	472	+ $wpo_gzip_headers_information = $wpo_gzip_compression->get_headers_information($wpo_gzip_compression->css_resource_url());
	473	+ $is_cloudflare_site = $this->is_cloudflare_site($use_cache);
360	474	$is_gzip_compression_section_exists = $wpo_gzip_compression->is_gzip_compression_section_exists();
361		- $wpo_gzip_compression_enabled_by_wpo = $is_gzip_compression_section_exists && $wpo_gzip_compression_enabled && !$is_cloudflare_site && !(is_array($wpo_gzip_headers_information) && 'brotli' == $wpo_gzip_headers_information['compression']);
	475	+ $wpo_gzip_compression_enabled_by_wpo = $is_gzip_compression_section_exists && true === $wpo_gzip_compression_enabled && !$is_cloudflare_site && !(is_array($wpo_gzip_headers_information) && 'brotli' === $wpo_gzip_headers_information['compression']);
	476	+ $wpo_gzip_compression_content_types = $wpo_gzip_compression->get_enabled_disabled_compression_content_types($use_cache);
	477	+ $wpo_gzip_compression_partially_enabled = count($wpo_gzip_compression_content_types['enabled']) > 0 && count($wpo_gzip_compression_content_types['disabled']) > 0;
362	478
363		- WP_Optimize()->include_template('cache/gzip-compression.php', false, array(
	479	+ return WP_Optimize()->include_template('cache/gzip-compression-control-panel.php', true, array(
364	480	'wpo_gzip_headers_information' => $wpo_gzip_headers_information,
365	481	'wpo_gzip_compression_enabled' => $wpo_gzip_compression_enabled,
366	482	'is_cloudflare_site' => $is_cloudflare_site,
367	483	'wpo_gzip_compression_enabled_by_wpo' => $wpo_gzip_compression_enabled_by_wpo,
368	484	'wpo_gzip_compression_settings_added' => $is_gzip_compression_section_exists,
369		- 'info_link' => 'https://getwpo.com/gzip-compression-explained/',
370	485	'faq_link' => 'https://getwpo.com/gzip-faq-link/',
371		- 'class_name' => (!is_wp_error($wpo_gzip_compression_enabled) && $wpo_gzip_compression_enabled ? 'wpo-enabled' : 'wpo-disabled')
	486	+ 'class_name' => $is_gzip_compression_section_exists ? 'wpo-enabled' : 'wpo-disabled',
	487	+ 'wpo_gzip_compression_content_types' => $wpo_gzip_compression_content_types,
	488	+ 'wpo_gzip_compression_partially_enabled' => $wpo_gzip_compression_partially_enabled,
372	489	));
373	490	}
374	491
375	492	/**
		@@ -375,19 +492,22 @@
375	492	/**
376	493	* Cache tab
377	494	*/
378	495	public function output_cache_settings_tab() {
379		-
	496	+
380	497	$wpo_browser_cache = WP_Optimize()->get_browser_cache();
381	498	$wpo_browser_cache_enabled = $wpo_browser_cache->is_enabled();
382		-
	499	+ $wpo_browser_cache->maybe_reset_error_message_output();
	500	+
383	501	WP_Optimize()->include_template('cache/browser-cache.php', false, array(
384	502	'wpo_browser_cache_enabled' => $wpo_browser_cache_enabled,
385		- 'is_cloudflare_site' => $this->is_cloudflare_site(),
	503	+ 'is_cloudflare_handling_browser_cache' => $this->is_cloudflare_handling_browser_cache(),
386	504	'wpo_browser_cache_settings_added' => $wpo_browser_cache->is_browser_cache_section_exists(),
387	505	'class_name' => (true === $wpo_browser_cache_enabled ? 'wpo-enabled' : 'wpo-disabled'),
388	506	'wpo_browser_cache_expire_days' => WP_Optimize()->get_options()->get_option('browser_cache_expire_days', '28'),
389	507	'wpo_browser_cache_expire_hours' => WP_Optimize()->get_options()->get_option('browser_cache_expire_hours', '0'),
	508	+ 'wpo_browser_cache_error_message' => WP_Optimize()->get_options()->get_option('browser_cache_error_message', ''),
	509	+ 'wpo_browser_cache_output' => WP_Optimize()->get_options()->get_option('browser_cache_output', ''),
390	510	'info_link' => 'https://developer.mozilla.org/en-US/docs/Web/HTTP/Caching',
391	511	'faq_link' => 'https://www.digitalocean.com/community/tutorials/how-to-implement-browser-caching-with-nginx-s-header-module-on-ubuntu-16-04',
392	512	));
393	513	}
		@@ -392,25 +512,62 @@
392	512	));
393	513	}
394	514
395	515	/**
	516	+ * Cache: Auto LCP tab
	517	+ */
	518	+ public function output_page_cache_lcp() {
	519	+ $lcp_options = array();
	520	+ if (WP_Optimize::is_premium()) {
	521	+ $lcp_options['lcp_preload_enable'] = (bool) WPO_Cache_Config::instance()->get_option('lcp_preload_enable');
	522	+ }
	523	+ WP_Optimize()->include_template('cache/page-cache-lcp-settings.php', false, $lcp_options);
	524	+ }
	525	+
	526	+ /**
396	527	* Check if is the current site handled with Cloudflare.
397	528	*
398	529	* @return bool
399	530	*/
400		- public function is_cloudflare_site() {
401		- return isset($_SERVER['HTTP_CF_RAY']);
	531	+ public function is_cloudflare_site($use_cache = false): bool {
	532	+
	533	+ if ($use_cache) {
	534	+ $cached_value = get_transient('wpo_is_cloudflare_site');
	535	+ if (false !== $cached_value) return $cached_value;
	536	+ }
	537	+
	538	+ $response = wp_remote_get(home_url());
	539	+ if (is_wp_error($response)) return false;
	540	+
	541	+ $cloudflare_status = wp_remote_retrieve_header($response, 'cf-cache-status');
	542	+
	543	+ set_transient('wpo_is_cloudflare_site', $cloudflare_status, HOUR_IN_SECONDS);
	544	+
	545	+ return !empty($cloudflare_status);
402	546	}
403	547
404	548	/**
	549	+ * Check if browser cache rules is handled by Cloudflare.
	550	+ *
	551	+ * @return bool
	552	+ */
	553	+ private function is_cloudflare_handling_browser_cache(): bool {
	554	+ $response = wp_remote_get(home_url());
	555	+ if (is_wp_error($response)) return false;
	556	+
	557	+ $headers = wp_remote_retrieve_headers($response);
	558	+ return isset($headers['cf-cache-status']) && (isset($headers['cache-control']) || isset($headers['expires']));
	559	+ }
	560	+
	561	+ /**
405	562	* Include Cloudflare settings template.
406	563	*/
407	564	public function output_cloudflare_settings() {
408	565	if (WP_Optimize::is_premium() || !apply_filters('show_cloudflare_settings', $this->is_cloudflare_site())) return;
409		-
	566	+
410	567	WP_Optimize()->include_template('cache/page-cache-cloudflare-placeholder.php');
411	568	}
412		-
	569	+
413	570	/**
414	571	* Outputs the DB optimize Tab
415	572	*/
416	573	public function output_database_optimize_tab() {
		@@ -415,37 +572,62 @@
415	572	*/
416	573	public function output_database_optimize_tab() {
417	574	$optimizer = WP_Optimize()->get_optimizer();
418	575	$options = WP_Optimize()->get_options();
	576	+ $optimization_results = false;
419	577
420		- // check if nonce passed.
421		- $nonce_passed = (!empty($_REQUEST['_wpnonce']) && wp_verify_nonce($_REQUEST['_wpnonce'], 'wpo_optimization')) ? true : false;
	578	+ $nonce_passed = TeamUpdraft\WP_Optimize\Includes\Fragments\verify_nonce('_wpnonce', 'wpo_optimization');
	579	+
	580	+ // save options.
	581	+ $post = TeamUpdraft\WP_Optimize\Includes\Fragments\fetch_superglobal('post', 'wp-optimize');
422	582
423		- // save options.
424		- if ($nonce_passed && isset($_POST['wp-optimize'])) $options->save_sent_manual_run_optimization_options($_POST, true);
	583	+ if ($nonce_passed && $post) $options->save_sent_manual_run_optimization_options($_POST, true); // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Only isset is used to check
425	584
426		- $optimize_db = ($nonce_passed && isset($_POST["optimize-db"])) ? true : false;
	585	+ $optimize_db = $nonce_passed && TeamUpdraft\WP_Optimize\Includes\Fragments\fetch_superglobal('post', 'optimize-db');
	586	+
	587	+ $optimization_results = (($nonce_passed) ? $optimizer->do_optimizations($_POST) : false); // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Only isset is used to check, and compared again literal string
	588	+
	589	+ // display optimization table or restricted access message.
	590	+ if (WP_Optimize()->can_run_optimizations()) {
427	591
428		- $optimization_results = (($nonce_passed) ? $optimizer->do_optimizations($_POST) : false);
	592	+ $total_table_count = 0;
	593	+ $too_many_tables = $optimizer->is_table_count_too_high($total_table_count);
	594	+ $server_allows_table_optimization = WP_Optimize()->get_server_compatibility_instance()->does_server_allow_table_optimization();
429	595
430		- // display optimizations table or restricted access message.
431		- if (WP_Optimize()->can_run_optimizations()) {
432		- WP_Optimize()->include_template('database/optimize-table.php', false, array('optimize_db' => $optimize_db, 'optimization_results' => $optimization_results, 'load_data' => false, 'does_server_allows_table_optimization' => WP_Optimize()->does_server_allows_table_optimization()));
	596	+ $wp_optimize_commands = new WP_Optimize_Commands();
	597	+ $status_data = $wp_optimize_commands->get_widgets_data(array('widgets' => array('all_status')));
	598	+ $optimizations_table_data = $wp_optimize_commands->get_widgets_data(array('widgets' => array('wp_optimize')));
	599	+
	600	+ // Merge both sets of parameters
	601	+ $template_params = array(
	602	+ 'optimize_db' => $optimize_db,
	603	+ 'optimization_results' => $optimization_results,
	604	+ 'too_many_tables' => $too_many_tables && !$optimizer->is_large_table_count_scan_complete(),
	605	+ 'done_table_count' => $optimizer->get_table_status_count(),
	606	+ 'total_table_count' => $total_table_count,
	607	+ 'should_show_load_in_batches_button' => $server_allows_table_optimization && $too_many_tables && (0 < $total_table_count),
	608	+ 'load_data' => false,
	609	+ 'onboarding_active' => WP_Optimize()->get_onboarding()->is_active(),
	610	+ 'optimizations_table_data' => $optimizations_table_data['data']['wp_optimize'],
	611	+ 'status_data' => $status_data['data']['all_status'],
	612	+ );
	613	+
	614	+ WP_Optimize()->include_template('database/optimize-table.php', false, $template_params);
	615	+
433	616	} else {
434	617	$this->prevent_run_optimizations_message();
435	618	}
436	619	}
437		-
	620	+
438	621	/**
439	622	* Outputs the DB Tables Tab
440	623	*/
441	624	public function output_database_tables_tab() {
442		- // check if nonce passed.
443		- $nonce_passed = (!empty($_REQUEST['_wpnonce']) && wp_verify_nonce($_REQUEST['_wpnonce'], 'wpo_optimization')) ? true : false;
444		-
445		- $optimize_db = ($nonce_passed && isset($_POST["optimize-db"])) ? true : false;
446		-
447		- if (!WP_Optimize()->does_server_allows_table_optimization()) {
	625	+ $nonce_passed = TeamUpdraft\WP_Optimize\Includes\Fragments\verify_nonce('_wpnonce', 'wpo_optimization');
	626	+
	627	+ $optimize_db = $nonce_passed && TeamUpdraft\WP_Optimize\Includes\Fragments\fetch_superglobal('post', 'optimize-db');
	628	+
	629	+ if (!WP_Optimize()->get_server_compatibility_instance()->does_server_allow_table_optimization()) {
448	630	$message = __('Your server takes care of table optimization', 'wp-optimize');
449	631	$this->prevent_run_optimizations_message($message);
450	632	} elseif (WP_Optimize()->can_run_optimizations()) {
451	633	WP_Optimize()->include_template('database/tables.php', false, array('optimize_db' => $optimize_db, 'load_data' => WP_Optimize()->template_should_include_data()));
		@@ -454,14 +636,59 @@
454	636	}
455	637	}
456	638
457	639	/**
	640	+ * Outputs Dashboard Tab
	641	+ */
	642	+ public function output_dashboard() {
	643	+ $data = WP_Optimize_Dashboard::instance()->get_dashboard_data();
	644	+ WP_Optimize()->include_template('dashboard/dashboard.php', false, $data);
	645	+ }
	646	+
	647	+ /**
	648	+ * Outputs Performance 404 requests Tab
	649	+ */
	650	+ public function output_performance_404_requests() {
	651	+ $wp_optimize = WP_Optimize();
	652	+ $is_enabled = $wp_optimize->get_options()->get_option('404_detector', 0);
	653	+
	654	+ $detector = $wp_optimize->get_404_detector();
	655	+ $suspicious_threshold = $detector->get_suspicious_request_count_threshold();
	656	+
	657	+ $report_has_data = false;
	658	+ $requests = array();
	659	+
	660	+ if ($is_enabled) {
	661	+ $requests = $detector->get_suspicious_requests();
	662	+
	663	+ foreach ($requests as $url_requests) {
	664	+ foreach ($url_requests as $row) {
	665	+ if (1 < $row->occurrences && 'grouped' === $row->row_type) {
	666	+ if (0 === $row->non_suspicious_referrers && 1 < $row->total_referrers) {
	667	+ continue;
	668	+ }
	669	+ }
	670	+ $report_has_data = true;
	671	+ }
	672	+ }
	673	+ }
	674	+
	675	+ $wp_optimize->include_template('performance/404-detector.php', false, array(
	676	+ 'requests' => $requests,
	677	+ 'suspicious_threshold' => $suspicious_threshold,
	678	+ 'obj_404_detector' => $detector,
	679	+ 'report_has_data' => $report_has_data,
	680	+ 'is_enabled' => $is_enabled,
	681	+ ));
	682	+ }
	683	+
	684	+ /**
458	685	* Runs upon the WP action admin_page_wpo_images_unused
459	686	*/
460	687	public function admin_page_wpo_images_unused() {
461	688	WP_Optimize()->include_template('images/unused.php');
462	689	}
463		-
	690	+
464	691	/**
465	692	* Runs upon the WP action wp_optimize_admin_page_wpo_images_lazyload
466	693	*/
467	694	public function admin_page_wpo_images_lazyload() {
		@@ -466,10 +693,23 @@
466	693	*/
467	694	public function admin_page_wpo_images_lazyload() {
468	695	WP_Optimize()->include_template('images/lazyload.php');
469	696	}
470		-
	697	+
471	698	/**
	699	+ * Runs upon the WP action wp_optimize_admin_page_wpo_images_dimensions
	700	+ */
	701	+ public function admin_page_wpo_images_dimensions() {
	702	+ $options = WP_Optimize()->get_options();
	703	+ $image_dimensions = $options->get_option('image_dimensions');
	704	+ $ignore_classes = $options->get_option('image_dimensions_ignore_classes');
	705	+ WP_Optimize()->include_template('images/dimensions.php', false, array(
	706	+ 'images_dimensions_status' => $image_dimensions,
	707	+ 'ignore_classes' => $ignore_classes ?: '',
	708	+ ));
	709	+ }
	710	+
	711	+ /**
472	712	* Show footer review message and link.
473	713	*
474	714	* @return string
475	715	*/
		@@ -474,26 +714,29 @@
474	714	* @return string
475	715	*/
476	716	public function display_footer_review_message() {
477	717	$message = sprintf(
478		- __('Enjoyed %s? Please leave us a %s rating. We really appreciate your support!', 'wp-optimize'),
	718	+ // translators: %1$s is plugin name, %2$s is 5-star rating, %3$s is link to Trustpilot, %4$s is link to G2.
	719	+ __('Enjoyed %1$s? Please leave us a %2$s rating on %3$s or %4$s.', 'wp-optimize').' '.__('We really appreciate your support!', 'wp-optimize'),
479	720	'<b>WP-Optimize</b>',
480		- '<a href="https://www.g2.com/products/wp-optimize/reviews" target="_blank">&starf;&starf;&starf;&starf;&starf;</a>'
	721	+ '<span style="color:#2271b1">&starf;&starf;&starf;&starf;&starf;</span>',
	722	+ '<a href="https://uk.trustpilot.com/review/getwpo.com" target="_blank">Trustpilot</a>',
	723	+ '<a href="https://www.g2.com/products/wp-optimize/reviews" target="_blank">G2.com</a>'
481	724	);
482	725	return $message;
483	726	}
484		-
	727	+
485	728	/**
486	729	* Adds menu in admin bar
487	730	*/
488	731	public function wpo_admin_bar() {
489	732	$wp_admin_bar = $GLOBALS['wp_admin_bar'];
490		-
	733	+
491	734	if (defined('WPOPTIMIZE_ADMINBAR_DISABLE') && WPOPTIMIZE_ADMINBAR_DISABLE) return;
492		-
	735	+
493	736	// Show menu item in top bar only for super admins.
494	737	if (is_multisite() & !is_super_admin(get_current_user_id())) return;
495		-
	738	+
496	739	// Add a link called at the top admin bar.
497	740	$args = array(
498	741	'id' => 'wp-optimize-node',
499	742	'title' => apply_filters('wpoptimize_admin_node_title', 'WP-Optimize')
		@@ -498,15 +741,15 @@
498	741	'id' => 'wp-optimize-node',
499	742	'title' => apply_filters('wpoptimize_admin_node_title', 'WP-Optimize')
500	743	);
501	744	$wp_admin_bar->add_node($args);
502		-
	745	+
503	746	$pages = $this->get_submenu_items();
504		-
	747	+
505	748	foreach ($pages as $page_id => $page) {
506		-
	749	+
507	750	if (!isset($page['create_submenu']) || !$page['create_submenu']) {
508		- if (isset($page['icon']) && 'separator' == $page['icon']) {
	751	+ if (isset($page['icon']) && 'separator' === $page['icon']) {
509	752	$args = array(
510	753	'id' => 'wpo-separator-'.$page_id,
511	754	'parent' => 'wp-optimize-node',
512	755	'meta' => array(
		@@ -516,17 +759,17 @@
516	759	$wp_admin_bar->add_node($args);
517	760	}
518	761	continue;
519	762	}
520		-
521		- // 'menu_slug' => 'WP-Optimize',
522		-
	763	+
	764	+ // 'menu_slug' => 'WP-Optimize',
	765	+
523	766	$menu_page_url = menu_page_url($page['menu_slug'], false);
524		-
	767	+
525	768	if (is_multisite()) {
526	769	$menu_page_url = network_admin_url('admin.php?page='.$page['menu_slug']);
527	770	}
528		-
	771	+
529	772	$args = array(
530	773	'id' => 'wpoptimize_admin_node_'.$page_id,
531	774	'title' => $page['menu_title'],
532	775	'parent' => 'wp-optimize-node',
		@@ -533,19 +776,18 @@
533	776	'href' => $menu_page_url,
534	777	);
535	778	$wp_admin_bar->add_node($args);
536	779	}
537		-
	780	+
538	781	}
539		-
	782	+
540	783	/**
541	784	* Manages the admin bar menu for caching (currently page and minify)
542	785	*/
543	786	public function cache_admin_bar($wp_admin_bar) {
544		-
545	787	$options = WP_Optimize()->get_options();
546	788	if (!$options->get_option('enable_cache_in_admin_bar', true)) return;
547		-
	789	+
548	790	/**
549	791	* The "purge cache" menu items
550	792	*
551	793	* @param array $menu_items - The menu items, in the format required by $wp_admin_bar->add_menu()
		@@ -551,11 +793,11 @@
551	793	* @param array $menu_items - The menu items, in the format required by $wp_admin_bar->add_menu()
552	794	* @param object $wp_admin_bar
553	795	*/
554	796	$menu_items = apply_filters('wpo_cache_admin_bar_menu_items', array(), $wp_admin_bar);
555		-
	797	+
556	798	if (empty($menu_items) || !is_array($menu_items)) return;
557		-
	799	+
558	800	$wp_admin_bar->add_menu(array(
559	801	'id' => 'wpo_purge_cache',
560	802	'title' => __('Purge cache', 'wp-optimize'),
561	803	'href' => '#',
		@@ -563,45 +805,45 @@
563	805	'title' => __('Purge cache', 'wp-optimize'),
564	806	),
565	807	'parent' => false,
566	808	));
567		-
	809	+
568	810	foreach ($menu_items as $item) {
569	811	$wp_admin_bar->add_menu($item);
570	812	}
571	813	}
572		-
	814	+
573	815	/**
574	816	* Adds and displays menu and submenu pages
575	817	*/
576	818	public function admin_menu() {
577		-
	819	+
578	820	$capability_required = WP_Optimize()->capability_required();
579	821	$can_run_optimizations = WP_Optimize()->can_run_optimizations();
580	822	$can_manage_options = WP_Optimize()->can_manage_options();
581		-
582		- if (!current_user_can($capability_required) || (!$can_run_optimizations && !$can_manage_options)) return;
583		-
	823	+
	824	+ if (!WP_Optimize()->current_user_can() || (!$can_run_optimizations && !$can_manage_options)) return;
	825	+
584	826	$icon_svg = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmlld0JveD0iMCAwIDE2IDE2IgogICB2ZXJzaW9uPSIxLjEiCiAgIGlkPSJzdmc0MzE2IgogICBoZWlnaHQ9IjE2IgogICB3aWR0aD0iMTYiPgogIDxkZWZzCiAgICAgaWQ9ImRlZnM0MzE4IiAvPgogIDxtZXRhZGF0YQogICAgIGlkPSJtZXRhZGF0YTQzMjEiPgogICAgPHJkZjpSREY+CiAgICAgIDxjYzpXb3JrCiAgICAgICAgIHJkZjphYm91dD0iIj4KICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3N2Zyt4bWw8L2RjOmZvcm1hdD4KICAgICAgICA8ZGM6dHlwZQogICAgICAgICAgIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+CiAgICAgICAgPGRjOnRpdGxlPjwvZGM6dGl0bGU+CiAgICAgIDwvY2M6V29yaz4KICAgIDwvcmRmOlJERj4KICA8L21ldGFkYXRhPgogIDxnCiAgICAgaWQ9ImxheWVyMSI+CiAgICA8cGF0aAogICAgICAgc3R5bGU9ImZpbGw6I2EwYTVhYTtmaWxsLW9wYWNpdHk6MSIKICAgICAgIGlkPSJwYXRoNTciCiAgICAgICBkPSJtIDEwLjc2ODgwOSw2Ljc2MTYwNTEgMCwwIGMgLTAuMDE2ODgsLTAuMDE2ODc4IC0wLjAyNTMxLC0wLjA0MjE4MSAtMC4wMzM3NCwtMC4wNjc0OTkgLTAuMDA4NCwtMC4wMDgzOSAtMC4wMDg0LC0wLjAxNjg3OCAtMC4wMTY4OCwtMC4wMzM3NDMgQyA5Ljk5MjYxMTIsNS4xOTIzMzY2IDguMjIwODU1Nyw0LjU4NDg3ODEgNi43NDQzOTEyLDUuMjkzNTc5NyA1LjY3MjkwMDUsNS44MDgyMzI4IDUuMDU3MDA0Myw2Ljg4ODE2MTMgNS4wNjU0NDIsOC4wMDE4MzY1IDQuNDU3OTgyMiw3LjMxMDAwNzYgMy42OTg2NTg0LDYuNzk1MzU0NSAyLjg1NDk2NDIsNi40OTE2MjUzIDMuMjY4Mzc0Myw1LjA2NTc4MzEgNC4yNTU0OTYsMy44MTcxMTY2IDUuNjg5Nzc0NiwzLjEyNTI4NzggOC4zNjQyODMyLDEuODM0NDM2OCAxMS41NzAzMTksMi45Mzk2NzQ0IDEyLjg4NjQ4MSw1LjU4ODg3MjYgMTMuNDUxNzU1LDYuNzI3ODU5NiAxNC42NDk4MDEsNy4zNTIxOTIxIDE1Ljg0Nzg0Niw3LjIzNDA3NSAxNS43NjM0ODIsNi4zMzk3NiAxNS41MTg4MDUsNS40MzcwMDg2IDE1LjEwNTM5Niw0LjU3NjQ0MDQgMTMuMjE1NTIxLDAuNjg3MDEzNCA4LjUzMzAyMjYsLTAuOTQxMzE2MjcgNC42NDM1OTQzLDAuOTQwMTIxNzkgMi4zMjM0MzcsMi4wNjIyMzM0IDAuODA0Nzg4MTQsNC4xNzk5MDQ0IDAuMzU3NjMxMzIsNi41MzM4MDk4IDIuNDE2MjQzOCw2LjQyNDEyOSA0LjQzMjY3MTcsNy41MDQwNTc0IDUuNDM2NjY2Miw5LjQzNjExNjcgbCAwLjAwODM5LDAgYyAwLjc1OTMxOTIsMS4zNzUyMjAzIDIuNDcyMDE3OCwxLjk0MDQ5NTMgMy45MDYyOTYsMS4yNDg2NjczIDEuMDQ2MTc5OCwtMC41MDYyMTggMS42NTM2NDA4LC0xLjUzNTUyMzggMS42Nzg5NTA4LC0yLjYxNTQ1MTIgMC41ODIxNDgsMC43MDg3MDE4IDEuMzMzMDM1LDEuMjQ4NjY2OCAyLjE1OTg1NiwxLjU3NzcwNjQgLTAuNDM4NzIxLDEuMzU4MzQ3OCAtMS40MDA1MzMsMi41NDc5NTQ4IC0yLjc5MjYyNywzLjIxNDQ3ODggLTIuNTkwMTM4NywxLjI0ODY1OCAtNS42NzgwNTc0LDAuMjUzMTA0IC03LjA2MTcxNTEsLTIuMjI3MzU3IGwgMCwwIEMgMi43NjIxMDQ4LDkuNDUyOTg5NCAxLjUxMzQzODMsOC44MjAyMTkxIDAuMjgxNjQ1OTIsOC45NzIwODQ0IDAuMzgyODg3NjUsOS43OTg5MDQ2IDAuNjE5MTIzMzEsMTAuNjE3Mjg3IDAuOTk4Nzg1MiwxMS40MDE5MjIgYyAxLjg4MTQzNjgsMy44OTc4NjQgNi41NjM5MzcsNS41MjYxOTggMTAuNDYxODAwOCwzLjY0NDc2IDIuMjQ0MjI2LC0xLjA4ODM2OSAzLjczNzU2MiwtMy4xMDQ3OTYgNC4yMzUzNDIsLTUuMzc0MzMyMyAtMS45OTk1NTQsMC4wNDIxODEgLTMuOTQ4NDg2LC0xLjAyOTMwNjMgLTQuOTI3MTcsLTIuOTEwNzQzMyB6IgogICAgICAgY2xhc3M9InN0MTciIC8+CiAgPC9nPgo8L3N2Zz4K';
585		-
	827	+
586	828	// Removes the admin menu items on the left WP bar.
587	829	if (!is_multisite() || (is_multisite() && is_network_admin())) {
588	830	add_menu_page("WP-Optimize", "WP-Optimize", $capability_required, "WP-Optimize", array($this, "display_admin"), $icon_svg);
589		-
	831	+
590	832	$sub_menu_items = $this->get_submenu_items();
591		-
	833	+
592	834	foreach ($sub_menu_items as $menu_item) {
593	835	if ($menu_item['create_submenu']) add_submenu_page('WP-Optimize', $menu_item['page_title'], $menu_item['menu_title'], $capability_required, $menu_item['menu_slug'], $menu_item['function']);
594	836	}
595	837	}
596		-
	838	+
597	839	$options = WP_Optimize()->get_options();
598		-
599		- if ('true' == $options->get_option('enable-admin-menu', 'false')) {
	840	+
	841	+ if ('true' === $options->get_option('enable-admin-menu', 'false')) {
600	842	add_action('wp_before_admin_bar_render', array($this, 'wpo_admin_bar'));
601	843	}
602	844	}
603		-
	845	+
604	846	/**
605	847	* Get the submenu items
606	848	*
607	849	* @return array
		@@ -608,11 +850,20 @@
608	850	*/
609	851	public function get_submenu_items() {
610	852	$sub_menu_items = array(
611	853	array(
	854	+ 'page_title' => __('Overview', 'wp-optimize'),
	855	+ 'menu_title' => __('Overview', 'wp-optimize'),
	856	+ 'menu_slug' => 'WP-Optimize',
	857	+ 'function' => array($this, 'display_admin'),
	858	+ 'icon' => 'chart-bar',
	859	+ 'create_submenu' => true,
	860	+ 'order' => 10,
	861	+ ),
	862	+ array(
612	863	'page_title' => __('Database', 'wp-optimize'),
613	864	'menu_title' => __('Database', 'wp-optimize'),
614		- 'menu_slug' => 'WP-Optimize',
	865	+ 'menu_slug' => 'wpo_database',
615	866	'function' => array($this, 'display_admin'),
616	867	'icon' => 'cloud',
617	868	'create_submenu' => true,
618	869	'order' => 20,
		@@ -639,13 +890,22 @@
639	890	'page_title' => __('Minify', 'wp-optimize'),
640	891	'menu_title' => __('Minify', 'wp-optimize'),
641	892	'menu_slug' => 'wpo_minify',
642	893	'function' => array($this, 'display_admin'),
643		- 'icon' => 'dashboard',
	894	+ 'icon' => 'editor-contract',
644	895	'create_submenu' => true,
645	896	'order' => 50,
646	897	),
647	898	array(
	899	+ 'page_title' => __('Performance', 'wp-optimize'),
	900	+ 'menu_title' => __('Performance', 'wp-optimize'),
	901	+ 'menu_slug' => 'wpo_performance',
	902	+ 'function' => array($this, 'display_admin'),
	903	+ 'icon' => 'performance',
	904	+ 'create_submenu' => true,
	905	+ 'order' => 53,
	906	+ ),
	907	+ array(
648	908	'create_submenu' => false,
649	909	'order' => 55,
650	910	'icon' => 'separator',
651	911	),
		@@ -676,24 +936,33 @@
676	936	'create_submenu' => true,
677	937	'order' => 70,
678	938	),
679	939	);
680		-
681		- $sub_menu_items = apply_filters('wp_optimize_sub_menu_items', $sub_menu_items);
682		-
683		- usort($sub_menu_items, array($this, 'order_sort'));
684		-
685		- return $sub_menu_items;
	940	+
	941	+ $filtered_sub_menu_items = apply_filters('wp_optimize_sub_menu_items', $sub_menu_items);
	942	+
	943	+ if (empty($filtered_sub_menu_items) || !is_array($filtered_sub_menu_items)) {
	944	+ $filtered_sub_menu_items = $sub_menu_items;
	945	+ }
	946	+
	947	+ usort($filtered_sub_menu_items, array($this, 'order_sort'));
	948	+
	949	+ return $filtered_sub_menu_items;
686	950	}
687		-
	951	+
688	952	/**
689	953	* Order sorting function
	954	+ *
	955	+ * @param array $a
	956	+ * @param array $b
	957	+ *
	958	+ * @return int
690	959	*/
691	960	public function order_sort($a, $b) {
692		- if ($a['order'] == $b['order']) return 0;
	961	+ if ($a['order'] === $b['order']) return 0;
693	962	return ($a['order'] > $b['order']) ? 1 : -1;
694	963	}
695		-
	964	+
696	965	/**
697	966	* Output information message for users who have no permissions to run optimizations.
698	967	*
699	968	* @param string $message Message to display
		@@ -703,9 +972,9 @@
703	972	$message = __('You have no permissions to run optimizations.', 'wp-optimize');
704	973	}
705	974	WP_Optimize()->include_template('info-message.php', false, array('message' => $message));
706	975	}
707		-
	976	+
708	977	/**
709	978	* Output information message for users who have no permissions to manage settings.
710	979	*/
711	980	public function prevent_manage_options_info() {
		@@ -710,9 +979,9 @@
710	979	*/
711	980	public function prevent_manage_options_info() {
712	981	WP_Optimize()->include_template('info-message.php', false, array('message' => __('You have no permissions to manage WP-Optimize settings.', 'wp-optimize')));
713	982	}
714		-
	983	+
715	984	/**
716	985	* Output success/error messages from $output array.
717	986	*
718	987	* @param array $output ['messages' => success messages, 'errors' => error messages]
		@@ -718,13 +987,13 @@
718	987	* @param array $output ['messages' => success messages, 'errors' => error messages]
719	988	*/
720	989	private function wpo_render_output_messages($output) {
721	990	foreach ($output['messages'] as $item) {
722		- echo '<div class="updated fade below-h2"><strong>'.$item.'</strong></div>';
	991	+ echo '<div class="updated fade below-h2"><strong>'.esc_html($item).'</strong></div>';
723	992	}
724		-
	993	+
725	994	foreach ($output['errors'] as $item) {
726		- echo '<div class="error fade below-h2"><strong>'.$item.'</strong></div>';
	995	+ echo '<div class="error fade below-h2"><strong>'.esc_html($item).'</strong></div>';
727	996	}
728	997	}
729	998	}
730	999	endif;