futtta / autoptimize

classes/autoptimizeScripts.php

Indentation +25 added lines, -25 removed lines

@@ -128,27 +128,27 @@ 
                             // should we add flags?
                             foreach ($excludeJS as $exclTag => $exclFlags) {
                                 if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) {
-                                   $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
+                                    $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
                                 }
                             }
                         }
                         
-   						// should we minify the non-aggregated script?
-						if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
-							$_CachedMinifiedUrl = $this->minify_single($path);
+                            // should we minify the non-aggregated script?
+                        if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
+                            $_CachedMinifiedUrl = $this->minify_single($path);
 
-							// replace orig URL with minified URL from cache if so
-							if (!empty($_CachedMinifiedUrl)) {
-								$newTag = str_replace($url, $_CachedMinifiedUrl, $newTag);
-							}
+                            // replace orig URL with minified URL from cache if so
+                            if (!empty($_CachedMinifiedUrl)) {
+                                $newTag = str_replace($url, $_CachedMinifiedUrl, $newTag);
+                            }
 							
-							// remove querystring from URL in newTag
-							if ( !empty($explUrl[1]) ) {
-								$newTag = str_replace("?".$explUrl[1],"",$newTag);
-							}
-						}
+                            // remove querystring from URL in newTag
+                            if ( !empty($explUrl[1]) ) {
+                                $newTag = str_replace("?".$explUrl[1],"",$newTag);
+                            }
+                        }
 
-						// should we move the non-aggregated script?
+                        // should we move the non-aggregated script?
                         if( $this->ismovable($newTag) ) {
                             // can be moved, flags and all
                             if( $this->movetolast($newTag) )    {
@@ -261,7 +261,7 @@ 
         
         //$this->jscode has all the uncompressed code now.
         if ($this->alreadyminified!==true) {
-          if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
+            if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
             if (@is_callable(array("JSMin","minify"))) {
                 $tmp_jscode = trim(JSMin::minify($this->jscode));
                 if (!empty($tmp_jscode)) {
@@ -275,10 +275,10 @@ 
                 $this->jscode = $this->inject_minified($this->jscode);
                 return false;
             }
-          } else {
-              $this->jscode = $this->inject_minified($this->jscode);
+            } else {
+                $this->jscode = $this->inject_minified($this->jscode);
             return false;
-          }
+            }
         }
         return true;
     }
@@ -340,8 +340,8 @@ 
     
     // Checks against the white- and blacklists
     private function ismergeable($tag) {
-		if (apply_filters('autoptimize_filter_js_dontaggregate',false)) {
-			return false;
+        if (apply_filters('autoptimize_filter_js_dontaggregate',false)) {
+            return false;
         } else if (!empty($this->whitelist)) {
             foreach ($this->whitelist as $match) {
                 if(strpos($tag,$match)!==false) {
@@ -449,15 +449,15 @@ 
      * 
      * @param string $jsPath
      * @return bool
-	 */
-	private function can_inject_late($jsPath) {
-		$consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
+     */
+    private function can_inject_late($jsPath) {
+        $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
         if ( $this->inject_min_late !== true ) {
             // late-inject turned off
             return false;
         } else if ( (strpos($jsPath,"min.js") === false) && ( strpos($jsPath,"wp-includes/js/jquery/jquery.js") === false ) && ( str_replace($consider_minified_array, '', $jsPath) === $jsPath ) ) {
-			// file not minified based on filename & filter
-			return false;
+            // file not minified based on filename & filter
+            return false;
         } else {
             // phew, all is safe, we can late-inject
             return true;

Spacing +114 added lines, -114 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeScripts extends autoptimizeBase {
     private $scripts = array();
-    private $dontmove = array('document.write','html5.js','show_ads.js','google_ad','blogcatalog.com/w','tweetmeme.com/i','mybloglog.com/','histats.com/js','ads.smowtion.com/ad.js','statcounter.com/counter/counter.js','widgets.amung.us','ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar','intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject','plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize');
-    private $domove = array('gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go');
-    private $domovelast = array('addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/','jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go');
+    private $dontmove = array('document.write', 'html5.js', 'show_ads.js', 'google_ad', 'blogcatalog.com/w', 'tweetmeme.com/i', 'mybloglog.com/', 'histats.com/js', 'ads.smowtion.com/ad.js', 'statcounter.com/counter/counter.js', 'widgets.amung.us', 'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar', 'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject', 'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize');
+    private $domove = array('gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go');
+    private $domovelast = array('addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/', 'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go');
     private $trycatch = false;
     private $alreadyminified = false;
     private $forcehead = true;
@@ -21,70 +21,70 @@ 
     
     //Reads the page and collects script tags
     public function read($options) {
-        $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content );
+        $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content);
         if ($noptimizeJS) return false;
 
         // only optimize known good JS?
-        $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content );
+        $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', '', $this->content);
         if (!empty($whitelistJS)) {
-            $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistJS)));
+            $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistJS)));
         }
 
         // is there JS we should simply remove
-        $removableJS = apply_filters( 'autoptimize_filter_js_removables', '', $this->content );
+        $removableJS = apply_filters('autoptimize_filter_js_removables', '', $this->content);
         if (!empty($removableJS)) {
-            $this->jsremovables = array_filter(array_map('trim',explode(",",$removableJS)));
+            $this->jsremovables = array_filter(array_map('trim', explode(",", $removableJS)));
         }
 
         // only header?
-        if( apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true ) {
-            $content = explode('</head>',$this->content,2);
+        if (apply_filters('autoptimize_filter_js_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_js_include_inline', $options['include_inline']) == true ) {
+        if (apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true) {
             $this->include_inline = true;
         }
 
         // filter to "late inject minified JS", default to true for now (it is faster)
-        $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late',true);
+        $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true);
 
         // filters to override hardcoded do(nt)move(last) array contents (array in, array out!)
-        $this->dontmove = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove );        
-        $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast );
-        $this->domove = apply_filters( 'autoptimize_filter_js_domove', $this->domove );
+        $this->dontmove = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove);        
+        $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast);
+        $this->domove = apply_filters('autoptimize_filter_js_domove', $this->domove);
 
         // get extra exclusions settings or filter
         $excludeJS = $options['js_exclude'];
