Inspection of "fix typo" - futtta/autoptimize - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#171)

unknown

created 2018-06-22 06:22 UTC

Status

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

@@ -33,7 +33,7 @@  discard block
 block discarded – undo
      * 
      * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
      * unset, minify will sniff for an XHTML doctype.
-	 * 
+     * 
      * 'keepComments' : (optional boolean) should the HTML comments be kept
      * in the HTML Code?
      * 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
      * 
      * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
      * unset, minify will sniff for an XHTML doctype.
-	 * 
+     * 
      * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
      * unset, minify will sniff for an XHTML doctype.
      * 
@@ -111,11 +111,11 @@  discard block
 block discarded – undo
             ,$this->_html);
         
         // remove HTML comments (not containing IE conditional comments).
-		if  ($this->_keepComments == false) {
-			$this->_html = preg_replace_callback(
-				'/<!--([\\s\\S]*?)-->/'
-				,array($this, '_commentCB')
-				,$this->_html);
+        if  ($this->_keepComments == false) {
+            $this->_html = preg_replace_callback(
+                '/<!--([\\s\\S]*?)-->/'
+                ,array($this, '_commentCB')
+                ,$this->_html);
         }
 		
         // replace PREs with placeholders
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
             ,array($this, '_removeTextareaCB')
             ,$this->_html);
 			
-		// replace data: URIs with placeholders
+        // replace data: URIs with placeholders
         $this->_html = preg_replace_callback(
             '/(=("|\')data:.*\\2)/Ui'
             ,array($this, '_removeDataURICB')
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
     protected $_placeholders = array();
     protected $_cssMinifier = null;
     protected $_jsMinifier = null;
-	protected $_keepComments = false;
+    protected $_keepComments = false;
 
     protected function _outsideTagCB($m)
     {
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
         return $this->_reservePlace($m[1]);
     }
 	
-	protected function _removeDataURICB($m)
+    protected function _removeDataURICB($m)
     {
         return $this->_reservePlace($m[1]);
     }

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -70,7 +70,7 @@  discard block
 block discarded – undo
     {
         $this->_html = str_replace("\r\n", "\n", trim($html));
         if (isset($options['xhtml'])) {
-            $this->_isXhtml = (bool)$options['xhtml'];
+            $this->_isXhtml = (bool) $options['xhtml'];
         }
         if (isset($options['cssMinifier'])) {
             $this->_cssMinifier = $options['cssMinifier'];
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
             $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));
         }
         
-        $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);
+        $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']);
         $this->_placeholders = array();
         
         // replace SCRIPTs (and minify) with placeholders
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
             ,$this->_html);
         
         // remove HTML comments (not containing IE conditional comments).
-		if  ($this->_keepComments == false) {
+		if ($this->_keepComments == false) {
 			$this->_html = preg_replace_callback(
 				'/<!--([\\s\\S]*?)-->/'
 				,array($this, '_commentCB')
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
     
     protected function _reservePlace($content)
     {
-        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';
+        $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%';
         $this->_placeholders[$placeholder] = $content;
         return $placeholder;
     }
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
 
     protected function _outsideTagCB($m)
     {
-        return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<';
+        return '>'.preg_replace('/^\\s+|\\s+$/', ' ', $m[1]).'<';
     }
     
     protected function _removePreCB($m)
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
     protected function _removeCdata($str)
     {
         return (false !== strpos($str, '<![CDATA['))
-            ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str)
+            ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str)
             : $str;
     }
     

Please login to merge, or discard this patch.

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

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

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

Please login to merge, or discard this patch.

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

		@@ -701,9 +701,15 @@
		block discarded – undo
701	701	private function hue_to_rgb($v1, $v2, $vh)
702	702	{
703	703	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
704		- if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
705		- if ($vh * 2 < 1) return $v2;
706		- if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
	704	+ if ($vh * 6 < 1) {
	705	+ return $v1 + ($v2 - $v1) * 6 * $vh;
	706	+ }
	707	+ if ($vh * 2 < 1) {
	708	+ return $v2;
	709	+ }
	710	+ if ($vh * 3 < 2) {
	711	+ return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
	712	+ }
707	713	return $v1;
708	714	}
709	715

Please login to merge, or discard this patch.

Spacing +60 added lines, -60 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Doc Comments +10 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

autoptimize.php 3 patches

Braces +13 added lines, -7 removed lines patch added patch discarded remove patch

@@ -12,7 +12,10 @@  discard block
 block discarded – undo
 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__));
 
@@ -224,12 +227,15 @@  discard block
 block discarded – undo
 
     // Choose the classes
     $classes = array();
-    if($conf->get('autoptimize_js'))
-        $classes[] = 'autoptimizeScripts';
-    if($conf->get('autoptimize_css'))
-        $classes[] = 'autoptimizeStyles';
-    if($conf->get('autoptimize_html'))
-        $classes[] = 'autoptimizeHTML';
+    if($conf->get('autoptimize_js')) {
+            $classes[] = 'autoptimizeScripts';
+    }
+    if($conf->get('autoptimize_css')) {
+            $classes[] = 'autoptimizeStyles';
+    }
+    if($conf->get('autoptimize_html')) {
+            $classes[] = 'autoptimizeHTML';
+    }
 
     // Set some options
     $classoptions = array(

Please login to merge, or discard this patch.

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

@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 
 // WP CLI
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
-	require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
+    require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
 }
 
 // Initialize the cache at least once
@@ -137,21 +137,21 @@  discard block
 block discarded – undo
         $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') ) {
-		$ao_noptimize = true;
-	}
-
-	// if setting says not to optimize cart/ checkout
-	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() ) {
-				$ao_noptimize = true;
-				break;
-			}
-		}
-	}
+    // 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') ) {
+        $ao_noptimize = true;
+    }
+
+    // if setting says not to optimize cart/ checkout
+    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() ) {
+                $ao_noptimize = true;
+                break;
+            }
+        }
+    }
 
     // filter you can use to block autoptimization on your own terms
     $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );

Please login to merge, or discard this patch.

Spacing +79 added lines, -79 removed lines patch added patch discarded remove patch

@@ -12,15 +12,15 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 }
 
 // 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 @@  discard block
 block discarded – undo
 /* 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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
 	}
 
     // 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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
             // }
         }
 
-        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 @@  discard block
 block discarded – undo
                     @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 @@  discard block
 block discarded – undo
                     @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 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
         )
     );
 
-    $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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
 }
 
 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');
     }
 }

Please login to merge, or discard this patch.

classes/autoptimizeToolbar.php 3 patches

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

@@ -75,18 +75,18 @@
 block discarded – undo
         $wp_admin_bar->add_node( array(
             'id'     => 'autoptimize-cache-info',
             'title'  => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' .
-                   '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
-                   '<div class="circle">'.
-                   '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
-                   '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
-                   '<div class="shadow"></div>'.
-                   '</div>'.
-                   '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
-                   '</div>' .
-                   '<table>' .
-                   '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
-                   '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
-                   '</table>',
+                    '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
+                    '<div class="circle">'.
+                    '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
+                    '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
+                    '<div class="shadow"></div>'.
+                    '</div>'.
+                    '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
+                    '</div>' .
+                    '<table>' .
+                    '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
+                    '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
+                    '</table>',
             'parent' => 'autoptimize'
         ));
 

Please login to merge, or discard this patch.

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -1,35 +1,35 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 class autoptimizeToolbar
 {
     public function __construct()
     {
         // If Cache is not available we don't add the Autoptimize Toolbar
-        if( ! autoptimizeCache::cacheavail() ) {
+        if (!autoptimizeCache::cacheavail()) {
             return;
         }
         // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated.
-        add_action( 'wp_loaded', array( $this, 'load_toolbar' ) );
+        add_action('wp_loaded', array($this, 'load_toolbar'));
     }
 
     public function load_toolbar()
     {
         // Check permissions and that toolbar is not hidden via filter
-        if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) {
+        if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) {
             // Create a handler for the AJAX toolbar requests
-            add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) );
+            add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache'));
 
             // Load custom styles, scripts and menu only when needed
-            if ( is_admin_bar_showing() ) {
-                if ( is_admin() ) {
+            if (is_admin_bar_showing()) {
+                if (is_admin()) {
                     // in the case of back-end
-                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+                    add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
                 } else {
                     // in the case of front-end
-                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+                    add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
                 }
                 // Add the Autoptimize Toolbar to the Admin bar
-                add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 );
+                add_action('admin_bar_menu', array($this, 'add_toolbar'), 100);
             }
         }
     }
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
         $stats = autoptimizeCache::stats();
 
         // Set the Max Size recommended for cache files
-        $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 );
+        $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024);
 
         // Retrieve the current Total Files in cache
         $files = $stats[0];
@@ -52,83 +52,83 @@  discard block
 block discarded – undo
         $size = $this->format_filesize($bytes);
 
         // We calculated the percentage of cache used
-        $percentage = ceil( $bytes / $max_size * 100 );
-        if ( $percentage > 100 ) {
+        $percentage = ceil($bytes/$max_size*100);
+        if ($percentage > 100) {
             $percentage = 100;
         }
         // We define the type of color indicator for the current state of cache size.
         // "green" if the size is less than 80% of the total recommended
         // "orange" if over 80%
         // "red" if over 100%
-        $color = ( $percentage == 100 ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' );
+        $color = ($percentage == 100) ? 'red' : (($percentage > 80) ? 'orange' : 'green');
 
         // Create or add new items into the Admin Toolbar.
         // Main Autoptimize node
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'    => 'autoptimize',
-            'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( "Autoptimize", 'autoptimize' ) . '</span>',
-            'href'  => admin_url( 'options-general.php?page=autoptimize' ),
-            'meta'  => array( 'class' => 'bullet-' . $color )
+            'title' => '<span class="ab-icon"></span><span class="ab-label">'.__("Autoptimize", 'autoptimize').'</span>',
+            'href'  => admin_url('options-general.php?page=autoptimize'),
+            'meta'  => array('class' => 'bullet-'.$color)
         ));
 
         // Cache Info node
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-cache-info',
-            'title'  => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' .
-                   '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
+            'title'  => '<p>'.__("Cache Info", 'autoptimize').'</p>'.
+                   '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'.
                    '<div class="circle">'.
-                   '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
-                   '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
+                   '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'.
+                   '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'.
                    '<div class="shadow"></div>'.
                    '</div>'.
-                   '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
-                   '</div>' .
-                   '<table>' .
-                   '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
-                   '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
+                   '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'.
+                   '</div>'.
+                   '<table>'.
+                   '<tr><td>'.__("Size", 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'.
+                   '<tr><td>'.__("Files", 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'.
                    '</table>',
             'parent' => 'autoptimize'
         ));
 
         // Delete Cache node
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-delete-cache',
-            'title'  => __( "Delete Cache", 'autoptimize' ),
+            'title'  => __("Delete Cache", 'autoptimize'),
             'parent' => 'autoptimize'
         ));
     }
 
     public function delete_cache()
     {
-        check_ajax_referer( 'ao_delcache_nonce', 'nonce' );
+        check_ajax_referer('ao_delcache_nonce', 'nonce');
         $result = false;
-        if ( current_user_can( 'manage_options' ) )
+        if (current_user_can('manage_options'))
         {
             // We call the function for cleaning the Autoptimize cache
             $result = autoptimizeCache::clearall();
         }
-        wp_send_json( $result );
+        wp_send_json($result);
     }
 
     public function enqueue_scripts()
     {
         // Autoptimize Toolbar Styles
-        wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), time(), 'all' );
+        wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), time(), 'all');
         // Autoptimize Toolbar Javascript
-        wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), time(), true );
+        wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), time(), true);
         // Localizes a registered script with data for a JavaScript variable. (We need this for the AJAX work properly in the front-end mode)
-        wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array(
-            'ajaxurl' => admin_url( 'admin-ajax.php' ),
-            'error_msg' => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ),
-            'dismiss_msg' => __( 'Dismiss this notice.' ),
-            'nonce' => wp_create_nonce( 'ao_delcache_nonce' )
-        ) );
+        wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array(
+            'ajaxurl' => admin_url('admin-ajax.php'),
+            'error_msg' => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'),
+            'dismiss_msg' => __('Dismiss this notice.'),
+            'nonce' => wp_create_nonce('ao_delcache_nonce')
+        ));
     }
 
     public function format_filesize($bytes, $decimals = 2)
     {
-        $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' );
-        for ($i = 0; ($bytes / 1024) > 0.9; $i++, $bytes /= 1024) {}
-        return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[$i] );
+        $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+        for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {}
+        return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]);
     }
 }

Please login to merge, or discard this patch.

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,8 @@
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 class autoptimizeToolbar
 {
     public function __construct()

Please login to merge, or discard this patch.

classes/autoptimizeBase.php 4 patches

Braces +10 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,5 +1,8 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 abstract class autoptimizeBase {
     protected $content = '';
@@ -122,7 +125,9 @@  discard block
 block discarded – undo
         $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;
     }
@@ -359,7 +364,9 @@  discard block
 block discarded – undo
 		
 		// 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);

Please login to merge, or discard this patch.

Doc Comments +17 added lines patch added patch discarded remove patch

@@ -139,6 +139,10 @@  discard block
 block discarded – undo
     }
 
     // hide everything between noptimize-comment tags
+
+    /**
+     * @param string $noptimize_in
+     */
     protected function hide_noptimize($noptimize_in) {
         if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { 
             $noptimize_out = preg_replace_callback(
@@ -286,6 +290,9 @@  discard block
 block discarded – undo
         }
     }
     
+    /**
+     * @param string $tag
+     */
     protected function isremovable($tag, $removables) {
         foreach ($removables as $match) {
             if (strpos($tag,$match)!==false) {
@@ -296,6 +303,10 @@  discard block
 block discarded – undo
     }
     
     // inject already minified code in optimized JS/CSS
+
+    /**
+     * @return string
+     */
     protected function inject_minified($in) {
         if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
             $out = preg_replace_callback(
@@ -342,6 +353,9 @@  discard block
 block discarded – undo
         return $out;
     }
     
+    /**
+     * @param string $pathIn
+     */
     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 ) {
@@ -405,6 +419,9 @@  discard block
 block discarded – undo
 		return $_CachedMinifiedUrl;
 	}
 	
+	/**
+	 * @param string $needle
+	 */
 	protected function str_ends_in($haystack,$needle) {
 		$needleLength = strlen($needle);
 		$haystackLength = strlen($haystack);

Please login to merge, or discard this patch.

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

@@ -343,45 +343,45 @@  discard block
 block discarded – undo
     }
     
     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";			
-		} else {
-			return false;
-		}
+        // 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";			
+        } 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 ) ) {
-			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 ) ) {
+            return false;
+        }
 		
-		// read file, return false if empty
-		$_toMinify = file_get_contents($pathIn);
-		if ( empty($_toMinify) ) return false;
+        // read file, return false if empty
+        $_toMinify = file_get_contents($pathIn);
+        if ( empty($_toMinify) ) return false;
 		
-		// check cache
-		$_md5hash = "single_".md5($_toMinify);
-		$_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"))) {
-						$tmp_code = trim(JSMin::minify($_toMinify));
-					}
-				}
-			} else if ($codeType === "css") {
+        // check cache
+        $_md5hash = "single_".md5($_toMinify);
+        $_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"))) {
+                        $tmp_code = trim(JSMin::minify($_toMinify));
+                    }
+                }
+            } else if ($codeType === "css") {
                 // make sure paths to background images/ imported css/ fonts .. are OK
                 $_toMinify = autoptimizeStyles::fixurls($pathIn,$_toMinify);
                 if (class_exists('Minify_CSS_Compressor')) {
-					$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
+                    $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
                 } else if(class_exists('CSSmin')) {
                     $cssmin = new CSSmin();
                     if (method_exists($cssmin,"run")) {
@@ -390,31 +390,31 @@  discard block
 block discarded – undo
                         $tmp_code = trim(CssMin::minify($_toMinify));
                     }
                 }
-			}
-			if (!empty($tmp_code)) {
-				$_Minified = $tmp_code;
-				unset($tmp_code);
-			}
-			// and then cache
-			$_cache->cache($_Minified,$codeMime);
-			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
-		}
-		unset($_cache);
+            }
+            if (!empty($tmp_code)) {
+                $_Minified = $tmp_code;
+                unset($tmp_code);
+            }
+            // and then cache
+            $_cache->cache($_Minified,$codeMime);
+            $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
+        }
+        unset($_cache);
 	
-		// if CDN, then CDN
-		$_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);									
+        // if CDN, then CDN
+        $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);									
 
-		return $_CachedMinifiedUrl;
-	}
+        return $_CachedMinifiedUrl;
+    }
 	
-	protected function str_ends_in($haystack,$needle) {
-		$needleLength = strlen($needle);
-		$haystackLength = strlen($haystack);
-		$lastPos=strrpos($haystack,$needle);
-		if ($lastPos === $haystackLength - $needleLength) {
-			return true;
-		} else {
-			return false;
-		}
-	}
+    protected function str_ends_in($haystack,$needle) {
+        $needleLength = strlen($needle);
+        $haystackLength = strlen($haystack);
+        $lastPos=strrpos($haystack,$needle);
+        if ($lastPos === $haystackLength - $needleLength) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

Please login to merge, or discard this patch.

Spacing +81 added lines, -81 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
     
     //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 @@  discard block
 block discarded – undo
             
             $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 @@  discard block
 block discarded – undo
         }
         
         // 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 @@  discard block
 block discarded – undo
     // 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 @@  discard block
 block discarded – undo
 
     // 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 @@  discard block
 block discarded – undo
     
     // 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 @@  discard block
 block discarded – undo
     }
 
     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 @@  discard block
 block discarded – undo
     }
 
     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 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
     }
 
     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 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
         }
 
         // 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 @@  discard block
 block discarded – undo
     
     // 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 @@  discard block
 block discarded – undo
     
     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 = autoptimizeStyles::fixurls($pathIn,$_toMinify);
+                $_toMinify = autoptimizeStyles::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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 		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 {

Please login to merge, or discard this patch.

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

Spacing +73 added lines, -73 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

classes/autoptimizeScripts.php 3 patches

Braces +10 added lines, -4 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

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

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

Please login to merge, or discard this patch.

Spacing +115 added lines, -115 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

classes/autoptimizeStyles.php 4 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -610,6 +610,9 @@
 block discarded – undo
         return $code;
     }
     
