futtta / autoptimize

classes/autoptimizeStyles.php

Spacing +189 added lines, -189 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 {

 

@@ -23,62 +23,62 @@ 
 

     //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', '', $this->content );

+        $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);

         if (!empty($whitelistCSS)) {

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

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

         }

         

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

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

         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, $this->content );

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

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

+        $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS, $this->content);

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

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

         } else {

             $this->dontmove = array();

         }

         

         // forcefully exclude CSS with data-noptimize attrib

-        $this->dontmove[]="data-noptimize";

+        $this->dontmove[] = "data-noptimize";

 

         // should we defer css?

         // value: true/ false

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

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

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

 

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

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

 

         // should we inline?

         // value: true/ false

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

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

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

         

         // 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,65 +108,65 @@ 
         $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>

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

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

                         $url = $explUrl[0];

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

                 } else {

 					// excluded CSS, minify if getpath 

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

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

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

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

                         $url = $explUrl[0];

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

  					

-						if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {

+						if ($path && apply_filters('autoptimize_filter_css_minify_excluded', false)) {

 							$_CachedMinifiedUrl = $this->minify_single($path);

 

 							if (!empty($_CachedMinifiedUrl)) {

@@ -177,12 +177,12 @@ 
 							}

 							

 							// remove querystring from URL

-							if ( !empty($explUrl[1]) ) {

-								$newTag = str_replace("?".$explUrl[1],"",$newTag);

+							if (!empty($explUrl[1])) {

+								$newTag = str_replace("?".$explUrl[1], "", $newTag);

 							}

 

 							// and replace

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

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

 						}

 					}					

 				}

@@ -195,31 +195,31 @@ 
     

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

                     $cssContents = file_get_contents($cssPath);

                     $cssHash = md5($cssContents);

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

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

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

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

+                    $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)."|".$cssHash."%%INJECTLATER%%*/";

+                        $css = $tmpstyle;

+                        $this->alreadyminified = true;

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

+                        $css = "/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/";

                     }

                 } else {

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

@@ -227,8 +227,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;

             }

@@ -237,12 +237,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;

@@ -262,30 +262,30 @@ 
             $external_imports = "";

 

             // remove comments to avoid importing commented-out imports

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

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

 

-            while(preg_match_all('#@import +(?:url)?(?:(?:\\(([\"\']?)(?:[^\"\')]+)\\1\\)|([\"\'])(?:[^\"\']+)\\2)(?:[^,;\"\']+(?:,[^,;\"\']+)*)?)(?:;)#m',$thiscss_nocomments,$matches)) {

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

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

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

+            while (preg_match_all('#@import +(?:url)?(?:(?:\\(([\"\']?)(?:[^\"\')]+)\\1\\)|([\"\'])(?:[^\"\']+)\\2)(?:[^,;\"\']+(?:,[^,;\"\']+)*)?)(?:;)#m', $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".AUTOPTIMIZE_HASH."%%".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".AUTOPTIMIZE_HASH."%%".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;

@@ -299,32 +299,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. 

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

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

             // Check for already-minified code

             $hash = md5($code);

-            do_action( 'autoptimize_action_css_hash', $hash );

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

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

+            do_action('autoptimize_action_css_hash', $hash);

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

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

                 $code = $ccheck->retrieve();

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

                 continue;

@@ -333,44 +333,44 @@ 
 

             // Do the imaging!

             $imgreplace = array();

-            preg_match_all( self::ASSETS_REGEX, $code, $matches );

+            preg_match_all(self::ASSETS_REGEX, $code, $matches);

 

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

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

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

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

+                foreach ($matches[1] 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;

@@ -392,42 +392,42 @@ 
                         

                             // 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[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]);

+                        $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]);

                     } else {

                         // just cdn the URL if applicable

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

-                            $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]);

+                            $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]);

 						}

                     }

                 }

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

                 // change urls to cdn-url

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

-                    $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]);

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

+                    $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$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);

             }

             

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

                     }

                 }

@@ -439,7 +439,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);

@@ -454,13 +454,13 @@ 
     //Caches the CSS in uncompressed, deflated and gzipped form.

     public function cache() {

         // CSS cache

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

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

             $md5 = $this->hashmap[md5($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();

         }

@@ -475,7 +475,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'.AUTOPTIMIZE_HASH.'%%(.*?)%%SCRIPT%%#is',

                 create_function(

@@ -490,55 +490,55 @@ 
         $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, $this->content );

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

+        $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);

 

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

                 $preloadCssBlock = "";

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

-                $defer_inline_code=$this->defer_inline;

-                if(!empty($defer_inline_code)){

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

+                $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()) { 

+                        $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) {

                     

                     // Filter to modify the onload attribute - passes value and the stylesheet url

                     $preloadOnLoad = apply_filters('autoptimize_filter_css_preload_onload', "this.onload=null;this.rel='stylesheet'", $url);

@@ -548,22 +548,22 @@ 
                     

                 } 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) {

                 $preloadPolyfill = '<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>';

                 $noScriptCssBlock .= "</noscript>";

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

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

                 

                 // Adds preload polyfill at end of body tag

                 $this->inject_in_html(

                     apply_filters('autoptimize_css_preload_polyfill', $preloadPolyfill),

-                    array('</body>','before')

+                    array('</body>', 'before')

                 );

             }

         }

@@ -574,62 +574,62 @@ 
     

     static function fixurls($file, $code) {

         // Switch all imports to the url() syntax

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

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

 

-        if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {

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

-            $dir = dirname( $file ); // Like /themes/expound/css

+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {

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

+            $dir = dirname($file); // Like /themes/expound/css

 

             // $dir should not contain backslashes, since it's used to replace

             // urls, but it can contain them when running on Windows because

             // fixurls() is sometimes called with `ABSPATH . 'index.php'`

-            $dir = str_replace( '\\', '/', $dir );

-            unset( $file ); // not used below at all

+            $dir = str_replace('\\', '/', $dir);

+            unset($file); // not used below at all

 

             $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 ) {

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

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

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

                     $removedQuotes = true;

                 } else {

                     $removedQuotes = false;

                 }

 

-                if ( '' === $noQurl ) {

+                if ('' === $noQurl) {

                     continue;

                 }

 

                 $url = $noQurl;

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

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

                     // URL is protocol-relative, host-relative or something we don't touch

                     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 the url + whatever was behind potentially for replacement

                     // We must do this, or different css classes referencing the same bg image (but

                     // different parts of it, say, in sprites and such) loose their stuff...

-                    $hash = md5( $url . $matches[2][$k] );

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

+                    $hash = md5($url.$matches[2][$k]);

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

 

-                    if ( $removedQuotes ) {

-                        $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k];

+                    if ($removedQuotes) {

+                        $replace[$hash] = "url('".$newurl."')".$matches[2][$k];

                     } else {

-                        $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k];

+                        $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];

                     }

                 }

             }

 

