futtta / autoptimize

config/default.php

Braces +13 added lines, -8 removed lines

@@ -1,10 +1,12 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+}
+if(!isset($_SERVER['HTTP_USER_AGENT'])) {
 	$_SERVER['HTTP_USER_AGENT'] = '';
+}
 	
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -19,16 +21,19 @@ 
 {
 	$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)
+if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) {
 	$encoding = 'none';
+}
 
 //Get data
 $contents = file_get_contents(__FILE__.'.'.$encoding);

Spacing +10 added lines, -10 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
@@ -27,28 +27,28 @@ 
 }
 
 //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)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 //Get data
 $contents = file_get_contents(__FILE__.'.'.$encoding);
 
 // first check if we have to send 304
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
 date_default_timezone_set("UTC");
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	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
+	$expireTime = 60*60*24*356; // 1y max according to RFC
 
-	if(isset($encoding) && $encoding != 'none') 
+	if (isset($encoding) && $encoding != 'none') 
 	{
 		header('Content-Encoding: '.$encoding);
 	}
@@ -57,7 +57,7 @@ 
 	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('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 	
 	// send output

config/delayed.php

Braces +14 added lines, -9 removed lines

@@ -1,10 +1,12 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+}
+if(!isset($_SERVER['HTTP_USER_AGENT'])) {
 	$_SERVER['HTTP_USER_AGENT'] = '';
+}
 	
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -19,16 +21,19 @@ 
 {
 	$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)
+if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) {
 	$encoding = 'none';
+}
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
@@ -36,7 +41,7 @@ 
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
 	$contents = gzencode($code,9,$flag);
-}else{
+} else{
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }

Spacing +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
@@ -27,16 +27,16 @@ 
 }
 
 //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)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
-if($encoding != 'none' && $iscompressed == false)
+if ($encoding != 'none' && $iscompressed == false)
 {
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
-}else{
+	$contents = gzencode($code, 9, $flag);
+} else {
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }
@@ -44,19 +44,19 @@ 
 // first check if we have to send 304
 // inspired by http://www.jonasjohn.de/snippets/php/caching.htm
 
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
 date_default_timezone_set("UTC");
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	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
+	$expireTime = 60*60*24*355; // 1y max according to RFC
 	if ($encoding != 'none') {
 		header('Content-Encoding: '.$encoding);
 	}
@@ -65,22 +65,22 @@ 
 	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('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
 	// send output
 	echo $contents;
 
 	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
+	if ($encoding != 'none' && $iscompressed == false)
 	{
 		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+		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);
+		$contents = gzencode($code, 9, $flag);
+		file_put_contents(__FILE__.'.'.$ext, $contents);
 	}
 }