+    /**
+     * @param string $tag
+     */
     private function ismovable($tag) {
 		if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
 			return false;

Please login to merge, or discard this patch.

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

@@ -162,32 +162,32 @@  discard block
 block discarded – undo
                     // Remove the original style tag
                     $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);
+                    // excluded CSS, minify if getpath 
+                    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)) {
-							$_CachedMinifiedUrl = $this->minify_single($path);
-
-							if (!empty($_CachedMinifiedUrl)) {
-								// replace orig URL with URL to cache
-								$newTag = str_replace($url, $_CachedMinifiedUrl, $tag);
-							} else {
-								$newTag = $tag;
-							}
+                        if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
+                            $_CachedMinifiedUrl = $this->minify_single($path);
+
+                            if (!empty($_CachedMinifiedUrl)) {
+                                // replace orig URL with URL to cache
+                                $newTag = str_replace($url, $_CachedMinifiedUrl, $tag);
+                            } else {
+                                $newTag = $tag;
+                            }
 							
-							// remove querystring from URL
-							if ( !empty($explUrl[1]) ) {
-								$newTag = str_replace("?".$explUrl[1],"",$newTag);
-							}
-
-							// and replace
-							$this->content = str_replace($tag,$newTag,$this->content);
-						}
-					}					
-				}
+                            // remove querystring from URL
+                            if ( !empty($explUrl[1]) ) {
+                                $newTag = str_replace("?".$explUrl[1],"",$newTag);
+                            }
+
+                            // and replace
+                            $this->content = str_replace($tag,$newTag,$this->content);
+                        }
+                    }					
+                }
             }
             return true;
         }
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
                         // 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]);
-						}
+                        }
                     }
                 }
             } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
@@ -611,8 +611,8 @@  discard block
 block discarded – undo
     }
     
     private function ismovable($tag) {
-		if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
-			return 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) {
@@ -637,13 +637,13 @@  discard block
 block discarded – undo
     }
     
     private function can_inject_late($cssPath,$css) {
-		$consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
+        $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
         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 ) ) {
-			// file not minified based on filename & filter
-			return false;
+            // file not minified based on filename & filter
+            return false;
         } else if ( strpos($css,"@import") !== false ) {
             // can't late-inject files with imports as those need to be aggregated 
             return false;

Please login to merge, or discard this patch.

Braces +11 added lines, -5 removed lines patch added patch discarded remove patch

@@ -1,5 +1,8 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 class autoptimizeStyles extends autoptimizeBase {
 
@@ -24,7 +27,9 @@  discard block
 block discarded – undo
     //Reads the page and collects style tags
     public function read($options) {
         $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );
-        if ($noptimizeCSS) return false;
+        if ($noptimizeCSS) {
+            return false;
+        }
 
         $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content );
         if (!empty($whitelistCSS)) {
@@ -139,7 +144,7 @@  discard block
 block discarded – undo
                         if($path!==false && preg_match('#\.css$#',$path)) {
                             // Good link
                             $this->css[] = array($media,$path);
-                        }else{
+                        } else{
                             // Link is dynamic (.php etc)
                             $tag = '';
                         }
@@ -228,8 +233,9 @@  discard block
 block discarded – undo
             }
             
             foreach($media as $elem) {
-                if(!isset($this->csscode[$elem]))
-                    $this->csscode[$elem] = '';
+                if(!isset($this->csscode[$elem])) {
+                                    $this->csscode[$elem] = '';
+                }
                 $this->csscode[$elem] .= "\n/*FILESTART*/".$css;
             }
         }

Please login to merge, or discard this patch.

Spacing +189 added lines, -189 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 
     //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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
 							}
 							
 							// 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 @@  discard block
 block discarded – undo
     
     // 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 @@  discard block
 block discarded – undo
                 }
             }
             
-            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 @@  discard block
 block discarded – undo
         // 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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
                     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 @@  discard block
 block discarded – undo
 
             // 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 @@  discard block
 block discarded – undo
                         
                             // 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 @@  discard block
 block discarded – undo
             
             $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 @@  discard block
 block discarded – undo
     //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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
                     
                 } 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 @@  discard block
 block discarded – undo
     
     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 @@  discard block
 block discarded – undo
     }
     
     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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
         }
     }
     
-    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 @@  discard block
 block discarded – undo
     }
     
     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;

Please login to merge, or discard this patch.

classlesses/autoptimizeUpdateCode.php 2 patches

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

@@ -3,7 +3,10 @@
 block discarded – undo
 * below code handles updates and is only included by autoptimize.php if/ when needed
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 $majorUp = false;        
 $autoptimize_major_version=substr($autoptimize_db_version,0,3);

Please login to merge, or discard this patch.

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -3,48 +3,48 @@  discard block
 block discarded – undo
 * below code handles updates and is only included by autoptimize.php if/ when needed
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 $majorUp = false;        
-$autoptimize_major_version=substr($autoptimize_db_version,0,3);
+$autoptimize_major_version = substr($autoptimize_db_version, 0, 3);
 
-switch($autoptimize_major_version) {
+switch ($autoptimize_major_version) {
     case "1.6":
         // from back in the days when I did not yet consider multisite
         // if user was on version 1.6.x, force advanced options to be shown by default
-        update_option('autoptimize_show_adv','1');
+        update_option('autoptimize_show_adv', '1');
 
         // and remove old options
-        $to_delete_options=array("autoptimize_cdn_css","autoptimize_cdn_css_url","autoptimize_cdn_js","autoptimize_cdn_js_url","autoptimize_cdn_img","autoptimize_cdn_img_url","autoptimize_css_yui","autoptimize_js_yui");
+        $to_delete_options = array("autoptimize_cdn_css", "autoptimize_cdn_css_url", "autoptimize_cdn_js", "autoptimize_cdn_js_url", "autoptimize_cdn_img", "autoptimize_cdn_img_url", "autoptimize_css_yui", "autoptimize_js_yui");
         foreach ($to_delete_options as $del_opt) {
-            delete_option( $del_opt );
+            delete_option($del_opt);
         }
         $majorUp = true;
     case "1.7":
         // force 3.8 dashicons in CSS exclude options when upgrading from 1.7 to 1.8
-        if ( !is_multisite() ) {
+        if (!is_multisite()) {
             $css_exclude = get_option('autoptimize_css_exclude');
             if (empty($css_exclude)) {
                 $css_exclude = "admin-bar.min.css, dashicons.min.css";
-            } else if (strpos($css_exclude,"dashicons.min.css")===false) {
+            } else if (strpos($css_exclude, "dashicons.min.css") === false) {
                 $css_exclude .= ", dashicons.min.css";
             }
-            update_option('autoptimize_css_exclude',$css_exclude);
+            update_option('autoptimize_css_exclude', $css_exclude);
         } 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 ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
                 $css_exclude = get_option('autoptimize_css_exclude');
                 if (empty($css_exclude)) {
                     $css_exclude = "admin-bar.min.css, dashicons.min.css";
-                } else if (strpos($css_exclude,"dashicons.min.css")===false) {
+                } else if (strpos($css_exclude, "dashicons.min.css") === false) {
                     $css_exclude .= ", dashicons.min.css";
                 }
-                update_option('autoptimize_css_exclude',$css_exclude);
+                update_option('autoptimize_css_exclude', $css_exclude);
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
         $majorUp = true;
     case "1.9":
@@ -52,53 +52,53 @@  discard block
 block discarded – undo
         * 2.0 will not aggregate inline CSS/JS by default, but we want users
         * upgrading from 1.9 to keep their inline code aggregated by default. 
         */
-        if ( !is_multisite() ) {
-            update_option('autoptimize_css_include_inline','on');
-            update_option('autoptimize_js_include_inline','on');
+        if (!is_multisite()) {
+            update_option('autoptimize_css_include_inline', 'on');
+            update_option('autoptimize_js_include_inline', 'on');
         } 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 );
-                update_option('autoptimize_css_include_inline','on');
-                update_option('autoptimize_js_include_inline','on');
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                update_option('autoptimize_css_include_inline', 'on');
+                update_option('autoptimize_js_include_inline', 'on');
             }
-            switch_to_blog( $original_blog_id );    
+            switch_to_blog($original_blog_id);    
         }
         $majorUp = true;
     case "2.2":
         /*
          * 2.3 has no "remove google fonts" in main screen, moved to "extra"
          */
-        if ( !is_multisite() ) {
-            $_nogooglefont = get_option('autoptimize_css_nogooglefont','');
-            $_ao_extrasetting = get_option('autoptimize_extra_settings','');
-            if ( ($_nogooglefont == 1) && ( empty($_ao_extrasetting) ) ) {
-                $_aoextra_removegfonts = 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"=>"");
-                update_option( 'autoptimize_extra_settings', $_aoextra_removegfonts );
+        if (!is_multisite()) {
+            $_nogooglefont = get_option('autoptimize_css_nogooglefont', '');
+            $_ao_extrasetting = get_option('autoptimize_extra_settings', '');
+            if (($_nogooglefont == 1) && (empty($_ao_extrasetting))) {
+                $_aoextra_removegfonts = 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"=>"");
+                update_option('autoptimize_extra_settings', $_aoextra_removegfonts);
             }
             delete_option('autoptimize_css_nogooglefont');
         } 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 );
-                    $_nogooglefont = get_option('autoptimize_css_nogooglefont','');
-                    $_ao_extrasetting = get_option('autoptimize_extra_settings','');
-                    if ( ($_nogooglefont == 1) && ( empty($_ao_extrasetting) ) ) {
-                    $_aoextra_removegfonts = 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"=>"");
-                    update_option( 'autoptimize_extra_settings', $_aoextra_removegfonts );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                    $_nogooglefont = get_option('autoptimize_css_nogooglefont', '');
+                    $_ao_extrasetting = get_option('autoptimize_extra_settings', '');
+                    if (($_nogooglefont == 1) && (empty($_ao_extrasetting))) {
+                    $_aoextra_removegfonts = 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"=>"");
+                    update_option('autoptimize_extra_settings', $_aoextra_removegfonts);
                 }
                 delete_option('autoptimize_css_nogooglefont');
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
         $majorUp = true;
     }
 
-if ( $majorUp === true && get_transient('autoptimize_stale_option_buster') == false ) {
+if ($majorUp === true && get_transient('autoptimize_stale_option_buster') == false) {
     // clear cache and notify user to check result if major upgrade
     set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS);
     autoptimizeCache::clearall();

Please login to merge, or discard this patch.

		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	*
34	34	* 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
35	35	* unset, minify will sniff for an XHTML doctype.
36		- *
	36	+ *
37	37	* 'keepComments' : (optional boolean) should the HTML comments be kept
38	38	* in the HTML Code?
39	39	*
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	*
61	61	* 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
62	62	* unset, minify will sniff for an XHTML doctype.
63		- *
	63	+ *
64	64	* 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
65	65	* unset, minify will sniff for an XHTML doctype.
66	66	*
		@@ -111,11 +111,11 @@ discard block
		block discarded – undo
111	111	,$this->_html);
112	112
113	113	// remove HTML comments (not containing IE conditional comments).
114		- if ($this->_keepComments == false) {
115		- $this->_html = preg_replace_callback(
116		- '/<!--([\\s\\S]*?)-->/'
117		- ,array($this, '_commentCB')
118		- ,$this->_html);
	114	+ if ($this->_keepComments == false) {
	115	+ $this->_html = preg_replace_callback(
	116	+ '/<!--([\\s\\S]*?)-->/'
	117	+ ,array($this, '_commentCB')
	118	+ ,$this->_html);
119	119	}
120	120
121	121	// replace PREs with placeholders
		@@ -129,7 +129,7 @@ discard block
		block discarded – undo
129	129	,array($this, '_removeTextareaCB')
130	130	,$this->_html);
131	131
132		- // replace data: URIs with placeholders
	132	+ // replace data: URIs with placeholders
133	133	$this->_html = preg_replace_callback(
134	134	'/(=("\|\')data:.*\\2)/Ui'
135	135	,array($this, '_removeDataURICB')
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	protected $_placeholders = array();
184	184	protected $_cssMinifier = null;
185	185	protected $_jsMinifier = null;
186		- protected $_keepComments = false;
	186	+ protected $_keepComments = false;
187	187
188	188	protected function _outsideTagCB($m)
189	189	{
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	return $this->_reservePlace($m[1]);
201	201	}
202	202
203		- protected function _removeDataURICB($m)
	203	+ protected function _removeDataURICB($m)
204	204	{
205	205	return $this->_reservePlace($m[1]);
206	206	}

		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	{
71	71	$this->_html = str_replace("\r\n", "\n", trim($html));
72	72	if (isset($options['xhtml'])) {
73		- $this->_isXhtml = (bool)$options['xhtml'];
	73	+ $this->_isXhtml = (bool) $options['xhtml'];
74	74	}
75	75	if (isset($options['cssMinifier'])) {
76	76	$this->_cssMinifier = $options['cssMinifier'];
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	$this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));
96	96	}
97	97
98		- $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);
	98	+ $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']);
99	99	$this->_placeholders = array();
100	100
101	101	// replace SCRIPTs (and minify) with placeholders
		@@ -111,7 +111,7 @@ discard block
		block discarded – undo
111	111	,$this->_html);
112	112
113	113	// remove HTML comments (not containing IE conditional comments).
114		- if ($this->_keepComments == false) {
	114	+ if ($this->_keepComments == false) {
115	115	$this->_html = preg_replace_callback(
116	116	'/<!--([\\s\\S]*?)-->/'
117	117	,array($this, '_commentCB')
		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173
174	174	protected function _reservePlace($content)
175	175	{
176		- $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';
	176	+ $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%';
177	177	$this->_placeholders[$placeholder] = $content;
178	178	return $placeholder;
179	179	}
		@@ -187,7 +187,7 @@ discard block
		block discarded – undo
187	187
188	188	protected function _outsideTagCB($m)
189	189	{
190		- return '>' . preg_replace('/^\\s+\|\\s+$/', ' ', $m[1]) . '<';
	190	+ return '>'.preg_replace('/^\\s+\|\\s+$/', ' ', $m[1]).'<';
191	191	}
192	192
193	193	protected function _removePreCB($m)
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	protected function _removeCdata($str)
258	258	{
259	259	return (false !== strpos($str, '<![CDATA['))
260		- ? str_replace(array('/* <![CDATA[ /','/ ]]> /','/<![CDATA[/','/]]>*/','<![CDATA[', ']]>'), '', $str)
	260	+ ? str_replace(array('/* <![CDATA[ /', '/ ]]> /', '/<![CDATA[/', '/]]>*/', '<![CDATA[', ']]>'), '', $str)
261	261	: $str;
262	262	}
263	263

		@@ -264,11 +264,11 @@ discard block
		block discarded – undo
264	264	// Normalize all whitespace strings to single spaces. Easier to work with that way.
265	265	$css = preg_replace('/\s+/', ' ', $css);
266	266
267		- // preserve flex, keeping percentage even if 0
268		- $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ])\s?(?:px\|em\|auto\|%)?(?:calc\(.\))?)/i',array($this, 'replace_flex'),$css);
	267	+ // preserve flex, keeping percentage even if 0
	268	+ $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ])\s?(?:px\|em\|auto\|%)?(?:calc\(.\))?)/i',array($this, 'replace_flex'),$css);
269	269
270		- // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
271		- $css = preg_replace_callback('/\sfilter\:\sprogid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css);
	270	+ // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
	271	+ $css = preg_replace_callback('/\sfilter\:\sprogid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css);
272	272
273	273	// Shorten & preserve calculations calc(...) since spaces are important
274	274	$css = preg_replace_callback('/calc(\(((?:[^\(\)]+\|(?1))*)\))/i', array($this, 'replace_calc'), $css);
		@@ -344,8 +344,8 @@ discard block
		block discarded – undo
344	344	// <percentage> data type: https://developer.mozilla.org/en-US/docs/Web/CSS/percentage
345	345	$css = preg_replace('/([^\\\\]\:\|\s)0(?:em\|ex\|ch\|rem\|vw\|vh\|vm\|vmin\|cm\|mm\|in\|px\|pt\|pc\|%)/iS', '${1}0', $css);
346	346
347		- // 0% step in a keyframe? restore the % unit
348		- $css = preg_replace_callback('/(@[a-z\-]?keyframes[^\{]+\{)(.?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css);
	347	+ // 0% step in a keyframe? restore the % unit
	348	+ $css = preg_replace_callback('/(@[a-z\-]?keyframes[^\{]+\{)(.?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css);
349	349
350	350	// Replace 0 0; or 0 0 0; or 0 0 0 0; with 0.
351	351	$css = preg_replace('/\:0(?: 0){1,3}(;\|\}\| \!)/', ':0$1', $css);
		@@ -384,7 +384,7 @@ discard block
		block discarded – undo
384	384	// Add "/" back to fix Opera -o-device-pixel-ratio query
385	385	$css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css);
386	386
387		- // Replace multiple semi-colons in a row by a single one
	387	+ // Replace multiple semi-colons in a row by a single one
388	388	// See SF bug #1980989
389	389	$css = preg_replace('/;;+/', ';', $css);
390	390
		@@ -411,8 +411,8 @@ discard block
		block discarded – undo
411	411
412	412	// restore preserved comments and strings in reverse order
413	413	for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) {
414		- $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
415		- // $css.=$this->preserved_tokens[$i];
	414	+ $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
	415	+ // $css.=$this->preserved_tokens[$i];
416	416	}
417	417
418	418	// Trim the final string (for any leading or trailing white spaces)
		@@ -469,9 +469,9 @@ discard block
		block discarded – undo
469	469
470	470	if ($found_terminator) {
471	471	$token = $this->str_slice($css, $start_index, $end_index);
472		- if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) {
473		- $token = preg_replace('/\s+/', '', $token);
474		- }
	472	+ if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) {
	473	+ $token = preg_replace('/\s+/', '', $token);
	474	+ }
475	475	$this->preserved_tokens[] = $token;
476	476
477	477	$preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
		@@ -602,13 +602,13 @@ discard block
		block discarded – undo
602	602	return 'flex:'.self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
603	603	}
604	604
605		- private function preserve_old_IE_specific_matrix_definition($matches)
606		- {
607		- $this->preserved_tokens[] = $matches[1];
608		- return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
	605	+ private function preserve_old_IE_specific_matrix_definition($matches)
	606	+ {
	607	+ $this->preserved_tokens[] = $matches[1];
	608	+ return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
609	609	}
610	610
611		- private function replace_keyframe_zero($matches)
	611	+ private function replace_keyframe_zero($matches)
612	612	{
613	613	return $matches[1] . preg_replace('/0(\{\|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3];
614	614	}

		@@ -43,10 +43,10 @@ discard block
		block discarded – undo
43	43	public function __construct($raise_php_limits = TRUE)
44	44	{
45	45	// Set suggested PHP limits
46		- $this->memory_limit = 128 * 1048576; // 128MB in bytes
	46	+ $this->memory_limit = 128*1048576; // 128MB in bytes
47	47	$this->max_execution_time = 60; // 1 min
48		- $this->pcre_backtrack_limit = 1000 * 1000;
49		- $this->pcre_recursion_limit = 500 * 1000;
	48	+ $this->pcre_backtrack_limit = 1000*1000;
	49	+ $this->pcre_recursion_limit = 500*1000;
50	50
51	51	$this->raise_php_limits = (bool) $raise_php_limits;
52	52	}
		@@ -83,8 +83,8 @@ discard block
		block discarded – undo
83	83	}
84	84	$comment_found = $this->str_slice($css, $start_index + 2, $end_index);
85	85	$this->comments[] = $comment_found;
86		- $comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___';
87		- $css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index);
	86	+ $comment_preserve_string = self::COMMENT.(count($this->comments) - 1).'___';
	87	+ $css = $this->str_slice($css, 0, $start_index + 2).$comment_preserve_string.$this->str_slice($css, $end_index);