-            if ( ! empty( $replace ) ) {

+            if (!empty($replace)) {

                 // Sort the replacements array by key length in desc order (so that the longest strings are replaced first)

-                $keys = array_map( 'strlen', array_keys( $replace ) );

-                array_multisort( $keys, SORT_DESC, $replace );

+                $keys = array_map('strlen', array_keys($replace));

+                array_multisort($keys, SORT_DESC, $replace);

 

                 // Replace URLs found within $code

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

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

             }

         }

 

@@ -637,11 +637,11 @@ 
     }

     

     private function ismovable($tag) {

-		if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {

+		if (apply_filters('autoptimize_filter_css_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;

                 }

             }

@@ -649,8 +649,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;

                     }

@@ -662,21 +662,21 @@ 
         }

     }

     

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

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

 		$consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);

-        if ( $this->inject_min_late !== true ) {

+        if ($this->inject_min_late !== true) {

             // late-inject turned off

             return false;

-        } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {

+        } else if ((strpos($cssPath, "min.css") === false) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) {

 			// file not minified based on filename & filter

 			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 {

@@ -686,11 +686,11 @@ 
     }

     

     private function maybe_cdn_urls($inUrl) {

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

-        $urlPath = parse_url($url,PHP_URL_PATH);

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

+        $urlPath = parse_url($url, PHP_URL_PATH);

 

         // exclude fonts from CDN except if filter returns true

-        if ( !preg_match('#\.(woff2?|eot|ttf|otf)$#i',$urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {

+        if (!preg_match('#\.(woff2?|eot|ttf|otf)$#i', $urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {

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

         } else {

             $cdn_url = $url;

autoptimize.php

Spacing +79 added lines, -79 removed lines

@@ -12,15 +12,15 @@ 
 http://www.gnu.org/licenses/gpl.txt
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__));
+define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__));
 
 // Load config class
 include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeConfig.php');
 
 // Load toolbar class
-include( AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php' );
+include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php');
 
 // Load partners tab if admin
 if (is_admin()) {
@@ -28,31 +28,31 @@ 
 }
 
 // Do we gzip when caching (needed early to load autoptimizeCache.php)
-define('AUTOPTIMIZE_CACHE_NOGZIP',(bool) get_option('autoptimize_cache_nogzip'));
+define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip'));
 
 // Load cache class
 include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCache.php');
 
 // wp-content dir name (automagically set, should not be needed), dirname of AO cache dir and AO-prefix can be overridden in wp-config.php
-if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME','/'.wp_basename( WP_CONTENT_DIR )); }
-if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR','/cache/autoptimize/'); }
+if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); }
+if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); }
 if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); }
 
 // Plugin dir constants (plugin url's defined later to accomodate domain mapped sites)
 if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
-    if (is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true )) {
+    if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
         $blog_id = get_current_blog_id();
-        define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
+        define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
     } else {
-        define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR );
+        define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR);
     }
 }
-define('AUTOPTIMIZE_CACHE_DELAY',true);
-define('WP_ROOT_DIR',substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR)-strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
+define('AUTOPTIMIZE_CACHE_DELAY', true);
+define('WP_ROOT_DIR', substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR) - strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
 
 // WP CLI
