| @@ -6,14 +6,30 @@ | ||
| 6 | 6 | require_once(WPO_PLUGIN_MAIN_PATH . 'cache/class-wpo-load-url-task.php'); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | class WP_Optimize_Page_Cache_Preloader extends WP_Optimize_Preloader { |
| 10 | - | |
| 10 | + | |
| 11 | + /** | |
| 12 | + * @var string | |
| 13 | + */ | |
| 11 | 14 | protected $preload_type = 'page_cache'; |
| 12 | - | |
| 15 | + | |
| 16 | + /** | |
| 17 | + * @var string | |
| 18 | + */ | |
| 13 | 19 | protected $task_type = 'load-url-task'; |
| 20 | + | |
| 21 | + /** | |
| 22 | + * @var null | WP_Optimize_Page_Cache_Preloader | |
| 23 | + */ | |
| 24 | + static protected $_instance = null; | |
| 14 | 25 | |
| 15 | - static protected $_instance = null; | |
| 26 | + /** | |
| 27 | + * List of URLs for which a task will be created to preload them into cache | |
| 28 | + * | |
| 29 | + * @var array | |
| 30 | + */ | |
| 31 | + private $url_preload_list = array(); | |
| 16 | 32 | |
| 17 | 33 | /** |
| 18 | 34 | * WP_Optimize_Page_Cache_Preloader constructor. |
| 19 | 35 | */ |
| @@ -20,8 +36,9 @@ | ||
| 20 | 36 | public function __construct() { |
| 21 | 37 | parent::__construct(); |
| 22 | 38 | |
| 23 | 39 | add_action('wpo_page_cache_schedule_preload', array($this, 'run_scheduled_cache_preload')); |
| 40 | + add_action('wpo_page_cache_run_preload', array($this, 'run_preload_cron_job')); | |
| 24 | 41 | add_filter('wpo_preload_headers', array($this, 'preload_headers')); |
| 25 | 42 | } |
| 26 | 43 | |
| 27 | 44 | /** |
| @@ -41,8 +58,9 @@ | ||
| 41 | 58 | */ |
| 42 | 59 | public function cache_settings_updated($new_settings, $previous_settings) { |
| 43 | 60 | if (!$new_settings['enable_page_caching']) { |
| 44 | 61 | wp_clear_scheduled_hook('wpo_page_cache_schedule_preload'); |
| 62 | + wp_clear_scheduled_hook('wpo_page_cache_run_preload'); | |
| 45 | 63 | $this->delete_preload_continue_action(); |
| 46 | 64 | return; |
| 47 | 65 | } |
| 48 | 66 | |
| @@ -49,9 +67,9 @@ | ||
| 49 | 67 | if (!empty($new_settings['enable_schedule_preload'])) { |
| 50 | 68 | |
| 51 | 69 | $last_schedule_type = $previous_settings['preload_schedule_type']; |
| 52 | 70 | |
| 53 | - $last_use_nighttime = $this->options->get_option('page_cache_schedule_preload_nighttime'); | |
| 71 | + $last_use_nighttime = (int) $this->options->get_option('page_cache_schedule_preload_nighttime'); | |
| 54 | 72 | // By default, we schedule preload events to the nighttime. |
| 55 | 73 | $use_nighttime = apply_filters('wpo_page_cache_schedule_preload_use_nighttime', 1); |
| 56 | 74 | |
| 57 | 75 | $this->options->update_option('page_cache_schedule_preload_nighttime', $use_nighttime); |
| @@ -57,13 +75,13 @@ | ||
| 57 | 75 | $this->options->update_option('page_cache_schedule_preload_nighttime', $use_nighttime); |
| 58 | 76 | |
| 59 | 77 | if (wp_next_scheduled('wpo_page_cache_schedule_preload')) { |
| 60 | 78 | // if already scheduled this schedule type |
| 61 | - if ($new_settings['preload_schedule_type'] == $last_schedule_type && ($last_use_nighttime === $use_nighttime)) { | |
| 79 | + if ($new_settings['preload_schedule_type'] === $last_schedule_type && ($last_use_nighttime === $use_nighttime)) { | |
| 62 | 80 | // If the schedule type is cache lifespan, check if the cache lifespan changed. |
| 63 | - if ('wpo_use_cache_lifespan' == $new_settings['preload_schedule_type']) { | |
| 81 | + if ('wpo_use_cache_lifespan' === $new_settings['preload_schedule_type']) { | |
| 64 | 82 | // Else, if the settings cache lifespan settings haven't changed, returns |
| 65 | - if ($new_settings['page_cache_length_value'] == $previous_settings['page_cache_length_value'] && $new_settings['page_cache_length_unit'] == $previous_settings['page_cache_length_unit']) { | |
| 83 | + if ($new_settings['page_cache_length_value'] === $previous_settings['page_cache_length_value'] && $new_settings['page_cache_length_unit'] === $previous_settings['page_cache_length_unit']) { | |
| 66 | 84 | return; |
| 67 | 85 | } |
| 68 | 86 | } else { |
| 69 | 87 | return; |
| @@ -111,8 +129,19 @@ | ||
| 111 | 129 | } |
| 112 | 130 | } |
| 113 | 131 | |
| 114 | 132 | /** |
| 133 | + * Reschedule preload action on plugin activation if page cache enabled. | |
| 134 | + * | |
| 135 | + * @return void | |
| 136 | + */ | |
| 137 | + public function maybe_reschedule_preload_on_activation() { | |
| 138 | + if ($this->get_cache_config('enable_page_caching')) { | |
| 139 | + $this->reschedule_preload(); | |
| 140 | + } | |
| 141 | + } | |
| 142 | + | |
| 143 | + /** | |
| 115 | 144 | * Check if scheduled preload enabled. |
| 116 | 145 | * |
| 117 | 146 | * @return bool |
| 118 | 147 | */ |
| @@ -129,9 +158,9 @@ | ||
| 129 | 158 | $schedule_type = WPO_Cache_Config::instance()->get_option('preload_schedule_type'); |
| 130 | 159 | if (!$schedule_type) return; |
| 131 | 160 | |
| 132 | 161 | // Don't run preload if cache lifespan option enabled and cache not expired yet. |
| 133 | - if ('wpo_use_cache_lifespan' == $schedule_type) { | |
| 162 | + if ('wpo_use_cache_lifespan' === $schedule_type) { | |
| 134 | 163 | |
| 135 | 164 | /** |
| 136 | 165 | * Filters the allowed time difference between the cache exiry and the current time, in seconds. |
| 137 | 166 | * If the cache expires in less than $allowed_time_difference, preload. Otherwise leave it. |
| @@ -151,12 +180,30 @@ | ||
| 151 | 180 | |
| 152 | 181 | $this->run(); |
| 153 | 182 | } |
| 154 | 183 | |
| 184 | + /** | |
| 185 | + * Runs manual cache preload and reschedules if scheduled preload is enabled | |
| 186 | + * | |
| 187 | + * @return void | |
| 188 | + */ | |
| 189 | + public function run_preload_cron_job() { | |
| 190 | + $wpo_page_cache = WP_Optimize()->get_page_cache(); | |
| 155 | 191 | |
| 192 | + if ($this->is_scheduled_preload_enabled()) { | |
| 193 | + $this->cancel_preload(); | |
| 194 | + $this->reschedule_preload(); | |
| 195 | + $this->run('scheduled', null, true); | |
| 196 | + } elseif ($wpo_page_cache->should_auto_preload_purged_contents()) { | |
| 197 | + $this->run('manual', null, true); | |
| 198 | + } | |
| 199 | + } | |
| 200 | + | |
| 156 | 201 | /** |
| 157 | 202 | * Get cache config option value. |
| 158 | 203 | * |
| 204 | + * @param string $option | |
| 205 | + * | |
| 159 | 206 | * @return mixed |
| 160 | 207 | */ |
| 161 | 208 | public function get_cache_config($option) { |
| 162 | 209 | static $config = null; |
| @@ -182,10 +229,12 @@ | ||
| 182 | 229 | if (!empty($urls)) { |
| 183 | 230 | |
| 184 | 231 | $this->log(__('Creating tasks for preload site urls.', 'wp-optimize')); |
| 185 | 232 | |
| 233 | + $wpo_cache_specific_urls_only = wpo_cache_specific_urls_only(); | |
| 234 | + | |
| 186 | 235 | foreach ($urls as $url) { |
| 187 | - if (wpo_url_in_exceptions($url)) continue; | |
| 236 | + if (!$wpo_cache_specific_urls_only && wpo_url_in_exceptions($url)) continue; | |
| 188 | 237 | |
| 189 | 238 | if ($this->url_is_already_cached($url, $type)) { |
| 190 | 239 | continue; |
| 191 | 240 | } |
| @@ -193,11 +242,8 @@ | ||
| 193 | 242 | // this description is being used for internal purposes. |
| 194 | 243 | $description = 'Preload - '.$url; |
| 195 | 244 | $options = array('url' => $url, 'preload_type' => $type, 'anonymous_user_allowed' => (defined('DOING_CRON') && DOING_CRON) || (defined('WP_CLI') && WP_CLI)); |
| 196 | 245 | |
| 197 | - if (!class_exists('WP_Optimize_Load_Url_Task')) { | |
| 198 | - require_once WPO_PLUGIN_MAIN_PATH . 'cache/class-wpo-load-url-task.php'; | |
| 199 | - } | |
| 200 | 246 | WP_Optimize_Load_Url_Task::create_task($this->task_type, $description, $options, 'WP_Optimize_Load_Url_Task'); |
| 201 | 247 | } |
| 202 | 248 | |
| 203 | 249 | $this->log(__('Tasks for preload site urls created.', 'wp-optimize')); |
| @@ -221,9 +267,9 @@ | ||
| 221 | 267 | if (!$is_mobile_caching_enabled) return; |
| 222 | 268 | |
| 223 | 269 | $mobile_args = array( |
| 224 | 270 | 'httpversion' => '1.1', |
| 225 | - 'user-agent' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1', | |
| 271 | + 'user-agent' => WP_Optimize_Utils::get_user_agent('mobile'), | |
| 226 | 272 | 'timeout' => 10, |
| 227 | 273 | 'headers' => apply_filters('wpo_preload_headers', array()), |
| 228 | 274 | ); |
| 229 | 275 | |
| @@ -245,9 +291,9 @@ | ||
| 245 | 291 | if (!apply_filters('wpo_should_preload_amp', false, $url)) return; |
| 246 | 292 | |
| 247 | 293 | $amp_args = array( |
| 248 | 294 | 'httpversion' => '1.1', |
| 249 | - 'user-agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.89 Safari/537.36', | |
| 295 | + 'user-agent' => WP_Optimize_Utils::get_user_agent(), | |
| 250 | 296 | 'timeout' => 10, |
| 251 | 297 | 'headers' => array( |
| 252 | 298 | 'X-WP-Optimize-Cache-Preload' => 'Yes', |
| 253 | 299 | ), |
| @@ -277,8 +323,9 @@ | ||
| 277 | 323 | $urls = $this->get_post_urls(); |
| 278 | 324 | $this->options->update_option('wpo_last_page_cache_preload_type', 'posts'); |
| 279 | 325 | } |
| 280 | 326 | |
| 327 | + // translators: %d: Number of URLs found | |
| 281 | 328 | $this->log(sprintf(_n('%d url found.', '%d urls found.', count($urls), 'wp-optimize'), count($urls))); |
| 282 | 329 | |
| 283 | 330 | /** |
| 284 | 331 | * Filter the URLs which will be preloaded |
| @@ -285,9 +332,10 @@ | ||
| 285 | 332 | * |
| 286 | 333 | * @param array $urls |
| 287 | 334 | * @return array |
| 288 | 335 | */ |
| 289 | - return apply_filters('wpo_preload_get_site_urls', $urls); | |
| 336 | + $filtered_urls = apply_filters('wpo_preload_get_site_urls', $urls); | |
| 337 | + return is_array($filtered_urls) ? $filtered_urls : $urls; | |
| 290 | 338 | } |
| 291 | 339 | |
| 292 | 340 | /** |
| 293 | 341 | * Loads sitemap file and returns list of urls. |
| @@ -313,12 +361,12 @@ | ||
| 313 | 361 | |
| 314 | 362 | // if we get error then |
| 315 | 363 | // sometimes returns error due to timeout |
| 316 | 364 | if (is_wp_error($response)) { |
| 317 | - $response = file_get_contents($sitemap_url); | |
| 365 | + $response = @file_get_contents($sitemap_url); // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged -- suppress warnings when there is network error | |
| 318 | 366 | |
| 319 | 367 | // if response is empty then try load from file. |
| 320 | - if (empty($response) && '' == $sitemap_url) { | |
| 368 | + if (empty($response)) { | |
| 321 | 369 | $sitemap_file = $this->get_local_sitemap_file(); |
| 322 | 370 | |
| 323 | 371 | if (is_file($sitemap_file)) { |
| 324 | 372 | $response = file_get_contents($sitemap_file); |
| @@ -395,9 +443,9 @@ | ||
| 395 | 443 | // if there any separators add urls for each page |
| 396 | 444 | if (count($matches[0])) { |
| 397 | 445 | $prefix = strpos($permalink, '?') ? '&page=' : ''; |
| 398 | 446 | for ($page = 0; $page < count($matches[0]); $page++) { |
| 399 | - if ('' != $prefix) { | |
| 447 | + if ('' !== $prefix) { | |
| 400 | 448 | $urls[] = $permalink . $prefix . ($page+2); |
| 401 | 449 | } else { |
| 402 | 450 | $urls[] = trailingslashit($permalink) . ($page+2); |
| 403 | 451 | } |
| @@ -435,9 +483,9 @@ | ||
| 435 | 483 | * @return bool |
| 436 | 484 | */ |
| 437 | 485 | public function is_domain_mapping_enabled() { |
| 438 | 486 | // SUNRISE constant is defined with installation WordPress MU Domain Mapping plugin. |
| 439 | - $enabled = is_multisite() && defined('SUNRISE') && 'on' == strtolower(SUNRISE); | |
| 487 | + $enabled = is_multisite() && defined('SUNRISE') && 'on' === strtolower(SUNRISE); | |
| 440 | 488 | |
| 441 | 489 | /** |
| 442 | 490 | * Filters if Multisite Domain mapping is enabled. |
| 443 | 491 | * Currently, we can only detect if the WordPress MU Domain Mapping plugin is in use. |
| @@ -458,11 +506,11 @@ | ||
| 458 | 506 | |
| 459 | 507 | $domain = ''; |
| 460 | 508 | $multisite_plugin_table_name = $wpdb->base_prefix.'domain_mapping'; |
| 461 | 509 | // Check if table exists |
| 462 | - if ($wpdb->get_var("SHOW TABLES LIKE '$multisite_plugin_table_name'") != $multisite_plugin_table_name) { | |
| 510 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . esc_sql($multisite_plugin_table_name) . "'") !== $multisite_plugin_table_name) { | |
| 463 | 511 | // This table created in WordPress MU Domain Mapping plugin. |
| 464 | - $row = $wpdb->get_row("SELECT `domain` FROM {$multisite_plugin_table_name} WHERE `blog_id` = {$blog_id} AND `active` = 1", ARRAY_A); | |
| 512 | + $row = $wpdb->get_row($wpdb->prepare("SELECT `domain` FROM " .esc_sql($multisite_plugin_table_name) . " WHERE `blog_id` = %d AND `active` = %d", $blog_id, 1), ARRAY_A); | |
| 465 | 513 | if (!empty($row)) { |
| 466 | 514 | $domain = $row['domain']; |
| 467 | 515 | } |
| 468 | 516 | } else { |
| @@ -479,12 +527,41 @@ | ||
| 479 | 527 | return apply_filters('wpo_get_mapped_domain', $domain, $blog_id); |
| 480 | 528 | } |
| 481 | 529 | |
| 482 | 530 | /** |
| 531 | + * Actually add the URLs to be preloaded into cache during `shutdown` hook | |
| 532 | + * | |
| 533 | + * @return void | |
| 534 | + */ | |
| 535 | + public function create_tasks_for_auto_preload_urls() { | |
| 536 | + $wpo_cache_specific_urls_only = wpo_cache_specific_urls_only(); | |
| 537 | + foreach ($this->url_preload_list as $url) { | |
| 538 | + if (!$wpo_cache_specific_urls_only && wpo_url_in_exceptions($url)) continue; | |
| 539 | + | |
| 540 | + $description = 'Preload - '.$url; | |
| 541 | + $options = array('url' => $url, 'preload_type' => 'manual', 'anonymous_user_allowed' => (defined('DOING_CRON') && DOING_CRON) || (defined('WP_CLI') && WP_CLI)); | |
| 542 | + | |
| 543 | + WP_Optimize_Load_Url_Task::create_task($this->task_type, $description, $options, 'WP_Optimize_Load_Url_Task'); | |
| 544 | + } | |
| 545 | + | |
| 546 | + $this->run('manual', null, true); | |
| 547 | + } | |
| 548 | + | |
| 549 | + /** | |
| 550 | + * Prepare the URL list that will need to be tasked to be preloaded | |
| 551 | + * | |
| 552 | + * @param string $url The URL to be preloaded | |
| 553 | + * @return void | |
| 554 | + */ | |
| 555 | + public function add_url_to_preload_list($url) { | |
| 556 | + $this->url_preload_list[] = $url; | |
| 557 | + } | |
| 558 | + | |
| 559 | + /** | |
| 483 | 560 | * Captures and logs any interesting messages |
| 484 | 561 | * |
| 485 | - * @param String $message - the error message | |
| 486 | - * @param String $error_type - the error type | |
| 562 | + * @param string $message - the error message | |
| 563 | + * @param string $error_type - the error type | |
| 487 | 564 | */ |
| 488 | 565 | public function log($message, $error_type = 'info') { |
| 489 | 566 | |
| 490 | 567 | if (isset($this->loggers)) { |
| @@ -539,16 +616,16 @@ | ||
| 539 | 616 | continue; |
| 540 | 617 | } |
| 541 | 618 | |
| 542 | 619 | if ($this->should_regenerate_file($file_path, $preload_type)) { |
| 543 | - // delefe the expired cache file | |
| 544 | - unlink($file_path); | |
| 620 | + // delete the expired cache file | |
| 621 | + wp_delete_file($file_path); | |
| 545 | 622 | $regenerate_count++; |
| 546 | 623 | } |
| 547 | 624 | } |
| 548 | 625 | |
| 549 | 626 | // if 0 == $regenerate_count, nothing all the expected files exist, and none were deleted. |
| 550 | - return 0 == $regenerate_count; | |
| 627 | + return 0 === $regenerate_count; | |
| 551 | 628 | } |
| 552 | 629 | |
| 553 | 630 | /** |
| 554 | 631 | * Determine if a file should be regenerated |
| @@ -572,9 +649,9 @@ | ||
| 572 | 649 | // Sets the variables once per request: |
| 573 | 650 | if (null === $is_preloader_scheduled) { |
| 574 | 651 | $is_preloader_scheduled = WPO_Cache_Config::instance()->get_option('enable_schedule_preload'); |
| 575 | 652 | $schedule_type = WPO_Cache_Config::instance()->get_option('preload_schedule_type'); |
| 576 | - $lifespan = WPO_Cache_Config::instance()->get_option('page_cache_length'); | |
| 653 | + $lifespan = (int) WPO_Cache_Config::instance()->get_option('page_cache_length'); | |
| 577 | 654 | $schedule_interval = $this->get_schedule_interval($schedule_type); |
| 578 | 655 | |
| 579 | 656 | /** |
| 580 | 657 | * Expiry threshold: the current file will be considered stale if within the threshold. Default: 600s (10min) |
| @@ -596,9 +673,9 @@ | ||
| 596 | 673 | */ |
| 597 | 674 | $regenerate_file_when_no_expiry_date = apply_filters('wpo_regenerate_file_when_no_expiry_date', true); |
| 598 | 675 | } |
| 599 | 676 | |
| 600 | - if (($always_regenerate_file_if_preload_is_manual && 'manual' == $preload_type) || ($always_regenerate_file_if_preload_is_scheduled && 'scheduled' == $preload_type)) { | |
| 677 | + if (($always_regenerate_file_if_preload_is_manual && 'manual' === $preload_type) || ($always_regenerate_file_if_preload_is_scheduled && 'scheduled' === $preload_type)) { | |
| 601 | 678 | $result = true; |
| 602 | 679 | } else { |
| 603 | 680 | |
| 604 | 681 | $modified_time = (int) filemtime($path); |
| @@ -603,9 +680,9 @@ | ||
| 603 | 680 | |
| 604 | 681 | $modified_time = (int) filemtime($path); |
| 605 | 682 | |
| 606 | 683 | // cache lifespan is set. |
| 607 | - if (0 != $lifespan) { | |
| 684 | + if (0 !== $lifespan) { | |
| 608 | 685 | $expiry_time = $modified_time + $lifespan - $lifespan_expiry_threshold; |
| 609 | 686 | $result = time() > $expiry_time; |
| 610 | 687 | } elseif ($is_preloader_scheduled) { |
| 611 | 688 | $expiry_time = $modified_time + $schedule_interval - $lifespan_expiry_threshold; |
| @@ -620,8 +697,10 @@ | ||
| 620 | 697 | } |
| 621 | 698 | |
| 622 | 699 | /** |
| 623 | 700 | * Add preloader headers |
| 701 | + * | |
| 702 | + * @param array $headers Preload headers | |
| 624 | 703 | */ |
| 625 | 704 | public function preload_headers($headers) { |
| 626 | 705 | $headers['X-WP-Optimize-Cache-Preload'] = 'Yes'; |
| 627 | 706 | return $headers; |
| @@ -649,13 +728,25 @@ | ||
| 649 | 728 | 'success' => false, |
| 650 | 729 | 'error' => __('Probably page cache preload is running already.', 'wp-optimize') |
| 651 | 730 | ); |
| 652 | 731 | } |
| 653 | - | |
| 732 | + | |
| 733 | + /** | |
| 734 | + * Returns preload data | |
| 735 | + * | |
| 736 | + * @return array | |
| 737 | + */ | |
| 654 | 738 | protected function get_preload_data() { |
| 655 | 739 | return WP_Optimize()->get_page_cache()->get_cache_size(); |
| 656 | 740 | } |
| 657 | - | |
| 741 | + | |
| 742 | + /** | |
| 743 | + * Returns preloading message | |
| 744 | + * | |
| 745 | + * @param array $cache_size | |
| 746 | + * | |
| 747 | + * @return array | |
| 748 | + */ | |
| 658 | 749 | protected function get_preloading_message($cache_size) { |
| 659 | 750 | return array( |
| 660 | 751 | 'done' => false, |
| 661 | 752 | 'message' => __('Loading URLs...', 'wp-optimize'), |
| @@ -662,18 +753,34 @@ | ||
| 662 | 753 | 'size' => WP_Optimize()->format_size($cache_size['size']), |
| 663 | 754 | 'file_count' => $cache_size['file_count'] |
| 664 | 755 | ); |
| 665 | 756 | } |
| 666 | - | |
| 757 | + | |
| 758 | + /** | |
| 759 | + * Returns last preload message | |
| 760 | + * | |
| 761 | + * @param array $cache_size | |
| 762 | + * @param string $last_preload_time_str | |
| 763 | + * | |
| 764 | + * @return array | |
| 765 | + */ | |
| 667 | 766 | protected function get_last_preload_message($cache_size, $last_preload_time_str) { |
| 668 | 767 | return array( |
| 669 | 768 | 'done' => true, |
| 769 | + // translators: %s is the last preload time | |
| 670 | 770 | 'message' => sprintf(__('Last preload finished at %s', 'wp-optimize'), $last_preload_time_str), |
| 671 | 771 | 'size' => WP_Optimize()->format_size($cache_size['size']), |
| 672 | 772 | 'file_count' => $cache_size['file_count'] |
| 673 | 773 | ); |
| 674 | 774 | } |
| 675 | - | |
| 775 | + | |
| 776 | + /** | |
| 777 | + * Returns preload success message | |
| 778 | + * | |
| 779 | + * @param array $cache_size | |
| 780 | + * | |
| 781 | + * @return array | |
| 782 | + */ | |
| 676 | 783 | protected function get_preload_success_message($cache_size) { |
| 677 | 784 | return array( |
| 678 | 785 | 'done' => true, |
| 679 | 786 | 'size' => WP_Optimize()->format_size($cache_size['size']), |
| @@ -679,9 +786,18 @@ | ||
| 679 | 786 | 'size' => WP_Optimize()->format_size($cache_size['size']), |
| 680 | 787 | 'file_count' => $cache_size['file_count'] |
| 681 | 788 | ); |
| 682 | 789 | } |
| 683 | - | |
| 790 | + | |
| 791 | + /** | |
| 792 | + * Returns preload progress message | |
| 793 | + * | |
| 794 | + * @param array $cache_size | |
| 795 | + * @param string $preloaded_message | |
| 796 | + * @param int $preload_resuming_in | |
| 797 | + * | |
| 798 | + * @return array | |
| 799 | + */ | |
| 684 | 800 | protected function get_preload_progress_message($cache_size, $preloaded_message, $preload_resuming_in) { |
| 685 | 801 | return array( |
| 686 | 802 | 'done' => false, |
| 687 | 803 | 'message' => $preloaded_message, |
| @@ -702,10 +818,10 @@ | ||
| 702 | 818 | |
| 703 | 819 | $gmt_offset = WP_Optimize_Utils::get_gmt_offset(); |
| 704 | 820 | |
| 705 | 821 | // Set time to random time from 1 a.m. to 4:59 a.m. |
| 706 | - $random_time = sprintf('%02d:%02d', rand(1, 4), rand(0, 59)); | |
| 707 | - $nighttime = strtotime(date("Y-m-d {$random_time}:00", $time)) - $gmt_offset; | |
| 822 | + $random_time = sprintf('%02d:%02d', wp_rand(1, 4), wp_rand(0, 59)); | |
| 823 | + $nighttime = strtotime(gmdate("Y-m-d {$random_time}:00", $time)) - $gmt_offset; | |
| 708 | 824 | |
| 709 | 825 | if ($nighttime < time()) $nighttime += 24 * 3600; |
| 710 | 826 | |
| 711 | 827 | return $nighttime; |
| @@ -710,6 +826,4 @@ | ||
| 710 | 826 | |
| 711 | 827 | return $nighttime; |
| 712 | 828 | } |
| 713 | 829 | } |
| 714 | - | |
| 715 | -WP_Optimize_Page_Cache_Preloader::instance(); | |