88	88	// Set correct start_index: Fixes issue #2528130
89	89	$start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found);
90	90	}
		@@ -137,14 +137,14 @@ discard block
		block discarded – undo
137	137	$css_chunks[$i] = $this->minify($css_chunks[$i], $linebreak_pos);
138	138	// Keep the first @charset at-rule found
139	139	if (empty($charset) && preg_match($charset_regexp, $css_chunks[$i], $matches)) {
140		- $charset = strtolower($matches[1]) . $matches[2];
	140	+ $charset = strtolower($matches[1]).$matches[2];
141	141	}
142	142	// Delete all @charset at-rules
143	143	$css_chunks[$i] = preg_replace($charset_regexp, '', $css_chunks[$i]);
144	144	}
145	145
146	146	// Update the first chunk and push the charset to the top of the file.
147		- $css_chunks[0] = $charset . $css_chunks[0];
	147	+ $css_chunks[0] = $charset.$css_chunks[0];
148	148
149	149	return implode('', $css_chunks);
150	150	}
		@@ -219,17 +219,17 @@ discard block
		block discarded – undo
219	219	for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
220	220
221	221	$token = $this->comments[$i];
222		- $placeholder = '/' . self::COMMENT . $i . '___/';
	222	+ $placeholder = '/'.self::COMMENT.$i.'___/';
223	223
224	224	// ! in the first position of the comment means preserve
225	225	// so push to the preserved tokens keeping the !
226	226	if (substr($token, 0, 1) === '!') {
227	227	$this->preserved_tokens[] = $token;
228		- $token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
	228	+ $token_tring = self::TOKEN.(count($this->preserved_tokens) - 1).'___';
229	229	$css = preg_replace($placeholder, $token_tring, $css, 1);
230	230	// Preserve new lines for /*! important comments
231		- $css = preg_replace('/\s[\n\r\f]+\s(\/\*'. $token_tring .')/S', self::NL.'$1', $css);
232		- $css = preg_replace('/('. $token_tring .'\\/)\s[\n\r\f]+\s*/', '$1'.self::NL, $css);
	231	+ $css = preg_replace('/\s[\n\r\f]+\s(\/\*'.$token_tring.')/S', self::NL.'$1', $css);
	232	+ $css = preg_replace('/('.$token_tring.'\\/)\s[\n\r\f]+\s*/', '$1'.self::NL, $css);
233	233	continue;
234	234	}
235	235
		@@ -237,10 +237,10 @@ discard block
		block discarded – undo
237	237	// shorten that to /\/ and the next one to /**/
238	238	if (substr($token, (strlen($token) - 1), 1) === '\\') {
239	239	$this->preserved_tokens[] = '\\';
240		- $css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
	240	+ $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
241	241	$i = $i + 1; // attn: advancing the loop
242	242	$this->preserved_tokens[] = '';
243		- $css = preg_replace('/' . self::COMMENT . $i . '___/', self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
	243	+ $css = preg_replace('/'.self::COMMENT.$i.'___/', self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
244	244	continue;
245	245	}
246	246
		@@ -251,13 +251,13 @@ discard block
		block discarded – undo
251	251	if ($start_index > 2) {
252	252	if (substr($css, $start_index - 3, 1) === '>') {
253	253	$this->preserved_tokens[] = '';
254		- $css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
	254	+ $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
255	255	}
256	256	}
257	257	}
258	258
259	259	// in all other cases kill the comment
260		- $css = preg_replace('/\/\' . $this->str_slice($placeholder, 1, -1) . '\\//', '', $css, 1);
	260	+ $css = preg_replace('/\/\'.$this->str_slice($placeholder, 1, -1).'\\//', '', $css, 1);
261	261	}
262	262
263	263
		@@ -265,7 +265,7 @@ discard block
		block discarded – undo
265	265	$css = preg_replace('/\s+/', ' ', $css);
266	266
267	267	// preserve flex, keeping percentage even if 0
268		- $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ])\s?(?:px\|em\|auto\|%)?(?:calc\(.\))?)/i',array($this, 'replace_flex'),$css);
	268	+ $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ])\s?(?:px\|em\|auto\|%)?(?:calc\(.\))?)/i', array($this, 'replace_flex'), $css);
269	269
270	270	// Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
271	271	$css = preg_replace_callback('/\sfilter\:\sprogid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css);
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	$css = preg_replace('/\!important/i', ' !important', $css);
304	304
305	305	// bring back the colon
306		- $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css);
	306	+ $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css);
307	307
308	308	// retain space for special IE6 cases
309	309	$css = preg_replace_callback('/\:first\-(line\|letter)(\{\|,)/i', array($this, 'lowercase_pseudo_first'), $css);
		@@ -376,20 +376,20 @@ discard block
		block discarded – undo
376	376
377	377	// Find a fraction that is used for Opera's -o-device-pixel-ratio query
378	378	// Add token to add the "\" back in later
379		- $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
	379	+ $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css);
380	380
381	381	// Remove empty rules.
382	382	$css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css);
383	383
384	384	// Add "/" back to fix Opera -o-device-pixel-ratio query
385		- $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css);
	385	+ $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css);
386	386
387	387	// Replace multiple semi-colons in a row by a single one
388	388	// See SF bug #1980989
389	389	$css = preg_replace('/;;+/', ';', $css);
390	390
391	391	// Restore new lines for /*! important comments
392		- $css = preg_replace('/'. self::NL .'/', "\n", $css);
	392	+ $css = preg_replace('/'.self::NL.'/', "\n", $css);
393	393
394	394	// Lowercase all uppercase properties
395	395	$css = preg_replace_callback('/(\{\|\;)([A-Z\-]+)(\:)/', array($this, 'lowercase_properties'), $css);
		@@ -403,7 +403,7 @@ discard block
		block discarded – undo
403	403	while ($i < strlen($css)) {
404	404	$i++;
405	405	if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) {
406		- $css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i);
	406	+ $css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i);
407	407	$start_index = $i;
408	408	}
409	409	}
		@@ -411,7 +411,7 @@ discard block
		block discarded – undo
411	411
412	412	// restore preserved comments and strings in reverse order
413	413	for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) {
414		- $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
	414	+ $css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1);
415	415	// $css.=$this->preserved_tokens[$i];
416	416	}
417	417
		@@ -452,7 +452,7 @@ discard block
		block discarded – undo
452	452	$terminator = ')';
453	453	}
454	454
455		- while ($found_terminator === FALSE && $end_index+1 <= $max_index) {
	455	+ while ($found_terminator === FALSE && $end_index + 1 <= $max_index) {
456	456	$end_index = $this->index_of($css, $terminator, $end_index + 1);
457	457
458	458	// endIndex == 0 doesn't really apply here
		@@ -469,12 +469,12 @@ discard block
		block discarded – undo
469	469
470	470	if ($found_terminator) {
471	471	$token = $this->str_slice($css, $start_index, $end_index);
472		- if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) {
	472	+ if (strpos($token, "<svg") === false && strpos($token, 'svg+xml') === false) {
473	473	$token = preg_replace('/\s+/', '', $token);
474	474	}
475	475	$this->preserved_tokens[] = $token;
476	476
477		- $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
	477	+ $preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)';
478	478	$sb[] = $preserver;
479	479
480	480	$append_index = $end_index + 1;
		@@ -536,16 +536,16 @@ discard block
		block discarded – undo
536	536
537	537	if ($is_filter) {
538	538	// Restore, maintain case, otherwise filter will break
539		- $sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7];
	539	+ $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7];
540	540	} else {
541	541	if (strtolower($m[2]) == strtolower($m[3]) &&
542	542	strtolower($m[4]) == strtolower($m[5]) &&
543	543	strtolower($m[6]) == strtolower($m[7])) {
544	544	// Compress.
545		- $hex = '#' . strtolower($m[3] . $m[5] . $m[7]);
	545	+ $hex = '#'.strtolower($m[3].$m[5].$m[7]);
546	546	} else {
547	547	// Non compressible color, restore but lower case.
548		- $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]);
	548	+ $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]);
549	549	}
550	550	// replace Hex colors to short safe color names
551	551	$sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex;
		@@ -574,7 +574,7 @@ discard block
		block discarded – undo
574	574	// one, maybe more? put'em back then
575	575	if (($pos = $this->index_of($match, self::COMMENT)) >= 0) {
576	576	for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
577		- $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1);
	577	+ $match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1);
578	578	}
579	579	}
580	580
		@@ -582,7 +582,7 @@ discard block
		block discarded – undo
582	582	$match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match);
583	583
584	584	$this->preserved_tokens[] = $match;
585		- return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote;
	585	+ return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote;
586	586	}
587	587
588	588	private function replace_colon($matches)
		@@ -592,34 +592,34 @@ discard block
		block discarded – undo
592	592
593	593	private function replace_calc($matches)
594	594	{
595		- $this->preserved_tokens[] = preg_replace('/\)([\+\-]{1})/',') $1',preg_replace('/([\+\-]{1})\(/','$1 (',trim(preg_replace('/\s([\\/\(\),])\s*/', '$1', $matches[2]))));
596		- return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
	595	+ $this->preserved_tokens[] = preg_replace('/\)([\+\-]{1})/', ') $1', preg_replace('/([\+\-]{1})\(/', '$1 (', trim(preg_replace('/\s([\\/\(\),])\s*/', '$1', $matches[2]))));
	596	+ return 'calc('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
597	597	}
598	598
599	599	private function replace_flex($matches)
600	600	{
601	601	$this->preserved_tokens[] = trim($matches[1]);
602		- return 'flex:'.self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
	602	+ return 'flex:'.self::TOKEN.(count($this->preserved_tokens) - 1).'___';
603	603	}
604	604
605	605	private function preserve_old_IE_specific_matrix_definition($matches)
606	606	{
607	607	$this->preserved_tokens[] = $matches[1];
608		- return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
	608	+ return 'filter:progid:DXImageTransform.Microsoft.Matrix('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
609	609	}
610	610
611	611	private function replace_keyframe_zero($matches)
612	612	{
613		- return $matches[1] . preg_replace('/0(\{\|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3];
	613	+ return $matches[1].preg_replace('/0(\{\|,[^\)\{]+\{)/', '0%$1', $matches[2]).$matches[3];
614	614	}
615	615
616	616	private function rgb_to_hex($matches)
617	617	{
618	618	// Support for percentage values rgb(100%, 0%, 45%);
619		- if ($this->index_of($matches[1], '%') >= 0){
	619	+ if ($this->index_of($matches[1], '%') >= 0) {
620	620	$rgbcolors = explode(',', str_replace('%', '', $matches[1]));
621	621	for ($i = 0; $i < count($rgbcolors); $i++) {
622		- $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
	622	+ $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i])*2.55);
623	623	}
624	624	} else {
625	625	$rgbcolors = explode(',', $matches[1]);
		@@ -632,11 +632,11 @@ discard block
		block discarded – undo
632	632	}
633	633
634	634	// Fix for issue #2528093
635		- if (!preg_match('/[\s\,\);\}]/', $matches[2])){
636		- $matches[2] = ' ' . $matches[2];
	635	+ if (!preg_match('/[\s\,\);\}]/', $matches[2])) {
	636	+ $matches[2] = ' '.$matches[2];
637	637	}
638	638
639		- return '#' . implode('', $rgbcolors) . $matches[2];
	639	+ return '#'.implode('', $rgbcolors).$matches[2];
640	640	}
641	641
642	642	private function hsl_to_hex($matches)
		@@ -647,18 +647,18 @@ discard block
		block discarded – undo
647	647	$l = floatval($values[2]);
648	648
649	649	// Wrap and clamp, then fraction!
650		- $h = ((($h % 360) + 360) % 360) / 360;
651		- $s = $this->clamp_number($s, 0, 100) / 100;
652		- $l = $this->clamp_number($l, 0, 100) / 100;
	650	+ $h = ((($h%360) + 360)%360)/360;
	651	+ $s = $this->clamp_number($s, 0, 100)/100;
	652	+ $l = $this->clamp_number($l, 0, 100)/100;
653	653
654	654	if ($s == 0) {
655		- $r = $g = $b = $this->round_number(255 * $l);
	655	+ $r = $g = $b = $this->round_number(255*$l);
656	656	} else {
657		- $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
658		- $v1 = (2 * $l) - $v2;
659		- $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3)));
660		- $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h));
661		- $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3)));
	657	+ $v2 = $l < 0.5 ? $l(1 + $s) : ($l + $s) - ($s$l);
	658	+ $v1 = (2*$l) - $v2;
	659	+ $r = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h + (1/3)));
	660	+ $g = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h));
	661	+ $b = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h - (1/3)));
662	662	}
663	663
664	664	return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2]));
		@@ -666,27 +666,27 @@ discard block
		block discarded – undo
666	666
667	667	private function lowercase_pseudo_first($matches)
668	668	{
669		- return ':first-'. strtolower($matches[1]) .' '. $matches[2];
	669	+ return ':first-'.strtolower($matches[1]).' '.$matches[2];
670	670	}
671	671
672	672	private function lowercase_directives($matches)
673	673	{
674		- return '@'. strtolower($matches[1]);
	674	+ return '@'.strtolower($matches[1]);
675	675	}
676	676
677	677	private function lowercase_pseudo_elements($matches)
678	678	{
679		- return ':'. strtolower($matches[1]);
	679	+ return ':'.strtolower($matches[1]);
680	680	}
681	681
682	682	private function lowercase_common_functions($matches)
683	683	{
684		- return ':'. strtolower($matches[1]) .'(';
	684	+ return ':'.strtolower($matches[1]).'(';
685	685	}
686	686
687	687	private function lowercase_common_functions_values($matches)
688	688	{
689		- return $matches[1] . strtolower($matches[2]);
	689	+ return $matches[1].strtolower($matches[2]);
690	690	}
691	691
692	692	private function lowercase_properties($matches)
		@@ -701,9 +701,9 @@ discard block
		block discarded – undo
701	701	private function hue_to_rgb($v1, $v2, $vh)
702	702	{
703	703	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
704		- if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
705		- if ($vh * 2 < 1) return $v2;
706		- if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
	704	+ if ($vh6 < 1) return $v1 + ($v2 - $v1)6*$vh;
	705	+ if ($vh*2 < 1) return $v2;
	706	+ if ($vh3 < 2) return $v1 + ($v2 - $v1)((2/3) - $vh)*6;
707	707	return $v1;
708	708	}
709	709
		@@ -778,9 +778,9 @@ discard block
		block discarded – undo
778	778	{
779	779	if (is_string($size)) {
780	780	switch (substr($size, -1)) {
781		- case 'M': case 'm': return (int) $size * 1048576;
782		- case 'K': case 'k': return (int) $size * 1024;
783		- case 'G': case 'g': return (int) $size * 1073741824;
	781	+ case 'M': case 'm': return (int) $size*1048576;
	782	+ case 'K': case 'k': return (int) $size*1024;
	783	+ case 'G': case 'g': return (int) $size*1073741824;
784	784	}
785	785	}
786	786

		@@ -686,6 +686,11 @@ discard block
		block discarded – undo
686	686	* ---------------------------------------------------------------------------------------------
687	687	*/
688	688
	689	+ /**
	690	+ * @param double $v1
	691	+ * @param double $v2
	692	+ * @param integer $vh
	693	+ */
689	694	private function hue_to_rgb($v1, $v2, $vh)
690	695	{
691	696	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
		@@ -700,6 +705,10 @@ discard block
		block discarded – undo
700	705	return intval(floor(floatval($n) + 0.5), 10);
701	706	}
702	707
	708	+ /**
	709	+ * @param integer $min
	710	+ * @param integer $max
	711	+ */
703	712	private function clamp_number($n, $min, $max)
704	713	{
705	714	return min(max($n, $min), $max);
		@@ -728,7 +737,7 @@ discard block
		block discarded – undo
728	737	*
729	738	* @param string $str
730	739	* @param int $start index
731		- * @param int\|bool $end index (optional)
	740	+ * @param integer $end index (optional)
732	741	* @return string
733	742	*/
734	743	private function str_slice($str, $start = 0, $end = FALSE)

		@@ -12,7 +12,10 @@ discard block
		block discarded – undo
12	12	http://www.gnu.org/licenses/gpl.txt
13	13	*/
14	14
15		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
	15	+if ( ! defined( 'ABSPATH' ) ) {
	16	+ exit;
	17	+}
	18	+// Exit if accessed directly
16	19
17	20	define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__));
18	21
		@@ -224,12 +227,15 @@ discard block
		block discarded – undo