classes/autoptimizeCache.php

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 class autoptimizeCache {
     private $filename;

Spacing +61 added lines, -61 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeCache {
     private $filename;
@@ -7,14 +7,14 @@ 
     private $cachedir;
     private $delayed;
     
-    public function __construct($md5,$ext='php') {
+    public function __construct($md5, $ext = 'php') {
         $this->cachedir = AUTOPTIMIZE_CACHE_DIR;
         $this->delayed = AUTOPTIMIZE_CACHE_DELAY;
         $this->nogzip = AUTOPTIMIZE_CACHE_NOGZIP;
-        if($this->nogzip == false) {
+        if ($this->nogzip == false) {
             $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.php';
         } else {
-            if (in_array($ext, array("js","css")))     {
+            if (in_array($ext, array("js", "css"))) {
                 $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
             } else {
                 $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
@@ -23,7 +23,7 @@ 
     }
     
     public function check() {
-        if(!file_exists($this->cachedir.$this->filename)) {
+        if (!file_exists($this->cachedir.$this->filename)) {
             // No cached file, sorry
             return false;
         }
@@ -32,8 +32,8 @@ 
     }
     
     public function retrieve() {
-        if($this->check()) {
-            if($this->nogzip == false) {
+        if ($this->check()) {
+            if ($this->nogzip == false) {
                 return file_get_contents($this->cachedir.$this->filename.'.none');
             } else {
                 return file_get_contents($this->cachedir.$this->filename);
@@ -42,48 +42,48 @@ 
         return false;
     }
     
-    public function cache($code,$mime) {
-        if($this->nogzip == false) {
+    public function cache($code, $mime) {
+        if ($this->nogzip == false) {
             $file = ($this->delayed ? 'delayed.php' : 'default.php');
             $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'/config/'.$file);
-            $phpcode = str_replace(array('%%CONTENT%%','exit;'),array($mime,''),$phpcode);
-            file_put_contents($this->cachedir.$this->filename,$phpcode, LOCK_EX);
-            file_put_contents($this->cachedir.$this->filename.'.none',$code, LOCK_EX);
-            if(!$this->delayed) {
+            $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode);
+            file_put_contents($this->cachedir.$this->filename, $phpcode, LOCK_EX);
+            file_put_contents($this->cachedir.$this->filename.'.none', $code, LOCK_EX);
+            if (!$this->delayed) {
                 // Compress now!
-                file_put_contents($this->cachedir.$this->filename.'.deflate',gzencode($code,9,FORCE_DEFLATE), LOCK_EX);
-                file_put_contents($this->cachedir.$this->filename.'.gzip',gzencode($code,9,FORCE_GZIP), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.deflate', gzencode($code, 9, FORCE_DEFLATE), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.gzip', gzencode($code, 9, FORCE_GZIP), LOCK_EX);
             }
         } else {
             // Write code to cache without doing anything else
-            file_put_contents($this->cachedir.$this->filename,$code, LOCK_EX);
+            file_put_contents($this->cachedir.$this->filename, $code, LOCK_EX);
             if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) {
                 // Create an additional cached gzip file
-                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code,9,FORCE_GZIP), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code, 9, FORCE_GZIP), LOCK_EX);
             }
         }
     }
     
     public function getname() {
-        apply_filters('autoptimize_filter_cache_getname',AUTOPTIMIZE_CACHE_URL.$this->filename);
+        apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename);
         return $this->filename;
     }
     
     static function clearall() {
-        if(!autoptimizeCache::cacheavail()) {
+        if (!autoptimizeCache::cacheavail()) {
             return false;
         }
     
         // scan the cachedirs        
-        foreach (array("","js","css") as $scandirName) {
+        foreach (array("", "js", "css") as $scandirName) {
             $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName);
         }
         
         // clear the cachedirs
         foreach ($scan as $scandirName=>$scanneddir) {
-            $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/";
-            foreach($scanneddir as $file) {
-                if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) {
+            $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/";
+            foreach ($scanneddir as $file) {
+                if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) {
                     @unlink($thisAoCacheDir.$file);
                 }
             }
@@ -98,15 +98,15 @@ 
                 do_action("autoptimize_action_cachepurged");
             }
         }
-        add_action("shutdown","autoptimize_do_cachepurged_action",11);
+        add_action("shutdown", "autoptimize_do_cachepurged_action", 11);
         
         // try to purge caching plugins cache-files?
         include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizePageCacheFlush.php');
-        add_action("autoptimize_action_cachepurged","autoptimize_flush_pagecache",10,0);
+        add_action("autoptimize_action_cachepurged", "autoptimize_flush_pagecache", 10, 0);
 
         // warm cache (part of speedupper)?
-        if ( apply_filters('autoptimize_filter_speedupper', true) ) {
-            $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000);
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
+            $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1, 100000);
             $warmCache = @wp_remote_get($warmCacheUrl);
             unset($warmCache);
         }
@@ -114,12 +114,12 @@ 
         return true;
     }
 
-    static function stats()    {
-        $AOstats=get_transient("autoptimize_stats");
+    static function stats() {
+        $AOstats = get_transient("autoptimize_stats");
 
         if (empty($AOstats)) {
             // Cache not available :(
-            if(!autoptimizeCache::cacheavail()) {
+            if (!autoptimizeCache::cacheavail()) {
                 return 0;
             }
             
@@ -128,28 +128,28 @@ 
             $size = 0;
             
             // scan the cachedirs        
-            foreach (array("","js","css") as $scandirName) {
+            foreach (array("", "js", "css") as $scandirName) {
                 $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName);
             }
             
             foreach ($scan as $scandirName=>$scanneddir) {
-                $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/";
-                foreach($scanneddir as $file) {
-                    if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) {
-                        if(is_file($thisAoCacheDir.$file)) {
-                            if(AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file,'.js') !== false || strpos($file,'.css') !== false || strpos($file,'.img') !== false || strpos($file,'.txt') !== false )) {
+                $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/";
+                foreach ($scanneddir as $file) {
+                    if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) {
+                        if (is_file($thisAoCacheDir.$file)) {
+                            if (AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file, '.js') !== false || strpos($file, '.css') !== false || strpos($file, '.img') !== false || strpos($file, '.txt') !== false)) {
                                 $count++;
-                            } elseif(!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file,'.none') !== false) {
+                            } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file, '.none') !== false) {
                                 $count++;
                             }
-                            $size+=filesize($thisAoCacheDir.$file);
+                            $size += filesize($thisAoCacheDir.$file);
                         }
                     }
                 }
             }
-            $AOstats=array($count,$size,time());
-            if ($count>100) {
-                set_transient( "autoptimize_stats", $AOstats, apply_filters( 'autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS ) );
+            $AOstats = array($count, $size, time());
+            if ($count > 100) {
+                set_transient("autoptimize_stats", $AOstats, apply_filters('autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS));
             }
         }
         // print the number of instances
@@ -157,36 +157,36 @@ 
     }    
 
     static function cacheavail() {
-        if(!defined('AUTOPTIMIZE_CACHE_DIR')) {
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
             // We didn't set a cache
             return false;
         }
         
-        foreach (array("","js","css") as $checkDir) {
-            if(!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) {
+        foreach (array("", "js", "css") as $checkDir) {
+            if (!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) {
                 return false;
             }
         }
         
         /** write index.html here to avoid prying eyes */
-        $indexFile=AUTOPTIMIZE_CACHE_DIR.'/index.html';
-        if(!is_file($indexFile)) {
-            @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
+        $indexFile = AUTOPTIMIZE_CACHE_DIR.'/index.html';
+        if (!is_file($indexFile)) {
+            @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
         }
 
         /** write .htaccess here to overrule wp_super_cache */
-        $htAccess=AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
-        if(!is_file($htAccess)) {
+        $htAccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
+        if (!is_file($htAccess)) {
             /** 
              * create wp-content/AO_htaccess_tmpl with 
              * whatever htaccess rules you might need
              * if you want to override default AO htaccess
              */
-            $htaccess_tmpl=WP_CONTENT_DIR."/AO_htaccess_tmpl";
+            $htaccess_tmpl = WP_CONTENT_DIR."/AO_htaccess_tmpl";
             if (is_file($htaccess_tmpl)) { 
-                $htAccessContent=file_get_contents($htaccess_tmpl);
+                $htAccessContent = file_get_contents($htaccess_tmpl);
             } else if (is_multisite() || AUTOPTIMIZE_CACHE_NOGZIP == false) {
-                $htAccessContent='<IfModule mod_expires.c>
+                $htAccessContent = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
         ExpiresByType text/javascript A30672000
@@ -212,7 +212,7 @@ 
     </Files>
 </IfModule>';
             } else {
-                $htAccessContent='<IfModule mod_expires.c>
+                $htAccessContent = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
         ExpiresByType text/javascript A30672000
@@ -238,7 +238,7 @@ 
     </Files>
 </IfModule>';
             }
-            @file_put_contents($htAccess,$htAccessContent);
+            @file_put_contents($htAccess, $htAccessContent);
         }
 
         // All OK
@@ -247,22 +247,22 @@ 
 
     static function checkCacheDir($dir) {
         // Check and create if not exists
-        if(!file_exists($dir))    {
-            @mkdir($dir,0775,true);
-            if(!file_exists($dir))    {
+        if (!file_exists($dir)) {
+            @mkdir($dir, 0775, true);
+            if (!file_exists($dir)) {
                 return false;
             }
         }
 
         // check if we can now write
-        if(!is_writable($dir))    {
+        if (!is_writable($dir)) {
             return false;
         }
 
         // and write index.html here to avoid prying eyes
-        $indexFile=$dir.'/index.html';
-        if(!is_file($indexFile)) {
-            @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
+        $indexFile = $dir.'/index.html';
+        if (!is_file($indexFile)) {
+            @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
         }
         
         return true;

classes/autoptimizeHTML.php

Braces +7 added lines, -3 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 class autoptimizeHTML extends autoptimizeBase {
     private $keepcomments = false;
@@ -26,8 +29,9 @@ 
     //Joins and optimizes CSS
     public function minify() {
         $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content );
-        if ($noptimizeHTML)
-            return false;
+        if ($noptimizeHTML) {
+                    return false;
+        }
         
         if(class_exists('Minify_HTML')) {
             // wrap the to-be-excluded strings in noptimize tags

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeHTML extends autoptimizeBase {
     private $keepcomments = false;
@@ -10,13 +10,13 @@ 
         $this->keepcomments = (bool) $options['keepcomments'];
         
         // filter to force xhtml
-        $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false );
+        $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false);
         
         // filter to add strings to be excluded from HTML minification
-        $excludeHTML = apply_filters( 'autoptimize_filter_html_exclude','' );
-        if ($excludeHTML!=="") {
-            $exclHTMLArr = array_filter(array_map('trim',explode(",",$excludeHTML)));
-            $this->exclude = array_merge($exclHTMLArr,$this->exclude);
+        $excludeHTML = apply_filters('autoptimize_filter_html_exclude', '');
+        if ($excludeHTML !== "") {
+            $exclHTMLArr = array_filter(array_map('trim', explode(",", $excludeHTML)));
+            $this->exclude = array_merge($exclHTMLArr, $this->exclude);
         }
         
         // Nothing else for HTML
@@ -25,16 +25,16 @@ 
     
     //Joins and optimizes CSS
     public function minify() {
-        $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content );
+        $noptimizeHTML = apply_filters('autoptimize_filter_html_noptimize', false, $this->content);
         if ($noptimizeHTML)
             return false;
         
-        if(class_exists('Minify_HTML')) {
+        if (class_exists('Minify_HTML')) {
             // wrap the to-be-excluded strings in noptimize tags
             foreach ($this->exclude as $exclString) {
-                if (strpos($this->content,$exclString)!==false) {
-                    $replString="<!--noptimize-->".$exclString."<!--/noptimize-->";
-                    $this->content=str_replace($exclString,$replString,$this->content);
+                if (strpos($this->content, $exclString) !== false) {
+                    $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->";
+                    $this->content = str_replace($exclString, $replString, $this->content);
                 }
             }
 
@@ -47,8 +47,8 @@ 
                 $options['xhtml'] = true;
             }
 
-            if (@is_callable(array("Minify_HTML","minify"))) {
-                $tmp_content = Minify_HTML::minify($this->content,$options);
+            if (@is_callable(array("Minify_HTML", "minify"))) {
+                $tmp_content = Minify_HTML::minify($this->content, $options);
                 if (!empty($tmp_content)) {
                     $this->content = $tmp_content;
                     unset($tmp_content);
@@ -60,16 +60,16 @@ 
             
             // remove the noptimize-wrapper from around the excluded strings
             foreach ($this->exclude as $exclString) {
-                $replString="<!--noptimize-->".$exclString."<!--/noptimize-->";
-                if (strpos($this->content,$replString)!==false) {
-                    $this->content=str_replace($replString,$exclString,$this->content);
+                $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->";
+                if (strpos($this->content, $replString) !== false) {
+                    $this->content = str_replace($replString, $exclString, $this->content);
                 }
             }
 
             // revslider data attribs somehow suffer from HTML optimization, this fixes that
-            if ( class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false) ) {
-                $this->content = preg_replace('#\n(data-.*$)\n#Um',' $1 ', $this->content);
-                $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#','$1 $2', $this->content);
+            if (class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) {
+                $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content);
+                $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content);
             }
 
             return true;

classes/external/php/minify-2.1.7-jsmin.php

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
     protected $inputLength = 0;

     protected $lookAhead   = null;

     protected $output      = '';

-    protected $lastByteOut  = '';

+    protected $lastByteOut = '';

     protected $keptComment = '';

 

     /**

@@ -104,7 +104,7 @@ 
         }

 

         $mbIntEnc = null;

-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {

+        if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {

             $mbIntEnc = mb_internal_encoding();

             mb_internal_encoding('8bit');

         }

@@ -121,7 +121,7 @@ 
                         && ($this->b === $this->lastByteOut)) {

                     // Don't delete this space. If we do, the addition/subtraction

                     // could be parsed as a post-increment

-                } elseif (! $this->isAlphaNum($this->b)) {

+                } elseif (!$this->isAlphaNum($this->b)) {

                     $command = self::ACTION_DELETE_A;

                 }

             } elseif ($this->a === "\n") {

@@ -132,10 +132,10 @@ 
                     // otherwise mb_strpos will give WARNING

                 } elseif ($this->b === null

                           || (false === strpos('{[(+-!~', $this->b)

-                              && ! $this->isAlphaNum($this->b))) {

+                              && !$this->isAlphaNum($this->b))) {

                     $command = self::ACTION_DELETE_A;

                 }

-            } elseif (! $this->isAlphaNum($this->a)) {

+            } elseif (!$this->isAlphaNum($this->a)) {

                 if ($this->b === ' '

                     || ($this->b === "\n"

                         && (false === strpos('}])+-"\'', $this->a)))) {

@@ -191,7 +191,7 @@ 
                 $this->a = $this->b;

                 if ($this->a === "'" || $this->a === '"') { // string literal

                     $str = $this->a; // in case needed for exception

-                    for(;;) {

+                    for (;;) {

                         $this->output .= $this->a;

                         $this->lastByteOut = $this->a;

 

@@ -218,13 +218,13 @@ 
             case self::ACTION_DELETE_A_B: // 3

                 $this->b = $this->next();

                 if ($this->b === '/' && $this->isRegexpLiteral()) {

-                    $this->output .= $this->a . $this->b;

+                    $this->output .= $this->a.$this->b;

                     $pattern = '/'; // keep entire pattern in case we need to report it in the exception

-                    for(;;) {

+                    for (;;) {

                         $this->a = $this->get();

                         $pattern .= $this->a;

                         if ($this->a === '[') {

-                            for(;;) {

+                            for (;;) {

                                 $this->output .= $this->a;

                                 $this->a = $this->get();

                                 $pattern .= $this->a;

@@ -239,7 +239,7 @@ 
                                 if ($this->isEOF($this->a)) {

                                     throw new JSMin_UnterminatedRegExpException(

                                         "JSMin: Unterminated set in RegExp at byte "

-                                            . $this->inputIndex .": {$pattern}");

+                                            . $this->inputIndex.": {$pattern}");

                                 }

                             }

                         }

@@ -283,7 +283,7 @@ 
                 // certainly wasn't keyword

                 continue;

             }

-            if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {

+            if (preg_match("~(^|[\\s\\S])".substr($keyword, 0, -1)."$~", $recentOutput, $m)) {

                 if ($m[1] === '' || !$this->isAlphaNum($m[1])) {

                     return true;

                 }

@@ -392,7 +392,7 @@ 
     {

         $this->get();

         $comment = '';

-        for(;;) {

+        for (;;) {

             $get = $this->get();

             if ($get === '*') {

                 if ($this->peek() === '/') { // end of comment reached

@@ -403,7 +403,7 @@ 
                             // don't prepend a newline if two comments right after one another

                             $this->keptComment = "\n";

                         }

-                        $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";

+                        $this->keptComment .= "/*!".substr($comment, 1)."*/\n";

                     } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {

                         // IE conditional

                         $this->keptComment .= "/*{$comment}*/";

classes/external/php/minify-2.3.1-jsmin.php

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
     protected $inputLength = 0;
     protected $lookAhead   = null;
     protected $output      = '';
-    protected $lastByteOut  = '';
+    protected $lastByteOut = '';
     protected $keptComment = '';
 
     /**
@@ -104,7 +104,7 @@ 
         }
 
         $mbIntEnc = null;
-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
+        if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
             $mbIntEnc = mb_internal_encoding();
             mb_internal_encoding('8bit');
         }
@@ -126,7 +126,7 @@ 
                         && ($this->b === $this->lastByteOut)) {
                     // Don't delete this space. If we do, the addition/subtraction
                     // could be parsed as a post-increment
-                } elseif (! $this->isAlphaNum($this->b)) {
+                } elseif (!$this->isAlphaNum($this->b)) {
                     $command = self::ACTION_DELETE_A;
                 }
             } elseif ($this->a === "\n") {
@@ -137,10 +137,10 @@ 
                     // otherwise mb_strpos will give WARNING
                 } elseif ($this->b === null
                           || (false === strpos('{[(+-!~', $this->b)
-                              && ! $this->isAlphaNum($this->b))) {
+                              && !$this->isAlphaNum($this->b))) {
                     $command = self::ACTION_DELETE_A;
                 }
-            } elseif (! $this->isAlphaNum($this->a)) {
+            } elseif (!$this->isAlphaNum($this->a)) {
                 if ($this->b === ' '
                     || ($this->b === "\n"
                         && (false === strpos('}])+-"\'', $this->a)))) {
@@ -197,7 +197,7 @@ 
                 if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal
                     $delimiter = $this->a;
                     $str = $this->a; // in case needed for exception
-                    for(;;) {
+                    for (;;) {
                         $this->output .= $this->a;
                         $this->lastByteOut = $this->a;
                         $this->a = $this->get();
@@ -225,13 +225,13 @@ 
             case self::ACTION_DELETE_A_B: // 3
                 $this->b = $this->next();
                 if ($this->b === '/' && $this->isRegexpLiteral()) {
-                    $this->output .= $this->a . $this->b;
+                    $this->output .= $this->a.$this->b;
                     $pattern = '/'; // keep entire pattern in case we need to report it in the exception
-                    for(;;) {
+                    for (;;) {
                         $this->a = $this->get();
                         $pattern .= $this->a;
                         if ($this->a === '[') {
-                            for(;;) {
+                            for (;;) {
                                 $this->output .= $this->a;
                                 $this->a = $this->get();
                                 $pattern .= $this->a;
@@ -246,7 +246,7 @@ 
                                 if ($this->isEOF($this->a)) {
                                     throw new JSMin_UnterminatedRegExpException(
                                         "JSMin: Unterminated set in RegExp at byte "
-                                            . $this->inputIndex .": {$pattern}");
+                                            . $this->inputIndex.": {$pattern}");
                                 }
                             }
                         }
@@ -291,7 +291,7 @@ 
 
         // if the "/" follows a keyword, it must be a regexp, otherwise it's best to assume division
 
-        $subject = $this->output . trim($this->a);
+        $subject = $this->output.trim($this->a);
         if (!preg_match('/(?:case|else|in|return|typeof)$/', $subject, $m)) {
             // not a keyword
             return false;
@@ -402,7 +402,7 @@ 
     {
         $this->get();
         $comment = '';
-        for(;;) {
+        for (;;) {
             $get = $this->get();
             if ($get === '*') {
                 if ($this->peek() === '/') { // end of comment reached
@@ -413,7 +413,7 @@ 
                             // don't prepend a newline if two comments right after one another
                             $this->keptComment = "\n";
                         }
-                        $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";
+                        $this->keptComment .= "/*!".substr($comment, 1)."*/\n";
                     } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
                         // IE conditional
                         $this->keptComment .= "/*{$comment}*/";

classes/external/php/jsmin-1.1.1.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
   // -- Protected Instance Methods ---------------------------------------------

 

   protected function action($d) {

-    switch($d) {

+    switch ($d) {

       case 1:

         $this->output .= $this->a;

 

@@ -109,7 +109,7 @@ 
             $this->a === ':' || $this->a === '[' || $this->a === '!' ||

             $this->a === '&' || $this->a === '|' || $this->a === '?')) {

 

-          $this->output .= $this->a . $this->b;

+          $this->output .= $this->a.$this->b;

 

           for (;;) {

             $this->a = $this->get();

@@ -245,7 +245,7 @@ 
     $c = $this->get();

 

     if ($c === '/') {

-      switch($this->peek()) {

+      switch ($this->peek()) {

         case '/':

           for (;;) {

             $c = $this->get();

@@ -259,7 +259,7 @@ 
           $this->get();

 

           for (;;) {

-            switch($this->get()) {

+            switch ($this->get()) {

               case '*':

                 if ($this->peek() === '/') {

                   $this->get();

Braces +2 added lines, -4 removed lines

@@ -191,8 +191,7 @@ 
             default:

               if ($this->isAlphaNum($this->b)) {

                 $this->action(1);

-              }

-              else {

+              } else {

                 $this->action(2);

               }

           }

@@ -224,8 +223,7 @@ 
                 default:

                   if ($this->isAlphaNum($this->a)) {

                     $this->action(1);

-                  }

-                  else {

+                  } else {

                     $this->action(3);

                   }

               }

classes/external/php/minify-2.1.7-html.php

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
     {

         $this->_html = str_replace("\r\n", "\n", trim($html));

         if (isset($options['xhtml'])) {

-            $this->_isXhtml = (bool)$options['xhtml'];

+            $this->_isXhtml = (bool) $options['xhtml'];

         }

         if (isset($options['cssMinifier'])) {

             $this->_cssMinifier = $options['cssMinifier'];

@@ -79,7 +79,7 @@ 
             $this->_jsMinifier = $options['jsMinifier'];

         }

         if (isset($options['jsCleanComments'])) {

-            $this->_jsCleanComments = (bool)$options['jsCleanComments'];

+            $this->_jsCleanComments = (bool) $options['jsCleanComments'];

         }

     }

 

@@ -95,7 +95,7 @@ 
             $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));

         }

         

-        $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);

+        $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']);

         $this->_placeholders = array();

         

         // replace SCRIPTs (and minify) with placeholders

@@ -171,7 +171,7 @@ 
     

     protected function _reservePlace($content)

     {

-        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';

+        $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%';

         $this->_placeholders[$placeholder] = $content;

         return $placeholder;

     }

classes/external/php/minify-css-compressor.php

Spacing +1 added lines, -1 removed lines

@@ -245,6 +245,6 @@
                 )
                 \\s*
             /x', '$1', $m[1]);
-        return 'font-family:' . $m[1] . $m[2];
+        return 'font-family:'.$m[1].$m[2];
     }
 }