futtta / autoptimize

classes/external/php/minify-2.1.7-jsmin.php

Indentation +12 added lines, -12 removed lines

@@ -273,12 +273,12 @@ 
             return true;

         }

 

-	// we have to check for a preceding keyword, and we don't need to pattern

-	// match over the whole output.

-	$recentOutput = substr($this->output, -10);

+    // we have to check for a preceding keyword, and we don't need to pattern

+    // match over the whole output.

+    $recentOutput = substr($this->output, -10);

 

-	// check if return/typeof directly precede a pattern without a space

-	foreach (array('return', 'typeof') as $keyword) {

+    // check if return/typeof directly precede a pattern without a space

+    foreach (array('return', 'typeof') as $keyword) {

             if ($this->a !== substr($keyword, -1)) {

                 // certainly wasn't keyword

                 continue;

@@ -290,13 +290,13 @@ 
             }

         }

 

-	// check all keywords

-	if ($this->a === ' ' || $this->a === "\n") {

-		if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {

-			if ($m[1] === '' || !$this->isAlphaNum($m[1])) {

-				return true;

-			}

-		}

+    // check all keywords

+    if ($this->a === ' ' || $this->a === "\n") {

+        if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {

+            if ($m[1] === '' || !$this->isAlphaNum($m[1])) {

+                return true;

+            }

+        }

     }

 

         return false;

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
     protected $inputLength = 0;

     protected $lookAhead   = null;

     protected $output      = '';

-    protected $lastByteOut  = '';

+    protected $lastByteOut = '';

     protected $keptComment = '';

 

     /**

@@ -104,7 +104,7 @@ 
         }

 

         $mbIntEnc = null;

-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {

+        if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {

             $mbIntEnc = mb_internal_encoding();

             mb_internal_encoding('8bit');

         }

@@ -121,7 +121,7 @@ 
                         && ($this->b === $this->lastByteOut)) {

                     // Don't delete this space. If we do, the addition/subtraction

                     // could be parsed as a post-increment

-                } elseif (! $this->isAlphaNum($this->b)) {

+                } elseif (!$this->isAlphaNum($this->b)) {

                     $command = self::ACTION_DELETE_A;

                 }

             } elseif ($this->a === "\n") {

@@ -132,10 +132,10 @@ 
                     // otherwise mb_strpos will give WARNING

                 } elseif ($this->b === null

                           || (false === strpos('{[(+-!~', $this->b)

-                              && ! $this->isAlphaNum($this->b))) {

+                              && !$this->isAlphaNum($this->b))) {

                     $command = self::ACTION_DELETE_A;

                 }

-            } elseif (! $this->isAlphaNum($this->a)) {

+            } elseif (!$this->isAlphaNum($this->a)) {

                 if ($this->b === ' '

                     || ($this->b === "\n"

                         && (false === strpos('}])+-"\'', $this->a)))) {

@@ -191,7 +191,7 @@ 
                 $this->a = $this->b;

                 if ($this->a === "'" || $this->a === '"') { // string literal

                     $str = $this->a; // in case needed for exception

-                    for(;;) {

+                    for (;;) {

                         $this->output .= $this->a;

                         $this->lastByteOut = $this->a;

 

@@ -218,13 +218,13 @@ 
             case self::ACTION_DELETE_A_B: // 3

                 $this->b = $this->next();

                 if ($this->b === '/' && $this->isRegexpLiteral()) {

-                    $this->output .= $this->a . $this->b;

+                    $this->output .= $this->a.$this->b;

                     $pattern = '/'; // keep entire pattern in case we need to report it in the exception

-                    for(;;) {

+                    for (;;) {

                         $this->a = $this->get();

                         $pattern .= $this->a;

                         if ($this->a === '[') {

-                            for(;;) {

+                            for (;;) {

                                 $this->output .= $this->a;

                                 $this->a = $this->get();

                                 $pattern .= $this->a;

@@ -239,7 +239,7 @@ 
                                 if ($this->isEOF($this->a)) {

                                     throw new JSMin_UnterminatedRegExpException(

                                         "JSMin: Unterminated set in RegExp at byte "

-                                            . $this->inputIndex .": {$pattern}");

+                                            . $this->inputIndex.": {$pattern}");

                                 }

                             }

                         }

@@ -283,7 +283,7 @@ 
                 // certainly wasn't keyword

                 continue;

             }

-            if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {

+            if (preg_match("~(^|[\\s\\S])".substr($keyword, 0, -1)."$~", $recentOutput, $m)) {

                 if ($m[1] === '' || !$this->isAlphaNum($m[1])) {

                     return true;

                 }

@@ -392,7 +392,7 @@ 
     {

         $this->get();

         $comment = '';

-        for(;;) {

+        for (;;) {

             $get = $this->get();

             if ($get === '*') {

                 if ($this->peek() === '/') { // end of comment reached

@@ -403,7 +403,7 @@ 
                             // don't prepend a newline if two comments right after one another

                             $this->keptComment = "\n";

                         }

-                        $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";

+                        $this->keptComment .= "/*!".substr($comment, 1)."*/\n";

                     } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {

                         // IE conditional

                         $this->keptComment .= "/*{$comment}*/";

classes/external/php/minify-2.3.1-jsmin.php

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
     protected $inputLength = 0;
     protected $lookAhead   = null;
     protected $output      = '';
-    protected $lastByteOut  = '';
+    protected $lastByteOut = '';
     protected $keptComment = '';
 
     /**
@@ -104,7 +104,7 @@ 
         }
 
         $mbIntEnc = null;
-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
+        if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
             $mbIntEnc = mb_internal_encoding();
             mb_internal_encoding('8bit');
         }
@@ -126,7 +126,7 @@ 
                         && ($this->b === $this->lastByteOut)) {
                     // Don't delete this space. If we do, the addition/subtraction
                     // could be parsed as a post-increment
-                } elseif (! $this->isAlphaNum($this->b)) {
+                } elseif (!$this->isAlphaNum($this->b)) {
                     $command = self::ACTION_DELETE_A;
                 }
             } elseif ($this->a === "\n") {
@@ -137,10 +137,10 @@ 
                     // otherwise mb_strpos will give WARNING
                 } elseif ($this->b === null
                           || (false === strpos('{[(+-!~', $this->b)
-                              && ! $this->isAlphaNum($this->b))) {
+                              && !$this->isAlphaNum($this->b))) {
                     $command = self::ACTION_DELETE_A;
                 }
-            } elseif (! $this->isAlphaNum($this->a)) {
+            } elseif (!$this->isAlphaNum($this->a)) {
                 if ($this->b === ' '
                     || ($this->b === "\n"
                         && (false === strpos('}])+-"\'', $this->a)))) {
@@ -197,7 +197,7 @@ 
                 if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal
                     $delimiter = $this->a;
                     $str = $this->a; // in case needed for exception
-                    for(;;) {
+                    for (;;) {
                         $this->output .= $this->a;
                         $this->lastByteOut = $this->a;
                         $this->a = $this->get();
@@ -225,13 +225,13 @@ 
             case self::ACTION_DELETE_A_B: // 3
                 $this->b = $this->next();
                 if ($this->b === '/' && $this->isRegexpLiteral()) {
-                    $this->output .= $this->a . $this->b;
+                    $this->output .= $this->a.$this->b;
                     $pattern = '/'; // keep entire pattern in case we need to report it in the exception
-                    for(;;) {
+                    for (;;) {
                         $this->a = $this->get();
                         $pattern .= $this->a;
                         if ($this->a === '[') {
-                            for(;;) {
+                            for (;;) {
                                 $this->output .= $this->a;
                                 $this->a = $this->get();
                                 $pattern .= $this->a;
@@ -246,7 +246,7 @@ 
                                 if ($this->isEOF($this->a)) {
                                     throw new JSMin_UnterminatedRegExpException(
                                         "JSMin: Unterminated set in RegExp at byte "
-                                            . $this->inputIndex .": {$pattern}");
+                                            . $this->inputIndex.": {$pattern}");
                                 }
                             }
                         }
@@ -291,7 +291,7 @@ 
 
         // if the "/" follows a keyword, it must be a regexp, otherwise it's best to assume division
 
-        $subject = $this->output . trim($this->a);
+        $subject = $this->output.trim($this->a);
         if (!preg_match('/(?:case|else|in|return|typeof)$/', $subject, $m)) {
             // not a keyword
             return false;
@@ -402,7 +402,7 @@ 
     {
         $this->get();
         $comment = '';
-        for(;;) {
+        for (;;) {
             $get = $this->get();
             if ($get === '*') {
                 if ($this->peek() === '/') { // end of comment reached
@@ -413,7 +413,7 @@ 
                             // don't prepend a newline if two comments right after one another
                             $this->keptComment = "\n";
                         }
-                        $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";
+                        $this->keptComment .= "/*!".substr($comment, 1)."*/\n";
                     } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
                         // IE conditional
                         $this->keptComment .= "/*{$comment}*/";

classes/external/php/jsmin-1.1.1.php

Indentation +84 added lines, -84 removed lines

@@ -46,62 +46,62 @@ 
  */

 

 class JSMin {

-  const ORD_LF    = 10;

-  const ORD_SPACE = 32;

+    const ORD_LF    = 10;

+    const ORD_SPACE = 32;

 

-  protected $a           = '';

-  protected $b           = '';

-  protected $input       = '';

-  protected $inputIndex  = 0;

-  protected $inputLength = 0;

-  protected $lookAhead   = null;

-  protected $output      = '';

+    protected $a           = '';

+    protected $b           = '';

+    protected $input       = '';

+    protected $inputIndex  = 0;

+    protected $inputLength = 0;

+    protected $lookAhead   = null;

+    protected $output      = '';

 

-  // -- Public Static Methods --------------------------------------------------

+    // -- Public Static Methods --------------------------------------------------

 

-  public static function minify($js) {

+    public static function minify($js) {

     $jsmin = new JSMin($js);

     return $jsmin->min();

-  }

+    }

 

-  // -- Public Instance Methods ------------------------------------------------

+    // -- Public Instance Methods ------------------------------------------------

 

-  public function __construct($input) {

+    public function __construct($input) {

     $this->input       = str_replace("\r\n", "\n", $input);

     $this->inputLength = strlen($this->input);

-  }

+    }

 

-  // -- Protected Instance Methods ---------------------------------------------

+    // -- Protected Instance Methods ---------------------------------------------

 

-  protected function action($d) {

+    protected function action($d) {

     switch($d) {

-      case 1:

+        case 1:

         $this->output .= $this->a;

 

-      case 2:

+        case 2:

         $this->a = $this->b;

 

         if ($this->a === "'" || $this->a === '"') {

-          for (;;) {

+            for (;;) {

             $this->output .= $this->a;

             $this->a       = $this->get();

 

             if ($this->a === $this->b) {

-              break;

+                break;

             }

 

             if (ord($this->a) <= self::ORD_LF) {

-              throw new JSMinException('Unterminated string literal.');

+                throw new JSMinException('Unterminated string literal.');

             }

 

             if ($this->a === '\\') {

-              $this->output .= $this->a;

-              $this->a       = $this->get();

+                $this->output .= $this->a;

+                $this->a       = $this->get();

+            }

             }

-          }

         }

 

-      case 3:

+        case 3:

         $this->b = $this->next();

 

         if ($this->b === '/' && (

@@ -109,70 +109,70 @@ 
             $this->a === ':' || $this->a === '[' || $this->a === '!' ||

             $this->a === '&' || $this->a === '|' || $this->a === '?')) {

 

-          $this->output .= $this->a . $this->b;

+            $this->output .= $this->a . $this->b;

 

-          for (;;) {

+            for (;;) {

             $this->a = $this->get();

 

             if ($this->a === '/') {

-              break;

+                break;

             } elseif ($this->a === '\\') {

-              $this->output .= $this->a;

-              $this->a       = $this->get();

+                $this->output .= $this->a;

+                $this->a       = $this->get();

             } elseif (ord($this->a) <= self::ORD_LF) {

-              throw new JSMinException('Unterminated regular expression '.

-                  'literal.');

+                throw new JSMinException('Unterminated regular expression '.

+                    'literal.');

             }

 

             $this->output .= $this->a;

-          }

+            }

 

-          $this->b = $this->next();

+            $this->b = $this->next();

         }

     }

-  }

+    }

 

-  protected function get() {

+    protected function get() {

     $c = $this->lookAhead;

     $this->lookAhead = null;

 

     if ($c === null) {

-      if ($this->inputIndex < $this->inputLength) {

+        if ($this->inputIndex < $this->inputLength) {

         $c = $this->input[$this->inputIndex];

         $this->inputIndex += 1;

-      } else {

+        } else {

         $c = null;

-      }

+        }

     }

 

     if ($c === "\r") {

-      return "\n";

+        return "\n";

     }

 

     if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {

-      return $c;

+        return $c;

     }

 

     return ' ';

-  }

+    }

 

-  protected function isAlphaNum($c) {

+    protected function isAlphaNum($c) {

     return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;

-  }

+    }

 

-  protected function min() {

+    protected function min() {

     $this->a = "\n";

     $this->action(3);

 

     while ($this->a !== null) {

-      switch ($this->a) {

+        switch ($this->a) {

         case ' ':

           if ($this->isAlphaNum($this->b)) {

             $this->action(1);

-          } else {

+            } else {

             $this->action(2);

-          }

-          break;

+            }

+            break;

 

         case "\n":

           switch ($this->b) {

@@ -182,21 +182,21 @@ 
             case '+':

             case '-':

               $this->action(1);

-              break;

+                break;

 

             case ' ':

               $this->action(3);

-              break;

+                break;

 

             default:

               if ($this->isAlphaNum($this->b)) {

                 $this->action(1);

-              }

-              else {

+                }

+                else {

                 $this->action(2);

-              }

-          }

-          break;

+                }

+            }

+            break;

 

         default:

           switch ($this->b) {

@@ -204,10 +204,10 @@ 
               if ($this->isAlphaNum($this->a)) {

                 $this->action(1);

                 break;

-              }

+                }

 

-              $this->action(3);

-              break;

+                $this->action(3);

+                break;

 

             case "\n":

               switch ($this->a) {

@@ -219,71 +219,71 @@ 
                 case '"':

                 case "'":

                   $this->action(1);

-                  break;

+                    break;

 

                 default:

                   if ($this->isAlphaNum($this->a)) {

                     $this->action(1);

-                  }

-                  else {

+                    }

+                    else {

                     $this->action(3);

-                  }

-              }

-              break;

+                    }

+                }

+                break;

 

             default:

               $this->action(1);

-              break;

-          }

-      }