224	227
225	228	// Choose the classes
226	229	$classes = array();
227		- if($conf->get('autoptimize_js'))
228		- $classes[] = 'autoptimizeScripts';
229		- if($conf->get('autoptimize_css'))
230		- $classes[] = 'autoptimizeStyles';
231		- if($conf->get('autoptimize_html'))
232		- $classes[] = 'autoptimizeHTML';
	230	+ if($conf->get('autoptimize_js')) {
	231	+ $classes[] = 'autoptimizeScripts';
	232	+ }
	233	+ if($conf->get('autoptimize_css')) {
	234	+ $classes[] = 'autoptimizeStyles';
	235	+ }
	236	+ if($conf->get('autoptimize_html')) {
	237	+ $classes[] = 'autoptimizeHTML';
	238	+ }
233	239
234	240	// Set some options
235	241	$classoptions = array(

		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50
51	51	// WP CLI
52	52	if ( defined( 'WP_CLI' ) && WP_CLI ) {
53		- require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
	53	+ require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
54	54	}
55	55
56	56	// Initialize the cache at least once
		@@ -137,21 +137,21 @@ discard block
		block discarded – undo
137	137	$ao_noptimize = true;
138	138	}
139	139
140		- // if setting says not to optimize logged in user and user is logged in
141		- if ( get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts') ) {
142		- $ao_noptimize = true;
143		- }
144		-
145		- // if setting says not to optimize cart/ checkout
146		- if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) {
147		- // checking for woocommerce, easy digital downloads and wp ecommerce
148		- foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) {
149		- if ( function_exists($shopCond) && $shopCond() ) {
150		- $ao_noptimize = true;
151		- break;
152		- }
153		- }
154		- }
	140	+ // if setting says not to optimize logged in user and user is logged in
	141	+ if ( get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts') ) {
	142	+ $ao_noptimize = true;
	143	+ }
	144	+
	145	+ // if setting says not to optimize cart/ checkout
	146	+ if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) {
	147	+ // checking for woocommerce, easy digital downloads and wp ecommerce
	148	+ foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) {
	149	+ if ( function_exists($shopCond) && $shopCond() ) {
	150	+ $ao_noptimize = true;
	151	+ break;
	152	+ }
	153	+ }
	154	+ }
155	155
156	156	// filter you can use to block autoptimization on your own terms
157	157	$ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );

		@@ -12,15 +12,15 @@ discard block
		block discarded – undo
12	12	http://www.gnu.org/licenses/gpl.txt
13	13	*/
14	14
15		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
	15	+if (!defined('ABSPATH')) exit; // Exit if accessed directly
16	16
17		-define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__));
	17	+define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__));
18	18
19	19	// Load config class
20	20	include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeConfig.php');
21	21
22	22	// Load toolbar class
23		-include( AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php' );
	23	+include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php');
24	24
25	25	// Load partners tab if admin
26	26	if (is_admin()) {
		@@ -28,31 +28,31 @@ discard block
		block discarded – undo
28	28	}
29	29
30	30	// Do we gzip when caching (needed early to load autoptimizeCache.php)
31		-define('AUTOPTIMIZE_CACHE_NOGZIP',(bool) get_option('autoptimize_cache_nogzip'));
	31	+define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip'));
32	32
33	33	// Load cache class
34	34	include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCache.php');
35	35
36	36	// 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
37		-if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME','/'.wp_basename( WP_CONTENT_DIR )); }
38		-if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR','/cache/autoptimize/'); }
	37	+if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); }
	38	+if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); }
39	39	if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); }
40	40
41	41	// Plugin dir constants (plugin url's defined later to accomodate domain mapped sites)
42	42	if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
43		- if (is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true )) {
	43	+ if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
44	44	$blog_id = get_current_blog_id();
45		- define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
	45	+ define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
46	46	} else {
47		- define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR );
	47	+ define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR);
48	48	}
49	49	}
50		-define('AUTOPTIMIZE_CACHE_DELAY',true);
51		-define('WP_ROOT_DIR',substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR)-strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
	50	+define('AUTOPTIMIZE_CACHE_DELAY', true);
	51	+define('WP_ROOT_DIR', substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR) - strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
52	52
53	53	// WP CLI
54		-if ( defined( 'WP_CLI' ) && WP_CLI ) {
55		- require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
	54	+if (defined('WP_CLI') && WP_CLI) {
	55	+ require_once AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCLI.php';
56	56	}
57	57
58	58	// Initialize the cache at least once
		@@ -61,65 +61,65 @@ discard block
		block discarded – undo
61	61	/* Check if we're updating, in which case we might need to do stuff and flush the cache
62	62	to avoid old versions of aggregated files lingering around */
63	63
64		-$autoptimize_version="2.3.0";
65		-$autoptimize_db_version=get_option('autoptimize_version','none');
	64	+$autoptimize_version = "2.3.0";
	65	+$autoptimize_db_version = get_option('autoptimize_version', 'none');
66	66
67	67	if ($autoptimize_db_version !== $autoptimize_version) {
68		- if ($autoptimize_db_version==="none") {
	68	+ if ($autoptimize_db_version === "none") {
69	69	add_action('admin_notices', 'autoptimize_install_config_notice');
70	70	} else {
71	71	// updating, include the update-code
72	72	include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeUpdateCode.php');
73	73	}
74	74
75		- update_option('autoptimize_version',$autoptimize_version);
76		- $autoptimize_db_version=$autoptimize_version;
	75	+ update_option('autoptimize_version', $autoptimize_version);
	76	+ $autoptimize_db_version = $autoptimize_version;
77	77	}
78	78
79	79	// Load translations
80	80	function autoptimize_load_plugin_textdomain() {
81		- load_plugin_textdomain('autoptimize',false,plugin_basename(dirname( __FILE__ )).'/localization');
	81	+ load_plugin_textdomain('autoptimize', false, plugin_basename(dirname(__FILE__)).'/localization');
82	82	}
83		-add_action( 'init', 'autoptimize_load_plugin_textdomain' );
	83	+add_action('init', 'autoptimize_load_plugin_textdomain');
84	84
85		-function autoptimize_uninstall(){
	85	+function autoptimize_uninstall() {
86	86	autoptimizeCache::clearall();
87	87
88		- $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");
	88	+ $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");
89	89
90		- if ( !is_multisite() ) {
91		- foreach ($delete_options as $del_opt) { delete_option( $del_opt ); }
	90	+ if (!is_multisite()) {
	91	+ foreach ($delete_options as $del_opt) { delete_option($del_opt); }
92	92	} else {
93	93	global $wpdb;
94		- $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
	94	+ $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
95	95	$original_blog_id = get_current_blog_id();
96		- foreach ( $blog_ids as $blog_id ) {
97		- switch_to_blog( $blog_id );
98		- foreach ($delete_options as $del_opt) { delete_option( $del_opt ); }
	96	+ foreach ($blog_ids as $blog_id) {
	97	+ switch_to_blog($blog_id);
	98	+ foreach ($delete_options as $del_opt) { delete_option($del_opt); }
99	99	}
100		- switch_to_blog( $original_blog_id );
	100	+ switch_to_blog($original_blog_id);
101	101	}
102	102
103		- if ( wp_get_schedule( 'ao_cachechecker' ) ) {
104		- wp_clear_scheduled_hook( 'ao_cachechecker' );
	103	+ if (wp_get_schedule('ao_cachechecker')) {
	104	+ wp_clear_scheduled_hook('ao_cachechecker');
105	105	}
106	106	}
107	107
108	108	function autoptimize_install_config_notice() {
109	109	echo '<div class="updated"><p>';
110		- _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' );
	110	+ _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize');
111	111	echo '</p></div>';
112	112	}
113	113
114	114	function autoptimize_update_config_notice() {
115	115	echo '<div class="updated"><p>';
116		- _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' );
	116	+ _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize');
117	117	echo '</p></div>';
118	118	}
119	119
120	120	function autoptimize_cache_unavailable_notice() {
121	121	echo '<div class="error"><p>';
122		- printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR );
	122	+ printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR);
123	123	echo '</p></div>';
124	124	}
125	125
		@@ -128,27 +128,27 @@ discard block
		block discarded – undo
128	128	$ao_noptimize = false;
129	129
130	130	// noptimize in qs to get non-optimized page for debugging
131		- if (array_key_exists("ao_noptimize",$_GET) \|\| array_key_exists("ao_noptirocket",$_GET)) {
132		- if ( ( ($_GET["ao_noptimize"]==="1") \|\| ($_GET["ao_noptirocket"]==="1") ) && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) {
	131	+ if (array_key_exists("ao_noptimize", $_GET) \|\| array_key_exists("ao_noptirocket", $_GET)) {
	132	+ if ((($_GET["ao_noptimize"] === "1") \|\| ($_GET["ao_noptirocket"] === "1")) && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) {
133	133	$ao_noptimize = true;
134	134	}
135	135	}
136	136
137	137	// check for DONOTMINIFY constant as used by e.g. WooCommerce POS
138		- if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true \|\| constant('DONOTMINIFY')==="true")) {
	138	+ if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true \|\| constant('DONOTMINIFY') === "true")) {
139	139	$ao_noptimize = true;
140	140	}
141	141
142	142	// if setting says not to optimize logged in user and user is logged in
143		- if ( get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts') ) {
	143	+ if (get_option('autoptimize_optimize_logged', 'on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts')) {
144	144	$ao_noptimize = true;
145	145	}
146	146
147	147	// if setting says not to optimize cart/ checkout
148		- if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) {
	148	+ if (get_option('autoptimize_optimize_checkout', 'on') !== 'on') {
149	149	// checking for woocommerce, easy digital downloads and wp ecommerce
150		- foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) {
151		- if ( function_exists($shopCond) && $shopCond() ) {
	150	+ foreach (array("is_checkout", "is_cart", "edd_is_checkout", "wpsc_is_cart", "wpsc_is_checkout") as $shopCond) {
	151	+ if (function_exists($shopCond) && $shopCond()) {
152	152	$ao_noptimize = true;
153	153	break;
154	154	}
		@@ -156,11 +156,11 @@ discard block
		block discarded – undo
156	156	}
157	157
158	158	// filter you can use to block autoptimization on your own terms
159		- $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );
	159	+ $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize);
160	160
161		- if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') \|\| !is_customize_preview() ) ) {
	161	+ if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') \|\| !is_customize_preview())) {
162	162	// load speedupper conditionally (true by default?)
163		- if ( apply_filters('autoptimize_filter_speedupper', true) ) {
	163	+ if (apply_filters('autoptimize_filter_speedupper', true)) {
164	164	include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeSpeedupper.php');
165	165	}
166	166
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php');
172	172
173	173	// Load extra classes and set some vars
174		- if($conf->get('autoptimize_html')) {
	174	+ if ($conf->get('autoptimize_html')) {
175	175	include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php');
176	176	// BUG: new minify-html does not support keeping HTML comments, skipping for now
177	177	// if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
		@@ -181,7 +181,7 @@ discard block
		block discarded – undo
181	181	// }
182	182	}
183	183
184		- if($conf->get('autoptimize_js')) {
	184	+ if ($conf->get('autoptimize_js')) {
185	185	include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php');
186	186	if (!class_exists('JSMin')) {
187	187	if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
		@@ -190,15 +190,15 @@ discard block
		block discarded – undo
190	190	@include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php');
191	191	}
192	192	}
193		- if ( ! defined( 'CONCATENATE_SCRIPTS' )) {
194		- define('CONCATENATE_SCRIPTS',false);
	193	+ if (!defined('CONCATENATE_SCRIPTS')) {
	194	+ define('CONCATENATE_SCRIPTS', false);
195	195	}
196		- if ( ! defined( 'COMPRESS_SCRIPTS' )) {
197		- define('COMPRESS_SCRIPTS',false);
	196	+ if (!defined('COMPRESS_SCRIPTS')) {
	197	+ define('COMPRESS_SCRIPTS', false);
198	198	}
199	199	}
200	200
201		- if($conf->get('autoptimize_css')) {
	201	+ if ($conf->get('autoptimize_css')) {
202	202	include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php');
203	203	if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
204	204	if (!class_exists('Minify_CSS_Compressor')) {
		@@ -209,13 +209,13 @@ discard block
		block discarded – undo
209	209	@include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php');
210	210	}
211	211	}
212		- if ( ! defined( 'COMPRESS_CSS' )) {
213		- define('COMPRESS_CSS',false);
	212	+ if (!defined('COMPRESS_CSS')) {
	213	+ define('COMPRESS_CSS', false);
214	214	}
215	215	}
216	216
217	217	// filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned!
218		- if (apply_filters('autoptimize_filter_obkiller',false)) {
	218	+ if (apply_filters('autoptimize_filter_obkiller', false)) {
219	219	while (ob_get_level() > 0) {
220	220	ob_end_clean();
221	221	}
		@@ -227,36 +227,36 @@ discard block
		block discarded – undo
227	227
228	228	// Action on end, this is where the magic happens
229	229	function autoptimize_end_buffering($content) {
230		- if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) \|\| preg_match('/<html[^>]*(?:amp\|⚡)/',$content) === 1 \|\| stripos($content,"<xsl:stylesheet") !== false ) { return $content; }
	230	+ if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) \|\| preg_match('/<html[^>]*(?:amp\|⚡)/', $content) === 1 \|\| stripos($content, "<xsl:stylesheet") !== false) { return $content; }
231	231
232	232	// load URL constants as late as possible to allow domain mapper to kick in
233	233	if (function_exists("domain_mapping_siteurl")) {
234		- define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id()));
235		- define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url()));
	234	+ define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id()));
	235	+ define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url()));
236	236	} else {
237		- define('AUTOPTIMIZE_WP_SITE_URL',site_url());
238		- define('AUTOPTIMIZE_WP_CONTENT_URL',content_url());
	237	+ define('AUTOPTIMIZE_WP_SITE_URL', site_url());
	238	+ define('AUTOPTIMIZE_WP_CONTENT_URL', content_url());
239	239	}
240	240
241		- if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) {
	241	+ if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
242	242	$blog_id = get_current_blog_id();
243		- define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
	243	+ define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
244	244	} else {
245		- define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
	245	+ define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
246	246	}
247		- define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL));
248		- define('AUTOPTIMIZE_HASH',wp_hash(AUTOPTIMIZE_CACHE_DIR));
	247	+ define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
	248	+ define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_DIR));
249	249
250	250	// Config element
251	251	$conf = autoptimizeConfig::instance();
252	252
253	253	// Choose the classes
254	254	$classes = array();
255		- if($conf->get('autoptimize_js'))
	255	+ if ($conf->get('autoptimize_js'))
256	256	$classes[] = 'autoptimizeScripts';
257		- if($conf->get('autoptimize_css'))
	257	+ if ($conf->get('autoptimize_css'))
258	258	$classes[] = 'autoptimizeStyles';
259		- if($conf->get('autoptimize_html'))
	259	+ if ($conf->get('autoptimize_html'))
260	260	$classes[] = 'autoptimizeHTML';
261	261
262	262	// Set some options
		@@ -285,12 +285,12 @@ discard block
		block discarded – undo
285	285	)
286	286	);
287	287
288		- $content = apply_filters( 'autoptimize_filter_html_before_minify', $content );
	288	+ $content = apply_filters('autoptimize_filter_html_before_minify', $content);
289	289
290	290	// Run the classes
291		- foreach($classes as $name) {
	291	+ foreach ($classes as $name) {
292	292	$instance = new $name($content);
293		- if($instance->read($classoptions[$name])) {
	293	+ if ($instance->read($classoptions[$name])) {
294	294	$instance->minify();
295	295	$instance->cache();
296	296	$content = $instance->getcontent();
		@@ -298,19 +298,19 @@ discard block
		block discarded – undo
298	298	unset($instance);
299	299	}
300	300
301		- $content = apply_filters( 'autoptimize_html_after_minify', $content );
	301	+ $content = apply_filters('autoptimize_html_after_minify', $content);
302	302	return $content;
303	303	}
304	304
305		-if ( autoptimizeCache::cacheavail() ) {
	305	+if (autoptimizeCache::cacheavail()) {
306	306	$conf = autoptimizeConfig::instance();
307		- if( $conf->get('autoptimize_html') \|\| $conf->get('autoptimize_js') \|\| $conf->get('autoptimize_css') ) {
	307	+ if ($conf->get('autoptimize_html') \|\| $conf->get('autoptimize_js') \|\| $conf->get('autoptimize_css')) {
308	308	// Hook to wordpress
309	309	if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
310		- add_action('init','autoptimize_start_buffering',-1);
	310	+ add_action('init', 'autoptimize_start_buffering', -1);
311	311	} else {
312	312	if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); }
313		- add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2);
	313	+ add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2);
314	314	}
315	315	}
316	316	} else {
		@@ -318,15 +318,15 @@ discard block
		block discarded – undo
318	318	}
319	319
320	320	function autoptimize_activate() {
321		- register_uninstall_hook( __FILE__, 'autoptimize_uninstall' );
	321	+ register_uninstall_hook(__FILE__, 'autoptimize_uninstall');
322	322	}
323		-register_activation_hook( __FILE__, 'autoptimize_activate' );
	323	+register_activation_hook(__FILE__, 'autoptimize_activate');
324	324
325	325	include_once('classlesses/autoptimizeCacheChecker.php');
326	326
327		-add_action('plugins_loaded','includeAutoptimizeExtra');
	327	+add_action('plugins_loaded', 'includeAutoptimizeExtra');
