Inspection of "Small cleanup of consider_minified logic (spaces)." - futtta/autoptimize - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( dea3cb...6551bc )

by frank

created 2017-03-30 21:14 UTC

Status

Spacing +4 added lines, -4 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'];
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
             $this->_jsMinifier = $options['jsMinifier'];
         }
         if (isset($options['jsCleanComments'])) {
-            $this->_jsCleanComments = (bool)$options['jsCleanComments'];
+            $this->_jsCleanComments = (bool) $options['jsCleanComments'];
         }
     }
 
@@ -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
@@ -171,7 +171,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;
     }

Please login to merge, or discard this patch.

classes/external/php/minify-html.php 1 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[', ']]>'), '', $str)
+            ? str_replace(array('/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str)
             : $str;
     }
     

Please login to merge, or discard this patch.

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

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

		@@ -245,6 +245,6 @@
		block discarded – undo
245	245	)
246	246	\\s*
247	247	/x', '$1', $m[1]);
248		- return 'font-family:' . $m[1] . $m[2];
	248	+ return 'font-family:'.$m[1].$m[2];
249	249	}
250	250	}

Please login to merge, or discard this patch.

classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php 1 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.

classlesses/autoptimizePartners.php 1 patch

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

@@ -5,20 +5,20 @@  discard block
 block discarded – undo
 
 add_action('admin_init', 'ao_partner_tabs_preinit');
 function ao_partner_tabs_preinit() {
-    if (apply_filters('autoptimize_filter_show_partner_tabs',true)) {
-        add_filter('autoptimize_filter_settingsscreen_tabs','ao_add_partner_tabs');
+    if (apply_filters('autoptimize_filter_show_partner_tabs', true)) {
+        add_filter('autoptimize_filter_settingsscreen_tabs', 'ao_add_partner_tabs');
     }
 }
 
 function ao_add_partner_tabs($in) {
-    $in=array_merge($in,array('ao_partners' => __('Optimize More!','autoptimize')));
+    $in = array_merge($in, array('ao_partners' => __('Optimize More!', 'autoptimize')));
     return $in;
 }
 
-add_action('admin_menu','ao_partners_init');
+add_action('admin_menu', 'ao_partners_init');
 function ao_partners_init() {
-    if (apply_filters('autoptimize_filter_show_partner_tabs',true)) {
-        $hook=add_submenu_page(NULL,'AO partner','AO partner','manage_options','ao_partners','ao_partners');
+    if (apply_filters('autoptimize_filter_show_partner_tabs', true)) {
+        $hook = add_submenu_page(NULL, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', 'ao_partners');
         // register_settings here as well if needed
     }
 }
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
     }    
     </style>
     <div class="wrap">
-        <h1><?php _e('Autoptimize Settings','autoptimize'); ?></h1>
+        <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
         <?php
-            echo '<h2>'. __("These Autoptimize power-ups and related services will improve your site's performance even more!",'autoptimize') . '</h2>';
+            echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>';
         ?>
         <div>
             <?php getAOPartnerFeed(); ?>
@@ -82,32 +82,32 @@  discard block
 block discarded – undo
 }
 
 function getAOPartnerFeed() {
-    $noFeedText=__( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' );
+    $noFeedText = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize');
 
-    if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
-        $rss = fetch_feed( "http://feeds.feedburner.com/OptimizingMattersDownloads" );
+    if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+        $rss = fetch_feed("http://feeds.feedburner.com/OptimizingMattersDownloads");
         $maxitems = 0;
 
-        if ( ! is_wp_error( $rss ) ) {
-            $maxitems = $rss->get_item_quantity( 20 ); 
-            $rss_items = $rss->get_items( 0, $maxitems );
+        if (!is_wp_error($rss)) {
+            $maxitems = $rss->get_item_quantity(20); 
+            $rss_items = $rss->get_items(0, $maxitems);
         } ?>
         <ul>
             <?php
-            if ( $maxitems == 0 ) {
+            if ($maxitems == 0) {
                 echo $noFeedText;
             } else {
-                foreach ( $rss_items as $item ) : 
-                    $itemURL = esc_url( $item->get_permalink() ); ?>
+                foreach ($rss_items as $item) : 
+                    $itemURL = esc_url($item->get_permalink()); ?>
                     <li class="itemDetail">
-                        <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html( $item->get_title() ); ?></a></h3>
+                        <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html($item->get_title()); ?></a></h3>
                         <?php
-                        if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(),"image")!==false) ) {
-                            $itemImgURL=esc_url($enclosure->get_link());
+                        if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(), "image") !== false)) {
+                            $itemImgURL = esc_url($enclosure->get_link());
                             echo "<div class=\"itemImage\"><a href=\"".$itemURL."\" target=\"_blank\"><img src=\"".$itemImgURL."\"/></a></div>";
                         }
                         ?>
-                        <div class="itemDescription"><?php echo wp_kses_post($item -> get_description() ); ?></div>
+                        <div class="itemDescription"><?php echo wp_kses_post($item -> get_description()); ?></div>
                         <div class="itemButtonRow"><div class="itemButton button-secondary"><a href="<?php echo $itemURL; ?>" target="_blank">More info</a></div></div>
                     </li>
                 <?php endforeach; ?>

Please login to merge, or discard this patch.

classes/autoptimizeToolbar.php 1 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.

classes/autoptimizeConfig.php 1 patch

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

Please login to merge, or discard this patch.

classes/autoptimizeScripts.php 1 patch

Spacing +112 added lines, -112 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','blogcatalog.com/w','tweetmeme.com/i','mybloglog.com/','histats.com/js','ads.smowtion.com/ad.js','statcounter.com/counter/counter.js','widgets.amung.us','ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar','intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject','plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize');
-    private $domove = array('gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go');
-    private $domovelast = array('addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/','jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go');
+    private $dontmove = array('document.write', 'html5.js', 'show_ads.js', 'google_ad', 'blogcatalog.com/w', 'tweetmeme.com/i', 'mybloglog.com/', 'histats.com/js', 'ads.smowtion.com/ad.js', 'statcounter.com/counter/counter.js', 'widgets.amung.us', 'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar', 'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject', 'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize');
+    private $domove = array('gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go');
+    private $domovelast = array('addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/', 'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go');
     private $trycatch = false;
     private $alreadyminified = false;
     private $forcehead = true;
@@ -21,70 +21,70 @@  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', "" );
+        $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', "");
         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', '');
+        $removableJS = apply_filters('autoptimize_filter_js_removables', '');
         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 );
