Inspection of "Update to latest version of YUI CSS compressor PHP..." - futtta/autoptimize - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 303039...b36263 )

by frank

created 2017-03-30 09:52 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.php 1 patch

Spacing +56 added lines, -56 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);
         }
 
 
@@ -300,7 +300,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);
@@ -373,20 +373,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);
@@ -400,7 +400,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;
                 }
             }
@@ -408,7 +408,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);
         }
 
         // Trim the final string (for any leading or trailing white spaces)
@@ -448,7 +448,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
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
                 $token = preg_replace('/\s+/', '', $token);
                 $this->preserved_tokens[] = $token;
 
-                $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
+                $preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)';
                 $sb[] = $preserver;
 
                 $append_index = $end_index + 1;
@@ -530,16 +530,16 @@  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;
@@ -568,7 +568,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);
             }
         }
 
@@ -576,7 +576,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)
@@ -587,27 +587,27 @@  discard block
 block discarded – undo
     private function replace_calc($matches)
     {
         $this->preserved_tokens[] = trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2]));
-        return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
+        return 'calc('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
     }
 
 	private function preserve_old_IE_specific_matrix_definition($matches)
 	{
 		$this->preserved_tokens[] = $matches[1];
-		return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
+		return 'filter:progid:DXImageTransform.Microsoft.Matrix('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
     }
 
 	private function replace_keyframe_zero($matches)
     {
-        return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3];
+        return $matches[1].preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]).$matches[3];
     }
 
     private function rgb_to_hex($matches)
     {
         // Support for percentage values rgb(100%, 0%, 45%);
-        if ($this->index_of($matches[1], '%') >= 0){
+        if ($this->index_of($matches[1], '%') >= 0) {
             $rgbcolors = explode(',', str_replace('%', '', $matches[1]));
             for ($i = 0; $i < count($rgbcolors); $i++) {
-                $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
+                $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i])*2.55);
             }
         } else {
             $rgbcolors = explode(',', $matches[1]);
@@ -620,11 +620,11 @@  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)
@@ -635,18 +635,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]));
@@ -654,27 +654,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)
@@ -689,9 +689,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;
     }
 
@@ -766,9 +766,9 @@  discard block
 block discarded – undo
     {
         if (is_string($size)) {
             switch (substr($size, -1)) {
-                case 'M': case 'm': return $size * 1048576;
-                case 'K': case 'k': return $size * 1024;
-                case 'G': case 'g': return $size * 1073741824;
+                case 'M': case 'm': return $size*1048576;
+                case 'K': case 'k': return $size*1024;
+                case 'G': case 'g': return $size*1073741824;
             }
         }
 

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/autoptimizeStyles.php 1 patch

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

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeStyles extends autoptimizeBase {
 
@@ -23,12 +23,12 @@  discard block
 block discarded – undo
 
     //Reads the page and collects style tags
     public function read($options) {
-        $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );
+        $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
         if ($noptimizeCSS) return false;
 
-        $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '' );
+        $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '');
         if (!empty($whitelistCSS)) {
-            $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));
+            $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));
         }
         
         if ($options['nogooglefont'] == true) {
@@ -36,33 +36,33 @@  discard block
 block discarded – undo
         } else {
             $removableCSS = "";
         }
-        $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS);
+        $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);
         if (!empty($removableCSS)) {
-            $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
+            $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
         }
 
-        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
+        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
 
         // filter to "late inject minified CSS", default to true for now (it is faster)
-        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
+        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
 
         // Remove everything that's not the header
-        if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
-            $content = explode('</head>',$this->content,2);
+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
+            $content = explode('</head>', $this->content, 2);
             $this->content = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
 
         // include inline?
-        if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
             $this->include_inline = true;
         }
         
         // what CSS shouldn't be autoptimized
         $excludeCSS = $options['css_exclude'];
-        $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS );
-        if ($excludeCSS!=="") {
-            $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
+        $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS);
+        if ($excludeCSS !== "") {
+            $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
         } else {
             $this->dontmove = "";
         }
@@ -70,17 +70,17 @@  discard block
 block discarded – undo
         // should we defer css?
         // value: true/ false
         $this->defer = $options['defer'];
-        $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer );
+        $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer);
 
         // should we inline while deferring?
         // value: inlined CSS
         $this->defer_inline = $options['defer_inline'];
-        $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline );
+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline);
 
         // should we inline?
         // value: true/ false
         $this->inline = $options['inline'];
-        $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline );
+        $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline);
         
         // get cdn url
         $this->cdn_url = $options['cdn_url'];
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
         $this->content = $this->hide_noptimize($this->content);
         
         // exclude (no)script, as those may contain CSS which should be left as is
