Changeset 3765447 for gt-performance/trunk/src/Admin/AdminModule.php

Timestamp:

10/26/2026 02:39:16 AM (3 hours ago)

Author:

gauravtiwari

Message:

Update to version 1.3.6 from GitHub

File:

• gt-performance/trunk/src/Admin/AdminModule.php (modified) (10 diffs)

gt-performance/trunk/src/Admin/AdminModule.php

@@ -45 +45 @@
 use GTPerformance\Redis\ObjectCacheInstaller;
 use GTPerformance\XCloud\EdgeOwnership;
+use GTPerformance\XCloud\EnterprisePurgeHook;
+use GTPerformance\XCloud\EnterprisePurgeModule;
 use GTPerformance\XCloud\SiteService;
 
@@ -750 +752 @@
                 $settings = Settings::all();
                 $before   = $settings;
+                if ( ( new EdgeOwnership() )->enterprisePurgeHookActive() ) {
+                        $this->redirect( 'gtperf_edge_owner_xcloud_hook', 'cloudflare' );
+                }
                 if ( ( new EdgeOwnership() )->xcloudOwnsEdge() ) {
                         $this->redirect( 'gtperf_edge_owner_conflict', 'cloudflare' );
@@ -1566 +1571 @@
                         );
                 }
+                if ( ( new EdgeOwnership() )->enterprisePurgeHookActive() ) {
+                        printf(
+                                '<div class="notice notice-info inline"><p>%s</p></div>',
+                                esc_html__( 'xCloud Cloudflare Enterprise serves this site: its automatic cache purge plugin is installed. GT Performance purges through xCloud, so this direct Cloudflare integration is paused and makes no API calls. Its settings are kept, and it resumes if the xCloud plugin is removed.', 'gt-performance' )
+                        );
+                }
                 $this->settingsFormOpen();
                 $this->panelOpen( __( 'Connection', 'gt-performance' ), __( 'A scoped token is safer. Global API Key authentication remains available for legacy accounts.', 'gt-performance' ) );
@@ -1962 +1973 @@
 
                 $this->settingsFormClose();