-if ( defined( 'WP_CLI' ) && WP_CLI ) {
-	require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
+if (defined('WP_CLI') && WP_CLI) {
+	require_once AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCLI.php';
 }
 
 // Initialize the cache at least once
@@ -61,65 +61,65 @@ 
 /* Check if we're updating, in which case we might need to do stuff and flush the cache
 to avoid old versions of aggregated files lingering around */
 
-$autoptimize_version="2.3.0";
-$autoptimize_db_version=get_option('autoptimize_version','none');
+$autoptimize_version = "2.3.0";
+$autoptimize_db_version = get_option('autoptimize_version', 'none');
 
 if ($autoptimize_db_version !== $autoptimize_version) {
-    if ($autoptimize_db_version==="none") {
+    if ($autoptimize_db_version === "none") {
         add_action('admin_notices', 'autoptimize_install_config_notice');
     } else {
         // updating, include the update-code
         include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeUpdateCode.php');
     }
 
-    update_option('autoptimize_version',$autoptimize_version);
-    $autoptimize_db_version=$autoptimize_version;
+    update_option('autoptimize_version', $autoptimize_version);
+    $autoptimize_db_version = $autoptimize_version;
 }
 
 // Load translations
 function autoptimize_load_plugin_textdomain() {
-    load_plugin_textdomain('autoptimize',false,plugin_basename(dirname( __FILE__ )).'/localization');
+    load_plugin_textdomain('autoptimize', false, plugin_basename(dirname(__FILE__)).'/localization');
 }
-add_action( 'init', 'autoptimize_load_plugin_textdomain' );
+add_action('init', 'autoptimize_load_plugin_textdomain');
 
-function autoptimize_uninstall(){
+function autoptimize_uninstall() {
     autoptimizeCache::clearall();
 
-    $delete_options=array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice","autoptimize_css_include_inline","autoptimize_js_include_inline","autoptimize_optimize_logged","autoptimize_optimize_checkout","autoptimize_extra_settings");
+    $delete_options = array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice", "autoptimize_css_include_inline", "autoptimize_js_include_inline", "autoptimize_optimize_logged", "autoptimize_optimize_checkout", "autoptimize_extra_settings");
 
-    if ( !is_multisite() ) {
-        foreach ($delete_options as $del_opt) { delete_option( $del_opt ); }
+    if (!is_multisite()) {
+        foreach ($delete_options as $del_opt) { delete_option($del_opt); }
     } else {
         global $wpdb;
-        $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+        $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
         $original_blog_id = get_current_blog_id();
-        foreach ( $blog_ids as $blog_id ) {
-            switch_to_blog( $blog_id );
-            foreach ($delete_options as $del_opt) { delete_option( $del_opt ); }
+        foreach ($blog_ids as $blog_id) {
+            switch_to_blog($blog_id);
+            foreach ($delete_options as $del_opt) { delete_option($del_opt); }
         }
-        switch_to_blog( $original_blog_id );
+        switch_to_blog($original_blog_id);
     }
 
-    if ( wp_get_schedule( 'ao_cachechecker' ) ) {
-        wp_clear_scheduled_hook( 'ao_cachechecker' );
+    if (wp_get_schedule('ao_cachechecker')) {
+        wp_clear_scheduled_hook('ao_cachechecker');
     }
 }
 
 function autoptimize_install_config_notice() {
     echo '<div class="updated"><p>';
-    _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' );
+    _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize');
     echo '</p></div>';
 }
 
 function autoptimize_update_config_notice() {
     echo '<div class="updated"><p>';
-    _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' );
+    _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize');
     echo '</p></div>';
 }
 
 function autoptimize_cache_unavailable_notice() {
     echo '<div class="error"><p>';
-    printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR );
+    printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR);
     echo '</p></div>';
 }
 
@@ -128,27 +128,27 @@ 
     $ao_noptimize = false;
 
     // noptimize in qs to get non-optimized page for debugging
-    if (array_key_exists("ao_noptimize",$_GET) || array_key_exists("ao_noptirocket",$_GET)) {
-        if ( ( ($_GET["ao_noptimize"]==="1") || ($_GET["ao_noptirocket"]==="1") ) && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) {
+    if (array_key_exists("ao_noptimize", $_GET) || array_key_exists("ao_noptirocket", $_GET)) {
+        if ((($_GET["ao_noptimize"] === "1") || ($_GET["ao_noptirocket"] === "1")) && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) {
             $ao_noptimize = true;
         }
     }
 
     // check for DONOTMINIFY constant as used by e.g. WooCommerce POS
-    if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true || constant('DONOTMINIFY')==="true")) {
+    if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === "true")) {
         $ao_noptimize = true;
     }
 
 	// if setting says not to optimize logged in user and user is logged in
-	if ( get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts') ) {
+	if (get_option('autoptimize_optimize_logged', 'on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts')) {
 		$ao_noptimize = true;
 	}
 
 	// if setting says not to optimize cart/ checkout
-	if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) {
+	if (get_option('autoptimize_optimize_checkout', 'on') !== 'on') {
 		// checking for woocommerce, easy digital downloads and wp ecommerce
-		foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) {
-			if ( function_exists($shopCond) && $shopCond() ) {
+		foreach (array("is_checkout", "is_cart", "edd_is_checkout", "wpsc_is_cart", "wpsc_is_checkout") as $shopCond) {
+			if (function_exists($shopCond) && $shopCond()) {
 				$ao_noptimize = true;
 				break;
 			}
@@ -156,11 +156,11 @@ 
 	}
 
     // filter you can use to block autoptimization on your own terms
-    $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );
+    $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize);
 
-    if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') || !is_customize_preview() ) ) {
+    if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') || !is_customize_preview())) {
         // load speedupper conditionally (true by default?)
-        if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeSpeedupper.php');
         }
 
@@ -171,7 +171,7 @@ 
         include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php');
 
         // Load extra classes and set some vars
-        if($conf->get('autoptimize_html')) {
+        if ($conf->get('autoptimize_html')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php');
             // BUG: new minify-html does not support keeping HTML comments, skipping for now
             // if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
@@ -181,7 +181,7 @@ 
             // }
         }
 
-        if($conf->get('autoptimize_js')) {
+        if ($conf->get('autoptimize_js')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php');
             if (!class_exists('JSMin')) {
                 if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
@@ -190,15 +190,15 @@ 
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php');
                 }
             }
-            if ( ! defined( 'CONCATENATE_SCRIPTS' )) {
-                define('CONCATENATE_SCRIPTS',false);
+            if (!defined('CONCATENATE_SCRIPTS')) {
+                define('CONCATENATE_SCRIPTS', false);
             }
-            if ( ! defined( 'COMPRESS_SCRIPTS' )) {
-                define('COMPRESS_SCRIPTS',false);
+            if (!defined('COMPRESS_SCRIPTS')) {
+                define('COMPRESS_SCRIPTS', false);
             }
         }
 
-        if($conf->get('autoptimize_css')) {
+        if ($conf->get('autoptimize_css')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php');
             if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
                 if (!class_exists('Minify_CSS_Compressor')) {
@@ -209,13 +209,13 @@ 
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php');
                 }
             }
-            if ( ! defined( 'COMPRESS_CSS' )) {
-                define('COMPRESS_CSS',false);
+            if (!defined('COMPRESS_CSS')) {
+                define('COMPRESS_CSS', false);
             }
         }
 
         // filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned!
-        if (apply_filters('autoptimize_filter_obkiller',false)) {
+        if (apply_filters('autoptimize_filter_obkiller', false)) {
             while (ob_get_level() > 0) {
                 ob_end_clean();
             }
@@ -227,36 +227,36 @@ 
 
 // Action on end, this is where the magic happens
 function autoptimize_end_buffering($content) {
-    if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/',$content) === 1 || stripos($content,"<xsl:stylesheet") !== false ) { return $content; }
+    if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/', $content) === 1 || stripos($content, "<xsl:stylesheet") !== false) { return $content; }
 
     // load URL constants as late as possible to allow domain mapper to kick in
     if (function_exists("domain_mapping_siteurl")) {
-        define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id()));
-        define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url()));
+        define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id()));
+        define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url()));
     } else {
-        define('AUTOPTIMIZE_WP_SITE_URL',site_url());
-        define('AUTOPTIMIZE_WP_CONTENT_URL',content_url());
+        define('AUTOPTIMIZE_WP_SITE_URL', site_url());
+        define('AUTOPTIMIZE_WP_CONTENT_URL', content_url());
     }
 
-    if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) {
+    if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
         $blog_id = get_current_blog_id();
-        define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
+        define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
     } else {
-        define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
+        define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
     }
-    define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL));
-    define('AUTOPTIMIZE_HASH',wp_hash(AUTOPTIMIZE_CACHE_DIR));
+    define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
+    define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_DIR));
 
     // Config element
     $conf = autoptimizeConfig::instance();
 
     // Choose the classes
     $classes = array();
-    if($conf->get('autoptimize_js'))
+    if ($conf->get('autoptimize_js'))
         $classes[] = 'autoptimizeScripts';
-    if($conf->get('autoptimize_css'))
+    if ($conf->get('autoptimize_css'))
         $classes[] = 'autoptimizeStyles';
-    if($conf->get('autoptimize_html'))
+    if ($conf->get('autoptimize_html'))
         $classes[] = 'autoptimizeHTML';
 
     // Set some options
@@ -285,12 +285,12 @@ 
         )
     );
 
-    $content = apply_filters( 'autoptimize_filter_html_before_minify', $content );
+    $content = apply_filters('autoptimize_filter_html_before_minify', $content);
 
     // Run the classes
