Changeset 3266664

Timestamp:

04/04/2025 02:50:12 AM (12 months ago)

Author:

etruel

Message:

3.5 Apr 3, 2025

Location:

flash-cache

Files:

• tags/3.5 (added)
• tags/3.5/README.md (added)
• tags/3.5/assets (added)
• tags/3.5/assets/css (added)
• tags/3.5/assets/css/icons.css (added)
• tags/3.5/assets/css/style.css (added)
• tags/3.5/assets/img (added)
• tags/3.5/assets/img/flash-cache-icon.png (added)
• tags/3.5/assets/js (added)
• tags/3.5/assets/js/settings.js (added)
• tags/3.5/can_create_cache.txt (added)
• tags/3.5/can_cron.txt (added)
• tags/3.5/flash_cache.php (added)
• tags/3.5/includes (added)
• tags/3.5/includes/cache.tpl (added)
• tags/3.5/includes/enviroment.php (added)
• tags/3.5/includes/functions.php (added)
• tags/3.5/includes/lib (added)
• tags/3.5/includes/lib/jsmin.php (added)
• tags/3.5/includes/notices.php (added)
• tags/3.5/includes/optimize_fonts.php (added)
• tags/3.5/includes/optimize_scripts.php (added)
• tags/3.5/includes/optimize_styles.php (added)
• tags/3.5/includes/patterns.php (added)
• tags/3.5/includes/plugin_functions.php (added)
• tags/3.5/includes/posts.php (added)
• tags/3.5/includes/preload.php (added)
• tags/3.5/includes/process.php (added)
• tags/3.5/includes/settings.php (added)
• tags/3.5/includes/version.php (added)
• tags/3.5/languages (added)
• tags/3.5/languages/flash-cache.pot (added)
• tags/3.5/readme.txt (added)
• tags/3.5/screenshot-1.jpg (added)
• tags/3.5/screenshot-2.jpg (added)
• trunk/flash_cache.php (modified) (6 diffs)
• trunk/includes/cache.tpl (modified) (1 diff)
• trunk/includes/functions.php (modified) (1 diff)
• trunk/includes/patterns.php (modified) (5 diffs)
• trunk/includes/process.php (modified) (38 diffs)
• trunk/includes/settings.php (modified) (16 diffs)
• trunk/readme.txt (modified) (2 diffs)

flash-cache/trunk/flash_cache.php

@@ -4 +4 @@
  * Plugin URI: https://flashcache.net
  * Description: Flash Cache is a plugin to really improve performance of Wordpress Websites. If you like it, please rate it 5 stars to allow us to improve its development.
- * Version: 3.4
+ * Version: 3.5
  * Author: Etruel Developments LLC
  * Author URI: https://etruel.com/
@@ -21 +21 @@
 // Plugin version
 if (!defined('FLASH_CACHE_VERSION')) {
-    define('FLASH_CACHE_VERSION', '3.4');
+    define('FLASH_CACHE_VERSION', '3.5');
 }
 
@@ -48 +48 @@
             self::$instance = new self();
             self::$instance->constants();
-            self::$instance->load_text_domain();
             self::$instance->hooks();
             self::$instance->includes();
@@ -111 +110 @@
         register_uninstall_hook(__FILE__, array(__CLASS__, 'uninstall'));
         add_action('permalink_structure_changed', 'flash_cache_changes_permalinks', 10, 2);
+        add_action('init', [self::$instance, 'load_textdomain'] );
+
     }
 
     /**
-     * Static function load_text_domain 
+     * Static function load_textdomain 
      * Load the text domain.
      * @access public
@@ -120 +121 @@
      * @since 1.0.0
      */
-    public static function load_text_domain() {
+    public static function load_textdomain() {
         // Set filter for plugin's languages directory
         $lang_dir    = dirname(plugin_basename(__FILE__)) . '/languages/';
         $lang_dir    = apply_filters('flash_cache_languages_directory', $lang_dir);
-
-        // Traditional WordPress plugin locale filter
-        $locale  = apply_filters('plugin_locale', get_locale(), 'flash-cache');
-        $mofile  = sprintf('%1$s-%2$s.mo', 'flash-cache', $locale);
-
-        // Setup paths to current locale file
-        $mofile_local    = $lang_dir . $mofile;
-        $mofile_global   = WP_LANG_DIR . '/flash-cache/' . $mofile;
-
-        if (file_exists($mofile_global)) {
-            // Look in global /wp-content/languages/flash_cache/ folder
-            load_textdomain('flash-cache', $mofile_global);
-        } elseif (file_exists($mofile_local)) {
-            // Look in local /wp-content/plugins/flash_cache/languages/ folder
-            load_textdomain('flash-cache', $mofile_local);
-        } else {
-            // Load the default language files
-            load_plugin_textdomain('flash-cache', false, $lang_dir);
-        }
+        load_plugin_textdomain('flash-cache', false, $lang_dir);
     }
 
@@ -214 +197 @@
 
 add_action('plugins_loaded', 'Flash_Cache_load');
-?>

flash-cache/trunk/includes/cache.tpl

@@ -27 +27 @@
     include $home_path.'index.php';
 }
-
-?>

flash-cache/trunk/includes/functions.php

@@ -834 +834 @@
     return isset($updated) ? $updated : false;
 }
-?>

flash-cache/trunk/includes/patterns.php