328	328	function includeAutoptimizeExtra() {
329		- if ( apply_filters('autoptimize_filter_extra_activate',true) ) {
	329	+ if (apply_filters('autoptimize_filter_extra_activate', true)) {
330	330	include_once('classlesses/autoptimizeExtra.php');
331	331	}
332	332	}

		@@ -75,18 +75,18 @@
		block discarded – undo
75	75	$wp_admin_bar->add_node( array(
76	76	'id' => 'autoptimize-cache-info',
77	77	'title' => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' .
78		- '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
79		- '<div class="circle">'.
80		- '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
81		- '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
82		- '<div class="shadow"></div>'.
83		- '</div>'.
84		- '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
85		- '</div>' .
86		- '<table>' .
87		- '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
88		- '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
89		- '</table>',
	78	+ '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
	79	+ '<div class="circle">'.
	80	+ '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
	81	+ '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
	82	+ '<div class="shadow"></div>'.
	83	+ '</div>'.
	84	+ '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
	85	+ '</div>' .
	86	+ '<table>' .
	87	+ '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
	88	+ '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
	89	+ '</table>',
90	90	'parent' => 'autoptimize'
91	91	));
92	92

		@@ -1,35 +1,35 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
	2	+if (!defined('ABSPATH')) exit; // Exit if accessed directly
3	3	class autoptimizeToolbar
4	4	{
5	5	public function __construct()
6	6	{
7	7	// If Cache is not available we don't add the Autoptimize Toolbar
8		- if( ! autoptimizeCache::cacheavail() ) {
	8	+ if (!autoptimizeCache::cacheavail()) {
9	9	return;
10	10	}
11	11	// Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated.
12		- add_action( 'wp_loaded', array( $this, 'load_toolbar' ) );
	12	+ add_action('wp_loaded', array($this, 'load_toolbar'));
13	13	}
14	14
15	15	public function load_toolbar()
16	16	{
17	17	// Check permissions and that toolbar is not hidden via filter
18		- if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) {
	18	+ if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) {
19	19	// Create a handler for the AJAX toolbar requests
20		- add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) );
	20	+ add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache'));
21	21
22	22	// Load custom styles, scripts and menu only when needed
23		- if ( is_admin_bar_showing() ) {
24		- if ( is_admin() ) {
	23	+ if (is_admin_bar_showing()) {
	24	+ if (is_admin()) {
25	25	// in the case of back-end
26		- add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
	26	+ add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
27	27	} else {
28	28	// in the case of front-end
29		- add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
	29	+ add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
30	30	}
31	31	// Add the Autoptimize Toolbar to the Admin bar
32		- add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 );
	32	+ add_action('admin_bar_menu', array($this, 'add_toolbar'), 100);
33	33	}
34	34	}
35	35	}
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	$stats = autoptimizeCache::stats();
43	43
44	44	// Set the Max Size recommended for cache files
45		- $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 );
	45	+ $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 51210241024);
46	46
47	47	// Retrieve the current Total Files in cache
48	48	$files = $stats[0];
		@@ -52,83 +52,83 @@ discard block
		block discarded – undo
52	52	$size = $this->format_filesize($bytes);
53	53
54	54	// We calculated the percentage of cache used
55		- $percentage = ceil( $bytes / $max_size * 100 );
56		- if ( $percentage > 100 ) {
	55	+ $percentage = ceil($bytes/$max_size*100);
	56	+ if ($percentage > 100) {
57	57	$percentage = 100;
58	58	}
59	59	// We define the type of color indicator for the current state of cache size.
60	60	// "green" if the size is less than 80% of the total recommended
61	61	// "orange" if over 80%
62	62	// "red" if over 100%
63		- $color = ( $percentage == 100 ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' );
	63	+ $color = ($percentage == 100) ? 'red' : (($percentage > 80) ? 'orange' : 'green');
64	64
65	65	// Create or add new items into the Admin Toolbar.
66	66	// Main Autoptimize node
67		- $wp_admin_bar->add_node( array(
	67	+ $wp_admin_bar->add_node(array(
68	68	'id' => 'autoptimize',
69		- 'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( "Autoptimize", 'autoptimize' ) . '</span>',
70		- 'href' => admin_url( 'options-general.php?page=autoptimize' ),
71		- 'meta' => array( 'class' => 'bullet-' . $color )
	69	+ 'title' => '<span class="ab-icon"></span><span class="ab-label">'.__("Autoptimize", 'autoptimize').'</span>',
	70	+ 'href' => admin_url('options-general.php?page=autoptimize'),
	71	+ 'meta' => array('class' => 'bullet-'.$color)
72	72	));
73	73
74	74	// Cache Info node
75		- $wp_admin_bar->add_node( array(
	75	+ $wp_admin_bar->add_node(array(
76	76	'id' => 'autoptimize-cache-info',
77		- 'title' => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' .
78		- '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
	77	+ 'title' => '<p>'.__("Cache Info", 'autoptimize').'</p>'.
	78	+ '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'.
79	79	'<div class="circle">'.
80		- '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
81		- '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
	80	+ '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'.
	81	+ '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'.
82	82	'<div class="shadow"></div>'.
83	83	'</div>'.
84		- '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
85		- '</div>' .
86		- '<table>' .
87		- '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
88		- '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
	84	+ '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'.
	85	+ '</div>'.
	86	+ '<table>'.
	87	+ '<tr><td>'.__("Size", 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'.
	88	+ '<tr><td>'.__("Files", 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'.
89	89	'</table>',
90	90	'parent' => 'autoptimize'
91	91	));
92	92
93	93	// Delete Cache node
94		- $wp_admin_bar->add_node( array(
	94	+ $wp_admin_bar->add_node(array(
95	95	'id' => 'autoptimize-delete-cache',
96		- 'title' => __( "Delete Cache", 'autoptimize' ),
	96	+ 'title' => __("Delete Cache", 'autoptimize'),
97	97	'parent' => 'autoptimize'
98	98	));
99	99	}
100	100
101	101	public function delete_cache()
102	102	{
103		- check_ajax_referer( 'ao_delcache_nonce', 'nonce' );
	103	+ check_ajax_referer('ao_delcache_nonce', 'nonce');
104	104	$result = false;
105		- if ( current_user_can( 'manage_options' ) )
	105	+ if (current_user_can('manage_options'))
106	106	{
107	107	// We call the function for cleaning the Autoptimize cache
108	108	$result = autoptimizeCache::clearall();
109	109	}
110		- wp_send_json( $result );
	110	+ wp_send_json($result);
111	111	}
112	112
113	113	public function enqueue_scripts()
114	114	{
115	115	// Autoptimize Toolbar Styles
116		- wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), time(), 'all' );
	116	+ wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), time(), 'all');
117	117	// Autoptimize Toolbar Javascript
118		- wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), time(), true );
	118	+ wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), time(), true);
119	119	// Localizes a registered script with data for a JavaScript variable. (We need this for the AJAX work properly in the front-end mode)
120		- wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array(
121		- 'ajaxurl' => admin_url( 'admin-ajax.php' ),
122		- 'error_msg' => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ),
123		- 'dismiss_msg' => __( 'Dismiss this notice.' ),
124		- 'nonce' => wp_create_nonce( 'ao_delcache_nonce' )
125		- ) );
	120	+ wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array(
	121	+ 'ajaxurl' => admin_url('admin-ajax.php'),
	122	+ 'error_msg' => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'),
	123	+ 'dismiss_msg' => __('Dismiss this notice.'),
	124	+ 'nonce' => wp_create_nonce('ao_delcache_nonce')
	125	+ ));
126	126	}
127	127
128	128	public function format_filesize($bytes, $decimals = 2)
129	129	{
130		- $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' );
131		- for ($i = 0; ($bytes / 1024) > 0.9; $i++, $bytes /= 1024) {}
132		- return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[$i] );
	130	+ $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
	131	+ for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {}
	132	+ return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]);
133	133	}
134	134	}

		@@ -1,5 +1,8 @@
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
	2	+if ( ! defined( 'ABSPATH' ) ) {
	3	+ exit;
	4	+}
	5	+// Exit if accessed directly
3	6	class autoptimizeToolbar
4	7	{
5	8	public function __construct()

		@@ -1,5 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
	2	+if ( ! defined( 'ABSPATH' ) ) {
	3	+ exit;
	4	+}
	5	+// Exit if accessed directly
3	6
4	7	abstract class autoptimizeBase {
5	8	protected $content = '';
		@@ -122,7 +125,9 @@ discard block
		block discarded – undo
122	125	$out = parse_url($in,PHP_URL_HOST);
123	126
124	127	// fallback if parse_url does not understand the url is in fact a url
125		- if (empty($out)) $out=$in;
	128	+ if (empty($out)) {
	129	+ $out=$in;
	130	+ }
126	131
127	132	return $out;
128	133	}
		@@ -359,7 +364,9 @@ discard block
		block discarded – undo
359	364
360	365	// read file, return false if empty
361	366	$_toMinify = file_get_contents($pathIn);
362		- if ( empty($_toMinify) ) return false;
	367	+ if ( empty($_toMinify) ) {
	368	+ return false;
	369	+ }
363	370
364	371	// check cache
365	372	$_md5hash = "single_".md5($_toMinify);

		@@ -139,6 +139,10 @@ discard block
		block discarded – undo
139	139	}
140	140
141	141	// hide everything between noptimize-comment tags
	142	+
	143	+ /**
	144	+ * @param string $noptimize_in
	145	+ */
142	146	protected function hide_noptimize($noptimize_in) {
143	147	if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) {
144	148	$noptimize_out = preg_replace_callback(
		@@ -286,6 +290,9 @@ discard block
		block discarded – undo
286	290	}
287	291	}
288	292
	293	+ /**
	294	+ * @param string $tag
	295	+ */
289	296	protected function isremovable($tag, $removables) {
290	297	foreach ($removables as $match) {
291	298	if (strpos($tag,$match)!==false) {
		@@ -296,6 +303,10 @@ discard block
		block discarded – undo
296	303	}
297	304
298	305	// inject already minified code in optimized JS/CSS
	306	+
	307	+ /**
	308	+ * @return string
	309	+ */
299	310	protected function inject_minified($in) {
300	311	if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
301	312	$out = preg_replace_callback(
		@@ -342,6 +353,9 @@ discard block
		block discarded – undo
342	353	return $out;
343	354	}
344	355
	356	+ /**
	357	+ * @param string $pathIn
	358	+ */
345	359	protected function minify_single($pathIn) {
346	360	// determine JS or CSS and set var (also mimetype), return false if neither
347	361	if ( $this->str_ends_in($pathIn,".js") === true ) {
		@@ -405,6 +419,9 @@ discard block
		block discarded – undo
405	419	return $_CachedMinifiedUrl;
406	420	}
407	421
	422	+ /**
	423	+ * @param string $needle
	424	+ */
408	425	protected function str_ends_in($haystack,$needle) {
409	426	$needleLength = strlen($needle);
410	427	$haystackLength = strlen($haystack);

		@@ -343,45 +343,45 @@ discard block
		block discarded – undo
343	343	}
344	344
345	345	protected function minify_single($pathIn) {
346		- // determine JS or CSS and set var (also mimetype), return false if neither
347		- if ( $this->str_ends_in($pathIn,".js") === true ) {
348		- $codeType="js";
349		- $codeMime="text/javascript";
350		- } else if ( $this->str_ends_in($pathIn,".css") === true ) {
351		- $codeType="css";
352		- $codeMime="text/css";
353		- } else {
354		- return false;
355		- }
	346	+ // determine JS or CSS and set var (also mimetype), return false if neither
	347	+ if ( $this->str_ends_in($pathIn,".js") === true ) {
	348	+ $codeType="js";
	349	+ $codeMime="text/javascript";
	350	+ } else if ( $this->str_ends_in($pathIn,".css") === true ) {
	351	+ $codeType="css";
	352	+ $codeMime="text/css";
	353	+ } else {
	354	+ return false;
	355	+ }
356	356
357		- // if min.js or min.css return false
358		- 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 ) ) {
359		- return false;
360		- }
	357	+ // if min.js or min.css return false
	358	+ 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 ) ) {
	359	+ return false;
	360	+ }
361	361
362		- // read file, return false if empty
363		- $_toMinify = file_get_contents($pathIn);
364		- if ( empty($_toMinify) ) return false;
	362	+ // read file, return false if empty
	363	+ $_toMinify = file_get_contents($pathIn);
	364	+ if ( empty($_toMinify) ) return false;
365	365
366		- // check cache
367		- $_md5hash = "single_".md5($_toMinify);
368		- $_cache = new autoptimizeCache($_md5hash,$codeType);
369		- if ($_cache->check() ) {
370		- $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
371		- } else {
372		- // if not in cache first minify
373		- $_Minified = $_toMinify;
374		- if ($codeType === "js") {
375		- if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
376		- if (@is_callable(array("JSMin","minify"))) {
377		- $tmp_code = trim(JSMin::minify($_toMinify));
378		- }
379		- }
380		- } else if ($codeType === "css") {
	366	+ // check cache
	367	+ $_md5hash = "single_".md5($_toMinify);
	368	+ $_cache = new autoptimizeCache($_md5hash,$codeType);
	369	+ if ($_cache->check() ) {
	370	+ $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
	371	+ } else {
	372	+ // if not in cache first minify
	373	+ $_Minified = $_toMinify;
	374	+ if ($codeType === "js") {
	375	+ if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
	376	+ if (@is_callable(array("JSMin","minify"))) {
	377	+ $tmp_code = trim(JSMin::minify($_toMinify));
	378	+ }
	379	+ }
	380	+ } else if ($codeType === "css") {
381	381	// make sure paths to background images/ imported css/ fonts .. are OK
382	382	$_toMinify = autoptimizeStyles::fixurls($pathIn,$_toMinify);
383	383	if (class_exists('Minify_CSS_Compressor')) {
384		- $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
	384	+ $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
385	385	} else if(class_exists('CSSmin')) {
386	386	$cssmin = new CSSmin();
387	387	if (method_exists($cssmin,"run")) {
		@@ -390,31 +390,31 @@ discard block
		block discarded – undo
390	390	$tmp_code = trim(CssMin::minify($_toMinify));
391	391	}
392	392	}
393		- }
394		- if (!empty($tmp_code)) {
395		- $_Minified = $tmp_code;
396		- unset($tmp_code);
397		- }
398		- // and then cache
399		- $_cache->cache($_Minified,$codeMime);
400		- $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
401		- }
402		- unset($_cache);
	393	+ }
	394	+ if (!empty($tmp_code)) {
	395	+ $_Minified = $tmp_code;
	396	+ unset($tmp_code);
	397	+ }
	398	+ // and then cache
	399	+ $_cache->cache($_Minified,$codeMime);
	400	+ $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
	401	+ }
	402	+ unset($_cache);
403	403
404		- // if CDN, then CDN
405		- $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);
	404	+ // if CDN, then CDN
	405	+ $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);
406	406
407		- return $_CachedMinifiedUrl;
408		- }
	407	+ return $_CachedMinifiedUrl;
	408	+ }
409	409
410		- protected function str_ends_in($haystack,$needle) {
411		- $needleLength = strlen($needle);
412		- $haystackLength = strlen($haystack);
413		- $lastPos=strrpos($haystack,$needle);
414		- if ($lastPos === $haystackLength - $needleLength) {
415		- return true;
416		- } else {
417		- return false;
418		- }
419		- }
	410	+ protected function str_ends_in($haystack,$needle) {
	411	+ $needleLength = strlen($needle);
	412	+ $haystackLength = strlen($haystack);
	413	+ $lastPos=strrpos($haystack,$needle);
	414	+ if ($lastPos === $haystackLength - $needleLength) {
	415	+ return true;
	416	+ } else {
	417	+ return false;
	418	+ }
	419	+ }
420	420	}

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
	2	+if (!defined('ABSPATH')) exit; // Exit if accessed directly
3	3
4	4	abstract class autoptimizeBase {
5	5	protected $content = '';
		@@ -23,37 +23,37 @@ discard block
		block discarded – undo
23	23
24	24	//Converts an URL to a full path
25	25	protected function getpath($url) {
26		- $url=apply_filters( 'autoptimize_filter_cssjs_alter_url', $url);
	26	+ $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url);
27	27
28		- if (strpos($url,'%')!==false) {
29		- $url=urldecode($url);
	28	+ if (strpos($url, '%') !== false) {
	29	+ $url = urldecode($url);
30	30	}
31	31
32		- $siteHost=parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST);
33		- $contentHost=parse_url(AUTOPTIMIZE_WP_ROOT_URL,PHP_URL_HOST);
	32	+ $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
	33	+ $contentHost = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST);
34	34
35	35	// normalize
36		- if (strpos($url,'//')===0) {
	36	+ if (strpos($url, '//') === 0) {
37	37	if (is_ssl()) {
38	38	$url = "https:".$url;
39	39	} else {
40	40	$url = "http:".$url;
41	41	}
42		- } else if ((strpos($url,'//')===false) && (strpos($url,$siteHost)===false)) {
	42	+ } else if ((strpos($url, '//') === false) && (strpos($url, $siteHost) === false)) {
43	43	if (AUTOPTIMIZE_WP_SITE_URL === $siteHost) {
44	44	$url = AUTOPTIMIZE_WP_SITE_URL.$url;
45	45	} else {
46		- $subdir_levels=substr_count(preg_replace("/https?:\/\//","",AUTOPTIMIZE_WP_SITE_URL),"/");
47		- $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..",$subdir_levels).$url;
	46	+ $subdir_levels = substr_count(preg_replace("/https?:\/\//", "", AUTOPTIMIZE_WP_SITE_URL), "/");
	47	+ $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..", $subdir_levels).$url;
48	48	}
49	49	}
50	50
51	51	if ($siteHost !== $contentHost) {
52		- $url=str_replace(AUTOPTIMIZE_WP_CONTENT_URL,AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME,$url);
	52	+ $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url);
53	53	}
54	54
55	55	// first check; hostname wp site should be hostname of url
56		- $thisHost=@parse_url($url,PHP_URL_HOST);
	56	+ $thisHost = @parse_url($url, PHP_URL_HOST);