-    foreach($classes as $name) {
+    foreach ($classes as $name) {
         $instance = new $name($content);
-        if($instance->read($classoptions[$name])) {
+        if ($instance->read($classoptions[$name])) {
             $instance->minify();
             $instance->cache();
             $content = $instance->getcontent();
@@ -298,19 +298,19 @@ 
         unset($instance);
     }
     
-    $content = apply_filters( 'autoptimize_html_after_minify', $content );
+    $content = apply_filters('autoptimize_html_after_minify', $content);
     return $content;
 }
 
-if ( autoptimizeCache::cacheavail() ) {
+if (autoptimizeCache::cacheavail()) {
     $conf = autoptimizeConfig::instance();
-    if( $conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') ) {
+    if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) {
         // Hook to wordpress
         if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
-            add_action('init','autoptimize_start_buffering',-1);
+            add_action('init', 'autoptimize_start_buffering', -1);
         } else {
             if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); }
-            add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2);
+            add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2);
         }
     }
 } else {
@@ -318,15 +318,15 @@ 
 }
 
 function autoptimize_activate() {
-    register_uninstall_hook( __FILE__, 'autoptimize_uninstall' );
+    register_uninstall_hook(__FILE__, 'autoptimize_uninstall');
 }
-register_activation_hook( __FILE__, 'autoptimize_activate' );
+register_activation_hook(__FILE__, 'autoptimize_activate');
 
 include_once('classlesses/autoptimizeCacheChecker.php');
 
-add_action('plugins_loaded','includeAutoptimizeExtra');
+add_action('plugins_loaded', 'includeAutoptimizeExtra');
 function includeAutoptimizeExtra() {
-    if ( apply_filters('autoptimize_filter_extra_activate',true) ) {
+    if (apply_filters('autoptimize_filter_extra_activate', true)) {
         include_once('classlesses/autoptimizeExtra.php');
     }
 }

classes/autoptimizeConfig.php

Spacing +182 added lines, -182 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);
             }
         }
 
@@ -159,31 +159,31 @@ 
 <div class="wrap">
 
 <?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?>
-<div class="notice-error notice"><?php echo '<p>' . sprintf( __('<strong>You are using a very old version of PHP</strong> which will not be supported as from the upcoming Autoptimize 2.4 any more, cfr. <a href=%s>this blogpost for more info</a>. please ask your hoster to provide you with an upgrade path to 7.x.','autoptimize'), '"https://blog.futtta.be/2018/02/13/introducing-zytzagoos-major-changes-for-autoptimize-2-4/" target="_blank"' ) . '</p>'; ?></div>
+<div class="notice-error notice"><?php echo '<p>'.sprintf(__('<strong>You are using a very old version of PHP</strong> which will not be supported as from the upcoming Autoptimize 2.4 any more, cfr. <a href=%s>this blogpost for more info</a>. please ask your hoster to provide you with an upgrade path to 7.x.', 'autoptimize'), '"https://blog.futtta.be/2018/02/13/introducing-zytzagoos-major-changes-for-autoptimize-2-4/" target="_blank"').'</p>'; ?></div>
 <?php } ?>
 
 <?php if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { ?>
-<div class="notice-error notice"><?php echo '<p>' . sprintf( __('You are forcing Autoptimize to use the "legacy minifiers" by setting the AUTOPTIMIZE_LEGACY_MINFIERS constant in /wp-config.php. The "legacy minifiers" will not be supported as from the upcoming Autoptimize 2.4 any more, cfr. <a href=%s>this blogpost for more info</a>.','autoptimize'), '"https://blog.futtta.be/2018/02/13/introducing-zytzagoos-major-changes-for-autoptimize-2-4/" target="_blank"') . '</p>'; ?></div>
+<div class="notice-error notice"><?php echo '<p>'.sprintf(__('You are forcing Autoptimize to use the "legacy minifiers" by setting the AUTOPTIMIZE_LEGACY_MINFIERS constant in /wp-config.php. The "legacy minifiers" will not be supported as from the upcoming Autoptimize 2.4 any more, cfr. <a href=%s>this blogpost for more info</a>.', 'autoptimize'), '"https://blog.futtta.be/2018/02/13/introducing-zytzagoos-major-changes-for-autoptimize-2-4/" target="_blank"').'</p>'; ?></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>
@@ -198,158 +198,158 @@ 
 <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, this can potentially fix some JS-errors, but makes the JS render blocking.','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, this can potentially fix some JS-errors, but makes the JS render blocking.', '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'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></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'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></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('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.','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('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', '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>
 <?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'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></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'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></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','wp-content/cache/, wp-content/uploads/, 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', 'wp-content/cache/, wp-content/uploads/, 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>). This is not needed for Cloudflare.','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>). This is not needed for Cloudflare.', '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);
-    printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]) );
+    $AOstatArr = autoptimizeCache::stats(); 
+    $AOcacheSize = round($AOstatArr[1]/1024);
+    printf(__('%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]));
 ?></td>
 </tr>
 </table>
 </li>
 
-<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
-<h2 class="itemTitle"><?php _e('Misc Options','autoptimize'); ?></h2>
+<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv">
+<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2>
 <table class="form-table"> 
-	<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>
+	<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>
-	<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-		<th scope="row"><?php _e('Also optimize for logged in users?','autoptimize'); ?></th>
-		<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged','1')?'checked="checked" ':''; ?>/>
-			<?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.','autoptimize'); ?></label>
+	<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+		<th scope="row"><?php _e('Also optimize for logged in users?', 'autoptimize'); ?></th>
+		<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/>
+			<?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label>
 		</td>
 	</tr>
 	<?php
-		if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
+		if (function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout")) {
 			?>
-				<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-					<th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th>
-					<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/>
-						<?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.','autoptimize'); ?></label>
+				<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+					<th scope="row"><?php _e('Also optimize shop cart/ checkout?', 'autoptimize'); ?></th>
+					<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout', '1') ? 'checked="checked" ' : ''; ?>/>
+						<?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize'); ?></label>
 					</td>
 				</tr>
 			<?php
@@ -360,11 +360,11 @@ 
 
 </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>
@@ -373,31 +373,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 here</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 here</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">
@@ -412,7 +412,7 @@ 
             </div>
         </div>
     </div>
-    <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!","autoptimize"); ?>"></a></div>
+    <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!", "autoptimize"); ?>"></a></div>
 </div>
 
 <script type="text/javascript">
@@ -551,14 +551,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() {
@@ -567,47 +567,47 @@ 
     }
 
     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_cdn_url');
-        register_setting('autoptimize','autoptimize_cache_clean');
-        register_setting('autoptimize','autoptimize_cache_nogzip');
-        register_setting('autoptimize','autoptimize_show_adv');
-        register_setting('autoptimize','autoptimize_optimize_logged');
-        register_setting('autoptimize','autoptimize_optimize_checkout');
+        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_cdn_url');
+        register_setting('autoptimize', 'autoptimize_cache_clean');
+        register_setting('autoptimize', 'autoptimize_cache_nogzip');
+        register_setting('autoptimize', 'autoptimize_show_adv');
+        register_setting('autoptimize', 'autoptimize_optimize_logged');
+        register_setting('autoptimize', 'autoptimize_optimize_checkout');
     }
 
-    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);
             }
         }
 
