PluginProbe
WP-Optimize – Cache, Compress images, Minify & Clean database to boost page speed & performance / 4.7.0
WP-Optimize – Cache, Compress images, Minify & Clean database to boost page speed & performance v4.7.0
4.7.0 4.6.1 4.6.0 4.5.5 4.5.4 4.5.3 4.5.2 3.2.20 3.2.21 3.2.22 3.2.3 3.2.5 3.2.6 3.2.7 3.2.9 3.3.0 3.3.1 3.3.2 3.4.0 3.4.1 3.4.2 3.5.0 3.6.0 3.7.0 3.7.1 All 111 releases
← All changes | wp-optimize.php +556 -209 3.6.0 → 4.7.0 View file →
@@ -1,13 +1,15 @@
1 1 <?php
2 2 /**
3 3 Plugin Name: WP-Optimize - Clean, Compress, Cache
4 -Plugin URI: https://getwpo.com
4 +Plugin URI: https://teamupdraft.com/wp-optimize
5 5 Description: WP-Optimize makes your site fast and efficient. It cleans the database, compresses images and caches pages. Fast sites attract more traffic and users.
6 -Version: 3.6.0
6 +Version: 4.7.0
7 +Requires at least: 4.9
8 +Requires PHP: 7.2
7 9 Update URI: https://wordpress.org/plugins/wp-optimize/
8 -Author: David Anderson, Ruhani Rabin, Team Updraft
9 -Author URI: https://updraftplus.com
10 +Author: TeamUpdraft, DavidAnderson
11 +Author URI: https://teamupdraft.com/wp-optimize?utm_source=wpo-wp-dir&utm_medium=referral&utm_campaign=plugin-dir&utm_content=teamupdraft&utm_creative_format=author
10 12 Text Domain: wp-optimize
11 13 Domain Path: /languages
12 14 License: GPLv2 or later
13 15 */
@@ -15,19 +17,21 @@
15 17 if (!defined('ABSPATH')) die('No direct access allowed');
16 18
17 19 // Check to make sure if WP_Optimize is already call and returns.
18 20 if (!class_exists('WP_Optimize')) :
19 -define('WPO_VERSION', '3.6.0');
21 +define('WPO_VERSION', '4.7.0');
20 22 define('WPO_PLUGIN_URL', plugin_dir_url(__FILE__));
21 23 define('WPO_PLUGIN_MAIN_PATH', plugin_dir_path(__FILE__));
22 24 define('WPO_PLUGIN_SLUG', plugin_basename(__FILE__));
23 25 define('WPO_PREMIUM_NOTIFICATION', false);
24 -define('WPO_MINIFY_PHP_VERSION_MET', version_compare(PHP_VERSION, '5.4', '>=') ? true : false);
26 +define('WPO_REQUIRED_PHP_VERSION', '7.2');
27 +define('WPO_REQUIRED_WP_VERSION', '4.9');
25 28 if (!defined('WPO_USE_WEBP_CONVERSION')) define('WPO_USE_WEBP_CONVERSION', true);
29 +require_once(WPO_PLUGIN_MAIN_PATH.'includes/fragments/input-processing.php');
26 30
27 31 class WP_Optimize {
28 32
29 - public $premium_version_link = 'https://getwpo.com/buy/';
33 + public $premium_version_link = 'https://teamupdraft.com/wp-optimize/pricing/?utm_source=wpo-plugin&utm_medium=referral&utm_campaign=paac&utm_creative_format=overlay';
30 34
31 35 private $template_directories;
32 36
33 37 protected static $_instance = null;
@@ -34,13 +38,49 @@
34 38
35 39 protected $_cache_init_status = null;
36 40
37 41 /**
42 + * An array of schedule types
43 + *
44 + * @param boolean $placeholder Determines whether a placeholder select option should be included or not
45 + *
46 + * @return array An array of schedule types
47 + */
48 + public static function get_schedule_types($placeholder = false) {
49 + $schedule_types = array(
50 + 'wpo_daily' => __('Daily', 'wp-optimize'),
51 + 'wpo_weekly' => __('Weekly', 'wp-optimize'),
52 + 'wpo_fortnightly' => __('Fortnightly', 'wp-optimize'),
53 + 'wpo_monthly' => __('Monthly', 'wp-optimize'),
54 + );
55 +
56 + $schedule_types = apply_filters('wp_optimize_schedule_types', $schedule_types);
57 + if (true === $placeholder) {
58 + $schedule_types = array_merge(array('' => __('Select schedule', 'wp-optimize')), $schedule_types);
59 + }
60 + return $schedule_types;
61 + }
62 +
63 + /**
38 64 * Class constructor
39 65 */
40 66 public function __construct() {
67 +
41 68 spl_autoload_register(array($this, 'loader'));
42 69
70 + // Don't process when accessing without normal WordPress core loading.
71 + if (!defined('WPINC')) return;
72 +
73 + $bypass_instance = $this->get_bypass_instance();
74 + if ($bypass_instance->should_bypass()) {
75 + // Show a bypass notice in the admin bar
76 + $bypass_instance->show_admin_notice();
77 + if (!headers_sent()) {
78 + header('WPO-Bypass-Mode: active');
79 + }
80 + return;
81 + }
82 +
43 83 // Checks if premium is installed along with plugins needed.
44 84 add_action('plugins_loaded', array($this, 'plugins_loaded'), 1);
45 85
46 86 register_activation_hook(__FILE__, array('WPO_Activation', 'actions'));
@@ -45,15 +85,14 @@
45 85
46 86 register_activation_hook(__FILE__, array('WPO_Activation', 'actions'));
47 87 register_deactivation_hook(__FILE__, array('WPO_Deactivation', 'actions'));
48 88 register_uninstall_hook(__FILE__, array('WPO_Uninstall', 'actions'));
49 -
89 +
90 + WPO_Page_Optimizer::instance()->maybe_initialise();
91 +
50 92 $this->load_admin();
51 93 add_action('admin_init', array($this, 'admin_init'));
52 - add_action('admin_bar_menu', array($this, 'cache_admin_bar'), 100, 1);
53 94
54 - add_action('init', array($this, 'schedule_plugin_cron_tasks'));
55 -
56 95 add_filter("plugin_action_links_".plugin_basename(__FILE__), array($this, 'plugin_settings_link'));
57 96 add_action('wpo_cron_event2', array($this, 'cron_action'));
58 97 add_filter('cron_schedules', array($this, 'cron_schedules'));
59 98
@@ -58,23 +97,24 @@
58 97 add_filter('cron_schedules', array($this, 'cron_schedules'));
59 98
60 99 if (!$this->get_options()->get_option('installed-for', false)) $this->get_options()->update_option('installed-for', time());
61 100
62 - if (!self::is_premium()) {
63 - add_action('auto_option_settings', array($this->get_options(), 'auto_option_settings'));
64 - }
101 + add_action('admin_footer-upload.php', array($this, 'add_smush_popup_template'));
65 102
66 103 add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
67 104
68 105 add_action('wp_enqueue_scripts', array($this, 'frontend_enqueue_scripts'));
69 106
107 + if ($this->get_options()->get_option('404_detector', 0)) {
108 + WP_Optimize_Performance::get_instance($this->get_404_detector())->hook_404_handler();
109 + }
110 +
70 111 $this->load_ajax_handler();
71 - WP_Optimize_Heartbeat::get_instance();
72 112
73 113 // Show update to Premium notice for non-premium multisite.
74 114 add_action('wpo_additional_options', array($this, 'show_multisite_update_to_premium_notice'));
75 115
76 - // Action column (show repair button if need).
116 + // Action column (show repair button, if needed).
77 117 add_filter('wpo_tables_list_additional_column_data', array($this, 'tables_list_additional_column_data'), 15, 2);
78 118
79 119 /**
80 120 * Add action for display Images > Compress images tab.
@@ -80,9 +120,9 @@
80 120 * Add action for display Images > Compress images tab.
81 121 */
82 122 add_action('wp_optimize_admin_page_wpo_images_smush', array($this, 'admin_page_wpo_images_smush'));
83 123
84 - include_once(WPO_PLUGIN_MAIN_PATH.'includes/updraftcentral.php');
124 + include_once(WPO_PLUGIN_MAIN_PATH.'includes/updraftcentral/updraftcentral.php');
85 125
86 126 include_once(WPO_PLUGIN_MAIN_PATH.'includes/backward-compatibility-functions.php');
87 127
88 128 register_shutdown_function(array($this, 'log_fatal_errors'));
@@ -91,9 +131,9 @@
91 131
92 132 add_action('upgrader_process_complete', array($this, 'detect_active_plugins_and_themes_updates'), 10, 2);
93 133
94 134 $import_done_hooks = array(
95 - 'import_end', // wordpress importer
135 + 'import_end', // WordPress importer
96 136 'pmxi_after_xml_import', // wp all import
97 137 );
98 138
99 139 $db_update_hooks = apply_filters('wp_optimize_db_update_hooks', $import_done_hooks);
@@ -102,16 +142,87 @@
102 142 add_action($hook, array($this, 'maybe_schedule_update_record_count_event'));
103 143 }
104 144 add_action('wpo_update_record_count_event', array($this->get_db_info(), 'wpo_update_record_count'));
105 145
146 + add_action('wpo_reset_stats_counter', array($this, 'reset_stats_counters'));
147 +
148 + $this->schedule_reset_stats_counters_event();
149 +
106 150 }
107 151
108 152 /**
109 - * Auto-loads classes.
153 + * Reset stats counter at the start of each month
154 + */
155 + public function reset_stats_counters() {
156 + // Save current total cleaned as previous month data
157 + $options = $this->get_options();
158 + $last_month_total_cleaned = $options->get_option('total-cleaned-current-month');
159 + $options->update_option('total-cleaned-previous-month', $last_month_total_cleaned);
160 + $options->update_option('total-cleaned-current-month', '0');
161 + $this->schedule_reset_stats_counters_event();
162 + }
163 +
164 + /**
165 + * Schedule the reset of stat's counter at the start of each month
166 + */
167 + private function schedule_reset_stats_counters_event() {
168 + if (!wp_next_scheduled('wpo_reset_stats_counter')) {
169 + $next_reset = strtotime('first day of next month midnight');
170 + wp_schedule_single_event($next_reset, 'wpo_reset_stats_counter');
171 + }
172 + }
173 +
174 + /**
175 + * Returns Onboarding class instance
110 176 *
177 + * @return WPO_Onboarding
178 + */
179 + public function get_onboarding() {
180 + return WPO_Onboarding::instance();
181 + }
182 +
183 + /**
184 + * Check if minimum requirements for WP-Optimize is met or not.
185 + *
186 + * @return bool
187 + */
188 + public function is_minimum_requirement_met() {
189 + global $wp_version;
190 + return (version_compare(WPO_REQUIRED_PHP_VERSION, PHP_VERSION, '<=') && version_compare(WPO_REQUIRED_WP_VERSION, $wp_version, '<='));
191 + }
192 +
193 + /**
194 + * Add admin notice about minimum server requirements.
195 + */
196 + public function add_notice_minimum_requirements_not_met() {
197 + add_action('admin_notices', array($this, 'output_minimum_requirements_notice'));
198 + }
199 +
200 + /**
201 + * Deactivate the plugin programmatically
202 + */
203 + public function deactivate_plugin() {
204 + if (!function_exists('deactivate_plugins')) {
205 + require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
206 + }
207 + deactivate_plugins(plugin_basename(__FILE__));
208 + }
209 +
210 + /**
211 + * Die after stating minimum requirements
212 + */
213 + public function die_minimum_requirement_not_met() {
214 + $message = $this->get_minimum_requirements_notice_message();
215 + $message .= ' <a href="'.esc_url(admin_url('plugins.php')).'">'.esc_html__('Back to Plugins.', 'wp-optimize').'</a>';
216 + wp_die(wp_kses_post($message));
217 + }
218 +
219 + /**
220 + * Autoloads classes.
221 + *
111 222 * @param string $class_name The name of the class.
112 223 */
113 - private function loader($class_name) {
224 + public function loader($class_name) {
114 225 $dirs = $this->get_class_directories();
115 226
116 227 foreach ($dirs as $dir) {
117 228 $class_file = WPO_PLUGIN_MAIN_PATH . trailingslashit($dir) . 'class-' . str_replace('_', '-', strtolower($class_name)) . '.php';
@@ -118,8 +229,14 @@
118 229 if (file_exists($class_file)) {
119 230 require_once($class_file);
120 231 return;
121 232 }
233 +
234 + $interface_file = WPO_PLUGIN_MAIN_PATH . trailingslashit($dir) . 'interface-' . str_replace('_', '-', strtolower($class_name)) . '.php';
235 + if (file_exists($interface_file)) {
236 + require_once($interface_file);
237 + return;
238 + }
122 239 }
123 240
124 241 // Include PHP Minify - https://github.com/matthiasmullie/minify
125 242 if (strpos($class_name, 'MatthiasMullie') !== false) {
@@ -129,12 +246,11 @@
129 246 require_once($class_file);
130 247 return;
131 248 }
132 249 }
133 -
134 - if ('Minify_HTML' == $class_name) {
250 +
251 + if ('Minify_HTML' === $class_name) {
135 252 require_once WPO_PLUGIN_MAIN_PATH.'vendor/mrclay/minify/lib/Minify/HTML.php';
136 - return;
137 253 }
138 254 }
139 255
140 256 /**
@@ -146,11 +262,17 @@
146 262 return array(
147 263 'cache',
148 264 'compatibility',
149 265 'includes',
266 + 'includes/tables',
267 + 'includes/list-tables',
268 + 'includes/dashboard',
269 + 'includes/gravatars',
270 + 'includes/lcp',
150 271 'minify',
151 272 'optimizations',
152 273 'webp',
274 + 'includes/updraftcentral',
153 275 );
154 276 }
155 277
156 278 /**
@@ -160,8 +282,17 @@
160 282 $this->get_admin_instance();
161 283 }
162 284
163 285 /**
286 + * Returns Bypass class instance
287 + *
288 + * @return WP_Optimize_Bypass
289 + */
290 + private function get_bypass_instance() {
291 + return WP_Optimize_Bypass::instance();
292 + }
293 +
294 + /**
164 295 * Returns Admin class instance
165 296 *
166 297 * @return WP_Optimize_Admin
167 298 */
@@ -182,11 +313,23 @@
182 313 $should_purge_cache = false;
183 314 $skin = $upgrader_object->skin;
184 315 if ('plugin' === $options['type']) {
185 316 // A plugin is updated using the default update system (upgrader_overwrote_package is used for the upload method)
186 - if (property_exists($skin, 'plugin_active') && $skin->plugin_active) {
187 - $should_purge_cache = true;
317 + $plugins = array();
318 + if (!empty($options['plugin'])) {
319 + $plugins = array($options['plugin']);
320 + } elseif (!empty($options['plugins']) && is_array($options['plugins'])) {
321 + $plugins = $options['plugins'];
188 322 }
323 +
324 + foreach ($plugins as $plugin) {
325 + if (!empty($plugin) && ! is_wp_error($upgrader_object->result)) {
326 + if (is_plugin_active($plugin)) {
327 + $should_purge_cache = true;
328 + break;
329 + }
330 + }
331 + }
189 332 } elseif ('theme' === $options['type']) {
190 333 $active_theme = get_stylesheet();
191 334 $parent_theme = get_template();
192 335 // A theme is updated using the upload system
@@ -192,9 +335,9 @@
192 335 // A theme is updated using the upload system
193 336 if (isset($options['action']) && 'install' === $options['action'] && isset($skin->options['overwrite']) && 'update-theme' === $skin->options['overwrite']) {
194 337 $updated_theme = $upgrader_object->result['destination_name'];
195 338 // Check if the theme is in use
196 - if ($active_theme == $updated_theme || $parent_theme == $updated_theme) {
339 + if ($active_theme === $updated_theme || $parent_theme === $updated_theme) {
197 340 $should_purge_cache = true;
198 341 }
199 342 // A theme is updated using the classic update system
200 343 } elseif (isset($options['action']) && 'update' === $options['action'] && isset($options['themes']) && is_array($options['themes'])) {
@@ -223,11 +366,12 @@
223 366
224 367 public function admin_page_wpo_images_smush() {
225 368 $options = Updraft_Smush_Manager()->get_smush_options();
226 369 $custom = 90 >= $options['image_quality'] && 65 <= $options['image_quality'];
227 - $sites = WP_Optimize()->get_sites();
228 - $this->include_template('images/smush.php', false, array('smush_options' => $options, 'custom' => $custom, 'sites' => $sites, 'does_server_allows_local_webp_conversion' => $this->does_server_allows_local_webp_conversion()));
229 - $this->include_template('images/smush-popup.php');
370 + $sites = $this->get_sites();
371 + $compression_server_hint = Updraft_Smush_Manager()->get_compression_server_hint();
372 + $this->include_template('images/smush.php', false, array('smush_options' => $options, 'custom' => $custom, 'sites' => $sites, 'does_server_allow_local_webp_conversion' => $this->get_server_compatibility_instance()->does_server_allow_local_webp_conversion(), 'compression_server_hint' => $compression_server_hint));
373 + $this->add_smush_popup_template();
230 374 }
231 375
232 376 public static function instance() {
233 377 if (empty(self::$_instance)) {
@@ -243,13 +387,29 @@
243 387 /**
244 388 * Adds 3rd party plugin compatibilities.
245 389 */
246 390 public function load_compatibilities() {
247 - WPO_Polylang_Compatibility::instance();
391 + global $wp_version;
392 +
393 + if (class_exists('Polylang')) {
394 + WPO_Polylang_Compatibility::instance();
395 + }
396 +
397 + if (version_compare($wp_version, '5.2', '<')) {
398 + WPO_WP_Kses_Compatibility::instance();
399 + }
400 +
248 401 WPO_Page_Builder_Compatibility::instance();
249 - WPO_Custom_Permalink_Compatibility::instance();
250 - WPO_TranslatePress_Compatibility::instance();
402 + WPO_KD_Submissions_Compatibility::instance();
251 403
404 + if (class_exists('Custom_Permalinks')) {
405 + WPO_Custom_Permalink_Compatibility::instance();
406 + }
407 +
408 + if (class_exists('TRP_Translate_Press')) {
409 + WPO_TranslatePress_Compatibility::instance();
410 + }
411 +
252 412 do_action('wpo_load_compatibilities');
253 413 }
254 414
255 415 /**
@@ -269,58 +429,59 @@
269 429 return WP_Optimize_Notices::instance();
270 430 }
271 431
272 432 /**
273 - * Returns instance if WPO_Page_Cache class.
433 + * Get and instantiate WP_Optimize_Delay_JS
274 434 *
275 - * @return WPO_Page_Cache
435 + * @return WP_Optimize_Delay_JS
276 436 */
277 - public function get_page_cache() {
278 - return WPO_Page_Cache::instance();
437 + private function get_delay_js() {
438 + return WP_Optimize_Delay_JS::instance();
279 439 }
280 440
281 441 /**
282 - * Returns instance if WP_Optimize_WebP class.
442 + * Returns instance of WPO_Page_Optimizer class.
283 443 *
284 - * @return WP_Optimize_WebP
444 + * @return WPO_Page_Optimizer
285 445 */
286 - public function get_webp_instance() {
287 - return WP_Optimize_WebP::get_instance();
446 + public function get_page_optimizer() {
447 + return WPO_Page_Optimizer::instance();
288 448 }
289 449
290 450 /**
291 - * Detects if the platform is Kinsta or not
451 + * Returns instance 404 Detector Cron class.
292 452 *
293 - * @return bool Returns true if it is Kinsta platform, otherwise returns false
453 + * @return WP_Optimize_404_Detector_Cron
294 454 */
295 - private function is_kinsta() {
296 - return isset($_SERVER['KINSTA_CACHE_ZONE']);
455 + private function get_404_detector_cron() {
456 + return WP_Optimize_404_Detector_Cron::get_instance();
297 457 }
298 458
299 459 /**
300 - * Detects whether the server handles cache. eg. Nginx cache
460 + * Returns instance of WPO_Page_Cache class.
461 + *
462 + * @return WPO_Page_Cache
301 463 */
302 - public function does_server_handles_cache() {
303 - return $this->is_kinsta();
464 + public function get_page_cache() {
465 + return WPO_Page_Cache::instance();
304 466 }
305 467
306 468 /**
307 - * Detects whether the server supports table optimization.
469 + * Returns instance of WP_Optimize_WebP class.
308 470 *
309 - * Some servers prevent table optimization
310 - * because InnoDB engine does not optimize table
311 - * instead it drops tables and recreate them
312 - * which results in elevated disk write operations
471 + * @return WP_Optimize_WebP
313 472 */
314 - public function does_server_allows_table_optimization() {
315 - return !$this->is_kinsta();
473 + public function get_webp_instance() {
474 + return WP_Optimize_WebP::get_instance();
316 475 }
317 476
318 477 /**
319 - * Detects whether the server supports local webp conversion tools
478 + * Returns instance of WP_Optimize_Server_Compatibility class.
479 + *
480 + * @return WP_Optimize_Server_Compatibility
320 481 */
321 - private function does_server_allows_local_webp_conversion() {
322 - return !$this->is_kinsta();
482 + public function get_server_compatibility_instance(): WP_Optimize_Server_Compatibility {
483 + return WP_Optimize_Server_Compatibility::get_instance();
323 484 }
324 485
325 486 /**
326 487 * Create instance of WP_Optimize_Browser_Cache.
@@ -382,8 +543,9 @@
382 543 /**
383 544 * Enqueue scripts and styles on WP-Optimize pages.
384 545 */
385 546 public function admin_enqueue_scripts() {
547 + global $wp_version;
386 548 $enqueue_version = $this->get_enqueue_version();
387 549 $min_or_not = $this->get_min_or_not_string();
388 550 $min_or_not_internal = $this->get_min_or_not_internal_string();
389 551
@@ -394,8 +556,17 @@
394 556 wp_enqueue_style('wp-optimize-global', WPO_PLUGIN_URL.'css/wp-optimize-global'.$min_or_not_internal.'.css', array(), $enqueue_version);
395 557
396 558 // load scripts and styles only on WP-Optimize pages.
397 559 if (!$this->is_wpo_page()) return;
560 +
561 + wp_enqueue_script( 'jquery-ui-tooltip' );
562 + // Defeat other plugins/themes which dump their jQuery UI CSS onto our settings page
563 + wp_deregister_style('jquery-ui');
564 + wp_enqueue_style('jquery-ui', WPO_PLUGIN_URL.'css/jquery-ui.custom' . $min_or_not_internal . '.css', array(), $enqueue_version);
565 +
566 +
567 + wp_enqueue_script('select2', WPO_PLUGIN_URL . 'js/select2/select2' . $min_or_not . '.js', array('jquery'), $enqueue_version);
568 + wp_enqueue_style('select2', WPO_PLUGIN_URL . 'css/select2/select2' . $min_or_not . '.css', array(), $enqueue_version);
398 569
399 570 wp_enqueue_script('jquery-serialize-json', WPO_PLUGIN_URL.'js/serialize-json/jquery.serializejson'.$min_or_not.'.js', array('jquery'), $enqueue_version);
400 571
401 572 wp_register_script('updraft-queue-js', WPO_PLUGIN_URL.'js/queue'.$min_or_not_internal.'.js', array(), $enqueue_version);
@@ -403,22 +574,32 @@
403 574 wp_enqueue_script('wp-optimize-modal', WPO_PLUGIN_URL.'js/modal'.$min_or_not_internal.'.js', array('jquery', 'backbone', 'wp-util'), $enqueue_version);
404 575 wp_enqueue_script('wp-optimize-cache-js', WPO_PLUGIN_URL.'js/cache'.$min_or_not_internal.'.js', array('wp-optimize-send-command', 'smush-js', 'wp-optimize-heartbeat-js', 'wp-optimize-block-ui'), $enqueue_version);
405 576 wp_enqueue_script('wp-optimize-admin-js', WPO_PLUGIN_URL.'js/wpoadmin'.$min_or_not_internal.'.js', array('jquery', 'updraft-queue-js', 'wp-optimize-send-command', 'smush-js', 'wp-optimize-modal', 'wp-optimize-cache-js', 'wp-optimize-heartbeat-js'), $enqueue_version);
406 577 wp_enqueue_style('wp-optimize-admin-css', WPO_PLUGIN_URL.'css/wp-optimize-admin'.$min_or_not_internal.'.css', array(), $enqueue_version);
407 - // Using tablesorter to help with organising the DB size on Table Information
408 - // https://github.com/Mottie/tablesorter
409 - wp_enqueue_script('tablesorter-js', WPO_PLUGIN_URL.'js/tablesorter/jquery.tablesorter'.$min_or_not.'.js', array('jquery', 'wp-optimize-send-command'), $enqueue_version);
578 + // Using table sorter to help with organising the DB size on Table Information
579 + // https://github.com/tofsjonas/sortable/
580 + wp_enqueue_script('sortable-js', WPO_PLUGIN_URL.'js/sortable/sortable'.$min_or_not.'.js', array('wp-optimize-send-command'), $enqueue_version);
581 + wp_enqueue_script('sortable-a11y-js', WPO_PLUGIN_URL.'js/sortable/sortable.a11y'.$min_or_not.'.js', array('wp-optimize-send-command'), $enqueue_version);
410 582
411 - wp_enqueue_script('tablesorter-widgets-js', WPO_PLUGIN_URL.'js/tablesorter/jquery.tablesorter.widgets'.$min_or_not.'.js', array('jquery'), $enqueue_version);
583 + wp_enqueue_style('sortable-css', WPO_PLUGIN_URL.'css/sortable/sortable'.$min_or_not_internal.'.css', array(), $enqueue_version);
412 584
413 - // wp_enqueue_style('tablesorter-css', WPO_PLUGIN_URL.'css/tablesorter/theme.default.min.css', array(), $enqueue_version);
414 -
415 585 $js_variables = $this->wpo_js_translations();
416 586 $js_variables['loggers_classes_info'] = $this->get_loggers_classes_info();
417 -
418 587 wp_localize_script('wp-optimize-admin-js', 'wpoptimize', $js_variables);
419 588
420 589 do_action('wpo_premium_scripts_styles', $min_or_not_internal, $min_or_not, $enqueue_version);
590 +
591 + $status_report_dependencies = array('wp-optimize-admin-js');
592 +
593 + // Only include wp-api-fetch if WP >= 5.0
594 + if (version_compare($wp_version, '5.0', '>=')) {
595 + $status_report_dependencies[] = 'wp-api-fetch';
596 + }
597 +
598 + wp_enqueue_script('wp-optimize-status-report', WPO_PLUGIN_URL.'js/status'.$min_or_not_internal.'.js', $status_report_dependencies, $enqueue_version);
599 +
600 + wp_enqueue_script('js-zip', WPO_PLUGIN_URL.'/js/jszip/jszip' . $min_or_not . '.js', array(), $enqueue_version);
601 +
421 602 }
422 603
423 604 /**
424 605 * Enqueue any required front-end scripts
@@ -425,11 +606,11 @@
425 606 *
426 607 * @return void
427 608 */
428 609 public function frontend_enqueue_scripts() {
429 - if (!current_user_can('manage_options') || !is_admin_bar_showing()) return;
610 + if (!$this->current_user_can('manage_options') || !is_admin_bar_showing()) return;
430 611 $enqueue_version = $this->get_enqueue_version();
431 - $min_or_not_internal = WP_Optimize()->get_min_or_not_internal_string();
612 + $min_or_not_internal = $this->get_min_or_not_internal_string();
432 613
433 614 // Register or enqueue common scripts
434 615 wp_enqueue_style('wp-optimize-global', WPO_PLUGIN_URL.'css/wp-optimize-global'.$min_or_not_internal.'.css', array(), $enqueue_version);
435 616 }
@@ -435,8 +616,10 @@
435 616 }
436 617
437 618 /**
438 619 * Load Task Manager
620 + *
621 + * @return Updraft_Smush_Manager
439 622 */
440 623 public function get_task_manager() {
441 624 include_once(WPO_PLUGIN_MAIN_PATH.'vendor/team-updraft/common-libs/src/updraft-tasks/class-updraft-tasks-activation.php');
442 625
@@ -454,9 +637,9 @@
454 637
455 638 /**
456 639 * Indicate whether we have an associated instance of WP-Optimize Premium or not.
457 640 *
458 - * @returns Boolean
641 + * @returns bool
459 642 */
460 643 public static function is_premium() {
461 644 if (file_exists(WPO_PLUGIN_MAIN_PATH.'premium.php') && function_exists('WP_Optimize_Premium')) {
462 645 $wp_optimize_premium = WP_Optimize_Premium();
@@ -471,9 +654,9 @@
471 654 * @return bool
472 655 */
473 656 public function is_apache_server() {
474 657 global $is_apache;
475 - return $is_apache;
658 + return (bool) $is_apache;
476 659 }
477 660
478 661 /**
479 662 * Check if script running on IIS web server.
@@ -517,12 +700,23 @@
517 700 * Checks if this is the premium version and loads it. It also ensures that if the free version is installed then it is disabled with an appropriate error message.
518 701 */
519 702 public function plugins_loaded() {
520 703
521 - if ($this->does_server_handles_cache()) {
704 + if (!$this->is_minimum_requirement_met()) {
705 + $this->add_notice_minimum_requirements_not_met();
706 + $this->deactivate_plugin();
707 + WPO_Deactivation::actions();
708 + return;
709 + }
710 +
711 + if (is_admin() && $this->current_user_can()) {
712 + WP_Optimize_Heartbeat::get_instance();
713 + }
714 +
715 + if ($this->get_server_compatibility_instance()->does_server_handle_cache()) {
522 716 add_filter('wp_optimize_admin_page_wpo_cache_tabs', array($this, 'filter_cache_tabs'), 99, 1);
523 717
524 - // If newly migrated to server that handles cache, disable wpo cache
718 + // If newly migrated to a server that handles cache, disable wpo cache
525 719 $cache = $this->get_page_cache();
526 720 if ($cache->is_enabled()) {
527 721 $cache->disable();
528 722 }
@@ -534,23 +728,28 @@
534 728 if (file_exists(WPO_PLUGIN_MAIN_PATH.'premium.php') && !class_exists('WP_Optimize_Premium')) {
535 729 include_once(WPO_PLUGIN_MAIN_PATH.'premium.php');
536 730 }
537 731
732 + if (!self::is_premium()) {
733 + $this->get_server_compatibility_instance()->maybe_disable_unsupported_table_optimization();
734 + add_action('auto_option_settings', array($this->get_options(), 'auto_option_settings'));
735 + }
736 +
538 737 // load defaults
539 - WP_Optimize()->get_options()->set_default_options();
738 + $this->get_options()->set_default_options();
540 739
541 740 // Initialize loggers.
542 - $this->setup_loggers();
741 + add_action('init', array($this, 'setup_loggers'));
543 742
544 743 if ($this->is_active('premium') && false !== ($free_plugin = $this->is_active('free'))) {
545 744 if (!function_exists('deactivate_plugins')) include_once(ABSPATH.'wp-admin/includes/plugin.php');
546 745 deactivate_plugins($free_plugin);
547 746
548 - // If WPO_ADVANCED_CACHE is defined, we empty advanced-cache.php to regenerate later. Otherwise it contains the path to free.
747 + // If WPO_ADVANCED_CACHE is defined, we empty advanced-cache.php to regenerate later. Otherwise, it contains the path to free.
549 748 if (defined('WPO_ADVANCED_CACHE') && WPO_ADVANCED_CACHE) {
550 749 $advanced_cache_filename = trailingslashit(WP_CONTENT_DIR) . 'advanced-cache.php';
551 750
552 - if (!is_file($advanced_cache_filename) && is_writable(dirname($advanced_cache_filename)) || (is_file($advanced_cache_filename) && is_writable($advanced_cache_filename))) {
751 + if (!is_file($advanced_cache_filename) && wp_is_writable(dirname($advanced_cache_filename)) || (is_file($advanced_cache_filename) && wp_is_writable($advanced_cache_filename))) {
553 752 file_put_contents($advanced_cache_filename, '');
554 753 }
555 754 }
556 755
@@ -558,23 +757,29 @@
558 757 add_action('admin_notices', array($this, 'show_admin_notice_premium'));
559 758 return;
560 759 }
561 760
562 - // Loads the task manager
563 - $this->get_task_manager();
761 + add_action('init', array($this, 'init'));
564 762
565 - // Loads the language file.
566 - load_plugin_textdomain('wp-optimize', false, dirname(plugin_basename(__FILE__)) . '/languages');
763 + // add_filter('updraftcentral_host_plugins', array($this, 'attach_updraftcentral_host'));
764 + // if (file_exists(WPO_PLUGIN_MAIN_PATH.'central/factory.php')) include_once(WPO_PLUGIN_MAIN_PATH.'central/factory.php');
765 + }
567 766
767 + /**
768 + * Methods needed to be run in init hook.
769 + *
770 + * @return void
771 + */
772 + public function init() {
773 + $this->load_language_file();
774 + $this->schedule_plugin_cron_tasks();
775 + $this->init_page_cache();
776 + $this->get_minify();
777 + $this->get_delay_js();
778 +
568 779 // Load 3rd party plugin compatibilities.
569 780 $this->load_compatibilities();
570 781
571 - // Load page cache.
572 - $this->get_page_cache();
573 - $this->init_page_cache();
574 -
575 - // Include minify
576 - $this->get_minify();
577 782 $this->run_updates();
578 783
579 784 // We need this here because webp can be unavailable because of server moves
580 785 // This deletes already converted webp images and original image file when a media is deleted
@@ -579,18 +784,29 @@
579 784 // We need this here because webp can be unavailable because of server moves
580 785 // This deletes already converted webp images and original image file when a media is deleted
581 786 WP_Optimize_WebP_Images::get_instance();
582 787
788 + // Loads the task manager
789 + $this->get_task_manager();
790 +
583 791 // Include WebP
584 792 if (WPO_USE_WEBP_CONVERSION) {
585 793 $this->get_webp_instance();
586 794 }
587 795
588 - // add_filter('updraftcentral_host_plugins', array($this, 'attach_updraftcentral_host'));
589 - // if (file_exists(WPO_PLUGIN_MAIN_PATH.'central/factory.php')) include_once(WPO_PLUGIN_MAIN_PATH.'central/factory.php');
796 + $this->get_onboarding()->init();
590 797 }
591 798
592 799 /**
800 + * Loads the language file.
801 + *
802 + * @return void
803 + */
804 + private function load_language_file() {
805 + load_plugin_textdomain('wp-optimize', false, dirname(plugin_basename(__FILE__)) . '/languages');
806 + }
807 +
808 + /**
593 809 * Attach this wp-optimize plugin as host of the UpdraftCentral libraries
594 810 * (e.g. "central" folder)
595 811 *
596 812 * @param array $hosts List of plugins having the "central" library integrated into them
@@ -602,9 +818,9 @@
602 818 return $hosts;
603 819 }
604 820
605 821 /**
606 - * Filter cache tabs (when it is Kinsta)
822 + * Filter cache tabs (when the server handles it or do not allow it, like Kinsta)
607 823 *
608 824 * @param array $tabs An array of tabs
609 825 *
610 826 * @return array $tabs An array of tabs
@@ -619,18 +835,18 @@
619 835
620 836 /**
621 837 * Check whether one of free/Premium is active (whether it is this instance or not)
622 838 *
623 - * @param String $which - 'free' or 'premium'
839 + * @param string $which - 'free' or 'premium'
624 840 *
625 - * @return String|Boolean - plugin path (if installed) or false if not
841 + * @return string|boolean - plugin path (if installed) or false if not
626 842 */
627 - private function is_active($which = 'free') {
843 + public function is_active($which = 'free') {
628 844 $active_plugins = $this->get_active_plugins();
629 845 foreach ($active_plugins as $file) {
630 846 if ('wp-optimize.php' == basename($file)) {
631 847 $plugin_dir = WP_PLUGIN_DIR.'/'.dirname($file);
632 - if (('free' == $which && !file_exists($plugin_dir.'/premium.php')) || ('free' != $which && file_exists($plugin_dir.'/premium.php'))) return $file;
848 + if (('free' === $which && !file_exists($plugin_dir.'/premium.php')) || ('free' !== $which && file_exists($plugin_dir.'/premium.php'))) return $file;
633 849 }
634 850 }
635 851 return false;
636 852 }
@@ -637,14 +853,13 @@
637 853
638 854 /**
639 855 * Gets an array of plugins active on either the current site, or site-wide
640 856 *
641 - * @return Array - a list of plugin paths (relative to the plugin directory)
857 + * @return array - a list of plugin paths (relative to the plugin directory)
642 858 */
643 859 private function get_active_plugins() {
644 -
645 860 // Gets all active plugins on the current site
646 - $active_plugins = get_option('active_plugins');
861 + $active_plugins = (array) get_option('active_plugins', array());
647 862
648 863 if (is_multisite()) {
649 864 $network_active_plugins = get_site_option('active_sitewide_plugins');
650 865 if (!empty($network_active_plugins)) {
@@ -678,9 +893,9 @@
678 893
679 894 // Loops around each plugin available.
680 895 foreach ($get_plugins as $key => $value) {
681 896 // If the plugin name matches that of the specified name, it will gather details.
682 - if ($value['Name'] != $name && $value['TextDomain'] != $name) continue;
897 + if ($value['Name'] !== $name && $value['TextDomain'] !== $name) continue;
683 898 $plugin_info['installed'] = true;
684 899 $plugin_info['name'] = $key;
685 900 $plugin_info['version'] = $value['Version'];
686 901 if (in_array($key, $active_plugins)) {
@@ -694,10 +909,10 @@
694 909 /**
695 910 * This is a notice to show users that premium is installed
696 911 */
697 912 public function show_admin_notice_premium() {
698 - echo '<div id="wp-optimize-premium-installed-warning" class="error"><p>'.__('WP-Optimize (Free) has been de-activated, because WP-Optimize Premium is active.', 'wp-optimize').'</p></div>';
699 - if (isset($_GET['activate'])) unset($_GET['activate']);
913 + echo '<div id="wp-optimize-premium-installed-warning" class="error"><p>'.esc_html__('WP-Optimize (Free) has been de-activated, because WP-Optimize Premium is active.', 'wp-optimize').'</p></div>';
914 + if (isset($_GET['activate'])) unset($_GET['activate']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- only unsetting value, not using it.
700 915 }
701 916
702 917 /**
703 918 * Show update to Premium notice for non-premium multisite.
@@ -704,9 +919,9 @@
704 919 */
705 920 public function show_multisite_update_to_premium_notice() {
706 921 if (!is_multisite() || self::is_premium()) return;
707 922
708 - echo '<p><a href="'.$this->premium_version_link.'">'.__('New feature: WP-Optimize Premium can now optimize all sites within a multisite install, not just the main one.', 'wp-optimize').'</a></p>';
923 + echo '<p><a href="'.esc_url($this->premium_version_link). '&utm_content=multisite-upsell' .'">'.esc_html__('New feature: WP-Optimize Premium can now optimize all sites within a multisite install, not just the main one.', 'wp-optimize').'</a></p>';
709 924 }
710 925
711 926 public function admin_init() {
712 927 $pagenow = $GLOBALS['pagenow'];
@@ -712,9 +927,9 @@
712 927 $pagenow = $GLOBALS['pagenow'];
713 928
714 929 $this->register_template_directories();
715 930
716 - if (('index.php' == $pagenow && current_user_can('update_plugins')) || ('index.php' == $pagenow && defined('WP_OPTIMIZE_FORCE_DASHNOTICE') && WP_OPTIMIZE_FORCE_DASHNOTICE)) {
931 + if (('index.php' === $pagenow && $this->current_user_can('update_plugins')) || ('index.php' === $pagenow && defined('WP_OPTIMIZE_FORCE_DASHNOTICE') && WP_OPTIMIZE_FORCE_DASHNOTICE)) {
717 932 $options = $this->get_options();
718 933
719 934 $dismissed_until = $options->get_option('dismiss_dash_notice_until', 0);
720 935
@@ -730,8 +945,11 @@
730 945
731 946 if ($this->is_wp_smush_installed()) {
732 947 add_filter('transient_wp-smush-conflict_check', array($this, 'modify_wp_smush_conflict_check'), 9, 1);
733 948 }
949 + if ($this->get_options()->get_option('404_detector', 0)) {
950 + WP_Optimize_Performance::get_instance($this->get_404_detector())->init();
951 + }
734 952 }
735 953
736 954 /**
737 955 * Checks whether the WP Smush plugin is active or not
@@ -757,9 +975,9 @@
757 975 return $active_plugins;
758 976 }
759 977
760 978 /**
761 - * Get the install or update notice instance
979 + * Get the installation or update notice instance
762 980 *
763 981 * @return WP_Optimize_Install_Or_Update_Notice
764 982 */
765 983 public function get_install_or_update_notice() {
@@ -776,14 +994,42 @@
776 994 $this->include_template('notices/thanks-for-using-main-dash.php', false, array(
777 995 'is_premium' => WP_Optimize::is_premium()
778 996 ));
779 997 }
780 -
998 +
999 + /**
1000 + * Returns required capability string
1001 + *
1002 + * @return string
1003 + */
781 1004 public function capability_required() {
782 - return apply_filters('wp_optimize_capability_required', 'manage_options');
1005 + $capability = is_multisite() ? 'manage_network_options' : 'manage_options';
1006 +
1007 + $filtered_capability = apply_filters('wp_optimize_capability_required', $capability);
1008 +
1009 + return is_string($filtered_capability) ? $filtered_capability : $capability;
783 1010 }
784 1011
785 1012 /**
1013 + * Check if the current user has a given capability.
1014 + * If no capability is provided, it checks for the default capability required to access WP-Optimize.
1015 + *
1016 + * @param string|null $capability The capability to check. Null = use default.
1017 + * @return bool
1018 + */
1019 + public function current_user_can($capability = null) {
1020 + if (null === $capability) {
1021 + $capability = $this->capability_required(); // falls back to default
1022 + }
1023 +
1024 + if (current_user_can($capability)) {
1025 + return true;
1026 + }
1027 +
1028 + return false;
1029 + }
1030 +
1031 + /**
786 1032 * Returns array of translations used in javascript code.
787 1033 *
788 1034 * @return array
789 1035 */
@@ -788,9 +1034,9 @@
788 1034 * @return array
789 1035 */
790 1036 public function wpo_js_translations() {
791 1037 $log_message = __('For more details, please check your logs configured in logging destinations settings.', 'wp-optimize');
792 - return apply_filters('wpo_js_translations', array(
1038 + $translations = array(
793 1039 'automatic_backup_before_optimizations' => __('Automatic backup before optimizations', 'wp-optimize'),
794 1040 'error_unexpected_response' => __('An unexpected response was received.', 'wp-optimize'),
795 1041 'optimization_complete' => __('Optimization complete', 'wp-optimize'),
796 1042 'with_warnings' => __('(with warnings - open the browser console for more details)', 'wp-optimize'),
@@ -804,10 +1050,13 @@
804 1050 'disable' => __('Disable', 'wp-optimize'),
805 1051 'please_select_settings_file' => __('Please, select settings file.', 'wp-optimize'),
806 1052 'are_you_sure_you_want_to_remove_logging_destination' => __('Are you sure you want to remove this logging destination?', 'wp-optimize'),
807 1053 'fill_all_settings_fields' => __('Before saving, you need to complete the currently incomplete settings (or remove them).', 'wp-optimize'),
1054 + // translators: %s is the table name
808 1055 'table_was_not_repaired' => __('%s was not repaired.', 'wp-optimize') . ' ' . $log_message,
1056 + // translators: %s is the table name
809 1057 'table_was_not_deleted' => __('%s was not deleted.', 'wp-optimize') . ' ' . $log_message,
1058 + // translators: %s is the table name
810 1059 'table_was_not_converted' => __('%s was not converted to InnoDB.', 'wp-optimize') . ' ' . $log_message,
811 1060 'please_use_positive_integers' => __('Please use positive integers.', 'wp-optimize'),
812 1061 'please_use_valid_values' => __('Please use valid values.', 'wp-optimize'),
813 1062 'update' => __('Update', 'wp-optimize'),
@@ -832,9 +1081,11 @@
832 1081 'spinner_src' => esc_url(admin_url('images/spinner-2x.gif')),
833 1082 'logo_src' => esc_url(WPO_PLUGIN_URL.'images/notices/wp_optimize_logo.png'),
834 1083 'settings_page_url' => is_multisite() ? network_admin_url('admin.php?page=wpo_settings') : admin_url('admin.php?page=wpo_settings'),
835 1084 'sites' => $this->get_sites(),
836 - 'user_always_ignores_table_delete_warning' => (get_user_meta(get_current_user_id(), 'wpo-ignores-table-delete-warning', true)) ? true : false,
1085 + 'user_always_ignores_table_deletion_warning' => (bool) get_user_meta(get_current_user_id(), 'wpo-ignores-table-deletion-warning', true),
1086 + 'user_always_ignores_post_meta_deletion_warning' => (bool) get_user_meta(get_current_user_id(), 'wpo-ignores-post-meta-deletion-warning', true),
1087 + 'user_always_ignores_orphaned_relationship_data_deletion_warning' => (bool) get_user_meta(get_current_user_id(), 'wpo-ignores-orphaned-relationship-data-deletion-warning', true),
837 1088 'post_meta_tweak_completed' => __('The tweak has been performed.', 'wp-optimize'),
838 1089 'no_minified_assets' => __('No minified files are present', 'wp-optimize'),
839 1090 'network_site_url' => network_site_url(),
840 1091 'export_settings_file_name' => 'wpoptimize-settings-'.sanitize_title(get_bloginfo('name')).'.json',
@@ -844,67 +1095,57 @@
844 1095 'importing_data_from' => __('This will import data from:', 'wp-optimize'),
845 1096 'exported_on' => __('Which was exported on:', 'wp-optimize'),
846 1097 'continue_import' => __('Do you want to carry out the import?', 'wp-optimize'),
847 1098 'select_destination' => __('Select destination', 'wp-optimize'),
1099 + 'show' => __('Show', 'wp-optimize'),
1100 + 'hide' => __('Hide', 'wp-optimize'),
1101 + 'please_wait' => __('Please wait a moment...', 'wp-optimize'),
1102 + 'clipboard_failed' => __('Copy to clipboard failed, please do it manually', 'wp-optimize'),
1103 + 'clipboard_success' => __('System status has been copied to the clipboard', 'wp-optimize'),
1104 + 'high_table_count_threshold' => WP_Optimizer::HIGH_TABLE_COUNT_THRESHOLD,
1105 + // translators: 1: starting table count, 2: ending table count
1106 + 'loading_tables_in_batches' => esc_html__('Loading tables %1$s to %2$s', 'wp-optimize'),
1107 + // translators: %s time to finish
1108 + 'time_left' => esc_html__('Aproximate time to finish: %s', 'wp-optimize'),
1109 + 'done_reloading' => esc_html__('Done, reloading', 'wp-optimize'),
848 1110 'show_information' => __('Show information', 'wp-optimize'),
849 1111 'hide_information' => __('Hide information', 'wp-optimize'),
850 - ));
1112 + 'data_not_available' => __('Not available', 'wp-optimize'),
1113 + 'something_wrong_try_again' => __('Something went wrong; please try again.', 'wp-optimize'),
1114 + 'db_tables_scan_pending_list' => __('Your database tables need to be scanned before they can be listed.', 'wp-optimize'),
1115 + 'db_tables_scan_pending_optimize' => __('Your database tables need to be scanned before they can be optimized.', 'wp-optimize'),
1116 + 'db_tables_scan_button' => __('Scan tables', 'wp-optimize')
1117 + );
1118 + $filtered_translations = apply_filters('wpo_js_translations', $translations);
1119 + return is_array($filtered_translations) ? $filtered_translations : $translations;
851 1120 }
852 1121
853 1122 /**
854 - * Manages the admin bar menu for caching (currently page and minify)
855 - */
856 - public function cache_admin_bar($wp_admin_bar) {
857 -
858 - $options = $this->get_options();
859 - if (!$options->get_option('enable_cache_in_admin_bar', true)) return;
860 -
861 - /**
862 - * The "purge cache" menu items
863 - *
864 - * @param array $menu_items - The menu items, in the format required by $wp_admin_bar->add_menu()
865 - * @param object $wp_admin_bar
866 - */
867 - $menu_items = apply_filters('wpo_cache_admin_bar_menu_items', array(), $wp_admin_bar);
868 -
869 - if (empty($menu_items) || !is_array($menu_items)) return;
870 -
871 - $wp_admin_bar->add_menu(array(
872 - 'id' => 'wpo_purge_cache',
873 - 'title' => __('Purge cache', 'wp-optimize'),
874 - 'href' => '#',
875 - 'meta' => array(
876 - 'title' => __('Purge cache', 'wp-optimize'),
877 - ),
878 - 'parent' => false,
879 - ));
880 -
881 - foreach ($menu_items as $item) {
882 - $wp_admin_bar->add_menu($item);
883 - }
884 - }
885 -
886 - /**
887 1123 * Add settings link on plugin page
888 1124 *
889 - * @param string $links Passing through the URL to be used within the HREF.
890 - * @return string Returns the Links.
1125 + * @param array $links Passing through the URL to be used within the HREF.
1126 + * @return array Returns the Links.
891 1127 */
892 1128 public function plugin_settings_link($links) {
893 1129
894 1130 $admin_page_url = $this->get_options()->admin_page_url();
895 1131 $settings_page_url = $this->get_options()->admin_page_url('wpo_settings');
1132 + $database_page_url = $this->get_options()->admin_page_url('wpo_database');
896 1133
897 - if (false == self::is_premium()) {
898 - $premium_link = '<a href="' . esc_url($this->premium_version_link) . '" target="_blank">' . __('Premium', 'wp-optimize') . '</a>';
1134 + if (!self::is_premium()) {
1135 + $premium_link = '<a href="' . esc_url($this->premium_version_link) . '&utm_content=plugin-page' . '" target="_blank">' . esc_html__('Premium', 'wp-optimize') . '</a>';
899 1136 array_unshift($links, $premium_link);
900 1137 }
901 1138
902 - $settings_link = '<a href="' . esc_url($settings_page_url) . '">' . __('Settings', 'wp-optimize') . '</a>';
1139 + $settings_link = '<a href="' . esc_url($settings_page_url) . '">' . esc_html__('Settings', 'wp-optimize') . '</a>';
903 1140 array_unshift($links, $settings_link);
904 1141
905 - $optimize_link = '<a href="' . esc_url($admin_page_url) . '">' . __('Optimize', 'wp-optimize') . '</a>';
1142 + $optimize_link = '<a href="' . esc_url($database_page_url) . '">' . esc_html__('Optimize', 'wp-optimize') . '</a>';
906 1143 array_unshift($links, $optimize_link);
1144 +
1145 + $dashboard_link = '<a href="' . esc_url($admin_page_url) . '">' . esc_html__('Overview', 'wp-optimize') . '</a>';
1146 + array_unshift($links, $dashboard_link);
1147 +
907 1148 return $links;
908 1149 }
909 1150
910 1151 /**
@@ -918,9 +1159,9 @@
918 1159 public function tables_list_additional_column_data($content, $table_info) {
919 1160 if ($table_info->is_needing_repair) {
920 1161 $content .= '<div class="wpo_button_wrap">'
921 1162 . '<button class="button button-secondary run-single-table-repair" data-table="' . esc_attr($table_info->Name) . '">' . __('Repair', 'wp-optimize') . '</button>'
922 - . '<img class="optimization_spinner visibility-hidden" src="' . esc_attr(admin_url('images/spinner-2x.gif')) . '" width="20" height="20" alt="...">'
1163 + . '<img class="optimization_spinner visibility-hidden" src="' . esc_attr(admin_url('images/spinner-2x.gif')) . '" width="20" height="20" alt="...">' // phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- N/A
923 1164 . '<span class="optimization_done_icon dashicons dashicons-yes visibility-hidden"></span>'
924 1165 . '</div>';
925 1166 }
926 1167
@@ -927,18 +1168,18 @@
927 1168 // table belongs to plugin.
928 1169 if ($table_info->can_be_removed) {
929 1170 $content .= '<div>'
930 1171 . '<button class="button button-secondary run-single-table-delete" data-table="' . esc_attr($table_info->Name) . '">' . __('Remove', 'wp-optimize') . '</button>'
931 - . '<img class="optimization_spinner visibility-hidden" src="' . esc_attr(admin_url('images/spinner-2x.gif')) . '" width="20" height="20" alt="...">'
1172 + . '<img class="optimization_spinner visibility-hidden" src="' . esc_attr(admin_url('images/spinner-2x.gif')) . '" width="20" height="20" alt="...">' // phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- N/A
932 1173 . '<span class="optimization_done_icon dashicons dashicons-yes visibility-hidden"></span>'
933 1174 . '</div>';
934 1175 }
935 1176
936 1177 // Add option for MyISAM to InnoDB conversion.
937 - if ('MyISAM' == $table_info->Engine) {
1178 + if ('MyISAM' === $table_info->Engine) {
938 1179 $content .= '<div class="wpo_button_convert wpo_button_wrap">'
939 1180 . '<button class="button button-secondary toinnodb" data-table="' . esc_attr($table_info->Name) . '">' . __('Convert to InnoDB', 'wp-optimize') . '</button>'
940 - . '<img class="optimization_spinner visibility-hidden" src="' . esc_attr(admin_url('images/spinner-2x.gif')) . '" width="20" height="20" alt="...">'
1181 + . '<img class="optimization_spinner visibility-hidden" src="' . esc_attr(admin_url('images/spinner-2x.gif')) . '" width="20" height="20" alt="...">' // phpcs:ignore PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage -- N/A
941 1182 . '<span class="optimization_done_icon dashicons dashicons-yes visibility-hidden"></span>'
942 1183 . '</div>';
943 1184
944 1185 }
@@ -948,9 +1189,9 @@
948 1189
949 1190 /**
950 1191 * Initialize WP-Optimize page cache.
951 1192 */
952 - public function init_page_cache() {
1193 + private function init_page_cache() {
953 1194 if ($this->get_page_cache()->config->get_option('enable_page_caching', false)) {
954 1195 if ((!(defined('WP_CLI') && WP_CLI)) && (!defined('DOING_AJAX') || !DOING_AJAX)) {
955 1196 $this->_cache_init_status = $this->get_page_cache()->enable();
956 1197 }
@@ -959,9 +1200,9 @@
959 1200
960 1201 /**
961 1202 * Get init_page_cache() status.
962 1203 *
963 - * @return bool
1204 + * @return bool|WP_Error
964 1205 */
965 1206 public function get_init_page_cache_status() {
966 1207 return $this->_cache_init_status;
967 1208 }
@@ -975,17 +1216,17 @@
975 1216 $gmt_offset = (int) (3600 * get_option('gmt_offset'));
976 1217
977 1218 $options = $this->get_options();
978 1219
979 - if ($options->get_option('schedule') === false) {
1220 + if (false === $options->get_option('schedule')) {
980 1221 $options->set_default_options();
981 1222 } else {
982 - if ('true' == $options->get_option('schedule')) {
1223 + if ('true' === $options->get_option('schedule')) {
983 1224 if (!wp_next_scheduled('wpo_cron_event2')) {
984 1225 $schedule_type = $options->get_option('schedule-type', 'wpo_weekly');
985 1226
986 1227 // Backward compatibility
987 - if ('wpo_otherweekly' == $schedule_type) $schedule_type = 'wpo_fortnightly';
1228 + if ('wpo_otherweekly' === $schedule_type) $schedule_type = 'wpo_fortnightly';
988 1229
989 1230 $this_time = (86400 * 7);
990 1231
991 1232 switch ($schedule_type) {
@@ -1007,15 +1248,15 @@
1007 1248 }
1008 1249
1009 1250 add_action('wpo_cron_event2', array($this, 'cron_action'));
1010 1251 $result = wp_schedule_event((current_time("timestamp", 0) + $this_time - $gmt_offset), $schedule_type, 'wpo_cron_event2');
1011 - WP_Optimize()->log('running wp_schedule_event()');
1252 + $this->log('running wp_schedule_event()');
1012 1253 if (is_wp_error($result)) {
1013 1254 $error_msg = $result->get_error_message();
1014 - WP_Optimize()->log($error_msg);
1015 - WP_Optimize()->log(print_r($result, true));
1255 + $this->log($error_msg);
1256 + $this->log(print_r($result, true)); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r -- Using for debugging purpose, logged into separate file
1016 1257 } else {
1017 - WP_Optimize()->log($result);
1258 + $this->log($result);
1018 1259 }
1019 1260 }
1020 1261 }
1021 1262 }
@@ -1021,13 +1262,31 @@
1021 1262 }
1022 1263 }
1023 1264
1024 1265 /**
1025 - * Clears all cron events
1266 + * Unschedules WP-Optimize cron events on deactivation.
1026 1267 *
1027 1268 * @return void
1028 1269 */
1029 1270 public function wpo_cron_deactivate() {
1271 + if (is_multisite()) {
1272 + $sites = $this->get_sites();
1273 + foreach ($sites as $site) {
1274 + switch_to_blog($site->blog_id);
1275 + $this->unschedule_wpo_cron_jobs();
1276 + restore_current_blog();
1277 + }
1278 + } else {
1279 + $this->unschedule_wpo_cron_jobs();
1280 + }
1281 + }
1282 +
1283 + /**
1284 + * Unschedules all WP-Optimize cron jobs on the current site.
1285 + *
1286 + * @return void
1287 + */
1288 + private function unschedule_wpo_cron_jobs() {
1030 1289 $cron_jobs = _get_cron_array();
1031 1290 foreach ($cron_jobs as $job) {
1032 1291 foreach (array_keys($job) as $hook) {
1033 1292 if (preg_match('/^wpo_/', $hook)) wp_unschedule_hook($hook);
@@ -1073,8 +1332,12 @@
1073 1332 /**
1074 1333 * Run updates on plugin activation.
1075 1334 */
1076 1335 public function run_updates() {
1336 +
1337 + if (!defined('WPO_CACHE_FILES_DIR')) define('WPO_CACHE_FILES_DIR', untrailingslashit(WP_CONTENT_DIR).'/cache/wpo-cache');
1338 +
1339 + require_once(WPO_PLUGIN_MAIN_PATH . 'cache/file-based-page-cache-functions.php');
1077 1340 include_once(WPO_PLUGIN_MAIN_PATH.'includes/class-wp-optimize-updates.php');
1078 1341 WP_Optimize_Updates::check_updates();
1079 1342 }
1080 1343
@@ -1085,13 +1348,21 @@
1085 1348 * @return string
1086 1349 */
1087 1350 public function show_admin_warning_overdue_crons($howmany) {
1088 1351 $ret = '<div class="updated below-h2"><p>';
1089 - $ret .= '<strong>'.__('Warning', 'wp-optimize').':</strong> '.sprintf(__('WordPress has a number (%d) of scheduled tasks which are overdue.', 'wp-optimize'), $howmany).' '. __('Unless this is a development site, this probably means that the scheduler in your WordPress install is not working.', 'wp-optimize').' <a href="'.apply_filters('wpoptimize_com_link', "https://getwpo.com/faqs/the-scheduler-in-my-wordpress-installation-is-not-working-what-should-i-do/").'">'.__('Read this page for a guide to possible causes and how to fix it.', 'wp-optimize').'</a>';
1352 + // translators: %d is number of overdue cron jobs
1353 + $ret .= '<strong>'.esc_html__('Warning', 'wp-optimize').':</strong> '.sprintf(esc_html__('WordPress has a number (%d) of scheduled tasks which are overdue.', 'wp-optimize'), $howmany).' '. esc_html__('Unless this is a development site, this probably means that the scheduler in your WordPress install is not working.', 'wp-optimize').' <a target="_blank" href="'.esc_url(apply_filters('wpoptimize_com_link', "https://teamupdraft.com/blog/the-scheduler-in-wordpress-is-not-working-what-should-i-do/")).'">'.esc_html__('Read this page for a guide to possible causes and how to fix it.', 'wp-optimize').'</a>';
1090 1354 $ret .= '</p></div>';
1091 1355 return $ret;
1092 1356 }
1093 1357
1358 + /**
1359 + * Normalizes path string
1360 + *
1361 + * @param string $path
1362 + *
1363 + * @return string
1364 + */
1094 1365 private function wp_normalize_path($path) {
1095 1366 // Wp_normalize_path is not present before WP 3.9.
1096 1367 if (function_exists('wp_normalize_path')) return wp_normalize_path($path);
1097 1368 // Taken from WP 4.6.
@@ -1102,24 +1373,38 @@
1102 1373 }
1103 1374 return $path;
1104 1375 }
1105 1376
1377 + /**
1378 + * Returns templates directory path
1379 + *
1380 + * @return string
1381 + */
1106 1382 public function get_templates_dir() {
1107 - return apply_filters('wp_optimize_templates_dir', $this->wp_normalize_path(WPO_PLUGIN_MAIN_PATH.'templates'));
1383 + $templates_dir = $this->wp_normalize_path(WPO_PLUGIN_MAIN_PATH.'templates');
1384 + $filtered_templates_dir = apply_filters('wp_optimize_templates_dir', $templates_dir);
1385 + return is_string($filtered_templates_dir) ? $filtered_templates_dir : $templates_dir;
1108 1386 }
1109 1387
1388 + /**
1389 + * Returns templates URL
1390 + *
1391 + * @return string
1392 + */
1110 1393 public function get_templates_url() {
1111 - return apply_filters('wp_optimize_templates_url', WPO_PLUGIN_URL.'templates');
1394 + $templates_url = WPO_PLUGIN_URL . 'templates';
1395 + $filtered_templates_url = apply_filters('wp_optimize_templates_url', $templates_url);
1396 + return is_string($filtered_templates_url) ? $filtered_templates_url : $templates_url;
1112 1397 }
1113 1398
1114 1399 /**
1115 1400 * Return or output view content
1116 1401 *
1117 - * @param String $path - path to template, usually relative to templates/ within the WP-O directory
1118 - * @param Boolean $return_instead_of_echo - what to do with the results
1119 - * @param Array $extract_these - key/value pairs for substitution into the scope of the template
1402 + * @param string $path - path to template, usually relative to templates/ within the WP-O directory
1403 + * @param boolean $return_instead_of_echo - what to do with the results
1404 + * @param array $extract_these - key/value pairs for substitution into the scope of the template
1120 1405 *
1121 - * @return String|Void
1406 + * @return string|void
1122 1407 */
1123 1408 public function include_template($path, $return_instead_of_echo = false, $extract_these = array()) {
1124 1409 if ($return_instead_of_echo) ob_start();
1125 1410
@@ -1139,10 +1424,10 @@
1139 1424
1140 1425 do_action('wp_optimize_before_template', $path, $template_file, $return_instead_of_echo, $extract_these);
1141 1426
1142 1427 if (!file_exists($template_file)) {
1143 - error_log("WP Optimize: template not found: ".$template_file);
1144 - echo __('Error:', 'wp-optimize').' '.__('template not found', 'wp-optimize')." (".$path.")";
1428 + error_log("WP Optimize: template not found: ".$template_file); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log -- Using for debugging purpose such as incomplete installation
1429 + echo esc_html__('Error:', 'wp-optimize').' '.esc_html__('template not found', 'wp-optimize')." (".esc_html($path).")";
1145 1430 } else {
1146 1431 extract($extract_these);
1147 1432 // The following are useful variables which can be used in the template.
1148 1433 // They appear as unused, but may be used in the $template_file.
@@ -1169,9 +1454,9 @@
1169 1454 $templates_dir = $this->get_templates_dir();
1170 1455
1171 1456 if ($dh = opendir($templates_dir)) {
1172 1457 while (($file = readdir($dh)) !== false) {
1173 - if ('.' == $file || '..' == $file) continue;
1458 + if ('.' === $file || '..' === $file) continue;
1174 1459 if (is_dir($templates_dir.'/'.$file)) {
1175 1460 $template_directories[$file] = $templates_dir.'/'.$file;
1176 1461 }
1177 1462 }
@@ -1201,9 +1486,9 @@
1201 1486 * Format Bytes Into KB/MB
1202 1487 *
1203 1488 * @param mixed $bytes Number of bytes to be converted.
1204 1489 * @param integer $decimals the number of decimal digits
1205 - * @return integer return the correct format size.
1490 + * @return string return the correct format size.
1206 1491 */
1207 1492 public function format_size($bytes, $decimals = 2) {
1208 1493 if (!is_numeric($bytes)) return __('N/A', 'wp-optimize');
1209 1494
@@ -1214,9 +1499,9 @@
1214 1499 } elseif (1024 <= $bytes) {
1215 1500 $bytes = number_format($bytes / 1024, $decimals) . ' KB';
1216 1501 } elseif (1 < $bytes) {
1217 1502 $bytes = $bytes . ' bytes';
1218 - } elseif (1 == $bytes) {
1503 + } elseif (1 === (int) $bytes) {
1219 1504 $bytes = $bytes . ' byte';
1220 1505 } else {
1221 1506 $bytes = '0 bytes';
1222 1507 }
@@ -1224,15 +1509,16 @@
1224 1509 return $bytes;
1225 1510 }
1226 1511
1227 1512 /**
1228 - * Format a timestamp into a juman readable date time
1513 + * Format a timestamp into a human-readable date time
1229 1514 *
1230 - * @param int $timestamp
1515 + * @param int $timestamp Epoch timestamp to convert
1516 + * @param string $separator String separator
1231 1517 * @return string
1232 1518 */
1233 - public function format_date_time($timestamp) {
1234 - return date_i18n(get_option('date_format').' @ '.get_option('time_format'), ($timestamp + get_option('gmt_offset') * 3600));
1519 + public function format_date_time($timestamp, $separator = ' @ ') {
1520 + return date_i18n(get_option('date_format'). $separator .get_option('time_format'), ($timestamp + get_option('gmt_offset') * 3600));
1235 1521 }
1236 1522
1237 1523 /**
1238 1524 * Executed this function on cron event.
@@ -1245,9 +1531,9 @@
1245 1531 $options = $this->get_options();
1246 1532
1247 1533 $this->log('WPO: Starting cron_action()');
1248 1534 $options->update_option('last-optimized', time());
1249 - if ('true' == $options->get_option('schedule')) {
1535 + if ('true' === $options->get_option('schedule')) {
1250 1536 $this_options = $options->get_option('auto');
1251 1537
1252 1538 // Currently the output of the optimizations is not saved/used/logged.
1253 1539 $optimizer->do_optimizations($this_options, 'auto');
@@ -1259,14 +1545,17 @@
1259 1545 * Schedule cron tasks used by plugin.
1260 1546 *
1261 1547 * @return void
1262 1548 */
1263 - public function schedule_plugin_cron_tasks() {
1549 + private function schedule_plugin_cron_tasks() {
1264 1550 if (!wp_next_scheduled('wpo_weekly_cron_tasks')) {
1265 - wp_schedule_event(current_time("timestamp", 0), 'weekly', 'wpo_weekly_cron_tasks');
1551 + wp_schedule_event(current_time("timestamp", 0), 'wpo_weekly', 'wpo_weekly_cron_tasks');
1266 1552 }
1267 1553
1268 1554 add_action('wpo_weekly_cron_tasks', array($this, 'do_weekly_cron_tasks'));
1555 +
1556 + // Run 404 detector cron.
1557 + $this->get_404_detector_cron();
1269 1558 }
1270 1559
1271 1560 /**
1272 1561 * Do plugin background tasks.
@@ -1279,16 +1568,16 @@
1279 1568 }
1280 1569
1281 1570 /**
1282 1571 * This will customize a URL with a correct Affiliate link
1283 - * This function can be update to suit any URL as longs as the URL is passed
1572 + * This function can be updated to suit any URL as longs as the URL is passed
1284 1573 *
1285 - * @param String $url - URL to be check to see if it an updraftplus match.
1286 - * @param String $text - Text to be entered within the href a tags.
1287 - * @param String $html - Any specific HTML to be added. Supplied parameter will not be escaped in this function. Provide escaped, safe HTML
1288 - * @param String|Array $attrs - Specify the HTML attributes as an array or string. Use the array format for multiple attributes (e.g., array( "class" => "lorem-ipsum", "title" => "Highlighting text" )), and use the string format for a single attribute (e.g., 'class="lorem-ipsum"').
1289 - * @param Boolean $return_instead_of_echo - if set, then the result will be returned, not echo-ed.
1290 - * @return String|void
1574 + * @param string $url - URL to check to see if it is an updraftplus match.
1575 + * @param ?string $text - Text to be entered within the href a tags.
1576 + * @param ?string $html - Any specific HTML to be added. Supplied parameter will not be escaped in this function. Provide escaped, safe HTML
1577 + * @param string|array $attrs - Specify the HTML attributes as an array or string. Use the array format for multiple attributes (e.g., array( "class" => "lorem-ipsum", "title" => "Highlighting text" )), and use the string format for a single attribute (e.g., 'class="lorem-ipsum"').
1578 + * @param bool $return_instead_of_echo - if set, then the result will be returned, not echo-ed.
1579 + * @return string|void
1291 1580 */
1292 1581 public function wp_optimize_url($url, $text = '', $html = '', $attrs = '', $return_instead_of_echo = false) {
1293 1582 // Check if the URL is UpdraftPlus.
1294 1583 $url = $this->maybe_add_affiliate_params($url); // Return URL - check if there is HTML such as images.
@@ -1302,9 +1591,9 @@
1302 1591 foreach ($attrs as $attr => $value) {
1303 1592 $str_attrs .= $attr . '="' . esc_attr($value) . '" ';
1304 1593 }
1305 1594 } else {
1306 - // If $attrs is empty, the explode function will only return an empty array.
1595 + // If $attrs is empty, the `explode` function will only return an empty array.
1307 1596 $attrs = explode('=', $attrs);
1308 1597 // Check if $attrs in positions 1 and 2 are not empty and exist; otherwise, return an empty string.
1309 1598 $str_attrs = !empty($attrs[0]) && !empty($attrs[1]) ? $attrs[0] . '="' . esc_attr(str_replace('"', '', $attrs[1])) . '"' : '';
1310 1599 }
@@ -1319,13 +1608,13 @@
1319 1608 $result = sprintf(
1320 1609 '<a href="%s" %s>%s</a>',
1321 1610 esc_url($url),
1322 1611 $str_attrs,
1323 - $content
1612 + wp_kses_post($content)
1324 1613 );
1325 1614
1326 1615 if ($return_instead_of_echo) return $result;
1327 - echo $result;
1616 + echo wp_kses_post($result);
1328 1617 }
1329 1618
1330 1619 /**
1331 1620 * Check if a URL is external
@@ -1330,9 +1619,9 @@
1330 1619 /**
1331 1620 * Check if a URL is external
1332 1621 *
1333 1622 * @param string $url
1334 - * @return string
1623 + * @return bool
1335 1624 */
1336 1625 public function is_external_url($url) {
1337 1626 if (empty($url)) {
1338 1627 return false;
@@ -1345,9 +1634,9 @@
1345 1634 return $current_domain !== $url;
1346 1635 }
1347 1636
1348 1637 /**
1349 - * Get an URL with an eventual affiliate ID
1638 + * Get a URL with an eventual affiliate ID
1350 1639 *
1351 1640 * @param string $url
1352 1641 * @return string
1353 1642 */
@@ -1359,9 +1648,10 @@
1359 1648
1360 1649 // Apply filters.
1361 1650 $url = apply_filters('wpoptimize_updraftplus_com_link', $url);
1362 1651 }
1363 - return apply_filters('wpoptimize_maybe_add_affiliate_params', $url);
1652 + $filtered_url = apply_filters('wpoptimize_maybe_add_affiliate_params', $url);
1653 + return is_string($filtered_url) ? $filtered_url : $url;
1364 1654 }
1365 1655
1366 1656 /**
1367 1657 * Setup WPO logger(s)
@@ -1422,9 +1712,9 @@
1422 1712 // check for previous version options format.
1423 1713 $keys = array_keys($saved_loggers);
1424 1714
1425 1715 // if options stored in old format then reformat it.
1426 - if (false == is_numeric($keys[0])) {
1716 + if (false === is_numeric($keys[0])) {
1427 1717 $_saved_loggers = array();
1428 1718 foreach ($saved_loggers as $logger_id => $enabled) {
1429 1719 if ($enabled) {
1430 1720 $_saved_loggers[] = $logger_id;
@@ -1455,9 +1745,9 @@
1455 1745 foreach (array_keys($logger_options) as $option_name) {
1456 1746 if (array_key_exists($option_name, $options_keys)) {
1457 1747 $options_keys[$option_name]++;
1458 1748 } else {
1459 - $options_keys[$option_name] = 0;
1749 + $options_keys[$option_name] = 0;
1460 1750 }
1461 1751
1462 1752 $option_value = isset($logger_additional_options[$option_name][$options_keys[$option_name]]) ? $logger_additional_options[$option_name][$options_keys[$option_name]] : '';
1463 1753
@@ -1482,11 +1772,10 @@
1482 1772 $loggers[] = $logger;
1483 1773 }
1484 1774 }
1485 1775
1486 - $loggers = apply_filters('wp_optimize_loggers', $loggers);
1487 -
1488 - return $loggers;
1776 + $filtered_loggers = apply_filters('wp_optimize_loggers', $loggers);
1777 + return is_array($filtered_loggers) ? $filtered_loggers : $loggers;
1489 1778 }
1490 1779
1491 1780 /**
1492 1781 * Returns associative array with logger class name in a key and path to class file in a value.
@@ -1554,17 +1843,17 @@
1554 1843 return (is_multisite() && self::is_premium());
1555 1844 }
1556 1845
1557 1846 /**
1558 - * Returns true if current user can run optimizations.
1847 + * Returns true if the current user can run optimizations.
1559 1848 *
1560 1849 * @return bool
1561 1850 */
1562 - public function can_run_optimizations() {
1851 + public function can_run_optimizations(): bool {
1563 1852 // we don't check permissions for cron jobs.
1564 1853 if (defined('DOING_CRON') && DOING_CRON) return true;
1565 1854
1566 - if (self::is_premium() && false == user_can(get_current_user_id(), 'wpo_run_optimizations')) return false;
1855 + if (self::is_premium() && false === user_can(get_current_user_id(), 'wpo_run_optimizations')) return false;
1567 1856 return true;
1568 1857 }
1569 1858
1570 1859 /**
@@ -1583,13 +1872,10 @@
1583 1872 * @return array
1584 1873 */
1585 1874 public function get_sites() {
1586 1875 $sites = array();
1587 - // check if function get_sites exists (since 4.6.0) else use wp_get_sites.
1588 1876 if (function_exists('get_sites')) {
1589 1877 $sites = get_sites(array('network_id' => null, 'deleted' => 0, 'number' => 999999));
1590 - } elseif (function_exists('wp_get_sites')) {
1591 - $sites = wp_get_sites(array('network_id' => null, 'deleted' => 0, 'limit' => 999999));
1592 1878 }
1593 1879 return $sites;
1594 1880 }
1595 1881
@@ -1595,9 +1881,9 @@
1595 1881
1596 1882 /**
1597 1883 * Returns script memory limit in megabytes.
1598 1884 *
1599 - * @param bool $memory_limit
1885 + * @param string|bool $memory_limit
1600 1886 * @return int
1601 1887 */
1602 1888 public function get_memory_limit($memory_limit = false) {
1603 1889 // Returns in megabytes
@@ -1667,8 +1953,10 @@
1667 1953 * Converts shorthand memory notation value to bytes.
1668 1954 * From http://php.net/manual/en/function.ini-get.php
1669 1955 *
1670 1956 * @param string $val shorthand memory notation value.
1957 + *
1958 + * @return string
1671 1959 */
1672 1960 public function return_bytes($val) {
1673 1961 $val = trim($val);
1674 1962 $last = strtolower($val[strlen($val)-1]);
@@ -1700,9 +1988,9 @@
1700 1988
1701 1989 /**
1702 1990 * Close browser connection and continue script work. - Taken from UpdraftPlus
1703 1991 *
1704 - * @param array $txt Response to browser; this must be JSON (or if not, alter the Content-Type header handling below)
1992 + * @param string $txt Response to browser; this must be JSON (or if not, alter the Content-Type header handling below)
1705 1993 * @return void
1706 1994 */
1707 1995 public function close_browser_connection($txt = '') {
1708 1996 if (!headers_sent()) {
@@ -1714,9 +2002,9 @@
1714 2002 }
1715 2003
1716 2004 if (session_id()) session_write_close();
1717 2005 echo "\r\n\r\n";
1718 - echo $txt;
2006 + echo $txt; // phpcs:ignore WordPress.Security.EscapeOutput -- Output is already escaped
1719 2007 // These two added - 19-Feb-15 - started being required on local dev machine, for unknown reason (probably some plugin that started an output buffer).
1720 2008 $ob_level = ob_get_level();
1721 2009 while ($ob_level > 0) {
1722 2010 ob_end_flush();
@@ -1732,9 +2020,13 @@
1732 2020 */
1733 2021 public function change_time_limit() {
1734 2022 $time_limit = (defined('WP_OPTIMIZE_SET_TIME_LIMIT') && WP_OPTIMIZE_SET_TIME_LIMIT > 15) ? WP_OPTIMIZE_SET_TIME_LIMIT : 1800;
1735 2023
1736 - @set_time_limit($time_limit); // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged -- Try to reduce the chances of PHP self-terminating via reaching max_execution_time.
2024 + // phpcs:disable
2025 + // Generic.PHP.NoSilencedErrors.Discouraged -- Try to reduce the chances of PHP self-terminating via reaching max_execution_time.
2026 + // Squiz.PHP.DiscouragedFunctions.Discouraged -- Try to reduce the chances of PHP self-terminating via reaching max_execution_time.
2027 + @set_time_limit($time_limit);
2028 + // phpcs:enable
1737 2029 }
1738 2030
1739 2031 /**
1740 2032 * Does the request come from UDC
@@ -1751,11 +2043,11 @@
1751 2043 * @return boolean
1752 2044 */
1753 2045 public function template_should_include_data() {
1754 2046 /**
1755 - * Filters wether data should be included in certain templates or not.
2047 + * Filters whether data should be included in certain templates or not.
1756 2048 */
1757 - return apply_filters('wpo_template_should_include_data', $this->is_updraft_central_request());
2049 + return (bool) apply_filters('wpo_template_should_include_data', $this->is_updraft_central_request());
1758 2050 }
1759 2051
1760 2052 /**
1761 2053 * Load the templates for the modal window
@@ -1764,8 +2056,18 @@
1764 2056 $this->include_template('modal.php');
1765 2057 }
1766 2058
1767 2059 /**
2060 + * Adds compress popup template
2061 + */
2062 + public function add_smush_popup_template() {
2063 + if ($this->current_user_can()) {
2064 + $compression_server_hint = Updraft_Smush_Manager()->get_compression_server_hint();
2065 + $this->include_template('images/smush-popup.php', false, array('compression_server_hint' => $compression_server_hint));
2066 + }
2067 + }
2068 +
2069 + /**
1768 2070 * Delete transients and semaphores data from options table.
1769 2071 */
1770 2072 public function delete_transients_and_semaphores() {
1771 2073 global $wpdb;
@@ -1789,17 +2091,21 @@
1789 2091 foreach ($masks as $mask) {
1790 2092 $where_parts[] = "(`option_name` LIKE '{$mask}')";
1791 2093 }
1792 2094
1793 - $wpdb->query("DELETE FROM {$wpdb->options} WHERE " . join(' OR ', $where_parts));
2095 + $where_clause = implode(' OR ', $where_parts);
2096 + $wpdb->query($wpdb->prepare("DELETE FROM `{$wpdb->options}` WHERE %s", $where_clause));
1794 2097 }
1795 2098
1796 2099 /**
1797 2100 * Prevents bots from indexing plugins list
2101 + *
2102 + * @param string $output
2103 + * @return string
1798 2104 */
1799 2105 public function robots_txt($output) {
1800 2106 $upload_dir = wp_upload_dir();
1801 - $path = parse_url($upload_dir['baseurl']);
2107 + $path = wp_parse_url($upload_dir['baseurl']);
1802 2108 $output .= "\nUser-agent: *";
1803 2109 $output .= "\nDisallow: " . str_replace($path['scheme'].'://'.$path['host'], '', $upload_dir['baseurl']) . "/wpo/wpo-plugins-tables-list.json\n";
1804 2110 return $output;
1805 2111 }
@@ -1835,8 +2141,49 @@
1835 2141 * Instantiate Ajax handling class
1836 2142 */
1837 2143 private function load_ajax_handler() {
1838 2144 WPO_Ajax::get_instance();
2145 + }
2146 +
2147 + /**
2148 + * Get instance of WP_Optimize_Table_Management
2149 + *
2150 + * @return WP_Optimize_Table_Management
2151 + */
2152 + public function get_table_management() {
2153 + return WP_Optimize_Table_Management::get_instance();
2154 + }
2155 +
2156 + /**
2157 + * Get instance of WP_Optimize_404_Detector
2158 + *
2159 + * @return WP_Optimize_404_Detector
2160 + */
2161 + public function get_404_detector() {
2162 + return WP_Optimize_404_Detector::get_instance();
2163 + }
2164 +
2165 + /**
2166 + * Returns the message used to notify the user that the PHP version or WordPress version doesn't meet the requirements.
2167 + *
2168 + * @return string
2169 + */
2170 + public function get_minimum_requirements_notice_message() {
2171 + // translators: %1$s is minimum required PHP version, %2$s is minimum required WordPress version
2172 + return sprintf(esc_html__('WP-Optimize requires a minimum PHP version of %1$s and WordPress version of %2$s or higher', 'wp-optimize'), esc_html(WPO_REQUIRED_PHP_VERSION), esc_html(WPO_REQUIRED_WP_VERSION));
2173 + }
2174 +
2175 + /**
2176 + * Output notice when PHP version or WordPress version is not meet for WP-Optimize.
2177 + *
2178 + * @return void
2179 + */
2180 + public function output_minimum_requirements_notice() {
2181 + ?>
2182 + <div class="notice notice-error is-dismissible">
2183 + <p><?php echo $this->get_minimum_requirements_notice_message(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Output is already escaped ?></p>
2184 + </div>
2185 + <?php
1839 2186 }
1840 2187 }
1841 2188
1842 2189 /**