Inspection of "mention W3TC might be blocking AO re-activation in..." - futtta/autoptimize - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( b0a8a8...1c95ce )

by frank

created 2017-06-29 11:06 UTC

Status

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -345,8 +345,8 @@  discard block
 block discarded – undo
 		</td>
 	</tr>
 	<?php
-		if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
-			?>
+        if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
+            ?>
 				<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
 					<th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th>
 					<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/>
@@ -354,8 +354,8 @@  discard block
 block discarded – undo
 					</td>
 				</tr>
 			<?php
-		}
-	?>
+        }
+    ?>
 </table>
 </li>
 

Please login to merge, or discard this patch.

config/default.php 1 patch

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -2,9 +2,9 @@  discard block
 block discarded – undo
 
 //Check everything exists before using it
 if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
+    $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
 if(!isset($_SERVER['HTTP_USER_AGENT']))
-	$_SERVER['HTTP_USER_AGENT'] = '';
+    $_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -15,20 +15,20 @@  discard block
 block discarded – undo
 
 // Check for buggy versions of Internet Explorer
 if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') && 
-	preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
+    preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
 {
-	$version = floatval($matches[1]);
+    $version = floatval($matches[1]);
 	
-	if ($version < 6)
-		$encoding = 'none';
+    if ($version < 6)
+        $encoding = 'none';
 		
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
-		$encoding = 'none';
+    if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
+        $encoding = 'none';
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
 if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
-	$encoding = 'none';
+    $encoding = 'none';
 
 //Get data
 $contents = file_get_contents(__FILE__.'.'.$encoding);
@@ -41,24 +41,24 @@  discard block
 block discarded – undo
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
 if (($modTimeMatch)||($eTagMatch)) {
-	header('HTTP/1.1 304 Not Modified');
-	header('Connection: close');
+    header('HTTP/1.1 304 Not Modified');
+    header('Connection: close');
 } else {
-	// send all sorts of headers
-	$expireTime=60*60*24*356; // 1y max according to RFC
+    // send all sorts of headers
+    $expireTime=60*60*24*356; // 1y max according to RFC
 
-	if(isset($encoding) && $encoding != 'none') 
-	{
-		header('Content-Encoding: '.$encoding);
-	}
-	header('Vary: Accept-Encoding');
-	header('Content-Length: '.strlen($contents));
-	header('Content-type: %%CONTENT%%; charset=utf-8');
-	header('Cache-Control: max-age='.$expireTime.', public, immutable');
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years
-	header('ETag: ' . $eTag);
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
+    if(isset($encoding) && $encoding != 'none') 
+    {
+        header('Content-Encoding: '.$encoding);
+    }
+    header('Vary: Accept-Encoding');
+    header('Content-Length: '.strlen($contents));
+    header('Content-type: %%CONTENT%%; charset=utf-8');
+    header('Cache-Control: max-age='.$expireTime.', public, immutable');
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years
+    header('ETag: ' . $eTag);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 	
-	// send output
-	echo $contents;
+    // send output
+    echo $contents;
 }

Please login to merge, or discard this patch.

config/delayed.php 1 patch

Indentation +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -2,9 +2,9 @@  discard block
 block discarded – undo
 
 //Check everything exists before using it
 if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
+    $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
 if(!isset($_SERVER['HTTP_USER_AGENT']))
-	$_SERVER['HTTP_USER_AGENT'] = '';
+    $_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -15,30 +15,30 @@  discard block
 block discarded – undo
 
 // Check for buggy versions of Internet Explorer
 if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') && 
-	preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
+    preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
 {
-	$version = floatval($matches[1]);
+    $version = floatval($matches[1]);
 	
-	if ($version < 6)
-		$encoding = 'none';
+    if ($version < 6)
+        $encoding = 'none';
 		
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
-		$encoding = 'none';
+    if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
+        $encoding = 'none';
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
 if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
-	$encoding = 'none';
+    $encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
 {
-	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
-	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
+    $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
+    $code = file_get_contents(__FILE__.'.none');
+    $contents = gzencode($code,9,$flag);
 }else{
-	//Get data
-	$contents = file_get_contents(__FILE__.'.'.$encoding);
+    //Get data
+    $contents = file_get_contents(__FILE__.'.'.$encoding);
 }
 
 // first check if we have to send 304
@@ -51,35 +51,35 @@  discard block
 block discarded – undo
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
 if (($modTimeMatch)||($eTagMatch)) {
-	header('HTTP/1.1 304 Not Modified');
-	header('Connection: close');
+    header('HTTP/1.1 304 Not Modified');
+    header('Connection: close');
 } else {
-	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
-	if ($encoding != 'none') {
-		header('Content-Encoding: '.$encoding);
-	}
-	header('Vary: Accept-Encoding');
-	header('Content-Length: '.strlen($contents));
-	header('Content-type: %%CONTENT%%; charset=utf-8');
-	header('Cache-Control: max-age='.$expireTime.', public, immutable');
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
+    // send all sorts of headers
+    $expireTime=60*60*24*355; // 1y max according to RFC
+    if ($encoding != 'none') {
+        header('Content-Encoding: '.$encoding);
+    }
+    header('Vary: Accept-Encoding');
+    header('Content-Length: '.strlen($contents));
+    header('Content-type: %%CONTENT%%; charset=utf-8');
+    header('Cache-Control: max-age='.$expireTime.', public, immutable');
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
+    header('ETag: ' . $eTag);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
-	// send output
-	echo $contents;
+    // send output
+    echo $contents;
 
-	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
-	{
-		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+    //And write to filesystem cache if not done yet
+    if($encoding != 'none' && $iscompressed == false)
+    {
+        //Write the content we sent
+        file_put_contents(__FILE__.'.'.$encoding,$contents);
 		
-		//And write the new content
-		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
-		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
-	}
+        //And write the new content
+        $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
+        $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
+        $contents = gzencode($code,9,$flag);
+        file_put_contents(__FILE__.'.'.$ext,$contents);
+    }
 }

Please login to merge, or discard this patch.

classlesses/autoptimizeSpeedupper.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -88,13 +88,13 @@
 block discarded – undo
 }
 
 function ao_css_speedup_cleanup($cssin) {
-	// speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
-	return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
+    // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
+    return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
 }
 
 function ao_js_speedup_cleanup($jsin) {
-	// cleanup
-	return trim($jsin);
+    // cleanup
+    return trim($jsin);
 }
 
 add_filter('autoptimize_css_individual_style','ao_css_snippetcacher',10,2);

Please login to merge, or discard this patch.

		@@ -88,13 +88,13 @@
		block discarded – undo
88	88	}
89	89
90	90	function ao_css_speedup_cleanup($cssin) {
91		- // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
92		- return trim(str_replace(array('/FILESTART/','/FILESTART2/'),'',$cssin));
	91	+ // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
	92	+ return trim(str_replace(array('/FILESTART/','/FILESTART2/'),'',$cssin));
93	93	}
94	94
95	95	function ao_js_speedup_cleanup($jsin) {
96		- // cleanup
97		- return trim($jsin);
	96	+ // cleanup
	97	+ return trim($jsin);
98	98	}
99	99
100	100	add_filter('autoptimize_css_individual_style','ao_css_snippetcacher',10,2);

		@@ -345,8 +345,8 @@ discard block
		block discarded – undo