-        if ( strpos( $this->content, '<script' ) !== false ) { 
+        if (strpos($this->content, '<script') !== false) { 
             $this->content = preg_replace_callback(
                 '#<(?:no)?script.*?<\/(?:no)?script>#is',
                 create_function(
@@ -110,65 +110,65 @@  discard block
 block discarded – undo
         $this->content = $this->hide_comments($this->content);
         
         // Get <style> and <link>
-        if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {
-            foreach($matches[0] as $tag) {
-                if ($this->isremovable($tag,$this->cssremovables)) {
-                    $this->content = str_replace($tag,'',$this->content);
+        if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
+            foreach ($matches[0] as $tag) {
+                if ($this->isremovable($tag, $this->cssremovables)) {
+                    $this->content = str_replace($tag, '', $this->content);
                 } else if ($this->ismovable($tag)) {
                     // Get the media
-                    if(strpos($tag,'media=')!==false) {
-                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);
-                        $medias = explode(',',$medias[1]);
+                    if (strpos($tag, 'media=') !== false) {
+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
+                        $medias = explode(',', $medias[1]);
                         $media = array();
-                        foreach($medias as $elem) {
-                            if (empty($elem)) { $elem="all"; }
+                        foreach ($medias as $elem) {
+                            if (empty($elem)) { $elem = "all"; }
                             $media[] = $elem;
                         }
                     } else {
                         // No media specified - applies to all
                         $media = array('all');
                     }
-                    $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag );
+                    $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
                 
-                    if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
                         // <link>
-                        $explUrl = explode('?',$source[2],2);
+                        $explUrl = explode('?', $source[2], 2);
                         $url = $explUrl[0];
                         $path = $this->getpath($url);
                         
-                        if($path!==false && preg_match('#\.css$#',$path)) {
+                        if ($path !== false && preg_match('#\.css$#', $path)) {
                             // Good link
-                            $this->css[] = array($media,$path);
-                        }else{
+                            $this->css[] = array($media, $path);
+                        } else {
                             // Link is dynamic (.php etc)
                             $tag = '';
                         }
                     } else {
                         // inline css in style tags can be wrapped in comment tags, so restore comments
                         $tag = $this->restore_comments($tag);
-                        preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
+                        preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
 
                         // and re-hide them to be able to to the removal based on tag
                         $tag = $this->hide_comments($tag);
 
-                        if ( $this->include_inline ) {
-                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
-                            $this->css[] = array($media,'INLINE;'.$code);
+                        if ($this->include_inline) {
+                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
+                            $this->css[] = array($media, 'INLINE;'.$code);
                         } else {
                             $tag = '';
                         }
                     }
                     
                     // Remove the original style tag
-                    $this->content = str_replace($tag,'',$this->content);
+                    $this->content = str_replace($tag, '', $this->content);
                 } else {
 					// excluded CSS, minify if getpath 
-					if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
-						$explUrl = explode('?',$source[2],2);
+					if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
+						$explUrl = explode('?', $source[2], 2);
                         $url = $explUrl[0];
                         $path = $this->getpath($url);
  					
-						if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
+						if ($path && apply_filters('autoptimize_filter_css_minify_excluded', false)) {
 							$_CachedMinifiedUrl = $this->minify_single($path);
 
 							if (!empty($_CachedMinifiedUrl)) {
@@ -179,12 +179,12 @@  discard block
 block discarded – undo
 							}
 							
 							// remove querystring from URL
-							if ( !empty($explUrl[1]) ) {
-								$newTag = str_replace("?".$explUrl[1],"",$newTag);
+							if (!empty($explUrl[1])) {
+								$newTag = str_replace("?".$explUrl[1], "", $newTag);
 							}
 
 							// and replace
-							$this->content = str_replace($tag,$newTag,$this->content);
+							$this->content = str_replace($tag, $newTag, $this->content);
 						}
 					}					
 				}
@@ -197,29 +197,29 @@  discard block
 block discarded – undo
     
     // Joins and optimizes CSS
     public function minify() {
-        foreach($this->css as $group) {
-            list($media,$css) = $group;
-            if(preg_match('#^INLINE;#',$css)) {
+        foreach ($this->css as $group) {
+            list($media, $css) = $group;
+            if (preg_match('#^INLINE;#', $css)) {
                 // <style>
-                $css = preg_replace('#^INLINE;#','',$css);
-                $css = $this->fixurls(ABSPATH.'/index.php',$css);
-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" );
-                if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
-                    $css=$tmpstyle;
-                    $this->alreadyminified=true;
+                $css = preg_replace('#^INLINE;#', '', $css);
+                $css = $this->fixurls(ABSPATH.'/index.php', $css);
+                $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
+                if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
+                    $css = $tmpstyle;
+                    $this->alreadyminified = true;
                 }
             } else {
                 //<link>
-                if($css !== false && file_exists($css) && is_readable($css)) {
+                if ($css !== false && file_exists($css) && is_readable($css)) {
                     $cssPath = $css;
-                    $css = $this->fixurls($cssPath,file_get_contents($cssPath));
-                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);
-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath );
+                    $css = $this->fixurls($cssPath, file_get_contents($cssPath));
+                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
                     if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
-                        $css=$tmpstyle;
-                        $this->alreadyminified=true;
-                    } else if ($this->can_inject_late($cssPath,$css)) {
-                        $css="/*!%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%*/";
+                        $css = $tmpstyle;
+                        $this->alreadyminified = true;
+                    } else if ($this->can_inject_late($cssPath, $css)) {
+                        $css = "/*!%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%*/";
                     }
                 } else {
                     // Couldn't read CSS. Maybe getpath isn't working?
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
                 }
             }
             
-            foreach($media as $elem) {
-                if(!isset($this->csscode[$elem]))
+            foreach ($media as $elem) {
+                if (!isset($this->csscode[$elem]))
                     $this->csscode[$elem] = '';
                 $this->csscode[$elem] .= "\n/*FILESTART*/".$css;
             }
@@ -237,12 +237,12 @@  discard block
 block discarded – undo
         // Check for duplicate code
         $md5list = array();
         $tmpcss = $this->csscode;
-        foreach($tmpcss as $media => $code) {
+        foreach ($tmpcss as $media => $code) {
             $md5sum = md5($code);
             $medianame = $media;
-            foreach($md5list as $med => $sum) {
+            foreach ($md5list as $med => $sum) {
                 // If same code
-                if($sum === $md5sum) {
+                if ($sum === $md5sum) {
                     //Add the merged code
                     $medianame = $med.', '.$media;
                     $this->csscode[$medianame] = $code;
@@ -262,30 +262,30 @@  discard block
 block discarded – undo
             $external_imports = "";
 
             // remove comments to avoid importing commented-out imports
-            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us','',$thiscss);
+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
 
-            while(preg_match_all('#@import.*(?:;|$)#Um',$thiscss_nocomments,$matches)) {
-                foreach($matches[0] as $import)    {
-                    if ($this->isremovable($import,$this->cssremovables)) {
-                        $thiscss = str_replace($import,'',$thiscss);
+            while (preg_match_all('#@import.*(?:;|$)#Um', $thiscss_nocomments, $matches)) {
+                foreach ($matches[0] as $import) {
+                    if ($this->isremovable($import, $this->cssremovables)) {
+                        $thiscss = str_replace($import, '', $thiscss);
                         $import_ok = true;
                     } else {
-                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");
+                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
                         $path = $this->getpath($url);
                         $import_ok = false;
                         if (file_exists($path) && is_readable($path)) {
-                            $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\");
-                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);
-                            $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" );
-                            if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
-                                $code=$tmpstyle;
-                                $this->alreadyminified=true;
-                            } else if ($this->can_inject_late($path,$code)) {
-                                $code="/*!%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/";
+                            $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\");
+                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
+                            $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");
+                            if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
+                                $code = $tmpstyle;
+                                $this->alreadyminified = true;
+                            } else if ($this->can_inject_late($path, $code)) {
+                                $code = "/*!%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/";
                             }
                             
-                            if(!empty($code)) {
-                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);
+                            if (!empty($code)) {
+                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
                                 if (!empty($tmp_thiscss)) {
                                     $thiscss = $tmp_thiscss;
                                     $import_ok = true;
@@ -299,31 +299,31 @@  discard block
 block discarded – undo
                     if (!$import_ok) {
                         // external imports and general fall-back
                         $external_imports .= $import;
-                        $thiscss = str_replace($import,'',$thiscss);
+                        $thiscss = str_replace($import, '', $thiscss);
                         $fiximports = true;
                     }
                 }
-                $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);
-                $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);
+                $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
+                $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
                 
                 // and update $thiscss_nocomments before going into next iteration in while loop
-                $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
+                $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
             }
             unset($thiscss_nocomments);
             
             // add external imports to top of aggregated CSS
-            if($fiximports) {
-                $thiscss=$external_imports.$thiscss;
+            if ($fiximports) {
+                $thiscss = $external_imports.$thiscss;
             }
         }
         unset($thiscss);
         
         // $this->csscode has all the uncompressed code now. 
-        foreach($this->csscode as &$code) {
+        foreach ($this->csscode as &$code) {
             // Check for already-minified code
             $hash = md5($code);
-            $ccheck = new autoptimizeCache($hash,'css');
-            if($ccheck->check()) {
+            $ccheck = new autoptimizeCache($hash, 'css');
+            if ($ccheck->check()) {
                 $code = $ccheck->retrieve();
                 $this->hashmap[md5($code)] = $hash;
                 continue;
@@ -332,44 +332,44 @@  discard block
 block discarded – undo
 
             // Do the imaging!
             $imgreplace = array();
-            preg_match_all( self::ASSETS_REGEX, $code, $matches );
+            preg_match_all(self::ASSETS_REGEX, $code, $matches);
 
-            if ( ($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)) ) {
-                foreach($matches[1] as $count => $quotedurl) {
-                    $iurl = trim($quotedurl," \t\n\r\0\x0B\"'");
+            if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
+                foreach ($matches[1] as $count => $quotedurl) {
+                    $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'");
 
                     // if querystring, remove it from url
-                    if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
+                    if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
                     
                     $ipath = $this->getpath($iurl);
 
                     $datauri_max_size = 4096;
-                    $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size );
-                    $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', "");
+                    $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
+                    $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
                     if (!empty($datauri_exclude)) {
-                        $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
+                        $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
                         foreach ($no_datauris as $no_datauri) {
-                            if (strpos($iurl,$no_datauri)!==false) {
-                                $ipath=false;
+                            if (strpos($iurl, $no_datauri) !== false) {
+                                $ipath = false;
                                 break;
                             }
                         }
                     }
 
-                    if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
-                        $ihash=md5($ipath);
-                        $icheck = new autoptimizeCache($ihash,'img');
-                        if($icheck->check()) {
+                    if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
+                        $ihash = md5($ipath);
+                        $icheck = new autoptimizeCache($ihash, 'img');
+                        if ($icheck->check()) {
                             // we have the base64 image in cache
-                            $headAndData=$icheck->retrieve();
-                            $_base64data=explode(";base64,",$headAndData);
-                            $base64data=$_base64data[1];
+                            $headAndData = $icheck->retrieve();
+                            $_base64data = explode(";base64,", $headAndData);
+                            $base64data = $_base64data[1];
                         } else {
                             // It's an image and we don't have it in cache, get the type
-                            $explA=explode('.',$ipath);
-                            $type=end($explA);
+                            $explA = explode('.', $ipath);
+                            $type = end($explA);
 
-                            switch($type) {
+                            switch ($type) {
                                 case 'jpeg':
                                     $dataurihead = 'data:image/jpeg;base64,';
                                     break;
@@ -391,42 +391,42 @@  discard block
 block discarded – undo
                         
                             // Encode the data
                             $base64data = base64_encode(file_get_contents($ipath));
-                            $headAndData=$dataurihead.$base64data;
+                            $headAndData = $dataurihead.$base64data;
 
                             // Save in cache
-                            $icheck->cache($headAndData,"text/plain");
+                            $icheck->cache($headAndData, "text/plain");
                         }
                         unset($icheck);
 
                         // Add it to the list for replacement
-                        $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]);
+                        $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]);
                     } else {
                         // just cdn the URL if applicable
                         if (!empty($this->cdn_url)) {
-                            $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]);
+                            $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]);
 						}
                     }
                 }
             } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
                 // change urls to cdn-url
-                foreach($matches[1] as $count => $quotedurl) {
-                    $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]);
+                foreach ($matches[1] as $count => $quotedurl) {
+                    $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]);
                 }
             }
             
-            if(!empty($imgreplace)) {
-                $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code);
+            if (!empty($imgreplace)) {
+                $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code);
             }
             
             // Minify
-            if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
+            if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
                 if (class_exists('Minify_CSS_Compressor')) {
                     $tmp_code = trim(Minify_CSS_Compressor::process($code));
-                } else if(class_exists('CSSmin')) {
+                } else if (class_exists('CSSmin')) {
                     $cssmin = new CSSmin();
-                    if (method_exists($cssmin,"run")) {
+                    if (method_exists($cssmin, "run")) {
                         $tmp_code = trim($cssmin->run($code));
-                    } elseif (@is_callable(array($cssmin,"minify"))) {
+                    } elseif (@is_callable(array($cssmin, "minify"))) {
                         $tmp_code = trim(CssMin::minify($code));
                     }
                 }
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
             
             $code = $this->inject_minified($code);
             
-            $tmp_code = apply_filters( 'autoptimize_css_after_minify',$code );
+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
             if (!empty($tmp_code)) {
                 $code = $tmp_code;
                 unset($tmp_code);
@@ -453,13 +453,13 @@  discard block
 block discarded – undo
     //Caches the CSS in uncompressed, deflated and gzipped form.
     public function cache() {
         // CSS cache
-        foreach($this->csscode as $media => $code) {
+        foreach ($this->csscode as $media => $code) {
             $md5 = $this->hashmap[md5($code)];
                 
-            $cache = new autoptimizeCache($md5,'css');
-            if(!$cache->check()) {
+            $cache = new autoptimizeCache($md5, 'css');
+            if (!$cache->check()) {
                 // Cache our code
-                $cache->cache($code,'text/css');
+                $cache->cache($code, 'text/css');
             }
             $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         }
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
         $this->content = $this->restore_comments($this->content);
         
         // restore (no)script
-        if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) { 
+        if (strpos($this->content, '%%SCRIPT%%') !== false) { 
             $this->content = preg_replace_callback(
                 '#%%SCRIPT%%(.*?)%%SCRIPT%%#is',
                 create_function(
@@ -489,74 +489,74 @@  discard block
 block discarded – undo
         $this->content = $this->restore_noptimize($this->content);
         
         //Restore the full content
-        if(!empty($this->restofcontent)) {
+        if (!empty($this->restofcontent)) {
             $this->content .= $this->restofcontent;
             $this->restofcontent = '';
         }
         
         // Inject the new stylesheets
-        $replaceTag = array("<title","before");
-        $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag );
+        $replaceTag = array("<title", "before");
+        $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag);
 
         if ($this->inline == true) {
-            foreach($this->csscode as $media => $code) {
-                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
+            foreach ($this->csscode as $media => $code) {
+                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
             }
         } else {
             if ($this->defer == true) {
                 $preloadCssBlock = "";
                 $noScriptCssBlock = "<noscript id=\"aonoscrcss\">";
-                $defer_inline_code=$this->defer_inline;
-                if(!empty($defer_inline_code)){
-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify',true ) ) {
-                        $iCssHash=md5($defer_inline_code);
-                        $iCssCache = new autoptimizeCache($iCssHash,'css');
-                        if($iCssCache->check()) { 
+                $defer_inline_code = $this->defer_inline;
+                if (!empty($defer_inline_code)) {
+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
+                        $iCssHash = md5($defer_inline_code);
+                        $iCssCache = new autoptimizeCache($iCssHash, 'css');
+                        if ($iCssCache->check()) { 
                             // we have the optimized inline CSS in cache
-                            $defer_inline_code=$iCssCache->retrieve();
+                            $defer_inline_code = $iCssCache->retrieve();
                         } else {
                             if (class_exists('Minify_CSS_Compressor')) {
                                 $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code));
-                            } else if(class_exists('CSSmin')) {
+                            } else if (class_exists('CSSmin')) {
                                 $cssmin = new CSSmin();
                                 $tmp_code = trim($cssmin->run($defer_inline_code));
                             }
                             if (!empty($tmp_code)) {
                                 $defer_inline_code = $tmp_code;
-                                $iCssCache->cache($defer_inline_code,"text/css");
+                                $iCssCache->cache($defer_inline_code, "text/css");
                                 unset($tmp_code);
                             }
                         }
                     }
-                    $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
-                    $this->inject_in_html($code_out,$replaceTag);
+                    $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
+                    $this->inject_in_html($code_out, $replaceTag);
                 }
             }
 
-            foreach($this->url as $media => $url) {
+            foreach ($this->url as $media => $url) {
                 $url = $this->url_replace_cdn($url);
                 
                 //Add the stylesheet either deferred (import at bottom) or normal links in head
-                if($this->defer == true) {
+                if ($this->defer == true) {
                     $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="this.rel=\'stylesheet\'" />';
                     $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />';
                 } else {
                     if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
-                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
-                    } else if (strlen($this->csscode[$media])>0) {
-                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
+                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
+                    } else if (strlen($this->csscode[$media]) > 0) {
+                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
                     }
                 }
             }
             
-            if($this->defer == true) {
+            if ($this->defer == true) {
                 $preloadPolyfill = '<script data-cfasync=\'false\'>/*! loadCSS. [c]2017 Filament Group, Inc. MIT License */
 !function(a){"use strict";var b=function(b,c,d){function e(a){return h.body?a():void setTimeout(function(){e(a)})}function f(){i.addEventListener&&i.removeEventListener("load",f),i.media=d||"all"}var g,h=a.document,i=h.createElement("link");if(c)g=c;else{var j=(h.body||h.getElementsByTagName("head")[0]).childNodes;g=j[j.length-1]}var k=h.styleSheets;i.rel="stylesheet",i.href=b,i.media="only x",e(function(){g.parentNode.insertBefore(i,c?g:g.nextSibling)});var l=function(a){for(var b=i.href,c=k.length;c--;)if(k[c].href===b)return a();setTimeout(function(){l(a)})};return i.addEventListener&&i.addEventListener("load",f),i.onloadcssdefined=l,l(f),i};"undefined"!=typeof exports?exports.loadCSS=b:a.loadCSS=b}("undefined"!=typeof global?global:this);
 /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */
 !function(a){if(a.loadCSS){var b=loadCSS.relpreload={};if(b.support=function(){try{return a.document.createElement("link").relList.supports("preload")}catch(b){return!1}},b.poly=function(){for(var b=a.document.getElementsByTagName("link"),c=0;c<b.length;c++){var d=b[c];"preload"===d.rel&&"style"===d.getAttribute("as")&&(a.loadCSS(d.href,d,d.getAttribute("media")),d.rel=null)}},!b.support()){b.poly();var c=a.setInterval(b.poly,300);a.addEventListener&&a.addEventListener("load",function(){b.poly(),a.clearInterval(c)}),a.attachEvent&&a.attachEvent("onload",function(){a.clearInterval(c)})}}}(this);</script>';
                 $noScriptCssBlock .= "</noscript>";
-                $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag);
-                $this->inject_in_html($preloadPolyfill,array('</body>','before'));
+                $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag);
+                $this->inject_in_html($preloadPolyfill, array('</body>', 'before'));
             }
         }
 
@@ -564,38 +564,38 @@  discard block
 block discarded – undo
         return $this->content;
     }
     
-    static function fixurls($file,$code) {
-        $file = str_replace(WP_ROOT_DIR,'',$file);
-        $file = str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',$file);
+    static function fixurls($file, $code) {
+        $file = str_replace(WP_ROOT_DIR, '', $file);
+        $file = str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', $file);
         $dir = dirname($file); // Like /themes/expound/css
 
         // switch all imports to the url() syntax
-        $code=preg_replace('#@import ("|\')(.+?)\.css.*("|\')#','@import url("${2}.css")',$code);
+        $code = preg_replace('#@import ("|\')(.+?)\.css.*("|\')#', '@import url("${2}.css")', $code);
 
-        if( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
             $replace = array();
-            foreach($matches[1] as $k => $url) {
+            foreach ($matches[1] as $k => $url) {
                 // Remove quotes
-                $url = trim($url," \t\n\r\0\x0B\"'");
-                $noQurl = trim($url,"\"'");
+                $url = trim($url, " \t\n\r\0\x0B\"'");
+                $noQurl = trim($url, "\"'");
                 
                 if ($noQurl === '') { continue; }
                 
-                if ($url!==$noQurl) {
-                    $removedQuotes=true;
+                if ($url !== $noQurl) {
+                    $removedQuotes = true;
                 } else {
-                    $removedQuotes=false;
+                    $removedQuotes = false;
                 }
-                $url=$noQurl;
-                if(substr($url,0,1)=='/' || preg_match('#^(https?://|ftp://|data:)#i',$url)) {
+                $url = $noQurl;
+                if (substr($url, 0, 1) == '/' || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
                     //URL is absolute
                     continue;
                 } else {
                     // relative URL
-                    $newurl = preg_replace('/https?:/','',str_replace(" ","%20",AUTOPTIMIZE_WP_CONTENT_URL.str_replace('//','/',$dir.'/'.$url)));
+                    $newurl = preg_replace('/https?:/', '', str_replace(" ", "%20", AUTOPTIMIZE_WP_CONTENT_URL.str_replace('//', '/', $dir.'/'.$url)));
 
                     $hash = md5($url);
-                    $code = str_replace($matches[0][$k],$hash,$code);
+                    $code = str_replace($matches[0][$k], $hash, $code);
 
                     if (!empty($removedQuotes)) {
                         $replace[$hash] = 'url(\''.$newurl.'\')'.$matches[2][$k];
@@ -605,17 +605,17 @@  discard block
 block discarded – undo
                 }
             }    
             //Do the replacing here to avoid breaking URLs
-            $code = str_replace(array_keys($replace),array_values($replace),$code);
+            $code = str_replace(array_keys($replace), array_values($replace), $code);
         }    
         return $code;
     }
     
     private function ismovable($tag) {
-		if (apply_filters('autoptimize_filter_css_dontaggregate',false)) {
+		if (apply_filters('autoptimize_filter_css_dontaggregate', false)) {
 			return false;
         } else if (!empty($this->whitelist)) {
             foreach ($this->whitelist as $match) {
-                if(strpos($tag,$match)!==false) {
+                if (strpos($tag, $match) !== false) {
                     return true;
                 }
             }
@@ -623,8 +623,8 @@  discard block
 block discarded – undo
             return false;
         } else {
             if (is_array($this->dontmove)) {
-                foreach($this->dontmove as $match) {
-                    if(strpos($tag,$match)!==false) {
+                foreach ($this->dontmove as $match) {
+                    if (strpos($tag, $match) !== false) {
                         //Matched something
                         return false;
                     }
@@ -636,17 +636,17 @@  discard block
 block discarded – undo
         }
     }
     
-    private function can_inject_late($cssPath,$css) {
-        if ((strpos($cssPath,"min.css")===false) || ($this->inject_min_late!==true)) {
+    private function can_inject_late($cssPath, $css) {
+        if ((strpos($cssPath, "min.css") === false) || ($this->inject_min_late !== true)) {
             // late-inject turned off or file not minified based on filename
             return false;
-        } else if (strpos($css,"@import")!==false) {
+        } else if (strpos($css, "@import") !== false) {
             // can't late-inject files with imports as those need to be aggregated 
             return false;
-        } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
+        } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed
             return false;
-        } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
+        } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
             // don't late-inject CSS with images if CDN is set OR is image inlining is on
             return false;
         } else {
@@ -656,9 +656,9 @@  discard block
 block discarded – undo
     }
     
     private function maybe_cdn_urls($inUrl) {
-        $url = trim($inUrl," \t\n\r\0\x0B\"'");
+        $url = trim($inUrl, " \t\n\r\0\x0B\"'");
         // exclude fonts from CDN except if filter returns true
-        if ( !preg_match('#\.(woff2?|eot|ttf|otf)$#i',$url) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {
+        if (!preg_match('#\.(woff2?|eot|ttf|otf)$#i', $url) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {
             $cdn_url = $this->url_replace_cdn($url);
         } else {
             $cdn_url = $url;

Please login to merge, or discard this patch.

		@@ -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
		@@ -300,7 +300,7 @@ discard block
		block discarded – undo
300	300	$css = preg_replace('/\!important/i', ' !important', $css);
301	301
302	302	// bring back the colon
303		- $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css);
	303	+ $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css);
304	304
305	305	// retain space for special IE6 cases
306	306	$css = preg_replace_callback('/\:first\-(line\|letter)(\{\|,)/i', array($this, 'lowercase_pseudo_first'), $css);
		@@ -373,20 +373,20 @@ discard block
		block discarded – undo
373	373
374	374	// Find a fraction that is used for Opera's -o-device-pixel-ratio query
375	375	// Add token to add the "\" back in later
376		- $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
	376	+ $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css);
377	377
378	378	// Remove empty rules.
379	379	$css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css);
380	380
381	381	// Add "/" back to fix Opera -o-device-pixel-ratio query
382		- $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css);
	382	+ $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css);
383	383
384	384	// Replace multiple semi-colons in a row by a single one
385	385	// See SF bug #1980989
386	386	$css = preg_replace('/;;+/', ';', $css);
387	387
388	388	// Restore new lines for /*! important comments
389		- $css = preg_replace('/'. self::NL .'/', "\n", $css);
	389	+ $css = preg_replace('/'.self::NL.'/', "\n", $css);
390	390
391	391	// Lowercase all uppercase properties
392	392	$css = preg_replace_callback('/(\{\|\;)([A-Z\-]+)(\:)/', array($this, 'lowercase_properties'), $css);
		@@ -400,7 +400,7 @@ discard block
		block discarded – undo
400	400	while ($i < strlen($css)) {
401	401	$i++;
402	402	if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) {
403		- $css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i);
	403	+ $css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i);
404	404	$start_index = $i;
405	405	}
406	406	}
		@@ -408,7 +408,7 @@ discard block
		block discarded – undo
408	408
409	409	// restore preserved comments and strings in reverse order
410	410	for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) {
411		- $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
	411	+ $css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1);
412	412	}
413	413
414	414	// Trim the final string (for any leading or trailing white spaces)
		@@ -448,7 +448,7 @@ discard block
		block discarded – undo
448	448	$terminator = ')';
449	449	}
450	450
451		- while ($found_terminator === FALSE && $end_index+1 <= $max_index) {
	451	+ while ($found_terminator === FALSE && $end_index + 1 <= $max_index) {
452	452	$end_index = $this->index_of($css, $terminator, $end_index + 1);
453	453
454	454	// endIndex == 0 doesn't really apply here
		@@ -468,7 +468,7 @@ discard block
		block discarded – undo
468	468	$token = preg_replace('/\s+/', '', $token);
469	469	$this->preserved_tokens[] = $token;
470	470
471		- $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
	471	+ $preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)';
472	472	$sb[] = $preserver;
473	473
474	474	$append_index = $end_index + 1;
		@@ -530,16 +530,16 @@ discard block
		block discarded – undo
530	530
531	531	if ($is_filter) {
532	532	// Restore, maintain case, otherwise filter will break
533		- $sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7];
	533	+ $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7];
534	534	} else {
535	535	if (strtolower($m[2]) == strtolower($m[3]) &&
536	536	strtolower($m[4]) == strtolower($m[5]) &&
537	537	strtolower($m[6]) == strtolower($m[7])) {
538	538	// Compress.
539		- $hex = '#' . strtolower($m[3] . $m[5] . $m[7]);
	539	+ $hex = '#'.strtolower($m[3].$m[5].$m[7]);
540	540	} else {
541	541	// Non compressible color, restore but lower case.
542		- $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]);
	542	+ $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]);
543	543	}
544	544	// replace Hex colors to short safe color names
545	545	$sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex;
		@@ -568,7 +568,7 @@ discard block
		block discarded – undo
568	568	// one, maybe more? put'em back then
569	569	if (($pos = $this->index_of($match, self::COMMENT)) >= 0) {
570	570	for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
571		- $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1);
	571	+ $match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1);
572	572	}
573	573	}
574	574
		@@ -576,7 +576,7 @@ discard block
		block discarded – undo
576	576	$match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match);
577	577
578	578	$this->preserved_tokens[] = $match;
579		- return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote;
	579	+ return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote;
580	580	}
581	581
582	582	private function replace_colon($matches)
		@@ -587,27 +587,27 @@ discard block
		block discarded – undo
587	587	private function replace_calc($matches)
588	588	{
589	589	$this->preserved_tokens[] = trim(preg_replace('/\s([\\/\(\),])\s*/', '$1', $matches[2]));
590		- return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
	590	+ return 'calc('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
591	591	}
592	592
593	593	private function preserve_old_IE_specific_matrix_definition($matches)
594	594	{
595	595	$this->preserved_tokens[] = $matches[1];
596		- return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')';
	596	+ return 'filter:progid:DXImageTransform.Microsoft.Matrix('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')';
597	597	}
598	598
599	599	private function replace_keyframe_zero($matches)
600	600	{
601		- return $matches[1] . preg_replace('/0(\{\|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3];
	601	+ return $matches[1].preg_replace('/0(\{\|,[^\)\{]+\{)/', '0%$1', $matches[2]).$matches[3];
602	602	}
603	603
604	604	private function rgb_to_hex($matches)
605	605	{
606	606	// Support for percentage values rgb(100%, 0%, 45%);
607		- if ($this->index_of($matches[1], '%') >= 0){
	607	+ if ($this->index_of($matches[1], '%') >= 0) {
608	608	$rgbcolors = explode(',', str_replace('%', '', $matches[1]));
609	609	for ($i = 0; $i < count($rgbcolors); $i++) {
610		- $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
	610	+ $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i])*2.55);
611	611	}
612	612	} else {
613	613	$rgbcolors = explode(',', $matches[1]);
		@@ -620,11 +620,11 @@ discard block
		block discarded – undo
620	620	}
621	621
622	622	// Fix for issue #2528093
623		- if (!preg_match('/[\s\,\);\}]/', $matches[2])){
624		- $matches[2] = ' ' . $matches[2];
	623	+ if (!preg_match('/[\s\,\);\}]/', $matches[2])) {
	624	+ $matches[2] = ' '.$matches[2];
625	625	}
626	626
627		- return '#' . implode('', $rgbcolors) . $matches[2];
	627	+ return '#'.implode('', $rgbcolors).$matches[2];
628	628	}
629	629
630	630	private function hsl_to_hex($matches)
		@@ -635,18 +635,18 @@ discard block
		block discarded – undo
635	635	$l = floatval($values[2]);
636	636
637	637	// Wrap and clamp, then fraction!
638		- $h = ((($h % 360) + 360) % 360) / 360;
639		- $s = $this->clamp_number($s, 0, 100) / 100;
640		- $l = $this->clamp_number($l, 0, 100) / 100;
	638	+ $h = ((($h%360) + 360)%360)/360;
	639	+ $s = $this->clamp_number($s, 0, 100)/100;
	640	+ $l = $this->clamp_number($l, 0, 100)/100;
641	641
642	642	if ($s == 0) {
643		- $r = $g = $b = $this->round_number(255 * $l);
	643	+ $r = $g = $b = $this->round_number(255*$l);
644	644	} else {
645		- $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
646		- $v1 = (2 * $l) - $v2;
647		- $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3)));
648		- $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h));
649		- $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3)));
	645	+ $v2 = $l < 0.5 ? $l(1 + $s) : ($l + $s) - ($s$l);
	646	+ $v1 = (2*$l) - $v2;
	647	+ $r = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h + (1/3)));
	648	+ $g = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h));
	649	+ $b = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h - (1/3)));