-        $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS, $this->content );
-        if ($excludeJS!=="") {
+        $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS, $this->content);
+        if ($excludeJS !== "") {
             if (is_array($excludeJS)) {
-                if(($removeKeys = array_keys($excludeJS,"remove")) !== false) {
+                if (($removeKeys = array_keys($excludeJS, "remove")) !== false) {
                     foreach ($removeKeys as $removeKey) {
                         unset($excludeJS[$removeKey]);
-                        $this->jsremovables[]=$removeKey;
+                        $this->jsremovables[] = $removeKey;
                     }
                 }
                 $exclJSArr = array_keys($excludeJS);
             } else {
-                $exclJSArr = array_filter(array_map('trim',explode(",",$excludeJS)));
+                $exclJSArr = array_filter(array_map('trim', explode(",", $excludeJS)));
             }
-            $this->dontmove = array_merge($exclJSArr,$this->dontmove);
+            $this->dontmove = array_merge($exclJSArr, $this->dontmove);
         }
 
         //Should we add try-catch?
-        if($options['trycatch'] == true)
+        if ($options['trycatch'] == true)
             $this->trycatch = true;
 
         // force js in head?    
-        if($options['forcehead'] == true) {
+        if ($options['forcehead'] == true) {
             $this->forcehead = true;
         } else {
             $this->forcehead = false;
         }
-        $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead );
+        $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead);
 
         // get cdn url
         $this->cdn_url = $options['cdn_url'];
@@ -99,24 +99,24 @@ 
         $this->content = $this->hide_comments($this->content);
 
         // Get script files