+                break;

+            }

+        }

     }

 

     return $this->output;

-  }

+    }

 

-  protected function next() {

+    protected function next() {

     $c = $this->get();

 

     if ($c === '/') {

-      switch($this->peek()) {

+        switch($this->peek()) {

         case '/':

           for (;;) {

             $c = $this->get();

 

             if (ord($c) <= self::ORD_LF) {

-              return $c;

+                return $c;

+            }

             }

-          }

 

         case '*':

           $this->get();

 

-          for (;;) {

+            for (;;) {

             switch($this->get()) {

-              case '*':

+                case '*':

                 if ($this->peek() === '/') {

-                  $this->get();

-                  return ' ';

+                    $this->get();

+                    return ' ';

                 }

                 break;

 

-              case null:

+                case null:

                 throw new JSMinException('Unterminated comment.');

             }

-          }

+            }

 

         default:

           return $c;

-      }

+        }

     }

 

     return $c;

-  }

+    }

 

-  protected function peek() {

+    protected function peek() {

     $this->lookAhead = $this->get();

     return $this->lookAhead;

-  }

+    }

 }

 

 // -- Exceptions ---------------------------------------------------------------

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
   // -- Protected Instance Methods ---------------------------------------------

 

   protected function action($d) {

-    switch($d) {

+    switch ($d) {

       case 1:

         $this->output .= $this->a;

 

@@ -109,7 +109,7 @@ 
             $this->a === ':' || $this->a === '[' || $this->a === '!' ||

             $this->a === '&' || $this->a === '|' || $this->a === '?')) {

 

-          $this->output .= $this->a . $this->b;

+          $this->output .= $this->a.$this->b;

 

           for (;;) {

             $this->a = $this->get();

@@ -245,7 +245,7 @@ 
     $c = $this->get();

 

     if ($c === '/') {

-      switch($this->peek()) {

+      switch ($this->peek()) {

         case '/':

           for (;;) {

             $c = $this->get();

@@ -259,7 +259,7 @@ 
           $this->get();

 

           for (;;) {

-            switch($this->get()) {

+            switch ($this->get()) {

               case '*':

                 if ($this->peek() === '/') {

                   $this->get();

Braces +2 added lines, -4 removed lines

@@ -191,8 +191,7 @@ 
             default:

               if ($this->isAlphaNum($this->b)) {

                 $this->action(1);

-              }

-              else {

+              } else {

                 $this->action(2);

               }

           }

@@ -224,8 +223,7 @@ 
                 default:

                   if ($this->isAlphaNum($this->a)) {

                     $this->action(1);

-                  }

-                  else {

+                  } else {

                     $this->action(3);

                   }

               }

classes/external/php/minify-2.1.7-html.php

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
     {

         $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 @@ 
             $this->_jsMinifier = $options['jsMinifier'];

         }

         if (isset($options['jsCleanComments'])) {

-            $this->_jsCleanComments = (bool)$options['jsCleanComments'];

+            $this->_jsCleanComments = (bool) $options['jsCleanComments'];

         }

     }

 

@@ -95,7 +95,7 @@ 
             $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 @@ 
     

     protected function _reservePlace($content)

     {

-        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';

+        $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%';

         $this->_placeholders[$placeholder] = $content;

         return $placeholder;

     }

classes/external/php/minify-html.php

Indentation +10 added lines, -10 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -70,7 +70,7 @@ 
     {
         $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 @@ 
             $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 @@ 
             ,$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 @@ 
     
     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 @@ 
 
     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 @@ 
     protected function _removeCdata($str)
     {
         return (false !== strpos($str, '<![CDATA['))
-            ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str)
+            ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str)
             : $str;
     }
     

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

Indentation +17 added lines, -17 removed lines

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

Braces +9 added lines, -3 removed lines

@@ -701,9 +701,15 @@
     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;
     }
 

Spacing +60 added lines, -60 removed lines

@@ -43,10 +43,10 @@ 
     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 @@ 
             }
             $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 @@ 
             $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 @@ 
         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 @@ 
             // 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 @@ 
                 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 @@ 
         $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 @@ 
         $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 @@ 
 
         // 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 @@ 
             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 @@ 
 
         // 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 @@ 
                 $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 @@ 
 
             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 @@ 
 
             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 @@ 
         // 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 @@ 
         $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 @@ 
 
     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 @@ 
         }
 
         // 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 @@ 
         $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 @@ 
 
     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 @@ 
     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 @@ 
     {
         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;
             }
         }
 

Doc Comments +10 added lines, -1 removed lines

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

autoptimize.php

Braces +13 added lines, -7 removed lines

@@ -12,7 +12,10 @@ 
 http://www.gnu.org/licenses/gpl.txt
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__));
 
@@ -224,12 +227,15 @@ 
 
     // Choose the classes
     $classes = array();
-    if($conf->get('autoptimize_js'))
-        $classes[] = 'autoptimizeScripts';
-    if($conf->get('autoptimize_css'))
-        $classes[] = 'autoptimizeStyles';
-    if($conf->get('autoptimize_html'))
-        $classes[] = 'autoptimizeHTML';
+    if($conf->get('autoptimize_js')) {
+            $classes[] = 'autoptimizeScripts';
+    }
+    if($conf->get('autoptimize_css')) {
+            $classes[] = 'autoptimizeStyles';
+    }
+    if($conf->get('autoptimize_html')) {
+            $classes[] = 'autoptimizeHTML';
+    }
 
     // Set some options
     $classoptions = array(

Indentation +4 added lines, -4 removed lines

@@ -132,10 +132,10 @@
         $ao_noptimize = true;
     }
 
-	// if setting says not to optimize logged in user and user is logged in
-	if (get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in()) {
-		$ao_noptimize = true;
-	}
+    // if setting says not to optimize logged in user and user is logged in
+    if (get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in()) {
+        $ao_noptimize = true;
+    }
 
     // filter you can use to block autoptimization on your own terms
     $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );

