futtta / autoptimize

classes/autoptimizeBase.php

Doc Comments +14 added lines

@@ -123,6 +123,10 @@ 
     }
 
     // hide everything between noptimize-comment tags
+
+    /**
+     * @param string $noptimize_in
+     */
     protected function hide_noptimize($noptimize_in) {
         if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { 
             $noptimize_out = preg_replace_callback(
@@ -251,6 +255,9 @@ 
         return $url;
     }
 
+    /**
+     * @param string $payload
+     */
     protected function inject_in_html($payload,$replaceTag) {
         if (strpos($this->content,$replaceTag[0])!== false) {
             if ($replaceTag[1]==="after") {
@@ -270,6 +277,9 @@ 
         }
     }
     
+    /**
+     * @param string $tag
+     */
     protected function isremovable($tag, $removables) {
         foreach ($removables as $match) {
             if (strpos($tag,$match)!==false) {
@@ -280,6 +290,10 @@ 
     }
     
     // inject already minified code in optimized JS/CSS
+
+    /**
+     * @return string
+     */
     protected function inject_minified($in) {
         if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
             $out = preg_replace_callback(

Spacing +59 added lines, -59 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 abstract class autoptimizeBase {
     protected $content = '';
@@ -23,32 +23,32 @@ 
     
     //Converts an URL to a full path
     protected function getpath($url) {
-        $url=apply_filters( 'autoptimize_filter_cssjs_alter_url', $url);
+        $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url);
         
-        if (strpos($url,'%')!==false) {
-            $url=urldecode($url);
+        if (strpos($url, '%') !== false) {
+            $url = urldecode($url);
         }
 
-        $siteHost=parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST);
+        $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
         
         // normalize
-        if (strpos($url,'//')===0) {
+        if (strpos($url, '//') === 0) {
             if (is_ssl()) {
                 $url = "https:".$url;
             } else {
                 $url = "http:".$url;
             }
-        } else if ((strpos($url,'//')===false) && (strpos($url,$siteHost)===false)) {
+        } else if ((strpos($url, '//') === false) && (strpos($url, $siteHost) === false)) {
             if (AUTOPTIMIZE_WP_SITE_URL === $siteHost) {
                 $url = AUTOPTIMIZE_WP_SITE_URL.$url;
             } else {
-                $subdir_levels=substr_count(preg_replace("/https?:\/\//","",AUTOPTIMIZE_WP_SITE_URL),"/");
-                $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..",$subdir_levels).$url;
+                $subdir_levels = substr_count(preg_replace("/https?:\/\//", "", AUTOPTIMIZE_WP_SITE_URL), "/");
+                $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..", $subdir_levels).$url;
             }
         }
 
         // first check; hostname wp site should be hostname of url
-        $thisHost=@parse_url($url,PHP_URL_HOST);
+        $thisHost = @parse_url($url, PHP_URL_HOST);
         if ($thisHost !== $siteHost) {
             /* 
             * first try to get all domains from WPML (if available)
@@ -60,18 +60,18 @@ 
             
             $multidomainsWPML = apply_filters('wpml_setting', array(), 'language_domains');
             if (!empty($multidomainsWPML)) {
-                $multidomains = array_map(array($this,"ao_getDomain"),$multidomainsWPML);
+                $multidomains = array_map(array($this, "ao_getDomain"), $multidomainsWPML);
             }
             
             if (!empty($this->cdn_url)) {
-                $multidomains[]=parse_url($this->cdn_url,PHP_URL_HOST);
+                $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST);
             }
             
             $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains);
             
             if (!empty($multidomains)) {
-                if (in_array($thisHost,$multidomains)) {
-                    $url=str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST), $url);
+                if (in_array($thisHost, $multidomains)) {
+                    $url = str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST), $url);
                 } else {
                     return false;
                 }
@@ -81,42 +81,42 @@ 
         }
         
         // try to remove "wp root url" from url while not minding http<>https
-        $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL);
-        $tmp_url = preg_replace('/https?:/','',$url);
-        $path = str_replace($tmp_ao_root,'',$tmp_url);
+        $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
+        $tmp_url = preg_replace('/https?:/', '', $url);
+        $path = str_replace($tmp_ao_root, '', $tmp_url);
         
         // final check; if path starts with :// or //, this is not a URL in the WP context and we have to assume we can't aggregate
-        if (preg_match('#^:?//#',$path)) {
+        if (preg_match('#^:?//#', $path)) {
             /** External script/css (adsense, etc) */
             return false;
         }
 
-        $path = str_replace('//','/',WP_ROOT_DIR.$path);
+        $path = str_replace('//', '/', WP_ROOT_DIR.$path);
         return $path;
     }
 
     // needed for WPML-filter
     protected function ao_getDomain($in) {
         // make sure the url starts with something vaguely resembling a protocol
-        if ((strpos($in,"http")!==0) && (strpos($in,"//")!==0)) {
-            $in="http://".$in;
+        if ((strpos($in, "http") !== 0) && (strpos($in, "//") !== 0)) {
+            $in = "http://".$in;
         }
         
         // do the actual parse_url
-        $out = parse_url($in,PHP_URL_HOST);
+        $out = parse_url($in, PHP_URL_HOST);
         
         // fallback if parse_url does not understand the url is in fact a url
-        if (empty($out)) $out=$in;
+        if (empty($out)) $out = $in;
         
         return $out;
     }
 
 
     // logger
-    protected function ao_logger($logmsg,$appendHTML=true) {
+    protected function ao_logger($logmsg, $appendHTML = true) {
         if ($appendHTML) {
-            $logmsg="<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
-            $this->content.=$logmsg;
+            $logmsg = "<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
+            $this->content .= $logmsg;
         } else {
             error_log("Autoptimize: ".$logmsg);
         }
@@ -124,7 +124,7 @@ 
 
     // hide everything between noptimize-comment tags
     protected function hide_noptimize($noptimize_in) {
-        if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { 
+        if (preg_match('/<!--\s?noptimize\s?-->/', $noptimize_in)) { 
             $noptimize_out = preg_replace_callback(
                 '#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is',
                 create_function(
@@ -141,7 +141,7 @@ 
     
     // unhide noptimize-tags
     protected function restore_noptimize($noptimize_in) {
-        if ( strpos( $noptimize_in, '%%NOPTIMIZE%%' ) !== false ) { 
+        if (strpos($noptimize_in, '%%NOPTIMIZE%%') !== false) { 
             $noptimize_out = preg_replace_callback(
                 '#%%NOPTIMIZE%%(.*?)%%NOPTIMIZE%%#is',
                 create_function(
@@ -157,7 +157,7 @@ 
     }
 
     protected function hide_iehacks($iehacks_in) {
-        if ( strpos( $iehacks_in, '<!--[if' ) !== false ) { 
+        if (strpos($iehacks_in, '<!--[if') !== false) { 
             $iehacks_out = preg_replace_callback(
                 '#<!--\[if.*?\[endif\]-->#is',
                 create_function(
@@ -173,7 +173,7 @@ 
     }
 
     protected function restore_iehacks($iehacks_in) {
-        if ( strpos( $iehacks_in, '%%IEHACK%%' ) !== false ) { 
+        if (strpos($iehacks_in, '%%IEHACK%%') !== false) { 
             $iehacks_out = preg_replace_callback(
                 '#%%IEHACK%%(.*?)%%IEHACK%%#is',
                 create_function(
@@ -183,13 +183,13 @@ 
                 $iehacks_in
             );
         } else {
-            $iehacks_out=$iehacks_in;
+            $iehacks_out = $iehacks_in;
         }
         return $iehacks_out;
     }
 
     protected function hide_comments($comments_in) {
-        if ( strpos( $comments_in, '<!--' ) !== false ) {
+        if (strpos($comments_in, '<!--') !== false) {
             $comments_out = preg_replace_callback(
                 '#<!--.*?-->#is',
                 create_function(
@@ -205,7 +205,7 @@ 
     }
 
     protected function restore_comments($comments_in) {
-        if ( strpos( $comments_in, '%%COMMENTS%%' ) !== false ) {
+        if (strpos($comments_in, '%%COMMENTS%%') !== false) {
             $comments_out = preg_replace_callback(
                 '#%%COMMENTS%%(.*?)%%COMMENTS%%#is',
                 create_function(
@@ -215,31 +215,31 @@ 
                 $comments_in
             );
         } else {
-            $comments_out=$comments_in;
+            $comments_out = $comments_in;
         }
         return $comments_out;
     }
 
-    protected function url_replace_cdn( $url ) {
+    protected function url_replace_cdn($url) {
         // API filter to change base CDN URL
-        $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $this->cdn_url );
+        $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $this->cdn_url);
 
-        if ( !empty($cdn_url) )  {
+        if (!empty($cdn_url)) {
             // prepend domain-less absolute URL's
-            if ( ( substr( $url, 0, 1 ) === '/' ) && ( substr( $url, 1, 1 ) !== '/' ) ) {
-                $url = rtrim( $cdn_url, '/' ) . $url;
+            if ((substr($url, 0, 1) === '/') && (substr($url, 1, 1) !== '/')) {
+                $url = rtrim($cdn_url, '/').$url;
             } else {
                 // get wordpress base URL
-                $WPSiteBreakdown = parse_url( AUTOPTIMIZE_WP_SITE_URL );
-                $WPBaseUrl       = $WPSiteBreakdown['scheme'] . '://' . $WPSiteBreakdown['host'];
-                if ( ! empty( $WPSiteBreakdown['port'] ) ) {
-                    $WPBaseUrl .= ":" . $WPSiteBreakdown['port'];
+                $WPSiteBreakdown = parse_url(AUTOPTIMIZE_WP_SITE_URL);
+                $WPBaseUrl       = $WPSiteBreakdown['scheme'].'://'.$WPSiteBreakdown['host'];
+                if (!empty($WPSiteBreakdown['port'])) {
+                    $WPBaseUrl .= ":".$WPSiteBreakdown['port'];
                 }
                 // replace full url's with scheme
-                $tmp_url = str_replace( $WPBaseUrl, rtrim( $cdn_url, '/' ), $url );
-                if ( $tmp_url === $url ) {
+                $tmp_url = str_replace($WPBaseUrl, rtrim($cdn_url, '/'), $url);
+                if ($tmp_url === $url) {
                     // last attempt; replace scheme-less URL's
-                    $url = str_replace( preg_replace( '/https?:/', '', $WPBaseUrl ), rtrim( $cdn_url, '/' ), $url );
+                    $url = str_replace(preg_replace('/https?:/', '', $WPBaseUrl), rtrim($cdn_url, '/'), $url);
                 } else {
                     $url = $tmp_url;
                 }
@@ -247,32 +247,32 @@ 
         }
 
         // allow API filter to alter URL after CDN replacement
-        $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url );
+        $url = apply_filters('autoptimize_filter_base_replace_cdn', $url);
         return $url;
     }
 
-    protected function inject_in_html($payload,$replaceTag) {
-        if (strpos($this->content,$replaceTag[0])!== false) {
-            if ($replaceTag[1]==="after") {
-                $replaceBlock=$replaceTag[0].$payload;
-            } else if ($replaceTag[1]==="replace"){
-                $replaceBlock=$payload;
+    protected function inject_in_html($payload, $replaceTag) {
+        if (strpos($this->content, $replaceTag[0]) !== false) {
+            if ($replaceTag[1] === "after") {
+                $replaceBlock = $replaceTag[0].$payload;
+            } else if ($replaceTag[1] === "replace") {
+                $replaceBlock = $payload;
             } else {
-                $replaceBlock=$payload.$replaceTag[0];
+                $replaceBlock = $payload.$replaceTag[0];
             }
-            $this->content = substr_replace($this->content,$replaceBlock,strpos($this->content,$replaceTag[0]),strlen($replaceTag[0]));
+            $this->content = substr_replace($this->content, $replaceBlock, strpos($this->content, $replaceTag[0]), strlen($replaceTag[0]));
         } else {
             $this->content .= $payload;
             if (!$this->tagWarning) {
-                $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<",">"),"",$replaceTag[0])."\" missing --><!--/noptimize-->";
-                $this->tagWarning=true;
+                $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<", ">"), "", $replaceTag[0])."\" missing --><!--/noptimize-->";
+                $this->tagWarning = true;
             }
         }
     }
     
     protected function isremovable($tag, $removables) {
         foreach ($removables as $match) {
-            if (strpos($tag,$match)!==false) {
+            if (strpos($tag, $match) !== false) {
                 return true;
             }
         }
@@ -281,7 +281,7 @@ 
     
     // inject already minified code in optimized JS/CSS
     protected function inject_minified($in) {
-        if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
+        if (strpos($in, '%%INJECTLATER%%') !== false) {
             $out = preg_replace_callback(
                 '#%%INJECTLATER%%(.*?)%%INJECTLATER%%#is',
                 create_function(

Braces +7 added lines, -2 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 abstract class autoptimizeBase {
     protected $content = '';
@@ -106,7 +109,9 @@ 
         $out = parse_url($in,PHP_URL_HOST);
         
         // fallback if parse_url does not understand the url is in fact a url
-        if (empty($out)) $out=$in;
+        if (empty($out)) {
+            $out=$in;
+        }
         
         return $out;
     }

classes/autoptimizeCache.php

Doc Comments +6 added lines

@@ -42,6 +42,9 @@ 
         return false;
     }
     
+    /**
+     * @param string $mime
+     */
     public function cache($code,$mime) {
         if($this->nogzip == false) {
             $file = ($this->delayed ? 'delayed.php' : 'default.php');
@@ -240,6 +243,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $dir
+     */
     static function checkCacheDir($dir) {
         // Check and create if not exists
         if(!file_exists($dir))    {

Spacing +59 added lines, -59 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,21 +98,21 @@ 
                 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);
 
         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;
             }
             
@@ -121,28 +121,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,HOUR_IN_SECONDS);
+            $AOstats = array($count, $size, time());
+            if ($count > 100) {
+                set_transient("autoptimize_stats", $AOstats, HOUR_IN_SECONDS);
             }
         }
         // print the number of instances
@@ -150,36 +150,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_headers.c>
+                $htAccessContent = '<IfModule mod_headers.c>
         Header set Vary "Accept-Encoding"
         Header set Cache-Control "max-age=10672000, must-revalidate"
 </IfModule>
@@ -206,7 +206,7 @@ 
     </Files>
 </IfModule>';
             } else {
-                $htAccessContent='<IfModule mod_headers.c>
+                $htAccessContent = '<IfModule mod_headers.c>
         Header set Vary "Accept-Encoding"
         Header set Cache-Control "max-age=10672000, must-revalidate"
 </IfModule>
@@ -233,7 +233,7 @@ 
     </Files>
 </IfModule>';
             }
-            @file_put_contents($htAccess,$htAccessContent);
+            @file_put_contents($htAccess, $htAccessContent);
         }
 
         // All OK
@@ -242,22 +242,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;

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;

classes/autoptimizeConfig.php

Doc Comments +3 added lines

@@ -625,6 +625,9 @@
         return false;
     }
 
+    /**
+     * @param string $url
+     */
     private function getFutttaFeeds($url) {
         if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
             $rss = fetch_feed( $url );

Spacing +171 added lines, -171 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeConfig {
     private $config = null;
@@ -7,25 +7,25 @@ 
 
     //Singleton: private construct
     private function __construct() {
-        if( is_admin() ) {
+        if (is_admin()) {
             //Add the admin page and settings
-            add_action('admin_menu',array($this,'addmenu'));
-            add_action('admin_init',array($this,'registersettings'));
+            add_action('admin_menu', array($this, 'addmenu'));
+            add_action('admin_init', array($this, 'registersettings'));
 
             //Set meta info
-            if(function_exists('plugin_row_meta')) {
+            if (function_exists('plugin_row_meta')) {
                 //2.8+
-                add_filter('plugin_row_meta',array($this,'setmeta'),10,2);
-            } elseif(function_exists('post_class')) {
+                add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2);
+            } elseif (function_exists('post_class')) {
                 //2.7
                 $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
-                add_filter('plugin_action_links_'.$plugin,array($this,'setmeta'));
+                add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta'));
             }
 
             //Clean cache?
-            if(get_option('autoptimize_cache_clean')) {
+            if (get_option('autoptimize_cache_clean')) {
                 autoptimizeCache::clearall();
-                update_option('autoptimize_cache_clean',0);
+                update_option('autoptimize_cache_clean', 0);
             }
         }
 
@@ -151,27 +151,27 @@ 
 <div class="wrap">
 
 <?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?>
-<div class="notice-error notice"><?php _e('<p><strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href="http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank">serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0</p>','autoptimize'); ?></div>
+<div class="notice-error notice"><?php _e('<p><strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href="http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank">serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0</p>', 'autoptimize'); ?></div>
 <?php } ?>
 
 <div id="autoptimize_main">
 <div id="ao_title_and_button">
-    <h1 id="ao_title"><?php _e('Autoptimize Settings','autoptimize'); ?>
+    <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?>
     <span id="ao_adv_button">
     <?php 
-    if (get_option('autoptimize_show_adv','0')=='1') {
+    if (get_option('autoptimize_show_adv', '0') == '1') {
         ?>
-        <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
-        <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
+        <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a>
+        <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a>
         <style>tr.ao_adv{display:table-row;} li.ao_adv{display:list-item;}</style>
         <?php
-        $hiddenClass="";
+        $hiddenClass = "";
     } else {
         ?>
-        <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
-        <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
+        <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a>
+        <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a>
         <?php
-        $hiddenClass="hidden ";
+        $hiddenClass = "hidden ";
     }
     ?>
     </span>
@@ -186,153 +186,153 @@ 
 <ul>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('HTML Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Optimize HTML Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>html_sub ao_adv" valign="top">
-<th scope="row"><?php _e('Keep HTML comments?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments')?'checked="checked" ':''; ?>/>
-<?php _e('Enable this if you want HTML comments to remain in the page.','autoptimize'); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>html_sub ao_adv" valign="top">
+<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('JavaScript Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2>
 <table class="form-table"> 
 <tr valign="top">
-<th scope="row"><?php _e('Optimize JavaScript Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/>
-<?php _e('Load JavaScript early, reducing the chance of JS-errors but making it render blocking. You can disable this if you\'re not aggregating inline JS and you want JS to be deferred.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Load JavaScript early, reducing the chance of JS-errors but making it render blocking. You can disable this if you\'re not aggregating inline JS and you want JS to be deferred.', 'autoptimize'); ?></label></td>
 </tr>
 <?php if (get_option('autoptimize_js_justhead')) { ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?','autoptimize');  _e(' <i>(deprecated)</i>','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/>
-<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?', 'autoptimize'); _e(' <i>(deprecated)</i>', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/>
-<?php _e('Check this option for Autoptimize to also aggregate JS in the HTML. If this option is not enabled, you might have to "force JavaScript in head".','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Check this option for Autoptimize to also aggregate JS in the HTML. If this option is not enabled, you might have to "force JavaScript in head".', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th>
-<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude',"seal.js, js/jquery/jquery.js"); ?>"/><br />
-<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th>
+<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude', "seal.js, js/jquery/jquery.js"); ?>"/><br />
+<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Add try-catch wrapping?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch')?'checked="checked" ':''; ?>/>
-<?php _e('If your scripts break because of a JS-error, you might want to try this.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('CSS Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2>
 <table class="form-table"> 
 <tr valign="top">
-<th scope="row"><?php _e('Optimize CSS Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top">
-<th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/>
-<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top">
+<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top">
-<th scope="row"><?php _e('Remove Google Fonts?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont')?'checked="checked" ':''; ?>/>
-<?php _e('Check this if you don\'t need or want Google Fonts being loaded.','autoptimize'); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top">
+<th scope="row"><?php _e('Remove Google Fonts?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Check this if you don\'t need or want Google Fonts being loaded.', 'autoptimize'); ?></label></td>
 </tr>
 <?php if (get_option('autoptimize_css_justhead')) { ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
-<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?','autoptimize'); _e(' <i>(deprecated)</i>','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/>
-<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
+<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?', 'autoptimize'); _e(' <i>(deprecated)</i>', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
-<th scope="row"><?php _e('Also aggregate inline CSS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline','1')?'checked="checked" ':''; ?>/>
-<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
+<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
-<th scope="row"><?php _e('Inline and Defer CSS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer')?'checked="checked" ':''; ?>/>
-<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
+<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv" id="autoptimize_css_defer_inline">
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv" id="autoptimize_css_defer_inline">
 <th scope="row"></th>
-<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.','autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td>
+<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub">
-<th scope="row"><?php _e('Inline all CSS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline')?'checked="checked" ':''; ?>/>
-<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub">
+<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub">
-<th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th>
-<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','admin-bar.min.css, dashicons.min.css'); ?>"/><br />
-<?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub">
+<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th>
+<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude', 'admin-bar.min.css, dashicons.min.css'); ?>"/><br />
+<?php _e('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('CDN Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2>
 <table class="form-table"> 
 <tr valign="top">
-<th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th>
-<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url',''),array("http","https")); ?>" /><br />
-<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>).','autoptimize'); ?></label></td>
+<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th>
+<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url', ''), array("http", "https")); ?>" /><br />
+<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>).', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
-<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
-<h2 class="itemTitle"><?php _e('Cache Info','autoptimize'); ?></h2>
+<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv">
+<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2>
 <table class="form-table" > 
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Cache folder','autoptimize'); ?></th>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th>
 <td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Can we write?','autoptimize'); ?></th>
-<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes','autoptimize') : __('No','autoptimize')); ?></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th>
+<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th>
 <td><?php
-    $AOstatArr=autoptimizeCache::stats(); 
-    $AOcacheSize=round($AOstatArr[1]/1024);
-    echo $AOstatArr[0].__(' files, totalling ','autoptimize').$AOcacheSize.__(' Kbytes (calculated at ','autoptimize').date("H:i e", $AOstatArr[2]).')';
+    $AOstatArr = autoptimizeCache::stats(); 
+    $AOcacheSize = round($AOstatArr[1]/1024);
+    echo $AOstatArr[0].__(' files, totalling ', 'autoptimize').$AOcacheSize.__(' Kbytes (calculated at ', 'autoptimize').date("H:i e", $AOstatArr[2]).')';
 ?></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/>
-<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 </ul>
 
-<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>">
+<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv', '0'); ?>">
 
 <p class="submit">
-<input type="submit" class="button-secondary" value="<?php _e('Save Changes','autoptimize') ?>" />
-<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache','autoptimize') ?>" />
+<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize') ?>" />
+<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize') ?>" />
 </p>
 
 </form>
@@ -341,31 +341,31 @@ 
     <div class="autoptimize_banner hidden">
         <ul>
         <?php
-        if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
-            $AO_banner=get_transient("autoptimize_banner");
+        if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+            $AO_banner = get_transient("autoptimize_banner");
             if (empty($AO_banner)) {
                 $banner_resp = wp_remote_get("http://misc.optimizingmatters.com/autoptimize_news.html");
                 if (!is_wp_error($banner_resp)) {
-                    if (wp_remote_retrieve_response_code($banner_resp)=="200") {
+                    if (wp_remote_retrieve_response_code($banner_resp) == "200") {
                         $AO_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp));
-                        set_transient("autoptimize_banner",$AO_banner,DAY_IN_SECONDS);
+                        set_transient("autoptimize_banner", $AO_banner, DAY_IN_SECONDS);
                     }
                 }
             }
             echo $AO_banner;
         }
         ?>
-        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.","autoptimize"); ?></li>
-        <li><?php _e("Happy with Autoptimize?","autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!","autoptimize"); ?></a></li>
+        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.", "autoptimize"); ?></li>
+        <li><?php _e("Happy with Autoptimize?", "autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!", "autoptimize"); ?></a></li>
         </ul>
     </div>
     <div style="margin-left:10px;margin-top:-5px;">
         <h2>
-            <?php _e("futtta about","autoptimize") ?>
+            <?php _e("futtta about", "autoptimize") ?>
             <select id="feed_dropdown" >
-                <option value="1"><?php _e("Autoptimize","autoptimize") ?></option>
-                <option value="2"><?php _e("WordPress","autoptimize") ?></option>
-                <option value="3"><?php _e("Web Technology","autoptimize") ?></option>
+                <option value="1"><?php _e("Autoptimize", "autoptimize") ?></option>
+                <option value="2"><?php _e("WordPress", "autoptimize") ?></option>
+                <option value="3"><?php _e("Web Technology", "autoptimize") ?></option>
             </select>
         </h2>
         <div id="futtta_feed">
@@ -519,14 +519,14 @@ 
     }
 
     public function addmenu() {
-        $hook=add_options_page(__('Autoptimize Options','autoptimize'),'Autoptimize','manage_options','autoptimize',array($this,'show'));
-        add_action( 'admin_print_scripts-'.$hook,array($this,'autoptimize_admin_scripts'));
-        add_action( 'admin_print_styles-'.$hook,array($this,'autoptimize_admin_styles'));
+        $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show'));
+        add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts'));
+        add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles'));
     }
 
     public function autoptimize_admin_scripts() {
-        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'),null,true);
-        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'),null,true);
+        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true);
+        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true);
     }
 
     public function autoptimize_admin_styles() {
@@ -535,46 +535,46 @@ 
     }
 
     public function registersettings() {
-        register_setting('autoptimize','autoptimize_html');
-        register_setting('autoptimize','autoptimize_html_keepcomments');
-        register_setting('autoptimize','autoptimize_js');
-        register_setting('autoptimize','autoptimize_js_exclude');
-        register_setting('autoptimize','autoptimize_js_trycatch');
-        register_setting('autoptimize','autoptimize_js_justhead');
-        register_setting('autoptimize','autoptimize_js_forcehead');
-        register_setting('autoptimize','autoptimize_js_include_inline');
-        register_setting('autoptimize','autoptimize_css');
-        register_setting('autoptimize','autoptimize_css_exclude');
-        register_setting('autoptimize','autoptimize_css_justhead');
-        register_setting('autoptimize','autoptimize_css_datauris');
-        register_setting('autoptimize','autoptimize_css_defer');
-        register_setting('autoptimize','autoptimize_css_defer_inline');
-        register_setting('autoptimize','autoptimize_css_inline');
-        register_setting('autoptimize','autoptimize_css_include_inline');
-        register_setting('autoptimize','autoptimize_css_nogooglefont');
-        register_setting('autoptimize','autoptimize_cdn_url');
-        register_setting('autoptimize','autoptimize_cache_clean');
-        register_setting('autoptimize','autoptimize_cache_nogzip');
-        register_setting('autoptimize','autoptimize_show_adv');
+        register_setting('autoptimize', 'autoptimize_html');
+        register_setting('autoptimize', 'autoptimize_html_keepcomments');
+        register_setting('autoptimize', 'autoptimize_js');
+        register_setting('autoptimize', 'autoptimize_js_exclude');
+        register_setting('autoptimize', 'autoptimize_js_trycatch');
+        register_setting('autoptimize', 'autoptimize_js_justhead');
+        register_setting('autoptimize', 'autoptimize_js_forcehead');
+        register_setting('autoptimize', 'autoptimize_js_include_inline');
+        register_setting('autoptimize', 'autoptimize_css');
+        register_setting('autoptimize', 'autoptimize_css_exclude');
+        register_setting('autoptimize', 'autoptimize_css_justhead');
+        register_setting('autoptimize', 'autoptimize_css_datauris');
+        register_setting('autoptimize', 'autoptimize_css_defer');
+        register_setting('autoptimize', 'autoptimize_css_defer_inline');
+        register_setting('autoptimize', 'autoptimize_css_inline');
+        register_setting('autoptimize', 'autoptimize_css_include_inline');
+        register_setting('autoptimize', 'autoptimize_css_nogooglefont');
+        register_setting('autoptimize', 'autoptimize_cdn_url');
+        register_setting('autoptimize', 'autoptimize_cache_clean');
+        register_setting('autoptimize', 'autoptimize_cache_nogzip');
+        register_setting('autoptimize', 'autoptimize_show_adv');
     }
 
-    public function setmeta($links,$file=null) {
+    public function setmeta($links, $file = null) {
         //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/
         //Do it only once - saves time
         static $plugin;
-        if(empty($plugin))
+        if (empty($plugin))
             $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
         
-        if($file===null) {
+        if ($file === null) {
             //2.7
             $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'));
-            array_unshift($links,$settings_link);
+            array_unshift($links, $settings_link);
         } else {
             //2.8
             //If it's us, add the link
-            if($file === $plugin) {
-                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>',__('Settings')));
-                $links = array_merge($links,$newlink);
+            if ($file === $plugin) {
+                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')));
+                $links = array_merge($links, $newlink);
             }
         }
 
@@ -582,7 +582,7 @@ 
     }
 
     public function get($key) {        
-        if(!is_array($this->config)) {
+        if (!is_array($this->config)) {
             //Default config
             $config = array('autoptimize_html' => 0,
                 'autoptimize_html_keepcomments' => 0,
@@ -607,9 +607,9 @@ 
                 );
 
             //Override with user settings
-            foreach(array_keys($config) as $name) {
+            foreach (array_keys($config) as $name) {
                 $conf = get_option($name);
-                if($conf!==false) {
+                if ($conf !== false) {
                     //It was set before!
                     $config[$name] = $conf;
                 }
@@ -619,31 +619,31 @@ 
             $this->config = $config;
         }
 
-        if(isset($this->config[$key]))
+        if (isset($this->config[$key]))
             return $this->config[$key];
 
         return false;
     }
 
     private function getFutttaFeeds($url) {
-        if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
-            $rss = fetch_feed( $url );
+        if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+            $rss = fetch_feed($url);
             $maxitems = 0;
 
-            if ( ! is_wp_error( $rss ) ) {
-                $maxitems = $rss->get_item_quantity( 7 ); 
-                $rss_items = $rss->get_items( 0, $maxitems );
+            if (!is_wp_error($rss)) {
+                $maxitems = $rss->get_item_quantity(7); 
+                $rss_items = $rss->get_items(0, $maxitems);
             }
             ?>
             <ul>
-                <?php if ( $maxitems == 0 ) : ?>
-                    <li><?php _e( 'No items', 'autoptimize' ); ?></li>
+                <?php if ($maxitems == 0) : ?>
+                    <li><?php _e('No items', 'autoptimize'); ?></li>
                 <?php else : ?>
-                    <?php foreach ( $rss_items as $item ) : ?>
+                    <?php foreach ($rss_items as $item) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
-                                title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>">
-                                <?php echo esc_html( $item->get_title() ); ?>
+                            <a href="<?php echo esc_url($item->get_permalink()); ?>"
+                                title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>">
+                                <?php echo esc_html($item->get_title()); ?>
                             </a>
                         </li>
                     <?php endforeach; ?>
@@ -654,20 +654,20 @@ 
     }
 
     // based on http://wordpress.stackexchange.com/a/58826
-    static function ao_admin_tabs(){
-        $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs',array('autoptimize' => __('Main','autoptimize')));
-        $tabContent="";
-        if (count($tabs)>1) {
-            if(isset($_GET['page'])){
+    static function ao_admin_tabs() {
+        $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('Main', 'autoptimize')));
+        $tabContent = "";
+        if (count($tabs) > 1) {
+            if (isset($_GET['page'])) {
                 $currentId = $_GET['page'];
             } else {
                 $currentId = "autoptimize";
             }
             $tabContent .= "<h2 class=\"nav-tab-wrapper\">";
-            foreach($tabs as $tabId => $tabName){
-                if($currentId == $tabId){
+            foreach ($tabs as $tabId => $tabName) {
+                if ($currentId == $tabId) {
                     $class = " nav-tab-active";
-                } else{
+                } else {
                     $class = "";
                 }
                 $tabContent .= '<a class="nav-tab'.$class.'" href="?page='.$tabId.'">'.$tabName.'</a>';

Braces +15 added lines, -7 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 class autoptimizeConfig {
     private $config = null;
@@ -562,8 +565,9 @@ 
         //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/
         //Do it only once - saves time
         static $plugin;
-        if(empty($plugin))
-            $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
+        if(empty($plugin)) {
+                    $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
+        }
         
         if($file===null) {
             //2.7
@@ -619,8 +623,9 @@ 
             $this->config = $config;
         }
 
-        if(isset($this->config[$key]))
-            return $this->config[$key];
+        if(isset($this->config[$key])) {
+                    return $this->config[$key];
+        }
 
         return false;
     }
@@ -638,10 +643,13 @@ 
             <ul>
                 <?php if ( $maxitems == 0 ) : ?>
                     <li><?php _e( 'No items', 'autoptimize' ); ?></li>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <?php foreach ( $rss_items as $item ) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
+                            <a href="<?php echo esc_url( $item->get_permalink() );
+}
+?>"
                                 title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>">
                                 <?php echo esc_html( $item->get_title() ); ?>
                             </a>

classes/autoptimizeStyles.php

Doc Comments +3 added lines

@@ -617,6 +617,9 @@
         return $code;

     }

     

+    /**
+     * @param string $tag
+     */
     private function ismovable($tag) {

         if (!empty($this->whitelist)) {

             foreach ($this->whitelist as $match) {

Spacing +188 added lines, -188 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if (!defined('ABSPATH')) exit; // Exit if accessed directly

 

 class autoptimizeStyles extends autoptimizeBase {

     private $css = array();

@@ -21,12 +21,12 @@ 
 

     //Reads the page and collects style tags

     public function read($options) {

-        $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );

+        $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);

         if ($noptimizeCSS) return false;

 

-        $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '' );

+        $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '');

         if (!empty($whitelistCSS)) {

-            $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));

+            $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));

         }

         

         if ($options['nogooglefont'] == true) {

@@ -34,33 +34,33 @@ 
         } else {

             $removableCSS = "";

         }

-        $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS);

+        $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);

         if (!empty($removableCSS)) {

-            $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));

+            $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));

         }

 

-        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);

+        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);

 

         // filter to "late inject minified CSS", default to true for now (it is faster)

-        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);

+        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);

 

         // Remove everything that's not the header

-        if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {

-            $content = explode('</head>',$this->content,2);

+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {

+            $content = explode('</head>', $this->content, 2);

             $this->content = $content[0].'</head>';

             $this->restofcontent = $content[1];

         }

 

         // include inline?

-        if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {

+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {

             $this->include_inline = true;

         }

         

         // what CSS shouldn't be autoptimized

         $excludeCSS = $options['css_exclude'];

-        $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS );

-        if ($excludeCSS!=="") {

-            $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));

+        $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS);

+        if ($excludeCSS !== "") {

+            $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));

         } else {

             $this->dontmove = "";

         }

@@ -68,17 +68,17 @@ 
         // should we defer css?

         // value: true/ false

         $this->defer = $options['defer'];

-        $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer );

+        $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer);

 

         // should we inline while deferring?

         // value: inlined CSS

         $this->defer_inline = $options['defer_inline'];

-        $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline );

+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline);

 

         // should we inline?

         // value: true/ false

         $this->inline = $options['inline'];

-        $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline );

+        $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline);

         

         // get cdn url

         $this->cdn_url = $options['cdn_url'];

@@ -90,7 +90,7 @@ 
         $this->content = $this->hide_noptimize($this->content);

         

         // exclude (no)script, as those may contain CSS which should be left as is

-        if ( strpos( $this->content, '<script' ) !== false ) { 

+        if (strpos($this->content, '<script') !== false) { 

             $this->content = preg_replace_callback(

                 '#<(?:no)?script.*?<\/(?:no)?script>#is',

                 create_function(

@@ -108,56 +108,56 @@ 
         $this->content = $this->hide_comments($this->content);

         

         // Get <style> and <link>

-        if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {

-            foreach($matches[0] as $tag) {

-                if ($this->isremovable($tag,$this->cssremovables)) {

-                    $this->content = str_replace($tag,'',$this->content);

+        if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {

+            foreach ($matches[0] as $tag) {

+                if ($this->isremovable($tag, $this->cssremovables)) {

+                    $this->content = str_replace($tag, '', $this->content);

                 } else if ($this->ismovable($tag)) {

                     // Get the media

-                    if(strpos($tag,'media=')!==false) {

-                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);

-                        $medias = explode(',',$medias[1]);

+                    if (strpos($tag, 'media=') !== false) {

+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);

+                        $medias = explode(',', $medias[1]);

                         $media = array();

-                        foreach($medias as $elem) {

-                            if (empty($elem)) { $elem="all"; }

+                        foreach ($medias as $elem) {

+                            if (empty($elem)) { $elem = "all"; }

                             $media[] = $elem;

                         }

                     } else {

                         // No media specified - applies to all

                         $media = array('all');

                     }

-                    $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag );

+                    $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);

                 

-                    if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {

+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {

                         // <link>

-                        $url = current(explode('?',$source[2],2));

+                        $url = current(explode('?', $source[2], 2));

                         $path = $this->getpath($url);

                         

-                        if($path!==false && preg_match('#\.css$#',$path)) {

+                        if ($path !== false && preg_match('#\.css$#', $path)) {

                             // Good link

-                            $this->css[] = array($media,$path);

-                        }else{

+                            $this->css[] = array($media, $path);

+                        } else {

                             // Link is dynamic (.php etc)

                             $tag = '';

                         }

                     } else {

                         // inline css in style tags can be wrapped in comment tags, so restore comments

                         $tag = $this->restore_comments($tag);

-                        preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);

+                        preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);

 

                         // and re-hide them to be able to to the removal based on tag

                         $tag = $this->hide_comments($tag);

 

-                        if ( $this->include_inline ) {

-                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);

-                            $this->css[] = array($media,'INLINE;'.$code);

+                        if ($this->include_inline) {

+                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);

+                            $this->css[] = array($media, 'INLINE;'.$code);

                         } else {

                             $tag = '';

                         }

                     }

                     

                     // Remove the original style tag

-                    $this->content = str_replace($tag,'',$this->content);

+                    $this->content = str_replace($tag, '', $this->content);

                 }

             }

             return true;

@@ -168,29 +168,29 @@ 
     

     // Joins and optimizes CSS

     public function minify() {

-        foreach($this->css as $group) {

-            list($media,$css) = $group;

-            if(preg_match('#^INLINE;#',$css)) {

+        foreach ($this->css as $group) {

+            list($media, $css) = $group;

+            if (preg_match('#^INLINE;#', $css)) {

                 // <style>

-                $css = preg_replace('#^INLINE;#','',$css);

-                $css = $this->fixurls(ABSPATH.'/index.php',$css);

-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" );

-                if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {

-                    $css=$tmpstyle;

-                    $this->alreadyminified=true;

+                $css = preg_replace('#^INLINE;#', '', $css);

+                $css = $this->fixurls(ABSPATH.'/index.php', $css);

+                $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");

+                if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {

+                    $css = $tmpstyle;

+                    $this->alreadyminified = true;

                 }

             } else {

                 //<link>

-                if($css !== false && file_exists($css) && is_readable($css)) {

+                if ($css !== false && file_exists($css) && is_readable($css)) {

                     $cssPath = $css;

-                    $css = $this->fixurls($cssPath,file_get_contents($cssPath));

-                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);

-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath );

+                    $css = $this->fixurls($cssPath, file_get_contents($cssPath));

+                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);

+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);

                     if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {

-                        $css=$tmpstyle;

-                        $this->alreadyminified=true;

-                    } else if ($this->can_inject_late($cssPath,$css)) {

-                        $css="%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%";

+                        $css = $tmpstyle;

+                        $this->alreadyminified = true;

+                    } else if ($this->can_inject_late($cssPath, $css)) {

+                        $css = "%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%";

                     }

                 } else {

                     // Couldn't read CSS. Maybe getpath isn't working?

@@ -198,8 +198,8 @@ 
                 }

             }

             

-            foreach($media as $elem) {

-                if(!isset($this->csscode[$elem]))

+            foreach ($media as $elem) {

+                if (!isset($this->csscode[$elem]))

                     $this->csscode[$elem] = '';

                 $this->csscode[$elem] .= "\n/*FILESTART*/".$css;

             }

@@ -208,12 +208,12 @@ 
         // Check for duplicate code

         $md5list = array();

         $tmpcss = $this->csscode;

-        foreach($tmpcss as $media => $code) {

+        foreach ($tmpcss as $media => $code) {

             $md5sum = md5($code);

             $medianame = $media;

-            foreach($md5list as $med => $sum) {

+            foreach ($md5list as $med => $sum) {

                 // If same code

-                if($sum === $md5sum) {

+                if ($sum === $md5sum) {

                     //Add the merged code

                     $medianame = $med.', '.$media;

                     $this->csscode[$medianame] = $code;

@@ -233,29 +233,29 @@ 
             $external_imports = "";

 

             // remove comments to avoid importing commented-out imports

-            $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);

-            while(preg_match_all('#@import.*(?:;|$)#Um',$thiscss_nocomments,$matches)) {

-                foreach($matches[0] as $import)    {

-                    if ($this->isremovable($import,$this->cssremovables)) {

-                        $thiscss = str_replace($import,'',$thiscss);

+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);

+            while (preg_match_all('#@import.*(?:;|$)#Um', $thiscss_nocomments, $matches)) {

+                foreach ($matches[0] as $import) {

+                    if ($this->isremovable($import, $this->cssremovables)) {

+                        $thiscss = str_replace($import, '', $thiscss);

                         $import_ok = true;

                     } else {

-                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");

+                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");

                         $path = $this->getpath($url);

                         $import_ok = false;

                         if (file_exists($path) && is_readable($path)) {

-                            $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\");

-                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);

-                            $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" );

-                            if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {

-                                $code=$tmpstyle;

-                                $this->alreadyminified=true;

-                            } else if ($this->can_inject_late($path,$code)) {

-                                $code="%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%";

+                            $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\");

+                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);

+                            $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");

+                            if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {

+                                $code = $tmpstyle;

+                                $this->alreadyminified = true;

+                            } else if ($this->can_inject_late($path, $code)) {

+                                $code = "%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%";

                             }

                             

-                            if(!empty($code)) {

-                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);

+                            if (!empty($code)) {

+                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);

                                 if (!empty($tmp_thiscss)) {

                                     $thiscss = $tmp_thiscss;

                                     $import_ok = true;

@@ -269,32 +269,32 @@ 
                     if (!$import_ok) {

                         // external imports and general fall-back

                         $external_imports .= $import;

-                        $thiscss = str_replace($import,'',$thiscss);

+                        $thiscss = str_replace($import, '', $thiscss);

                         $fiximports = true;

                     }

                 }

-                $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);

-                $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);

+                $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);

+                $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);

                 

                 // and update $thiscss_nocomments before going into next iteration in while loop

-                $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);

+                $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);

             }

             unset($thiscss_nocomments);

             

             // add external imports to top of aggregated CSS

-            if($fiximports) {

-                $thiscss=$external_imports.$thiscss;

+            if ($fiximports) {

+                $thiscss = $external_imports.$thiscss;

             }

         }

         unset($thiscss);

         

         // $this->csscode has all the uncompressed code now. 

         $mhtmlcount = 0;

-        foreach($this->csscode as &$code) {

+        foreach ($this->csscode as &$code) {

             // Check for already-minified code

             $hash = md5($code);

-            $ccheck = new autoptimizeCache($hash,'css');

-            if($ccheck->check()) {

+            $ccheck = new autoptimizeCache($hash, 'css');

+            if ($ccheck->check()) {

                 $code = $ccheck->retrieve();

                 $this->hashmap[md5($code)] = $hash;

                 continue;

@@ -303,44 +303,44 @@ 
 

             // Do the imaging!

             $imgreplace = array();

-            preg_match_all('#(background[^;{}]*url\((?!\s?"?\'?\s?data)(.*)\)[^;}]*)(?:;|$|})#Usm',$code,$matches);

+            preg_match_all('#(background[^;{}]*url\((?!\s?"?\'?\s?data)(.*)\)[^;}]*)(?:;|$|})#Usm', $code, $matches);

             

-            if(($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)))    {

-                foreach($matches[2] as $count => $quotedurl) {

-                    $iurl = trim($quotedurl," \t\n\r\0\x0B\"'");

+            if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {

+                foreach ($matches[2] as $count => $quotedurl) {

+                    $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'");

 

                     // if querystring, remove it from url

-                    if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }

+                    if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }

                     

                     $ipath = $this->getpath($iurl);

 

                     $datauri_max_size = 4096;

-                    $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size );

-                    $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', "");

+                    $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);

+                    $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");

                     if (!empty($datauri_exclude)) {

-                        $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));

+                        $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));

                         foreach ($no_datauris as $no_datauri) {

-                            if (strpos($iurl,$no_datauri)!==false) {

-                                $ipath=false;

+                            if (strpos($iurl, $no_datauri) !== false) {

+                                $ipath = false;

                                 break;

                             }

                         }

                     }

 

-                    if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {

-                        $ihash=md5($ipath);

-                        $icheck = new autoptimizeCache($ihash,'img');

-                        if($icheck->check()) {

+                    if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {

+                        $ihash = md5($ipath);

+                        $icheck = new autoptimizeCache($ihash, 'img');

+                        if ($icheck->check()) {

                             // we have the base64 image in cache

-                            $headAndData=$icheck->retrieve();

-                            $_base64data=explode(";base64,",$headAndData);

-                            $base64data=$_base64data[1];

+                            $headAndData = $icheck->retrieve();

+                            $_base64data = explode(";base64,", $headAndData);

+                            $base64data = $_base64data[1];

                         } else {

                             // It's an image and we don't have it in cache, get the type

-                            $explA=explode('.',$ipath);

-                            $type=end($explA);

+                            $explA = explode('.', $ipath);

+                            $type = end($explA);

 

-                            switch($type) {

+                            switch ($type) {

                                 case 'jpeg':

                                     $dataurihead = 'data:image/jpeg;base64,';

                                     break;

@@ -362,15 +362,15 @@ 
                         

                             // Encode the data

                             $base64data = base64_encode(file_get_contents($ipath));

-                            $headAndData=$dataurihead.$base64data;

+                            $headAndData = $dataurihead.$base64data;

 

                             // Save in cache

-                            $icheck->cache($headAndData,"text/plain");

+                            $icheck->cache($headAndData, "text/plain");

                         }

                         unset($icheck);

 

                         // Add it to the list for replacement

-                        $imgreplace[$matches[1][$count]] = str_replace($quotedurl,$headAndData,$matches[1][$count]).";\n*".str_replace($quotedurl,'mhtml:%%MHTML%%!'.$mhtmlcount,$matches[1][$count]).";\n_".$matches[1][$count].';';

+                        $imgreplace[$matches[1][$count]] = str_replace($quotedurl, $headAndData, $matches[1][$count]).";\n*".str_replace($quotedurl, 'mhtml:%%MHTML%%!'.$mhtmlcount, $matches[1][$count]).";\n_".$matches[1][$count].';';

                         

                         // Store image on the mhtml document

                         $this->mhtml .= "--_\r\nContent-Location:{$mhtmlcount}\r\nContent-Transfer-Encoding:base64\r\n\r\n{$base64data}\r\n";

@@ -378,52 +378,52 @@ 
                     } else {

                         // just cdn the URL if applicable

                         if (!empty($this->cdn_url)) {

-                            $url = trim($quotedurl," \t\n\r\0\x0B\"'");

-                            $cdn_url=$this->url_replace_cdn($url);

-                            $imgreplace[$matches[1][$count]] = str_replace($quotedurl,$cdn_url,$matches[1][$count]);

+                            $url = trim($quotedurl, " \t\n\r\0\x0B\"'");

+                            $cdn_url = $this->url_replace_cdn($url);

+                            $imgreplace[$matches[1][$count]] = str_replace($quotedurl, $cdn_url, $matches[1][$count]);

                         }

                     }

                 }

             } else if ((is_array($matches)) && (!empty($this->cdn_url))) {

                 // change background image urls to cdn-url

-                foreach($matches[2] as $count => $quotedurl) {

-                    $url = trim($quotedurl," \t\n\r\0\x0B\"'");

-                    $cdn_url=$this->url_replace_cdn($url);

-                    $imgreplace[$matches[1][$count]] = str_replace($quotedurl,$cdn_url,$matches[1][$count]);

+                foreach ($matches[2] as $count => $quotedurl) {

+                    $url = trim($quotedurl, " \t\n\r\0\x0B\"'");

+                    $cdn_url = $this->url_replace_cdn($url);

+                    $imgreplace[$matches[1][$count]] = str_replace($quotedurl, $cdn_url, $matches[1][$count]);

                 }

             }

             

-            if(!empty($imgreplace)) {

-                $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code);

+            if (!empty($imgreplace)) {

+                $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code);

             }

             

             // CDN the fonts!

-            if ( (!empty($this->cdn_url)) && (apply_filters('autoptimize_filter_css_fonts_cdn',false)) && (version_compare(PHP_VERSION, '5.3.0') >= 0) ) {

+            if ((!empty($this->cdn_url)) && (apply_filters('autoptimize_filter_css_fonts_cdn', false)) && (version_compare(PHP_VERSION, '5.3.0') >= 0)) {

                 $fontreplace = array();

                 include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeFontRegex.php');

                 

-                preg_match_all($fonturl_regex,$code,$matches);

+                preg_match_all($fonturl_regex, $code, $matches);

                 if (is_array($matches)) {

-                    foreach($matches[8] as $count => $quotedurl) {

-                        $url = trim($quotedurl," \t\n\r\0\x0B\"'");

-                        $cdn_url=$this->url_replace_cdn($url);

-                        $fontreplace[$matches[8][$count]] = str_replace($quotedurl,$cdn_url,$matches[8][$count]);

+                    foreach ($matches[8] as $count => $quotedurl) {

+                        $url = trim($quotedurl, " \t\n\r\0\x0B\"'");

+                        $cdn_url = $this->url_replace_cdn($url);

+                        $fontreplace[$matches[8][$count]] = str_replace($quotedurl, $cdn_url, $matches[8][$count]);

                     }

-                    if(!empty($fontreplace)) {

-                        $code = str_replace(array_keys($fontreplace),array_values($fontreplace),$code);

+                    if (!empty($fontreplace)) {

+                        $code = str_replace(array_keys($fontreplace), array_values($fontreplace), $code);

                     }

                 }

             }

             

             // Minify

-            if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {

+            if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {

                 if (class_exists('Minify_CSS_Compressor')) {

                     $tmp_code = trim(Minify_CSS_Compressor::process($code));

-                } else if(class_exists('CSSmin')) {

+                } else if (class_exists('CSSmin')) {

                     $cssmin = new CSSmin();

-                    if (method_exists($cssmin,"run")) {

+                    if (method_exists($cssmin, "run")) {

                         $tmp_code = trim($cssmin->run($code));

-                    } elseif (@is_callable(array($cssmin,"minify"))) {

+                    } elseif (@is_callable(array($cssmin, "minify"))) {

                         $tmp_code = trim(CssMin::minify($code));

                     }

                 }

@@ -435,7 +435,7 @@ 
             

             $code = $this->inject_minified($code);

             

-            $tmp_code = apply_filters( 'autoptimize_css_after_minify',$code );

+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);

             if (!empty($tmp_code)) {

                 $code = $tmp_code;

                 unset($tmp_code);

@@ -449,31 +449,31 @@ 
     

     //Caches the CSS in uncompressed, deflated and gzipped form.

     public function cache() {

-        if($this->datauris) {

+        if ($this->datauris) {

             // MHTML Preparation

             $this->mhtml = "/*\r\nContent-Type: multipart/related; boundary=\"_\"\r\n\r\n".$this->mhtml."*/\r\n";

             $md5 = md5($this->mhtml);

-            $cache = new autoptimizeCache($md5,'txt');

-            if(!$cache->check()) {

+            $cache = new autoptimizeCache($md5, 'txt');

+            if (!$cache->check()) {

                 // Cache our images for IE

-                $cache->cache($this->mhtml,'text/plain');

+                $cache->cache($this->mhtml, 'text/plain');

             }

             $mhtml = AUTOPTIMIZE_CACHE_URL.$cache->getname();

         }

         

         // CSS cache

-        foreach($this->csscode as $media => $code) {

+        foreach ($this->csscode as $media => $code) {

             $md5 = $this->hashmap[md5($code)];

 

-            if($this->datauris)    {

+            if ($this->datauris) {

                 // Images for ie! Get the right url

-                $code = str_replace('%%MHTML%%',$mhtml,$code);

+                $code = str_replace('%%MHTML%%', $mhtml, $code);

             }

                 

-            $cache = new autoptimizeCache($md5,'css');

-            if(!$cache->check()) {

+            $cache = new autoptimizeCache($md5, 'css');

+            if (!$cache->check()) {

                 // Cache our code

-                $cache->cache($code,'text/css');

+                $cache->cache($code, 'text/css');

             }

             $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();

         }

@@ -488,7 +488,7 @@ 
         $this->content = $this->restore_comments($this->content);

         

         // restore (no)script

-        if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) { 

+        if (strpos($this->content, '%%SCRIPT%%') !== false) { 

             $this->content = preg_replace_callback(

                 '#%%SCRIPT%%(.*?)%%SCRIPT%%#is',

                 create_function(

@@ -503,71 +503,71 @@ 
         $this->content = $this->restore_noptimize($this->content);

         

         //Restore the full content

-        if(!empty($this->restofcontent)) {

+        if (!empty($this->restofcontent)) {

             $this->content .= $this->restofcontent;

             $this->restofcontent = '';

         }

         

         // Inject the new stylesheets

-        $replaceTag = array("<title","before");

-        $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag );

+        $replaceTag = array("<title", "before");

+        $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag);

 

         if ($this->inline == true) {

-            foreach($this->csscode as $media => $code) {

-                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);

+            foreach ($this->csscode as $media => $code) {

+                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);

             }

         } else {

             if ($this->defer == true) {

                 $deferredCssBlock = "<script data-cfasync='false'>function lCss(url,media) {var d=document;var l=d.createElement('link');l.rel='stylesheet';l.type='text/css';l.href=url;l.media=media;aoin=d.getElementById('aonoscrcss');aoin.parentNode.insertBefore(l,aoin.nextSibling);}function deferredCSS() {";

                 $noScriptCssBlock = "<noscript id=\"aonoscrcss\">";

-                $defer_inline_code=$this->defer_inline;

-                if(!empty($defer_inline_code)){

-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify',true ) ) {

-                        $iCssHash=md5($defer_inline_code);

-                        $iCssCache = new autoptimizeCache($iCssHash,'css');

-                        if($iCssCache->check()) { 

+                $defer_inline_code = $this->defer_inline;

+                if (!empty($defer_inline_code)) {

+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {

+                        $iCssHash = md5($defer_inline_code);

+                        $iCssCache = new autoptimizeCache($iCssHash, 'css');

+                        if ($iCssCache->check()) { 

                             // we have the optimized inline CSS in cache

-                            $defer_inline_code=$iCssCache->retrieve();

+                            $defer_inline_code = $iCssCache->retrieve();

                         } else {

                             if (class_exists('Minify_CSS_Compressor')) {

                                 $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code));

-                            } else if(class_exists('CSSmin')) {

+                            } else if (class_exists('CSSmin')) {

                                 $cssmin = new CSSmin();

                                 $tmp_code = trim($cssmin->run($defer_inline_code));

                             }

                             if (!empty($tmp_code)) {

                                 $defer_inline_code = $tmp_code;

-                                $iCssCache->cache($defer_inline_code,"text/css");

+                                $iCssCache->cache($defer_inline_code, "text/css");

                                 unset($tmp_code);

                             }

                         }

                     }

-                    $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';

-                    $this->inject_in_html($code_out,$replaceTag);

+                    $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';

+                    $this->inject_in_html($code_out, $replaceTag);

                 }

             }

 

-            foreach($this->url as $media => $url) {

+            foreach ($this->url as $media => $url) {

                 $url = $this->url_replace_cdn($url);

                 

                 //Add the stylesheet either deferred (import at bottom) or normal links in head

-                if($this->defer == true) {

+                if ($this->defer == true) {

                     $deferredCssBlock .= "lCss('".$url."','".$media."');";

                     $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />';

                 } else {

                     if (strlen($this->csscode[$media]) > $this->cssinlinesize) {

-                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);

-                    } else if (strlen($this->csscode[$media])>0) {

-                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);

+                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);

+                    } else if (strlen($this->csscode[$media]) > 0) {

+                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);

                     }

                 }

             }

             

-            if($this->defer == true) {

+            if ($this->defer == true) {

                 $deferredCssBlock .= "}if(window.addEventListener){window.addEventListener('DOMContentLoaded',deferredCSS,false);}else{window.onload = deferredCSS;}</script>";

                 $noScriptCssBlock .= "</noscript>";

-                $this->inject_in_html($noScriptCssBlock,$replaceTag);

-                $this->inject_in_html($deferredCssBlock,array('</body>','before'));

+                $this->inject_in_html($noScriptCssBlock, $replaceTag);

+                $this->inject_in_html($deferredCssBlock, array('</body>', 'before'));

             }

         }

 

@@ -575,34 +575,34 @@ 
         return $this->content;

     }

     

-    static function fixurls($file,$code) {

-        $file = str_replace(WP_ROOT_DIR,'/',$file);

+    static function fixurls($file, $code) {

+        $file = str_replace(WP_ROOT_DIR, '/', $file);

         $dir = dirname($file); //Like /wp-content

 

         // quick fix for import-troubles in e.g. arras theme

-        $code=preg_replace('#@import ("|\')(.+?)\.css("|\')#','@import url("${2}.css")',$code);

+        $code = preg_replace('#@import ("|\')(.+?)\.css("|\')#', '@import url("${2}.css")', $code);

 

-        if(preg_match_all('#url\((?!data)(?!\#)(?!"\#)(.*)\)#Usi',$code,$matches)) {

+        if (preg_match_all('#url\((?!data)(?!\#)(?!"\#)(.*)\)#Usi', $code, $matches)) {

             $replace = array();

-            foreach($matches[1] as $k => $url) {

+            foreach ($matches[1] as $k => $url) {

                 // Remove quotes

-                $url = trim($url," \t\n\r\0\x0B\"'");

-                $noQurl = trim($url,"\"'");

-                if ($url!==$noQurl) {

-                    $removedQuotes=true;

+                $url = trim($url, " \t\n\r\0\x0B\"'");

+                $noQurl = trim($url, "\"'");

+                if ($url !== $noQurl) {

+                    $removedQuotes = true;

                 } else {

-                    $removedQuotes=false;

+                    $removedQuotes = false;

                 }

-                $url=$noQurl;

-                if(substr($url,0,1)=='/' || preg_match('#^(https?://|ftp://|data:)#i',$url)) {

+                $url = $noQurl;

+                if (substr($url, 0, 1) == '/' || preg_match('#^(https?://|ftp://|data:)#i', $url)) {

                     //URL is absolute

                     continue;

                 } else {

                     // relative URL

-                    $newurl = preg_replace('/https?:/','',str_replace(" ","%20",AUTOPTIMIZE_WP_ROOT_URL.str_replace('//','/',$dir.'/'.$url)));

+                    $newurl = preg_replace('/https?:/', '', str_replace(" ", "%20", AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));

 

                     $hash = md5($url);

-                    $code = str_replace($matches[0][$k],$hash,$code);

+                    $code = str_replace($matches[0][$k], $hash, $code);

 

                     if (!empty($removedQuotes)) {

                         $replace[$hash] = 'url(\''.$newurl.'\')';

@@ -612,7 +612,7 @@ 
                 }

             }    

             //Do the replacing here to avoid breaking URLs

-            $code = str_replace(array_keys($replace),array_values($replace),$code);

+            $code = str_replace(array_keys($replace), array_values($replace), $code);

         }    

         return $code;

     }

@@ -620,7 +620,7 @@ 
     private function ismovable($tag) {

         if (!empty($this->whitelist)) {

             foreach ($this->whitelist as $match) {

-                if(strpos($tag,$match)!==false) {

+                if (strpos($tag, $match) !== false) {

                     return true;

                 }

             }

@@ -628,8 +628,8 @@ 
             return false;

         } else {

             if (is_array($this->dontmove)) {

-                foreach($this->dontmove as $match) {

-                    if(strpos($tag,$match)!==false) {

+                foreach ($this->dontmove as $match) {

+                    if (strpos($tag, $match) !== false) {

                         //Matched something

                         return false;

                     }

@@ -641,17 +641,17 @@ 
         }

     }

     

-    private function can_inject_late($cssPath,$css) {

-        if ((strpos($cssPath,"min.css")===false) || ($this->inject_min_late!==true)) {

+    private function can_inject_late($cssPath, $css) {

+        if ((strpos($cssPath, "min.css") === false) || ($this->inject_min_late !== true)) {

             // late-inject turned off or file not minified based on filename

             return false;

-        } else if (strpos($css,"@import")!==false) {

+        } else if (strpos($css, "@import") !== false) {

             // can't late-inject files with imports as those need to be aggregated 

             return false;

-        } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {

+        } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {

             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed

             return false;

-        } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {

+        } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {

             // don't late-inject CSS with images if CDN is set OR is image inlining is on

             return false;

         } else {

Braces +11 added lines, -5 removed lines

@@ -1,5 +1,8 @@ 
 <?php

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly

 

 class autoptimizeStyles extends autoptimizeBase {

     private $css = array();

@@ -22,7 +25,9 @@ 
     //Reads the page and collects style tags

     public function read($options) {

         $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );

-        if ($noptimizeCSS) return false;

+        if ($noptimizeCSS) {
+            return false;
+        }
 

         $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '' );

         if (!empty($whitelistCSS)) {

@@ -136,7 +141,7 @@ 
                         if($path!==false && preg_match('#\.css$#',$path)) {

                             // Good link

                             $this->css[] = array($media,$path);

-                        }else{

+                        } else{

                             // Link is dynamic (.php etc)

                             $tag = '';

                         }

@@ -199,8 +204,9 @@ 
             }

             

             foreach($media as $elem) {

-                if(!isset($this->csscode[$elem]))

-                    $this->csscode[$elem] = '';

+                if(!isset($this->csscode[$elem])) {
+                                    $this->csscode[$elem] = '';
+                }
                 $this->csscode[$elem] .= "\n/*FILESTART*/".$css;

             }

         }

classes/external/php/jsmin-1.1.1.php

Doc Comments +3 added lines

@@ -59,6 +59,9 @@
 

   // -- Public Static Methods --------------------------------------------------

 

+  /**
+   * @param string $js
+   */
   public static function minify($js) {

     $jsmin = new JSMin($js);

     return $jsmin->min();

Indentation +84 added lines, -84 removed lines

@@ -46,62 +46,62 @@ 
  */

 

 class JSMin {

-  const ORD_LF    = 10;

-  const ORD_SPACE = 32;

+    const ORD_LF    = 10;

+    const ORD_SPACE = 32;

 

-  protected $a           = '';

-  protected $b           = '';

-  protected $input       = '';

-  protected $inputIndex  = 0;

-  protected $inputLength = 0;

-  protected $lookAhead   = null;

-  protected $output      = '';

+    protected $a           = '';

+    protected $b           = '';

+    protected $input       = '';

+    protected $inputIndex  = 0;

+    protected $inputLength = 0;

+    protected $lookAhead   = null;

+    protected $output      = '';

 

-  // -- Public Static Methods --------------------------------------------------

+    // -- Public Static Methods --------------------------------------------------

 

-  public static function minify($js) {

+    public static function minify($js) {

     $jsmin = new JSMin($js);

     return $jsmin->min();

-  }

+    }

 

-  // -- Public Instance Methods ------------------------------------------------

+    // -- Public Instance Methods ------------------------------------------------

 

-  public function __construct($input) {

+    public function __construct($input) {

     $this->input       = str_replace("\r\n", "\n", $input);

     $this->inputLength = strlen($this->input);

-  }

+    }

 

-  // -- Protected Instance Methods ---------------------------------------------

+    // -- Protected Instance Methods ---------------------------------------------

 

-  protected function action($d) {

+    protected function action($d) {

     switch($d) {

-      case 1:

+        case 1:

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

 

-      case 2:

+        case 2:

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

 

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

-          for (;;) {

+            for (;;) {

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

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

 

             if ($this->a === $this->b) {

-              break;

+                break;

             }

 

             if (ord($this->a) <= self::ORD_LF) {

-              throw new JSMinException('Unterminated string literal.');

+                throw new JSMinException('Unterminated string literal.');

             }

 

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

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

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

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

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

+            }

             }

-          }

         }

 

-      case 3:

+        case 3:

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

 

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

@@ -109,70 +109,70 @@ 
             $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 (;;) {

+            for (;;) {

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

 

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

-              break;

+                break;

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

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

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

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

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

             } elseif (ord($this->a) <= self::ORD_LF) {

-              throw new JSMinException('Unterminated regular expression '.

-                  'literal.');

+                throw new JSMinException('Unterminated regular expression '.

+                    'literal.');

             }

 

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

-          }

+            }

 

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

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

         }

     }

-  }

+    }

 

-  protected function get() {

+    protected function get() {

     $c = $this->lookAhead;

     $this->lookAhead = null;

 

     if ($c === null) {

-      if ($this->inputIndex < $this->inputLength) {

+        if ($this->inputIndex < $this->inputLength) {

         $c = $this->input[$this->inputIndex];

         $this->inputIndex += 1;

-      } else {

+        } else {

         $c = null;

-      }

+        }

     }

 

     if ($c === "\r") {

-      return "\n";

+        return "\n";

     }

 

     if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {

-      return $c;

+        return $c;

     }

 

     return ' ';

-  }

+    }

 

-  protected function isAlphaNum($c) {

+    protected function isAlphaNum($c) {

     return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;

-  }

+    }

 

-  protected function min() {

+    protected function min() {

     $this->a = "\n";

     $this->action(3);

 

     while ($this->a !== null) {

-      switch ($this->a) {

+        switch ($this->a) {

         case ' ':

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

             $this->action(1);

-          } else {

+            } else {

             $this->action(2);

-          }

-          break;

+            }

+            break;

 

         case "\n":

           switch ($this->b) {

@@ -182,21 +182,21 @@ 
             case '+':

             case '-':

               $this->action(1);

-              break;

+                break;

 

             case ' ':

               $this->action(3);

-              break;

+                break;

 

             default:

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

                 $this->action(1);

-              }

-              else {

+                }

+                else {

                 $this->action(2);

-              }

-          }

-          break;

+                }

+            }

+            break;

 

         default:

           switch ($this->b) {

@@ -204,10 +204,10 @@ 
               if ($this->isAlphaNum($this->a)) {

                 $this->action(1);

                 break;

-              }

+                }

 

-              $this->action(3);

-              break;

+                $this->action(3);

+                break;

 

             case "\n":

               switch ($this->a) {

@@ -219,71 +219,71 @@ 
                 case '"':

                 case "'":

                   $this->action(1);

-                  break;

+                    break;

 

                 default:

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

                     $this->action(1);

-                  }

-                  else {

+                    }

+                    else {

                     $this->action(3);

-                  }

-              }

-              break;

+                    }

+                }

+                break;

 

             default:

               $this->action(1);

-              break;

-          }

-      }

+                break;

+            }

+        }

     }

 

     return $this->output;

-  }

+    }

 

-  protected function next() {

+    protected function next() {

     $c = $this->get();

 

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

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

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

         case '/':

           for (;;) {

             $c = $this->get();

 

             if (ord($c) <= self::ORD_LF) {

-              return $c;

+                return $c;

+            }

             }

-          }

 

         case '*':

           $this->get();

 

-          for (;;) {

+            for (;;) {

             switch($this->get()) {

-              case '*':

+                case '*':

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

-                  $this->get();

-                  return ' ';

+                    $this->get();

+                    return ' ';

                 }

                 break;

 

-              case null:

+                case null:

                 throw new JSMinException('Unterminated comment.');

             }

-          }

+            }

 

         default:

           return $c;

-      }

+        }

     }

 

     return $c;

-  }

+    }

 

-  protected function peek() {

+    protected function peek() {

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

     return $this->lookAhead;

-  }

+    }

 }

 

 // -- Exceptions ---------------------------------------------------------------

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-css-compressor.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * 
      * @param array $options (currently ignored)
      * 
-     * @return null
+     * @return string
      */
     private function __construct($options) {
         $this->_options = $options;

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];
     }
 }

classes/external/php/yui-php-cssmin-2.4.8-4.php

Doc Comments +10 added lines, -1 removed lines

@@ -686,6 +686,11 @@ 
      * ---------------------------------------------------------------------------------------------
      */
 
+    /**
+     * @param double $v1
+     * @param double $v2
+     * @param integer $vh
+     */
     private function hue_to_rgb($v1, $v2, $vh)
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
@@ -700,6 +705,10 @@ 
         return intval(floor(floatval($n) + 0.5), 10);
     }
 
+    /**
+     * @param integer $min
+     * @param integer $max
+     */
     private function clamp_number($n, $min, $max)
     {
         return min(max($n, $min), $max);
@@ -728,7 +737,7 @@ 
      *
      * @param string   $str
      * @param int      $start index
-     * @param int|bool $end index (optional)
+     * @param integer $end index (optional)
      * @return string
      */
     private function str_slice($str, $start = 0, $end = FALSE)

Indentation +10 added lines, -10 removed lines

@@ -264,8 +264,8 @@ 
         // Normalize all whitespace strings to single spaces. Easier to work with that way.
         $css = preg_replace('/\s+/', ' ', $css);
 
-		// Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
-		$css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css);
+        // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
+        $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css);
 
         // Shorten & preserve calculations calc(...) since spaces are important
         $css = preg_replace_callback('/calc(\(((?:[^\(\)]+|(?1))*)\))/i', array($this, 'replace_calc'), $css);
@@ -341,8 +341,8 @@ 
         // <percentage> data type: https://developer.mozilla.org/en-US/docs/Web/CSS/percentage
         $css = preg_replace('/([^\\\\]\:|\s)0(?:em|ex|ch|rem|vw|vh|vm|vmin|cm|mm|in|px|pt|pc|%)/iS', '${1}0', $css);
 
-		// 0% step in a keyframe? restore the % unit
-		$css = preg_replace_callback('/(@[a-z\-]*?keyframes[^\{]+\{)(.*?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css);
+        // 0% step in a keyframe? restore the % unit
+        $css = preg_replace_callback('/(@[a-z\-]*?keyframes[^\{]+\{)(.*?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css);
 
         // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0.
         $css = preg_replace('/\:0(?: 0){1,3}(;|\}| \!)/', ':0$1', $css);
@@ -381,7 +381,7 @@ 
         // Add "/" back to fix Opera -o-device-pixel-ratio query
         $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css);
 
-		// Replace multiple semi-colons in a row by a single one
+        // Replace multiple semi-colons in a row by a single one
         // See SF bug #1980989
         $css = preg_replace('/;;+/', ';', $css);
 
@@ -590,13 +590,13 @@ 
         return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
     }
 
-	private function preserve_old_IE_specific_matrix_definition($matches)
-	{
-		$this->preserved_tokens[] = $matches[1];
-		return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
+    private function preserve_old_IE_specific_matrix_definition($matches)
+    {
+        $this->preserved_tokens[] = $matches[1];
+        return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
     }
 
-	private function replace_keyframe_zero($matches)
+    private function replace_keyframe_zero($matches)
     {
         return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3];
     }

Spacing +56 added lines, -56 removed lines

@@ -43,10 +43,10 @@ 
     public function __construct($raise_php_limits = TRUE)
     {
         // Set suggested PHP limits
-        $this->memory_limit = 128 * 1048576; // 128MB in bytes
+        $this->memory_limit = 128*1048576; // 128MB in bytes
         $this->max_execution_time = 60; // 1 min
-        $this->pcre_backtrack_limit = 1000 * 1000;
-        $this->pcre_recursion_limit =  500 * 1000;
+        $this->pcre_backtrack_limit = 1000*1000;
+        $this->pcre_recursion_limit = 500*1000;
 
         $this->raise_php_limits = (bool) $raise_php_limits;
     }
@@ -83,8 +83,8 @@ 
             }
             $comment_found = $this->str_slice($css, $start_index + 2, $end_index);
             $this->comments[] = $comment_found;
-            $comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___';
-            $css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index);
+            $comment_preserve_string = self::COMMENT.(count($this->comments) - 1).'___';
+            $css = $this->str_slice($css, 0, $start_index + 2).$comment_preserve_string.$this->str_slice($css, $end_index);
             // Set correct start_index: Fixes issue #2528130
             $start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found);
         }
@@ -137,14 +137,14 @@ 
             $css_chunks[$i] = $this->minify($css_chunks[$i], $linebreak_pos);
             // Keep the first @charset at-rule found
             if (empty($charset) && preg_match($charset_regexp, $css_chunks[$i], $matches)) {
-                $charset = strtolower($matches[1]) . $matches[2];
+                $charset = strtolower($matches[1]).$matches[2];
             }
             // Delete all @charset at-rules
             $css_chunks[$i] = preg_replace($charset_regexp, '', $css_chunks[$i]);
         }
 
         // Update the first chunk and push the charset to the top of the file.
-        $css_chunks[0] = $charset . $css_chunks[0];
+        $css_chunks[0] = $charset.$css_chunks[0];
 
         return implode('', $css_chunks);
     }
@@ -219,17 +219,17 @@ 
         for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
 
             $token = $this->comments[$i];
-            $placeholder = '/' . self::COMMENT . $i . '___/';
+            $placeholder = '/'.self::COMMENT.$i.'___/';
 
             // ! in the first position of the comment means preserve
             // so push to the preserved tokens keeping the !
             if (substr($token, 0, 1) === '!') {
                 $this->preserved_tokens[] = $token;
-                $token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+                $token_tring = self::TOKEN.(count($this->preserved_tokens) - 1).'___';
                 $css = preg_replace($placeholder, $token_tring, $css, 1);
                 // Preserve new lines for /*! important comments
-                $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css);
-                $css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/', '$1'.self::NL, $css);
+                $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'.$token_tring.')/S', self::NL.'$1', $css);
+                $css = preg_replace('/('.$token_tring.'\*\/)\s*[\n\r\f]+\s*/', '$1'.self::NL, $css);
                 continue;
             }
 
@@ -237,10 +237,10 @@ 
             // shorten that to /*\*/ and the next one to /**/
             if (substr($token, (strlen($token) - 1), 1) === '\\') {
                 $this->preserved_tokens[] = '\\';
-                $css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
                 $i = $i + 1; // attn: advancing the loop
                 $this->preserved_tokens[] = '';
-                $css = preg_replace('/' . self::COMMENT . $i . '___/',  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                $css = preg_replace('/'.self::COMMENT.$i.'___/', self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
                 continue;
             }
 
@@ -251,13 +251,13 @@ 
                 if ($start_index > 2) {
                     if (substr($css, $start_index - 3, 1) === '>') {
                         $this->preserved_tokens[] = '';
-                        $css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                        $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
                     }
                 }
             }
 
             // in all other cases kill the comment
-            $css = preg_replace('/\/\*' . $this->str_slice($placeholder, 1, -1) . '\*\//', '', $css, 1);
+            $css = preg_replace('/\/\*'.$this->str_slice($placeholder, 1, -1).'\*\//', '', $css, 1);
         }
 
 
@@ -300,7 +300,7 @@ 
         $css = preg_replace('/\!important/i', ' !important', $css);
 
         // bring back the colon
-        $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css);
+        $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css);
 
         // retain space for special IE6 cases
         $css = preg_replace_callback('/\:first\-(line|letter)(\{|,)/i', array($this, 'lowercase_pseudo_first'), $css);
@@ -373,20 +373,20 @@ 
 
         // Find a fraction that is used for Opera's -o-device-pixel-ratio query
         // Add token to add the "\" back in later
-        $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
+        $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css);
 
         // Remove empty rules.
         $css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css);
 
         // Add "/" back to fix Opera -o-device-pixel-ratio query
-        $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css);
+        $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css);
 
 		// Replace multiple semi-colons in a row by a single one
         // See SF bug #1980989
         $css = preg_replace('/;;+/', ';', $css);
 
         // Restore new lines for /*! important comments
-        $css = preg_replace('/'. self::NL .'/', "\n", $css);
+        $css = preg_replace('/'.self::NL.'/', "\n", $css);
 
         // Lowercase all uppercase properties
         $css = preg_replace_callback('/(\{|\;)([A-Z\-]+)(\:)/', array($this, 'lowercase_properties'), $css);
@@ -400,7 +400,7 @@ 
             while ($i < strlen($css)) {
                 $i++;
                 if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) {
-                    $css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i);
+                    $css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i);
                     $start_index = $i;
                 }
             }
@@ -408,7 +408,7 @@ 
 
         // restore preserved comments and strings in reverse order
         for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) {
-            $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
+            $css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1);
         }
 
         // Trim the final string (for any leading or trailing white spaces)
@@ -448,7 +448,7 @@ 
                 $terminator = ')';
             }
 
-            while ($found_terminator === FALSE && $end_index+1 <= $max_index) {
+            while ($found_terminator === FALSE && $end_index + 1 <= $max_index) {
                 $end_index = $this->index_of($css, $terminator, $end_index + 1);
 
                 // endIndex == 0 doesn't really apply here
@@ -468,7 +468,7 @@ 
                 $token = preg_replace('/\s+/', '', $token);
                 $this->preserved_tokens[] = $token;
 
-                $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
+                $preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)';
                 $sb[] = $preserver;
 
                 $append_index = $end_index + 1;
@@ -530,16 +530,16 @@ 
 
             if ($is_filter) {
                 // Restore, maintain case, otherwise filter will break
-                $sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7];
+                $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7];
             } else {
                 if (strtolower($m[2]) == strtolower($m[3]) &&
                     strtolower($m[4]) == strtolower($m[5]) &&
                     strtolower($m[6]) == strtolower($m[7])) {
                     // Compress.
-                    $hex = '#' . strtolower($m[3] . $m[5] . $m[7]);
+                    $hex = '#'.strtolower($m[3].$m[5].$m[7]);
                 } else {
                     // Non compressible color, restore but lower case.
-                    $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]);
+                    $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]);
                 }
                 // replace Hex colors to short safe color names
                 $sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex;
@@ -568,7 +568,7 @@ 
         // one, maybe more? put'em back then
         if (($pos = $this->index_of($match, self::COMMENT)) >= 0) {
             for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
-                $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1);
+                $match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1);
             }
         }
 
@@ -576,7 +576,7 @@ 
         $match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match);
 
         $this->preserved_tokens[] = $match;
-        return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote;
+        return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote;
     }
 
     private function replace_colon($matches)
@@ -587,27 +587,27 @@ 
     private function replace_calc($matches)
     {
         $this->preserved_tokens[] = trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2]));
-        return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
+        return 'calc('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
     }
 
 	private function preserve_old_IE_specific_matrix_definition($matches)
 	{
 		$this->preserved_tokens[] = $matches[1];
-		return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
+		return 'filter:progid:DXImageTransform.Microsoft.Matrix('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
     }
 
 	private function replace_keyframe_zero($matches)
     {
-        return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3];
+        return $matches[1].preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]).$matches[3];
     }
 
     private function rgb_to_hex($matches)
     {
         // Support for percentage values rgb(100%, 0%, 45%);
-        if ($this->index_of($matches[1], '%') >= 0){
+        if ($this->index_of($matches[1], '%') >= 0) {
             $rgbcolors = explode(',', str_replace('%', '', $matches[1]));
             for ($i = 0; $i < count($rgbcolors); $i++) {
-                $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
+                $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i])*2.55);
             }
         } else {
             $rgbcolors = explode(',', $matches[1]);
@@ -620,11 +620,11 @@ 
         }
 
         // Fix for issue #2528093
-        if (!preg_match('/[\s\,\);\}]/', $matches[2])){
-            $matches[2] = ' ' . $matches[2];
+        if (!preg_match('/[\s\,\);\}]/', $matches[2])) {
+            $matches[2] = ' '.$matches[2];
         }
 
-        return '#' . implode('', $rgbcolors) . $matches[2];
+        return '#'.implode('', $rgbcolors).$matches[2];
     }
 
     private function hsl_to_hex($matches)
@@ -635,18 +635,18 @@ 
         $l = floatval($values[2]);
 
         // Wrap and clamp, then fraction!
-        $h = ((($h % 360) + 360) % 360) / 360;
-        $s = $this->clamp_number($s, 0, 100) / 100;
-        $l = $this->clamp_number($l, 0, 100) / 100;
+        $h = ((($h%360) + 360)%360)/360;
+        $s = $this->clamp_number($s, 0, 100)/100;
+        $l = $this->clamp_number($l, 0, 100)/100;
 
         if ($s == 0) {
-            $r = $g = $b = $this->round_number(255 * $l);
+            $r = $g = $b = $this->round_number(255*$l);
         } else {
-            $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
-            $v1 = (2 * $l) - $v2;
-            $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3)));
-            $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h));
-            $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3)));
+            $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l);
+            $v1 = (2*$l) - $v2;
+            $r = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h + (1/3)));
+            $g = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h));
+            $b = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h - (1/3)));
         }
 
         return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2]));