57	57	if ($thisHost !== $siteHost) {
58	58	/*
59	59	* first try to get all domains from WPML (if available)
		@@ -65,18 +65,18 @@ discard block
		block discarded – undo
65	65
66	66	$multidomainsWPML = apply_filters('wpml_setting', array(), 'language_domains');
67	67	if (!empty($multidomainsWPML)) {
68		- $multidomains = array_map(array($this,"ao_getDomain"),$multidomainsWPML);
	68	+ $multidomains = array_map(array($this, "ao_getDomain"), $multidomainsWPML);
69	69	}
70	70
71	71	if (!empty($this->cdn_url)) {
72		- $multidomains[]=parse_url($this->cdn_url,PHP_URL_HOST);
	72	+ $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST);
73	73	}
74	74
75	75	$multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains);
76	76
77	77	if (!empty($multidomains)) {
78		- if (in_array($thisHost,$multidomains)) {
79		- $url=str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST), $url);
	78	+ if (in_array($thisHost, $multidomains)) {
	79	+ $url = str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST), $url);
80	80	} else {
81	81	return false;
82	82	}
		@@ -86,22 +86,22 @@ discard block
		block discarded – undo
86	86	}
87	87
88	88	// try to remove "wp root url" from url while not minding http<>https
89		- $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL);
	89	+ $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
90	90	if ($siteHost !== $contentHost) {
91	91	// as we replaced the content-domain with the site-domain, we should match against that
92		- $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_SITE_URL);
	92	+ $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL);
93	93	}
94		- $tmp_url = preg_replace('/https?:/','',$url);
95		- $path = str_replace($tmp_ao_root,'',$tmp_url);
	94	+ $tmp_url = preg_replace('/https?:/', '', $url);
	95	+ $path = str_replace($tmp_ao_root, '', $tmp_url);
96	96
97	97	// if path starts with :// or //, this is not a URL in the WP context and we have to assume we can't aggregate
98		- if (preg_match('#^:?//#',$path)) {
	98	+ if (preg_match('#^:?//#', $path)) {
99	99	/** External script/css (adsense, etc) */
100	100	return false;
101	101	}
102	102
103	103	// prepend with WP_ROOT_DIR to have full path to file
104		- $path = str_replace('//','/',WP_ROOT_DIR.$path);
	104	+ $path = str_replace('//', '/', WP_ROOT_DIR.$path);