-        if (preg_match_all('#<script.*</script>#Usmi',$this->content,$matches)) {
-            foreach($matches[0] as $tag) {
+        if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) {
+            foreach ($matches[0] as $tag) {
                 // only consider script aggregation for types whitelisted in should_aggregate-function
-                if( !$this->should_aggregate($tag) ) {
-                    $tag='';
+                if (!$this->should_aggregate($tag)) {
+                    $tag = '';
                     continue;
                 }
 
-                if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi',$tag,$source)) {
+                if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) {
                     // non-inline script
-                    if ($this->isremovable($tag,$this->jsremovables)) {
-                        $this->content = str_replace($tag,'',$this->content);
+                    if ($this->isremovable($tag, $this->jsremovables)) {
+                        $this->content = str_replace($tag, '', $this->content);
                         continue;
                     }
-                    $explUrl = explode('?',$source[2],2);
+                    $explUrl = explode('?', $source[2], 2);
                     $url = $explUrl[0];
                     $path = $this->getpath($url);
-                    if($path !== false && preg_match('#\.js$#',$path) && $this->ismergeable($tag)) {
+                    if ($path !== false && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) {
                         // ok to optimize, add to array
                         $this->scripts[] = $path;
                     } else {
@@ -127,14 +127,14 @@ 
                         if (is_array($excludeJS)) {
                             // should we add flags?
                             foreach ($excludeJS as $exclTag => $exclFlags) {
-                                if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) {
-                                   $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
+                                if (strpos($origTag, $exclTag) !== false && in_array($exclFlags, array("async", "defer"))) {
+                                   $newTag = str_replace('<script ', '<script '.$exclFlags.' ', $newTag);
                                 }
                             }
                         }
                         
    						// should we minify the non-aggregated script?
-						if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
+						if ($path && apply_filters('autoptimize_filter_js_minify_excluded', false)) {
 							$_CachedMinifiedUrl = $this->minify_single($path);
 
 							// replace orig URL with minified URL from cache if so
@@ -143,23 +143,23 @@ 
 							}
 							
 							// remove querystring from URL in newTag
-							if ( !empty($explUrl[1]) ) {
-								$newTag = str_replace("?".$explUrl[1],"",$newTag);
+							if (!empty($explUrl[1])) {
+								$newTag = str_replace("?".$explUrl[1], "", $newTag);
 							}
 						}
 
 						// should we move the non-aggregated script?
-                        if( $this->ismovable($newTag) ) {
+                        if ($this->ismovable($newTag)) {
                             // can be moved, flags and all
-                            if( $this->movetolast($newTag) )    {
+                            if ($this->movetolast($newTag)) {
                                 $this->move['last'][] = $newTag;
                             } else {
                                 $this->move['first'][] = $newTag;
                             }
                         } else {
                             // cannot be moved, so if flag was added re-inject altered tag immediately
-                            if ( $origTag !== $newTag ) {
-                                $this->content = str_replace($origTag,$newTag,$this->content);
+                            if ($origTag !== $newTag) {
+                                $this->content = str_replace($origTag, $newTag, $this->content);
                                 $origTag = '';
                             }
                             // and forget about the $tag (not to be touched any more)
@@ -168,23 +168,23 @@ 
                     }
                 } else {
                     // Inline script
-                    if ($this->isremovable($tag,$this->jsremovables)) {
-                        $this->content = str_replace($tag,'',$this->content);
+                    if ($this->isremovable($tag, $this->jsremovables)) {
+                        $this->content = str_replace($tag, '', $this->content);
                         continue;
                     }
                     
                     // unhide comments, as javascript may be wrapped in comment-tags for old times' sake
                     $tag = $this->restore_comments($tag);
-                    if($this->ismergeable($tag) && ( $this->include_inline )) {
-                        preg_match('#<script.*>(.*)</script>#Usmi',$tag,$code);
-                        $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm','$1',$code[1]);
-                        $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/','',$code);
+                    if ($this->ismergeable($tag) && ($this->include_inline)) {
+                        preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code);
+                        $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]);
+                        $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code);
                         $this->scripts[] = 'INLINE;'.$code;
                     } else {
                         // Can we move this?
-                        $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag );
-                        if( $this->ismovable($tag) || $autoptimize_js_moveable !== '' ) {
-                            if( $this->movetolast($tag) || $autoptimize_js_moveable === 'last' ) {
+                        $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag);
+                        if ($this->ismovable($tag) || $autoptimize_js_moveable !== '') {
+                            if ($this->movetolast($tag) || $autoptimize_js_moveable === 'last') {
                                 $this->move['last'][] = $tag;
                             } else {
                                 $this->move['first'][] = $tag;
@@ -199,7 +199,7 @@ 
                 }
                 
                 //Remove the original script tag
-                $this->content = str_replace($tag,'',$this->content);
+                $this->content = str_replace($tag, '', $this->content);
             }
             
             return true;
@@ -211,37 +211,37 @@ 
     
     //Joins and optimizes JS
     public function minify() {
-        foreach($this->scripts as $script) {
-            if(preg_match('#^INLINE;#',$script)) {
+        foreach ($this->scripts as $script) {
+            if (preg_match('#^INLINE;#', $script)) {
                 //Inline script
-                $script = preg_replace('#^INLINE;#','',$script);
-                $script = rtrim( $script, ";\n\t\r" ) . ';';
+                $script = preg_replace('#^INLINE;#', '', $script);
+                $script = rtrim($script, ";\n\t\r").';';
                 //Add try-catch?
-                if($this->trycatch) {
+                if ($this->trycatch) {
                     $script = 'try{'.$script.'}catch(e){}';
                 }
-                $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' );
-                if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscript) ) {
-                    $script=$tmpscript;
-                    $this->alreadyminified=true;
+                $tmpscript = apply_filters('autoptimize_js_individual_script', $script, '');
+                if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) {
+                    $script = $tmpscript;
+                    $this->alreadyminified = true;
                 }
-                $this->jscode .= "\n" . $script;
+                $this->jscode .= "\n".$script;
             } else {
                 //External script
-                if($script !== false && file_exists($script) && is_readable($script)) {
+                if ($script !== false && file_exists($script) && is_readable($script)) {
                     $scriptsrc = file_get_contents($script);
-                    $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$scriptsrc);
-                    $scriptsrc = rtrim($scriptsrc,";\n\t\r").';';
+                    $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc);
+                    $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';';
                     //Add try-catch?
-                    if($this->trycatch) {
+                    if ($this->trycatch) {
                         $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}';
                     }
-                    $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script );
-                    if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc) ) {
-                        $scriptsrc=$tmpscriptsrc;
-                        $this->alreadyminified=true;
+                    $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script);
+                    if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) {
+                        $scriptsrc = $tmpscriptsrc;
+                        $this->alreadyminified = true;
                     } else if ($this->can_inject_late($script)) {
-                        $scriptsrc="/*!%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%*/";
+                        $scriptsrc = "/*!%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%*/";
                     }
                     $this->jscode .= "\n".$scriptsrc;
                 }/*else{
@@ -252,24 +252,24 @@ 
 
         //Check for already-minified code
         $this->md5hash = md5($this->jscode);
-        $ccheck = new autoptimizeCache($this->md5hash,'js');
-        if($ccheck->check()) {
+        $ccheck = new autoptimizeCache($this->md5hash, 'js');
+        if ($ccheck->check()) {
             $this->jscode = $ccheck->retrieve();
             return true;
         }
         unset($ccheck);
         
         //$this->jscode has all the uncompressed code now.
-        if ($this->alreadyminified!==true) {
-          if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
-            if (@is_callable(array("JSMin","minify"))) {
+        if ($this->alreadyminified !== true) {
+          if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) {
+            if (@is_callable(array("JSMin", "minify"))) {
                 $tmp_jscode = trim(JSMin::minify($this->jscode));
                 if (!empty($tmp_jscode)) {
                     $this->jscode = $tmp_jscode;
                     unset($tmp_jscode);
                 }
                 $this->jscode = $this->inject_minified($this->jscode);
-                $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+                $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
                 return true;
             } else {
                 $this->jscode = $this->inject_minified($this->jscode);
@@ -284,11 +284,11 @@ 
     }
     
     //Caches the JS in uncompressed, deflated and gzipped form.
-    public function cache()    {
-        $cache = new autoptimizeCache($this->md5hash,'js');
-        if(!$cache->check()) {
+    public function cache() {
+        $cache = new autoptimizeCache($this->md5hash, 'js');
+        if (!$cache->check()) {
             //Cache our code
-            $cache->cache($this->jscode,'text/javascript');
+            $cache->cache($this->jscode, 'text/javascript');
         }
         $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         $this->url = $this->url_replace_cdn($this->url);
@@ -297,32 +297,32 @@ 
     // Returns the content
     public function getcontent() {
         // Restore the full content
-        if(!empty($this->restofcontent)) {
+        if (!empty($this->restofcontent)) {
             $this->content .= $this->restofcontent;
             $this->restofcontent = '';
         }
         
         // Add the scripts taking forcehead/ deferred (default) into account
-        if($this->forcehead == true) {
-            $replaceTag=array("</head>","before");
-            $defer="";
+        if ($this->forcehead == true) {
+            $replaceTag = array("</head>", "before");
+            $defer = "";
         } else {
-            $replaceTag=array("</body>","before");
-            $defer="defer ";
+            $replaceTag = array("</body>", "before");
+            $defer = "defer ";
         }
         
-        $defer = apply_filters( 'autoptimize_filter_js_defer', $defer );
+        $defer = apply_filters('autoptimize_filter_js_defer', $defer);
         $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>';
-        $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload',$bodyreplacementpayload);
+        $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload);
 
-        $bodyreplacement = implode('',$this->move['first']);
+        $bodyreplacement = implode('', $this->move['first']);
         $bodyreplacement .= $bodyreplacementpayload;
-        $bodyreplacement .= implode('',$this->move['last']);
+        $bodyreplacement .= implode('', $this->move['last']);
 
-        $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag );
+        $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag);
 
-        if (strlen($this->jscode)>0) {
-            $this->inject_in_html($bodyreplacement,$replaceTag);
+        if (strlen($this->jscode) > 0) {
+            $this->inject_in_html($bodyreplacement, $replaceTag);
         }
         
         // restore comments
@@ -340,19 +340,19 @@ 
     
     // Checks against the white- and blacklists
     private function ismergeable($tag) {
-		if (apply_filters('autoptimize_filter_js_dontaggregate',false)) {
+		if (apply_filters('autoptimize_filter_js_dontaggregate', false)) {
 			return false;
         } else if (!empty($this->whitelist)) {
             foreach ($this->whitelist as $match) {
-                if(strpos($tag,$match)!==false) {
+                if (strpos($tag, $match) !== false) {
                     return true;
                 }
             }
             // no match with whitelist
             return false;
         } else {
-            foreach($this->domove as $match) {
-                if(strpos($tag,$match)!==false)    {
+            foreach ($this->domove as $match) {
+                if (strpos($tag, $match) !== false) {
                     // Matched something
                     return false;
                 }
@@ -362,8 +362,8 @@ 
                 return false;
             }
             
-            foreach($this->dontmove as $match) {
-                if(strpos($tag,$match)!==false)    {
+            foreach ($this->dontmove as $match) {
+                if (strpos($tag, $match) !== false) {
                     //Matched something
                     return false;
                 }
@@ -376,12 +376,12 @@ 
     
     // Checks againstt the blacklist
     private function ismovable($tag) {
-        if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) {
+        if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable', true)) {
             return false;
         }
         
-        foreach($this->domove as $match) {
-            if(strpos($tag,$match)!==false)    {
+        foreach ($this->domove as $match) {
+            if (strpos($tag, $match) !== false) {
                 // Matched something
                 return true;
             }
@@ -391,8 +391,8 @@ 
             return true;
         }
         
-        foreach($this->dontmove as $match) {
-            if(strpos($tag,$match)!==false) {
+        foreach ($this->dontmove as $match) {
+            if (strpos($tag, $match) !== false) {
                 // Matched something
                 return false;
             }
@@ -403,8 +403,8 @@ 
     }
     
     private function movetolast($tag) {
-        foreach($this->domovelast as $match) {
-            if(strpos($tag,$match)!==false)    {
+        foreach ($this->domovelast as $match) {
+            if (strpos($tag, $match) !== false) {
                 // Matched, return true
                 return true;
             }
@@ -430,10 +430,10 @@ 
      * original function by https://github.com/zytzagoo/ on his AO fork, thanks Tomas!
      */
     public function should_aggregate($tag) {
-        preg_match('#<(script[^>]*)>#i',$tag,$scripttag);
-        if ( strpos($scripttag[1], 'type')===false ) {
+        preg_match('#<(script[^>]*)>#i', $tag, $scripttag);
+        if (strpos($scripttag[1], 'type') === false) {
             return true;
-        } else if ( preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1]) ) {
+        } else if (preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1])) {
             return true;
         } else {
             return false;
@@ -451,11 +451,11 @@ 
      * @return bool
 	 */
 	private function can_inject_late($jsPath) {
-		$consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
-        if ( $this->inject_min_late !== true ) {
+		$consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
+        if ($this->inject_min_late !== true) {
             // late-inject turned off
             return false;
-        } else if ( (strpos($jsPath,"min.js") === false) && ( strpos($jsPath,"wp-includes/js/jquery/jquery.js") === false ) && ( str_replace($consider_minified_array, '', $jsPath) === $jsPath ) ) {
+        } else if ((strpos($jsPath, "min.js") === false) && (strpos($jsPath, "wp-includes/js/jquery/jquery.js") === false) && (str_replace($consider_minified_array, '', $jsPath) === $jsPath)) {
 			// file not minified based on filename & filter
 			return false;
         } else {

Braces +10 added lines, -4 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 class autoptimizeScripts extends autoptimizeBase {
     private $scripts = array();
@@ -22,7 +25,9 @@ 
     //Reads the page and collects script tags
     public function read($options) {
         $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content );
-        if ($noptimizeJS) return false;
+        if ($noptimizeJS) {
+            return false;
+        }
 
         // only optimize known good JS?
         $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content );
@@ -75,8 +80,9 @@ 
         }
 
         //Should we add try-catch?
-        if($options['trycatch'] == true)
-            $this->trycatch = true;
+        if($options['trycatch'] == true) {
+                    $this->trycatch = true;
+        }
 
         // force js in head?    
         if($options['forcehead'] == true) {

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

Spacing +73 added lines, -73 removed lines

@@ -49,13 +49,13 @@ 
      */
     public function __construct($raisePhpLimits = true)
     {
-        $this->memoryLimit = 128 * 1048576; // 128MB in bytes
-        $this->pcreBacktrackLimit = 1000 * 1000;
-        $this->pcreRecursionLimit = 500 * 1000;
+        $this->memoryLimit = 128*1048576; // 128MB in bytes
+        $this->pcreBacktrackLimit = 1000*1000;
+        $this->pcreRecursionLimit = 500*1000;
 
         $this->raisePhpLimits = (bool) $raisePhpLimits;
 
-        $this->numRegex = '(?:\+|-)?\d*\.?\d+' . $this->unitsGroupRegex .'?';
+        $this->numRegex = '(?:\+|-)?\d*\.?\d+'.$this->unitsGroupRegex.'?';
     }
 
     /**
@@ -134,14 +134,14 @@ 
             $cssChunks[$i] = $this->minify($cssChunks[$i], $linebreakPos);
             // Keep the first @charset at-rule found
             if (empty($charset) && preg_match($charsetRegexp, $cssChunks[$i], $matches)) {
-                $charset = strtolower($matches[1]) . $matches[2];
+                $charset = strtolower($matches[1]).$matches[2];
             }
             // Delete all @charset at-rules
             $cssChunks[$i] = preg_replace($charsetRegexp, '', $cssChunks[$i]);
         }
 
         // Update the first chunk and push the charset to the top of the file.
-        $cssChunks[0] = $charset . $cssChunks[0];
+        $cssChunks[0] = $charset.$cssChunks[0];
 
         return trim(implode('', $cssChunks));
     }
@@ -235,7 +235,7 @@ 
     private function registerPreservedToken($token)
     {
         $this->preservedTokens[] = $token;
-        return self::TOKEN . (count($this->preservedTokens) - 1) .'___';
+        return self::TOKEN.(count($this->preservedTokens) - 1).'___';
     }
 
     /**
@@ -245,7 +245,7 @@ 
      */
     private function getPreservedTokenPlaceholderRegexById($id)
     {
-        return '/'. self::TOKEN . $id .'___/';
+        return '/'.self::TOKEN.$id.'___/';
     }
 
     /**
@@ -256,7 +256,7 @@ 
     private function registerComment($comment)
     {
         $this->comments[] = $comment;
-        return '/*'. self::COMMENT . (count($this->comments) - 1) .'___*/';
+        return '/*'.self::COMMENT.(count($this->comments) - 1).'___*/';
     }
 
     /**
@@ -266,7 +266,7 @@ 
      */
     private function getCommentPlaceholderById($id)
     {
-        return self::COMMENT . $id .'___';
+        return self::COMMENT.$id.'___';
     }
 
     /**
@@ -276,7 +276,7 @@ 
      */
     private function getCommentPlaceholderRegexById($id)
     {
-        return '/'. $this->getCommentPlaceholderById($id) .'/';
+        return '/'.$this->getCommentPlaceholderById($id).'/';
     }
 
     /**
@@ -287,7 +287,7 @@ 
     private function registerAtRuleBlock($block)
     {
         $this->atRuleBlocks[] = $block;
-        return self::AT_RULE_BLOCK . (count($this->atRuleBlocks) - 1) .'___';
+        return self::AT_RULE_BLOCK.(count($this->atRuleBlocks) - 1).'___';
     }
 
     /**
@@ -297,7 +297,7 @@ 
      */
     private function getAtRuleBlockPlaceholderRegexById($id)
     {
-        return '/'. self::AT_RULE_BLOCK . $id .'___/';
+        return '/'.self::AT_RULE_BLOCK.$id.'___/';
     }
 
     /**
@@ -330,8 +330,8 @@ 
                 $preservedTokenPlaceholder = $this->registerPreservedToken($comment);
                 $css = preg_replace($commentPlaceholderRegex, $preservedTokenPlaceholder, $css, 1);
                 // Preserve new lines for /*! important comments
-                $css = preg_replace('/\R+\s*(\/\*'. $preservedTokenPlaceholder .')/', self::NL.'$1', $css);
-                $css = preg_replace('/('. $preservedTokenPlaceholder .'\*\/)\s*\R+/', '$1'.self::NL, $css);
+                $css = preg_replace('/\R+\s*(\/\*'.$preservedTokenPlaceholder.')/', self::NL.'$1', $css);
+                $css = preg_replace('/('.$preservedTokenPlaceholder.'\*\/)\s*\R+/', '$1'.self::NL, $css);
                 continue;
             }
 
@@ -360,14 +360,14 @@ 
             }
 
             // in all other cases kill the comment
-            $css = preg_replace('/\/\*' . $commentPlaceholder . '\*\//', '', $css, 1);
+            $css = preg_replace('/\/\*'.$commentPlaceholder.'\*\//', '', $css, 1);
         }
 
         // Normalize all whitespace strings to single spaces. Easier to work with that way.
         $css = preg_replace('/\s+/', ' ', $css);
 
         // Remove spaces before & after newlines
-        $css = preg_replace('/\s*'. self::NL .'\s*/', self::NL, $css);
+        $css = preg_replace('/\s*'.self::NL.'\s*/', self::NL, $css);
 
         // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
         $css = preg_replace_callback(
@@ -409,7 +409,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, 'lowercasePseudoFirst'), $css);
@@ -419,7 +419,7 @@ 
 
         // lowercase some popular @directives
         $css = preg_replace_callback(
-            '/@(document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|namespace|page|' .
+            '/@(document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|namespace|page|'.
             'supports|viewport)/i',
             array($this, 'lowercaseDirectives'),
             $css
@@ -427,7 +427,7 @@ 
 
         // lowercase some more common pseudo-elements
         $css = preg_replace_callback(
-            '/:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|' .
+            '/:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|'.
             'last-(?:child|of-type)|link|only-(?:child|of-type)|root|:selection|target|visited)/i',
             array($this, 'lowercasePseudoElements'),
             $css
@@ -443,7 +443,7 @@ 
         // lower case some common function that can be values
         // NOTE: rgb() isn't useful as we replace with #hex later, as well as and() is already done for us
         $css = preg_replace_callback(
-            '/([:,( ]\s*)(attr|color-stop|from|rgba|to|url|-webkit-gradient|' .
+            '/([:,( ]\s*)(attr|color-stop|from|rgba|to|url|-webkit-gradient|'.
             '(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?(?:calc|max|min|(?:repeating-)?(?:linear|radial)-gradient))/iS',
             array($this, 'lowercaseCommonFunctionsValues'),
             $css
@@ -500,19 +500,19 @@ 
 
         // 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);
 
         // Patch new lines to avoid being removed when followed by empty rules cases
-        $css = preg_replace('/'. self::NL .'/', self::NL .'}', $css);
+        $css = preg_replace('/'.self::NL.'/', self::NL.'}', $css);
 
         // Remove empty rules.
         $css = preg_replace('/[^{};\/]+\{\}/S', '', $css);
 
         // Restore new lines for /*! important comments
-        $css = preg_replace('/'. self::NL .'}/', "\n", $css);
+        $css = preg_replace('/'.self::NL.'}/', "\n", $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
@@ -528,7 +528,7 @@ 
             $linebreakPos = (int) $linebreakPos;
             for ($startIndex = $i = 1, $l = strlen($css); $i < $l; $i++) {
                 if ($css[$i - 1] === '}' && $i - $startIndex > $linebreakPos) {
-                    $css = $this->strSlice($css, 0, $i) . "\n" . $this->strSlice($css, $i);
+                    $css = $this->strSlice($css, 0, $i)."\n".$this->strSlice($css, $i);
                     $l = strlen($css);
                     $startIndex = $i;
                 }
@@ -581,7 +581,7 @@ 
                 $terminator = ')';
             }
 
-            while ($terminatorFound === false && $endIndex+1 <= $maxIndex) {
+            while ($terminatorFound === false && $endIndex + 1 <= $maxIndex) {
                 $endIndex = $this->indexOf($css, $terminator, $endIndex + 1);
                 // endIndex == 0 doesn't really apply here
                 if ($endIndex > 0 && substr($css, $endIndex - 1, 1) !== '\\') {
@@ -604,7 +604,7 @@ 
                     trim($token)
                 );
                 $preservedTokenPlaceholder = $this->registerPreservedToken($token);
-                $sb[] = 'url('. $preservedTokenPlaceholder .')';
+                $sb[] = 'url('.$preservedTokenPlaceholder.')';
                 $appenIndex = $endIndex + 1;
             } else {
                 // No end terminator found, re-add the whole match. Should we throw/warn here?
@@ -630,7 +630,7 @@ 
     private function shortenZeroValues($css)
     {
         $unitsGroupReg = $this->unitsGroupRegex;
-        $numOrPosReg = '('. $this->numRegex .'|top|left|bottom|right|center)';
+        $numOrPosReg = '('.$this->numRegex.'|top|left|bottom|right|center)';
         $oneZeroSafeProperties = array(
             '(?:line-)?height',
             '(?:(?:min|max)-)?width',
@@ -656,17 +656,17 @@ 
         $regEnd = '/i';
 
         // First zero regex start
-        $oneZeroRegStart = $regStart .'('. implode('|', $oneZeroSafeProperties) .'):';
+        $oneZeroRegStart = $regStart.'('.implode('|', $oneZeroSafeProperties).'):';
 
         // Multiple zeros regex start
-        $nZerosRegStart = $regStart .'('. implode('|', $nZeroSafeProperties) .'):';
+        $nZerosRegStart = $regStart.'('.implode('|', $nZeroSafeProperties).'):';
 
         $css = preg_replace(
             array(
-                $oneZeroRegStart .'0'. $unitsGroupReg . $regEnd,
-                $nZerosRegStart . $numOrPosReg .' 0'. $unitsGroupReg . $regEnd,
-                $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd,
-                $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd
+                $oneZeroRegStart.'0'.$unitsGroupReg.$regEnd,
+                $nZerosRegStart.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd,
+                $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd,
+                $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd
             ),
             array(
                 '$1$2:0',
@@ -682,13 +682,13 @@ 
 
         // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0 for safe properties only.
         $css = preg_replace(
-            '/('. implode('|', $nZeroSafeProperties) .'):0(?: 0){1,3}(;|\}| !)'. $regEnd,
+            '/('.implode('|', $nZeroSafeProperties).'):0(?: 0){1,3}(;|\}| !)'.$regEnd,
             '$1:0$2',
             $css
         );
 
         // Replace 0 0 0; or 0 0 0 0; with 0 0 for background-position property.
-        $css = preg_replace('/(background-position):0(?: 0){2,3}(;|\}| !)'. $regEnd, '$1:0 0$2', $css);
+        $css = preg_replace('/(background-position):0(?: 0){2,3}(;|\}| !)'.$regEnd, '$1:0 0$2', $css);
 
         return $css;
     }
@@ -712,12 +712,12 @@ 
             '(?:text|box)-shadow'
         );
 
-        $regStart = '/(;|\{)('. implode('|', $propertiesWithColors) .'):([^;}]*)\b';
+        $regStart = '/(;|\{)('.implode('|', $propertiesWithColors).'):([^;}]*)\b';
         $regEnd = '\b/iS';
 
         foreach ($longNamedColors as $colorName => $colorCode) {
-            $patterns[] = $regStart . $colorName . $regEnd;
-            $replacements[] = '$1$2:$3'. $colorCode;
+            $patterns[] = $regStart.$colorName.$regEnd;
+            $replacements[] = '$1$2:$3'.$colorCode;
         }
 
         // Run at least 4 times to cover most cases (same color used several times for the same property)
@@ -762,16 +762,16 @@ 
 
             if ($isFilter) {
                 // 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 with shorter color names
                 $sb[] = array_key_exists($hex, $longHexColors) ? $longHexColors[$hex] : $hex;
@@ -818,7 +818,7 @@ 
         $match = preg_replace('/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/i', 'alpha(opacity=', $match);
 
         $preservedTokenPlaceholder = $this->registerPreservedToken($match);
-        return $quote . $preservedTokenPlaceholder . $quote;
+        return $quote.$preservedTokenPlaceholder.$quote;
     }
 
     private function processAtRuleBlocks($matches)
@@ -838,13 +838,13 @@ 
             )
         );
         $preservedTokenPlaceholder = $this->registerPreservedToken($token);
-        return 'calc('. $preservedTokenPlaceholder .')';
+        return 'calc('.$preservedTokenPlaceholder.')';
     }
 
     private function processOldIeSpecificMatrixDefinition($matches)
     {
         $preservedTokenPlaceholder = $this->registerPreservedToken($matches[1]);
-        return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $preservedTokenPlaceholder .')';
+        return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$preservedTokenPlaceholder.')';
     }
 
     private function processColon($matches)
@@ -869,10 +869,10 @@ 
 
         // Fix for issue #2528093
         if (!preg_match('/[\s,);}]/', $matches[2])) {
-            $matches[2] = ' '. $matches[2];
+            $matches[2] = ' '.$matches[2];
         }
 
-        return '#'. implode('', $hexColors) . $matches[2];
+        return '#'.implode('', $hexColors).$matches[2];
     }
 
     private function hslToHex($matches)
@@ -886,37 +886,37 @@ 
 
     private function processAtRulesOperators($matches)
     {
-        return $matches[1] . strtolower($matches[2]) .' (';
+        return $matches[1].strtolower($matches[2]).' (';
     }
 
     private function lowercasePseudoFirst($matches)
     {
-        return ':first-'. strtolower($matches[1]) .' '. $matches[2];
+        return ':first-'.strtolower($matches[1]).' '.$matches[2];
     }
 
     private function lowercaseDirectives($matches)
     {
-        return '@'. strtolower($matches[1]);
+        return '@'.strtolower($matches[1]);
     }
 
     private function lowercasePseudoElements($matches)
     {
-        return ':'. strtolower($matches[1]);
+        return ':'.strtolower($matches[1]);
     }
 
     private function lowercaseCommonFunctions($matches)
     {
-        return ':'. strtolower($matches[1]) .'(';
+        return ':'.strtolower($matches[1]).'(';
     }
 
     private function lowercaseCommonFunctionsValues($matches)
     {
-        return $matches[1] . strtolower($matches[2]);
+        return $matches[1].strtolower($matches[2]);
     }
 
     private function lowercaseProperties($matches)
     {
-        return $matches[1] . strtolower($matches[2]) . $matches[3];
+        return $matches[1].strtolower($matches[2]).$matches[3];
     }
 
     // ---------------------------------------------------------------------------------------------
@@ -967,18 +967,18 @@ 
         $l = floatval(str_replace('%', '', $hslValues[2]));
 
         // Wrap and clamp, then fraction!
-        $h = ((($h % 360) + 360) % 360) / 360;
-        $s = $this->clampNumber($s, 0, 100) / 100;
-        $l = $this->clampNumber($l, 0, 100) / 100;
+        $h = ((($h%360) + 360)%360)/360;
+        $s = $this->clampNumber($s, 0, 100)/100;
+        $l = $this->clampNumber($l, 0, 100)/100;
 
         if ($s == 0) {
-            $r = $g = $b = $this->roundNumber(255 * $l);
+            $r = $g = $b = $this->roundNumber(255*$l);
         } else {
-            $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
-            $v1 = (2 * $l) - $v2;
-            $r = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h + (1/3)));
-            $g = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h));
-            $b = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h - (1/3)));
+            $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l);
+            $v1 = (2*$l) - $v2;
+            $r = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h + (1/3)));
+            $g = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h));
+            $b = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h - (1/3)));
         }
 
         return array($r, $g, $b);