@@ -654,27 +654,27 @@ 
 
     private function lowercase_pseudo_first($matches)
     {
-        return ':first-'. strtolower($matches[1]) .' '. $matches[2];
+        return ':first-'.strtolower($matches[1]).' '.$matches[2];
     }
 
     private function lowercase_directives($matches)
     {
-        return '@'. strtolower($matches[1]);
+        return '@'.strtolower($matches[1]);
     }
 
     private function lowercase_pseudo_elements($matches)
     {
-        return ':'. strtolower($matches[1]);
+        return ':'.strtolower($matches[1]);
     }
 
     private function lowercase_common_functions($matches)
     {
-        return ':'. strtolower($matches[1]) .'(';
+        return ':'.strtolower($matches[1]).'(';
     }
 
     private function lowercase_common_functions_values($matches)
     {
-        return $matches[1] . strtolower($matches[2]);
+        return $matches[1].strtolower($matches[2]);
     }
 
     private function lowercase_properties($matches)
@@ -689,9 +689,9 @@ 
     private function hue_to_rgb($v1, $v2, $vh)
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
-        if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
-        if ($vh * 2 < 1) return $v2;
-        if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+        if ($vh*6 < 1) return $v1 + ($v2 - $v1)*6*$vh;
+        if ($vh*2 < 1) return $v2;
+        if ($vh*3 < 2) return $v1 + ($v2 - $v1)*((2/3) - $vh)*6;
         return $v1;
     }
 