Spacing +69 added lines, -69 removed lines

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

classes/autoptimizeStyles.php

Braces +11 added lines, -5 removed lines

@@ -1,5 +1,8 @@ 
 <?php

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly

 

 class autoptimizeStyles extends autoptimizeBase {

 

@@ -25,7 +28,9 @@ 
     //Reads the page and collects style tags

     public function read($options) {

         $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );

-        if ($noptimizeCSS) return false;

+        if ($noptimizeCSS) {
+            return false;
+        }
 

         $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '' );

         if (!empty($whitelistCSS)) {

@@ -139,7 +144,7 @@ 
                         if($path!==false && preg_match('#\.css$#',$path)) {

                             // Good link

                             $this->css[] = array($media,$path);

-                        }else{

+                        } else{

                             // Link is dynamic (.php etc)

                             $tag = '';

                         }

@@ -202,8 +207,9 @@ 
             }

             

             foreach($media as $elem) {

-                if(!isset($this->csscode[$elem]))

-                    $this->csscode[$elem] = '';

+                if(!isset($this->csscode[$elem])) {
+                                    $this->csscode[$elem] = '';
+                }
                 $this->csscode[$elem] .= "\n/*FILESTART*/".$css;

             }

         }

Doc Comments +3 added lines

@@ -656,6 +656,9 @@
         return $code;

     }

     

