Merge pull request #107 from bluehost/file-based-and-extend-expirations

File based and extend expirations

Author: 0aveRyan

composer.json

@@ -40,6 +40,9 @@
   "scripts": {
     "lint": [
       "vendor/bin/phpcs endurance-page-cache.php --standard=Bluehost"
+    ],
+    "fix": [
+      "vendor/bin/phpcbf endurance-page-cache.php --standard=Bluehost"
     ]
   }
 }

endurance-page-cache.php

@@ -71,6 +71,13 @@ class Endurance_Page_Cache {
 		 */
 		public $cloudflare_tier = 'basic';
 
+		/**
+		 * File Based enabled
+		 *
+		 * @var bool
+		 */
+		public $file_based_enabled = false;
+
 		/**
 		 * Whether or not to force a purge.
 		 *
@@ -166,6 +173,7 @@ public function __construct() {
 			$this->cloudflare_enabled      = (bool) $cloudflare_state;
 			$this->cloudflare_tier         = ( is_numeric( $cloudflare_state ) && $cloudflare_state ) ? 'basic' : $cloudflare_state;
 			$this->udev_api_services['cf'] = $this->cloudflare_tier;
+			$this->file_based_enabled      = (bool) get_option( 'endurance_file_enabled', false === strpos( dirname( __FILE__ ), 'public_html' ) );
 
 			array_push( $this->cache_exempt, rest_get_url_prefix() );
 
@@ -359,7 +367,7 @@ public function to_snake_case( $value, $delimiter = '_' ) {
 		 * @return bool True if uses file system to cache
 		 */
 		public function use_file_cache() {
-			return false === strpos( dirname( __FILE__ ), 'public_html' );
+			return $this->file_based_enabled;
 		}
 
 		/**
@@ -1046,7 +1054,11 @@ public function htaccess_contents_rewrites( $rules ) {
 			$base      = wp_parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
 			$cache_url = $base . str_replace( get_option( 'home' ), '', WP_CONTENT_URL . '/endurance-page-cache' );
 			$cache_url = str_replace( '//', '/', $cache_url );
-			$additions = "<ifModule mod_headers.c>\n" . 'Header set X-Endurance-Cache-Level "' . $this->cache_level . '"' . "\n</ifModule>\n";
+			$additions = "\n
+				<ifModule mod_headers.c>\n" . '
+					Header set X-Endurance-Cache-Level "' . $this->cache_level . '"' . "\n" . '
+					Header set X-nginx-cache "WordPress"' . "\n
+				</ifModule>\n";
 
 			if ( $this->use_file_cache() ) {
 				$additions .= 'Options -Indexes ' . "\n" . '
@@ -1081,7 +1093,7 @@ public function htaccess_contents_expirations( $rules ) {
 				'text/css'        => '1 month',
 				'application/pdf' => '1 month',
 				'text/javascript' => '1 month',
-				'text/html'       => '5 minutes',
+				'text/html'       => '2 hours',
 			);
 
 			$file_types = wp_parse_args( get_option( 'epc_filetype_expirations', array() ), $default_files );
@@ -1288,7 +1300,7 @@ public function update_level_expirations( $level ) {
 						'text/css'        => '1 week',
 						'application/pdf' => '1 week',
 						'text/javascript' => '1 month',
-						'text/html'       => '4 hours',
+						'text/html'       => '8 hours',
 						'default'         => '1 week',
 					);
 					break;
@@ -1302,7 +1314,7 @@ public function update_level_expirations( $level ) {
 						'text/css'        => '24 hours',
 						'application/pdf' => '1 week',
 						'text/javascript' => '24 hours',
-						'text/html'       => '5 minutes',
+						'text/html'       => '2 hours',
 						'default'         => '24 hours',
 					);
 					break;