@@ -766,9 +766,9 @@ 
     {
         if (is_string($size)) {
             switch (substr($size, -1)) {
-                case 'M': case 'm': return $size * 1048576;
-                case 'K': case 'k': return $size * 1024;
-                case 'G': case 'g': return $size * 1073741824;
+                case 'M': case 'm': return $size*1048576;
+                case 'K': case 'k': return $size*1024;
+                case 'G': case 'g': return $size*1073741824;
             }
         }
 

Braces +9 added lines, -3 removed lines

@@ -689,9 +689,15 @@
     private function hue_to_rgb($v1, $v2, $vh)
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
-        if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
-        if ($vh * 2 < 1) return $v2;
-        if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+        if ($vh * 6 < 1) {
+            return $v1 + ($v2 - $v1) * 6 * $vh;
+        }
+        if ($vh * 2 < 1) {
+            return $v2;
+        }
+        if ($vh * 3 < 2) {
+            return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+        }
         return $v1;
     }
 

classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php

Doc Comments +10 added lines, -1 removed lines

@@ -698,6 +698,11 @@ 
      * ---------------------------------------------------------------------------------------------
      */
 
+    /**
+     * @param double $v1
+     * @param double $v2
+     * @param integer $vh
+     */
     private function hue_to_rgb($v1, $v2, $vh)
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
@@ -712,6 +717,10 @@ 
         return intval(floor(floatval($n) + 0.5), 10);
     }
 