@@ -995,16 +995,16 @@ 
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
 
-        if ($vh * 6 < 1) {
-            return $v1 + ($v2 - $v1) * 6 * $vh;
+        if ($vh*6 < 1) {
+            return $v1 + ($v2 - $v1)*6*$vh;
         }
 
-        if ($vh * 2 < 1) {
+        if ($vh*2 < 1) {
             return $v2;
         }
 
-        if ($vh * 3 < 2) {
-            return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6;
+        if ($vh*3 < 2) {
+            return $v1 + ($v2 - $v1)*((2/3) - $vh)*6;
         }
 
         return $v1;
@@ -1039,13 +1039,13 @@ 
             switch ($letter) {
                 case 'M':
                 case 'm':
-                    return (int) $size * 1048576;
+                    return (int) $size*1048576;
                 case 'K':
                 case 'k':
-                    return (int) $size * 1024;
+                    return (int) $size*1024;
                 case 'G':
                 case 'g':
-                    return (int) $size * 1073741824;
+                    return (int) $size*1073741824;
             }
         }
         return (int) $size;
@@ -1059,7 +1059,7 @@ 
     private function rgbPercentageToRgbInteger($rgbPercentage)
     {
         if (strpos($rgbPercentage, '%') !== false) {
-            $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55);
+            $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55);
         }
 
         return intval($rgbPercentage, 10);

classlesses/autoptimizeSpeedupper.php

Spacing +28 added lines, -28 removed lines

@@ -3,62 +3,62 @@ 
 Autoptimize SpeedUp; minify & cache each JS/ CSS separately
 */
 
-function ao_js_snippetcache($jsin,$jsfilename) {
+function ao_js_snippetcache($jsin, $jsfilename) {
     $md5hash = "snippet_".md5($jsin);
-    $ccheck = new autoptimizeCache($md5hash,'js');
-    if($ccheck->check()) {
+    $ccheck = new autoptimizeCache($md5hash, 'js');
+    if ($ccheck->check()) {
         $scriptsrc = $ccheck->retrieve();
     } else {
-        if ( (strpos($jsfilename,"min.js") === false) && ( strpos($jsfilename,"js/jquery/jquery.js") === false ) && ( str_replace(apply_filters('autoptimize_filter_js_consider_minified',false), '', $jsfilename) === $jsfilename ) ) {
-            if(class_exists('JSMin')) {
+        if ((strpos($jsfilename, "min.js") === false) && (strpos($jsfilename, "js/jquery/jquery.js") === false) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) {
+            if (class_exists('JSMin')) {
                 $tmp_jscode = trim(JSMin::minify($jsin));
                 if (!empty($tmp_jscode)) {
                         $scriptsrc = $tmp_jscode;
                         unset($tmp_jscode);
                 } else {
-                        $scriptsrc=$jsin;
+                        $scriptsrc = $jsin;
                 }
             } else {
-                $scriptsrc=$jsin;
+                $scriptsrc = $jsin;
             }
         } else {
             // do some housekeeping here to remove comments & linebreaks and stuff
-            $scriptsrc=preg_replace("#^\s*\/\/.*$#Um","",$jsin);
-            $scriptsrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$scriptsrc);
-            $scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
+            $scriptsrc = preg_replace("#^\s*\/\/.*$#Um", "", $jsin);
+            $scriptsrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $scriptsrc);
+            $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
 
-            if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) {
-                $scriptsrc.=";";
+            if ((substr($scriptsrc, -1, 1) !== ";") && (substr($scriptsrc, -1, 1) !== "}")) {
+                $scriptsrc .= ";";
             }
         }
         if (!empty($jsfilename)) {
             // don't cache inline CSS to avoid risk of cache-explosion
-            $ccheck->cache($scriptsrc,'text/javascript');
+            $ccheck->cache($scriptsrc, 'text/javascript');
         }
     }
     unset($ccheck);
 
-    if (get_option("autoptimize_js_trycatch")==="on") {
-        $scriptsrc="try{".$scriptsrc."}catch(e){}";
+    if (get_option("autoptimize_js_trycatch") === "on") {
+        $scriptsrc = "try{".$scriptsrc."}catch(e){}";
     }
 
     return $scriptsrc;
 }
 
-function ao_css_snippetcache($cssin,$cssfilename) {
+function ao_css_snippetcache($cssin, $cssfilename) {
     $md5hash = "snippet_".md5($cssin);
-    $ccheck = new autoptimizeCache($md5hash,'css');
-    if($ccheck->check()) {
+    $ccheck = new autoptimizeCache($md5hash, 'css');
+    if ($ccheck->check()) {
         $stylesrc = $ccheck->retrieve();
     } else {
-        if ( ( strpos($cssfilename,"min.css") === false ) && ( str_replace( apply_filters('autoptimize_filter_css_consider_minified',false), '', $cssfilename ) === $cssfilename ) ) {
+        if ((strpos($cssfilename, "min.css") === false) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) {
             if (class_exists('Minify_CSS_Compressor')) {
                 $tmp_code = trim(Minify_CSS_Compressor::process($cssin));
-            } 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($cssin));
-                } elseif (@is_callable(array($cssmin,"minify"))) {
+                } elseif (@is_callable(array($cssmin, "minify"))) {
                     $tmp_code = trim(CssMin::minify($cssin));
                 }
             }
@@ -71,18 +71,18 @@ 
             }
         } else {
             // .min.css -> no heavy-lifting, just some cleanup
-            $stylesrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$cssin);
-            $stylesrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
-            $stylesrc=autoptimizeStyles::fixurls($cssfilename,$stylesrc);
+            $stylesrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $cssin);
+            $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
+            $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc);
         }
         if (!empty($cssfilename)) {
             // don't cache inline CSS to avoid risk of cache-explosion
-            $ccheck->cache($stylesrc,'text/css');
+            $ccheck->cache($stylesrc, 'text/css');
         }
     }
     unset($ccheck);
     return $stylesrc;
 }
 
-add_filter('autoptimize_css_individual_style','ao_css_snippetcache',10,2);
-add_filter('autoptimize_js_individual_script','ao_js_snippetcache',10,2);
+add_filter('autoptimize_css_individual_style', 'ao_css_snippetcache', 10, 2);
+add_filter('autoptimize_js_individual_script', 'ao_js_snippetcache', 10, 2);