added cachebuster for admin

Author: AsyncAlchemist

cache-everything.php

@@ -3,13 +3,13 @@
  * Plugin Name: Cache Everything
  * Plugin URI: https://github.com/AsyncAlchemist
  * Description: A simple plugin to cache everything in Wordpress.
- * Version: 0.25
+ * Version: 0.26
  * Author: Taylor Selden
  * Author URI: https://github.com/AsyncAlchemist
  */
 define('CACHE_EVERYTHING_JS_URL', 'wp-content/plugins/cache-everything/js');
 define('CACHE_EVERYTHING_CSS_URL', 'wp-content/plugins/cache-everything/css');
-define('CACHE_EVERYTHING_VERSION', '0.25');
+define('CACHE_EVERYTHING_VERSION', '0.26');
 
 require_once(plugin_dir_path(__FILE__) . 'handle-js-request.php');
 require_once(plugin_dir_path(__FILE__) . 'handle-css-request.php');

handle-css-request.php

@@ -9,6 +9,14 @@ function cache_everything_handle_css_request() {
     if (get_query_var('cache_everything_css')) {
         header("Content-Type: text/css; charset=UTF-8");
 
+        // Cache control headers
+        $max_age = get_option('cache_everything_max_age', 604800); // Default to 1 week in seconds if not set
+        $stale_while_revalidate = get_option('cache_everything_stale_while_revalidate', 86400);
+        $expires_time = gmdate('D, d M Y H:i:s', time() + $max_age) . ' GMT'; // Calculate the Expires header value
+        header("Cache-Control: public, max-age=$max_age, stale-while-revalidate=$stale_while_revalidate"); // Use the max age from settings
+        header("Expires: $expires_time");
+        header("X-WCE-Cache: public, max-age=$max_age, stale-while-revalidate=$stale_while_revalidate");
+
         // Get all user rules
         $all_roles = cache_everything_get_role_slugs(); 
 

public/js/cache-everything.js

@@ -149,6 +149,44 @@ function isUser() {
     return window.wce_userRoles && window.wce_userRoles.status && window.wce_userRoles.status.toLowerCase() === 'user';
 }
 
+/**
+ * Checks if the user is an administrator and either rewrites every link on the page to use a cachebuster
+ * or reloads the current page with a cachebuster, depending on whether the WordPress admin bar is present.
+ * This function utilizes the isRole function to determine if the user has an administrator role.
+ * If the user is an administrator, the current page is not in the wp-admin directory, and the Elementor editor is not active,
+ * and if the wp-admin bar is not present, it reloads the current page with a cachebuster. Otherwise, it appends a timestamp
+ * as a query parameter to each link on the page to ensure the content is not served from cache.
+ */
+function rewriteLinksOrReloadForAdmin() {
+    const isEditorActive = document.querySelector('.elementor-editor-active') !== null;
+    const isWpAdminBarPresent = document.getElementById('wpadminbar') !== null;
+
+    debugPrint(`Checking admin role and page conditions for cachebuster application. Admin: ${isRole('administrator')}, WP Admin: ${window.location.href.includes('/wp-admin/')}, Editor Active: ${isEditorActive}, WP Admin Bar Present: ${isWpAdminBarPresent}`);
+
+    if (isRole('administrator') && !window.location.href.includes('/wp-admin/') && !isEditorActive) {
+        if (!isWpAdminBarPresent) {
+            // Reload the current page with a cachebuster if the wp-admin bar is not present
+            const currentUrl = window.location.href;
+            const hasQueryParams = currentUrl.includes('?');
+            const cachebusterUrl = `${currentUrl}${hasQueryParams ? '&' : '?'}cachebuster=${new Date().getTime()}`;
+            debugPrint(`Reloading page for admin without WP Admin Bar: ${cachebusterUrl}`);
+            window.location.href = cachebusterUrl;
+        } else {
+            // Get all the links on the page and append a cachebuster to each if the wp-admin bar is present
+            const links = document.querySelectorAll('a:not(#wpadminbar a)');
+            const timestamp = new Date().getTime();
+
+            links.forEach(link => {
+                const currentUrl = link.href;
+                const hasQueryParams = currentUrl.includes('?');
+                const newUrl = `${currentUrl}${hasQueryParams ? '&' : '?'}cachebuster=${timestamp}`;
+                link.href = newUrl;
+            });
+            debugPrint(`Appended cachebuster to links for admin with WP Admin Bar present.`);
+        }
+    }
+}
+
 /**
  * Checks if the specified role is included for the user, case-insensitively.
  * @param {string} roleName - The name of the role to check.
@@ -452,7 +490,10 @@ addScriptToDOM();
 // Check if the DOM is already loaded
 if (document.readyState === "loading") {
     document.addEventListener('DOMContentLoaded', setupPrefetching);
+    document.addEventListener('DOMContentLoaded', rewriteLinksOrReloadForAdmin);
+
 } else {
     // DOMContentLoaded has already fired, call the function directly
     setupPrefetching();
+    rewriteLinksOrReloadForAdmin();
 }