@@ -615,7 +615,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,
@@ -641,43 +641,43 @@ 
                 );
 
             //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;
                 }
             }
 
             //Save for next question
-            $this->config = apply_filters( 'autoptimize_filter_get_config', $config );
+            $this->config = apply_filters('autoptimize_filter_get_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; ?>
@@ -688,20 +688,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>';

classlesses/autoptimizeExtra.php

Spacing +105 added lines, -105 removed lines

@@ -1,18 +1,18 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 // initialize
-if ( is_admin() ) {
-    add_action( 'admin_menu', 'autoptimize_extra_admin' );
-    add_filter( 'autoptimize_filter_settingsscreen_tabs','add_autoptimize_extra_tab' );
+if (is_admin()) {
+    add_action('admin_menu', 'autoptimize_extra_admin');
+    add_filter('autoptimize_filter_settingsscreen_tabs', 'add_autoptimize_extra_tab');
 } else {
     autoptimize_extra_init();
 }
 
 // get option
 function autoptimize_extra_get_options() {
-    $_default_val = array("autoptimize_extra_checkbox_field_1"=>"0","autoptimize_extra_checkbox_field_0"=>"0","autoptimize_extra_radio_field_4"=>"1","autoptimize_extra_text_field_2"=>"","autoptimize_extra_text_field_3"=>"");
-    $_option_val = get_option( 'autoptimize_extra_settings' );
+    $_default_val = array("autoptimize_extra_checkbox_field_1"=>"0", "autoptimize_extra_checkbox_field_0"=>"0", "autoptimize_extra_radio_field_4"=>"1", "autoptimize_extra_text_field_2"=>"", "autoptimize_extra_text_field_3"=>"");
+    $_option_val = get_option('autoptimize_extra_settings');
     if (empty($_option_val)) {
         $_option_val = $_default_val;
     }
@@ -24,74 +24,74 @@ 
     $autoptimize_extra_options = autoptimize_extra_get_options();
 
     /* disable emojis */
-    if ( !empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) ) {
+    if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_1'])) {
         autoptimize_extra_disable_emojis();
     }
     
     /* remove version from query string */
-    if ( !empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) ) {
-        add_filter( 'script_loader_src', 'autoptimize_extra_remove_qs', 15, 1 );
-        add_filter( 'style_loader_src', 'autoptimize_extra_remove_qs', 15, 1 );
+    if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_0'])) {
+        add_filter('script_loader_src', 'autoptimize_extra_remove_qs', 15, 1);
+        add_filter('style_loader_src', 'autoptimize_extra_remove_qs', 15, 1);
     }
 
     /* async JS */
     if (!empty($autoptimize_extra_options['autoptimize_extra_text_field_3'])) {
-        add_filter('autoptimize_filter_js_exclude','autoptimize_extra_async_js',10,1);
+        add_filter('autoptimize_filter_js_exclude', 'autoptimize_extra_async_js', 10, 1);
     }
 
     /* optimize google fonts */
-    if ( !empty( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] ) && ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] != "1" ) ) {
-        add_filter( 'wp_resource_hints', 'autoptimize_extra_gfonts_remove_dnsprefetch', 10, 2 );        
-        if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "2" ) {
-            add_filter('autoptimize_filter_css_removables','autoptimize_extra_remove_gfonts',10,1);
+    if (!empty($autoptimize_extra_options['autoptimize_extra_radio_field_4']) && ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] != "1")) {
+        add_filter('wp_resource_hints', 'autoptimize_extra_gfonts_remove_dnsprefetch', 10, 2);        
+        if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "2") {
+            add_filter('autoptimize_filter_css_removables', 'autoptimize_extra_remove_gfonts', 10, 1);
         } else {
-            add_filter('autoptimize_html_after_minify','autoptimize_extra_gfonts',10,1);
-            add_filter('autoptimize_extra_filter_tobepreconn','autoptimize_extra_preconnectgooglefonts',10,1);
+            add_filter('autoptimize_html_after_minify', 'autoptimize_extra_gfonts', 10, 1);
+            add_filter('autoptimize_extra_filter_tobepreconn', 'autoptimize_extra_preconnectgooglefonts', 10, 1);
         }
     }
     
     /* preconnect */