+    /**
+     * @param integer $min
+     * @param integer $max
+     */
     private function clamp_number($n, $min, $max)
     {
         return min(max($n, $min), $max);
@@ -740,7 +749,7 @@ 
      *
      * @param string   $str
      * @param int      $start index
-     * @param int|bool $end index (optional)
+     * @param integer $end index (optional)
      * @return string
      */
     private function str_slice($str, $start = 0, $end = FALSE)

Indentation +17 added lines, -17 removed lines

@@ -264,11 +264,11 @@ 
         // Normalize all whitespace strings to single spaces. Easier to work with that way.
         $css = preg_replace('/\s+/', ' ', $css);
 
-	// preserve flex, keeping percentage even if 0
-	$css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i',array($this, 'replace_flex'),$css);
+    // preserve flex, keeping percentage even if 0
+    $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i',array($this, 'replace_flex'),$css);
 
-	// Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
-	$css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css);
+    // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
+    $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css);
 
         // Shorten & preserve calculations calc(...) since spaces are important
         $css = preg_replace_callback('/calc(\(((?:[^\(\)]+|(?1))*)\))/i', array($this, 'replace_calc'), $css);
@@ -344,8 +344,8 @@ 
         // <percentage> data type: https://developer.mozilla.org/en-US/docs/Web/CSS/percentage
         $css = preg_replace('/([^\\\\]\:|\s)0(?:em|ex|ch|rem|vw|vh|vm|vmin|cm|mm|in|px|pt|pc|%)/iS', '${1}0', $css);
 
