Merge pull request #198 from wp-media/branch-2.8.16

2.8.16
wp-media · Oct 10, 2016 · eee1a2a · eee1a2a
2 parents f36e203 + aff6baa
commit eee1a2a
Show file tree

Hide file tree

Showing 55 changed files with 5,136 additions and 588 deletions.
diff --git a/inc/admin/options.php b/inc/admin/options.php
@@ -988,24 +988,28 @@ function rocket_after_save_options( $oldvalue, $value ) {
 
 	// Update CloudFlare Development Mode
 	if ( ! empty( $_POST ) && ( $oldvalue['cloudflare_devmode'] != $value['cloudflare_devmode'] ) ) {
-		set_rocket_cloudflare_devmode( (bool) $value['cloudflare_devmode'] );
+		set_rocket_cloudflare_devmode( $value['cloudflare_devmode'] );
 	}
 
 	// Update CloudFlare settings
 	if ( ! empty( $_POST ) && ( $oldvalue['cloudflare_auto_settings'] != $value['cloudflare_auto_settings'] ) ) {		
 		$cf_old_settings = explode( ',', $value['cloudflare_old_settings'] );
 
 		// Set Cache Level to Aggressive 
-		$cf_cache_lvl = ( isset( $cf_old_settings[0] ) && $value['cloudflare_auto_settings'] == 0 ) ? $cf_old_settings[0] : 'agg';
-		set_rocket_cloudflare_cache_lvl( $cf_cache_lvl );
+		$cf_cache_level = ( isset( $cf_old_settings[0] ) && $value['cloudflare_auto_settings'] == 0 ) ? $cf_old_settings[0] : 'aggressive';
+		set_rocket_cloudflare_cache_level( $cf_cache_level );
 
 		// Active Minification for HTML, CSS & JS
-		$cf_minify = ( isset( $cf_old_settings[1] ) && $value['cloudflare_auto_settings'] == 0 ) ? $cf_old_settings[1] : 7;
+		$cf_minify = ( isset( $cf_old_settings[1] ) && $value['cloudflare_auto_settings'] == 0 ) ? $cf_old_settings[1] : 'on';
 		set_rocket_cloudflare_minify( $cf_minify );
 
 		// Deactivate Rocket Loader to prevent conflicts
-		$cf_async = ( isset( $cf_old_settings[2] ) && $value['cloudflare_auto_settings'] == 0 ) ? $cf_old_settings[2] : false;
-		set_rocket_cloudflare_async( $cf_async );
+		$cf_rocket_loader = ( isset( $cf_old_settings[2] ) && $value['cloudflare_auto_settings'] == 0 ) ? $cf_old_settings[2] : 'off';
+		set_rocket_cloudflare_rocket_loader( $cf_rocket_loader );
+
+        // Set Browser cache to 1 month
+		$cf_browser_cache_ttl = ( isset( $cf_old_settings[3] ) && $value['cloudflare_auto_settings'] == 0 ) ? $cf_old_settings[3] : '2678400';
+		set_rocket_cloudflare_browser_cache_ttl( $cf_browser_cache_ttl );
 	}
 
 	// Regenerate advanced-cache.php file
@@ -1088,7 +1092,6 @@ function rocket_pre_main_option( $newvalue, $oldvalue ) {
 	// Save old CloudFlare settings
 	if ( ( isset( $newvalue['cloudflare_auto_settings'], $oldvalue['cloudflare_auto_settings'] ) && $newvalue['cloudflare_auto_settings'] != $oldvalue['cloudflare_auto_settings'] && $newvalue['cloudflare_auto_settings'] == 1 ) ) {
 		$cf_settings = get_rocket_cloudflare_settings();
-		$cf_settings = array( $cf_settings->cache_lvl, (int) $cf_settings->minify, ! is_string( $cf_settings->async ) ? (int) $cf_settings->async : $cf_settings->async );
 		$cf_settings = array_filter( $cf_settings );
 
 		$newvalue['cloudflare_old_settings'] = ( isset ( $cf_settings ) ) ? implode( ',' , $cf_settings ) : '';
@@ -1187,4 +1190,4 @@ function rocket_database_count_cleanup_items( $type ) {
     }
 
     return $count;
- }
+}
diff --git a/inc/admin/ui/modules/cdn.php b/inc/admin/ui/modules/cdn.php
@@ -2,18 +2,19 @@
 defined( 'ABSPATH' ) or die( 'Cheatin\' uh?' );
 
 add_settings_section( 'rocket_display_cdn_options', __( 'Content Delivery Network options', 'rocket' ), '__return_false', 'rocket_cdn' );
-add_settings_field(
-	'rocket_do_cloudflare',
-	'CloudFlare',
-	'rocket_field',
-	'rocket_cdn',
-	'rocket_display_cdn_options',
-	array(
+$cloudflare_readonly = '';
+
+if ( phpversion() < '5.4' ) {
+    $cloudflare_readonly = '1';
+}
+
+$rocket_do_cloudflare_settings = array(
 		array(
 			'type'         => 'checkbox',
 			'label'        => __( 'Enable CloudFlare settings tab.', 'rocket' ),
 			'label_for'    => 'do_cloudflare',
-			'label_screen' => 'CloudFlare'
+			'label_screen' => 'CloudFlare',
+			'readonly'     => $cloudflare_readonly,
 		),
 		array(
 			'type' 		  => 'helper_description',
@@ -24,9 +25,26 @@
 			'type' 		  => 'helper_description',
 			'name' 		  => 'rocket_do_cloudflare',
 			'description' => __( '<strong>Note:</strong> If you are using CloudFlare, configure the options in the CloudFlare tab. The CDN settings below <strong>do not apply</strong> to CloudFlare.', 'rocket' )
-		)
-	)
+		),
+	);
+
+if ( phpversion() < '5.4' ) {
+    $rocket_do_cloudflare_settings[] = array(
+        'type' => 'helper_warning',
+        'name' => 'rocket_cloudflare_warning',
+        'description' => __( 'Your PHP version is lower than to 5.4, so the CloudFlare functionality is not available. We recommend upgrading to a more recent version of PHP, like 5.6 or higher.', 'rocket' )
+    );
+}
+
+add_settings_field(
+	'rocket_do_cloudflare',
+	'CloudFlare',
+	'rocket_field',
+	'rocket_cdn',
+	'rocket_display_cdn_options',
+	$rocket_do_cloudflare_settings
 );
+
 add_settings_field(
 	'rocket_cdn',
 	__( 'CDN:', 'rocket' ),

diff --git a/inc/admin/ui/modules/cloudflare.php b/inc/admin/ui/modules/cloudflare.php
@@ -29,7 +29,7 @@
 		array(
 			'type'         => 'text',
 			'label_for'    => 'cloudflare_api_key',
-			'label_screen' => __( 'API Key', 'rocket' ),
+			'label_screen' => __( 'Global API Key', 'rocket' ),
 		),
 		array(
 			'type' 		   => 'helper_description',

diff --git a/inc/admin/upgrader.php b/inc/admin/upgrader.php
@@ -135,7 +135,7 @@ function rocket_first_install() {
 			'cloudflare_devmode'          => 0,
 			'cloudflare_protocol_rewrite' => 0,
 			'cloudflare_auto_settings'    => 0,
-			'cloudflare_old_settings'     => 0,
+			'cloudflare_old_settings'     => '',
 			'varnish_auto_purge'          => 0,
 			'do_beta'                     => 0,
 		)
@@ -288,4 +288,19 @@ function rocket_new_upgrade( $wp_rocket_version, $actual_version ) {
 
 		update_option( WP_ROCKET_SLUG, $options );
 	}
+
+    // Deactivate CloudFlare completely if PHP Version is lower than 5.4
+    if ( version_compare( $actual_version, '2.8.16', '<' ) && phpversion() < '5.4' ) {
+        $options                                = get_option( WP_ROCKET_SLUG );
+        $options['do_cloudflare']               = 0;
+        $options['cloudflare_email']            = '';
+		$options['cloudflare_api_key']          = '';
+		$options['cloudflare_domain']           = '';
+		$options['cloudflare_devmode']          = 0;
+		$options['cloudflare_protocol_rewrite'] = 0;
+		$options['cloudflare_auto_settings']    = 0;
+		$options['cloudflare_old_settings']     = '';
+
+        update_option( WP_ROCKET_SLUG, $options );
+    }
 }
diff --git a/inc/api/cloudflare.php b/inc/api/cloudflare.php