650	650	}
651	651
652	652	return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2]));
		@@ -654,27 +654,27 @@ discard block
		block discarded – undo
654	654
655	655	private function lowercase_pseudo_first($matches)
656	656	{
657		- return ':first-'. strtolower($matches[1]) .' '. $matches[2];
	657	+ return ':first-'.strtolower($matches[1]).' '.$matches[2];
658	658	}
659	659
660	660	private function lowercase_directives($matches)
661	661	{
662		- return '@'. strtolower($matches[1]);
	662	+ return '@'.strtolower($matches[1]);
663	663	}
664	664
665	665	private function lowercase_pseudo_elements($matches)
666	666	{
667		- return ':'. strtolower($matches[1]);
	667	+ return ':'.strtolower($matches[1]);
668	668	}
669	669
670	670	private function lowercase_common_functions($matches)
671	671	{
672		- return ':'. strtolower($matches[1]) .'(';
	672	+ return ':'.strtolower($matches[1]).'(';
673	673	}
674	674
675	675	private function lowercase_common_functions_values($matches)
676	676	{
677		- return $matches[1] . strtolower($matches[2]);
	677	+ return $matches[1].strtolower($matches[2]);
678	678	}
679	679
680	680	private function lowercase_properties($matches)
		@@ -689,9 +689,9 @@ discard block
		block discarded – undo
689	689	private function hue_to_rgb($v1, $v2, $vh)
690	690	{
691	691	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
692		- if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
693		- if ($vh * 2 < 1) return $v2;
694		- if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
	692	+ if ($vh6 < 1) return $v1 + ($v2 - $v1)6*$vh;
	693	+ if ($vh*2 < 1) return $v2;
	694	+ if ($vh3 < 2) return $v1 + ($v2 - $v1)((2/3) - $vh)*6;
695	695	return $v1;
696	696	}
697	697
		@@ -766,9 +766,9 @@ discard block
		block discarded – undo
766	766	{
767	767	if (is_string($size)) {
768	768	switch (substr($size, -1)) {
769		- case 'M': case 'm': return $size * 1048576;
770		- case 'K': case 'k': return $size * 1024;
771		- case 'G': case 'g': return $size * 1073741824;
	769	+ case 'M': case 'm': return $size*1048576;
	770	+ case 'K': case 'k': return $size*1024;
	771	+ case 'G': case 'g': return $size*1073741824;
772	772	}
773	773	}
774	774

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

futtta / autoptimize

Push — master ( 303039...b36263 )

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 +56 added lines, -56 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 +180 added lines, -180 removed lines patch added patch discarded remove patch