-		// 0% step in a keyframe? restore the % unit
-		$css = preg_replace_callback('/(@[a-z\-]*?keyframes[^\{]+\{)(.*?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css);
+        // 0% step in a keyframe? restore the % unit
+        $css = preg_replace_callback('/(@[a-z\-]*?keyframes[^\{]+\{)(.*?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css);
 
         // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0.
         $css = preg_replace('/\:0(?: 0){1,3}(;|\}| \!)/', ':0$1', $css);
@@ -384,7 +384,7 @@ 
         // Add "/" back to fix Opera -o-device-pixel-ratio query
         $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css);
 
-		// Replace multiple semi-colons in a row by a single one
+        // Replace multiple semi-colons in a row by a single one
         // See SF bug #1980989
         $css = preg_replace('/;;+/', ';', $css);
 
@@ -411,8 +411,8 @@ 
 
         // restore preserved comments and strings in reverse order
         for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) {
-			  $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
-			  // $css.=$this->preserved_tokens[$i];
+                $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
+                // $css.=$this->preserved_tokens[$i];
         }
 
         // Trim the final string (for any leading or trailing white spaces)
@@ -469,9 +469,9 @@ 
 
             if ($found_terminator) {
                 $token = $this->str_slice($css, $start_index, $end_index);
-				if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) {
-					$token = preg_replace('/\s+/', '', $token);
-				}
+                if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) {
+                    $token = preg_replace('/\s+/', '', $token);
+                }
                 $this->preserved_tokens[] = $token;
 
                 $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