+    /**
+     * @param string $tag
+     */
     private function ismovable($tag) {

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

 			return false;

Indentation +28 added lines, -28 removed lines

@@ -162,32 +162,32 @@ 
                     // Remove the original style tag

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

                 } else {

-					// excluded CSS, minify if getpath 

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

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

+                    // excluded CSS, minify if getpath 

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

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

                         $url = $explUrl[0];

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

  					

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

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

-

-							if (!empty($_CachedMinifiedUrl)) {

-								// replace orig URL with URL to cache

-								$newTag = str_replace($url, $_CachedMinifiedUrl, $tag);

-							} else {

-								$newTag = $tag;

-							}

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

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

+

+                            if (!empty($_CachedMinifiedUrl)) {

+                                // replace orig URL with URL to cache

+                                $newTag = str_replace($url, $_CachedMinifiedUrl, $tag);

+                            } else {

+                                $newTag = $tag;

+                            }

 							

-							// remove querystring from URL

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

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

-							}

-

-							// and replace

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

-						}

-					}					

-				}

+                            // remove querystring from URL

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

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

+                            }

+

+                            // and replace

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

+                        }

+                    }					

+                }

             }

             return true;

         }

@@ -404,7 +404,7 @@ 
                         // just cdn the URL if applicable

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

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