-    if ( !empty($autoptimize_extra_options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn') ) {
-        add_filter( 'wp_resource_hints', 'autoptimize_extra_preconnect', 10, 2 );
+    if (!empty($autoptimize_extra_options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) {
+        add_filter('wp_resource_hints', 'autoptimize_extra_preconnect', 10, 2);
     }
 }
 
 // disable emoji's functions
 function autoptimize_extra_disable_emojis() {
     // all actions related to emojis
-    remove_action( 'admin_print_styles', 'print_emoji_styles' );
-    remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
-    remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
-    remove_action( 'wp_print_styles', 'print_emoji_styles' );
-    remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
-    remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
-    remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
+    remove_action('admin_print_styles', 'print_emoji_styles');
+    remove_action('wp_head', 'print_emoji_detection_script', 7);
+    remove_action('admin_print_scripts', 'print_emoji_detection_script');
+    remove_action('wp_print_styles', 'print_emoji_styles');
+    remove_filter('wp_mail', 'wp_staticize_emoji_for_email');
+    remove_filter('the_content_feed', 'wp_staticize_emoji');
+    remove_filter('comment_text_rss', 'wp_staticize_emoji');
 
     // filter to remove TinyMCE emojis
-    add_filter( 'tiny_mce_plugins', 'autoptimize_extra_disable_emojis_tinymce' );
+    add_filter('tiny_mce_plugins', 'autoptimize_extra_disable_emojis_tinymce');
 
     // and remove dns-prefetch for emoji
-    add_filter( 'wp_resource_hints', 'autoptimize_extra_emojis_remove_dns_prefetch', 10, 2 );
+    add_filter('wp_resource_hints', 'autoptimize_extra_emojis_remove_dns_prefetch', 10, 2);
 }
 
-function autoptimize_extra_disable_emojis_tinymce( $plugins ) {
-    if ( is_array( $plugins ) ) {
-        return array_diff( $plugins, array( 'wpemoji' ) );
+function autoptimize_extra_disable_emojis_tinymce($plugins) {
+    if (is_array($plugins)) {
+        return array_diff($plugins, array('wpemoji'));
     } else {
         return array();
     }
 }
 
-function autoptimize_extra_emojis_remove_dns_prefetch( $urls, $relation_type ) {
-    $_emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/' );
+function autoptimize_extra_emojis_remove_dns_prefetch($urls, $relation_type) {
+    $_emoji_svg_url = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/');
 
-    return autoptimize_extra_remove_dns_prefetch( $urls, $relation_type, $_emoji_svg_url );
+    return autoptimize_extra_remove_dns_prefetch($urls, $relation_type, $_emoji_svg_url);
 }
 
 // remove query string function
-function autoptimize_extra_remove_qs( $src ) {
-    if ( strpos($src, '?ver=') ) {
-            $src = remove_query_arg( 'ver', $src );
+function autoptimize_extra_remove_qs($src) {
+    if (strpos($src, '?ver=')) {
+            $src = remove_query_arg('ver', $src);
     }
     return $src;
 }
@@ -103,19 +103,19 @@ 
     // get exclusions
     $AO_JSexclArrayIn = array();
     if (!empty($in)) {
-        $AO_JSexclArrayIn = array_fill_keys(array_filter(array_map('trim',explode(",",$in))),"");
+        $AO_JSexclArrayIn = array_fill_keys(array_filter(array_map('trim', explode(",", $in))), "");
     }
     
     // get asyncs
     $_fromSetting = $autoptimize_extra_options['autoptimize_extra_text_field_3'];
-    $AO_asynced_JS = array_fill_keys(array_filter(array_map('trim',explode(",",$_fromSetting))),"");
-    $AO_async_flag = apply_filters('autoptimize_filter_extra_async',"async");
+    $AO_asynced_JS = array_fill_keys(array_filter(array_map('trim', explode(",", $_fromSetting))), "");
+    $AO_async_flag = apply_filters('autoptimize_filter_extra_async', "async");
     foreach ($AO_asynced_JS as $JSkey => $JSvalue) {
         $AO_asynced_JS[$JSkey] = $AO_async_flag;
     }
     
     // merge exclusions & asyncs in one array and return to AO API
-    $AO_excl_w_async = array_merge( $AO_JSexclArrayIn, $AO_asynced_JS );
+    $AO_excl_w_async = array_merge($AO_JSexclArrayIn, $AO_asynced_JS);
     return $AO_excl_w_async;
 }
 
@@ -124,25 +124,25 @@ 
     $autoptimize_extra_options = autoptimize_extra_get_options();
     
     // get setting and store in array
-    $_to_be_preconnected = array_filter(array_map('trim',explode(",",$autoptimize_extra_options['autoptimize_extra_text_field_2'])));
-    $_to_be_preconnected = apply_filters( 'autoptimize_extra_filter_tobepreconn', $_to_be_preconnected );
+    $_to_be_preconnected = array_filter(array_map('trim', explode(",", $autoptimize_extra_options['autoptimize_extra_text_field_2'])));
+    $_to_be_preconnected = apply_filters('autoptimize_extra_filter_tobepreconn', $_to_be_preconnected);
 
     // walk array, extract domain and add to new array with crossorigin attribute
     foreach ($_to_be_preconnected as $_preconn_single) {
         $_preconn_parsed = parse_url($_preconn_single);
         
-        if ( is_array($_preconn_parsed) && empty($_preconn_parsed['scheme']) ) {
+        if (is_array($_preconn_parsed) && empty($_preconn_parsed['scheme'])) {
             $_preconn_domain = "//".$_preconn_parsed['host'];
-        } else if ( is_array($_preconn_parsed) ) {
+        } else if (is_array($_preconn_parsed)) {
             $_preconn_domain = $_preconn_parsed['scheme']."://".$_preconn_parsed['host'];
         }
         
-        if ( !empty($_preconn_domain) ) {
+        if (!empty($_preconn_domain)) {
             $_preconn_hint = array('href' => $_preconn_domain);
             // fonts don't get preconnected unless crossorigin flag is set, non-fonts don't get preconnected if origin flag is set
             // so hardcode fonts.gstatic.com to come with crossorigin and have filter to add other domains if needed
-            $_preconn_crossorigin = apply_filters( 'autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com') );
-            if ( in_array( $_preconn_domain, $_preconn_crossorigin ) ) {
+            $_preconn_crossorigin = apply_filters('autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com'));
+            if (in_array($_preconn_domain, $_preconn_crossorigin)) {
                 $_preconn_hint['crossorigin'] = 'anonymous';
             }
             $_new_hints[] = $_preconn_hint;
@@ -150,7 +150,7 @@ 
     }
 
     // merge in wordpress' preconnect hints
-    if ( 'preconnect' === $relation_type && !empty($_new_hints) ) {
+    if ('preconnect' === $relation_type && !empty($_new_hints)) {
         $hints = array_merge($hints, $_new_hints);      
     }
     
@@ -158,10 +158,10 @@ 
 }
 
 // google font functions
-function autoptimize_extra_gfonts_remove_dnsprefetch ( $urls, $relation_type ) {
+function autoptimize_extra_gfonts_remove_dnsprefetch($urls, $relation_type) {
     $_gfonts_url = "fonts.googleapis.com";
     
-    return autoptimize_extra_remove_dns_prefetch( $urls, $relation_type, $_gfonts_url );
+    return autoptimize_extra_remove_dns_prefetch($urls, $relation_type, $_gfonts_url);
 }
 
 function autoptimize_extra_remove_gfonts($in) { 
@@ -173,48 +173,48 @@ 
     $autoptimize_extra_options = autoptimize_extra_get_options();
     
     // extract fonts, partly based on wp rocket's extraction code
-    $_without_comments = preg_replace( '/<!--(.*)-->/Uis', '', $in );
-    preg_match_all( '#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $_without_comments, $matches );
+    $_without_comments = preg_replace('/<!--(.*)-->/Uis', '', $in);
+    preg_match_all('#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $_without_comments, $matches);
 
     $i = 0;
     $fontsCollection = array();
-    if ( ! $matches[2] ) {
+    if (!$matches[2]) {
         return $in;
     }
     
     // store them in $fonts array
-    foreach ( $matches[2] as $font ) {
-        if ( ! preg_match( '/rel=["\']dns-prefetch["\']/', $matches[0][ $i ] ) ) {
+    foreach ($matches[2] as $font) {
+        if (!preg_match('/rel=["\']dns-prefetch["\']/', $matches[0][$i])) {
             // Get fonts name.
-            $font = str_replace( array( '%7C', '%7c' ) , '|', $font );
-            $font = explode( 'family=', $font );
-            $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array();
+            $font = str_replace(array('%7C', '%7c'), '|', $font);
+            $font = explode('family=', $font);
+            $font = (isset($font[1])) ? explode('&', $font[1]) : array();
             // Add font to $fonts[$i] but make sure not to pollute with an empty family
-            $_thisfont = array_values( array_filter( explode( '|', reset( $font ) ) ) );
-            if ( !empty($_thisfont) ) {
+            $_thisfont = array_values(array_filter(explode('|', reset($font))));
+            if (!empty($_thisfont)) {
                 $fontsCollection[$i]["fonts"] = $_thisfont;
                 // And add subset if any
-                $subset = ( is_array( $font ) ) ? end( $font ) : '';
-                if ( false !== strpos( $subset, 'subset=' ) ) {
-                    $subset = explode( 'subset=', $subset );
-                    $fontsCollection[$i]["subsets"] = explode( ',', $subset[1] );
+                $subset = (is_array($font)) ? end($font) : '';
+                if (false !== strpos($subset, 'subset=')) {
+                    $subset = explode('subset=', $subset);
+                    $fontsCollection[$i]["subsets"] = explode(',', $subset[1]);
                 }
             }
             // And remove Google Fonts.
-            $in = str_replace( $matches[0][ $i ], '', $in );
+            $in = str_replace($matches[0][$i], '', $in);
         }
         $i++;
     }
 
-    $_fontsOut="";
-    if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "3" ) {
+    $_fontsOut = "";
+    if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "3") {
         // aggregate & link
-        $_fontsString="";
-        $_subsetString="";
+        $_fontsString = "";
+        $_subsetString = "";
         foreach ($fontsCollection as $font) {
-            $_fontsString .= '|'.trim( implode( '|' , $font["fonts"] ), '|' );
-            if ( !empty( $font["subsets"] ) ) {
-                $_subsetString .= implode( ',', $font["subsets"] ); 
+            $_fontsString .= '|'.trim(implode('|', $font["fonts"]), '|');
+            if (!empty($font["subsets"])) {
+                $_subsetString .= implode(',', $font["subsets"]); 
             }
         }
                     
@@ -222,17 +222,17 @@ 
             $_fontsString = $_fontsString."#038;subset=".$_subsetString;
         }
 
-        $_fontsString = str_replace( '|', '%7C', ltrim($_fontsString,'|') );
+        $_fontsString = str_replace('|', '%7C', ltrim($_fontsString, '|'));
         
-        if ( ! empty( $_fontsString ) ) {
-            $_fontsOut = '<link rel="stylesheet" id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family=' . $_fontsString . '" />';
+        if (!empty($_fontsString)) {
+            $_fontsOut = '<link rel="stylesheet" id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family='.$_fontsString.'" />';
         }
-    } else if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4" ) {
+    } else if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4") {
         // aggregate & load async (webfont.js impl.)
         $_fontsArray = array();
         foreach ($fontsCollection as $_fonts) {
-            if ( !empty( $_fonts["subsets"] ) ) {
-                $_subset = implode(",",$_fonts["subsets"]);
+            if (!empty($_fonts["subsets"])) {
+                $_subset = implode(",", $_fonts["subsets"]);
                 foreach ($_fonts["fonts"] as $key => $_one_font) {
                     $_one_font = $_one_font.":".$_subset;
                     $_fonts["fonts"][$key] = $_one_font;
@@ -245,7 +245,7 @@ 
         foreach ($_fontsArray as $_font) {
             $_fontsOut .= $_font."','";
         }
-        $_fontsOut = trim(trim($_fontsOut,"'"),",");
+        $_fontsOut = trim(trim($_fontsOut, "'"), ",");
         $_fontsOut .= '] },classes:false, events:false, timeout:1500};(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.defer=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>';
     }
  
@@ -259,7 +259,7 @@ 
 
     // preconnect to fonts.gstatic.com speed up download of static font-files
     $in[] = "https://fonts.gstatic.com";
-    if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4" ) {
+    if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4") {
         // and more preconnects for webfont.js
         $in[] = "https://ajax.googleapis.com";
         $in[] = "https://fonts.googleapis.com";
@@ -267,11 +267,11 @@ 
     return $in;
 }
 
-function autoptimize_extra_remove_dns_prefetch( $urls, $relation_type, $_remove_url ) {
-        if ( 'dns-prefetch' == $relation_type ) {
-        $_count=0;
+function autoptimize_extra_remove_dns_prefetch($urls, $relation_type, $_remove_url) {
+        if ('dns-prefetch' == $relation_type) {
+        $_count = 0;
         foreach ($urls as $_url) {
-            if ( strpos($_url, $_remove_url) !== false ) {
+            if (strpos($_url, $_remove_url) !== false) {
                 unset($urls[$_count]);
             }
             $_count++;
@@ -283,12 +283,12 @@ 
 
 /* admin page functions */
 function autoptimize_extra_admin() { 
-    add_submenu_page( null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', 'autoptimize_extra_options_page' );
-    register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
+    add_submenu_page(null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', 'autoptimize_extra_options_page');
+    register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings');
 }
 
 function add_autoptimize_extra_tab($in) {
-    $in=array_merge($in,array('autoptimize_extra' => __('Extra','autoptimize')));
+    $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
     return $in;
 }
 
@@ -302,50 +302,50 @@ 
         #autoptimize_extra_descr{font-size: 120%;}
     </style>
     <div class="wrap">
-    <h1><?php _e('Autoptimize Settings','autoptimize'); ?></h1>
+    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
     <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
     <form id='ao_settings_form' action='options.php' method='post'>
         <?php settings_fields('autoptimize_extra_settings'); ?>
-        <h2><?php _e('Extra Auto-Optimizations','autoptimize'); ?></h2>
-        <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.','autoptimize'); ?></span>
+        <h2><?php _e('Extra Auto-Optimizations', 'autoptimize'); ?></h2>
+        <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.', 'autoptimize'); ?></span>
         <table class="form-table">
             <tr>
-                <th scope="row"><?php _e('Remove emojis','autoptimize'); ?></th>
+                <th scope="row"><?php _e('Remove emojis', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) && 1 == $autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) echo 'checked="checked"'; ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.','autoptimize'); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) && 1 == $autoptimize_extra_options['autoptimize_extra_checkbox_field_1']) echo 'checked="checked"'; ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e('Remove query strings from static resources','autoptimize'); ?></th>
+                <th scope="row"><?php _e('Remove query strings from static resources', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty( $autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) && 1 == $autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) echo 'checked="checked"'; ?> value='1'><?php _e('Removing query strings (or more specificaly the <code>ver</code> parameter) will not improve load time, but might improve performance scores.','autoptimize'); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty($autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) && 1 == $autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) echo 'checked="checked"'; ?> value='1'><?php _e('Removing query strings (or more specificaly the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e('Google Fonts','autoptimize'); ?></th>
+                <th scope="row"><?php _e('Google Fonts', 'autoptimize'); ?></th>
                 <td>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($_googlef,array(2,3,4))) {echo "checked"; } ?> ><?php _e('Leave as is','autoptimize'); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $_googlef, true); ?> ><?php _e('Remove Google Fonts','autoptimize'); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $_googlef, true); ?> ><?php _e('Combine and link in head','autoptimize'); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $_googlef, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>','autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($_googlef, array(2, 3, 4))) {echo "checked"; } ?> ><?php _e('Leave as is', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $_googlef, true); ?> ><?php _e('Remove Google Fonts', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $_googlef, true); ?> ><?php _e('Combine and link in head', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $_googlef, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize'); ?><br/>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>','autoptimize'); ?></th>
+                <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php echo $autoptimize_extra_options['autoptimize_extra_text_field_2']; ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).','autoptimize'); ?></label>
+                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php echo $autoptimize_extra_options['autoptimize_extra_text_field_2']; ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>','autoptimize'); ?></th>
+                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
                     <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php echo $autoptimize_extra_options['autoptimize_extra_text_field_3']; ?>'>
                     <br />
-                    <?php _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here.','autoptimize'); ?>
+                    <?php _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here.', 'autoptimize'); ?>
                 </td>
             </tr>
         </table>
-        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes','autoptimize') ?>" /></p>
+        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize') ?>" /></p>
     </form>
     <?php
 }

classes/autoptimizeBase.php

Spacing +81 added lines, -81 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,37 +23,37 @@ 
     
     //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);
-        $contentHost=parse_url(AUTOPTIMIZE_WP_ROOT_URL,PHP_URL_HOST);
+        $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
+        $contentHost = parse_url(AUTOPTIMIZE_WP_ROOT_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;
             }
         }
         
         if ($siteHost !== $contentHost) {
-            $url=str_replace(AUTOPTIMIZE_WP_CONTENT_URL,AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME,$url);
+            $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $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)
@@ -65,18 +65,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;
                 }
@@ -86,22 +86,22 @@ 
         }
         
         // try to remove "wp root url" from url while not minding http<>https
-        $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL);
+        $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
         if ($siteHost !== $contentHost) {
             // as we replaced the content-domain with the site-domain, we should match against that 
-            $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_SITE_URL);
+            $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL);
         }
-        $tmp_url = preg_replace('/https?:/','',$url);
-        $path = str_replace($tmp_ao_root,'',$tmp_url);
+        $tmp_url = preg_replace('/https?:/', '', $url);
+        $path = str_replace($tmp_ao_root, '', $tmp_url);
         
         // 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;
         }
 
         // prepend with WP_ROOT_DIR to have full path to file
-        $path = str_replace('//','/',WP_ROOT_DIR.$path);
+        $path = str_replace('//', '/', WP_ROOT_DIR.$path);
         
         // final check: does file exist and is it readable
         if (file_exists($path) && is_file($path) && is_readable($path)) {
@@ -114,25 +114,25 @@ 
     // 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);
         }
@@ -140,7 +140,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(
@@ -157,7 +157,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'.AUTOPTIMIZE_HASH.'%%(.*?)%%NOPTIMIZE%%#is',
                 create_function(
@@ -173,7 +173,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(
@@ -189,7 +189,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'.AUTOPTIMIZE_HASH.'%%(.*?)%%IEHACK%%#is',
                 create_function(
@@ -199,13 +199,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(
@@ -221,7 +221,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'.AUTOPTIMIZE_HASH.'%%(.*?)%%COMMENTS%%#is',
                 create_function(
@@ -231,31 +231,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;
                 }
@@ -263,32 +263,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;
             }
         }
@@ -297,7 +297,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'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is',
                 create_function(
@@ -344,49 +344,49 @@ 
     
     protected function minify_single($pathIn) {
 		// determine JS or CSS and set var (also mimetype), return false if neither
-		if ( $this->str_ends_in($pathIn,".js") === true ) {
-			$codeType="js";
-			$codeMime="text/javascript";
-		} else if ( $this->str_ends_in($pathIn,".css") === true ) {
-			$codeType="css";
-			$codeMime="text/css";			
+		if ($this->str_ends_in($pathIn, ".js") === true) {
+			$codeType = "js";
+			$codeMime = "text/javascript";
+		} else if ($this->str_ends_in($pathIn, ".css") === true) {
+			$codeType = "css";
+			$codeMime = "text/css";			
 		} else {
 			return false;
 		}
 		
 		// if min.js or min.css return false
-		if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
+		if (($this->str_ends_in($pathIn, "-min.".$codeType) === true) || ($this->str_ends_in($pathIn, ".min.".$codeType) === true) || ($this->str_ends_in($pathIn, "js/jquery/jquery.js") === true)) {
 			return false;
 		}
 		
 		// read file, return false if empty
 		$_toMinify = file_get_contents($pathIn);
-		if ( empty($_toMinify) ) return false;
+		if (empty($_toMinify)) return false;
 		
 		// check cache
 		$_md5hash = "single_".md5($_toMinify);
-		$_cache = new autoptimizeCache($_md5hash,$codeType);
-		if ($_cache->check() ) {
+		$_cache = new autoptimizeCache($_md5hash, $codeType);
+		if ($_cache->check()) {
 			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
 		} else {
 			// if not in cache first minify
 			$_Minified = $_toMinify;
 			if ($codeType === "js") {
-				if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
-					if (@is_callable(array("JSMin","minify"))) {
+				if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) {
+					if (@is_callable(array("JSMin", "minify"))) {
 						$tmp_code = trim(JSMin::minify($_toMinify));
 					}
 				}
 			} else if ($codeType === "css") {
                 // make sure paths to background images/ imported css/ fonts .. are OK
-                $_toMinify = $this->fixurls($pathIn,$_toMinify);
+                $_toMinify = $this->fixurls($pathIn, $_toMinify);
                 if (class_exists('Minify_CSS_Compressor')) {
 					$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
-                } 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($_toMinify));
-                    } elseif (@is_callable(array($cssmin,"minify"))) {
+                    } elseif (@is_callable(array($cssmin, "minify"))) {
                         $tmp_code = trim(CssMin::minify($_toMinify));
                     }
                 }
@@ -396,7 +396,7 @@ 
 				unset($tmp_code);
 			}
 			// and then cache
-			$_cache->cache($_Minified,$codeMime);
+			$_cache->cache($_Minified, $codeMime);
 			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
 		}
 		unset($_cache);
@@ -407,10 +407,10 @@ 
 		return $_CachedMinifiedUrl;
 	}
 	
-	protected function str_ends_in($haystack,$needle) {
+	protected function str_ends_in($haystack, $needle) {
 		$needleLength = strlen($needle);
 		$haystackLength = strlen($haystack);
-		$lastPos=strrpos($haystack,$needle);
+		$lastPos = strrpos($haystack, $needle);
 		if ($lastPos === $haystackLength - $needleLength) {
 			return true;
 		} else {