@@ -602,13 +602,13 @@ 
         return 'flex:'.self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
     }   
 
-	private function preserve_old_IE_specific_matrix_definition($matches)
-	{
-		$this->preserved_tokens[] = $matches[1];
-		return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
+    private function preserve_old_IE_specific_matrix_definition($matches)
+    {
+        $this->preserved_tokens[] = $matches[1];
+        return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
     }
 
-	private function replace_keyframe_zero($matches)
+    private function replace_keyframe_zero($matches)
     {
         return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3];
     }

Spacing +60 added lines, -60 removed lines

@@ -43,10 +43,10 @@ 
     public function __construct($raise_php_limits = TRUE)
     {
         // Set suggested PHP limits
-        $this->memory_limit = 128 * 1048576; // 128MB in bytes
+        $this->memory_limit = 128*1048576; // 128MB in bytes
         $this->max_execution_time = 60; // 1 min
-        $this->pcre_backtrack_limit = 1000 * 1000;
-        $this->pcre_recursion_limit =  500 * 1000;
+        $this->pcre_backtrack_limit = 1000*1000;
+        $this->pcre_recursion_limit = 500*1000;
 
         $this->raise_php_limits = (bool) $raise_php_limits;
     }
@@ -83,8 +83,8 @@ 
             }
             $comment_found = $this->str_slice($css, $start_index + 2, $end_index);
             $this->comments[] = $comment_found;