105	105
106	106	// final check: does file exist and is it readable
107	107	if (file_exists($path) && is_file($path) && is_readable($path)) {
		@@ -114,25 +114,25 @@ discard block
		block discarded – undo
114	114	// needed for WPML-filter
115	115	protected function ao_getDomain($in) {
116	116	// make sure the url starts with something vaguely resembling a protocol
117		- if ((strpos($in,"http")!==0) && (strpos($in,"//")!==0)) {
118		- $in="http://".$in;
	117	+ if ((strpos($in, "http") !== 0) && (strpos($in, "//") !== 0)) {
	118	+ $in = "http://".$in;
119	119	}
120	120
121	121	// do the actual parse_url
122		- $out = parse_url($in,PHP_URL_HOST);
	122	+ $out = parse_url($in, PHP_URL_HOST);
123	123
124	124	// fallback if parse_url does not understand the url is in fact a url
125		- if (empty($out)) $out=$in;
	125	+ if (empty($out)) $out = $in;
126	126
127	127	return $out;
128	128	}
129	129
130	130
131	131	// logger
132		- protected function ao_logger($logmsg,$appendHTML=true) {
	132	+ protected function ao_logger($logmsg, $appendHTML = true) {
133	133	if ($appendHTML) {
134		- $logmsg="<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
135		- $this->content.=$logmsg;
	134	+ $logmsg = "<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
	135	+ $this->content .= $logmsg;
136	136	} else {
137	137	error_log("Autoptimize: ".$logmsg);
138	138	}
		@@ -140,7 +140,7 @@ discard block
		block discarded – undo
140	140
141	141	// hide everything between noptimize-comment tags
142	142	protected function hide_noptimize($noptimize_in) {
143		- if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) {
	143	+ if (preg_match('/<!--\s?noptimize\s?-->/', $noptimize_in)) {
144	144	$noptimize_out = preg_replace_callback(
145	145	'#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is',
146	146	create_function(
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157
158	158	// unhide noptimize-tags
159	159	protected function restore_noptimize($noptimize_in) {
160		- if ( strpos( $noptimize_in, '%%NOPTIMIZE%%' ) !== false ) {
	160	+ if (strpos($noptimize_in, '%%NOPTIMIZE%%') !== false) {
161	161	$noptimize_out = preg_replace_callback(
162	162	'#%%NOPTIMIZE'.AUTOPTIMIZE_HASH.'%%(.*?)%%NOPTIMIZE%%#is',
163	163	create_function(
		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	}
174	174
175	175	protected function hide_iehacks($iehacks_in) {
176		- if ( strpos( $iehacks_in, '<!--[if' ) !== false ) {
	176	+ if (strpos($iehacks_in, '<!--[if') !== false) {
177	177	$iehacks_out = preg_replace_callback(
178	178	'#<!--\[if.*?\[endif\]-->#is',
179	179	create_function(
		@@ -189,7 +189,7 @@ discard block
		block discarded – undo
189	189	}
190	190
191	191	protected function restore_iehacks($iehacks_in) {
192		- if ( strpos( $iehacks_in, '%%IEHACK%%' ) !== false ) {
	192	+ if (strpos($iehacks_in, '%%IEHACK%%') !== false) {
193	193	$iehacks_out = preg_replace_callback(
194	194	'#%%IEHACK'.AUTOPTIMIZE_HASH.'%%(.*?)%%IEHACK%%#is',
195	195	create_function(
		@@ -199,13 +199,13 @@ discard block
		block discarded – undo
199	199	$iehacks_in
200	200	);
201	201	} else {
202		- $iehacks_out=$iehacks_in;
	202	+ $iehacks_out = $iehacks_in;
203	203	}
204	204	return $iehacks_out;
205	205	}
206	206
207	207	protected function hide_comments($comments_in) {
208		- if ( strpos( $comments_in, '<!--' ) !== false ) {
	208	+ if (strpos($comments_in, '<!--') !== false) {
209	209	$comments_out = preg_replace_callback(
210	210	'#<!--.*?-->#is',
211	211	create_function(
		@@ -221,7 +221,7 @@ discard block
		block discarded – undo
221	221	}
222	222
223	223	protected function restore_comments($comments_in) {
224		- if ( strpos( $comments_in, '%%COMMENTS%%' ) !== false ) {
	224	+ if (strpos($comments_in, '%%COMMENTS%%') !== false) {
225	225	$comments_out = preg_replace_callback(
226	226	'#%%COMMENTS'.AUTOPTIMIZE_HASH.'%%(.*?)%%COMMENTS%%#is',
227	227	create_function(
		@@ -231,31 +231,31 @@ discard block
		block discarded – undo
231	231	$comments_in
232	232	);
233	233	} else {
234		- $comments_out=$comments_in;
	234	+ $comments_out = $comments_in;
235	235	}
236	236	return $comments_out;
237	237	}
238	238
239		- protected function url_replace_cdn( $url ) {
	239	+ protected function url_replace_cdn($url) {
240	240	// API filter to change base CDN URL
241		- $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $this->cdn_url );
	241	+ $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $this->cdn_url);
242	242
243		- if ( !empty($cdn_url) ) {
	243	+ if (!empty($cdn_url)) {
244	244	// prepend domain-less absolute URL's
245		- if ( ( substr( $url, 0, 1 ) === '/' ) && ( substr( $url, 1, 1 ) !== '/' ) ) {
246		- $url = rtrim( $cdn_url, '/' ) . $url;
	245	+ if ((substr($url, 0, 1) === '/') && (substr($url, 1, 1) !== '/')) {
	246	+ $url = rtrim($cdn_url, '/').$url;
247	247	} else {
248	248	// get wordpress base URL
249		- $WPSiteBreakdown = parse_url( AUTOPTIMIZE_WP_SITE_URL );
250		- $WPBaseUrl = $WPSiteBreakdown['scheme'] . '://' . $WPSiteBreakdown['host'];
251		- if ( ! empty( $WPSiteBreakdown['port'] ) ) {
252		- $WPBaseUrl .= ":" . $WPSiteBreakdown['port'];
	249	+ $WPSiteBreakdown = parse_url(AUTOPTIMIZE_WP_SITE_URL);
	250	+ $WPBaseUrl = $WPSiteBreakdown['scheme'].'://'.$WPSiteBreakdown['host'];
	251	+ if (!empty($WPSiteBreakdown['port'])) {
	252	+ $WPBaseUrl .= ":".$WPSiteBreakdown['port'];
253	253	}
254	254	// replace full url's with scheme
255		- $tmp_url = str_replace( $WPBaseUrl, rtrim( $cdn_url, '/' ), $url );
256		- if ( $tmp_url === $url ) {
	255	+ $tmp_url = str_replace($WPBaseUrl, rtrim($cdn_url, '/'), $url);
	256	+ if ($tmp_url === $url) {
257	257	// last attempt; replace scheme-less URL's
258		- $url = str_replace( preg_replace( '/https?:/', '', $WPBaseUrl ), rtrim( $cdn_url, '/' ), $url );
	258	+ $url = str_replace(preg_replace('/https?:/', '', $WPBaseUrl), rtrim($cdn_url, '/'), $url);
259	259	} else {
260	260	$url = $tmp_url;
261	261	}
		@@ -263,32 +263,32 @@ discard block
		block discarded – undo
263	263	}
264	264
265	265	// allow API filter to alter URL after CDN replacement
266		- $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url );
	266	+ $url = apply_filters('autoptimize_filter_base_replace_cdn', $url);
267	267	return $url;
268	268	}
269	269
270		- protected function inject_in_html($payload,$replaceTag) {
271		- if (strpos($this->content,$replaceTag[0])!== false) {
272		- if ($replaceTag[1]==="after") {
273		- $replaceBlock=$replaceTag[0].$payload;
274		- } else if ($replaceTag[1]==="replace"){
275		- $replaceBlock=$payload;
	270	+ protected function inject_in_html($payload, $replaceTag) {
	271	+ if (strpos($this->content, $replaceTag[0]) !== false) {
	272	+ if ($replaceTag[1] === "after") {
	273	+ $replaceBlock = $replaceTag[0].$payload;
	274	+ } else if ($replaceTag[1] === "replace") {
	275	+ $replaceBlock = $payload;
276	276	} else {
277		- $replaceBlock=$payload.$replaceTag[0];
	277	+ $replaceBlock = $payload.$replaceTag[0];
278	278	}
279		- $this->content = substr_replace($this->content,$replaceBlock,strpos($this->content,$replaceTag[0]),strlen($replaceTag[0]));
	279	+ $this->content = substr_replace($this->content, $replaceBlock, strpos($this->content, $replaceTag[0]), strlen($replaceTag[0]));
280	280	} else {
281	281	$this->content .= $payload;
282	282	if (!$this->tagWarning) {
283		- $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<",">"),"",$replaceTag[0])."\" missing --><!--/noptimize-->";
284		- $this->tagWarning=true;
	283	+ $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<", ">"), "", $replaceTag[0])."\" missing --><!--/noptimize-->";
	284	+ $this->tagWarning = true;
285	285	}
286	286	}
287	287	}
288	288
289	289	protected function isremovable($tag, $removables) {
290	290	foreach ($removables as $match) {
291		- if (strpos($tag,$match)!==false) {
	291	+ if (strpos($tag, $match) !== false) {
292	292	return true;
293	293	}
294	294	}
		@@ -297,7 +297,7 @@ discard block
		block discarded – undo
297	297
298	298	// inject already minified code in optimized JS/CSS
299	299	protected function inject_minified($in) {
300		- if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
	300	+ if (strpos($in, '%%INJECTLATER%%') !== false) {
301	301	$out = preg_replace_callback(
302	302	'#\/\\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.?)%%INJECTLATER%%\*\/#is',
303	303	create_function(
		@@ -344,49 +344,49 @@ discard block
		block discarded – undo
344	344
345	345	protected function minify_single($pathIn) {
346	346	// determine JS or CSS and set var (also mimetype), return false if neither
347		- if ( $this->str_ends_in($pathIn,".js") === true ) {
348		- $codeType="js";
349		- $codeMime="text/javascript";
350		- } else if ( $this->str_ends_in($pathIn,".css") === true ) {
351		- $codeType="css";
352		- $codeMime="text/css";
	347	+ if ($this->str_ends_in($pathIn, ".js") === true) {
	348	+ $codeType = "js";
	349	+ $codeMime = "text/javascript";
	350	+ } else if ($this->str_ends_in($pathIn, ".css") === true) {
	351	+ $codeType = "css";
	352	+ $codeMime = "text/css";
353	353	} else {
354	354	return false;
355	355	}
356	356
357	357	// if min.js or min.css return false
358		- 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 ) ) {
	358	+ 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)) {
359	359	return false;
360	360	}
361	361
362	362	// read file, return false if empty
363	363	$_toMinify = file_get_contents($pathIn);
364		- if ( empty($_toMinify) ) return false;
	364	+ if (empty($_toMinify)) return false;
365	365
366	366	// check cache
367	367	$_md5hash = "single_".md5($_toMinify);
368		- $_cache = new autoptimizeCache($_md5hash,$codeType);
369		- if ($_cache->check() ) {
	368	+ $_cache = new autoptimizeCache($_md5hash, $codeType);
	369	+ if ($_cache->check()) {
370	370	$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
371	371	} else {
372	372	// if not in cache first minify
373	373	$_Minified = $_toMinify;
374	374	if ($codeType === "js") {
375		- if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
376		- if (@is_callable(array("JSMin","minify"))) {
	375	+ if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) {
	376	+ if (@is_callable(array("JSMin", "minify"))) {
377	377	$tmp_code = trim(JSMin::minify($_toMinify));
378	378	}
379	379	}
380	380	} else if ($codeType === "css") {
381	381	// make sure paths to background images/ imported css/ fonts .. are OK
382		- $_toMinify = autoptimizeStyles::fixurls($pathIn,$_toMinify);
	382	+ $_toMinify = autoptimizeStyles::fixurls($pathIn, $_toMinify);
383	383	if (class_exists('Minify_CSS_Compressor')) {
384	384	$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
385		- } else if(class_exists('CSSmin')) {
	385	+ } else if (class_exists('CSSmin')) {
386	386	$cssmin = new CSSmin();
387		- if (method_exists($cssmin,"run")) {
	387	+ if (method_exists($cssmin, "run")) {
388	388	$tmp_code = trim($cssmin->run($_toMinify));
389		- } elseif (@is_callable(array($cssmin,"minify"))) {
	389	+ } elseif (@is_callable(array($cssmin, "minify"))) {
390	390	$tmp_code = trim(CssMin::minify($_toMinify));
391	391	}
392	392	}
		@@ -396,7 +396,7 @@ discard block
		block discarded – undo
396	396	unset($tmp_code);
397	397	}
398	398	// and then cache
399		- $_cache->cache($_Minified,$codeMime);
	399	+ $_cache->cache($_Minified, $codeMime);
400	400	$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
401	401	}
402	402	unset($_cache);
		@@ -407,10 +407,10 @@ discard block
		block discarded – undo
407	407	return $_CachedMinifiedUrl;
408	408	}
409	409
410		- protected function str_ends_in($haystack,$needle) {
	410	+ protected function str_ends_in($haystack, $needle) {
411	411	$needleLength = strlen($needle);
412	412	$haystackLength = strlen($haystack);
413		- $lastPos=strrpos($haystack,$needle);
	413	+ $lastPos = strrpos($haystack, $needle);
414	414	if ($lastPos === $haystackLength - $needleLength) {
415	415	return true;
416	416	} else {

		@@ -49,13 +49,13 @@ discard block
		block discarded – undo
49	49	*/
50	50	public function __construct($raisePhpLimits = true)
51	51	{
52		- $this->memoryLimit = 128 * 1048576; // 128MB in bytes
53		- $this->pcreBacktrackLimit = 1000 * 1000;
54		- $this->pcreRecursionLimit = 500 * 1000;
	52	+ $this->memoryLimit = 128*1048576; // 128MB in bytes
	53	+ $this->pcreBacktrackLimit = 1000*1000;
	54	+ $this->pcreRecursionLimit = 500*1000;
55	55
56	56	$this->raisePhpLimits = (bool) $raisePhpLimits;
57	57
58		- $this->numRegex = '(?:\+\|-)?\d*\.?\d+' . $this->unitsGroupRegex .'?';
	58	+ $this->numRegex = '(?:\+\|-)?\d*\.?\d+'.$this->unitsGroupRegex.'?';
59	59	}
60	60
61	61	/**
		@@ -134,14 +134,14 @@ discard block
		block discarded – undo
134	134	$cssChunks[$i] = $this->minify($cssChunks[$i], $linebreakPos);
135	135	// Keep the first @charset at-rule found
136	136	if (empty($charset) && preg_match($charsetRegexp, $cssChunks[$i], $matches)) {
137		- $charset = strtolower($matches[1]) . $matches[2];
	137	+ $charset = strtolower($matches[1]).$matches[2];
138	138	}
139	139	// Delete all @charset at-rules
140	140	$cssChunks[$i] = preg_replace($charsetRegexp, '', $cssChunks[$i]);
141	141	}
142	142
143	143	// Update the first chunk and push the charset to the top of the file.
144		- $cssChunks[0] = $charset . $cssChunks[0];
	144	+ $cssChunks[0] = $charset.$cssChunks[0];
145	145
146	146	return trim(implode('', $cssChunks));
147	147	}
		@@ -235,7 +235,7 @@ discard block
		block discarded – undo
235	235	private function registerPreservedToken($token)
236	236	{
237	237	$this->preservedTokens[] = $token;
238		- return self::TOKEN . (count($this->preservedTokens) - 1) .'___';
	238	+ return self::TOKEN.(count($this->preservedTokens) - 1).'___';
239	239	}
240	240
241	241	/**
		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245	*/
246	246	private function getPreservedTokenPlaceholderRegexById($id)
247	247	{
248		- return '/'. self::TOKEN . $id .'___/';
	248	+ return '/'.self::TOKEN.$id.'___/';
249	249	}
250	250
251	251	/**
		@@ -256,7 +256,7 @@ discard block
		block discarded – undo
256	256	private function registerComment($comment)
257	257	{
258	258	$this->comments[] = $comment;
259		- return '/'. self::COMMENT . (count($this->comments) - 1) .'___/';
	259	+ return '/'.self::COMMENT.(count($this->comments) - 1).'___/';
260	260	}
261	261
262	262	/**
		@@ -266,7 +266,7 @@ discard block
		block discarded – undo
266	266	*/
267	267	private function getCommentPlaceholderById($id)
268	268	{
269		- return self::COMMENT . $id .'___';
	269	+ return self::COMMENT.$id.'___';
270	270	}
271	271
272	272	/**
		@@ -276,7 +276,7 @@ discard block
		block discarded – undo
276	276	*/
277	277	private function getCommentPlaceholderRegexById($id)
278	278	{
279		- return '/'. $this->getCommentPlaceholderById($id) .'/';
	279	+ return '/'.$this->getCommentPlaceholderById($id).'/';
280	280	}
281	281
282	282	/**
		@@ -287,7 +287,7 @@ discard block
		block discarded – undo
287	287	private function registerAtRuleBlock($block)
288	288	{
289	289	$this->atRuleBlocks[] = $block;
290		- return self::AT_RULE_BLOCK . (count($this->atRuleBlocks) - 1) .'___';
	290	+ return self::AT_RULE_BLOCK.(count($this->atRuleBlocks) - 1).'___';
291	291	}
292	292
293	293	/**
		@@ -297,7 +297,7 @@ discard block
		block discarded – undo
297	297	*/
298	298	private function getAtRuleBlockPlaceholderRegexById($id)
299	299	{
300		- return '/'. self::AT_RULE_BLOCK . $id .'___/';
	300	+ return '/'.self::AT_RULE_BLOCK.$id.'___/';
301	301	}
302	302
303	303	/**
		@@ -330,8 +330,8 @@ discard block
		block discarded – undo
330	330	$preservedTokenPlaceholder = $this->registerPreservedToken($comment);
331	331	$css = preg_replace($commentPlaceholderRegex, $preservedTokenPlaceholder, $css, 1);
332	332	// Preserve new lines for /*! important comments
333		- $css = preg_replace('/\R+\s(\/\'. $preservedTokenPlaceholder .')/', self::NL.'$1', $css);
334		- $css = preg_replace('/('. $preservedTokenPlaceholder .'\\/)\s\R+/', '$1'.self::NL, $css);
	333	+ $css = preg_replace('/\R+\s(\/\'.$preservedTokenPlaceholder.')/', self::NL.'$1', $css);
	334	+ $css = preg_replace('/('.$preservedTokenPlaceholder.'\\/)\s\R+/', '$1'.self::NL, $css);
335	335	continue;
336	336	}
337	337
		@@ -360,14 +360,14 @@ discard block
		block discarded – undo
360	360	}
361	361
362	362	// in all other cases kill the comment
363		- $css = preg_replace('/\/\' . $commentPlaceholder . '\\//', '', $css, 1);
	363	+ $css = preg_replace('/\/\'.$commentPlaceholder.'\\//', '', $css, 1);
364	364	}
365	365
366	366	// Normalize all whitespace strings to single spaces. Easier to work with that way.
367	367	$css = preg_replace('/\s+/', ' ', $css);
368	368
369	369	// Remove spaces before & after newlines
370		- $css = preg_replace('/\s'. self::NL .'\s/', self::NL, $css);
	370	+ $css = preg_replace('/\s'.self::NL.'\s/', self::NL, $css);
371	371
372	372	// Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters
373	373	$css = preg_replace_callback(
		@@ -409,7 +409,7 @@ discard block
		block discarded – undo
409	409	$css = preg_replace('/!important/i', ' !important', $css);
410	410
411	411	// bring back the colon
412		- $css = preg_replace('/'. self::CLASSCOLON .'/', ':', $css);
	412	+ $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css);
413	413
414	414	// retain space for special IE6 cases
415	415	$css = preg_replace_callback('/:first-(line\|letter)(\{\|,)/i', array($this, 'lowercasePseudoFirst'), $css);
		@@ -419,7 +419,7 @@ discard block
		block discarded – undo
419	419
420	420	// lowercase some popular @directives
421	421	$css = preg_replace_callback(
422		- '/@(document\|font-face\|import\|(?:-(?:atsc\|khtml\|moz\|ms\|o\|wap\|webkit)-)?keyframes\|media\|namespace\|page\|' .
	422	+ '/@(document\|font-face\|import\|(?:-(?:atsc\|khtml\|moz\|ms\|o\|wap\|webkit)-)?keyframes\|media\|namespace\|page\|'.
423	423	'supports\|viewport)/i',
424	424	array($this, 'lowercaseDirectives'),
425	425	$css
		@@ -427,7 +427,7 @@ discard block
		block discarded – undo
427	427
428	428	// lowercase some more common pseudo-elements
429	429	$css = preg_replace_callback(
430		- '/:(active\|after\|before\|checked\|disabled\|empty\|enabled\|first-(?:child\|of-type)\|focus\|hover\|' .
	430	+ '/:(active\|after\|before\|checked\|disabled\|empty\|enabled\|first-(?:child\|of-type)\|focus\|hover\|'.
431	431	'last-(?:child\|of-type)\|link\|only-(?:child\|of-type)\|root\|:selection\|target\|visited)/i',
432	432	array($this, 'lowercasePseudoElements'),
433	433	$css
		@@ -443,7 +443,7 @@ discard block
		block discarded – undo
443	443	// lower case some common function that can be values
444	444	// NOTE: rgb() isn't useful as we replace with #hex later, as well as and() is already done for us
445	445	$css = preg_replace_callback(
446		- '/([:,( ]\s*)(attr\|color-stop\|from\|rgba\|to\|url\|-webkit-gradient\|' .
	446	+ '/([:,( ]\s*)(attr\|color-stop\|from\|rgba\|to\|url\|-webkit-gradient\|'.
447	447	'(?:-(?:atsc\|khtml\|moz\|ms\|o\|wap\|webkit)-)?(?:calc\|max\|min\|(?:repeating-)?(?:linear\|radial)-gradient))/iS',
448	448	array($this, 'lowercaseCommonFunctionsValues'),
449	449	$css
		@@ -500,19 +500,19 @@ discard block
		block discarded – undo
500	500
501	501	// Find a fraction that is used for Opera's -o-device-pixel-ratio query
502	502	// Add token to add the "\" back in later
503		- $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
	503	+ $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css);
504	504
505	505	// Patch new lines to avoid being removed when followed by empty rules cases
506		- $css = preg_replace('/'. self::NL .'/', self::NL .'}', $css);
	506	+ $css = preg_replace('/'.self::NL.'/', self::NL.'}', $css);
507	507
508	508	// Remove empty rules.
509	509	$css = preg_replace('/[^{};\/]+\{\}/S', '', $css);
510	510
511	511	// Restore new lines for /*! important comments
512		- $css = preg_replace('/'. self::NL .'}/', "\n", $css);
	512	+ $css = preg_replace('/'.self::NL.'}/', "\n", $css);
513	513
514	514	// Add "/" back to fix Opera -o-device-pixel-ratio query
515		- $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css);
	515	+ $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css);
516	516
517	517	// Replace multiple semi-colons in a row by a single one
518	518	// See SF bug #1980989
		@@ -528,7 +528,7 @@ discard block
		block discarded – undo
528	528	$linebreakPos = (int) $linebreakPos;
529	529	for ($startIndex = $i = 1, $l = strlen($css); $i < $l; $i++) {
530	530	if ($css[$i - 1] === '}' && $i - $startIndex > $linebreakPos) {
531		- $css = $this->strSlice($css, 0, $i) . "\n" . $this->strSlice($css, $i);
	531	+ $css = $this->strSlice($css, 0, $i)."\n".$this->strSlice($css, $i);
532	532	$l = strlen($css);
533	533	$startIndex = $i;
534	534	}
		@@ -581,7 +581,7 @@ discard block
		block discarded – undo
581	581	$terminator = ')';
582	582	}
583	583
584		- while ($terminatorFound === false && $endIndex+1 <= $maxIndex) {
	584	+ while ($terminatorFound === false && $endIndex + 1 <= $maxIndex) {
585	585	$endIndex = $this->indexOf($css, $terminator, $endIndex + 1);
586	586	// endIndex == 0 doesn't really apply here
587	587	if ($endIndex > 0 && substr($css, $endIndex - 1, 1) !== '\\') {
		@@ -604,7 +604,7 @@ discard block
		block discarded – undo
604	604	trim($token)
605	605	);
606	606	$preservedTokenPlaceholder = $this->registerPreservedToken($token);
607		- $sb[] = 'url('. $preservedTokenPlaceholder .')';
	607	+ $sb[] = 'url('.$preservedTokenPlaceholder.')';
608	608	$appenIndex = $endIndex + 1;
609	609	} else {
610	610	// No end terminator found, re-add the whole match. Should we throw/warn here?
		@@ -630,7 +630,7 @@ discard block
		block discarded – undo
630	630	private function shortenZeroValues($css)
631	631	{
632	632	$unitsGroupReg = $this->unitsGroupRegex;
633		- $numOrPosReg = '('. $this->numRegex .'\|top\|left\|bottom\|right\|center)';
	633	+ $numOrPosReg = '('.$this->numRegex.'\|top\|left\|bottom\|right\|center)';
634	634	$oneZeroSafeProperties = array(
635	635	'(?:line-)?height',
636	636	'(?:(?:min\|max)-)?width',
		@@ -656,17 +656,17 @@ discard block
		block discarded – undo
656	656	$regEnd = '/i';
657	657
658	658	// First zero regex start
659		- $oneZeroRegStart = $regStart .'('. implode('\|', $oneZeroSafeProperties) .'):';
	659	+ $oneZeroRegStart = $regStart.'('.implode('\|', $oneZeroSafeProperties).'):';
660	660
661	661	// Multiple zeros regex start
662		- $nZerosRegStart = $regStart .'('. implode('\|', $nZeroSafeProperties) .'):';
	662	+ $nZerosRegStart = $regStart.'('.implode('\|', $nZeroSafeProperties).'):';
663	663
664	664	$css = preg_replace(
665	665	array(
666		- $oneZeroRegStart .'0'. $unitsGroupReg . $regEnd,
667		- $nZerosRegStart . $numOrPosReg .' 0'. $unitsGroupReg . $regEnd,
668		- $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd,
669		- $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd
	666	+ $oneZeroRegStart.'0'.$unitsGroupReg.$regEnd,
	667	+ $nZerosRegStart.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd,
	668	+ $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd,
	669	+ $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd
670	670	),
671	671	array(
672	672	'$1$2:0',
		@@ -682,13 +682,13 @@ discard block
		block discarded – undo
682	682
683	683	// Replace 0 0; or 0 0 0; or 0 0 0 0; with 0 for safe properties only.
684	684	$css = preg_replace(
685		- '/('. implode('\|', $nZeroSafeProperties) .'):0(?: 0){1,3}(;\|\}\| !)'. $regEnd,
	685	+ '/('.implode('\|', $nZeroSafeProperties).'):0(?: 0){1,3}(;\|\}\| !)'.$regEnd,
686	686	'$1:0$2',
687	687	$css
688	688	);
689	689
690	690	// Replace 0 0 0; or 0 0 0 0; with 0 0 for background-position property.
691		- $css = preg_replace('/(background-position):0(?: 0){2,3}(;\|\}\| !)'. $regEnd, '$1:0 0$2', $css);
	691	+ $css = preg_replace('/(background-position):0(?: 0){2,3}(;\|\}\| !)'.$regEnd, '$1:0 0$2', $css);
692	692
693	693	return $css;
694	694	}
		@@ -712,12 +712,12 @@ discard block
		block discarded – undo
712	712	'(?:text\|box)-shadow'
713	713	);
714	714
715		- $regStart = '/(;\|\{)('. implode('\|', $propertiesWithColors) .'):([^;}]*)\b';
	715	+ $regStart = '/(;\|\{)('.implode('\|', $propertiesWithColors).'):([^;}]*)\b';
716	716	$regEnd = '\b/iS';
717	717
718	718	foreach ($longNamedColors as $colorName => $colorCode) {
719		- $patterns[] = $regStart . $colorName . $regEnd;
720		- $replacements[] = '$1$2:$3'. $colorCode;
	719	+ $patterns[] = $regStart.$colorName.$regEnd;
	720	+ $replacements[] = '$1$2:$3'.$colorCode;
721	721	}
722	722
723	723	// Run at least 4 times to cover most cases (same color used several times for the same property)
		@@ -762,16 +762,16 @@ discard block
		block discarded – undo
762	762
763	763	if ($isFilter) {
764	764	// Restore, maintain case, otherwise filter will break
765		- $sb[] = $m[1] .'#'. $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7];
	765	+ $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7];
766	766	} else {
767	767	if (strtolower($m[2]) == strtolower($m[3]) &&
768	768	strtolower($m[4]) == strtolower($m[5]) &&
769	769	strtolower($m[6]) == strtolower($m[7])) {
770	770	// Compress.
771		- $hex = '#'. strtolower($m[3] . $m[5] . $m[7]);
	771	+ $hex = '#'.strtolower($m[3].$m[5].$m[7]);
772	772	} else {
773	773	// Non compressible color, restore but lower case.
774		- $hex = '#'. strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]);
	774	+ $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]);
775	775	}
776	776	// replace Hex colors with shorter color names
777	777	$sb[] = array_key_exists($hex, $longHexColors) ? $longHexColors[$hex] : $hex;
		@@ -818,7 +818,7 @@ discard block
		block discarded – undo
818	818	$match = preg_replace('/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/i', 'alpha(opacity=', $match);
819	819
820	820	$preservedTokenPlaceholder = $this->registerPreservedToken($match);
821		- return $quote . $preservedTokenPlaceholder . $quote;
	821	+ return $quote.$preservedTokenPlaceholder.$quote;
822	822	}
823	823
824	824	private function processAtRuleBlocks($matches)
		@@ -838,13 +838,13 @@ discard block
		block discarded – undo
838	838	)
839	839	);
840	840	$preservedTokenPlaceholder = $this->registerPreservedToken($token);
841		- return 'calc('. $preservedTokenPlaceholder .')';
	841	+ return 'calc('.$preservedTokenPlaceholder.')';
842	842	}
843	843
844	844	private function processOldIeSpecificMatrixDefinition($matches)
845	845	{
846	846	$preservedTokenPlaceholder = $this->registerPreservedToken($matches[1]);
847		- return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $preservedTokenPlaceholder .')';
	847	+ return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$preservedTokenPlaceholder.')';
848	848	}
849	849
850	850	private function processColon($matches)
		@@ -869,10 +869,10 @@ discard block
		block discarded – undo
869	869
870	870	// Fix for issue #2528093
871	871	if (!preg_match('/[\s,);}]/', $matches[2])) {
872		- $matches[2] = ' '. $matches[2];
	872	+ $matches[2] = ' '.$matches[2];
873	873	}
874	874
875		- return '#'. implode('', $hexColors) . $matches[2];
	875	+ return '#'.implode('', $hexColors).$matches[2];
876	876	}
877	877
878	878	private function hslToHex($matches)
		@@ -886,37 +886,37 @@ discard block
		block discarded – undo
886	886
887	887	private function processAtRulesOperators($matches)
888	888	{
889		- return $matches[1] . strtolower($matches[2]) .' (';
	889	+ return $matches[1].strtolower($matches[2]).' (';
890	890	}
891	891
892	892	private function lowercasePseudoFirst($matches)
893	893	{
894		- return ':first-'. strtolower($matches[1]) .' '. $matches[2];
	894	+ return ':first-'.strtolower($matches[1]).' '.$matches[2];
895	895	}
896	896
897	897	private function lowercaseDirectives($matches)
898	898	{
899		- return '@'. strtolower($matches[1]);
	899	+ return '@'.strtolower($matches[1]);
900	900	}
901	901
902	902	private function lowercasePseudoElements($matches)
903	903	{
904		- return ':'. strtolower($matches[1]);
	904	+ return ':'.strtolower($matches[1]);
905	905	}
906	906
907	907	private function lowercaseCommonFunctions($matches)
908	908	{
909		- return ':'. strtolower($matches[1]) .'(';
	909	+ return ':'.strtolower($matches[1]).'(';
910	910	}
911	911
912	912	private function lowercaseCommonFunctionsValues($matches)
913	913	{
914		- return $matches[1] . strtolower($matches[2]);
	914	+ return $matches[1].strtolower($matches[2]);
915	915	}
916	916
917	917	private function lowercaseProperties($matches)
918	918	{
919		- return $matches[1] . strtolower($matches[2]) . $matches[3];
	919	+ return $matches[1].strtolower($matches[2]).$matches[3];
920	920	}
921	921
922	922	// ---------------------------------------------------------------------------------------------
		@@ -967,18 +967,18 @@ discard block
		block discarded – undo
967	967	$l = floatval(str_replace('%', '', $hslValues[2]));
968	968
969	969	// Wrap and clamp, then fraction!
970		- $h = ((($h % 360) + 360) % 360) / 360;
971		- $s = $this->clampNumber($s, 0, 100) / 100;
972		- $l = $this->clampNumber($l, 0, 100) / 100;
	970	+ $h = ((($h%360) + 360)%360)/360;
	971	+ $s = $this->clampNumber($s, 0, 100)/100;
	972	+ $l = $this->clampNumber($l, 0, 100)/100;
973	973
974	974	if ($s == 0) {
975		- $r = $g = $b = $this->roundNumber(255 * $l);
	975	+ $r = $g = $b = $this->roundNumber(255*$l);
976	976	} else {
977		- $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
978		- $v1 = (2 * $l) - $v2;
979		- $r = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h + (1/3)));
980		- $g = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h));
981		- $b = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h - (1/3)));
	977	+ $v2 = $l < 0.5 ? $l(1 + $s) : ($l + $s) - ($s$l);
	978	+ $v1 = (2*$l) - $v2;
	979	+ $r = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h + (1/3)));
	980	+ $g = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h));
	981	+ $b = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h - (1/3)));
982	982	}
983	983
984	984	return array($r, $g, $b);
		@@ -995,16 +995,16 @@ discard block
		block discarded – undo
995	995	{
996	996	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
997	997
998		- if ($vh * 6 < 1) {
999		- return $v1 + ($v2 - $v1) * 6 * $vh;
	998	+ if ($vh*6 < 1) {
	999	+ return $v1 + ($v2 - $v1)6$vh;
1000	1000	}
1001	1001
1002		- if ($vh * 2 < 1) {
	1002	+ if ($vh*2 < 1) {
1003	1003	return $v2;
1004	1004	}
1005	1005
1006		- if ($vh * 3 < 2) {
1007		- return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6;
	1006	+ if ($vh*3 < 2) {
	1007	+ return $v1 + ($v2 - $v1)((2/3) - $vh)6;
1008	1008	}
1009	1009
1010	1010	return $v1;
		@@ -1039,13 +1039,13 @@ discard block
		block discarded – undo
1039	1039	switch ($letter) {
1040	1040	case 'M':
1041	1041	case 'm':
1042		- return (int) $size * 1048576;
	1042	+ return (int) $size*1048576;
1043	1043	case 'K':
1044	1044	case 'k':
1045		- return (int) $size * 1024;
	1045	+ return (int) $size*1024;
1046	1046	case 'G':
1047	1047	case 'g':
1048		- return (int) $size * 1073741824;
	1048	+ return (int) $size*1073741824;
1049	1049	}
1050	1050	}
1051	1051	return (int) $size;
		@@ -1059,7 +1059,7 @@ discard block
		block discarded – undo
1059	1059	private function rgbPercentageToRgbInteger($rgbPercentage)
1060	1060	{
1061	1061	if (strpos($rgbPercentage, '%') !== false) {
1062		- $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55);
	1062	+ $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55);
1063	1063	}
1064	1064
1065	1065	return intval($rgbPercentage, 10);

		@@ -128,27 +128,27 @@ discard block
		block discarded – undo
128	128	// should we add flags?
129	129	foreach ($excludeJS as $exclTag => $exclFlags) {
130	130	if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) {
131		- $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
	131	+ $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
132	132	}
133	133	}
134	134	}
135	135
136		- // should we minify the non-aggregated script?
137		- if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
138		- $_CachedMinifiedUrl = $this->minify_single($path);
	136	+ // should we minify the non-aggregated script?
	137	+ if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
	138	+ $_CachedMinifiedUrl = $this->minify_single($path);
139	139
140		- // replace orig URL with minified URL from cache if so
141		- if (!empty($_CachedMinifiedUrl)) {
142		- $newTag = str_replace($url, $_CachedMinifiedUrl, $newTag);
143		- }
	140	+ // replace orig URL with minified URL from cache if so
	141	+ if (!empty($_CachedMinifiedUrl)) {
	142	+ $newTag = str_replace($url, $_CachedMinifiedUrl, $newTag);
	143	+ }
144	144
145		- // remove querystring from URL in newTag
146		- if ( !empty($explUrl[1]) ) {
147		- $newTag = str_replace("?".$explUrl[1],"",$newTag);
148		- }
149		- }
	145	+ // remove querystring from URL in newTag
	146	+ if ( !empty($explUrl[1]) ) {
	147	+ $newTag = str_replace("?".$explUrl[1],"",$newTag);
	148	+ }
	149	+ }
150	150
151		- // should we move the non-aggregated script?
	151	+ // should we move the non-aggregated script?
152	152	if( $this->ismovable($newTag) ) {
153	153	// can be moved, flags and all
154	154	if( $this->movetolast($newTag) ) {
		@@ -261,7 +261,7 @@ discard block
		block discarded – undo
261	261
262	262	//$this->jscode has all the uncompressed code now.
263	263	if ($this->alreadyminified!==true) {
264		- if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
	264	+ if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
265	265	if (@is_callable(array("JSMin","minify"))) {
266	266	$tmp_jscode = trim(JSMin::minify($this->jscode));
267	267	if (!empty($tmp_jscode)) {
		@@ -275,10 +275,10 @@ discard block
		block discarded – undo
275	275	$this->jscode = $this->inject_minified($this->jscode);
276	276	return false;
277	277	}
278		- } else {
279		- $this->jscode = $this->inject_minified($this->jscode);
280		- return false;
281		- }
	278	+ } else {
	279	+ $this->jscode = $this->inject_minified($this->jscode);
	280	+ return false;
	281	+ }
282	282	}
283	283	$this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
284	284	return true;
		@@ -341,8 +341,8 @@ discard block
		block discarded – undo
341	341
342	342	// Checks against the white- and blacklists
343	343	private function ismergeable($tag) {
344		- if (apply_filters('autoptimize_filter_js_dontaggregate',false)) {
345		- return false;
	344	+ if (apply_filters('autoptimize_filter_js_dontaggregate',false)) {
	345	+ return false;
346	346	} else if (!empty($this->whitelist)) {
347	347	foreach ($this->whitelist as $match) {
348	348	if(strpos($tag,$match)!==false) {
		@@ -450,15 +450,15 @@ discard block
		block discarded – undo
450	450	*
451	451	* @param string $jsPath
452	452	* @return bool
453		- */
454		- private function can_inject_late($jsPath) {
455		- $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
	453	+ */
	454	+ private function can_inject_late($jsPath) {
	455	+ $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
456	456	if ( $this->inject_min_late !== true ) {
457	457	// late-inject turned off
458	458	return false;
459	459	} else if ( (strpos($jsPath,"min.js") === false) && ( strpos($jsPath,"wp-includes/js/jquery/jquery.js") === false ) && ( str_replace($consider_minified_array, '', $jsPath) === $jsPath ) ) {
460		- // file not minified based on filename & filter
461		- return false;
	460	+ // file not minified based on filename & filter
	461	+ return false;
462	462	} else {
463	463	// phew, all is safe, we can late-inject
464	464	return true;

		@@ -610,6 +610,9 @@
		block discarded – undo
610	610	return $code;
611	611	}
612	612
	613	+ /**
	614	+ * @param string $tag
	615	+ */
613	616	private function ismovable($tag) {
614	617	if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
615	618	return false;

		@@ -162,32 +162,32 @@ discard block
		block discarded – undo
162	162	// Remove the original style tag
163	163	$this->content = str_replace($tag,'',$this->content);
164	164	} else {
165		- // excluded CSS, minify if getpath
166		- if (preg_match('#<link.href=("\|\')(.)("\|\')#Usmi',$tag,$source)) {
167		- $explUrl = explode('?',$source[2],2);
	165	+ // excluded CSS, minify if getpath
	166	+ if (preg_match('#<link.href=("\|\')(.)("\|\')#Usmi',$tag,$source)) {
	167	+ $explUrl = explode('?',$source[2],2);
168	168	$url = $explUrl[0];
169	169	$path = $this->getpath($url);
170	170
171		- if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
172		- $_CachedMinifiedUrl = $this->minify_single($path);
173		-
174		- if (!empty($_CachedMinifiedUrl)) {
175		- // replace orig URL with URL to cache
176		- $newTag = str_replace($url, $_CachedMinifiedUrl, $tag);
177		- } else {
178		- $newTag = $tag;
179		- }
	171	+ if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
	172	+ $_CachedMinifiedUrl = $this->minify_single($path);
	173	+
	174	+ if (!empty($_CachedMinifiedUrl)) {
	175	+ // replace orig URL with URL to cache
	176	+ $newTag = str_replace($url, $_CachedMinifiedUrl, $tag);
	177	+ } else {
	178	+ $newTag = $tag;
	179	+ }
180	180
181		- // remove querystring from URL
182		- if ( !empty($explUrl[1]) ) {
183		- $newTag = str_replace("?".$explUrl[1],"",$newTag);
184		- }
185		-
186		- // and replace
187		- $this->content = str_replace($tag,$newTag,$this->content);
188		- }
189		- }
190		- }
	181	+ // remove querystring from URL
	182	+ if ( !empty($explUrl[1]) ) {
	183	+ $newTag = str_replace("?".$explUrl[1],"",$newTag);
	184	+ }
	185	+
	186	+ // and replace
	187	+ $this->content = str_replace($tag,$newTag,$this->content);
	188	+ }
	189	+ }
	190	+ }
191	191	}
192	192	return true;
193	193	}
		@@ -404,7 +404,7 @@ discard block
		block discarded – undo
404	404	// just cdn the URL if applicable
405	405	if (!empty($this->cdn_url)) {
406	406	$imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]);
407		- }
	407	+ }
408	408	}
409	409	}
410	410	} else if ((is_array($matches)) && (!empty($this->cdn_url))) {
		@@ -611,8 +611,8 @@ discard block
		block discarded – undo
611	611	}
612	612
613	613	private function ismovable($tag) {
614		- if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
615		- return false;
	614	+ if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
	615	+ return false;
616	616	} else if (!empty($this->whitelist)) {
617	617	foreach ($this->whitelist as $match) {
618	618	if(strpos($tag,$match)!==false) {
		@@ -637,13 +637,13 @@ discard block
		block discarded – undo
637	637	}
638	638
639	639	private function can_inject_late($cssPath,$css) {
640		- $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
	640	+ $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
641	641	if ( $this->inject_min_late !== true ) {
642	642	// late-inject turned off
643	643	return false;
644	644	} else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {
645		- // file not minified based on filename & filter
646		- return false;
	645	+ // file not minified based on filename & filter
	646	+ return false;
647	647	} else if ( strpos($css,"@import") !== false ) {
648	648	// can't late-inject files with imports as those need to be aggregated
649	649	return false;

		@@ -3,7 +3,10 @@
		block discarded – undo
3	3	* below code handles updates and is only included by autoptimize.php if/ when needed
4	4	*/
5	5
6		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
	6	+if ( ! defined( 'ABSPATH' ) ) {
	7	+ exit;
	8	+}
	9	+// Exit if accessed directly
7	10
8	11	$majorUp = false;
9	12	$autoptimize_major_version=substr($autoptimize_db_version,0,3);

futtta / autoptimize

Pull Request — master (#171)

Status

Category

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

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

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

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +60 added lines, -60 removed lines patch added patch discarded remove patch

Doc Comments +10 added lines, -1 removed lines patch added patch discarded remove patch

Braces +13 added lines, -7 removed lines patch added patch discarded remove patch

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

Spacing +79 added lines, -79 removed lines patch added patch discarded remove patch

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

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

Braces +10 added lines, -3 removed lines patch added patch discarded remove patch

Doc Comments +17 added lines patch added patch discarded remove patch

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

Spacing +81 added lines, -81 removed lines patch added patch discarded remove patch

Spacing +73 added lines, -73 removed lines patch added patch discarded remove patch

Braces +10 added lines, -4 removed lines patch added patch discarded remove patch

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

Spacing +115 added lines, -115 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

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

Braces +11 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +189 added lines, -189 removed lines patch added patch discarded remove patch

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

		@@ -3,48 +3,48 @@ discard block
		block discarded – undo
3	3	* below code handles updates and is only included by autoptimize.php if/ when needed
4	4	*/
5	5
6		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
	6	+if (!defined('ABSPATH')) exit; // Exit if accessed directly
7	7
8	8	$majorUp = false;
9		-$autoptimize_major_version=substr($autoptimize_db_version,0,3);
	9	+$autoptimize_major_version = substr($autoptimize_db_version, 0, 3);
10	10
11		-switch($autoptimize_major_version) {
	11	+switch ($autoptimize_major_version) {
12	12	case "1.6":
13	13	// from back in the days when I did not yet consider multisite
14	14	// if user was on version 1.6.x, force advanced options to be shown by default
15		- update_option('autoptimize_show_adv','1');
	15	+ update_option('autoptimize_show_adv', '1');
16	16
17	17	// and remove old options
18		- $to_delete_options=array("autoptimize_cdn_css","autoptimize_cdn_css_url","autoptimize_cdn_js","autoptimize_cdn_js_url","autoptimize_cdn_img","autoptimize_cdn_img_url","autoptimize_css_yui","autoptimize_js_yui");
	18	+ $to_delete_options = array("autoptimize_cdn_css", "autoptimize_cdn_css_url", "autoptimize_cdn_js", "autoptimize_cdn_js_url", "autoptimize_cdn_img", "autoptimize_cdn_img_url", "autoptimize_css_yui", "autoptimize_js_yui");
19	19	foreach ($to_delete_options as $del_opt) {
20		- delete_option( $del_opt );
	20	+ delete_option($del_opt);
21	21	}
22	22	$majorUp = true;
23	23	case "1.7":
24	24	// force 3.8 dashicons in CSS exclude options when upgrading from 1.7 to 1.8
25		- if ( !is_multisite() ) {
	25	+ if (!is_multisite()) {
26	26	$css_exclude = get_option('autoptimize_css_exclude');
27	27	if (empty($css_exclude)) {
28	28	$css_exclude = "admin-bar.min.css, dashicons.min.css";
29		- } else if (strpos($css_exclude,"dashicons.min.css")===false) {
	29	+ } else if (strpos($css_exclude, "dashicons.min.css") === false) {
30	30	$css_exclude .= ", dashicons.min.css";
31	31	}
32		- update_option('autoptimize_css_exclude',$css_exclude);
	32	+ update_option('autoptimize_css_exclude', $css_exclude);
33	33	} else {
34	34	global $wpdb;
35		- $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
	35	+ $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
36	36	$original_blog_id = get_current_blog_id();
37		- foreach ( $blog_ids as $blog_id ) {
38		- switch_to_blog( $blog_id );
	37	+ foreach ($blog_ids as $blog_id) {
	38	+ switch_to_blog($blog_id);
39	39	$css_exclude = get_option('autoptimize_css_exclude');
40	40	if (empty($css_exclude)) {
41	41	$css_exclude = "admin-bar.min.css, dashicons.min.css";
42		- } else if (strpos($css_exclude,"dashicons.min.css")===false) {
	42	+ } else if (strpos($css_exclude, "dashicons.min.css") === false) {
43	43	$css_exclude .= ", dashicons.min.css";
44	44	}
45		- update_option('autoptimize_css_exclude',$css_exclude);
	45	+ update_option('autoptimize_css_exclude', $css_exclude);
46	46	}
47		- switch_to_blog( $original_blog_id );
	47	+ switch_to_blog($original_blog_id);
48	48	}
49	49	$majorUp = true;
50	50	case "1.9":
		@@ -52,53 +52,53 @@ discard block
		block discarded – undo
52	52	* 2.0 will not aggregate inline CSS/JS by default, but we want users
53	53	* upgrading from 1.9 to keep their inline code aggregated by default.
54	54	*/
55		- if ( !is_multisite() ) {
56		- update_option('autoptimize_css_include_inline','on');
57		- update_option('autoptimize_js_include_inline','on');
	55	+ if (!is_multisite()) {
	56	+ update_option('autoptimize_css_include_inline', 'on');
	57	+ update_option('autoptimize_js_include_inline', 'on');
58	58	} else {
59	59	global $wpdb;
60		- $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
	60	+ $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
61	61	$original_blog_id = get_current_blog_id();
62		- foreach ( $blog_ids as $blog_id ) {
63		- switch_to_blog( $blog_id );
64		- update_option('autoptimize_css_include_inline','on');
65		- update_option('autoptimize_js_include_inline','on');
	62	+ foreach ($blog_ids as $blog_id) {
	63	+ switch_to_blog($blog_id);
	64	+ update_option('autoptimize_css_include_inline', 'on');
	65	+ update_option('autoptimize_js_include_inline', 'on');
66	66	}
67		- switch_to_blog( $original_blog_id );
	67	+ switch_to_blog($original_blog_id);
68	68	}
69	69	$majorUp = true;
70	70	case "2.2":
71	71	/*
72	72	* 2.3 has no "remove google fonts" in main screen, moved to "extra"
73	73	*/
74		- if ( !is_multisite() ) {
75		- $_nogooglefont = get_option('autoptimize_css_nogooglefont','');
76		- $_ao_extrasetting = get_option('autoptimize_extra_settings','');
77		- if ( ($_nogooglefont == 1) && ( empty($_ao_extrasetting) ) ) {
78		- $_aoextra_removegfonts = 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"=>"");
79		- update_option( 'autoptimize_extra_settings', $_aoextra_removegfonts );
	74	+ if (!is_multisite()) {
	75	+ $_nogooglefont = get_option('autoptimize_css_nogooglefont', '');
	76	+ $_ao_extrasetting = get_option('autoptimize_extra_settings', '');
	77	+ if (($_nogooglefont == 1) && (empty($_ao_extrasetting))) {
	78	+ $_aoextra_removegfonts = 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"=>"");
	79	+ update_option('autoptimize_extra_settings', $_aoextra_removegfonts);
80	80	}
81	81	delete_option('autoptimize_css_nogooglefont');
82	82	} else {
83	83	global $wpdb;
84		- $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
	84	+ $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
85	85	$original_blog_id = get_current_blog_id();
86		- foreach ( $blog_ids as $blog_id ) {
87		- switch_to_blog( $blog_id );
88		- $_nogooglefont = get_option('autoptimize_css_nogooglefont','');
89		- $_ao_extrasetting = get_option('autoptimize_extra_settings','');
90		- if ( ($_nogooglefont == 1) && ( empty($_ao_extrasetting) ) ) {
91		- $_aoextra_removegfonts = 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"=>"");
92		- update_option( 'autoptimize_extra_settings', $_aoextra_removegfonts );
	86	+ foreach ($blog_ids as $blog_id) {
	87	+ switch_to_blog($blog_id);
	88	+ $_nogooglefont = get_option('autoptimize_css_nogooglefont', '');
	89	+ $_ao_extrasetting = get_option('autoptimize_extra_settings', '');
	90	+ if (($_nogooglefont == 1) && (empty($_ao_extrasetting))) {
	91	+ $_aoextra_removegfonts = 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"=>"");
	92	+ update_option('autoptimize_extra_settings', $_aoextra_removegfonts);
93	93	}
94	94	delete_option('autoptimize_css_nogooglefont');
95	95	}
96		- switch_to_blog( $original_blog_id );
	96	+ switch_to_blog($original_blog_id);
97	97	}
98	98	$majorUp = true;
99	99	}
100	100
101		-if ( $majorUp === true && get_transient('autoptimize_stale_option_buster') == false ) {
	101	+if ($majorUp === true && get_transient('autoptimize_stale_option_buster') == false) {
102	102	// clear cache and notify user to check result if major upgrade
103	103	set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS);
104	104	autoptimizeCache::clearall();