'+e.message+"
"):Object.keys(e).forEach(t=>{i.append(""+t+": "),i.append(e[t].message),i.append("")})}})}),v("#wpr_enable_mobile_cache").on("click",function(t){t.preventDefault(),v("#wpr_enable_mobile_cache").addClass("wpr-isLoading"),v.post(ajaxurl,{action:"rocket_enable_mobile_cache",_ajax_nonce:rocket_ajax_data.nonce},function(t){t.success&&(v("#wpr_enable_mobile_cache").hide(),v("#wpr_mobile_cache_default").hide(),v("#wpr_mobile_cache_response").show(),v("#wpr_enable_mobile_cache").removeClass("wpr-isLoading"),v("#cache_mobile").val(1),v("#do_caching_mobile_files").val(1))})})}),document.addEventListener("DOMContentLoaded",function(){var t=document.getElementById("analytics_enabled");t&&t.addEventListener("change",function(){var t=this.checked;"undefined"!=typeof rocket_mixpanel_data&&(rocket_mixpanel_data.optin_enabled=t?"1":"0"),fetch(ajaxurl,{method:"POST",headers:{"Content-Type":"application/x-www-form-urlencoded"},body:new URLSearchParams({action:"rocket_toggle_optin",value:t?1:0,_ajax_nonce:rocket_ajax_data.nonce})})})}),document.addEventListener("DOMContentLoaded",function(){let t=2e3,e=5e3,i=Array.isArray(window.rocket_ajax_data?.rocket_insights_ids)?window.rocket_ajax_data.rocket_insights_ids.slice():[],n=t,r=null,s=!0,a={data:{status:"",score:0,pages_num:0},html:"",row_html:"",disabled_btn_html:{global_score_widget:"",rocket_insights:""}},o=(window.rocket_ajax_data?.global_score_data&&(a=window.rocket_ajax_data.global_score_data),v("#wpr-speed-radar-url-input")),l=v(".wpr-ri-urls-table tbody"),c=v(".wpr-ri-urls-table");function p(t){i.includes(t)||i.push(t)}function d(t){var e=v(".wpr-ri-summary-info"),i="1"===window.rocket_ajax_data?.is_free,i=v(i?"#wpr-ri-quota-banner":"#rocket_insights_survey");!1===t||!s?(e.hide(),i.removeClass("hidden")):(e.show(),i.addClass("hidden"))}function h(t){void 0!==t&&s!==t&&(s=t,document.querySelectorAll(".wpr-action-speed_radar_refresh").forEach(t=>{var e=t.closest(".wpr-ri-item");e&&(e=parseInt(e.dataset.rocketInsightsId,10),e=i.includes(e),!s||e?(t.classList.add("wpr-ri-action--disabled"),t.setAttribute("disabled","true"),s||(t.classList.add("wpr-btn-with-tool-tip"),t.setAttribute("title",window.rocket_ajax_data?.rocket_insights_no_credit_tooltip||"Upgrade your plan to get access to re-test performance or run new tests"))):(t.classList.remove("wpr-ri-action--disabled","wpr-btn-with-tool-tip"),t.removeAttribute("disabled"),t.removeAttribute("title")))}))}function u(){r&&(clearTimeout(r),r=null),n=t}function _(){0
'+e.message+"
"):Object.keys(e).forEach(t=>{i.append(""+t+": "),i.append(e[t].message),i.append("")})}})}),v("#wpr_enable_mobile_cache").on("click",function(t){t.preventDefault(),v("#wpr_enable_mobile_cache").addClass("wpr-isLoading"),v.post(ajaxurl,{action:"rocket_enable_mobile_cache",_ajax_nonce:rocket_ajax_data.nonce},function(t){t.success&&(v("#wpr_enable_mobile_cache").hide(),v("#wpr_mobile_cache_default").hide(),v("#wpr_mobile_cache_response").show(),v("#wpr_enable_mobile_cache").removeClass("wpr-isLoading"),v("#cache_mobile").val(1),v("#do_caching_mobile_files").val(1))})})}),document.addEventListener("DOMContentLoaded",function(){var t=document.getElementById("analytics_enabled");t&&t.addEventListener("change",function(){var t=this.checked;"undefined"!=typeof rocket_mixpanel_data&&(rocket_mixpanel_data.optin_enabled=t?"1":"0"),fetch(ajaxurl,{method:"POST",headers:{"Content-Type":"application/x-www-form-urlencoded"},body:new URLSearchParams({action:"rocket_toggle_optin",value:t?1:0,_ajax_nonce:rocket_ajax_data.nonce})})})}),document.addEventListener("DOMContentLoaded",function(){let t=2e3,e=5e3,i=Array.isArray(window.rocket_ajax_data?.rocket_insights_ids)?window.rocket_ajax_data.rocket_insights_ids.slice():[],n=t,r=null,a=!0,s={data:{status:"",score:0,pages_num:0},html:"",row_html:"",disabled_btn_html:{global_score_widget:"",rocket_insights:""}},o=(window.rocket_ajax_data?.global_score_data&&(s=window.rocket_ajax_data.global_score_data),v("#wpr-speed-radar-url-input")),l=v(".wpr-ri-urls-table tbody"),c=v(".wpr-ri-urls-table");function d(t){i.includes(t)||i.push(t)}function p(t){var e=v(".wpr-ri-summary-info"),i="1"===window.rocket_ajax_data?.is_free,i=v(i?"#wpr-ri-quota-banner":"#rocket_insights_survey");!1===t||!a?(e.hide(),i.removeClass("hidden")):(e.show(),i.addClass("hidden"))}function h(t){void 0!==t&&a!==t&&(a=t,document.querySelectorAll(".wpr-action-speed_radar_refresh").forEach(t=>{var e=t.closest(".wpr-ri-item");e&&(e=parseInt(e.dataset.rocketInsightsId,10),e=i.includes(e),!a||e?(t.classList.add("wpr-ri-action--disabled"),t.setAttribute("disabled","true"),a||(t.classList.add("wpr-btn-with-tool-tip"),t.setAttribute("title",window.rocket_ajax_data?.rocket_insights_no_credit_tooltip||"Upgrade your plan to get access to re-test performance or run new tests"))):(t.classList.remove("wpr-ri-action--disabled","wpr-btn-with-tool-tip"),t.removeAttribute("disabled"),t.removeAttribute("title")))}))}function u(){r&&(clearTimeout(r),r=null),n=t}function _(){0
'+e.message+\"
\"):Object.keys(e).forEach(t=>{i.append(\"\"+t+\": \"),i.append(e[t].message),i.append(\"\")})}})}),v(\"#wpr_enable_mobile_cache\").on(\"click\",function(t){t.preventDefault(),v(\"#wpr_enable_mobile_cache\").addClass(\"wpr-isLoading\"),v.post(ajaxurl,{action:\"rocket_enable_mobile_cache\",_ajax_nonce:rocket_ajax_data.nonce},function(t){t.success&&(v(\"#wpr_enable_mobile_cache\").hide(),v(\"#wpr_mobile_cache_default\").hide(),v(\"#wpr_mobile_cache_response\").show(),v(\"#wpr_enable_mobile_cache\").removeClass(\"wpr-isLoading\"),v(\"#cache_mobile\").val(1),v(\"#do_caching_mobile_files\").val(1))})})}),document.addEventListener(\"DOMContentLoaded\",function(){var t=document.getElementById(\"analytics_enabled\");t&&t.addEventListener(\"change\",function(){var t=this.checked;\"undefined\"!=typeof rocket_mixpanel_data&&(rocket_mixpanel_data.optin_enabled=t?\"1\":\"0\"),fetch(ajaxurl,{method:\"POST\",headers:{\"Content-Type\":\"application/x-www-form-urlencoded\"},body:new URLSearchParams({action:\"rocket_toggle_optin\",value:t?1:0,_ajax_nonce:rocket_ajax_data.nonce})})})}),document.addEventListener(\"DOMContentLoaded\",function(){let t=2e3,e=5e3,i=Array.isArray(window.rocket_ajax_data?.rocket_insights_ids)?window.rocket_ajax_data.rocket_insights_ids.slice():[],n=t,r=null,s=!0,a={data:{status:\"\",score:0,pages_num:0},html:\"\",row_html:\"\",disabled_btn_html:{global_score_widget:\"\",rocket_insights:\"\"}},o=(window.rocket_ajax_data?.global_score_data&&(a=window.rocket_ajax_data.global_score_data),v(\"#wpr-speed-radar-url-input\")),l=v(\".wpr-ri-urls-table tbody\"),c=v(\".wpr-ri-urls-table\");function p(t){i.includes(t)||i.push(t)}function d(t){var e=v(\".wpr-ri-summary-info\"),i=\"1\"===window.rocket_ajax_data?.is_free,i=v(i?\"#wpr-ri-quota-banner\":\"#rocket_insights_survey\");!1===t||!s?(e.hide(),i.removeClass(\"hidden\")):(e.show(),i.addClass(\"hidden\"))}function h(t){void 0!==t&&s!==t&&(s=t,document.querySelectorAll(\".wpr-action-speed_radar_refresh\").forEach(t=>{var e=t.closest(\".wpr-ri-item\");e&&(e=parseInt(e.dataset.rocketInsightsId,10),e=i.includes(e),!s||e?(t.classList.add(\"wpr-ri-action--disabled\"),t.setAttribute(\"disabled\",\"true\"),s||(t.classList.add(\"wpr-btn-with-tool-tip\"),t.setAttribute(\"title\",window.rocket_ajax_data?.rocket_insights_no_credit_tooltip||\"Upgrade your plan to get access to re-test performance or run new tests\"))):(t.classList.remove(\"wpr-ri-action--disabled\",\"wpr-btn-with-tool-tip\"),t.removeAttribute(\"disabled\"),t.removeAttribute(\"title\")))}))}function u(){r&&(clearTimeout(r),r=null),n=t}function _(){0
'+e.message+\"
\"):Object.keys(e).forEach(t=>{i.append(\"\"+t+\": \"),i.append(e[t].message),i.append(\"\")})}})}),v(\"#wpr_enable_mobile_cache\").on(\"click\",function(t){t.preventDefault(),v(\"#wpr_enable_mobile_cache\").addClass(\"wpr-isLoading\"),v.post(ajaxurl,{action:\"rocket_enable_mobile_cache\",_ajax_nonce:rocket_ajax_data.nonce},function(t){t.success&&(v(\"#wpr_enable_mobile_cache\").hide(),v(\"#wpr_mobile_cache_default\").hide(),v(\"#wpr_mobile_cache_response\").show(),v(\"#wpr_enable_mobile_cache\").removeClass(\"wpr-isLoading\"),v(\"#cache_mobile\").val(1),v(\"#do_caching_mobile_files\").val(1))})})}),document.addEventListener(\"DOMContentLoaded\",function(){var t=document.getElementById(\"analytics_enabled\");t&&t.addEventListener(\"change\",function(){var t=this.checked;\"undefined\"!=typeof rocket_mixpanel_data&&(rocket_mixpanel_data.optin_enabled=t?\"1\":\"0\"),fetch(ajaxurl,{method:\"POST\",headers:{\"Content-Type\":\"application/x-www-form-urlencoded\"},body:new URLSearchParams({action:\"rocket_toggle_optin\",value:t?1:0,_ajax_nonce:rocket_ajax_data.nonce})})})}),document.addEventListener(\"DOMContentLoaded\",function(){let t=2e3,e=5e3,i=Array.isArray(window.rocket_ajax_data?.rocket_insights_ids)?window.rocket_ajax_data.rocket_insights_ids.slice():[],n=t,r=null,a=!0,s={data:{status:\"\",score:0,pages_num:0},html:\"\",row_html:\"\",disabled_btn_html:{global_score_widget:\"\",rocket_insights:\"\"}},o=(window.rocket_ajax_data?.global_score_data&&(s=window.rocket_ajax_data.global_score_data),v(\"#wpr-speed-radar-url-input\")),l=v(\".wpr-ri-urls-table tbody\"),c=v(\".wpr-ri-urls-table\");function d(t){i.includes(t)||i.push(t)}function p(t){var e=v(\".wpr-ri-summary-info\"),i=\"1\"===window.rocket_ajax_data?.is_free,i=v(i?\"#wpr-ri-quota-banner\":\"#rocket_insights_survey\");!1===t||!a?(e.hide(),i.removeClass(\"hidden\")):(e.show(),i.addClass(\"hidden\"))}function h(t){void 0!==t&&a!==t&&(a=t,document.querySelectorAll(\".wpr-action-speed_radar_refresh\").forEach(t=>{var e=t.closest(\".wpr-ri-item\");e&&(e=parseInt(e.dataset.rocketInsightsId,10),e=i.includes(e),!a||e?(t.classList.add(\"wpr-ri-action--disabled\"),t.setAttribute(\"disabled\",\"true\"),a||(t.classList.add(\"wpr-btn-with-tool-tip\"),t.setAttribute(\"title\",window.rocket_ajax_data?.rocket_insights_no_credit_tooltip||\"Upgrade your plan to get access to re-test performance or run new tests\"))):(t.classList.remove(\"wpr-ri-action--disabled\",\"wpr-btn-with-tool-tip\"),t.removeAttribute(\"disabled\"),t.removeAttribute(\"title\")))}))}function u(){r&&(clearTimeout(r),r=null),n=t}function _(){0
' . sprintf( - // translators: %1$s = opening link tag, %2$s = closing link tag. - __( 'Not required for services like Cloudflare and Sucuri. Please see our available %1$sAdd-ons%2$s.', 'rocket' ), - '', - '' - ) . '', - 'help' => [ - 'id' => $this->beacon->get_suggest( 'cdn_section' ), - 'url' => $cdn_beacon['url'], - ], - 'page' => 'page_cdn', + $cdn_beacon = $this->beacon->get_suggest( 'own_cdn' ); + + $cdn_sections = [ + 'cdn_section' => [ + 'title' => __( 'Your CDN', 'rocket' ), + 'type' => 'your_own_cdn', + 'help' => [ + 'id' => $cdn_beacon['id'], + 'url' => $cdn_beacon['url'], + ], + 'page' => 'page_cdn', + 'class' => [ 'your-own-cdn' ], + 'status_indicator' => [ + // Read raw options to avoid values filtered through pre_get_rocket_option_* when RocketCDN is active. + // This prevents incorrect BYOCDN status display when CDN is enabled but no CNAMEs are configured. + 'is_active' => ! empty( ( (array) $this->options->get_options() )['cdn_cnames'] ?? [] ), + 'status_text' => __( 'Your CDN is active on your website', 'rocket' ), + 'paused_status_text' => __( 'RocketCDN is paused', 'rocket' ), + 'hide_pause_btn' => true, ], - 'cnames_section' => [ - 'type' => 'nocontainer', - 'page' => 'page_cdn', - ], - 'exclude_cdn_section' => [ - 'title' => __( 'Exclude files from CDN', 'rocket' ), - 'type' => 'fields_container', - 'help' => [ - 'id' => $cdn_exclude_beacon['id'], - 'url' => $cdn_exclude_beacon['url'], - ], - 'page' => 'page_cdn', - ], - ] - ); + ], + ]; + + /** + * Filters the CDN driver sections. + * + * Allows adding or modifying sections for different CDN drivers + * (Built-in CDN, RocketCDN Unlimited, Your own CDN). + * + * @param array $cdn_driver_sections CDN driver sections data. + */ + $cdn_sections = wpm_apply_filters_typed( 'array', 'rocket_cdn_driver_sections', $cdn_sections ); + + $this->settings->add_settings_sections( $cdn_sections ); $maybe_display_cdn_helper = ''; @@ -1588,7 +1610,7 @@ private function cdn_section() { apply_filters( 'rocket_cdn_settings_fields', [ - 'cdn' => [ + 'cdn' => [ 'type' => 'checkbox', 'label' => __( 'Enable Content Delivery Network', 'rocket' ), 'helper' => $maybe_display_cdn_helper, @@ -1596,24 +1618,16 @@ private function cdn_section() { 'page' => 'page_cdn', 'default' => 0, 'sanitize_callback' => 'sanitize_checkbox', - ], - 'cdn_cnames' => [ - 'type' => 'cnames', - 'label' => __( 'CDN CNAME(s)', 'rocket' ), - 'description' => __( 'Specify the CNAME(s) below', 'rocket' ), - 'default' => [], - 'section' => 'cnames_section', - 'page' => 'page_cdn', - ], - 'cdn_reject_files' => [ - 'type' => 'textarea', - 'description' => __( 'Specify URL(s) of files that should not get served via CDN (one per line).', 'rocket' ), - 'helper' => __( 'The domain part of the URL will be stripped automatically.
Use (.*) wildcards to exclude all files of a given file type located at a specific path.', 'rocket' ), - 'placeholder' => '/wp-content/plugins/some-plugins/(.*).css', - 'section' => 'exclude_cdn_section', - 'page' => 'page_cdn', - 'default' => [], - 'sanitize_callback' => 'sanitize_textarea', + 'container_class' => [ 'wpr-isHidden' ], + ], + 'cdn_cnames' => [ + 'type' => 'cnames', + 'label' => __( 'CDN CNAME(s)', 'rocket' ), + 'description' => __( 'Specify the CNAME(s) below', 'rocket' ), + 'default' => [], + 'section' => 'cdn_section', + 'page' => 'page_cdn', + 'container_class' => [ 'your-own-cdn' ], ], ] ) diff --git a/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Render.php b/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Render.php index 9ee344c4e..87f0f1882 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Render.php +++ b/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Render.php @@ -209,10 +209,12 @@ public function render_tutorials_section() { /** * Render the tools page section. * + * @param array $data Data to pass to the template. + * * @since 3.0 */ - public function render_tools_section() { - echo $this->generate( 'page-sections/tools' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + public function render_tools_section( $data = [] ) { + echo $this->generate( 'page-sections/tools', $data ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. } /** @@ -323,6 +325,54 @@ public function addons_container( $args ) { echo $this->generate( 'sections/addons-container', $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. } + /** + * Displays the Your Own CDN section template. + * + * This is a section for configuring your own CDN settings. + * It includes the PAUSE CDN button. + * + * @param array $args Array of arguments to populate the template. + */ + public function your_own_cdn( $args ) { + echo $this->generate( 'sections/cdn/your-own-cdn', $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + + /** + * Displays the RocketCDN Free section template. + * + * @param array $args Array of arguments to populate the template. + */ + public function rocketcdn_free( $args ) { + echo $this->generate( 'sections/cdn/rocketcdn-free', $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + + /** + * Displays the RocketCDN Paid section template. + * + * @param array $args Array of arguments to populate the template. + */ + public function rocketcdn_paid( $args ) { + echo $this->generate( 'sections/cdn/rocketcdn-paid', $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + + /** + * Displays the purge CDN cache section template. + * + * @param array $args Array of arguments to populate the template. + */ + public function purge_cdn_cache_section( $args ) { + echo $this->generate( 'sections/cdn/purge-cdn-cache', $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + + /** + * Displays the no container with title section template. + * + * @param array $args Array of arguments to populate the template. + */ + public function nocontainer_with_title( $args ) { + echo $this->generate( 'sections/nocontainer-with-title', $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + /** * Displays the text field template. * @@ -364,6 +414,23 @@ public function textarea( $args ) { echo $this->generate( 'fields/textarea', $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. } + /** + * Displays the textarea with container field template. + * + * @since 3.22 + * + * @param array $args Array of arguments to populate the template. + */ + public function textarea_with_container( $args ) { + if ( is_array( $args['value'] ) ) { + $args['value'] = implode( "\n", $args['value'] ); + } + + $args['value'] = empty( $args['value'] ) ? '' : $args['value']; + + echo $this->generate( 'fields/textarea-with-container', $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + /** * Displays the sliding checkbox field template. * diff --git a/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/ServiceProvider.php b/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/ServiceProvider.php index 1f0808b51..f3047305a 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/ServiceProvider.php +++ b/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/ServiceProvider.php @@ -74,6 +74,7 @@ public function register(): void { 'template_path', 'options', 'ri_context', + 'rocketcdn_subscription_controller', ] ); $this->getContainer()->addShared( 'settings_page_subscriber', Subscriber::class ) diff --git a/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Settings.php b/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Settings.php index f590f59dd..cce8f67e1 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Settings.php +++ b/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Settings.php @@ -385,6 +385,12 @@ public function sanitize_callback( $input ) { $input['cdn_zone'] = array_values( $input['cdn_zone'] ); } + if ( ! empty( $input['cdn_reject_pages'] ) ) { + $input['cdn_reject_pages'] = rocket_sanitize_textarea_field( 'cdn_reject_pages', $input['cdn_reject_pages'] ); + } else { + $input['cdn_reject_pages'] = []; + } + // Option : Files to exclude from the CDN process. if ( ! empty( $input['cdn_reject_files'] ) ) { $input['cdn_reject_files'] = rocket_sanitize_textarea_field( 'cdn_reject_files', $input['cdn_reject_files'] ); @@ -421,7 +427,16 @@ function ( $error ) { ); if ( ! $notices ) { - add_settings_error( 'general', 'settings_updated', __( 'Settings saved.', 'rocket' ), 'updated' ); + $message = __( 'Settings saved.', 'rocket' ); + + /** + * Filters the appended message to the "Settings saved." admin notice. + * + * @param string $appended_message The appended message. + */ + $message .= wpm_apply_filters_typed( 'string', 'rocket_settings_saved_message', '' ); + + add_settings_error( 'general', 'settings_updated', $message, 'updated' ); } } diff --git a/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Subscriber.php b/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Subscriber.php index c3b903eb4..660bba506 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Subscriber.php +++ b/web/app/plugins/wp-rocket/inc/Engine/Admin/Settings/Subscriber.php @@ -140,8 +140,9 @@ public function add_admin_page() { * @since 3.7.4 * * @param string $menu_title The text to be used for the menu. + * @param string $context Filter context, adminmenu or adminbar. */ - apply_filters( 'rocket_menu_title', $this->page->get_title() ), + wpm_apply_filters_typed( 'string', 'rocket_menu_title', $this->page->get_title(), 'adminmenu' ), $this->page->get_capability(), $this->page->get_slug(), [ $this->page, 'render_page' ] @@ -199,7 +200,8 @@ public function add_menu_tools_page( $navigation ) { $navigation['tools'] = [ 'id' => 'tools', 'title' => __( 'Tools', 'rocket' ), - 'menu_description' => __( 'Import, Export, Rollback', 'rocket' ), + 'menu_description' => __( 'Export, import, rollback, and set up MCP', 'rocket' ), + 'badge' => __( 'NEW', 'rocket' ), ]; return $navigation; diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Admin/Subscriber.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Admin/Subscriber.php index 281259b49..5189d463c 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/CDN/Admin/Subscriber.php +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Admin/Subscriber.php @@ -4,6 +4,7 @@ namespace WP_Rocket\Engine\CDN\Admin; use WP_Rocket\Event_Management\Subscriber_Interface; +use WP_Rocket\Engine\CDN\Context; class Subscriber implements Subscriber_Interface { /** @@ -13,7 +14,9 @@ class Subscriber implements Subscriber_Interface { */ public static function get_subscribed_events() { return [ - 'rocket_meta_boxes_fields' => [ 'add_meta_box', 9 ], + 'rocket_meta_boxes_fields' => [ 'add_meta_box', 9 ], + 'rocket_hidden_settings_fields' => [ 'add_cdn_type', 10 ], + 'rocket_input_sanitize' => 'sanitize_cdn_type_option', ]; } @@ -25,8 +28,52 @@ public static function get_subscribed_events() { * @return string[] */ public function add_meta_box( array $fields ) { - $fields['cdn'] = __( 'CDN', 'rocket' ); + /* + * Hiding the CDN option in the metabox for now. + * We will revisit this when handling CDN status for different pages/posts. + * + * $fields['cdn'] = __( 'CDN', 'rocket' ); + */ return $fields; } + + /** + * Add CDN to the list of hidden settings fields. + * + * @param string[] $fields Hidden settings fields. + * + * @return string[] + */ + public function add_cdn_type( array $fields ) { + $fields[] = 'cdn_type'; + + return $fields; + } + + /** + * Sanitize the CDN type option. + * + * @param array $input Input array. + * + * @return array + */ + public function sanitize_cdn_type_option( array $input ) { + // Set default value if empty. + if ( empty( $input['cdn_type'] ) ) { + $input['cdn_type'] = Context::ROCKETCDN_TYPE; + } + + $allowed_drivers = [ Context::ROCKETCDN_TYPE, Context::BYOCDN_TYPE ]; + + // Validate that the value is one of the allowed drivers. + if ( ! in_array( $input['cdn_type'], $allowed_drivers, true ) ) { + $input['cdn_type'] = Context::ROCKETCDN_TYPE; + } + + // Sanitize the value. + $input['cdn_type'] = sanitize_text_field( $input['cdn_type'] ); + + return $input; + } } diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/CDN.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/CDN.php index ba864553d..dec12e2a6 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/CDN/CDN.php +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/CDN.php @@ -5,6 +5,7 @@ use WP_Rocket\Admin\Options_Data; use WP_Rocket\Engine\Support\CommentTrait; +use WP_Rocket\Engine\CDN\CNAMEValidator; /** * CDN class @@ -28,13 +29,31 @@ class CDN { */ private $home_host; + /** + * CNAME Validator instance + * + * @var CNAMEValidator + */ + private $cname_validator; + + /** + * Context instance. + * + * @var Context + */ + private $context; + /** * Constructor * - * @param Options_Data $options WP Rocket Options instance. + * @param Options_Data $options WP Rocket Options instance. + * @param CNAMEValidator $cname_validator CNAME Validator instance. + * @param Context $context Context instance. */ - public function __construct( Options_Data $options ) { - $this->options = $options; + public function __construct( Options_Data $options, CNAMEValidator $cname_validator, Context $context ) { + $this->options = $options; + $this->cname_validator = $cname_validator; + $this->context = $context; } /** @@ -232,6 +251,16 @@ public function get_cdn_urls( $zones = [ 'all' ] ) { */ $hosts = (array) apply_filters( 'rocket_cdn_cnames', $hosts, $zones ); $hosts = array_filter( $hosts ); + + if ( ! $this->context->is_rocketcdn() ) { + $hosts = array_filter( + $hosts, + function ( $url ) { + return $this->cname_validator->is_valid( rocket_add_url_protocol( $url ) ); + } + ); + } + $hosts = array_flip( array_flip( $hosts ) ); $hosts = array_values( $hosts ); diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/CNAMEValidator.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/CNAMEValidator.php new file mode 100644 index 000000000..904c0178d --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/CNAMEValidator.php @@ -0,0 +1,82 @@ +build_check_url( $cname_url ); + $response = wp_remote_head( $check_url, [ 'timeout' => 5 ] ); + + if ( is_wp_error( $response ) ) { + set_transient( $transient_key, 0, DAY_IN_SECONDS ); + return false; + } + + $code = isset( $response['response']['code'] ) ? (int) $response['response']['code'] : 0; // @phpstan-ignore-line - code may be absent in certain HTTP transport error states + $valid = 404 !== $code ? 1 : 0; + + set_transient( $transient_key, $valid, DAY_IN_SECONDS ); + + return (bool) $valid; + } + + /** + * Deletes cached validation results for the given CNAME URLs. + * + * Called when CDN settings are saved so stale cached results are not used + * after the user updates their CNAME list. + * + * @since 3.22.0.3 + * + * @param array $cname_urls List of CNAME URLs whose transients should be deleted. + * @return void + */ + public function clear_validation_cache( array $cname_urls ): void { + foreach ( $cname_urls as $url ) { + delete_transient( 'rocket_cname_valid_' . md5( rocket_add_url_protocol( $url ) ) ); + } + } + + /** + * Builds the URL to probe by replacing the site host with the CDN host in the + * active theme's stylesheet URI. + * + * Using style.css guarantees the file exists on any WordPress install and + * that the check works with any CDN provider — not just RocketCDN. + * + * @since 3.22.0.3 + * + * @param string $cname_url CDN URL. + * @return string + */ + private function build_check_url( string $cname_url ): string { + $stylesheet_path = wp_parse_url( get_stylesheet_uri(), PHP_URL_PATH ) ?? ''; + $cname_host = wp_parse_url( rocket_add_url_protocol( $cname_url ), PHP_URL_HOST ) ?? ''; + + return 'https://' . $cname_host . $stylesheet_path; + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Cache.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Cache.php new file mode 100644 index 000000000..517abafea --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Cache.php @@ -0,0 +1,52 @@ +query = $query; + } + + /** + * Clear all site's cache. + * + * @return void + */ + public function clear_all_cache(): void { + rocket_clean_domain(); + } + + /** + * Clear rocketCDN free pages cache. + * + * @return void + */ + public function clear_rocketcdn_free_pages_cache(): void { + $pages = $this->query->get_all(); + + foreach ( $pages as $page ) { + if ( empty( $page->url ) ) { + continue; + } + + Utils::clean_url( $page->url ); + } + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Context.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Context.php new file mode 100644 index 000000000..e502100a0 --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Context.php @@ -0,0 +1,116 @@ +options = $options; + $this->subscription_controller = $subscription_controller; + } + + /** + * Gets the currently active CDN driver. + * + * @return string + */ + public function get_driver(): string { + $cdn_type = $this->get_cdn_type(); + + if ( self::ROCKETCDN_TYPE !== $cdn_type ) { + return self::BYOCDN_TYPE; + } + + return $this->rocketcdn_resolver(); + } + + /** + * Get CDN Type. + * + * @return string + */ + public function get_cdn_type(): string { + return (string) $this->options->get( 'cdn_type', self::ROCKETCDN_TYPE ); + } + + /** + * Is rocketcdn tab is selected. + * + * @return bool + */ + public function is_rocketcdn() { + return self::ROCKETCDN_TYPE === $this->get_cdn_type(); + } + + /** + * Gets the free page limit for the RocketCDN free tier. + * + * @return int + */ + public function get_free_page_limit(): int { + return 3; + } + + /** + * Resolves RocketCDN to either free or paid type. + * + * @return string + */ + private function rocketcdn_resolver(): string { + if ( ! $this->subscription_controller->has_active_subscription() && $this->subscription_controller->is_cancelled_outside_grace_period() ) { + return self::ROCKETCDN_TYPE; + } + + if ( $this->subscription_controller->is_paid() ) { + return self::ROCKETCDN_PAID_TYPE; + } + + return self::ROCKETCDN_FREE_TYPE; + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/Custom.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/Custom.php new file mode 100644 index 000000000..529ca374a --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/Custom.php @@ -0,0 +1,16 @@ +container = $container; + $this->context = $context; + } + + /** + * Create appropriate driver based on current context + * + * @return DriverInterface|null Driver container ID. + */ + public function create(): ?DriverInterface { + $active_driver = $this->context->get_driver(); + + switch ( $active_driver ) { + case Context::ROCKETCDN_FREE_TYPE: + return $this->container->get( 'cdn_driver_free' ); + + case Context::ROCKETCDN_PAID_TYPE: + return $this->container->get( 'cdn_driver_paid' ); + + case Context::BYOCDN_TYPE: + return $this->container->get( 'cdn_driver_byocdn' ); + + default: + return null; + } + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/DriverInterface.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/DriverInterface.php new file mode 100644 index 000000000..940aa7c28 --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/DriverInterface.php @@ -0,0 +1,15 @@ +query = $query; + } + + /** + * Should rewrite url or not. + * + * @param string $url Page Url to check. + * @return bool + */ + public function should_rewrite_url( string $url ): bool { + return $this->query->is_url_found( $url ); + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/RocketCDNPaid.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/RocketCDNPaid.php new file mode 100644 index 000000000..1fe534f05 --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Drivers/RocketCDNPaid.php @@ -0,0 +1,119 @@ +options = $options; + } + + /** + * Should rewrite url or not. + * + * @param string $url Page Url to check. + * @return bool + */ + public function should_rewrite_url( string $url ): bool { + // Get excluded pages from options. + $excluded_pages = $this->get_excluded_pages(); + + // Check if URL is in excluded list. + foreach ( $excluded_pages as $excluded_pattern ) { + $normalized_pattern = $this->normalize_pattern( $excluded_pattern ); + if ( $this->matches_pattern( $url, $normalized_pattern ) ) { + return false; // This page is excluded, don't rewrite. + } + } + + return true; + } + + /** + * Get excluded pages from options + * + * @return array + */ + private function get_excluded_pages(): array { + $excluded = $this->options->get( 'cdn_reject_pages', [] ); + return is_array( $excluded ) ? $excluded : []; + } + + /** + * Check if URL matches exclusion pattern + * + * @param string $url URL to check. + * @param string $pattern Pattern to match against. + * @return bool + */ + private function matches_pattern( string $url, string $pattern ): bool { + if ( empty( $pattern ) ) { + return false; // Empty pattern should not match anything. + } + + return ! empty( + $this->find( + preg_quote( $pattern, '/' ), + $url + ) + ); + } + + /** + * Normalize pattern for matching + * + * Handles: + * 1. Trailing slashes (e.g., /category/ => /category) + * 2. Non-Latin characters (e.g., категории => URL-encoded) + * 3. Inconsistent URL encoding + * + * @param string $pattern Pattern to normalize. + * @return string Normalized pattern. + */ + private function normalize_pattern( string $pattern ): string { + $pattern = untrailingslashit( $pattern ); + + // This ensures "категории" becomes "%d0%ba%d0%b0%d1%82%d0%b5%d0%b3%d0%be%d1%80%d0%b8%d0%b8". + $pattern = $this->encode_non_latin_chars( $pattern ); + + return $pattern; + } + + /** + * URL-encode non-Latin characters in pattern + * + * Converts UTF-8 characters (like Cyrillic, Arabic, CJK) to URL-encoded form. + * This matches how WordPress and browsers encode URLs. + * + * @param string $pattern Pattern with possible non-Latin chars. + * @return string Pattern with non-Latin chars URL-encoded. + */ + private function encode_non_latin_chars( string $pattern ): string { + if ( empty( $pattern ) ) { + return ''; + } + // Use rawurlencode to match browser URL encoding. + // But preserve the path structure (don't encode /). + $parts = explode( '/', $pattern ); + $encoded_parts = array_map( 'rawurlencode', $parts ); + + return implode( '/', $encoded_parts ); + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Render/Controller.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Render/Controller.php new file mode 100644 index 000000000..51c024690 --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Render/Controller.php @@ -0,0 +1,963 @@ +beacon = $beacon; + $this->context = $context; + $this->options = $options; + $this->cdn_query = $cdn_query; + $this->subscription_controller = $subscription_controller; + $this->user = $user; + $this->cache = $cache; + } + + /** + * Adds the RocketCDN Paid section to the CDN driver sections. + * + * @since 3.22 + * + * @param array $sections CDN driver sections. + * + * @return array + */ + public function add_rocketcdn_paid_section( array $sections ): array { + if ( Context::ROCKETCDN_PAID_TYPE !== $this->context->get_driver() ) { + return $sections; + } + + $cdn_beacon = $this->beacon->get_suggest( 'rocketcdn' ); + + $status_indicator_data = $this->get_status_indicator_data( 1, $this->is_subscription_loading(), false ); + $status_indicator_data['class'] .= ' wpr-cdn-status-pronounced rocketcdn'; + + $sections['rocketcdn_paid_section'] = [ + 'title' => __( 'RocketCDN', 'rocket' ), + 'type' => 'rocketcdn_paid', + 'class' => [ 'rocketcdn' ], + 'page' => 'page_cdn', + 'help' => [ + 'id' => $cdn_beacon['id'], + 'url' => $cdn_beacon['url'], + ], + 'status_indicator' => $status_indicator_data, + ]; + + return $sections; + } + + /** + * Adds the RocketCDN Free section to the CDN driver sections. + * + * @since 3.22 + * + * @param array $sections CDN driver sections. + * + * @return array + */ + public function add_rocketcdn_free_section( array $sections ): array { + if ( Context::ROCKETCDN_PAID_TYPE === $this->context->get_driver() ) { + return $sections; + } + + $classes = [ 'rocketcdn' ]; + $is_subscription_loading = $this->is_subscription_loading(); + $this->page_count = count( $this->get_items() ); + $cta_heading = sprintf( + // translators: %1$s = opening strong tag, %2$s = closing strong tag. + __( '%1$sWant full-site Content Delivery coverage?%2$s Extend RocketCDN to all your pages with unlimited bandwidth.', 'rocket' ), + '', + '' + ); + + $cta_heading_max_limit = sprintf( + // translators: %1$s = opening strong tag, %2$s = number of pages allowed, %3$s = closing strong tag. + __( '%1$sNice work! You’re using RocketCDN on %2$s key pages!%3$s ', 'rocket' ), + '', + $this->context->get_free_page_limit(), + '' + ); + + $cta_description = __( 'Upgrade to RocketCDN Pro to extend faster content delivery across all your pages from 100+ edge locations worldwide.', 'rocket' ); + + $limit_reached = $this->page_count >= $this->context->get_free_page_limit(); + + // Disable input field and buttons when 3 pages are added. + if ( $limit_reached || $is_subscription_loading ) { + $classes[] = 'wpr-cdn-built-in--disabled'; + } + + if ( $this->is_cdn_paused() ) { + $classes[] = 'wpr-cdn-built-in--paused'; + } + + $cdn_beacon = $this->beacon->get_suggest( 'rocketcdn_free' ); + + $sections['rocketcdn_free_section'] = [ + 'title' => __( 'RocketCDN', 'rocket' ), + 'type' => 'rocketcdn_free', + 'class' => $classes, + 'page' => 'page_cdn', + 'help' => [ + 'id' => $cdn_beacon['id'], + 'url' => $cdn_beacon['url'], + ], + 'status_indicator' => $this->get_status_indicator_data( $this->page_count, $is_subscription_loading ), + 'cta_data' => [ + 'cta_heading' => $cta_heading, + 'cta_heading_max_limit' => $cta_heading_max_limit, + 'cta_description' => $cta_description, + 'is_visible' => $this->page_count > 0 && ! $this->user->is_reseller_account(), + 'is_expanded' => $limit_reached, + 'limit_reached' => $limit_reached, + ], + 'limit_reached' => $limit_reached, + ]; + + return $sections; + } + + /** + * Adds the Purge CDN Cache section to the CDN driver sections. + * + * @since 3.22 + * + * @param array $sections CDN driver sections. + * + * @return array + */ + public function add_purge_cdn_cache_section( array $sections ): array { + $cdn_beacon = $this->beacon->get_suggest( 'purge_cdn' ); + + if ( ! empty( $_SERVER['REQUEST_URI'] ) ) { + $referer_url = filter_var( wp_unslash( $_SERVER['REQUEST_URI'] ), FILTER_SANITIZE_URL ); + } + $classes = [ 'rocketcdn', 'rocketcdn-shared-section' ]; + + $sections['purge_cdn_cache_section'] = [ + // translators: %s is the CDN driver, wrapped in a span for JS targeting. + 'title' => sprintf( __( 'Purge %s Cache', 'rocket' ), 'RocketCDN' ), + 'type' => 'purge_cdn_cache_section', + 'description' => sprintf( + // translators: %s = CDN driver, wrapped in a span for JS targeting. + __( 'Purges %s cached resources for your website.', 'rocket' ), + 'RocketCDN' + ), + 'purge_url' => Utils::get_nonce_post_url( 'rocket_purge_rocketcdn' ), + 'page' => 'page_cdn', + 'help' => [ + 'id' => $cdn_beacon['id'], + 'url' => $cdn_beacon['url'], + ], + 'class' => $classes, + ]; + + if ( $this->context->is_rocketcdn() && $this->should_disable_element_for_rocketcdn() ) { + $sections['purge_cdn_cache_section']['class'][] = 'wpr-cdn-disabled'; + } + + return $sections; + } + + /** + * Adds the Exclude CDN section to the CDN driver sections. + * + * @since 3.22 + * + * @param array $sections CDN driver sections. + * + * @return array + */ + public function add_exclude_cdn_section( array $sections ): array { + $cdn_exclude_beacon = $this->beacon->get_suggest( 'exclude_cdn' ); + $rocketcdn_exclude_beacon = $this->beacon->get_suggest( 'exclude_cdn_rocketcdn' ); + + $is_rocketcdn = $this->context->is_rocketcdn(); + $initial_url = $is_rocketcdn ? $rocketcdn_exclude_beacon['url'] : $cdn_exclude_beacon['url']; + $initial_id = $is_rocketcdn ? $rocketcdn_exclude_beacon['id'] : $cdn_exclude_beacon['id']; + + $sections['exclude_cdn_section'] = [ + // translators: %s is the CDN driver, wrapped in a span for JS targeting. + 'title' => sprintf( __( 'Manage %s Exclusions', 'rocket' ), 'RocketCDN' ), + 'type' => 'nocontainer_with_title', + 'help' => [ + 'id' => $initial_id, + 'url' => $initial_url, + 'rocketcdn_url' => $rocketcdn_exclude_beacon['url'], + 'rocketcdn_id' => $rocketcdn_exclude_beacon['id'], + 'other_cdn_url' => $cdn_exclude_beacon['url'], + 'other_cdn_id' => $cdn_exclude_beacon['id'], + ], + 'page' => 'page_cdn', + 'class' => [ 'cdn-shared-section' ], + ]; + + if ( $this->context->is_rocketcdn() && $this->should_disable_element_for_rocketcdn() ) { + $sections['exclude_cdn_section']['class'][] = 'wpr-cdn-disabled'; + } + + return $sections; + } + + /** + * Adds exclusion fields for CDN to the settings fields array. + * + * @since 3.22 + * + * @param array $fields Existing settings fields array. + * + * @return array Modified fields array with CDN exclusion fields appended. + */ + public function add_exclusions_fields( array $fields ): array { + $exclusion_fields = []; + + if ( Context::ROCKETCDN_PAID_TYPE === $this->context->get_driver() ) { + $exclusion_fields['cdn_reject_pages'] = [ + 'type' => 'textarea_with_container', + 'label' => __( 'Exclude Pages from CDN', 'rocket' ), + 'description' => __( 'Specify URL(s) of pages that should not get served via CDN (one per line).', 'rocket' ), + 'helper' => __( 'Use (.*) wildcards to exclude all files of a given file type located at a specific path.', 'rocket' ), + 'placeholder' => '/path/to/page', + 'section' => 'exclude_cdn_section', + 'page' => 'page_cdn', + 'default' => [], + 'class' => [ + 'wpr-cdn-exclusions', + 'rocketcdn', + 'rocketcdn-shared-section', + ], + 'sanitize_callback' => 'sanitize_textarea', + ]; + } + + $exclusion_fields['cdn_reject_files'] = [ + 'type' => 'textarea_with_container', + 'label' => __( 'Exclude Files from CDN', 'rocket' ), + 'description' => __( 'Specify URL(s) of files that should not get served via CDN (one per line).', 'rocket' ), + 'helper' => __( 'The domain part of the URL will be stripped automatically.
Use (.*) wildcards to exclude all files of a given file type located at a specific path.', 'rocket' ), + 'placeholder' => '/wp-content/plugins/some-plugins/(.*).css', + 'section' => 'exclude_cdn_section', + 'page' => 'page_cdn', + 'default' => [], + 'class' => [ 'cdn-shared-section', 'wpr-cdn-exclusions' ], + 'sanitize_callback' => 'sanitize_textarea', + ]; + + // Disable exclusions fields when subscription is processing. + foreach ( array_keys( $exclusion_fields ) as $field ) { + if ( $this->context->is_rocketcdn() && $this->should_disable_element_for_rocketcdn() ) { + $exclusion_fields[ $field ]['class'][] = 'wpr-cdn-disabled'; + $exclusion_fields[ $field ]['attributes'] = [ + 'disabled' => 'disabled', + ]; + } + } + + return array_merge( $fields, $exclusion_fields ); + } + + /** + * Renders the built-in CDN page list table. + * + * Builds row data and delegates to the table-list generic partial. + * + * @since 3.22 + * + * @return void + */ + public function render_built_in_page_list(): void { + if ( 0 === $this->page_count ) { + return; + } + + echo $this->get_built_in_page_list(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + + /** + * Gets the status indicator HTML for the RocketCDN free section. + * + * @param int $pages_count Number of pages currently using RocketCDN. + * + * @return string The rendered status indicator HTML. + */ + public function get_status_indicator_html( int $pages_count ): string { + $data = $this->get_status_indicator_data( $pages_count, $this->is_subscription_loading() ); + + return $this->render_parts_with_data( 'cdn/cdn-status-indicator', $data, true ); + } + + /** + * Gets the built-in page list for the CDN settings. + * + * Generates a partial table list view using the 'rocket_cdn_free_page_rows' + * hook to populate the rows of the table. + * + * @return string The rendered HTML string of the built-in page list table. + */ + public function get_built_in_page_list(): string { + $table_data = [ + 'rows_hook' => 'rocket_cdn_free_page_rows', + ]; + + return $this->generate( 'partials/table-list', $table_data ); + } + + /** + * Renders the built-in CDN page list rows. + * + * Builds each row and renders them via the table-list-row generic partial. + * + * @since 3.22 + * + * @return void + */ + public function render_built_in_page_rows(): void { + $pages = $this->get_items(); + + foreach ( $pages as $page ) { + echo $this->generate( 'partials/table-list-row', $this->build_page_row( $page ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + } + + /** + * Renders the RocketCDN CTA banner. + * + * @param bool $display Whether to display the CTA. Default true. + * + * @return bool + * @since 3.22 + */ + public function maybe_display_rocketcdn_cta( bool $display = true ): bool { + if ( ! $display ) { + return false; + } + + if ( $this->is_subscription_loading() ) { + return false; + } + + if ( $this->user->is_reseller_account() ) { + return false; + } + + return true; + } + + /** + * Removes the "NEW" badge from the Content Delivery tab for existing paid RocketCDN subscribers. + * + * Paid users already know RocketCDN — the badge is only relevant for users + * discovering the service for the first time via the free tier. + * + * @since 3.22 + * + * @param string $badge Current badge label. + * + * @return string Empty string for paid subscribers, original badge otherwise. + */ + public function maybe_hide_cdn_tab_badge( string $badge ): string { + if ( $this->subscription_controller->is_paid() ) { + return ''; + } + + return $badge; + } + + /** + * Synchronizes forced pause state and emits tracking events on transitions. + * + * @param \WP_Screen $screen Current admin screen. + * + * @return void + */ + public function maybe_sync_forced_pause_tracking_state( \WP_Screen $screen ): void { + if ( 'settings_page_wprocket' !== $screen->id || ! current_user_can( 'rocket_manage_options' ) ) { + return; + } + $is_forced = $this->is_forced_paused(); + $stored = $this->get_forced_pause_tracking(); + $was_forced = (bool) ( $stored['tracking'] ?? false ); + + // Bail out when state hasn't changed to avoid unnecessary option updates and tracking events. + if ( $is_forced === $was_forced ) { + return; + } + + $stored['tracking'] = $is_forced; + update_option( self::FORCED_PAUSE_TRACKING_OPTION, $stored, false ); + + // Clear whole cache. + $this->cache->clear_all_cache(); + + /** + * Fires when the CDN state changes between paused and active. + * + * @param string $new_state The new state of the CDN: 'paused' or 'active'. + * @param string $reason 'wpr_forced_pause' when pausing, 'wpr_forced_resume' when resuming. + * @since 3.22 + */ + do_action( + 'rocket_rocketcdn_cdn_state_changed', + $is_forced ? 'paused' : 'active', + $is_forced ? 'wpr_forced_pause' : 'wpr_forced_resume' + ); + } + + /** + * Renders the CDN driver tabs. + * + * @since 3.22 + * + * @return void + */ + public function render_cdn_driver_tabs(): void { + + $driver = $this->context->get_driver(); + $data = [ + 'disable_other_cdn' => Context::ROCKETCDN_PAID_TYPE === $driver, + 'cdn_type' => $this->options->get( 'cdn_type', Context::ROCKETCDN_TYPE ), + 'display_tabs' => ! $this->is_cdn_type_filtered(), + 'rocketcdn_mode' => Context::ROCKETCDN_PAID_TYPE === $driver ? 'RocketCDN Paid' : 'RocketCDN Free', + ]; + + echo $this->generate( 'partials/cdn/cdn-driver-tabs', $data ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + + /** + * Renders the expired WP Rocket license notice. + * + * @since 3.22 + * + * @return void + */ + public function render_expired_wpr_licence_notice(): void { + if ( ! $this->should_display_licence_expired_notice() ) { + return; + } + + $data = [ + 'renewal_url' => $this->user->get_renewal_url(), + 'is_reseller' => $this->user->is_reseller_account(), + ]; + + echo $this->generate( 'partials/cdn/wpr-licence-expired-notice', $data ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + + /** + * Renders the reseller-banned notice. + * + * @since 3.23.1 + * + * @return void + */ + public function render_reseller_banned_notice(): void { + if ( ! $this->user->is_reseller_license_banned() ) { + return; + } + + echo $this->generate( 'partials/cdn/wpr-licence-banned-notice', [] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. + } + + /** + * Filter the CDN option to pause CDN for users with inactive subscriptions. + * + * If the user has an inactive subscription, this will force the CDN option to be false, + * effectively pausing CDN functionality until they renew or reactivate their subscription. + * + * @since 3.22 + * + * @param mixed $cdn Current value of the CDN option. + * + * @return mixed False if the user has an inactive subscription, original value otherwise. + */ + public function maybe_pause_cdn_for_inactive_subscription( $cdn ) { + // Bail early if not on RocketCDN driver to avoid unnecessary checks. + if ( ! $this->context->is_rocketcdn() ) { + return $cdn; + } + + if ( $this->is_forced_paused() ) { + $stored = $this->get_forced_pause_tracking(); + + // Prevent unnecessary DB write on every request. + if ( empty( $stored['persistent'] ) ) { + $stored['persistent'] = true; + update_option( self::FORCED_PAUSE_TRACKING_OPTION, $stored, false ); + + // Clear whole cache. + $this->cache->clear_all_cache(); + } + + return false; + } + + return $cdn; + } + + /** + * Determines whether a UI element should be disabled for RocketCDN. + * + * Returns true only when all of the following are true: the current context + * is RocketCDN, the CDN is paused, the user has an active subscription, + * the license is invalid, and the subscription is in a loading state. + * + * @return bool True if the element should be disabled, false otherwise. + */ + public function should_disable_element_for_rocketcdn(): bool { + return $this->is_subscription_loading() + || $this->is_cdn_paused() + || $this->should_display_licence_expired_notice() + || ! $this->subscription_controller->has_active_subscription(); + } + + /** + * Filters status indicator texts for the free RocketCDN tier. + * + * Hooked to {@see 'rocket_rocketcdn_status_indicator_texts'} at priority 10. + * Activates the status text once pages have been added, and surfaces an + * expiry notice when the WP Rocket licence is invalid. + * + * @param array $texts Text strings for the status indicator. + * @param int $pages_count Number of pages using RocketCDN. + * @param bool $is_subscription_loading Whether the subscription is loading. + * @param bool $free Whether this is for the free version. + * + * @return array + */ + public function get_free_status_indicator_texts( array $texts, int $pages_count, bool $is_subscription_loading, bool $free ): array { + if ( ! $free ) { + return $texts; + } + + if ( $pages_count > 0 ) { + $texts['status_text'] = $texts['active_status_text']; + $texts['details'] = __( 'Serving files from 10 edge locations. Covering up to 3 pages.', 'rocket' ); + } + + if ( $this->subscription_controller->is_license_invalid() ) { + $texts['class'] .= ' wpr-cdn-status--expired'; + $texts['paused_details'] = __( 'RocketCDN is currently paused because your WPRocket licence has expired.', 'rocket' ); + } + + if ( $this->user->is_reseller_license_banned() ) { + $texts['paused_details'] = ''; + } + + return $texts; + } + + /** + * Filters status indicator texts for the paid RocketCDN tier. + * + * Hooked to {@see 'rocket_rocketcdn_status_indicator_texts'} at priority 10. + * Activates the paid status text and surfaces a cancellation notice during + * the grace period. + * + * @param array $texts Text strings for the status indicator. + * @param int $pages_count Number of pages using RocketCDN. + * @param bool $is_subscription_loading Whether the subscription is loading. + * @param bool $free Whether this is for the free version. + * + * @return array + */ + public function get_paid_status_indicator_texts( array $texts, int $pages_count, bool $is_subscription_loading, bool $free ): array { + if ( $free ) { + return $texts; + } + + $texts['details'] = __( 'Serving files from 100+ edge locations', 'rocket' ); + $texts['active_status_text'] = __( 'RocketCDN is active on your website', 'rocket' ); + $texts['status_text'] = $texts['active_status_text']; + + if ( $this->subscription_controller->is_in_grace_period() ) { + $texts['paused_details'] = __( 'RocketCDN is currently paused because your RocketCDN subscription was cancelled. Please wait up to two days before resuming.', 'rocket' ); + $texts['class'] .= ' wpr-cdn-status--expired'; + } + + return $texts; + } + + /** + * Auto-creates a RocketCDN Free subscription when a previously forced-paused state is resolved. + * + * @since 3.22.0.2 + * + * @return void + */ + public function maybe_auto_create_rocketcdn_free_subscription() { + // Bail out if there is an active subscription. + if ( $this->subscription_controller->has_active_subscription() ) { + return; + } + + // Bail out if the subscription is paid and is still within the cancellation grace period — too early to auto-resume. + if ( $this->subscription_controller->is_paid() && $this->subscription_controller->is_in_grace_period() ) { + return; + } + + if ( $this->subscription_controller->is_license_invalid() ) { + return; + } + + // Update the forced pause tracking option to indicate the forced pause has been resolved. + $stored = $this->get_forced_pause_tracking(); + $stored['persistent'] = false; + update_option( self::FORCED_PAUSE_TRACKING_OPTION, $stored, false ); + + // Bail out if there are no add pages in the free plan — no need to auto create, allow normal flow. + if ( empty( $this->get_items() ) ) { + return; + } + + // Auto-create a new subscription to resume free RocketCDN service. + $this->subscription_controller->create_subscription(); + } + + /** + * Reads the forced pause tracking option, migrating the legacy bool format to the current array format. + * + * @return array + */ + private function get_forced_pause_tracking(): array { + $stored = get_option( self::FORCED_PAUSE_TRACKING_OPTION, [] ); + + // Migrate legacy bool value: the option used to be stored as a plain bool. + if ( is_bool( $stored ) ) { + return [ 'tracking' => $stored ]; + } + + return (array) $stored; + } + + /** + * Builds a table-list-row data array from a page object. + * + * @since 3.22 + * + * @param object $page Page object with url and title properties. + * + * @return array Row data for the table-list-row partial. + */ + private function build_page_row( object $page ): array { + $disable_class = $this->is_subscription_loading() ? 'wpr-cdn-disabled' : ''; + $delete_button = ''; + + return [ + 'columns' => [ + [ + 'content' => '' . esc_html( $page->title ) . '', + ], + [ + 'type' => 'actions', + 'content' => $delete_button, + ], + ], + ]; + } + + /** + * Retrieves the list of pages added to RocketCDN for the free plan. + * + * @since 3.22 + * + * @return array List of page objects with id, url, and title properties. + */ + private function get_items(): array { + $query_params = [ + 'orderby' => 'modified', + 'order' => 'asc', + 'number' => 20, + ]; + + return $this->cdn_query->query( $query_params ); + } + + /** + * Checks if subscription is currently processing. + * + * @since 3.22 + * + * @return bool True if the subscription is processing, false otherwise. + */ + private function is_subscription_loading(): bool { + return $this->subscription_controller->is_subscription_creation_loading(); + } + + /** + * Checks if the WP Rocket license is expired for a free RocketCDN subscriber. + * + * @return bool True when the expired licence notice should be displayed. + */ + private function should_display_licence_expired_notice(): bool { + return $this->context->is_rocketcdn() && + $this->subscription_controller->is_free() && + $this->subscription_controller->is_license_invalid() && + ! $this->user->is_reseller_license_banned(); + } + + /** + * Checks if the CDN type is currently filtered. + * + * @since 3.22 + * + * @return bool True if the CDN type is filtered, false otherwise. + */ + private function is_cdn_type_filtered(): bool { + $allowed_cdn_types = [ 'rocketcdn', 'byocdn' ]; + + /** + * Pre-filter cdn_type option. + * + * @since 3.22 + * + * @param mixed $cdn_type Filtered CDN type. + */ + $cdn_type = wpm_apply_filters_typed( 'string|null', 'pre_get_rocket_option_cdn_type', null, '' ); + + if ( null !== $cdn_type && in_array( $cdn_type, $allowed_cdn_types, true ) ) { + return true; + } + + return false; + } + + /** + * Get status indicator data for RocketCDN. + * + * Retrieves an array of data used to render the RocketCDN status indicator, + * including status text, details, and various flags based on the current + * subscription state. + * + * @param int $pages_count Number of pages currently using RocketCDN. + * @param bool $is_subscription_loading Whether the subscription is currently being processed. + * @param bool $free Whether this is for the free version of RocketCDN. Default true. + * + * @return array { + * Array of status indicator data. + * + * @type string $class CSS class to apply to the status indicator. Empty string or ' wpr-cdn-status--paused'. + * @type bool $is_active Whether RocketCDN is active. + * @type string $status_text Current status text to display. + * @type string $details Details text describing the current status. + * @type string $active_status_text Text to display when RocketCDN is active. + * @type string $paused_status_text Text to display when RocketCDN is paused. + * @type string $paused_details Details text to display when RocketCDN is paused. + * @type bool $is_paused Whether RocketCDN is currently paused. + * @type int $pages_count Number of pages currently using RocketCDN. + * @type bool $is_subscription_loading Whether the subscription is currently being processed. + * @type bool $hide_pause_btn Whether to hide the pause button. + * } + */ + private function get_status_indicator_data( int $pages_count, bool $is_subscription_loading, bool $free = true ): array { + $texts = [ + 'paused_status_text' => __( 'RocketCDN is paused', 'rocket' ), + 'active_status_text' => __( 'RocketCDN is active', 'rocket' ), + 'paused_details' => __( 'RocketCDN is currently paused. Click Resume CDN to re-enable content delivery.', 'rocket' ), + 'status_text' => '', + 'details' => sprintf( + // translators: %1$s = opening tag, %2$s = closing tag. + __( '%1$sStart with your homepage and add up to 2 more key pages.%2$s Includes unlimited traffic across 10 edge locations.', 'rocket' ), + '', + '' + ), + 'class' => '', + ]; + + /** + * Filters the status indicator text strings for RocketCDN. + * + * Free- and paid-tier callbacks are registered by default to apply + * tier-specific overrides. Additional callbacks may be added to + * customise the indicator for custom subscription states. + * + * @param array $texts { + * Text strings and CSS modifier class for the status indicator. + * + * @type string $paused_status_text Text displayed when CDN is paused. + * @type string $active_status_text Text displayed when CDN is active. + * @type string $paused_details Details shown while CDN is paused. + * @type string $status_text Currently-shown status text (empty = inactive state). + * @type string $details Currently-shown details text. + * @type string $class CSS modifier class(es) for the indicator element. + * } + * @param int $pages_count Number of pages currently using RocketCDN. + * @param bool $is_subscription_loading Whether the subscription is currently being processed. + * @param bool $free Whether this is for the free version of RocketCDN. + * + * @since 3.22.0.2 + */ + $texts = wpm_apply_filters_typed( 'array', 'rocket_rocketcdn_status_indicator_texts', $texts, $pages_count, $is_subscription_loading, $free ); + + if ( $is_subscription_loading ) { + $texts['status_text'] = __( 'Creating your subscription...', 'rocket' ); + $texts['details'] = __( 'Please wait, RocketCDN will be ready in about 30s.', 'rocket' ); + } + + $is_paused = $this->is_cdn_paused(); + + if ( $is_paused ) { + $texts['status_text'] = $texts['paused_status_text']; + $texts['details'] = $texts['paused_details']; + $texts['class'] .= ' wpr-cdn-status--paused'; + } + + return [ + 'class' => $texts['class'], + 'is_active' => true, + 'status_text' => $texts['status_text'], + 'details' => $texts['details'], + 'active_status_text' => $texts['active_status_text'], + 'paused_status_text' => $texts['paused_status_text'], + 'paused_details' => $texts['paused_details'], + 'is_paused' => $is_paused, + 'pages_count' => $pages_count, + 'is_subscription_loading' => $is_subscription_loading, + 'hide_pause_btn' => ( $is_subscription_loading || 0 === $pages_count ) && ! $is_paused, + ]; + } + + /** + * Check if cdn should pause or not. + * + * @return bool + */ + private function is_cdn_paused(): bool { + return ! (bool) $this->options->get( 'cdn' ); + } + + /** + * Determines whether the CDN should be force-paused due to an inactive or invalid subscription state. + * + * @since 3.22 + * + * @return bool True if the CDN should be force-paused, false otherwise. + */ + private function is_forced_paused(): bool { + // Force paused if paid plan cancelled but in grace period. + if ( $this->subscription_controller->is_paid() && $this->subscription_controller->is_in_grace_period() ) { + return true; + } + + if ( $this->subscription_controller->is_paid() && $this->subscription_controller->is_cancelled_outside_grace_period() ) { + return true; + } + + // Force paused if free plan with an invalid WP Rocket licence. + if ( $this->subscription_controller->is_free() && $this->subscription_controller->is_license_invalid() ) { + return true; + } + + // Force paused if subscription cancelled beyond the grace period and WP Rocket licence is invalid. + if ( $this->subscription_controller->is_cancelled_outside_grace_period() && $this->subscription_controller->is_license_invalid() ) { + return true; + } + + return false; + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Render/Subscriber.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Render/Subscriber.php new file mode 100644 index 000000000..c08920b0c --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Render/Subscriber.php @@ -0,0 +1,273 @@ +controller = $controller; + } + + /** + * {@inheritdoc} + */ + public static function get_subscribed_events(): array { + return [ + 'rocket_cdn_driver_sections' => [ + [ 'add_rocketcdn_paid_section' ], + [ 'add_rocketcdn_free_section' ], + [ 'add_exclude_cdn_section' ], + [ 'add_purge_cdn_cache_section' ], + ], + 'current_screen' => [ 'maybe_sync_forced_pause_tracking_state' ], + 'rocket_cdn_free_page_list' => 'render_built_in_page_list', + 'rocket_cdn_free_page_rows' => 'render_built_in_page_rows', + 'rocket_cdn_driver_tabs' => 'render_cdn_driver_tabs', + 'rocket_cdn_settings_fields' => 'add_exclusions_fields', + 'rocket_display_rocketcdn_cta' => 'maybe_display_rocketcdn_cta', + 'rocket_cdn_tab_badge' => 'maybe_hide_cdn_tab_badge', + 'pre_get_rocket_option_cdn' => 'maybe_pause_cdn_for_inactive_subscription', + 'rocket_cdn_free_before_status_indicator' => [ + [ 'render_expired_wpr_licence_notice', 9 ], + [ 'render_reseller_banned_notice', 9 ], + ], + 'rocket_rocketcdn_status_indicator_texts' => [ + [ 'get_free_status_indicator_texts', 10, 4 ], + [ 'get_paid_status_indicator_texts', 10, 4 ], + ], + 'admin_init' => 'maybe_auto_create_rocketcdn_free_subscription', + ]; + } + + /** + * Adds the RocketCDN Paid section to the CDN driver sections. + * + * @since 3.22 + * + * @param array $sections CDN driver sections. + * + * @return array + */ + public function add_rocketcdn_paid_section( array $sections ): array { + return $this->controller->add_rocketcdn_paid_section( $sections ); + } + + /** + * Adds the RocketCDN Free section to the CDN driver sections. + * + * @since 3.22 + * + * @param array $sections CDN driver sections. + * + * @return array + */ + public function add_rocketcdn_free_section( array $sections ): array { + return $this->controller->add_rocketcdn_free_section( $sections ); + } + + /** + * Adds the Exclude CDN section to the CDN driver sections. + * + * @since 3.22 + * + * @param array $sections CDN driver sections. + * + * @return array + */ + public function add_exclude_cdn_section( array $sections ): array { + return $this->controller->add_exclude_cdn_section( $sections ); + } + + /** + * Adds the Purge CDN Cache section to the CDN driver sections. + * + * @since 3.22 + * + * @param array $sections CDN driver sections. + * + * @return array + */ + public function add_purge_cdn_cache_section( array $sections ): array { + return $this->controller->add_purge_cdn_cache_section( $sections ); + } + + /** + * Renders the built-in CDN page list table. + * + * @since 3.22 + * + * @return void + */ + public function render_built_in_page_list(): void { + $this->controller->render_built_in_page_list(); + } + + /** + * Renders the built-in CDN page list rows. + * + * @since 3.22 + * + * @return void + */ + public function render_built_in_page_rows(): void { + $this->controller->render_built_in_page_rows(); + } + + /** + * Renders the CDN driver tabs. + * + * @since 3.22 + * + * @return void + */ + public function render_cdn_driver_tabs(): void { + $this->controller->render_cdn_driver_tabs(); + } + + /** + * Adds exclusion fields for CDN to the settings fields array. + * + * @since 3.22 + * + * @param array $fields Existing settings fields array. + * + * @return array + */ + public function add_exclusions_fields( array $fields ): array { + return $this->controller->add_exclusions_fields( $fields ); + } + + /** + * Displays the RocketCDN Call to Action on the CDN tab of WP Rocket settings page. + * + * @param bool $display Whether to display the CTA. Default true. + * + * @since 3.22 + * + * @return bool + */ + public function maybe_display_rocketcdn_cta( bool $display = true ): bool { + return $this->controller->maybe_display_rocketcdn_cta( $display ); + } + + /** + * Removes the "NEW" badge from the Content Delivery tab for existing paid subscribers. + * + * @since 3.22 + * + * @param string $badge Current badge label. + * + * @return string + */ + public function maybe_hide_cdn_tab_badge( string $badge ): string { + return $this->controller->maybe_hide_cdn_tab_badge( $badge ); + } + + /** + * Syncs the forced pause tracking option state on WP Rocket settings screen. + * + * @param \WP_Screen $screen Current screen object. + * + * @return void + */ + public function maybe_sync_forced_pause_tracking_state( \WP_Screen $screen ): void { + $this->controller->maybe_sync_forced_pause_tracking_state( $screen ); + } + + /** + * Pauses the CDN for inactive subscriptions. + * + * @since 3.22 + * + * @param mixed $cdn CDN Option. + * + * @return mixed + */ + public function maybe_pause_cdn_for_inactive_subscription( $cdn ) { + return $this->controller->maybe_pause_cdn_for_inactive_subscription( $cdn ); + } + + /** + * Renders the expired WP Rocket license notice. + * + * @since 3.22 + * + * @return void + */ + public function render_expired_wpr_licence_notice(): void { + $this->controller->render_expired_wpr_licence_notice(); + } + + /** + * Renders the reseller-banned notice. + * + * @since 3.23.1 + * + * @return void + */ + public function render_reseller_banned_notice(): void { + $this->controller->render_reseller_banned_notice(); + } + + /** + * Filters status indicator texts for the free RocketCDN tier. + * + * @param array $texts Text strings for the status indicator. + * @param int $pages_count Number of pages using RocketCDN. + * @param bool $is_subscription_loading Whether the subscription is loading. + * @param bool $free Whether this is for the free version. + * + * @return array + */ + public function get_free_status_indicator_texts( array $texts, int $pages_count, bool $is_subscription_loading, bool $free ): array { + return $this->controller->get_free_status_indicator_texts( $texts, $pages_count, $is_subscription_loading, $free ); + } + + /** + * Filters status indicator texts for the paid RocketCDN tier. + * + * @param array $texts Text strings for the status indicator. + * @param int $pages_count Number of pages using RocketCDN. + * @param bool $is_subscription_loading Whether the subscription is loading. + * @param bool $free Whether this is for the free version. + * + * @return array + */ + public function get_paid_status_indicator_texts( array $texts, int $pages_count, bool $is_subscription_loading, bool $free ): array { + return $this->controller->get_paid_status_indicator_texts( $texts, $pages_count, $is_subscription_loading, $free ); + } + + /** + * Auto-creates a RocketCDN Free subscription when a previously forced-paused state is resolved. + * + * @since 3.22.0.2 + * + * @return void + */ + public function maybe_auto_create_rocketcdn_free_subscription(): void { + $this->controller->maybe_auto_create_rocketcdn_free_subscription(); + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIClient.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIClient.php index 7600f4d7a..969c7b126 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIClient.php +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIClient.php @@ -42,6 +42,11 @@ private function get_remote_subscription_data() { 'cdn_url' => '', 'subscription_next_date_update' => 0, 'subscription_status' => 'cancelled', + 'website_attached' => false, + 'plan_type' => 'free', + 'plan_page_limit' => 0, + 'website_id' => 0, + 'status_code' => 500, ]; $token = get_option( 'rocketcdn_user_token' ); @@ -56,13 +61,23 @@ private function get_remote_subscription_data() { ], ]; + $parsed_home = wp_parse_url( home_url() ); + if ( empty( $parsed_home['host'] ) ) { + $this->set_status_transient( $default, 3 * MINUTE_IN_SECONDS ); + + return $default; + } + $response = wp_remote_get( - self::ROCKETCDN_API . 'website/search/?url=' . home_url(), + sprintf( '%1$ssubscription/%2$s/status', self::ROCKETCDN_API, $parsed_home['host'] ), $args ); - if ( 200 !== wp_remote_retrieve_response_code( $response ) ) { - $this->set_status_transient( $default, 3 * MINUTE_IN_SECONDS ); + $status_code = wp_remote_retrieve_response_code( $response ); + $default['status_code'] = $status_code; + + if ( 200 !== $status_code ) { + $this->set_status_transient( $default, 404 !== $status_code ? 3 * MINUTE_IN_SECONDS : DAY_IN_SECONDS ); return $default; } @@ -76,12 +91,28 @@ private function get_remote_subscription_data() { } $data = json_decode( $data, true ); - $data = array_intersect_key( (array) $data, $default ); - $data = array_merge( $default, $data ); + if ( empty( $data['success'] ) ) { + $this->set_status_transient( $default, 3 * MINUTE_IN_SECONDS ); + return $default; + } - $this->set_status_transient( $data, WEEK_IN_SECONDS ); + // Map the data. + $final_data = [ + 'id' => $data['subscription_id'] ?? 0, + 'is_active' => $data['website_activated'] ?? false, + 'cdn_url' => $data['cdn_url'] ?? '', + 'subscription_next_date_update' => $data['next_date_update'] ?? 0, + 'subscription_status' => $data['status'] ?? 'cancelled', + 'website_attached' => $data['website_attached'] ?? false, + 'plan_type' => $data['plan_type'] ?? 'free', + 'plan_page_limit' => $data['plan_page_limit'] ?? 0, + 'website_id' => $data['website_id'] ?? 0, + 'status_code' => $status_code, + ]; - return $data; + $this->set_status_transient( $final_data, DAY_IN_SECONDS ); + + return $final_data; } /** @@ -97,6 +128,7 @@ private function set_status_transient( $value, $duration ) { set_transient( 'rocketcdn_status', $value, $duration ); } + /** * Gets pricing & promotion data for RocketCDN from cache if it exists * @@ -222,7 +254,7 @@ public function purge_cache_request() { $subscription = $this->get_subscription_data(); $status = 'error'; - if ( ! isset( $subscription['id'] ) || 0 === $subscription['id'] ) { + if ( ! isset( $subscription['website_id'] ) || 0 === $subscription['website_id'] ) { return [ 'status' => $status, 'message' => __( 'RocketCDN cache purge failed: Missing identifier parameter.', 'rocket' ), @@ -246,7 +278,7 @@ public function purge_cache_request() { ]; $response = wp_remote_request( - self::ROCKETCDN_API . 'website/' . $subscription['id'] . '/purge/', + self::ROCKETCDN_API . 'website/' . $subscription['website_id'] . '/purge/', $args ); diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/CheckStatusAPIClient.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/CheckStatusAPIClient.php new file mode 100644 index 000000000..c56aebbb4 --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/CheckStatusAPIClient.php @@ -0,0 +1,84 @@ +task_id = $task_id; + } + + /** + * Get the transient key for making this API Client calls. + * + * @return string The transient key for plugin updates. + */ + protected function get_transient_key() { + return 'rocket_cdn_check_status_request'; + } + + /** + * Get the API URL for creating rocketcdn free account silently. + * + * @return string The API URL. + */ + protected function get_api_url() { + if ( empty( $this->task_id ) ) { + return ''; + } + return sprintf( '%1$swebsite/task/%2$s/', APIClient::ROCKETCDN_API, $this->task_id ); + } + + /** + * Check RocketCDN free account creation status. + * + * @return array|false + */ + public function check() { + $token = get_option( 'rocketcdn_user_token' ); + + if ( empty( $token ) ) { + return false; + } + + $args = [ + 'headers' => [ + 'Authorization' => 'Token ' . $token, + ], + ]; + + $response = $this->send_get_request( $args, true ); + + if ( is_wp_error( $response ) ) { + return false; + } + + $response = wp_remote_retrieve_body( $response ); + if ( empty( $response ) ) { + return false; + } + + return json_decode( $response, true ); + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/CreateAPIClient.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/CreateAPIClient.php new file mode 100644 index 000000000..e92c534b4 --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/CreateAPIClient.php @@ -0,0 +1,67 @@ +free_url = $user->get_rocketcdn_free_url(); + } + + /** + * Get the transient key for making this API Client calls. + * + * @return string The transient key for plugin updates. + */ + protected function get_transient_key() { + return 'rocket_cdn_create_request'; + } + + /** + * Get the API URL for creating rocketcdn free account silently. + * + * @return string The API URL. + */ + protected function get_api_url() { + return $this->free_url; + } + + /** + * Create RocketCDN free account. + * + * @return array|false + */ + public function create() { + $response = $this->send_post_request( [], true ); + + if ( is_wp_error( $response ) ) { + return false; + } + + $response = wp_remote_retrieve_body( $response ); + if ( empty( $response ) ) { + return false; + } + + return json_decode( $response, true ); + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/WebsiteSearch.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/WebsiteSearch.php new file mode 100644 index 000000000..fdf018b36 --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/APIHandler/WebsiteSearch.php @@ -0,0 +1,126 @@ +site_url = $site_url; + } + + /** + * Get the transient key for making this API Client calls. + * + * @return string The transient key. + */ + protected function get_transient_key() { + return 'rocket_cdn_website_search'; + } + + /** + * Get the API URL for website search. + * + * @return string The API URL. + */ + protected function get_api_url() { + if ( empty( $this->site_url ) ) { + return ''; + } + return add_query_arg( + 'url', + untrailingslashit( $this->site_url ), + APIClient::ROCKETCDN_API . 'website/search/' + ); + } + + /** + * Check RocketCDN free account creation status. + * + * @return array|false + */ + public function find() { + $cached = get_transient( $this->get_transient_key() ); + if ( false !== $cached ) { + return $cached; + } + + $token = get_option( 'rocketcdn_user_token' ); + + if ( empty( $token ) ) { + return false; + } + + $args = [ + 'headers' => [ + 'Authorization' => 'Token ' . $token, + ], + ]; + + $response = $this->send_get_request( $args, true ); + + if ( is_wp_error( $response ) ) { + return false; + } + + $response = wp_remote_retrieve_body( $response ); + if ( empty( $response ) ) { + return false; + } + + $response = json_decode( $response, true ); + if ( ! is_array( $response ) ) { + return false; + } + + $final = [ + 'subscription_status' => $response['subscription_status'] ?? 'cancelled', + 'plan_type' => $response['subscription_plan_type'] ?? 'free', + 'status_code' => wp_remote_retrieve_response_code( $response ), + 'website_status' => $response['status'] ?? '', + ]; + set_transient( $this->get_transient_key(), $final, HOUR_IN_SECONDS ); + + return $final; + } + + /** + * Validate response code. + * + * @param array $response Response object. + * @return bool + */ + protected function valid_response_code( $response ) { + return in_array( wp_remote_retrieve_response_code( $response ), [ 200, 404 ], true ); + } + + /** + * Validate response body. + * + * @param array $response Response object. + * @return bool + */ + protected function valid_response_body( $response ) { + return ! empty( wp_remote_retrieve_body( $response ) ); + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/AdminPageSubscriber.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/AdminPageSubscriber.php index 948f79325..6793ca5bf 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/AdminPageSubscriber.php +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/AdminPageSubscriber.php @@ -3,8 +3,8 @@ namespace WP_Rocket\Engine\CDN\RocketCDN; use WP_Rocket\Abstract_Render; -use WP_Rocket\Admin\Options_Data; -use WP_Rocket\Engine\Admin\Beacon\Beacon; +use WP_Rocket\Engine\License\API\User; +use WP_Rocket\Engine\License\API\UserClient; use WP_Rocket\Event_Management\Subscriber_Interface; /** @@ -21,54 +21,47 @@ class AdminPageSubscriber extends Abstract_Render implements Subscriber_Interfac private $api_client; /** - * WP Rocket options instance - * - * @var Options_Data - */ - private $options; - - /** - * Beacon instance + * UserClient instance * - * @var Beacon + * @var UserClient */ - private $beacon; + private $user_client; /** - * UserClient instance + * User instance * - * @var \WP_Rocket\Engine\License\API\UserClient + * @var User */ - private $user_client; + private $user; /** * Constructor * - * @param APIClient $api_client RocketCDN API Client instance. - * @param Options_Data $options WP Rocket options instance. - * @param Beacon $beacon Beacon instance. - * @param \WP_Rocket\Engine\License\API\UserClient $user_client UserClient instance. - * @param string $template_path Path to the templates. + * @param APIClient $api_client RocketCDN API Client instance. + * @param UserClient $user_client UserClient instance. + * @param User $user User instance. + * @param string $template_path Path to the templates. */ - public function __construct( APIClient $api_client, Options_Data $options, Beacon $beacon, $user_client, $template_path ) { + public function __construct( APIClient $api_client, $user_client, User $user, $template_path ) { parent::__construct( $template_path ); $this->api_client = $api_client; - $this->options = $options; - $this->beacon = $beacon; $this->user_client = $user_client; + $this->user = $user; } /** - * {@inheritdoc} + * Return an array of events that this subscriber wants to listen to. + * + * @return array */ public static function get_subscribed_events() { return [ - 'rocket_dashboard_after_account_data' => 'display_rocketcdn_status', - 'rocket_cdn_settings_fields' => 'rocketcdn_field', - 'admin_post_rocket_purge_rocketcdn' => 'purge_cdn_cache', - 'rocket_settings_page_footer' => 'add_subscription_modal', - 'http_request_args' => [ 'preserve_authorization_token', PHP_INT_MAX, 2 ], + 'rocket_dashboard_after_account_data' => 'display_rocketcdn_status', + 'admin_post_rocket_purge_rocketcdn' => 'purge_cdn_cache', + 'rocket_settings_page_footer' => 'add_subscription_modal', + 'http_request_args' => [ 'preserve_authorization_token', PHP_INT_MAX, 2 ], + 'rocket_insights_api_recommendations_params' => 'maybe_add_rocketcdn_to_recommendations_api_params', ]; } @@ -93,96 +86,48 @@ public function display_rocketcdn_status() { return; } + if ( $this->user->is_reseller_account() ) { + return; + } + $subscription_data = $this->api_client->get_subscription_data(); $container_class = ''; - $status_class = ''; - $label = ''; - $status_text = ''; $is_active = false; - - if ( 'running' === $subscription_data['subscription_status'] ) { - $label = __( 'Next Billing Date', 'rocket' ); - $status_class = ' wpr-isValid'; - $status_text = date_i18n( get_option( 'date_format' ), strtotime( $subscription_data['subscription_next_date_update'] ) ); - $is_active = true; + $items = []; + + if ( 'running' === $subscription_data['subscription_status'] && 'paid' === $subscription_data['plan_type'] ) { + $items[] = [ + 'label' => __( 'Plan', 'rocket' ), + 'value' => __( 'RocketCDN Pro', 'rocket' ), + 'class' => ' wpr-isValid wpr-no-icon', + ]; + $items[] = [ + 'label' => __( 'Next Billing Date', 'rocket' ), + 'value' => date_i18n( get_option( 'date_format' ), strtotime( $subscription_data['subscription_next_date_update'] ) ), + 'class' => ' wpr-isValid', + ]; + + $is_active = true; } else { - $status_class = ' wpr-isInvalid'; + $items[] = [ + 'label' => '', + 'value' => __( 'No RocketCDN Pro Subscription', 'rocket' ), + 'class' => ' wpr-isInvalid', + ]; $container_class = ' wpr-flex--egal'; - $status_text = __( 'No Subscription', 'rocket' ); } $data = [ 'is_live_site' => rocket_is_live_site(), 'container_class' => $container_class, - 'label' => $label, - 'status_class' => $status_class, - 'status_text' => $status_text, 'is_active' => $is_active, + 'items' => $items, ]; echo $this->generate( 'dashboard-status', $data ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Dynamic content is properly escaped in the view. } - /** - * Adds the RocketCDN fields to the CDN section - * - * @since 3.5 - * - * @param array $fields CDN settings fields. - * - * @return array - */ - public function rocketcdn_field( $fields ) { - if ( $this->is_white_label_account() ) { - return $fields; - } - - $subscription_data = $this->api_client->get_subscription_data(); - - if ( 'running' !== $subscription_data['subscription_status'] ) { - return $fields; - } - - $helper_text = __( 'Your RocketCDN subscription is currently active.', 'rocket' ); - $cdn_cnames = $this->options->get( 'cdn_cnames', [] ); - - if ( empty( $cdn_cnames ) || $cdn_cnames[0] !== $subscription_data['cdn_url'] ) { - $helper_text = sprintf( - // translators: %1$s = opening
tag, %2$s = CDN URL, %3$s = closing tag.
- __( 'To use RocketCDN, replace your CNAME with %1$s%2$s%3$s.', 'rocket' ),
- '',
- $subscription_data['cdn_url'],
- ''
- );
- }
-
- $beacon = $this->beacon->get_suggest( 'rocketcdn' );
-
- $more_info = sprintf(
- // translators: %1$is = opening link tag, %2$s = closing link tag.
- __( '%1$sMore Info%2$s', 'rocket' ),
- '',
- ''
- );
-
- $fields['cdn_cnames'] = [
- 'type' => 'rocket_cdn',
- 'label' => __( 'CDN CNAME(s)', 'rocket' ),
- 'description' => __( 'Specify the CNAME(s) below', 'rocket' ),
- 'helper' => $helper_text . ' ' . $more_info,
- 'default' => '',
- 'section' => 'cnames_section',
- 'page' => 'page_cdn',
- 'beacon' => [
- 'url' => $beacon['url'],
- 'id' => $beacon['id'],
- ],
- ];
-
- return $fields;
- }
-
/**
* Purges the CDN cache and store the response in a transient.
*
@@ -217,6 +162,10 @@ public function add_subscription_modal() {
return;
}
+ if ( $this->user->is_reseller_account() ) {
+ return;
+ }
+
if ( ! rocket_is_live_site() ) {
return;
}
@@ -258,7 +207,7 @@ public function add_subscription_modal() {
-
+
', + '
' + ); + + $message .= sprintf( + // translators: %1$s openingtag, %2$s closing
tag. + esc_html__( + '%1$sYou can now use Content Delivery, powered by RocketCDN, to speed up your homepage and 2 more pages, at no extra cost.%2$s', + 'rocket' + ), + '', + '
' + ); + + $notice_info = [ + 'new_version' => '3.22.0', + 'dismiss_button' => 'rocketcdn_install_notice', + 'dismiss_message' => __( 'Dismiss', 'rocket' ), + 'message' => $message, + 'action' => 'rocketcdn_install_page', + 'status' => 'success', + 'track_event' => true, + ]; + + Utils::display_update_notice( $notice_info, true ); + + return; + } + + $message = sprintf( + // translators: %1$s opening tag, %2$s closing tag. + esc_html__( + '%1$sUse RocketCDN for free to boost up to 3 pages 🚀%2$s', + 'rocket' + ), + '', + '
' + ); + + $message .= sprintf( + // translators: %1$s openingtag, %2$s closing
tag. + esc_html__( + '%1$sAs a WP Rocket user, you can now activate RocketCDN for free on up to 3 pages. Choose your top pages and speed up their performance worldwide!%2$s', + 'rocket' + ), + '', + '
' + ); + + $notice_info = [ + 'new_version' => '3.22.0', + 'dismiss_button' => 'rocket_update_notice', + 'dismiss_message' => __( 'Check it later', 'rocket' ), + 'message' => $message, + 'action' => 'rocketcdn_upgrade_page', + 'previous_version' => $previous_version, + 'track_event' => true, + ]; + + Utils::display_update_notice( $notice_info, true ); + } + + /** + * Tracks the "Start with my homepage" CTA click from the RocketCDN promo admin notice. + * + * Fires before rocket_dismiss_boxes() redirects, so we can track before the exit. + * + * @return void + */ + public function track_notice_homepage_cta_click(): void { + // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce is verified later by rocket_dismiss_boxes(). + $box = isset( $_GET['box'] ) ? sanitize_key( wp_unslash( $_GET['box'] ) ) : ''; + + if ( 'rocketcdn_install_notice' !== $box ) { + return; + } + + /** + * Fires when the homepage cta button is clicked. + * + * @param string $source The source of the click, either 'add_homepage_button' or 'admin_notices'. + */ + do_action( 'rocket_rocketcdn_add_homepage', 'admin_notices' ); + } + + /** + * Tracks when a RocketCDN admin notice is dismissed. + * + * Fires before rocket_dismiss_boxes() redirects, so we can track before the exit. + * + * @return void + */ + public function track_rocketcdn_notice_dismissed(): void { + // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Nonce is verified later by rocket_dismiss_boxes(). + $box = isset( $_GET['box'] ) ? sanitize_key( wp_unslash( $_GET['box'] ) ) : ''; + + $rocketcdn_boxes = [ 'rocketcdn_install_notice', 'rocket_update_notice' ]; + + if ( ! in_array( $box, $rocketcdn_boxes, true ) ) { + return; + } + + // Track Mixpanel event immediately. + $this->track_event( 'RocketCDN Admin Notice Dismissed' ); + } } diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/Queue.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/Queue.php new file mode 100644 index 000000000..41ec3e1cf --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/Queue.php @@ -0,0 +1,65 @@ +is_scheduled( $this->create_status_job ) ) { + return; + } + $this->cancel( $this->create_status_job ); + } + + /** + * Schedule reset task. + * + * @param string $task_id Task ID to check the status of RocketCDN free website creation. + * + * @return void + */ + public function schedule_create_status_job( string $task_id ): void { + // Schedule weekly cleanup. + $this->schedule_single( + time() + 30, // After 30 seconds from now. + $this->create_status_job, + [ + 'task_id' => $task_id, + ] + ); + } + + /** + * Cancel all scheduled tasks. + * + * @return void + */ + public function cancel_all_tasks() { + $this->cancel_create_status_job(); + } +} diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/RESTSubscriber.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/RESTSubscriber.php index 25b20d673..0850ccc47 100644 --- a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/RESTSubscriber.php +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/RESTSubscriber.php @@ -26,29 +26,62 @@ class RESTSubscriber implements Subscriber_Interface { */ private $options; + /** + * Rest controller instance. + * + * @var Rest + */ + private $rest; + + /** + * Subscription controller instance. + * + * @var SubscriptionController + */ + private $subscription_controller; + /** * Constructor * - * @param CDNOptionsManager $cdn_options CDNOptionsManager instance. - * @param Options_Data $options WP Rocket Options instance. + * @param CDNOptionsManager $cdn_options CDNOptionsManager instance. + * @param Options_Data $options WP Rocket Options instance. + * @param Rest $rest Rest controller instance. + * @param SubscriptionController $subscription_controller Subscription controller. */ - public function __construct( CDNOptionsManager $cdn_options, Options_Data $options ) { - $this->cdn_options = $cdn_options; - $this->options = $options; + public function __construct( CDNOptionsManager $cdn_options, Options_Data $options, Rest $rest, SubscriptionController $subscription_controller ) { + $this->cdn_options = $cdn_options; + $this->options = $options; + $this->rest = $rest; + $this->subscription_controller = $subscription_controller; } /** - * {@inheritdoc} + * Return an array of events that this subscriber wants to listen to. + * + * @return array */ public static function get_subscribed_events() { return [ - 'rest_api_init' => [ + 'rest_api_init' => [ [ 'register_enable_route' ], [ 'register_disable_route' ], + [ 'register_routes' ], ], + 'rocket_cdnfree_website_create_status' => 'check_status', ]; } + /** + * Registers RocketCDN pages and state REST routes. + * + * @since 3.22 + * + * @return void + */ + public function register_routes(): void { + $this->rest->register_routes(); + } + /** * Register Enable route in the WP REST API * @@ -72,6 +105,7 @@ public function register_enable_route() { 'required' => true, 'validate_callback' => [ $this, 'validate_key' ], ], + // RocketCDN CNAME is no longer required as it's now changed on the filter level not in the settings option. 'url' => [ 'required' => true, 'validate_callback' => function ( $param ) { @@ -128,9 +162,7 @@ public function register_disable_route() { * @return \WP_REST_Response|\WP_Error */ public function enable( \WP_REST_Request $request ) { - $params = $request->get_body_params(); - - $this->cdn_options->enable( $params['url'] ); + $this->cdn_options->enable(); $response = [ 'code' => 'success', @@ -191,4 +223,17 @@ public function validate_email( $param ) { public function validate_key( $param ) { return ! empty( $param ) && $param === $this->options->get( 'consumer_key' ); } + + /** + * Check subscription creation status. + * + * @param string $task_id Task ID to check. + * @return void + */ + public function check_status( string $task_id ) { + if ( empty( $task_id ) ) { + return; + } + $this->subscription_controller->check_status( $task_id ); + } } diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/Rest.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/Rest.php new file mode 100644 index 000000000..9966fadad --- /dev/null +++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/Rest.php @@ -0,0 +1,561 @@ +query = $query; + $this->options = $options; + $this->options_api = $options_api; + $this->render_controller = $render_controller; + $this->context = $context; + $this->subscription_controller = $subscription_controller; + } + + /** + * Registers the REST routes. + * + * @return void + */ + public function register_routes(): void { + register_rest_route( + self::ROUTE_NAMESPACE, + self::ROUTE_BASE . '/pages', + [ + [ + 'methods' => WP_REST_Server::READABLE, + 'callback' => [ $this, 'get_pages' ], + 'permission_callback' => [ $this, 'check_permission' ], + ], + [ + 'methods' => WP_REST_Server::CREATABLE, + 'callback' => [ $this, 'add_page' ], + 'permission_callback' => [ $this, 'check_permission' ], + 'args' => [ + 'url' => [ + 'required' => true, + 'validate_callback' => function ( $param ) { + return ! empty( $param ) && wp_http_validate_url( esc_url_raw( $param ) ); + }, + 'sanitize_callback' => function ( $param ) { + return $this->normalize_url_path_encoding( untrailingslashit( esc_url_raw( $param ) ) ); + }, + ], + ], + ], + ] + ); + + register_rest_route( + self::ROUTE_NAMESPACE, + self::ROUTE_BASE . '/pages/homepage', + [ + 'methods' => WP_REST_Server::CREATABLE, + 'callback' => [ $this, 'add_homepage' ], + 'permission_callback' => [ $this, 'check_permission' ], + ] + ); + + register_rest_route( + self::ROUTE_NAMESPACE, + self::ROUTE_BASE . '/pages/(?P
-
-
-
-
- + +
+
-
+
-
- + [] ] ); ?>
+
- ]*>(.*?)<\/title>/is', $html, $matches ) ) {
+ return $title;
+ }
+
+ // Clean up and sanitize the title.
+ $title = html_entity_decode( trim( $matches[1] ), ENT_QUOTES, 'UTF-8' );
+
+ if ( empty( $title ) ) {
+ return $title;
+ }
+
+ $title = wp_strip_all_tags( $title );
+ $title = sanitize_text_field( $title );
+
+ return $title;
+ }
+
+
+ /**
+ * Fetches the HTML content of a given URL using a custom user agent.
+ *
+ * Performs a remote GET request to the specified URL, simulating a mobile browser user agent,
+ * and returns the response body if the request is successful (HTTP 200).
+ *
+ * @param string $url The URL to fetch the HTML content from.
+ *
+ * @return string|false The HTML content of the page on success, or false on failure.
+ */
+ public function get_page_content( string $url ) {
+ $user_agent = 'WP Rocket/Fetch Page Buffer for Performance Monitoring 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';
+ $args = [
+ 'user-agent' => $user_agent,
+ 'timeout' => 60,
+ ];
+
+ $response = wp_safe_remote_get( $url, $args );
+
+ if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
+ return false;
+ }
+
+ return wp_remote_retrieve_body( $response );
+ }
+
+ /**
+ * Validates a given URL for performance monitoring eligibility.
+ *
+ * @param string $url The URL to validate.
+ *
+ * @return array {
+ * @type bool $error Whether an error occurred during validation.
+ * @type string $message The error message, or an empty string if no error.
+ * @type string $processed_url The URL with protocol added if validation passes.
+ * }
+ */
+ protected function get_page_url_validation_payload( string $url ): array {
+ $payload = [
+ 'error' => false,
+ 'message' => '',
+ 'processed_url' => '',
+ 'data' => [
+ 'status' => 400,
+ ],
+ ];
+
+ // Validate that url is not empty.
+ if ( '' === $url ) {
+ $payload['error'] = true;
+ $payload['message'] = 'No url provided.';
+
+ return $payload;
+ }
+
+ // Check if URL has protocol, add if needed.
+ $url = rocket_add_url_protocol( $url );
+ $payload['processed_url'] = $url;
+
+ $response = $this->get_page_content( $url );
+
+ if ( ! $response ) {
+ $payload['error'] = true;
+ $payload['message'] = 'Url does not resolve to a valid page.';
+
+ return $payload;
+ }
+
+ // check if url is not from admin.
+ if ( strpos( $url, admin_url() ) === 0 ) {
+ $payload['error'] = true;
+ $payload['message'] = 'Url is an admin page.';
+
+ return $payload;
+ }
+
+ // Fetch url body and send to payload.
+ $payload['message'] = $response;
+
+ return $payload;
+ }
+
+ /**
+ * Normalizes percent-encoding in URL path segments so that raw unicode and
+ * already-encoded forms produce the same canonical string.
+ *
+ * @param string $url URL to normalize.
+ *
+ * @return string
+ */
+ public function normalize_url_path_encoding( string $url ): string {
+ $parsed = wp_parse_url( $url );
+
+ if ( empty( $parsed['path'] ) ) {
+ return $url;
+ }
+
+ $encoded_path = implode(
+ '/',
+ array_map(
+ static function ( string $segment ): string {
+ return rawurlencode( rawurldecode( $segment ) );
+ },
+ explode( '/', $parsed['path'] )
+ )
+ );
+
+ $result = isset( $parsed['scheme'] ) ? $parsed['scheme'] . '://' : '';
+ $result .= $parsed['host'] ?? '';
+ $result .= isset( $parsed['port'] ) ? ':' . $parsed['port'] : '';
+ $result .= $encoded_path;
+ $result .= isset( $parsed['query'] ) ? '?' . $parsed['query'] : '';
+ $result .= isset( $parsed['fragment'] ) ? '#' . $parsed['fragment'] : '';
+
+ return $result;
+ }
+}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Common/PerformanceHints/Admin/Controller.php b/web/app/plugins/wp-rocket/inc/Engine/Common/PerformanceHints/Admin/Controller.php
index a0f674ced..44eed120d 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Common/PerformanceHints/Admin/Controller.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Common/PerformanceHints/Admin/Controller.php
@@ -205,4 +205,26 @@ private function delete_by_url( string $url ) {
$factory->queries()->delete_by_url( untrailingslashit( $url ) );
}
}
+
+ /**
+ * Clean performance hints when changing the logo.
+ *
+ * @param mixed $value The new value of the theme modification.
+ * @param mixed $old_value The old value of the theme modification.
+ *
+ * @return mixed
+ */
+ public function clean_on_logo_change( $value, $old_value ) {
+ if ( ! $this->is_allowed() ) {
+ return $value;
+ }
+
+ if ( $value === $old_value ) {
+ return $value;
+ }
+
+ $this->truncate_tables();
+
+ return $value;
+ }
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Common/PerformanceHints/Admin/Subscriber.php b/web/app/plugins/wp-rocket/inc/Engine/Common/PerformanceHints/Admin/Subscriber.php
index 2c6449c9a..e0317ac41 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Common/PerformanceHints/Admin/Subscriber.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Common/PerformanceHints/Admin/Subscriber.php
@@ -79,6 +79,8 @@ public static function get_subscribed_events(): array {
'rocket_dashboard_actions' => 'display_dashboard_button',
'admin_post_rocket_clean_performance_hints' => 'clean_performance_hints',
'admin_post_rocket_clean_performance_hints_url' => 'clean_url_performance_hints',
+ 'pre_set_theme_mod_custom_logo' => [ 'clean_performance_hints_on_logo_change', 10, 2 ],
+ 'pre_update_option_site_logo' => [ 'clean_performance_hints_on_logo_change', 10, 2 ],
];
}
@@ -202,4 +204,16 @@ public function clean_url_performance_hints(): void {
public function clean_performance_hint_result(): void {
$this->notices->clean_performance_hint_result();
}
+
+ /**
+ * Clean performance hints when changing the logo.
+ *
+ * @param mixed $value The new value of the theme modification.
+ * @param mixed $old_value The old value of the theme modification.
+ *
+ * @return mixed
+ */
+ public function clean_performance_hints_on_logo_change( $value, $old_value ) {
+ return $this->controller->clean_on_logo_change( $value, $old_value );
+ }
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Common/Queue/RUCSSQueueRunner.php b/web/app/plugins/wp-rocket/inc/Engine/Common/Queue/RUCSSQueueRunner.php
index 2af712f13..0620799a0 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Common/Queue/RUCSSQueueRunner.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Common/Queue/RUCSSQueueRunner.php
@@ -223,7 +223,7 @@ protected function do_batch( $size = 100, $context = '' ) {
$this->reset_group();
return $processed_actions;
} catch ( \Exception $exception ) {
- Logger::debug( $exception->getMessage() );
+ Logger::error( $exception->getMessage() );
$this->reset_group();
return 0;
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Common/Utils.php b/web/app/plugins/wp-rocket/inc/Engine/Common/Utils.php
index aeb5bf310..7f0484d8c 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Common/Utils.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Common/Utils.php
@@ -125,4 +125,130 @@ public static function process_deleted_cache_urls( array $deleted, ?callable $ca
return $urls;
}
+
+ /**
+ * Display an update notice when the plugin is updated.
+ *
+ * @param array $notice_info Notice information {.
+ * @type string $new version New Version of the plugin.
+ * @type string $previous_version Previous version of the plugin.
+ * @type string $message Notice message.
+ * @type string $action Notice action.
+ * @type string $dismiss_message Dismiss message button title.
+ * @type string $dismiss_button Dismiss button.
+ * }
+ *
+ * @param bool $display_general Whether to display the notice on all WP or only WPR dashboard.
+ * @return void
+ */
+ public static function display_update_notice( array $notice_info, $display_general = false ): void {
+ $previous_version = $notice_info['previous_version'] ?? '';
+ $status = $notice_info['status'] ?? 'info';
+ $version = $notice_info['new_version'] ?? '';
+
+ // If previous_version is set, this is an upgrade — check version compatibility before displaying the notice.
+ if ( ! empty( $previous_version ) ) {
+ if ( version_compare( $previous_version, $version, '>=' ) ) {
+ return;
+ }
+ }
+
+ if ( ! current_user_can( 'rocket_manage_options' ) ) {
+ return;
+ }
+
+ if ( ! $display_general && 'settings_page_wprocket' !== get_current_screen()->id ) {
+ return;
+ }
+
+ $boxes = get_user_meta( get_current_user_id(), 'rocket_boxes', true );
+
+ if ( in_array( $notice_info['dismiss_button'], (array) $boxes, true ) ) {
+ return;
+ }
+
+ if ( $notice_info['track_event'] ?? false ) {
+ /**
+ * Fires after the RocketCDN notice is displayed, allowing to track the impression of the notice.
+ *
+ * @param string $dismiss_button The notice button identifier.
+ */
+ do_action( 'rocket_notice_displayed', $notice_info['dismiss_button'] );
+ }
+
+ $notice_id = 'rocket-notice-' . sanitize_html_class( $notice_info['dismiss_button'] );
+
+ rocket_notice_html(
+ [
+ 'id' => $notice_id,
+ 'status' => $status,
+ 'dismissible' => 'is-dismissible',
+ 'message' => $notice_info['message'],
+ 'action' => $notice_info['action'],
+ 'dismiss_button' => $notice_info['dismiss_button'],
+ 'dismiss_button_message' => $notice_info['dismiss_message'],
+ 'dismiss_button_class' => 'button button-secondary',
+ ]
+ );
+
+ $nonce = wp_create_nonce( 'rocket_ignore_' . $notice_info['dismiss_button'] );
+ ?>
+
+ '$',
+ 'EUR' => '€',
+ ];
+
+ /**
+ * Get currency symbol from currency code.
+ *
+ * @param string $currency Currency code (EUR|USD).
+ * @return string Currency symbol (€|$).
+ */
+ public static function get_symbol( string $currency ): string {
+ $currency = strtoupper( trim( $currency ) );
+
+ if ( ! isset( self::CURRENCY_SYMBOLS[ $currency ] ) ) {
+ return self::CURRENCY_SYMBOLS[ self::DEFAULT_CURRENCY ];
+ }
+
+ return self::CURRENCY_SYMBOLS[ $currency ];
+ }
+
+ /**
+ * Format price with currency symbol.
+ *
+ * @param float|string $price Price.
+ * @param string $currency Currency string.
+ * @param string $wrap_span Wraps price components in span tags for styling:
+ * - Empty string: not to wrap.
+ * - price: wrap price only.
+ * - currency: wrap currency symbol only.
+ * - both: wrap both price and currency symbol individually.
+ * @param array $span_classes Span classes.
+ * @param bool $with_space With space between currency and price or not, default with no space.
+ *
+ * @return string
+ */
+ public static function format_price_with_currency_symbol( $price, string $currency, string $wrap_span = '', array $span_classes = [], $with_space = false ): string {
+ $currency_symbol = self::get_symbol( $currency );
+ switch ( $wrap_span ) {
+ case 'both':
+ $price = self::wrap_span( $price, $span_classes['price'] ?? '' );
+ $currency_symbol = self::wrap_span( $currency_symbol, $span_classes['currency'] ?? '' );
+ break;
+ case 'price':
+ $price = self::wrap_span( $price, $span_classes['price'] ?? '' );
+ break;
+ case 'currency':
+ $currency_symbol = self::wrap_span( $currency_symbol, $span_classes['currency'] ?? '' );
+ }
+
+ if ( self::is_euro( $currency ) ) {
+ return $price . ( $with_space ? ' ' : '' ) . $currency_symbol;
+ }
+ return $currency_symbol . ( $with_space ? ' ' : '' ) . $price;
+ }
+
+ /**
+ * Check if currency is euro or not.
+ *
+ * @param string $currency Currency to be tested.
+ * @return bool
+ */
+ public static function is_euro( $currency ): bool {
+ return 'EUR' === $currency;
+ }
+
+ /**
+ * Wrap a string in a span tag.
+ *
+ * @param int|float|string $item Item can be string, float, or integer.
+ * @param string $classnames Class attribute.
+ * @return string
+ */
+ private static function wrap_span( $item, $classnames = '' ): string {
+ return sprintf( '%s', $classnames, $item );
+ }
+}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/License/API/User.php b/web/app/plugins/wp-rocket/inc/Engine/License/API/User.php
index 66a25dee2..dfc799a4a 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/License/API/User.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/License/API/User.php
@@ -547,6 +547,23 @@ public function ban_reason() {
return $this->user->licence->plugin_updates_ban_reason ?? '';
}
+ /**
+ * Checks if the current website is a reseller account whose license was specifically banned.
+ *
+ * This is the single source of truth for "reseller-banned" state, combining reseller
+ * scoping with the specific `BANNED_WEBSITE` ban reason so it is not confused with
+ * other revocation causes (non-payment, fraud, chargeback, etc.).
+ *
+ * @since 3.23.1
+ *
+ * @return bool
+ */
+ public function is_reseller_license_banned(): bool {
+ return $this->is_reseller_account()
+ && $this->is_revoked()
+ && 'BANNED_WEBSITE' === $this->ban_reason();
+ }
+
/**
* Checks if plugin updates are available.
*
@@ -610,4 +627,26 @@ private function get_blocked_reason_text( $reason_code ) {
}
return $reasons[ $reason_code ];
}
+
+ /**
+ * Get currency from user data.
+ *
+ * @return string
+ */
+ public function get_currency() {
+ return $this->user->currency ?? 'USD';
+ }
+
+ /**
+ * Gets the user rocketcdn free url.
+ *
+ * @return string
+ */
+ public function get_rocketcdn_free_url() {
+ if ( ! isset( $this->user->rocketcdn->cdn_free_url ) ) {
+ return '';
+ }
+
+ return (string) $this->user->rocketcdn->cdn_free_url;
+ }
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/License/Renewal.php b/web/app/plugins/wp-rocket/inc/Engine/License/Renewal.php
index 0940c045f..acef09a1f 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/License/Renewal.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/License/Renewal.php
@@ -5,6 +5,7 @@
use WP_Rocket\Abstract_Render;
use WP_Rocket\Admin\Options_Data;
+use WP_Rocket\Engine\License\API\Currency;
use WP_Rocket\Engine\License\API\Pricing;
use WP_Rocket\Engine\License\API\User;
@@ -186,7 +187,8 @@ public function display_renewal_expired_banner() {
* @return array
*/
private function get_banner_data() {
- $price = esc_html( '$' . number_format_i18n( $this->get_price(), 2 ) );
+ $price = Currency::format_price_with_currency_symbol( number_format_i18n( $this->get_price(), 2 ), $this->user->get_currency() )
+ . '! ' . esc_html__( '(excl. taxes)', 'rocket' ) . '';
$message = sprintf(
// translators: %1$s = , %2$s = , %3$s = discount price.
@@ -199,7 +201,7 @@ private function get_banner_data() {
if ( $this->is_grandfather() ) {
$message = sprintf(
// translators: %1$s = , %2$s = discount percentage, %3$s = , %4$s = discount price.
- esc_html__( 'Renew with a %1$s%2$s discount%3$s before it is too late, you will only pay %1$s%4$s%3$s!', 'rocket' ),
+ esc_html__( 'Renew with a %1$s%2$s discount%3$s before it is too late, you will only pay %1$s%4$s%3$s', 'rocket' ),
'',
esc_html( $this->get_discount_percent() . '%' ),
'',
@@ -644,7 +646,7 @@ public function add_expired_bubble( $menu_title ): string {
return $menu_title;
}
- return $menu_title . ' !';
+ return $menu_title . ' !';
}
/**
diff --git a/web/app/plugins/wp-rocket/inc/Engine/License/Subscriber.php b/web/app/plugins/wp-rocket/inc/Engine/License/Subscriber.php
index d8f040e75..8c97004aa 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/License/Subscriber.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/License/Subscriber.php
@@ -50,7 +50,7 @@ public static function get_subscribed_events() {
'rocket_dashboard_license_info' => 'display_upgrade_section',
'rocket_settings_page_footer' => 'display_upgrade_popin',
'rocket_menu_title' => [
- [ 'add_notification_bubble' ],
+ [ 'add_notification_bubble', 10, 2 ],
[ 'add_notification_bubble_expired' ],
[ 'maybe_add_revoked_bubble' ],
],
@@ -106,10 +106,11 @@ public function display_upgrade_popin() {
* @since 3.7.4
*
* @param string $menu_title The text to be used for the menu.
+ * @param string $context Filter context.
* @return string
*/
- public function add_notification_bubble( $menu_title ) {
- return $this->upgrade->add_notification_bubble( $menu_title );
+ public function add_notification_bubble( $menu_title, $context = 'adminmenu' ) {
+ return $this->upgrade->add_notification_bubble( $menu_title, $context );
}
/**
diff --git a/web/app/plugins/wp-rocket/inc/Engine/License/Upgrade.php b/web/app/plugins/wp-rocket/inc/Engine/License/Upgrade.php
index 4f50f1f42..e6721e8b3 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/License/Upgrade.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/License/Upgrade.php
@@ -3,6 +3,7 @@
namespace WP_Rocket\Engine\License;
use WP_Rocket\Abstract_Render;
+use WP_Rocket\Engine\License\API\Currency;
use WP_Rocket\Engine\License\API\Pricing;
use WP_Rocket\Engine\License\API\User;
@@ -82,9 +83,14 @@ public function display_upgrade_popin() {
* Adds the notification bubble to WP Rocket menu item when a promo is active
*
* @param string $menu_title Menu title.
+ * @param string $context Filter context.
* @return string
*/
- public function add_notification_bubble( $menu_title ) {
+ public function add_notification_bubble( $menu_title, $context = 'adminmenu' ) {
+ if ( 'adminmenu' !== $context ) {
+ return $menu_title;
+ }
+
if ( ! $this->can_use_promo() ) {
return $menu_title;
}
@@ -363,11 +369,24 @@ private function get_upgrade_choices() {
* @return array
*/
private function get_generic_upgrade_data( $upgrade_item ) {
+ $currency = $this->user->get_currency();
+
+ $prices_classes = [];
+ if ( Currency::is_euro( $currency ) ) {
+ $prices_classes[] = 'wpr-with-euro';
+ }
+ if ( $this->pricing->is_promo_active() ) {
+ $prices_classes[] = 'wpr-with-promo';
+ }
+
$data = [
- 'name' => $upgrade_item->name,
- 'price' => $this->pricing->is_promo_active() ? $upgrade_item->saving : $upgrade_item->regular_price,
- 'websites' => $upgrade_item->websites,
- 'upgrade_url' => $upgrade_item->upgrade_url,
+ 'name' => $upgrade_item->name,
+ 'price' => $this->pricing->is_promo_active() ? $upgrade_item->saving : $upgrade_item->regular_price,
+ 'websites' => $upgrade_item->websites,
+ 'upgrade_url' => $upgrade_item->upgrade_url,
+ 'currency' => $currency,
+ 'currency_symbol' => Currency::get_symbol( $currency ),
+ 'prices_classes' => ! empty( $prices_classes ) ? ' ' . implode( ' ', $prices_classes ) : '',
];
if ( $this->pricing->is_promo_active() ) {
diff --git a/web/app/plugins/wp-rocket/inc/Engine/License/views/upgrade-item.php b/web/app/plugins/wp-rocket/inc/Engine/License/views/upgrade-item.php
index 39956e612..f39d70249 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/License/views/upgrade-item.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/License/views/upgrade-item.php
@@ -5,6 +5,8 @@
* @var array $data
*/
+use WP_Rocket\Engine\License\API\Currency;
+
defined( 'ABSPATH' ) || exit;
$rocket_initial_item = 'stacked' === $data['type'] ? reset( $data['item'] ) : $data['item'];
@@ -12,18 +14,31 @@
-
-
-
-
-
- -
-
-
- - - --
-
-
- - - --
-
-
- - - --
-
-
-
-
-
-
-
-
-
-
diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/cta-reseller-limit.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/cta-reseller-limit.php
new file mode 100644
index 000000000..9b38cdfbe
--- /dev/null
+++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/cta-reseller-limit.php
@@ -0,0 +1,31 @@
+
+
+
-  . 'rocketcdn-logo.svg' ); ?>)
-  . 'rocketcdn-text.svg' ); ?>)
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+ [] ] ); ?>
+
+
+
-
-
-
-
+
-
-
+
+
-
- $
- $
-
-
-
+
-
- $
+
-
-
-
-
+
diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/cta-small.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/cta-small.php
deleted file mode 100644
index 1dcce081a..000000000
--- a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/cta-small.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
+
+
+
+
+
+
+
-
diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/dashboard-status.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/dashboard-status.php
index 48ab3841e..6c26e78cb 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/dashboard-status.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/dashboard-status.php
@@ -5,12 +5,10 @@
* @since 3.5
*
* @param array $data {
- * @type bool $is_live_site Identifies if the current website is a live or local/staging one
+ * @type bool $is_live_site Identifies if the current website is a live or local/staging one.
* @type string $container_class Flex container CSS class.
- * @type string $label Content label.
- * @type string $status_class CSS Class to display the status.
- * @type string $status_text Text to display the subscription status.
* @type bool $is_active Boolean identifying the activation status.
+ * @type array $items List of plan info rows, each with 'label', 'value', and 'class'.
* }
*/
@@ -24,13 +22,17 @@
diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/promote-notice.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/promote-notice.php
deleted file mode 100644
index 93f7b9ac7..000000000
--- a/web/app/plugins/wp-rocket/inc/Engine/CDN/RocketCDN/views/promote-notice.php
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/ServiceProvider.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/ServiceProvider.php
index 4e3643696..4c1016487 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/CDN/ServiceProvider.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/ServiceProvider.php
@@ -3,8 +3,19 @@
namespace WP_Rocket\Engine\CDN;
+use WP_Rocket\Dependencies\League\Container\Argument\Literal\StringArgument;
use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
use WP_Rocket\Engine\CDN\Admin\Subscriber as AdminSubscriber;
+use WP_Rocket\Engine\CDN\Drivers\{
+ Custom,
+ DriverFactory,
+ RocketCDNFree,
+ RocketCDNPaid
+};
+use WP_Rocket\Engine\CDN\Render\{
+ Controller as RenderController,
+ Subscriber as RenderSubscriber
+};
/**
* Service provider for WP Rocket CDN
@@ -17,8 +28,18 @@ class ServiceProvider extends AbstractServiceProvider {
*/
protected $provides = [
'cdn',
+ 'cdn_cname_validator',
+ 'cdn_context',
'cdn_subscriber',
'cdn_admin_subscriber',
+ 'cdn_render_controller',
+ 'cdn_render_subscriber',
+ 'cdn_driver_factory',
+ 'cdn_driver_free',
+ 'cdn_driver_paid',
+ 'cdn_driver_byocdn',
+ 'cdn_driver',
+ 'cache_controller',
];
/**
@@ -38,15 +59,90 @@ public function provides( string $id ): bool {
* @return void
*/
public function register(): void {
+ $this->getContainer()->add( 'cache_controller', Cache::class )
+ ->addArgument( 'rocketcdn_query' );
+ $this->getContainer()->addShared( 'cdn_cname_validator', CNAMEValidator::class );
$this->getContainer()->addShared( 'cdn', CDN::class )
- ->addArgument( 'options' );
+ ->addArguments(
+ [
+ 'options',
+ 'cdn_cname_validator',
+ 'cdn_context',
+ ]
+ );
+ $this->getContainer()->addShared( 'cdn_context', Context::class )
+ ->addArguments(
+ [
+ 'options',
+ 'rocketcdn_subscription_controller',
+ ]
+ );
+
+ // Register individual drivers.
+ $this->getContainer()->add(
+ 'cdn_driver_free',
+ RocketCDNFree::class
+ )->addArgument( 'rocketcdn_query' );
+
+ $this->getContainer()->add(
+ 'cdn_driver_paid',
+ RocketCDNPaid::class
+ )->addArgument( 'options' );
+
+ $this->getContainer()->add(
+ 'cdn_driver_byocdn',
+ Custom::class
+ );
+
+ // Register Driver Factory.
+ $this->getContainer()->addShared(
+ 'cdn_driver_factory',
+ DriverFactory::class
+ )
+ ->addArgument( $this->getContainer() )
+ ->addArgument( 'cdn_context' );
+
+ // Register current active driver (resolved at runtime).
+ $this->getContainer()->add(
+ 'cdn_driver',
+ function () {
+ $factory = $this->getContainer()->get( 'cdn_driver_factory' );
+ return $factory->create();
+ }
+ );
+
$this->getContainer()->addShared( 'cdn_subscriber', Subscriber::class )
->addArguments(
[
'options',
'cdn',
+ 'options_api',
+ 'rocketcdn_subscription_controller',
+ 'cache_controller',
+ 'rocketcdn_query',
+ 'cdn_driver',
+ 'cdn_cname_validator',
]
);
$this->getContainer()->addShared( 'cdn_admin_subscriber', AdminSubscriber::class );
+
+ // CDN Render controller.
+ $this->getContainer()->addShared( 'cdn_render_controller', RenderController::class )
+ ->addArguments(
+ [
+ 'beacon',
+ new StringArgument( rocket_get_constant( 'WP_ROCKET_PATH', '' ) . 'views/settings/' ),
+ 'cdn_context',
+ 'options',
+ 'rocketcdn_query',
+ 'rocketcdn_subscription_controller',
+ 'user',
+ 'cache_controller',
+ ]
+ );
+
+ // CDN Render subscriber.
+ $this->getContainer()->addShared( 'cdn_render_subscriber', RenderSubscriber::class )
+ ->addArgument( 'cdn_render_controller' );
}
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/CDN/Subscriber.php b/web/app/plugins/wp-rocket/inc/Engine/CDN/Subscriber.php
index 6603c9fc3..89b207d6e 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/CDN/Subscriber.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/CDN/Subscriber.php
@@ -1,7 +1,16 @@
options = $options;
- $this->cdn = $cdn;
+ public function __construct(
+ Options_Data $options,
+ CDN $cdn,
+ Options $options_api,
+ SubscriptionController $subscription_controller,
+ Cache $cache,
+ RocketCDNQuery $query,
+ ?DriverInterface $driver = null,
+ ?CNAMEValidator $cname_validator = null
+ ) {
+ $this->options = $options;
+ $this->cdn = $cdn;
+ $this->options_api = $options_api;
+ $this->driver = $driver;
+ $this->subscription_controller = $subscription_controller;
+ $this->cache = $cache;
+ $this->query = $query;
+ $this->cname_validator = $cname_validator;
}
/**
@@ -44,20 +118,30 @@ public function __construct( Options_Data $options, CDN $cdn ) {
*/
public static function get_subscribed_events() {
return [
- 'rocket_buffer' => [
+ 'rocket_buffer' => [
[ 'rewrite', 2 ],
[ 'rewrite_srcset', 3 ],
],
- 'rocket_css_content' => 'rewrite_css_properties',
- 'rocket_usedcss_content' => 'rewrite_css_properties',
- 'rocket_cdn_hosts' => [ 'get_cdn_hosts', 10, 2 ],
- 'rocket_dns_prefetch' => 'add_dns_prefetch_cdn',
- 'rocket_facebook_sdk_url' => 'add_cdn_url',
- 'rocket_css_url' => [ 'add_cdn_url', 10, 2 ],
- 'rocket_js_url' => [ 'add_cdn_url', 10, 2 ],
- 'rocket_asset_url' => [ 'maybe_replace_url', 10, 2 ],
- 'wp_resource_hints' => [ 'add_preconnect_cdn', 10, 2 ],
- 'rocket_font_url' => [ 'add_cdn_url', 10, 2 ],
+ 'rocket_css_content' => 'rewrite_css_properties',
+ 'rocket_usedcss_content' => 'rewrite_css_properties',
+ 'rocket_cdn_hosts' => [ 'get_cdn_hosts', 10, 2 ],
+ 'rocket_dns_prefetch' => 'add_dns_prefetch_cdn',
+ 'rocket_facebook_sdk_url' => 'add_cdn_url',
+ 'rocket_css_url' => [ 'add_cdn_url', 10, 2 ],
+ 'rocket_js_url' => [ 'add_cdn_url', 10, 2 ],
+ 'rocket_asset_url' => [ 'maybe_replace_url', 10, 2 ],
+ 'wp_resource_hints' => [ 'add_preconnect_cdn', 10, 2 ],
+ 'rocket_font_url' => [ 'add_cdn_url', 10, 2 ],
+ 'rocket_first_install_options' => 'add_cdn_type_option',
+ 'wp_rocket_upgrade' => [
+ [ 'on_update_add_cdn_type_option', 10, 2 ],
+ ],
+ 'rocketcdn_free_plan_subscription_expired' => [ 'clear_free_plan_pages_cache' ],
+ 'update_option_wp_rocket_settings' => [
+ [ 'maybe_clear_cache', 10, 2 ],
+ [ 'maybe_clear_cname_cache', 10, 2 ],
+ ],
+ 'get_rocket_option_cdn' => 'apply_pause_on_rocketcdn_only',
];
}
@@ -105,6 +189,10 @@ public function rewrite_srcset( $html ) {
* @return string
*/
public function rewrite_css_properties( $content ) {
+ if ( ! $this->cdn_driver_should_rewrite_url() ) {
+ return $content;
+ }
+
/**
* Filters the application of the CDN on CSS properties
*
@@ -122,6 +210,10 @@ public function rewrite_css_properties( $content ) {
return $content;
}
+ if ( ! $this->subscription_controller->has_active_subscription() ) {
+ return $content;
+ }
+
return $this->cdn->rewrite_css_properties( $content );
}
@@ -189,6 +281,10 @@ public function add_dns_prefetch_cdn( $domains ) {
* @return string
*/
public function add_cdn_url( $url, $original_url = '' ) {
+ if ( ! $this->is_allowed() ) {
+ return $url;
+ }
+
if ( ! empty( $original_url ) ) {
if ( $this->cdn->is_excluded( $original_url ) ) {
return $url;
@@ -335,6 +431,10 @@ private function is_allowed() {
return false;
}
+ if ( ! $this->cdn_driver_should_rewrite_url() ) {
+ return false;
+ }
+
return true;
}
@@ -364,4 +464,173 @@ private function can_insert_resource_hints(): bool {
*/
return wpm_apply_filters_typed( 'boolean', 'rocket_cdn_insert_resource_hints', true );
}
+
+ /**
+ * Adds cdn_type option to WP Rocket options.
+ *
+ * @since 3.22
+ *
+ * @param array $options WP Rocket options array.
+ *
+ * @return array
+ */
+ public function add_cdn_type_option( array $options ) {
+ $options = (array) $options;
+
+ $options['cdn_type'] = 'rocketcdn';
+
+ return $options;
+ }
+
+ /**
+ * Add cdn_type option when upgrading from a version older than 3.22
+ *
+ * @since 3.22
+ *
+ * @param string $new_version New plugin version.
+ * @param string $old_version Previously installed plugin version.
+ *
+ * @return void
+ */
+ public function on_update_add_cdn_type_option( string $new_version, string $old_version ) {
+ // Bail early.
+ if ( version_compare( $old_version, '3.22', '>=' ) ) {
+ return;
+ }
+
+ $has_active_subscription = $this->subscription_controller->has_active_subscription();
+ $cdn_type = 'rocketcdn';
+ // Check if a CNAME is saved, cdn is enabled, and no RocketCDN subscription, then default to byocdn.
+ if (
+ ! $has_active_subscription
+ &&
+ ! empty( $this->options->get( 'cdn_cnames', [] ) ) && $this->is_cdn_enabled()
+ ) {
+ $cdn_type = 'byocdn';
+ }
+
+ $current_options = $this->options_api->get( 'settings', [] );
+ $current_options['cdn_type'] = $cdn_type;
+ if ( ! $has_active_subscription ) {
+ $current_options['cdn'] = 1;
+ }
+
+ $this->options_api->set( 'settings', $current_options );
+ }
+
+ /**
+ * Clear cached pages from free plan when subscription expired.
+ *
+ * @return void
+ */
+ public function clear_free_plan_pages_cache(): void {
+ if ( null === $this->query ) {
+ return;
+ }
+
+ $pages = $this->query->get_all();
+
+ foreach ( $pages as $page ) {
+ if ( empty( $page->url ) ) {
+ continue;
+ }
+
+ if ( Utils::is_home( $page->url ) ) {
+ rocket_clean_home();
+ continue;
+ }
+
+ rocket_clean_files( [ $page->url ] );
+ }
+ }
+
+ /**
+ * Determines if the CDN driver should rewrite the current URL.
+ *
+ * Checks if a CDN driver is set and whether it allows rewriting of the current URL.
+ *
+ * @return bool True if the URL should be rewritten by the CDN driver, false otherwise.
+ */
+ private function cdn_driver_should_rewrite_url(): bool {
+ if ( $this->driver && ! $this->driver->should_rewrite_url( $this->get_current_url() ) ) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Clear cache when cdn_type (driver) is changed.
+ *
+ * @param mixed $old_value Old option value.
+ * @param mixed $value New option value.
+ *
+ * @return void
+ */
+ public function maybe_clear_cache( $old_value, $value ) {
+ $cdn_changed = Utils::did_setting_change( 'cdn', $old_value, $value );
+ $cdn_type_changed = Utils::did_setting_change( 'cdn_type', $old_value, $value );
+
+ // Detect cdn status for pause/resume and cdn_type change.
+ if ( ! $cdn_changed && ! $cdn_type_changed ) {
+ return;
+ }
+
+ // Clear cache if cdn is paused/resumed or cdn_type is changed.
+
+ // CDN is paused/resumed.
+ if ( $cdn_changed ) {
+ // Clear specific pages' cache only when it's free rocketcdn.
+ if ( $this->subscription_controller->is_free() ) {
+ $this->cache->clear_rocketcdn_free_pages_cache();
+ return;
+ }
+
+ // Clear whole cache in case of paid rocketcdn.
+ $this->cache->clear_all_cache();
+ return;
+ }
+
+ // CDN type is changed, Clear whole cache.
+ $this->cache->clear_all_cache();
+ }
+
+ /**
+ * Clears CNAME validation transients when CDN settings are saved.
+ *
+ * Runs on both old and new CNAME lists so no stale cache entry survives a
+ * settings update regardless of whether CNAMEs were added or removed.
+ *
+ * @since 3.22.0.3
+ *
+ * @param mixed $old_value Previous option value.
+ * @param mixed $value New option value.
+ * @return void
+ */
+ public function maybe_clear_cname_cache( $old_value, $value ): void {
+ if ( null === $this->cname_validator ) {
+ return;
+ }
+
+ $old_cnames = is_array( $old_value ) && ! empty( $old_value['cdn_cnames'] ) ? (array) $old_value['cdn_cnames'] : [];
+ $new_cnames = is_array( $value ) && ! empty( $value['cdn_cnames'] ) ? (array) $value['cdn_cnames'] : [];
+ $all_cnames = array_filter( array_unique( array_merge( $old_cnames, $new_cnames ) ), 'is_string' );
+
+ $this->cname_validator->clear_validation_cache( $all_cnames );
+ }
+
+ /**
+ * Apply the pause of CDN on RocketCDN only.
+ *
+ * @param bool $cdn The current CDN status.
+ *
+ * @return bool
+ */
+ public function apply_pause_on_rocketcdn_only( $cdn ) {
+ if ( is_admin() ) {
+ return $cdn;
+ }
+
+ return $cdn || 'rocketcdn' !== $this->options->get( 'cdn_type' );
+ }
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/ClearUrlCache.php b/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/ClearUrlCache.php
new file mode 100644
index 000000000..f40cdfa17
--- /dev/null
+++ b/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/ClearUrlCache.php
@@ -0,0 +1,161 @@
+ __( 'Clear URL cache', 'rocket' ),
+ 'description' => _x(
+ 'Clears WP Rocket cache for specific URL(s), not a full purge. Before calling: list the URL(s), ask "Confirm you want to clear cache for this url?" (use "these" if plural), and wait for a yes in the same turn. On success (success: true, error empty): say the cache was cleared and will regenerate on next visit. On failure: error is an object of url => reason; report each failed URL with its own reason, not a generic message.',
+ 'Ability description',
+ 'rocket'
+ ),
+ 'category' => 'wp-rocket-cache',
+ 'input_schema' => [
+ 'type' => 'object',
+ 'properties' => [
+ 'url' => [
+ 'anyOf' => [
+ [
+ 'type' => 'string',
+ 'format' => 'uri',
+ ],
+ [
+ 'type' => 'array',
+ 'items' => [
+ 'type' => 'string',
+ 'format' => 'uri',
+ ],
+ 'minItems' => 1,
+ ],
+ ],
+ 'description' => __( 'A single URL or an array of URLs whose cache should be purged.', 'rocket' ),
+ ],
+ ],
+ 'required' => [ 'url' ],
+ ],
+ 'output_schema' => [
+ 'type' => 'object',
+ 'properties' => [
+ 'success' => [
+ 'type' => 'boolean',
+ 'description' => __( 'Indicates whether the url cache was succesfully purged', 'rocket' ),
+ ],
+ 'error' => [
+ 'type' => 'object',
+ 'additionalProperties' => [
+ 'type' => 'string',
+ ],
+ 'description' => __( 'Object keyed by URL for each URL whose cache could not be purged, with the reason as the value.', 'rocket' ),
+ ],
+ ],
+ ],
+ 'execute_callback' => [ $this, 'execute' ],
+ 'permission_callback' => [ $this, 'check_permissions' ],
+ 'meta' => [
+ 'mcp' => [
+ 'public' => true,
+ ],
+ 'show_in_rest' => true,
+ 'annotations' => [
+ 'readonly' => false,
+ 'destructive' => false,
+ 'idempotent' => false,
+ ],
+ ],
+ ]
+ );
+ }
+
+ /**
+ * Checks if the current user has permission to execute this ability.
+ *
+ * @return bool
+ */
+ public function check_permissions(): bool {
+ return current_user_can( 'rocket_manage_options' );
+ }
+
+ /**
+ * Executes the ability to purge the cache for one or more URLs.
+ *
+ * @param array $input The input data containing a single URL string or an array of URL strings to purge.
+ *
+ * @return array
+ */
+ public function execute( $input = null ): array {
+ $this->track_event(
+ 'MCP Ability Executed',
+ [
+ 'ability' => 'wp-rocket/clear-url-cache',
+ 'context' => 'wp_plugin_mcp',
+ ]
+ );
+
+ $urls = $input['url'];
+ $urls = is_array( $urls ) ? array_unique( $urls ) : [ $urls ];
+
+ $valid_urls = [];
+ $error = [];
+ $site_host = wp_parse_url( home_url(), PHP_URL_HOST );
+
+ foreach ( $urls as $url ) {
+ // Check if url format is valid.
+ if ( false === filter_var( $url, FILTER_VALIDATE_URL ) ) {
+ $error[ $url ] = __( 'URL format is invalid.', 'rocket' );
+ continue;
+ }
+
+ // Check if url belongs to site.
+ if ( wp_parse_url( $url, PHP_URL_HOST ) !== $site_host ) {
+ $error[ $url ] = __( 'URL does not belong to this site.', 'rocket' );
+ continue;
+ }
+
+ // Check if url is from admin.
+ if ( strpos( $url, admin_url() ) === 0 ) {
+ $error[ $url ] = __( 'URL is an admin page.', 'rocket' );
+ continue;
+ }
+
+ // Check if a url is home and clean separately.
+ if ( trailingslashit( $url ) === trailingslashit( home_url() ) ) {
+ rocket_clean_home();
+
+ $cleaned_urls[ $url ] = true;
+ continue;
+ }
+
+ $valid_urls[] = $url;
+ }
+
+ $cleaned_urls = ! empty( $valid_urls ) ? rocket_clean_files( $valid_urls ) : [];
+
+ foreach ( $cleaned_urls as $url => $cleared ) {
+ if ( ! $cleared ) {
+ $error[ $url ] = __( 'No cache found for this URL, or a file permission issue prevented cache clearing.', 'rocket' );
+ }
+ }
+
+ return [
+ 'success' => empty( $error ),
+ 'error' => $error,
+ ];
+ }
+}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/ClearWebsiteCache.php b/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/ClearWebsiteCache.php
new file mode 100644
index 000000000..8aaae3410
--- /dev/null
+++ b/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/ClearWebsiteCache.php
@@ -0,0 +1,105 @@
+ __( 'Clear website cache', 'rocket' ),
+ 'description' => _x(
+ 'Clears the full WP Rocket cache for the entire website. Use this when the user asks to clear, purge, or refresh all cached pages for the site. This is a site-wide destructive cache action. Do not use it for a single page; use clear-url-cache instead. Confirmation is required before calling',
+ 'Ability description',
+ 'rocket'
+ ),
+ 'category' => 'wp-rocket-cache',
+ 'input_schema' => [],
+ 'output_schema' => [
+ 'type' => 'object',
+ 'properties' => [
+ 'success' => [
+ 'type' => 'boolean',
+ 'description' => __( 'Indicates whether the website cache was successfully cleared', 'rocket' ),
+ ],
+ 'error' => [
+ 'type' => 'string',
+ 'description' => __( 'Reason the cache could not be cleared, empty on success.', 'rocket' ),
+ ],
+ ],
+ ],
+ 'execute_callback' => [ $this, 'execute' ],
+ 'permission_callback' => [ $this, 'check_permissions' ],
+ 'meta' => [
+ 'mcp' => [
+ 'public' => true,
+ ],
+ 'show_in_rest' => true,
+ 'annotations' => [
+ 'readonly' => false,
+ 'destructive' => false,
+ 'idempotent' => false,
+ ],
+ ],
+ ]
+ );
+ }
+
+ /**
+ * Checks if the current user has permission to execute this ability.
+ *
+ * @return bool
+ */
+ public function check_permissions(): bool {
+ return current_user_can( 'rocket_manage_options' );
+ }
+
+ /**
+ * Executes the ability to clear website cache.
+ *
+ * @return array
+ */
+ public function execute(): array {
+ $this->track_event(
+ 'MCP Ability Executed',
+ [
+ 'ability' => 'wp-rocket/clear-website-cache',
+ 'context' => 'wp_plugin_mcp',
+ ]
+ );
+
+ if ( rocket_is_importing() ) {
+ return [
+ 'success' => false,
+ 'error' => __( 'Unable to clear cache: a content import is currently in progress.', 'rocket' ),
+ ];
+ }
+
+ $result = rocket_clean_domain();
+
+ if ( false === $result ) {
+ return [
+ 'success' => false,
+ 'error' => __( 'Unable to clear cache: no cacheable URLs were found for this site.', 'rocket' ),
+ ];
+ }
+
+ return [
+ 'success' => true,
+ 'error' => '',
+ ];
+ }
+}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/Subscriber.php b/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/Subscriber.php
new file mode 100644
index 000000000..e6b0405bd
--- /dev/null
+++ b/web/app/plugins/wp-rocket/inc/Engine/Cache/Abilities/Subscriber.php
@@ -0,0 +1,89 @@
+clear_url_cache = $clear_url_cache;
+ $this->abilities_context = $abilities_context;
+ $this->clear_website_cache = $clear_website_cache;
+ }
+
+
+ /**
+ * Returns an array of events this subscriber wants to listen to.
+ *
+ * @return array
+ */
+ public static function get_subscribed_events(): array {
+ return [
+ 'wp_abilities_api_init' => 'register_clear_cache_ability',
+ 'wp_abilities_api_categories_init' => 'register_cache_category',
+ ];
+ }
+
+ /**
+ * Registers the ability to clear website/url cache.
+ */
+ public function register_clear_cache_ability() {
+ if ( ! $this->abilities_context->is_enabled() ) {
+ return;
+ }
+
+ $this->clear_url_cache->register();
+ $this->clear_website_cache->register();
+ }
+
+ /**
+ * Registers WP Rocket Cache ability category.
+ */
+ public function register_cache_category() {
+ if ( ! $this->abilities_context->is_enabled() ) {
+ return;
+ }
+
+ if ( ! function_exists( 'wp_register_ability_category' ) ) {
+ return;
+ }
+
+ wp_register_ability_category(
+ 'wp-rocket-cache',
+ [
+ 'label' => __( 'WP Rocket Cache', 'rocket' ),
+ 'description' => __( 'Abilities related to WP Rocket Cache.', 'rocket' ),
+ ]
+ );
+ }
+}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Cache/ServiceProvider.php b/web/app/plugins/wp-rocket/inc/Engine/Cache/ServiceProvider.php
index 27e3b3e2a..02c975f34 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Cache/ServiceProvider.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Cache/ServiceProvider.php
@@ -10,6 +10,11 @@
use WP_Rocket\Engine\Preload\Database\Queries\Cache as CacheQuery;
use WP_Rocket\Engine\Cache\Config\ConfigSubscriber;
use WP_Rocket\Engine\Cache\UrlValidation\{ TaxonomySubscriber, PostSubscriber };
+use WP_Rocket\Engine\Cache\Abilities\{
+ ClearUrlCache as ClearUrlCacheAbility,
+ ClearWebsiteCache as ClearWebsiteCacheAbility,
+ Subscriber as CacheAbilitiesSubscriber
+};
/**
* Service Provider for cache subscribers
@@ -32,6 +37,9 @@ class ServiceProvider extends AbstractServiceProvider {
'cache_config',
'taxonomy_subscriber',
'post_subscriber',
+ 'cache_abilities_clear_url_cache',
+ 'cache_abilities_clear_website_cache',
+ 'cache_abilities_subscriber',
];
/**
@@ -104,5 +112,15 @@ public function register(): void {
);
$this->getContainer()->addShared( 'taxonomy_subscriber', TaxonomySubscriber::class );
$this->getContainer()->addShared( 'post_subscriber', PostSubscriber::class );
+ $this->getContainer()->add( 'cache_abilities_clear_url_cache', ClearUrlCacheAbility::class );
+ $this->getContainer()->add( 'cache_abilities_clear_website_cache', ClearWebsiteCacheAbility::class );
+ $this->getContainer()->addShared( 'cache_abilities_subscriber', CacheAbilitiesSubscriber::class )
+ ->addArguments(
+ [
+ 'cache_abilities_clear_url_cache',
+ 'cache_abilities_clear_website_cache',
+ 'abilities_context',
+ ]
+ );
}
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Common/JobManager/APIHandler/AbstractSafeAPIClient.php b/web/app/plugins/wp-rocket/inc/Engine/Common/JobManager/APIHandler/AbstractSafeAPIClient.php
index d905dd953..c4be0ef8a 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Common/JobManager/APIHandler/AbstractSafeAPIClient.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Common/JobManager/APIHandler/AbstractSafeAPIClient.php
@@ -62,6 +62,9 @@ public function send_post_request( $params = [], $safe = false ) {
*/
private function send_request( $method, $params = [], $safe = false ) {
$api_url = $this->get_api_url();
+ if ( empty( $api_url ) ) {
+ return new WP_Error( 404, 'Empty Url.' );
+ }
$transient_key = $this->get_transient_key();
if ( get_transient( $transient_key . '_timeout_active' ) ) {
@@ -79,10 +82,14 @@ private function send_request( $method, $params = [], $safe = false ) {
return $response;
}
- $body = wp_remote_retrieve_body( $response );
- if ( empty( $body ) || ( ! empty( $response['response']['code'] ) && ! in_array( $response['response']['code'], [ 200, 202 ], true ) ) ) {
+ if ( ! $this->valid_response_code( $response ) ) {
+ $this->set_timeout_transients( $previous_expiration );
+ return new WP_Error( 500, 'Not valid response code.' );
+ }
+
+ if ( ! $this->valid_response_body( $response ) ) {
$this->set_timeout_transients( $previous_expiration );
- return new WP_Error( 500, 'Not valid response.' );
+ return new WP_Error( 500, 'Not valid response body.' );
}
$this->delete_timeout_transients();
@@ -150,4 +157,24 @@ private function send_remote_request( $api_url, $method, $params, $safe ) {
return new WP_Error( 400, 'Not valid request type.' );
}
+
+ /**
+ * Validate response code.
+ *
+ * @param array $response Response object.
+ * @return bool
+ */
+ protected function valid_response_code( $response ) {
+ return empty( $response['response']['code'] ) || in_array( $response['response']['code'], [ 200, 202 ], true );
+ }
+
+ /**
+ * Validate response body.
+ *
+ * @param array $response Response object.
+ * @return bool
+ */
+ protected function valid_response_body( $response ) {
+ return ! empty( wp_remote_retrieve_body( $response ) );
+ }
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Common/JobManager/JobProcessor.php b/web/app/plugins/wp-rocket/inc/Engine/Common/JobManager/JobProcessor.php
index 41222009d..f72732cb3 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Common/JobManager/JobProcessor.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Common/JobManager/JobProcessor.php
@@ -96,16 +96,11 @@ public function process_pending_jobs() {
'3.16',
'rocket_rucss_process_pending_jobs_start'
);
- $this->logger::debug( 'RUCSS: Start processing pending jobs inside cron.' );
if ( ! $this->is_allowed() ) {
- $this->logger::debug( 'Stop processing cron iteration for pending jobs.' );
-
return;
}
- $this->logger::debug( 'Start processing pending jobs inside cron.' );
-
// Get some items from the DB with status=pending & job_id isn't empty.
/**
@@ -161,10 +156,8 @@ public function process_pending_jobs() {
* @return void
*/
public function check_job_status( string $url, bool $is_mobile, string $optimization_type ) {
-
$row_details = $this->get_single_job( $url, $is_mobile, $optimization_type );
if ( ! is_object( $row_details ) ) {
- $this->logger::debug( 'Url - ' . $url . ' not found for is_mobile - ' . (int) $is_mobile );
// Nothing in DB, bailout.
return;
}
@@ -227,8 +220,6 @@ public function check_job_status( string $url, bool $is_mobile, string $optimiza
* @return void
*/
public function process_on_submit_jobs() {
- $this->logger::debug( 'Start processing on submit jobs for adding jobs to queue.' );
-
/**
* Fires at the start of the process on submit jobs.
*
@@ -242,8 +233,6 @@ public function process_on_submit_jobs() {
);
if ( ! $this->is_allowed() ) {
- $this->logger::debug( 'Stop processing cron iteration for to-submit jobs.' );
-
return;
}
@@ -309,7 +298,6 @@ public function process_on_submit_jobs() {
);
}
- $this->logger::debug( 'End processing on submit jobs for adding jobs to queue.' );
/**
* Fires at the end of the process pending jobs.
*
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Common/Page/PageHandlerTrait.php b/web/app/plugins/wp-rocket/inc/Engine/Common/Page/PageHandlerTrait.php
new file mode 100644
index 000000000..b2a537d69
--- /dev/null
+++ b/web/app/plugins/wp-rocket/inc/Engine/Common/Page/PageHandlerTrait.php
@@ -0,0 +1,160 @@
+ tag in the given HTML, decodes any HTML entities,
+ * strips all tags, sanitizes the text, and then trims the title at common separators
+ * (such as " | ", " - ", " – ", " » ") to return a clean, concise page title.
+ *
+ * @param string $html The HTML content from which to extract the page title.
+ *
+ * @return string The sanitized and trimmed page title, or an empty string if not found.
+ */
+ public function get_page_title( string $html ): string {
+ $title = '';
+
+ if ( empty( $html ) ) {
+ return $title;
+ }
+
+ // Extract title from title tag.
+ if ( ! preg_match( '/
-
-
-
-
-
-
-
-
- ', esc_html( $rocket_initial_item['saving'] ), '' );
- ?>
+
+
- $
+
+ 'wpr-upgrade-price-value',
+ 'currency' => 'wpr-upgrade-price-symbol',
+ ],
+ true
+ );
+ ?>
- $
+
+
+
+
"\']+$/i', $url ) ) {
+ return '';
+ }
+
+ $clean_sources[] = $url . ( $descriptor ? ' ' . $descriptor : '' );
+ }
+
+ return implode( ', ', $clean_sources );
+ }
+
+ /**
+ * Sanitize media query attribute.
+ *
+ * @param string $media Raw media query value.
+ * @return string Sanitized media query or empty string if invalid.
+ */
+ private function sanitize_media_query( $media ) {
+ // Check for event handlers or malicious content.
+ if ( $this->hasOnAttribute( $media ) ) {
+ return '';
+ }
+
+ // Check for quotes or angle brackets.
+ if ( $this->hasQuotes( $media ) ) {
+ return '';
+ }
+
+ // Validate media query contains only allowed characters.
+ // Allow: (, ), and, or, not, min/max-width, spaces, numbers, px, em, rem.
+ if ( ! preg_match( '/^[\w\s\(\)\-:,\.]+$/i', $media ) ) {
+ return '';
+ }
+
+ return sanitize_text_field( $media );
+ }
+
+ /**
+ * Sanitize sizes attribute.
+ *
+ * @param string $sizes Raw sizes value.
+ * @return string Sanitized sizes or empty string if invalid.
+ */
+ private function sanitize_sizes( $sizes ) {
+ // Check for event handlers or malicious content.
+ if ( $this->hasOnAttribute( $sizes ) ) {
+ return '';
+ }
+
+ // Check for quotes or angle brackets.
+ if ( $this->hasQuotes( $sizes ) ) {
+ return '';
+ }
+
+ // Validate sizes format: media_query width, media_query width, ...
+ // Example: "(max-width: 600px) 480px, 800px".
+ if ( ! preg_match( '/^[\w\s\(\)\-:,\.vwpxem%]+$/i', $sizes ) ) {
+ return '';
+ }
+
+ return sanitize_text_field( $sizes );
+ }
+
+ /**
+ * Validate MIME type for picture sources.
+ *
+ * Ensures the MIME type is:
+ * - A valid image type
+ * - Allowed by WordPress
+ * - Safe for use in elements
+ *
+ * @param string $type Raw MIME type.
+ * @return string Sanitized MIME type or empty string if invalid.
+ */
+ private function validate_mime_type( $type ) {
+ // Sanitize input.
+ $type = strtolower( trim( $type ) );
+
+ // Must be an image type.
+ if ( ! str_starts_with( $type, 'image/' ) ) {
+ return '';
+ }
+
+ // Exclude SVG for security (optional - can contain inline scripts).
+ // Remove this check if you want to support SVG.
+ if ( 'image/svg+xml' === $type ) {
+ return '';
+ }
+
+ // Get WordPress allowed image MIME types.
+ $allowed_mimes = get_allowed_mime_types();
+ $image_mimes = array_filter(
+ $allowed_mimes,
+ function ( $mime ) {
+ return str_starts_with( $mime, 'image/' );
+ }
+ );
+
+ // Check if type is in WordPress's allowed list.
+ if ( ! in_array( $type, $image_mimes, true ) ) {
+ return '';
+ }
+
+ return $type;
+ }
+
+ /**
+ * Check if item has On JS attributes like onload.
+ *
+ * @param string $item Item to be checked.
+ * @return false|int
+ */
+ private function hasOnAttribute( $item ) {
+ return preg_match( '/\s*on\w+\s*=/i', $item );
+ }
+
+ /**
+ * Check for quotes, angle brackets, or other HTML-like content.
+ *
+ * @param string $item Item to be checked.
+ * @return false|int
+ */
+ private function hasQuotes( $item ) {
+ return preg_match( '/[<>"\']/i', $item );
+ }
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Media/AboveTheFold/Frontend/Controller.php b/web/app/plugins/wp-rocket/inc/Engine/Media/AboveTheFold/Frontend/Controller.php
index 6494ccf6d..02d65c877 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Media/AboveTheFold/Frontend/Controller.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Media/AboveTheFold/Frontend/Controller.php
@@ -393,19 +393,27 @@ private function generate_source_tags( $lcp, $start_tag, $end_tag ) {
$media = '(min-width: ' . ( $prev_max_width + 0.1 ) . 'px) and ' . $media;
}
- // Add the media attribute to the media string.
-
- $media = ! empty( $media ) ? ' media="' . $media . '"' : '';
+ // Add the media attribute to the media string with escaping.
+ $media = ! empty( $media ) ? sprintf( ' media="%s"', esc_attr( $media ) ) : '';
$sources[] = $source->srcset;
- // Get the sizes attribute of the source, if it exists.
- $sizes = ! empty( $source->sizes ) ? ' imagesizes="' . $source->sizes . '"' : '';
+
+ // Get the sizes attribute of the source, if it exists, with escaping.
+ $sizes = ! empty( $source->sizes ) ? sprintf( ' imagesizes="%s"', esc_attr( $source->sizes ) ) : '';
// Determine whether to use 'href' or 'imagesrcset' based on the srcset attribute.
$link_attribute = ( substr_count( $source->srcset, ',' ) > 0 ) ? 'imagesrcset' : 'href';
- // Append the source and media query to the tag string.
- $tag .= $start_tag . $link_attribute . '="' . $source->srcset . '"' . ( $media ) . $sizes . $end_tag;
+ // Append the source and media query to the tag string with escaping.
+ $tag .= sprintf(
+ '%s%s="%s"%s%s%s',
+ $start_tag,
+ $link_attribute,
+ esc_attr( $source->srcset ),
+ $media,
+ $sizes,
+ $end_tag
+ );
// If a max-width is found in the source's media attribute, update the previous max-width.
if ( preg_match( '/\(max-width: (\d+(\.\d+)?)px\)/', $source->media, $matches ) ) {
@@ -417,9 +425,15 @@ private function generate_source_tags( $lcp, $start_tag, $end_tag ) {
// If a previous max-width is found, update the media query and add the LCP source to the sources array and the tag string.
if ( null !== $prev_max_width ) {
- $media = ' media="(min-width: ' . ( $prev_max_width + 0.1 ) . 'px)"';
+ $media = sprintf( ' media="(min-width: %spx)"', ( $prev_max_width + 0.1 ) );
$sources[] = $lcp->src;
- $tag .= $start_tag . 'href="' . $lcp->src . '"' . $media . $end_tag;
+ $tag .= sprintf(
+ '%shref="%s"%s%s',
+ $start_tag,
+ esc_attr( $lcp->src ),
+ $media,
+ $end_tag
+ );
}
// Return an associative array containing the sources array and the tag string.
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Media/ImageDimensions/ImageDimensions.php b/web/app/plugins/wp-rocket/inc/Engine/Media/ImageDimensions/ImageDimensions.php
index 4f4934ad2..eb7023b1d 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Media/ImageDimensions/ImageDimensions.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Media/ImageDimensions/ImageDimensions.php
@@ -82,10 +82,7 @@ public function sanitize_option_value( array $input, Settings $settings ): array
* @return string Buffer Page HTML contents after inserting dimensions into images.
*/
public function specify_image_dimensions( $html ) {
- Logger::debug( 'Start Specify Image Dimensions.' );
-
if ( ! $this->can_specify_dimensions_images() ) {
- Logger::debug( 'Specify Image Dimensions failed because option is not enabled from admin or by filter (rocket_specify_image_dimensions).' );
return $html;
}
@@ -124,8 +121,6 @@ public function specify_image_dimensions( $html ) {
*/
$images = apply_filters( 'rocket_specify_dimension_images', $images_match[0] );
- Logger::debug( 'Specify Image Dimensions found ( ' . count( $images ) . ' ).', $images );
-
foreach ( $images as $image ) {
$image_url = $this->can_specify_dimensions_one_image( $image );
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Media/Lazyload/CSS/Subscriber.php b/web/app/plugins/wp-rocket/inc/Engine/Media/Lazyload/CSS/Subscriber.php
index 1e736d9b5..53ac6df4f 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Media/Lazyload/CSS/Subscriber.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Media/Lazyload/CSS/Subscriber.php
@@ -159,20 +159,10 @@ public static function get_subscribed_events() {
* @return string
*/
public function maybe_replace_css_images( string $html ): string {
-
if ( ! $this->context->is_allowed() ) {
return $html;
}
- $this->logger::debug(
- 'Starting lazyload',
- $this->generate_log_context(
- [
- 'data' => $html,
- ]
- )
- );
-
/**
* Generate lazyload CSS for the page.
*
@@ -187,26 +177,11 @@ public function maybe_replace_css_images( string $html ): string {
);
if ( ! key_exists( 'html', $output ) ) {
- $this->logger::debug(
- 'Lazyload bailed out',
- $this->generate_log_context(
- [
- 'data' => $html,
- ]
- )
- );
+ $this->logger::debug( 'Lazyload CSS bailed out' );
+
return $html;
}
- $this->logger::debug(
- 'Ending lazyload',
- $this->generate_log_context(
- [
- 'data' => $html,
- ]
- )
- );
-
$html = $this->add_meta_comment( 'lazyload_css_bg_img', $output['html'] );
return $html;
@@ -218,10 +193,6 @@ public function maybe_replace_css_images( string $html ): string {
* @return void
*/
public function clear_generated_css() {
- $this->logger::debug(
- 'Clear lazy CSS',
- $this->generate_log_context()
- );
$this->cache->clear();
}
@@ -302,7 +273,7 @@ public function create_lazy_css_files( array $data ): array {
if ( $this->is_excluded( $url ) ) {
$this->logger::debug(
- "Excluded lazy css files $url",
+ "Excluded lazy css file $url",
$this->generate_log_context()
);
continue;
@@ -310,15 +281,10 @@ public function create_lazy_css_files( array $data ): array {
$url_key = $this->format_url( $url );
if ( ! $this->cache->has( $url_key ) ) {
- $this->logger::debug(
- "Generate lazy css files $url",
- $this->generate_log_context()
- );
-
$file_mapping = $this->generate_css_file( $url );
if ( empty( $file_mapping ) ) {
$this->logger::debug(
- "Create lazy css files $url bailed out",
+ "Create lazy css file $url bailed out",
$this->generate_log_context()
);
continue;
@@ -327,10 +293,6 @@ public function create_lazy_css_files( array $data ): array {
$mapping = array_merge( $mapping, $file_mapping );
} else {
- $this->logger::debug(
- "Load lazy css files $url",
- $this->generate_log_context()
- );
$mapping = array_merge( $mapping, $this->load_existing_mapping( $url ) );
}
@@ -364,7 +326,6 @@ public function create_lazy_css_files( array $data ): array {
* @return array
*/
public function add_lazy_tag( array $data ): array {
-
if ( ! key_exists( 'html', $data ) || ! key_exists( 'lazyloaded_images', $data ) ) {
$this->logger::debug(
'Add lazy tag bailed out',
@@ -387,15 +348,7 @@ public function add_lazy_tag( array $data ): array {
*/
$loaded = apply_filters( 'rocket_css_image_lazyload_images_load', [], $lazyload_images );
- $tags = $this->tag_generator->generate( $lazyload_images, $loaded );
- $this->logger::debug(
- 'Add lazy tag generated',
- $this->generate_log_context(
- [
- 'data' => $tags,
- ]
- )
- );
+ $tags = $this->tag_generator->generate( $lazyload_images, $loaded );
$data['html'] = str_replace( '', "$tags", $data['html'] );
return $data;
@@ -655,15 +608,6 @@ protected function generate_asset_url( string $url ): string {
$cached_url = $this->cache->generate_url( $this->format_url( $url ) );
- $this->logger::debug(
- "Generated url lazy css files $url",
- $this->generate_log_context(
- [
- 'data' => $cached_url,
- ]
- )
- );
-
return add_query_arg( $queries, $cached_url );
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Optimization/Buffer/Optimization.php b/web/app/plugins/wp-rocket/inc/Engine/Optimization/Buffer/Optimization.php
index 356de4552..d155737a1 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Optimization/Buffer/Optimization.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Optimization/Buffer/Optimization.php
@@ -28,19 +28,6 @@ class Optimization extends Abstract_Buffer {
*/
protected $tests;
- /**
- * Constructor.
- *
- * @since 3.3
- *
- * @param Tests $tests Tests instance.
- */
- public function __construct( Tests $tests ) {
- parent::__construct( $tests );
-
- $this->log( 'OPTIMIZATION PROCESS STARTED.', [], 'info' );
- }
-
/** ----------------------------------------------------------------------------------------- */
/** CACHE =================================================================================== */
/** ----------------------------------------------------------------------------------------- */
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Optimization/GoogleFonts/Combine.php b/web/app/plugins/wp-rocket/inc/Engine/Optimization/GoogleFonts/Combine.php
index cd897894c..228cb9795 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Optimization/GoogleFonts/Combine.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Optimization/GoogleFonts/Combine.php
@@ -50,7 +50,6 @@ class Combine extends AbstractGFOptimization {
*/
public function optimize( $html ): string {
$this->font_urls = [];
- Logger::info( 'GOOGLE FONTS COMBINE PROCESS STARTED.', [ 'GF combine process' ] );
$html_nocomments = $this->hide_comments( $html );
$fonts = $this->find( '])+)?(?:\s+href\s*=\s*([\'"])(?(?:https?:)?\/\/fonts\.googleapis\.com\/css[^\d](?:(?!\1).)+)\1)(?:\s+[^>]*)?>', $html_nocomments );
@@ -76,14 +75,6 @@ function ( $font ) use ( $exclusions ) {
$num_fonts = count( $filtered_fonts );
- Logger::debug(
- "Found {$num_fonts} Google Fonts after exclusions.",
- [
- 'GF combine process',
- 'tags' => $filtered_fonts,
- ]
- );
-
$this->parse( $filtered_fonts );
if ( empty( $this->fonts ) ) {
@@ -98,14 +89,6 @@ function ( $font ) use ( $exclusions ) {
$html = str_replace( $font[0], '', $html );
}
- Logger::info(
- 'Google Fonts successfully combined.',
- [
- 'GF combine process',
- 'url' => $this->fonts . $this->subsets,
- ]
- );
-
return $html;
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Optimization/GoogleFonts/CombineV2.php b/web/app/plugins/wp-rocket/inc/Engine/Optimization/GoogleFonts/CombineV2.php
index c92ccffa3..ee73a5571 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Optimization/GoogleFonts/CombineV2.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Optimization/GoogleFonts/CombineV2.php
@@ -32,7 +32,6 @@ class CombineV2 extends AbstractGFOptimization {
*/
public function optimize( $html ): string {
$this->font_urls = [];
- Logger::info( 'GOOGLE FONTS COMBINE-V2 PROCESS STARTED.', [ 'GF combine process' ] );
$processed_tags = [];
$html_nocomments = $this->hide_comments( $html );
@@ -59,14 +58,6 @@ function ( $tag ) use ( $exclusions ) {
$num_tags = count( $filtered_tags );
- Logger::debug(
- "Found {$num_tags} v2 Google Fonts after exclusions.",
- [
- 'GF combine process',
- 'tags' => $filtered_tags,
- ]
- );
-
$families = [];
foreach ( $filtered_tags as $tag ) {
$parsed_families = $this->parse( $tag );
@@ -89,14 +80,6 @@ function ( $tag ) use ( $exclusions ) {
$html = str_replace( $font[0], '', $html );
}
- Logger::info(
- 'V2 Google Fonts successfully combined.',
- [
- 'GF combine process',
- 'url' => $combined_url,
- ]
- );
-
return $html;
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/CSS/AdminSubscriber.php b/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/CSS/AdminSubscriber.php
index 3fe7255c5..1bcd9e1e8 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/CSS/AdminSubscriber.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/CSS/AdminSubscriber.php
@@ -19,7 +19,7 @@ public static function get_subscribed_events() {
return [
"update_option_{$slug}" => [ 'clean_minify', 10, 2 ],
"pre_update_option_{$slug}" => [ 'regenerate_minify_css_key', 10, 2 ],
- 'wp_rocket_upgrade' => [ 'on_update', 16, 2 ],
+ 'wp_rocket_upgrade' => [ 'clear_cache_on_update_to_3_15', 16, 2 ],
'rocket_meta_boxes_fields' => [ 'add_meta_box', 1 ],
];
}
@@ -126,7 +126,7 @@ protected function did_setting_change( $setting, array $new, array $old ) { // p
*
* @return void
*/
- public function on_update( $new_version, $old_version ) {
+ public function clear_cache_on_update_to_3_15( $new_version, $old_version ) {
if ( version_compare( $old_version, '3.15', '>=' ) ) {
return;
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/CSS/Minify.php b/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/CSS/Minify.php
index 6e94222aa..0a2aee17a 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/CSS/Minify.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/CSS/Minify.php
@@ -26,8 +26,6 @@ class Minify extends AbstractCSSOptimization implements ProcessorInterface {
* @return string
*/
public function optimize( $html ) {
- Logger::info( 'CSS MINIFICATION PROCESS STARTED.', [ 'css minification process' ] );
-
$styles = $this->get_styles( $html );
if ( empty( $styles ) ) {
@@ -99,14 +97,6 @@ protected function get_styles( $html ) {
return [];
}
- Logger::debug(
- 'Found ' . count( $styles ) . ' `` tags.',
- [
- 'css minification process',
- 'tags' => $styles,
- ]
- );
-
return $styles;
}
@@ -141,14 +131,6 @@ private function replace_url( $url ) {
$minified_file = rawurldecode( $this->minify_base_path . $filename );
if ( rocket_direct_filesystem()->exists( $minified_file ) ) {
- Logger::debug(
- 'Minified CSS file already exists.',
- [
- 'css minification process',
- 'path' => $minified_file,
- ]
- );
-
return $this->get_full_minified_url( $minified_file, $this->get_minify_url( $filename, $url ) );
}
@@ -216,14 +198,6 @@ protected function replace_style( $style, $minify_url, $html ) {
$replace_style = str_replace( ' $minify_url,
- ]
- );
-
return $html;
}
@@ -251,13 +225,6 @@ protected function save_minify_file( $minified_file, $minified_content ) {
return false;
}
- Logger::debug(
- 'Minified CSS file successfully created.',
- [
- 'css minification process',
- 'path' => $minified_file,
- ]
- );
return true;
}
diff --git a/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/JS/Combine.php b/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/JS/Combine.php
index 2658ee4c3..a6f2fdc4c 100644
--- a/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/JS/Combine.php
+++ b/web/app/plugins/wp-rocket/inc/Engine/Optimization/Minify/JS/Combine.php
@@ -87,7 +87,6 @@ public function __construct(
* @return string
*/
public function optimize( $html ) {
- Logger::info( 'JS COMBINE PROCESS STARTED.', [ 'js combine process' ] );
$html_nocomments = $this->hide_comments( $html );
$scripts = $this->find( '', $html_nocomments );
@@ -97,14 +96,6 @@ public function optimize( $html ) {
return $html;
}
- Logger::debug(
- 'Found ' . count( $scripts ) . ' `