-            $comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___';
-            $css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index);
+            $comment_preserve_string = self::COMMENT.(count($this->comments) - 1).'___';
+            $css = $this->str_slice($css, 0, $start_index + 2).$comment_preserve_string.$this->str_slice($css, $end_index);
             // Set correct start_index: Fixes issue #2528130
             $start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found);
         }
@@ -137,14 +137,14 @@ 
             $css_chunks[$i] = $this->minify($css_chunks[$i], $linebreak_pos);
             // Keep the first @charset at-rule found
             if (empty($charset) && preg_match($charset_regexp, $css_chunks[$i], $matches)) {
-                $charset = strtolower($matches[1]) . $matches[2];
+                $charset = strtolower($matches[1]).$matches[2];
             }
             // Delete all @charset at-rules
             $css_chunks[$i] = preg_replace($charset_regexp, '', $css_chunks[$i]);
         }
 
         // Update the first chunk and push the charset to the top of the file.
-        $css_chunks[0] = $charset . $css_chunks[0];
+        $css_chunks[0] = $charset.$css_chunks[0];
 
         return implode('', $css_chunks);
     }
@@ -219,17 +219,17 @@ 
         for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
 
             $token = $this->comments[$i];
-            $placeholder = '/' . self::COMMENT . $i . '___/';
+            $placeholder = '/'.self::COMMENT.$i.'___/';
 
             // ! in the first position of the comment means preserve
             // so push to the preserved tokens keeping the !
             if (substr($token, 0, 1) === '!') {
                 $this->preserved_tokens[] = $token;
-                $token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+                $token_tring = self::TOKEN.(count($this->preserved_tokens) - 1).'___';
                 $css = preg_replace($placeholder, $token_tring, $css, 1);
                 // Preserve new lines for /*! important comments
-                $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css);
-                $css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/', '$1'.self::NL, $css);
+                $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'.$token_tring.')/S', self::NL.'$1', $css);
+                $css = preg_replace('/('.$token_tring.'\*\/)\s*[\n\r\f]+\s*/', '$1'.self::NL, $css);
                 continue;
             }
 