@@ -13 +13 @@
 
 class flash_cache_patterns {
+    
 
     /**
@@ -287 +288 @@
                     
                 </table>';
-        echo '<table class="form-table">
-                    
+                $advanced_settings = wp_parse_args(get_option('flash_cache_advanced_settings', array()), flash_cache_settings::default_advanced_options());
+                $values['cache_type'] = ($advanced_settings['disable_widget_cache'] == 1) ? 'php' : $values['cache_type'];
+                echo '<table class="form-table">
                     <tr valign="top">
                         <th scope="row">' . __('Cache Type', 'flash-cache') . '</th>
                         <td>
                             <div class="radio-group">
-                                <input type="radio" ' . checked($values['cache_type'], 'html', false) . ' name="cache_type" value="html"/>' . __('HTML static (Ultra fast)', 'flash-cache') . '
+                                <input type="radio" ' . 
+                                    checked($values['cache_type'], 'html', false) . 
+                                    ($advanced_settings['disable_widget_cache'] == 1 ? ' disabled' : '') . 
+                                    ' name="cache_type" value="html"/>' . 
+                                    __('HTML static (Ultra fast)', 'flash-cache') . '
                                 <p class="description">' . __('Create a cache in HTML format, in this way avoid the PHP execution in the front-end accelerating the load of the page, plus reducing the server CPU cost.', 'flash-cache') . '</p>
                             </div>
-
+                
                             <div class="radio-group">
-                            <input type="radio" ' . checked($values['cache_type'], 'php', false) . ' name="cache_type" value="php"/>' . __('PHP Files (Accept GET and POST params)', 'flash-cache') . '
+                                <input type="radio" ' . 
+                                    checked($values['cache_type'], 'php', false) . 
+                                    ' name="cache_type" value="php"/>' . 
+                                    __('PHP Files (Accept GET and POST params)', 'flash-cache') . '
                                 <p class="description">' . __('Create cache from pages which has parameters GET or POST like Feed or WordPress search; this option is less optimal than HTML static.', 'flash-cache') . '</p>
                             </div>
@@ -304 +313 @@
                     </tr>
                 </table>';
+                
         echo '<table class="form-table">
                     
@@ -323 +333 @@
                 </table></div>';
     }
+
 
     /**
@@ -545 +556 @@
 
 flash_cache_patterns::hooks();
-?>

flash-cache/trunk/includes/process.php

@@ -1 +1 @@
 <?php
+
 /**
  * @package         etruel\Flash Cache
@@ -13 +14 @@
 class flash_cache_process {
 
-    public static $origin_url            = null;
-    public static $template_redirect     = false;
-    public static $optional_post_id      = 0;
-    public static $current_query         = array();
-    public static $url_to_cache          = '';
-    public static $pattern               = null;
-    public static $cache_type            = 'html';
-    public static $first_ob_output       = true;
-    public static $current_buffer        = '';
-    public static $force_process_type    = null;
-    public static $force_permalink       = false;
-    public static $advanced_settings     = null;
-    public static $can_cache_handler     = null;
+    public static $origin_url         = null;
+    public static $template_redirect  = false;
+    public static $optional_post_id   = 0;
+    public static $current_query      = array();
+    public static $url_to_cache       = '';
+    public static $pattern            = null;
+    public static $cache_type         = 'html';
+    public static $first_ob_output    = true;
+    public static $current_buffer     = '';
+    public static $force_process_type = null;
+    public static $force_permalink    = false;
+    public static $advanced_settings  = null;
+    public static $can_cache_handler  = null;
 
     /* Added for validation in optimize process. */
@@ -44 +45 @@
      */
     public static function get_file_lock($path_file) {
-
         if (!file_exists($path_file)) {
             @mkdir($path_file, 0777, true);
@@ -56 +56 @@
         return flock(self::$can_cache_handler, LOCK_EX | LOCK_NB);
     }
-    
+
     public static function get_db_lock($path_file) {
         global $wpdb;
         $wpdb->query('SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE');
         $wpdb->query('START TRANSACTION');
-    
-        
+
         $option_lock = 'flash_cache_db_lock_' . hash('sha256', $path_file);
 
         $results = $wpdb->get_results(
                 $wpdb->prepare(
-                        "SELECT * FROM ". flash_cache_settings::$flash_cache_table ." WHERE option_lock = %s  LIMIT 0, 25 FOR UPDATE NOWAIT",
+                        "SELECT * FROM " . flash_cache_settings::$flash_cache_table . " WHERE option_lock = %s  LIMIT 0, 25 FOR UPDATE NOWAIT",
                         $option_lock
                 )
@@ -80 +79 @@
             $wpdb->query(
                     $wpdb->prepare(
-                            "INSERT INTO ". flash_cache_settings::$flash_cache_table ." (option_lock, option_value) VALUES(%s, 1)",
+                            "INSERT INTO " . flash_cache_settings::$flash_cache_table . " (option_lock, option_value) VALUES(%s, 1)",
                             $option_lock
                     )
-            ); 
+            );
         }
 
@@ -93 +92 @@
         return true;
     }
+
     /**
      * Static function can_create_cache
@@ -100 +100 @@
      */
     public static function start_create_cache($path_file) {
-
         $advanced_settings = flash_cache_get_advanced_settings();
         if (empty($advanced_settings)) {
@@ -143 +142 @@
         }
         $cache_dir = flash_cache_get_home_path() . self::$advanced_settings['cache_dir'];
-        $log_file = $cache_dir . flash_cache_get_server_name() . '/cache_debug.log';
+        $log_file  = $cache_dir . flash_cache_get_server_name() . '/cache_debug.log';
         if (!file_exists($cache_dir . flash_cache_get_server_name())) {
             @mkdir($cache_dir . flash_cache_get_server_name(), 0777, true);
         }
-        
+
         $request_URI = sanitize_url(wp_unslash($_SERVER['REQUEST_URI']));
-        
+
         // Convert arrays and objects to string
         if (is_array($message) || is_object($message)) {
             $message = print_r($message, true);
         }
-        
+
         $log_message = date('H:i:s') . " " . getmypid() . " {$request_URI} {$message}\n\r";
         error_log($log_message, 3, $log_file);
@@ -166 +165 @@
      */
     public static function cache_response_html($response, $url_to_cache) {
-        $defer_flash_cache_js    = '<script type="text/javascript">
+        $defer_flash_cache_js = '<script type="text/javascript">
         function flash_cache_onloadjs() {
         var pattern_minimum = ' . absint(self::$pattern['ttl_minimum']) . ';
@@ -183 +182 @@
         }
         </script>';
-        $response                = str_replace('</body>', $defer_flash_cache_js . '</body>', $response);
+        $response             = str_replace('</body>', $defer_flash_cache_js . '</body>', $response);
         return $response;
     }
 
     public static function create_cache_html() {
-        
         if (is_null(self::$origin_url)) {
             self::$origin_url = get_site_url(null, '/');
@@ -194 +192 @@
         self::$origin_url = flash_cache_sanitize_origin_url(self::$origin_url);
 
-        $advanced_settings   = flash_cache_get_advanced_settings();
-        $cache_dir           = flash_cache_get_home_path() . $advanced_settings['cache_dir'];
-        
-        // Delete initial path
-        $path        = str_replace(self::$origin_url, '', self::$url_to_cache);
-        $cache_path  = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
-        
-        
+        $advanced_settings = flash_cache_get_advanced_settings();
+        $cache_dir         = rtrim(flash_cache_get_home_path() . $advanced_settings['cache_dir'], '/') . '/';
+        $server_name       = trim(flash_cache_get_server_name(), '/');
+
+        if (empty($server_name)) {
+            error_log('Error: flash_cache_get_server_name() devolvió un valor vacío.');
+            $server_name = 'default';
+        }
+
+        if (filter_var(self::$url_to_cache, FILTER_VALIDATE_URL)) {
+            $parsed_url     = parse_url(self::$url_to_cache);
+            $host_to_remove = $parsed_url['host'] ?? '';
+            $relative_path  = str_replace($parsed_url['scheme'] . '://' . $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''), '', self::$url_to_cache);
+        } else {
+            preg_match('~flash_cache/([^/]+)/~', self::$url_to_cache, $matches);
+            $host_to_remove = $matches[1] ?? '';
+            $relative_path  = str_replace($host_to_remove, '', self::$url_to_cache);
+        }
+
+        $path       = trim(str_replace(self::$origin_url, '', $relative_path), '/');
+        $cache_path = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
+        $response   = flash_cache_get_content(self::$url_to_cache);
+
+        $parent_dir = $cache_dir . $server_name;
+        if (!file_exists($parent_dir)) {
+
+            @mkdir($parent_dir, 0777, true);
+        }
         if (!file_exists($cache_path)) {
+
             @mkdir($cache_path, 0777, true);
         }
+
+
         if (!self::start_create_cache($cache_path)) {
             self::end_create_cache();
             return false;
         }
-    
-        $response = flash_cache_get_content(self::$url_to_cache);
-    
+
+
+
+
+
         if (empty($response['response'])) {
             return;
         }
 
-
-
-        self::debug('Creating HTML cache file path:' . $path . ' -URL:' . self::$url_to_cache);
+        self::debug('Creating HTML cache file path:' . $path . ' - URL:' . self::$url_to_cache);
 
         $response['response'] = apply_filters('flash_cache_response_html', $response['response'], self::$url_to_cache);
@@ -224 +245 @@
         $gzip_html = gzencode($response['response']);
         file_put_contents($cache_path . 'index-cache.html', $response['response']);
-        file_put_contents($cache_path . 'index-cache.html.gz', gzencode($response['response']));
+        file_put_contents($cache_path . 'index-cache.html.gz', $gzip_html);
         flash_cache_increment_disk_usage(mb_strlen($response['response'], '8bit'));
         flash_cache_increment_disk_usage(mb_strlen($gzip_html, '8bit'));
+
         self::end_create_cache();
     }
 
     public static function create_cache_php() {
-        global  $wp_query;
+        global $wp_query;
         if (is_null(self::$origin_url)) {
             self::$origin_url = get_site_url(null, '/');
         }
-        self::$origin_url = flash_cache_sanitize_origin_url(self::$origin_url);
+        self::$origin_url  = flash_cache_sanitize_origin_url(self::$origin_url);
         $advanced_settings = wp_parse_args(get_option('flash_cache_advanced_settings', array()), flash_cache_settings::default_advanced_options());
-
-        $home_path   = flash_cache_get_home_path();
-        $cache_dir   = $home_path . $advanced_settings['cache_dir'];
-
-        $path = str_replace(self::$origin_url, '', self::$url_to_cache);
-
+        $home_path         = flash_cache_get_home_path();
+        $cache_dir         = $home_path . $advanced_settings['cache_dir'];
+
+        $parsed_url = parse_url(self::$url_to_cache);
+
+        $relative_url = str_replace($parsed_url['scheme'] . '://' . $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''), '', self::$url_to_cache);
+
+        $path       = str_replace(self::$origin_url, '', $relative_url);
         $cache_path = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
 
@@ -254 +278 @@
         }
 
+        $cache_template = apply_filters('flash_cache_template_file', FLASH_CACHE_PLUGIN_DIR . 'includes/' . 'cache.tpl', $advanced_settings);
+
         self::debug('Creating PHP cache file path:' . $path . ' - URL:' . self::$url_to_cache);
-        $template_php    = file_get_contents(FLASH_CACHE_PLUGIN_DIR . 'includes/cache.tpl');
-        $template_php    = str_replace('{home_path}', "'" . $home_path . "'", $template_php);
-        $template_php    = str_replace('{url_path}', "'" . self::$url_to_cache . "'", $template_php);
-        $template_php    = str_replace('{minimum_ttl}', self::$pattern['ttl_minimum'], $template_php);
-        $template_php    = str_replace('{maximum_ttl}', self::$pattern['ttl_maximum'], $template_php);
-
-        if (!file_exists($cache_path . 'index-cache.php')) {
-            file_put_contents($cache_path . 'index-cache.php', $template_php);
-            flash_cache_increment_disk_usage(mb_strlen($template_php, '8bit'));
-        }
-        $request_url = flash_cache_get_content_to_php(self::$url_to_cache);
+        $template_php = file_get_contents($cache_template);
+        $template_php = str_replace('{home_path}', "'" . $home_path . "'", $template_php);
+        $template_php = str_replace('{url_path}', "'" . self::$url_to_cache . "'", $template_php);
+        $template_php = str_replace('{minimum_ttl}', self::$pattern['ttl_minimum'], $template_php);
+        $template_php = str_replace('{maximum_ttl}', self::$pattern['ttl_maximum'], $template_php);
+        $request_url  = flash_cache_get_content_to_php(self::$url_to_cache);
+
         if (defined('FLASH_CACHE_NOT_USE_THIS_REQUEST')) {
             $request = hash('sha256', http_build_query(array()));
@@ -276 +298 @@
             @mkdir($cache_path . $request_path, 0777, true);
         }
-        $request_file_path   = $cache_path . $request_path . $request . '.html';
-        $header_file_path    = $cache_path . $request_path . $request . '.header';
+
+        if (!file_exists($cache_path . 'index-cache.php')) {
+            file_put_contents($cache_path . 'index-cache.php', $template_php);
+            flash_cache_increment_disk_usage(mb_strlen($template_php, '8bit'));
+        }
+
+        $request_file_path = $cache_path . $request_path . $request . '.html';
+        $header_file_path  = $cache_path . $request_path . $request . '.header';
 
         if (is_search() && $wp_query->post_count > 0) {
             file_put_contents($request_file_path, $request_url['response']);
             file_put_contents($header_file_path, $request_url['content_type']);
-        }elseif(!is_search()){
+        } elseif (!is_search()) {
             file_put_contents($request_file_path, $request_url['response']);
             file_put_contents($header_file_path, $request_url['content_type']);
@@ -293 +321 @@
 
     public static function process_cache_from_query($current_query, $opcional_url = '') {
-        
-        $current_url         = '';
-        $advanced_settings   = wp_parse_args(get_option('flash_cache_advanced_settings', array()), flash_cache_settings::default_advanced_options());
-
-        self::$cache_type    = 'html';
-        $create_cache        = false;
-        $args                = array('post_type' => 'flash_cache_patterns', 'orderby' => 'ID', 'order' => 'ASC', 'numberposts' => -1);
-        $patterns            = get_posts($args);
-        $is_post             = false;
+
+        $current_url       = '';
+        $advanced_settings = wp_parse_args(get_option('flash_cache_advanced_settings', array()), flash_cache_settings::default_advanced_options());
+
+        self::$cache_type = 'html';
+        $create_cache     = false;
+        $args             = array('post_type' => 'flash_cache_patterns', 'orderby' => 'ID', 'order' => 'ASC', 'numberposts' => -1);
+        $patterns         = get_posts($args);
+        $is_post          = false;
 
         // We validate if it is post
@@ -327 +355 @@
             $pattern = flash_cache_patterns::get_data($pt->ID);
 
-            $url_must_contain_array  = array();
-            $line_arr                = explode("\n", $pattern['url_must_contain']);
+            $url_must_contain_array = array();
+            $line_arr               = explode("\n", $pattern['url_must_contain']);
 
             foreach ($line_arr as $key => $value) {
@@ -337 +365 @@
             }
 
-            
+
             if (!empty($url_must_contain_array)) {
                 foreach ($url_must_contain_array as $km => $url_must_contain) {
@@ -346 +374 @@
             }
 
-            $url_not_contain_array   = array();
-            $line_arr                = explode("\n", $pattern['url_not_contain']);
+            $url_not_contain_array = array();
+            $line_arr              = explode("\n", $pattern['url_not_contain']);
 
             foreach ($line_arr as $key => $value) {
@@ -367 +395 @@
             if ($pattern['page_type']['single'] && ($current_query['is_single'] || $current_query['is_page']) && !$current_query['is_feed']) {
                 if (empty($pattern['page_type']['posts'])) {
-                    $create_cache        = true;
-                    self::$cache_type    = $pattern['cache_type'];
+                    $create_cache     = true;
+                    self::$cache_type = $pattern['cache_type'];
                     break;
                 } else {
                     foreach ($pattern['page_type']['posts'] as $pcpt => $pp) {
                         if ($pcpt == $post->post_type) {
-                            $create_cache        = true;
-                            self::$cache_type    = $pattern['cache_type'];
+                            $create_cache     = true;
+                            self::$cache_type = $pattern['cache_type'];
                             break;
                         }
@@ -383 +411 @@
 
             if ($pattern['page_type']['search'] && $current_query['is_search'] && !$current_query['is_feed']) {
-                $create_cache        = true;
-                self::$cache_type    = $pattern['cache_type'];
+                $create_cache     = true;
+                self::$cache_type = $pattern['cache_type'];
                 break;
             }
             if ($pattern['page_type']['archives'] && $current_query['is_archive'] && !$current_query['is_feed']) {
-                $create_cache        = true;
-                self::$cache_type    = $pattern['cache_type'];
+                $create_cache     = true;
+                self::$cache_type = $pattern['cache_type'];
                 break;
             }
             if ($pattern['page_type']['category'] && $current_query['is_category'] && !$current_query['is_feed']) {
-                $create_cache        = true;
-                self::$cache_type    = $pattern['cache_type'];
+                $create_cache     = true;
+                self::$cache_type = $pattern['cache_type'];
                 break;
             }
             if ($pattern['page_type']['tag'] && $current_query['is_tag'] && !$current_query['is_feed']) {
-                $create_cache        = true;
-                self::$cache_type    = $pattern['cache_type'];
+                $create_cache     = true;
+                self::$cache_type = $pattern['cache_type'];
                 break;
             }
             if ($pattern['page_type']['frontpage'] && $current_query['is_front_page']) {
-                $create_cache        = true;
-                self::$cache_type    = $pattern['cache_type'];
+                $create_cache     = true;
+                self::$cache_type = $pattern['cache_type'];
                 break;
             }
             if ($pattern['page_type']['home'] && $current_query['is_home']) {
-                $create_cache        = true;
-                self::$cache_type    = $pattern['cache_type'];
+                $create_cache     = true;
+                self::$cache_type = $pattern['cache_type'];
                 break;
             }
             if ($pattern['page_type']['author'] && $current_query['is_author'] && !$current_query['is_feed']) {
-                $create_cache        = true;
-                self::$cache_type    = $pattern['cache_type'];
+                $create_cache     = true;
+                self::$cache_type = $pattern['cache_type'];
                 break;
             }
             if ($pattern['page_type']['feed'] && $current_query['is_feed']) {
-                $create_cache        = true;
-                self::$cache_type    = $pattern['cache_type'];
+                $create_cache     = true;
+                self::$cache_type = $pattern['cache_type'];
                 break;
             }
@@ -425 +453 @@
 
         if ($create_cache) {
-
-
-
 
             self::$current_query = $current_query;
             self::$url_to_cache  = $current_url;
             self::$pattern       = $pattern;
-            
+
             $process_type = $advanced_settings['process_type'];
             if (!empty(self::$force_process_type)) {
@@ -438 +463 @@
             }
 
-            
-
             if ($create_cache) {
+
                 if ($process_type == 'ob_with_curl_request') {
+
                     ob_start(array(__CLASS__, 'ob_callback'));
                 } else {
@@ -455 +480 @@
 
     public static function process_patterns() {
-        
+
         if (isset($_COOKIE["flash_cache"]) || isset($_COOKIE["flash_cache_backend"])) {
             return true;
@@ -469 +494 @@
         }
 
-
-        $general_settings    = wp_parse_args(get_option('flash_cache_settings', array()), flash_cache_settings::default_general_options());
-        $advanced_settings   = wp_parse_args(get_option('flash_cache_advanced_settings', array()), flash_cache_settings::default_advanced_options());
+        $general_settings  = wp_parse_args(get_option('flash_cache_settings', array()), flash_cache_settings::default_general_options());
+        $advanced_settings = wp_parse_args(get_option('flash_cache_advanced_settings', array()), flash_cache_settings::default_advanced_options());
         if (!$general_settings['activate']) {
             return true;
@@ -538 +562 @@
         }
 
-        $p       = sanitize_text_field($_GET['p']);
-        $token   = sanitize_text_field($_GET['token']);
+        $p     = sanitize_text_field($_GET['p']);
+        $token = sanitize_text_field($_GET['token']);
 
         $checksum = hash('sha256', $p . wp_salt('nonce'));
@@ -554 +578 @@
         }
 
-        $url_parse       = parse_url($url);
-        $origin_parse    = parse_url(self::$origin_url);
+        $url_parse    = parse_url($url);
+        $origin_parse = parse_url(self::$origin_url);
         if ($url_parse['host'] != $origin_parse['host']) {
             exit;
@@ -561 +585 @@
 
         do_action('onload_cache_file', $url);
-        $advanced_settings   = wp_parse_args(get_option('flash_cache_advanced_settings', array()), flash_cache_settings::default_advanced_options());
-        $cache_dir           = flash_cache_get_home_path() . $advanced_settings['cache_dir'];
-        $path                = str_replace(self::$origin_url, '', $url);
-        $cache_path          = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
-        $cache_file          = $cache_path . 'index-cache.html';
+        $advanced_settings = wp_parse_args(get_option('flash_cache_advanced_settings', array()), flash_cache_settings::default_advanced_options());
+        $cache_dir         = flash_cache_get_home_path() . $advanced_settings['cache_dir'];
+        $path              = str_replace(self::$origin_url, '', $url);
+        $cache_path        = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
+        $cache_file        = $cache_path . 'index-cache.html';
         if (file_exists($cache_file)) {
             $cache_response = file_get_contents($cache_file);
@@ -580 +604 @@
             exit;
         } else {
-            $opcional_url                = self::$origin_url . $path;
-            $current_query               = flash_cache_get_var_javascript('current_query', $cache_response);
-            $current_query               = json_decode(base64_decode($current_query), true);
+            $opcional_url             = self::$origin_url . $path;
+            $current_query            = flash_cache_get_var_javascript('current_query', $cache_response);
+            $current_query            = json_decode(base64_decode($current_query), true);
             self::debug('Procesing a new pattern from onload_cache:' . var_export($current_query, true));
-            self::$force_process_type    = 'curl';
-            self::$optional_post_id      = flash_cache_get_var_javascript('flash_cache_optional_post_id', $cache_response);
+            self::$force_process_type = 'curl';
+            self::$optional_post_id   = flash_cache_get_var_javascript('flash_cache_optional_post_id', $cache_response);
             self::process_cache_from_query($current_query, $opcional_url);
         }
@@ -607 +631 @@
      */
     public static function create_cache_from_ob($buffer, $use_curl) {
-        self::$current_buffer    .= $buffer;
-        $new_cache               = true;
+        self::$current_buffer .= $buffer;
+        $new_cache            = true;
         if (!preg_match(apply_filters('flash_cache_end_of_tags', '/(<\/html>|<\/rss>|<\/feed>|<\/urlset|<\?xml)/i'), self::$current_buffer)) {
             // No closing html tag. Not caching.
@@ -639 +663 @@
         $advanced_settings = flash_cache_get_advanced_settings();
 
-        $cache_dir   = flash_cache_get_home_path() . $advanced_settings['cache_dir'];
-        $path        = self::get_path(self::$optional_post_id);
-        $cache_path  = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
+        $cache_dir  = flash_cache_get_home_path() . $advanced_settings['cache_dir'];
+        $path       = self::get_path(self::$optional_post_id);
+        $cache_path = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
 
         if (!self::start_create_cache($cache_path)) {
@@ -665 +689 @@
 
         $gzip_response = gzencode($response);
+        if (file_exists($cache_path . 'index-cache.html') && file_exists($cache_path . 'index-cache.html.gz')) {
+            return false;
+        }
         file_put_contents($cache_path . 'index-cache.html', $response);
         file_put_contents($cache_path . 'index-cache.html.gz', $gzip_response);
@@ -674 +701 @@
 
     public static function create_cache_ob_php($response, $use_curl) {
-        global  $wp_query;
+        global $wp_query;
         if (is_null(self::$origin_url)) {
             self::$origin_url = get_site_url(null, '/');
         }
-        self::$origin_url = flash_cache_sanitize_origin_url(self::$origin_url);
-        $advanced_settings   = flash_cache_get_advanced_settings();
-        $home_path           = flash_cache_get_home_path();
-        $cache_dir           = $home_path . $advanced_settings['cache_dir'];
-        $path                = self::get_path(self::$optional_post_id);
-        $cache_path          = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
+        self::$origin_url  = flash_cache_sanitize_origin_url(self::$origin_url);
+        $advanced_settings = flash_cache_get_advanced_settings();
+        $home_path         = flash_cache_get_home_path();
+        $cache_dir         = $home_path . $advanced_settings['cache_dir'];
+        $path              = self::get_path(self::$optional_post_id);
+        $cache_path        = trailingslashit($cache_dir . flash_cache_get_server_name() . '/' . $path);
+
         if (!file_exists($cache_path)) {
             @mkdir($cache_path, 0777, true);
@@ -693 +721 @@
 
         self::debug('Creating OB PHP cache file path:' . $path . ' - URL:' . self::$url_to_cache);
-        $template_php    = file_get_contents(FLASH_CACHE_PLUGIN_DIR . 'includes/cache.tpl');
-        $template_php    = str_replace('{home_path}', "'" . $home_path . "'", $template_php);
-        $template_php    = str_replace('{url_path}', "'" . self::$url_to_cache . "'", $template_php);
-        $template_php    = str_replace('{minimum_ttl}', self::$pattern['ttl_minimum'], $template_php);
-        $template_php    = str_replace('{maximum_ttl}', self::$pattern['ttl_maximum'], $template_php);
+
+        $cache_template = apply_filters('flash_cache_template_file', FLASH_CACHE_PLUGIN_DIR . 'includes/' . 'cache.tpl', $advanced_settings);
+
+        $template_php = file_get_contents($cache_template);
+        $template_php = str_replace('{home_path}', "'" . $home_path . "'", $template_php);
+        $template_php = str_replace('{url_path}', "'" . self::$url_to_cache . "'", $template_php);
+        $template_php = str_replace('{minimum_ttl}', self::$pattern['ttl_minimum'], $template_php);
+        $template_php = str_replace('{maximum_ttl}', self::$pattern['ttl_maximum'], $template_php);
 
         if (!file_exists($cache_path . 'index-cache.php')) {
@@ -717 +748 @@
             @mkdir($cache_path . $request_path, 0777, true);
         }
-        $request_file_path       = $cache_path . $request_path . $request . '.html';
-        $header_file_path        = $cache_path . $request_path . $request . '.header';
-        $current_content_type    = 'text/html; charset=UTF-8';
-        $headers                 = headers_list();
+        $request_file_path    = $cache_path . $request_path . $request . '.html';
+        $header_file_path     = $cache_path . $request_path . $request . '.header';
+        $current_content_type = 'text/html; charset=UTF-8';
+        $headers              = headers_list();
         foreach ($headers as $header) {
             if (stripos($header, 'Content-Type') !== FALSE) {
-                $headerParts             = explode(':', $header);
-                $current_content_type    = trim($headerParts[1]);
+                $headerParts          = explode(':', $header);
+                $current_content_type = trim($headerParts[1]);
                 break;
             }
@@ -732 +763 @@
             file_put_contents($request_file_path, $response);
             file_put_contents($header_file_path, $current_content_type);
-        }elseif(!is_search()){
+        } elseif (!is_search()) {
             file_put_contents($request_file_path, $response);
             file_put_contents($header_file_path, $current_content_type);
@@ -751 +782 @@
         $uri = '';
         if ($post_id != 0) {
-            $site_url    = site_url();
-            $permalink   = get_permalink($post_id);
+            $site_url  = site_url();
+            $permalink = get_permalink($post_id);
             if (false === strpos($permalink, $site_url)) {
 
@@ -782 +813 @@
             if ($process_type == 'ob_with_curl_request' && false === strpos(self::$url_to_cache, self::$origin_url)) {
                 $request_URI = sanitize_url(wp_unslash($_SERVER['REQUEST_URI']));
-                $uri = strtolower($request_URI);
+                $uri         = strtolower($request_URI);
             } else {
                 $uri = str_replace(self::$origin_url, '', self::$url_to_cache);
@@ -789 +820 @@
         return $uri;
     }
-
 }
 
 flash_cache_process::hooks();
-?>

flash-cache/trunk/includes/settings.php

@@ -69 +69 @@
                 'flash_cache_setting',
                 array(__CLASS__, 'general_settings_page'),
-                FLASH_CACHE_PLUGIN_URL . 'assets/img/flash-cache-icon.png', 29);
+                FLASH_CACHE_PLUGIN_URL . 'assets/img/flash-cache-icon.png',
+                29
+        );
         $page = add_submenu_page(
                 'flash_cache_setting',
@@ -81 +83 @@
 
     public static function all_WP_admin_styles() {
-        ?><style type="text/css">
+        ?>
+        <style type="text/css">
             #adminmenu .toplevel_page_flash_cache_setting .wp-menu-image img {
                 padding-top: 5px;
@@ -89 +92 @@
 
     public static function default_general_options() {
-        $array   = array(
+        $array = array(
             'activate' => false,
         );
-        $array   = apply_filters('flash_cache_default_general_options', $array);
+        $array = apply_filters('flash_cache_default_general_options', $array);
         return $array;
     }
@@ -163 +166 @@
 
     public static function default_advanced_options() {
-        $array   = array(
+        $array = array(
             'cache_dir'              => 'flash_cache/',
             'viewer_protocol_policy' => 'http_and_https',
@@ -183 +186 @@
             'avoid_optimize_text'    => '',
             'lock_type'              => 'file',
+            'disable_widget_cache'   => false,
         );
-        $array   = apply_filters('flash_cache_default_advanced_options', $array);
+        $array = apply_filters('flash_cache_default_advanced_options', $array);
         return $array;
     }
@@ -213 +217 @@
         if ($typenow == 'flash_cache_patterns') {
             ?>
-            <div class="clear"></div></div>
-            <div class="clear"></div></div>
-            <div class="clear"></div></div>
+            <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            </div>
             <?php
         }
@@ -226 +233 @@
             ?>
             </div> <!-- wpfooter fix -->
-            <div class="clear"></div></div>
-            <div class="clear"></div></div>
-            <div class="clear"></div></div>
+            <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            </div>
+            <div class="clear"></div>
+            </div>
             <div id="wpfooter" role="contentinfo">
             <?php
@@ -235 +245 @@
 
     public static function advanced_settings_page() {
-        $values                  = wp_parse_args(get_option('flash_cache_advanced_settings', array()), self::default_advanced_options());
+        $values = wp_parse_args(get_option('flash_cache_advanced_settings', array()), self::default_advanced_options());
 
         echo '<div class="wrap wpm_container show_menu"><div class="flash-wrap-notices"></div>
@@ -320 +330 @@
                         </td>
                     </tr>';
-            echo '
+        echo '<tr valign="top" class="wrap-row">
+                    <th scope="row">' . __('Disable Cache in Widgets', 'flash-cache') . '</th>
+                    <td>';
+
+        $nopro = '<p class="description">' . __('Widget cache disabling is available in the Pro version.', 'flash-cache') . '</p>';
+        echo apply_filters('flash_cache_disable_cache_option', $nopro, $values);
+
+        echo '</td>
+                </tr>';
+        echo '
                     <tr valign="top" class="wrap-row">
                         <th scope="row">' . __('Optimize styles', 'flash-cache') . '</th>
@@ -354 +373 @@
                                 </span>
                             </div>
-                            <p class="description">' . __('Optimize and combine all your JavaScript files into one, this allows your site to request fewer files and get better page load performance.', 'flash-cache') . '</p>
-                    ';
-        
+                            <p class="description">' . __('Optimize and combine all your JavaScript files into one, this allows your site to request fewer files and get better page load performance.', 'flash-cache') . '</p>';
+
         // new advanced options for javascripts 
         // since 3.1 version
@@ -429 +447 @@
                                 </table>
                             </div>';
-                            echo apply_filters('flash_cache_optimize_scripts_extra_html', '', $values) . ' 
+        
+        echo apply_filters('flash_cache_optimize_scripts_extra_html', '', $values) . ' 
+            
                         </td>
                     </tr>';
@@ -525 +545 @@
             }
         }
+
         /** Sanitize all inputs and only accept the valid settings */
         $post_values = flash_cache_sanitize_settings_deep(self::default_advanced_options(), $post_values);
-        
-        $new_options = wp_parse_args($post_values, self::default_advanced_options());
-        $new_options = apply_filters('flash_cache_check_advanced_settings', $new_options);
-        if($old_value_lock = flash_cache_get_option('lock_type')) {
+
+        $new_options    = wp_parse_args($post_values, self::default_advanced_options());
+        $new_options    = apply_filters('flash_cache_check_advanced_settings', $new_options);
+        if ($old_value_lock = flash_cache_get_option('lock_type')) {
             if ($old_value_lock != $new_options['lock_type']) {
                 $cache_dir = flash_cache_get_option('cache_dir');
-                if(isset($cache_dir) && $cache_dir != '/'){
+                if (isset($cache_dir) && $cache_dir != '/') {
                     $cache_dir = flash_cache_get_home_path() . $cache_dir;
                     flash_cache_delete_dir($cache_dir, true);
@@ -539 +560 @@
             }
         }
+
+
+        $new_options = apply_filters('flash_cache_save_advanced_options', $new_options, $post_values);
+
+        $redirect_url = apply_filters('flash_cache_save_advanced_redirect_url', sanitize_url($_POST['_wp_http_referer']));
+
         update_option('flash_cache_advanced_settings', $new_options);
+        // Update .htaccess file 
         flash_cache_update_htaccess();
+
+        // Adds new notice to notify the Saved Options.
         flash_cache_notices::add(__('Settings updated', 'flash-cache'));
-        wp_redirect(sanitize_url($_POST['_wp_http_referer']));
+        wp_redirect($redirect_url);
+
+        // Delete current cache by the new options 
+        $advanced_settings = wp_parse_args(get_option('flash_cache_advanced_settings', array()), self::default_advanced_options());
+        $cache_dir         = get_home_path() . $advanced_settings['cache_dir'];
+        flash_cache_delete_dir($cache_dir, true);
         exit;
+    }
+
+    public static function is_widget_cache_disabled() {
+        $flash_cache_advanced = get_option('flash_cache_advanced_settings');
+        return isset($flash_cache_advanced['disable_widget_cache']) && $flash_cache_advanced['disable_widget_cache'];
     }
 
@@ -560 +600 @@
             wp_die(__('Security check', 'flash-cache'));
         }
-        $advanced_settings   = wp_parse_args(get_option('flash_cache_advanced_settings', array()), self::default_advanced_options());
-        $cache_dir           = get_home_path() . $advanced_settings['cache_dir'];
+        $advanced_settings = wp_parse_args(get_option('flash_cache_advanced_settings', array()), self::default_advanced_options());
+        $cache_dir         = get_home_path() . $advanced_settings['cache_dir'];
         flash_cache_delete_dir($cache_dir, true);
         flash_cache_notices::add(__('The cache files have been deleted.', 'flash-cache'));
@@ -598 +638 @@
     public static function flash_cache_check_permalinks() {
         global $current_screen;
-        if (isset($current_screen->id) &&
-                ($current_screen->id == 'toplevel_page_flash_cache_setting' || $current_screen->id == 'options-permalink')
+        if( isset($current_screen->id) &&
+            ($current_screen->id == 'toplevel_page_flash_cache_setting' || $current_screen->id == 'options-permalink')
         ) {
             if (get_option('permalink_structure') == '') {
@@ -615 +655 @@
 
 flash_cache_settings::hooks();
-?>

flash-cache/trunk/readme.txt

@@ -1 +1 @@
 === Flash Cache ===
-Contributors: etruel, khaztiel, sniuk, Gerarjos14
+Contributors: etruel, khaztiel, Gerarjos14, sniuk
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7267TH4PT3GSW
 Tags: cache, performance, speed, optimize, wp cache
 Requires at least: 3.6
-Tested up to: 6.6
+Tested up to: 6.7.2
 Requires PHP: 5.6
-Stable tag: 3.4
+Stable tag: 3.5
 License: GPLv2 or later
 
@@ -92 +92 @@
 == Changelog ==
 
+= 3.5 Apr 3, 2025 =
+* Improved many some filters to allow pro version to be more efficient by avoiding caching widgets.
+* Fixes getting cache initial path on creating cache for special url of some files.
+* Fixes double compression some times serving zipped files.
+* Fixes Cache PHP mode to be used with avoid cache widgets feature of PRO Version. 
+* Fixed an issue to prevent WP framework to being loaded in caches generated on PHP mode.
+* Fixes bug Notice Function _load_textdomain_just_in_time was called incorrectly.
+
 = 3.4 Jul 25, 2024 =
 * Added compatibility with pro version to cache external fonts.