345	345	</td>
346	346	</tr>
347	347	<?php
348		- if ( function_exists("is_checkout") \|\| function_exists("is_cart") \|\| function_exists("edd_is_checkout") \|\| function_exists("wpsc_is_cart") \|\| function_exists("wpsc_is_checkout") ) {
349		- ?>
	348	+ if ( function_exists("is_checkout") \|\| function_exists("is_cart") \|\| function_exists("edd_is_checkout") \|\| function_exists("wpsc_is_cart") \|\| function_exists("wpsc_is_checkout") ) {
	349	+ ?>
350	350	<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
351	351	<th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th>
352	352	<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/>
		@@ -354,8 +354,8 @@ discard block
		block discarded – undo
354	354	</td>
355	355	</tr>
356	356	<?php
357		- }
358		- ?>
	357	+ }
	358	+ ?>
359	359	</table>
360	360	</li>
361	361

		@@ -2,9 +2,9 @@ discard block
		block discarded – undo
2	2
3	3	//Check everything exists before using it
4	4	if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
5		- $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
	5	+ $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
6	6	if(!isset($_SERVER['HTTP_USER_AGENT']))
7		- $_SERVER['HTTP_USER_AGENT'] = '';
	7	+ $_SERVER['HTTP_USER_AGENT'] = '';
8	8
9	9	// Determine supported compression method
10	10	$gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
		@@ -15,20 +15,20 @@ discard block
		block discarded – undo
15	15
16	16	// Check for buggy versions of Internet Explorer
17	17	if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') &&
18		- preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
	18	+ preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
19	19	{
20		- $version = floatval($matches[1]);
	20	+ $version = floatval($matches[1]);
21	21
22		- if ($version < 6)
23		- $encoding = 'none';
	22	+ if ($version < 6)
	23	+ $encoding = 'none';
24	24
25		- if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
26		- $encoding = 'none';
	25	+ if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
	26	+ $encoding = 'none';
27	27	}
28	28
29	29	//Some servers compress the output of PHP - Don't break in those cases
30	30	if(ini_get('output_handler') == 'ob_gzhandler' \|\| ini_get('zlib.output_compression') == 1)
31		- $encoding = 'none';
	31	+ $encoding = 'none';
32	32
33	33	//Get data
34	34	$contents = file_get_contents(__FILE__.'.'.$encoding);
		@@ -41,24 +41,24 @@ discard block
		block discarded – undo
41	41	$modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
42	42
43	43	if (($modTimeMatch)\|\|($eTagMatch)) {
44		- header('HTTP/1.1 304 Not Modified');
45		- header('Connection: close');
	44	+ header('HTTP/1.1 304 Not Modified');
	45	+ header('Connection: close');
46	46	} else {
47		- // send all sorts of headers
48		- $expireTime=606024*356; // 1y max according to RFC
	47	+ // send all sorts of headers
	48	+ $expireTime=606024*356; // 1y max according to RFC
49	49
50		- if(isset($encoding) && $encoding != 'none')
51		- {
52		- header('Content-Encoding: '.$encoding);
53		- }
54		- header('Vary: Accept-Encoding');
55		- header('Content-Length: '.strlen($contents));
56		- header('Content-type: %%CONTENT%%; charset=utf-8');
57		- header('Cache-Control: max-age='.$expireTime.', public, immutable');
58		- header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years
59		- header('ETag: ' . $eTag);
60		- header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
	50	+ if(isset($encoding) && $encoding != 'none')
	51	+ {
	52	+ header('Content-Encoding: '.$encoding);
	53	+ }
	54	+ header('Vary: Accept-Encoding');
	55	+ header('Content-Length: '.strlen($contents));
	56	+ header('Content-type: %%CONTENT%%; charset=utf-8');
	57	+ header('Cache-Control: max-age='.$expireTime.', public, immutable');
	58	+ header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years
	59	+ header('ETag: ' . $eTag);
	60	+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
61	61
62		- // send output
63		- echo $contents;
	62	+ // send output
	63	+ echo $contents;
64	64	}

futtta / autoptimize

Push — master ( b0a8a8...1c95ce )

Status

Category

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

Indentation +41 added lines, -41 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch