futtta / autoptimize

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

Spacing +73 added lines, -73 removed lines

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

classlesses/autoptimizeSpeedupper.php

Spacing +28 added lines, -28 removed lines

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

classlesses/autoptimizeUpdateCode.php

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
         $majorUp = true;
     case "2.0":
     case "2.1":
-		$majorUp = true;
+        $majorUp = true;
     }
 
 if ( $majorUp === true ) {

Spacing +24 added lines, -24 removed lines

@@ -4,45 +4,45 @@ 
 */
 
 $majorUp = false;        
-$autoptimize_major_version=substr($autoptimize_db_version,0,3);
+$autoptimize_major_version = substr($autoptimize_db_version, 0, 3);
 
-switch($autoptimize_major_version) {
+switch ($autoptimize_major_version) {
     case "1.6":
         // from back in the days when I did not yet consider multisite
         // if user was on version 1.6.x, force advanced options to be shown by default
-        update_option('autoptimize_show_adv','1');
+        update_option('autoptimize_show_adv', '1');
 
         // and remove old options
-        $to_delete_options=array("autoptimize_cdn_css","autoptimize_cdn_css_url","autoptimize_cdn_js","autoptimize_cdn_js_url","autoptimize_cdn_img","autoptimize_cdn_img_url","autoptimize_css_yui","autoptimize_js_yui");
+        $to_delete_options = array("autoptimize_cdn_css", "autoptimize_cdn_css_url", "autoptimize_cdn_js", "autoptimize_cdn_js_url", "autoptimize_cdn_img", "autoptimize_cdn_img_url", "autoptimize_css_yui", "autoptimize_js_yui");
         foreach ($to_delete_options as $del_opt) {
-            delete_option( $del_opt );
+            delete_option($del_opt);
         }
         $majorUp = true;
     case "1.7":
         // force 3.8 dashicons in CSS exclude options when upgrading from 1.7 to 1.8
-        if ( !is_multisite() ) {
+        if (!is_multisite()) {
             $css_exclude = get_option('autoptimize_css_exclude');
             if (empty($css_exclude)) {
                 $css_exclude = "admin-bar.min.css, dashicons.min.css";
-            } else if (strpos($css_exclude,"dashicons.min.css")===false) {
+            } else if (strpos($css_exclude, "dashicons.min.css") === false) {
                 $css_exclude .= ", dashicons.min.css";
             }
-            update_option('autoptimize_css_exclude',$css_exclude);
+            update_option('autoptimize_css_exclude', $css_exclude);
         } else {
             global $wpdb;
-            $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
                 $css_exclude = get_option('autoptimize_css_exclude');
                 if (empty($css_exclude)) {
                     $css_exclude = "admin-bar.min.css, dashicons.min.css";
-                } else if (strpos($css_exclude,"dashicons.min.css")===false) {
+                } else if (strpos($css_exclude, "dashicons.min.css") === false) {
                     $css_exclude .= ", dashicons.min.css";
                 }
-                update_option('autoptimize_css_exclude',$css_exclude);
+                update_option('autoptimize_css_exclude', $css_exclude);
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
         $majorUp = true;
     case "1.9":
@@ -50,19 +50,19 @@ 
         * 2.0 will not aggregate inline CSS/JS by default, but we want users
         * upgrading from 1.9 to keep their inline code aggregated by default. 
         */
-        if ( !is_multisite() ) {
-            update_option('autoptimize_css_include_inline','on');
-            update_option('autoptimize_js_include_inline','on');
+        if (!is_multisite()) {
+            update_option('autoptimize_css_include_inline', 'on');
+            update_option('autoptimize_js_include_inline', 'on');
         } else {
             global $wpdb;
-            $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                update_option('autoptimize_css_include_inline','on');
-                update_option('autoptimize_js_include_inline','on');
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                update_option('autoptimize_css_include_inline', 'on');
+                update_option('autoptimize_js_include_inline', 'on');
             }
-            switch_to_blog( $original_blog_id );    
+            switch_to_blog($original_blog_id);    
         }
         $majorUp = true;
     case "2.0":
@@ -70,7 +70,7 @@ 
 		$majorUp = true;
     }
 
-if ( $majorUp === true ) {
+if ($majorUp === true) {
     // clear cache and notify user to check result if major upgrade
     autoptimizeCache::clearall();
     add_action('admin_notices', 'autoptimize_update_config_notice');