-        if ($excludeJS!=="") {
+        $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS);
+        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,37 +211,37 @@  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);
-                    $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;
-                    } else if ((( strpos($script,"min.js") !== false ) || ( strpos($script,"wp-includes/js/jquery/jquery.js") !== false )) && ( $this->inject_min_late === true )) {
-                        $scriptsrc="/*!%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%*/";
+                    $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 (((strpos($script, "min.js") !== false) || (strpos($script, "wp-includes/js/jquery/jquery.js") !== false)) && ($this->inject_min_late === true)) {
+                        $scriptsrc = "/*!%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%*/";
                     }
                     $this->jscode .= "\n".$scriptsrc;
                 }/*else{
@@ -252,24 +252,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);
@@ -284,11 +284,11 @@  discard block
 block discarded – undo
     }
     
     //Caches the JS in uncompressed, deflated and gzipped form.
-    public function cache()    {
-        $cache = new autoptimizeCache($this->md5hash,'js');
-        if(!$cache->check()) {
+    public function cache() {
+        $cache = new autoptimizeCache($this->md5hash, 'js');
+        if (!$cache->check()) {
             //Cache our code
-            $cache->cache($this->jscode,'text/javascript');
+            $cache->cache($this->jscode, 'text/javascript');
         }
         $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         $this->url = $this->url_replace_cdn($this->url);
@@ -297,32 +297,32 @@  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
@@ -340,19 +340,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;
                 }
@@ -362,8 +362,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;
                 }
@@ -376,12 +376,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;
             }
@@ -391,8 +391,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;
             }
@@ -403,8 +403,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;
             }
@@ -430,10 +430,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;

Please login to merge, or discard this patch.

classes/autoptimizeBase.php 1 patch

Spacing +80 added lines, -80 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%%(.*?)%%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%%(.*?)%%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%%(.*?)%%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%%(.*?)%%INJECTLATER%%\*\/#is',
                 create_function(
@@ -342,47 +342,47 @@  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") {
                 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));
                     }
                 }
@@ -392,7 +392,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);
@@ -403,10 +403,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.

		@@ -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'];
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	$this->_jsMinifier = $options['jsMinifier'];
80	80	}
81	81	if (isset($options['jsCleanComments'])) {
82		- $this->_jsCleanComments = (bool)$options['jsCleanComments'];
	82	+ $this->_jsCleanComments = (bool) $options['jsCleanComments'];
83	83	}
84	84	}
85	85
		@@ -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
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171
172	172	protected function _reservePlace($content)
173	173	{
174		- $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';
	174	+ $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%';
175	175	$this->_placeholders[$placeholder] = $content;
176	176	return $placeholder;
177	177	}

		@@ -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

		@@ -5,20 +5,20 @@ discard block
		block discarded – undo
5	5
6	6	add_action('admin_init', 'ao_partner_tabs_preinit');
7	7	function ao_partner_tabs_preinit() {
8		- if (apply_filters('autoptimize_filter_show_partner_tabs',true)) {
9		- add_filter('autoptimize_filter_settingsscreen_tabs','ao_add_partner_tabs');
	8	+ if (apply_filters('autoptimize_filter_show_partner_tabs', true)) {
	9	+ add_filter('autoptimize_filter_settingsscreen_tabs', 'ao_add_partner_tabs');
10	10	}
11	11	}
12	12
13	13	function ao_add_partner_tabs($in) {
14		- $in=array_merge($in,array('ao_partners' => __('Optimize More!','autoptimize')));
	14	+ $in = array_merge($in, array('ao_partners' => __('Optimize More!', 'autoptimize')));
15	15	return $in;
16	16	}
17	17
18		-add_action('admin_menu','ao_partners_init');
	18	+add_action('admin_menu', 'ao_partners_init');
19	19	function ao_partners_init() {
20		- if (apply_filters('autoptimize_filter_show_partner_tabs',true)) {
21		- $hook=add_submenu_page(NULL,'AO partner','AO partner','manage_options','ao_partners','ao_partners');
	20	+ if (apply_filters('autoptimize_filter_show_partner_tabs', true)) {
	21	+ $hook = add_submenu_page(NULL, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', 'ao_partners');
22	22	// register_settings here as well if needed
23	23	}
24	24	}
		@@ -69,10 +69,10 @@ discard block
		block discarded – undo
69	69	}
70	70	</style>
71	71	<div class="wrap">
72		- <h1><?php _e('Autoptimize Settings','autoptimize'); ?></h1>
	72	+ <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
73	73	<?php echo autoptimizeConfig::ao_admin_tabs(); ?>
74	74	<?php
75		- echo '<h2>'. __("These Autoptimize power-ups and related services will improve your site's performance even more!",'autoptimize') . '</h2>';
	75	+ echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>';
76	76	?>
77	77	<div>
78	78	<?php getAOPartnerFeed(); ?>
		@@ -82,32 +82,32 @@ discard block
		block discarded – undo
82	82	}
83	83
84	84	function getAOPartnerFeed() {
85		- $noFeedText=__( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' );
	85	+ $noFeedText = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize');
86	86
87		- if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
88		- $rss = fetch_feed( "http://feeds.feedburner.com/OptimizingMattersDownloads" );
	87	+ if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
	88	+ $rss = fetch_feed("http://feeds.feedburner.com/OptimizingMattersDownloads");
89	89	$maxitems = 0;
90	90
91		- if ( ! is_wp_error( $rss ) ) {
92		- $maxitems = $rss->get_item_quantity( 20 );
93		- $rss_items = $rss->get_items( 0, $maxitems );
	91	+ if (!is_wp_error($rss)) {
	92	+ $maxitems = $rss->get_item_quantity(20);
	93	+ $rss_items = $rss->get_items(0, $maxitems);
94	94	} ?>
95	95	<ul>
96	96	<?php
97		- if ( $maxitems == 0 ) {
	97	+ if ($maxitems == 0) {
98	98	echo $noFeedText;
99	99	} else {
100		- foreach ( $rss_items as $item ) :
101		- $itemURL = esc_url( $item->get_permalink() ); ?>
	100	+ foreach ($rss_items as $item) :
	101	+ $itemURL = esc_url($item->get_permalink()); ?>
102	102	<li class="itemDetail">
103		- <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html( $item->get_title() ); ?></a></h3>
	103	+ <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html($item->get_title()); ?></a></h3>
104	104	<?php
105		- if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(),"image")!==false) ) {
106		- $itemImgURL=esc_url($enclosure->get_link());
	105	+ if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(), "image") !== false)) {
	106	+ $itemImgURL = esc_url($enclosure->get_link());
107	107	echo "<div class=\"itemImage\"><a href=\"".$itemURL."\" target=\"_blank\"><img src=\"".$itemImgURL."\"/></a></div>";
108	108	}
109	109	?>
110		- <div class="itemDescription"><?php echo wp_kses_post($item -> get_description() ); ?></div>
	110	+ <div class="itemDescription"><?php echo wp_kses_post($item -> get_description()); ?></div>
111	111	<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="<?php echo $itemURL; ?>" target="_blank">More info</a></div></div>
112	112	</li>
113	113	<?php endforeach; ?>

		@@ -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,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%%(.*?)%%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%%(.*?)%%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%%(.*?)%%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%%(.?)%%INJECTLATER%%\*\/#is',
303	303	create_function(
		@@ -342,47 +342,47 @@ discard block
		block discarded – undo
342	342
343	343	protected function minify_single($pathIn) {
344	344	// determine JS or CSS and set var (also mimetype), return false if neither
345		- if ( $this->str_ends_in($pathIn,".js") === true ) {
346		- $codeType="js";
347		- $codeMime="text/javascript";
348		- } else if ( $this->str_ends_in($pathIn,".css") === true ) {
349		- $codeType="css";
350		- $codeMime="text/css";
	345	+ if ($this->str_ends_in($pathIn, ".js") === true) {
	346	+ $codeType = "js";
	347	+ $codeMime = "text/javascript";
	348	+ } else if ($this->str_ends_in($pathIn, ".css") === true) {
	349	+ $codeType = "css";
	350	+ $codeMime = "text/css";
351	351	} else {
352	352	return false;
353	353	}
354	354
355	355	// if min.js or min.css return false
356		- 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 ) ) {
	356	+ 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)) {
357	357	return false;
358	358	}
359	359
360	360	// read file, return false if empty
361	361	$_toMinify = file_get_contents($pathIn);
362		- if ( empty($_toMinify) ) return false;
	362	+ if (empty($_toMinify)) return false;
363	363
364	364	// check cache
365	365	$_md5hash = "single_".md5($_toMinify);
366		- $_cache = new autoptimizeCache($_md5hash,$codeType);
367		- if ($_cache->check() ) {
	366	+ $_cache = new autoptimizeCache($_md5hash, $codeType);
	367	+ if ($_cache->check()) {
368	368	$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
369	369	} else {
370	370	// if not in cache first minify
371	371	$_Minified = $_toMinify;
372	372	if ($codeType === "js") {
373		- if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
374		- if (@is_callable(array("JSMin","minify"))) {
	373	+ if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) {
	374	+ if (@is_callable(array("JSMin", "minify"))) {
375	375	$tmp_code = trim(JSMin::minify($_toMinify));
376	376	}
377	377	}
378	378	} else if ($codeType === "css") {
379	379	if (class_exists('Minify_CSS_Compressor')) {
380	380	$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
381		- } else if(class_exists('CSSmin')) {
	381	+ } else if (class_exists('CSSmin')) {
382	382	$cssmin = new CSSmin();
383		- if (method_exists($cssmin,"run")) {
	383	+ if (method_exists($cssmin, "run")) {
384	384	$tmp_code = trim($cssmin->run($_toMinify));
385		- } elseif (@is_callable(array($cssmin,"minify"))) {
	385	+ } elseif (@is_callable(array($cssmin, "minify"))) {
386	386	$tmp_code = trim(CssMin::minify($_toMinify));
387	387	}
388	388	}
		@@ -392,7 +392,7 @@ discard block
		block discarded – undo
392	392	unset($tmp_code);
393	393	}
394	394	// and then cache
395		- $_cache->cache($_Minified,$codeMime);
	395	+ $_cache->cache($_Minified, $codeMime);
396	396	$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
397	397	}
398	398	unset($_cache);
		@@ -403,10 +403,10 @@ discard block
		block discarded – undo
403	403	return $_CachedMinifiedUrl;
404	404	}
405	405
406		- protected function str_ends_in($haystack,$needle) {
	406	+ protected function str_ends_in($haystack, $needle) {
407	407	$needleLength = strlen($needle);
408	408	$haystackLength = strlen($haystack);
409		- $lastPos=strrpos($haystack,$needle);
	409	+ $lastPos = strrpos($haystack, $needle);
410	410	if ($lastPos === $haystackLength - $needleLength) {
411	411	return true;
412	412	} else {

futtta / autoptimize

Push — master ( dea3cb...6551bc )

Status

Category

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

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

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

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

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

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

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

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

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