@@ -237,10 +237,10 @@ 
             // shorten that to /*\*/ and the next one to /**/
             if (substr($token, (strlen($token) - 1), 1) === '\\') {
                 $this->preserved_tokens[] = '\\';
-                $css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
                 $i = $i + 1; // attn: advancing the loop
                 $this->preserved_tokens[] = '';
-                $css = preg_replace('/' . self::COMMENT . $i . '___/',  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                $css = preg_replace('/'.self::COMMENT.$i.'___/', self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
                 continue;
             }
 
@@ -251,13 +251,13 @@ 
                 if ($start_index > 2) {
                     if (substr($css, $start_index - 3, 1) === '>') {
                         $this->preserved_tokens[] = '';
-                        $css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+                        $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
                     }
                 }
             }
 
             // in all other cases kill the comment
-            $css = preg_replace('/\/\*' . $this->str_slice($placeholder, 1, -1) . '\*\//', '', $css, 1);
+            $css = preg_replace('/\/\*'.$this->str_slice($placeholder, 1, -1).'\*\//', '', $css, 1);
         }
 
 
@@ -265,7 +265,7 @@ 
         $css = preg_replace('/\s+/', ' ', $css);
 
 	// preserve flex, keeping percentage even if 0
-	$css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i',array($this, 'replace_flex'),$css);
+	$css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i', array($this, 'replace_flex'), $css);
 
 	// Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
 	$css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css);
@@ -303,7 +303,7 @@ 
         $css = preg_replace('/\!important/i', ' !important', $css);
 
         // bring back the colon
-        $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css);
+        $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css);
 
         // retain space for special IE6 cases
         $css = preg_replace_callback('/\:first\-(line|letter)(\{|,)/i', array($this, 'lowercase_pseudo_first'), $css);
@@ -376,20 +376,20 @@ 
 
         // Find a fraction that is used for Opera's -o-device-pixel-ratio query
         // Add token to add the "\" back in later
-        $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
+        $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css);
 
         // Remove empty rules.
         $css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css);
 
         // Add "/" back to fix Opera -o-device-pixel-ratio query
-        $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css);
+        $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css);
 
 		// Replace multiple semi-colons in a row by a single one
         // See SF bug #1980989
         $css = preg_replace('/;;+/', ';', $css);
 
         // Restore new lines for /*! important comments
-        $css = preg_replace('/'. self::NL .'/', "\n", $css);
+        $css = preg_replace('/'.self::NL.'/', "\n", $css);
 
         // Lowercase all uppercase properties
         $css = preg_replace_callback('/(\{|\;)([A-Z\-]+)(\:)/', array($this, 'lowercase_properties'), $css);
@@ -403,7 +403,7 @@ 
             while ($i < strlen($css)) {
                 $i++;
                 if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) {
-                    $css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i);
+                    $css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i);
                     $start_index = $i;
                 }
             }
@@ -411,7 +411,7 @@ 
 
         // restore preserved comments and strings in reverse order
         for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) {
-			  $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
+			  $css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1);
 			  // $css.=$this->preserved_tokens[$i];
         }
 
@@ -452,7 +452,7 @@ 
                 $terminator = ')';
             }
 
-            while ($found_terminator === FALSE && $end_index+1 <= $max_index) {
+            while ($found_terminator === FALSE && $end_index + 1 <= $max_index) {
                 $end_index = $this->index_of($css, $terminator, $end_index + 1);
 
                 // endIndex == 0 doesn't really apply here
@@ -469,12 +469,12 @@ 
 
             if ($found_terminator) {
                 $token = $this->str_slice($css, $start_index, $end_index);
-				if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) {
+				if (strpos($token, "<svg") === false && strpos($token, 'svg+xml') === false) {
 					$token = preg_replace('/\s+/', '', $token);
 				}
                 $this->preserved_tokens[] = $token;
 
-                $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
+                $preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)';
                 $sb[] = $preserver;
 
                 $append_index = $end_index + 1;
@@ -536,16 +536,16 @@ 
 
             if ($is_filter) {
                 // Restore, maintain case, otherwise filter will break
-                $sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7];
+                $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7];
             } else {
                 if (strtolower($m[2]) == strtolower($m[3]) &&
                     strtolower($m[4]) == strtolower($m[5]) &&
                     strtolower($m[6]) == strtolower($m[7])) {
                     // Compress.
-                    $hex = '#' . strtolower($m[3] . $m[5] . $m[7]);
+                    $hex = '#'.strtolower($m[3].$m[5].$m[7]);
                 } else {
                     // Non compressible color, restore but lower case.
-                    $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]);
+                    $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]);
                 }
                 // replace Hex colors to short safe color names
                 $sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex;
@@ -574,7 +574,7 @@ 
         // one, maybe more? put'em back then
         if (($pos = $this->index_of($match, self::COMMENT)) >= 0) {
             for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
-                $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1);
+                $match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1);
             }
         }
 
@@ -582,7 +582,7 @@ 
         $match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match);
 
         $this->preserved_tokens[] = $match;
-        return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote;
+        return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote;
     }
 
     private function replace_colon($matches)
@@ -592,34 +592,34 @@ 
 
     private function replace_calc($matches)
     {
-        $this->preserved_tokens[] = preg_replace('/\)([\+\-]{1})/',') $1',preg_replace('/([\+\-]{1})\(/','$1 (',trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2]))));
-        return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
+        $this->preserved_tokens[] = preg_replace('/\)([\+\-]{1})/', ') $1', preg_replace('/([\+\-]{1})\(/', '$1 (', trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2]))));
+        return 'calc('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
     }
     
     private function replace_flex($matches)
     {
         $this->preserved_tokens[] = trim($matches[1]);
-        return 'flex:'.self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+        return 'flex:'.self::TOKEN.(count($this->preserved_tokens) - 1).'___';
     }   
 
 	private function preserve_old_IE_specific_matrix_definition($matches)
 	{
 		$this->preserved_tokens[] = $matches[1];
-		return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
+		return 'filter:progid:DXImageTransform.Microsoft.Matrix('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
     }
 
 	private function replace_keyframe_zero($matches)
     {
-        return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3];
+        return $matches[1].preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]).$matches[3];
     }
 
     private function rgb_to_hex($matches)
     {
         // Support for percentage values rgb(100%, 0%, 45%);
-        if ($this->index_of($matches[1], '%') >= 0){
+        if ($this->index_of($matches[1], '%') >= 0) {
             $rgbcolors = explode(',', str_replace('%', '', $matches[1]));
             for ($i = 0; $i < count($rgbcolors); $i++) {
-                $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
+                $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i])*2.55);
             }
         } else {
             $rgbcolors = explode(',', $matches[1]);
@@ -632,11 +632,11 @@ 
         }
 
         // Fix for issue #2528093
-        if (!preg_match('/[\s\,\);\}]/', $matches[2])){
-            $matches[2] = ' ' . $matches[2];
+        if (!preg_match('/[\s\,\);\}]/', $matches[2])) {
+            $matches[2] = ' '.$matches[2];
         }
 
-        return '#' . implode('', $rgbcolors) . $matches[2];
+        return '#'.implode('', $rgbcolors).$matches[2];
     }
 
     private function hsl_to_hex($matches)
@@ -647,18 +647,18 @@ 
         $l = floatval($values[2]);
 
         // Wrap and clamp, then fraction!
-        $h = ((($h % 360) + 360) % 360) / 360;
-        $s = $this->clamp_number($s, 0, 100) / 100;
-        $l = $this->clamp_number($l, 0, 100) / 100;
+        $h = ((($h%360) + 360)%360)/360;
+        $s = $this->clamp_number($s, 0, 100)/100;
+        $l = $this->clamp_number($l, 0, 100)/100;
 
         if ($s == 0) {
-            $r = $g = $b = $this->round_number(255 * $l);
+            $r = $g = $b = $this->round_number(255*$l);
         } else {
-            $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
-            $v1 = (2 * $l) - $v2;
-            $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3)));
-            $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h));
-            $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3)));
+            $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l);
+            $v1 = (2*$l) - $v2;
+            $r = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h + (1/3)));
+            $g = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h));
+            $b = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h - (1/3)));
         }
 
         return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2]));
@@ -666,27 +666,27 @@ 
 
     private function lowercase_pseudo_first($matches)
     {
-        return ':first-'. strtolower($matches[1]) .' '. $matches[2];
+        return ':first-'.strtolower($matches[1]).' '.$matches[2];
     }
 
     private function lowercase_directives($matches)
     {
-        return '@'. strtolower($matches[1]);
+        return '@'.strtolower($matches[1]);
     }
 
     private function lowercase_pseudo_elements($matches)
     {
-        return ':'. strtolower($matches[1]);
+        return ':'.strtolower($matches[1]);
     }
 
     private function lowercase_common_functions($matches)
     {
-        return ':'. strtolower($matches[1]) .'(';
+        return ':'.strtolower($matches[1]).'(';
     }
 
     private function lowercase_common_functions_values($matches)
     {
-        return $matches[1] . strtolower($matches[2]);
+        return $matches[1].strtolower($matches[2]);
     }
 
     private function lowercase_properties($matches)
@@ -701,9 +701,9 @@ 
     private function hue_to_rgb($v1, $v2, $vh)
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
-        if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
-        if ($vh * 2 < 1) return $v2;
-        if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+        if ($vh*6 < 1) return $v1 + ($v2 - $v1)*6*$vh;
+        if ($vh*2 < 1) return $v2;
+        if ($vh*3 < 2) return $v1 + ($v2 - $v1)*((2/3) - $vh)*6;
         return $v1;
     }
 
@@ -778,9 +778,9 @@ 
     {
         if (is_string($size)) {
             switch (substr($size, -1)) {
-                case 'M': case 'm': return $size * 1048576;
-                case 'K': case 'k': return $size * 1024;
-                case 'G': case 'g': return $size * 1073741824;
+                case 'M': case 'm': return $size*1048576;
+                case 'K': case 'k': return $size*1024;
+                case 'G': case 'g': return $size*1073741824;
             }
         }
 

Braces +9 added lines, -3 removed lines

@@ -701,9 +701,15 @@
     private function hue_to_rgb($v1, $v2, $vh)
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
-        if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
-        if ($vh * 2 < 1) return $v2;
-        if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+        if ($vh * 6 < 1) {
+            return $v1 + ($v2 - $v1) * 6 * $vh;
+        }
+        if ($vh * 2 < 1) {
+            return $v2;
+        }
+        if ($vh * 3 < 2) {
+            return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+        }
         return $v1;
     }
 

config/default.php

Indentation +26 added lines, -26 removed lines

@@ -2,9 +2,9 @@ 
 
 //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 @@ 
 
 // 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 @@ 
 $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, must-revalidate');
-	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, must-revalidate');
+    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;
 }

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,27 +27,27 @@ 
 }
 
 //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');
 
-$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);
 	}
@@ -56,7 +56,7 @@ 
 	header('Content-type: %%CONTENT%%; charset=utf-8');
 	header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
 	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

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);