-                if ( ! empty( $settings['xcloud']['enabled'] ) ) {
+                if ( ! empty( $settings['xcloud']['enabled'] ) || ( new EnterprisePurgeHook() )->installed() ) {
                         $this->renderXcloudStatus( $settings );
                 }
@@ -2044 +2055 @@
                 $purge  = is_array( $purge ) ? $purge : array();
                 $conflict = ( new EdgeOwnership() )->hasDirectCloudflareConflict();
+                $hook     = new EnterprisePurgeHook();
+                $hookOn   = $hook->available();
+                $edge     = get_option( EnterprisePurgeModule::STATUS_OPTION, array() );
+                $edge     = is_array( $edge ) ? $edge : array();
+                $enterprise = ! empty( $xcloud['enterprise_available'] ) || $hookOn;
+                if ( $hookOn ) {
+                        $hookState = __( 'Automatic, through xCloud\'s cache purge plugin', 'gt-performance' );
+                } elseif ( $hook->installed() ) {
+                        $hookState = __( 'xCloud\'s plugin is installed but has no usable purge token', 'gt-performance' );
+                } else {
+                        $hookState = __( 'Manual: xCloud\'s automatic cache purge is not installed', 'gt-performance' );
+                }
+                $lastEdge = __( 'Never', 'gt-performance' );
+                if ( isset( $edge['created_at'] ) ) {
+                        $lastEdge = (string) $edge['created_at'] . ' (' . (string) ( $edge['status'] ?? '' ) . ')';
+                        if ( ! empty( $edge['origin_only'] ) ) {
+                                $lastEdge .= '; ' . sprintf(
+                                        /* translators: %s: number of pages. */
+                                        _n( '%s listing page cleared at the origin only', '%s listing pages cleared at the origin only', (int) $edge['origin_only'], 'gt-performance' ),
+                                        number_format_i18n( (int) $edge['origin_only'] )
+                                );
+                        }
+                }
                 ?>
                 <section class="gtp-panel">
@@ -2049 +2083 @@
                                 <div>
                                         <h3><?php esc_html_e( 'xCloud cache status', 'gt-performance' ); ?></h3>
-                                        <p><?php esc_html_e( 'Status is refreshed only on request. Enterprise settings and purge remain owned by the xCloud dashboard; GT Performance detects and reports the add-on.', 'gt-performance' ); ?></p>
+                                        <p><?php esc_html_e( 'Status is refreshed only on request. Enterprise settings stay in the xCloud dashboard. When xCloud\'s automatic cache purge plugin is installed, GT Performance purges Cloudflare Enterprise through it.', 'gt-performance' ); ?></p>
                                 </div>
                         </div>
@@ -2058 +2092 @@
                                 <div><dt><?php esc_html_e( 'Redis', 'gt-performance' ); ?></dt><dd><?php echo esc_html( ! empty( $xcloud['redis_enabled'] ) ? __( 'Enabled', 'gt-performance' ) : __( 'Disabled', 'gt-performance' ) ); ?></dd></div>
                                 <div><dt><?php esc_html_e( 'Object Cache Pro', 'gt-performance' ); ?></dt><dd><?php echo esc_html( ! empty( $xcloud['object_cache_pro'] ) ? __( 'Enabled', 'gt-performance' ) : __( 'Disabled', 'gt-performance' ) ); ?></dd></div>
-                                <div><dt><?php esc_html_e( 'Cloudflare Enterprise', 'gt-performance' ); ?></dt><dd><?php echo esc_html( ! empty( $xcloud['enterprise_available'] ) ? __( 'Active through xCloud', 'gt-performance' ) : __( 'Not detected', 'gt-performance' ) ); ?></dd></div>
+                                <div><dt><?php esc_html_e( 'Cloudflare Enterprise', 'gt-performance' ); ?></dt><dd><?php echo esc_html( $enterprise ? __( 'Active through xCloud', 'gt-performance' ) : __( 'Not detected', 'gt-performance' ) ); ?></dd></div>
+                                <div><dt><?php esc_html_e( 'Enterprise purge', 'gt-performance' ); ?></dt><dd><?php echo esc_html( $hookState ); ?></dd></div>
+                                <div><dt><?php esc_html_e( 'Last Enterprise purge', 'gt-performance' ); ?></dt><dd><?php echo esc_html( $lastEdge ); ?></dd></div>
                                 <div><dt><?php esc_html_e( 'Enterprise edge traffic (12h)', 'gt-performance' ); ?></dt><dd><?php echo esc_html( number_format_i18n( (int) ( $xcloud['enterprise_edge_requests'] ?? 0 ) ) . ' / ' . number_format_i18n( (int) ( $xcloud['enterprise_requests'] ?? 0 ) ) . ' (' . number_format_i18n( (float) ( $xcloud['enterprise_hit_percent'] ?? 0 ), 1 ) . '%)' ); ?></dd></div>
                                 <div><dt><?php esc_html_e( 'Free xCloud edge cache', 'gt-performance' ); ?></dt><dd><?php echo esc_html( ! empty( $xcloud['free_edge_cache_enabled'] ) ? __( 'Enabled', 'gt-performance' ) : __( 'Disabled', 'gt-performance' ) ); ?></dd></div>
@@ -2064 +2100 @@
                                 <div><dt><?php esc_html_e( 'Last xCloud purge', 'gt-performance' ); ?></dt><dd><?php echo esc_html( (string) ( $purge['created_at'] ?? __( 'Never', 'gt-performance' ) ) ); ?></dd></div>
                         </dl>
-                        <?php if ( $conflict || ! empty( $xcloud['enterprise_available'] ) ) : ?>
+                        <?php if ( $conflict || $enterprise ) : ?>
                                 <div class="gtp-guidance-list">
                                         <?php if ( $conflict ) : ?>
@@ -2072 +2108 @@
                                                 </div>
                                         <?php endif; ?>
-                                        <?php if ( ! empty( $xcloud['enterprise_available'] ) ) : ?>
+                                        <?php if ( $hookOn ) : ?>
+                                                <div class="gtp-callout gtp-callout--info" role="note">
+                                                        <strong><?php esc_html_e( 'Enterprise purge is automatic', 'gt-performance' ); ?></strong>
+                                                        <p><?php esc_html_e( 'Every GT Performance purge also clears Cloudflare Enterprise through xCloud: post saves and their related pages, the Purge button, scheduled purges, and WP-CLI. Direct Cloudflare is paused, because xCloud serves this site from its own Cloudflare zone.', 'gt-performance' ); ?></p>
+                                                </div>
+                                        <?php endif; ?>
+                                        <?php if ( $enterprise && ! $hookOn ) : ?>
                                                 <div class="gtp-callout gtp-callout--warning" role="note">
                                                         <strong><?php esc_html_e( 'Enterprise purge remains manual', 'gt-performance' ); ?></strong>
-                                                        <p><?php esc_html_e( 'Enterprise analytics are available through the API token, but its purge action currently requires an xCloud dashboard session. Automatic Enterprise purge is intentionally disabled until xCloud publishes a token-authenticated endpoint.', 'gt-performance' ); ?></p>
+                                                        <p><?php esc_html_e( 'xCloud\'s Public API does not expose an Enterprise purge. Install automatic cache purge from the site\'s Cloudflare Enterprise page in xCloud, and GT Performance will purge through it. Until then, purge from the xCloud dashboard.', 'gt-performance' ); ?></p>
                                                 </div>
+                                        <?php endif; ?>
+                                        <?php if ( $enterprise ) : ?>
                                                 <div class="gtp-callout gtp-callout--danger" role="note">
                                                         <strong><?php esc_html_e( 'Keep commerce HTML out of edge cache', 'gt-performance' ); ?></strong>
@@ -4119 +4163 @@
                         'gtperf_xcloud_json'          => array( __( 'xCloud returned an unreadable response. Try again in a moment.', 'gt-performance' ), 'error' ),
                         'gtperf_xcloud_api'           => array( __( 'xCloud rejected the request. Check the token scopes and team permissions.', 'gt-performance' ), 'error' ),
-                        'gtperf_xcloud_enterprise_purge_unavailable' => array( __( 'Cloudflare Enterprise purge is not available through the xCloud Public API token. Use the Purge control in the xCloud Enterprise dashboard.', 'gt-performance' ), 'warning' ),
+                        'gtperf_xcloud_enterprise_purge_unavailable' => array( __( 'Cloudflare Enterprise purge is not available through the xCloud Public API token. Install automatic cache purge from the site\'s Cloudflare Enterprise page in xCloud, or use the Purge control in the xCloud dashboard.', 'gt-performance' ), 'warning' ),
+                        'gtperf_edge_owner_xcloud_hook' => array( __( 'xCloud Cloudflare Enterprise serves this site, so direct Cloudflare is paused and no cache rule was synchronized. GT Performance purges through xCloud\'s automatic cache purge plugin instead.', 'gt-performance' ), 'info' ),
                         'gtperf_edge_owner_conflict'  => array( __( 'xCloud Cloudflare Enterprise is the active owner. Disable it or the direct Cloudflare integration before synchronizing another cache rule.', 'gt-performance' ), 'warning' ),
                         'xcloud-connected'         => array( __( 'xCloud site, host cache, and Cloudflare Enterprise status refreshed.', 'gt-performance' ), 'success' ),