-						}

+                        }

                     }

                 }

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

@@ -611,8 +611,8 @@ 
     }

     

     private function ismovable($tag) {

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

-			return false;

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

+            return false;

         } else if (!empty($this->whitelist)) {

             foreach ($this->whitelist as $match) {

                 if(strpos($tag,$match)!==false) {

@@ -637,13 +637,13 @@ 
     }

     

     private function can_inject_late($cssPath,$css) {

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

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

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

             // late-inject turned off

             return false;

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

-			// file not minified based on filename & filter

-			return false;

+            // file not minified based on filename & filter

+            return false;

         } else if ( strpos($css,"@import") !== false ) {

             // can't late-inject files with imports as those need to be aggregated 

             return false;

Spacing +182 added lines, -182 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if (!defined('ABSPATH')) exit; // Exit if accessed directly

 

 class autoptimizeStyles extends autoptimizeBase {

 

@@ -23,12 +23,12 @@ 
 

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

 							

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

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

             }

             

-            foreach($media as $elem) {

-                if(!isset($this->csscode[$elem]))

+            foreach ($media as $elem) {

+                if (!isset($this->csscode[$elem]))

                     $this->csscode[$elem] = '';

                 $this->csscode[$elem] .= "\n/*FILESTART*/".$css;

             }

@@ -237,12 +237,12 @@ 
         // Check for duplicate code

         $md5list = array();

         $tmpcss = $this->csscode;

-        foreach($tmpcss as $media => $code) {

+        foreach ($tmpcss as $media => $code) {

             $md5sum = md5($code);

             $medianame = $media;

-            foreach($md5list as $med => $sum) {

+            foreach ($md5list as $med => $sum) {

                 // If same code

-                if($sum === $md5sum) {

+                if ($sum === $md5sum) {

                     //Add the merged code

                     $medianame = $med.', '.$media;

                     $this->csscode[$medianame] = $code;

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

 

             // remove comments to avoid importing commented-out imports

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

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

 

-            while(preg_match_all('#@import.*(?:;|$)#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 @@ 
                     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 @@ 
 

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

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

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

             }    

             //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 @@ 
             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,21 +636,21 @@ 
         }

     }

     

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

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

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

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

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

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

             // late-inject turned off

             return false;

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

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

 			// file not minified based on filename & filter

 			return false;

-        } else if ( strpos($css,"@import") !== false ) {

+        } else if (strpos($css, "@import") !== false) {

             // can't late-inject files with imports as those need to be aggregated 

             return false;

-        } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {

+        } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {

             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed

             return false;

-        } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {

+        } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {

             // don't late-inject CSS with images if CDN is set OR is image inlining is on

             return false;

         } else {

@@ -660,9 +660,9 @@ 
     }

     

     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;

classlesses/autoptimizePartners.php

Spacing +21 added lines, -21 removed lines

@@ -5,20 +5,20 @@ 
 
 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 @@ 
     }    
     </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 @@ 
 }
 
 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; ?>