futtta / autoptimize

config/default.php

Spacing +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 
 // Determine supported compression method
@@ -27,16 +27,16 @@ 
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
-if($encoding != 'none' && $iscompressed == false)
+if ($encoding != 'none' && $iscompressed == false)
 {
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
-}else{
+	$contents = gzencode($code, 9, $flag);
+} else {
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }
@@ -44,19 +44,19 @@ 
 // first check if we have to send 304
 // inspired by http://www.jonasjohn.de/snippets/php/caching.htm
 
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
 date_default_timezone_set("UTC");
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	header('HTTP/1.1 304 Not Modified');
 	header('Connection: close');
 } else {
 	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
+	$expireTime = 60*60*24*355; // 1y max according to RFC
 	if ($encoding != 'none') {
 		header('Content-Encoding: '.$encoding);
 	}
@@ -66,22 +66,22 @@ 
 	header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
 	header('Cache-Control: max-age='.$expireTime.', public, immutable');
 	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
+	header('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
 	// send output
 	echo $contents;
 
 	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
+	if ($encoding != 'none' && $iscompressed == false)
 	{
 		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+		file_put_contents(__FILE__.'.'.$encoding, $contents);
 
 		//And write the new content
 		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
 		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
+		$contents = gzencode($code, 9, $flag);
+		file_put_contents(__FILE__.'.'.$ext, $contents);
 	}
 }

classes/external/php/yui-php-cssmin-bundled/Utils.php

Spacing +18 added lines, -18 removed lines

@@ -38,18 +38,18 @@ 
         $l = floatval(str_replace('%', '', $hslValues[2]));
 
         // Wrap and clamp, then fraction!
-        $h = ((($h % 360) + 360) % 360) / 360;
-        $s = self::clampNumber($s, 0, 100) / 100;
-        $l = self::clampNumber($l, 0, 100) / 100;
+        $h = ((($h%360) + 360)%360)/360;
+        $s = self::clampNumber($s, 0, 100)/100;
+        $l = self::clampNumber($l, 0, 100)/100;
 
         if ($s == 0) {
-            $r = $g = $b = self::roundNumber(255 * $l);
+            $r = $g = $b = self::roundNumber(255*$l);
         } else {
-            $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
-            $v1 = (2 * $l) - $v2;
-            $r = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h + (1/3)));
-            $g = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h));
-            $b = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h - (1/3)));
+            $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l);
+            $v1 = (2*$l) - $v2;
+            $r = self::roundNumber(255*self::hueToRgb($v1, $v2, $h + (1/3)));
+            $g = self::roundNumber(255*self::hueToRgb($v1, $v2, $h));
+            $b = self::roundNumber(255*self::hueToRgb($v1, $v2, $h - (1/3)));
         }
 
         return array($r, $g, $b);
@@ -66,16 +66,16 @@ 
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
 
-        if ($vh * 6 < 1) {
-            return $v1 + ($v2 - $v1) * 6 * $vh;
+        if ($vh*6 < 1) {
+            return $v1 + ($v2 - $v1)*6*$vh;
         }
 
-        if ($vh * 2 < 1) {
+        if ($vh*2 < 1) {
             return $v2;
         }
 
-        if ($vh * 3 < 2) {
-            return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6;
+        if ($vh*3 < 2) {
+            return $v1 + ($v2 - $v1)*((2/3) - $vh)*6;
         }
 
         return $v1;
@@ -94,13 +94,13 @@ 
             switch ($letter) {
                 case 'M':
                 case 'm':
-                    return (int) $size * 1048576;
+                    return (int) $size*1048576;
                 case 'K':
                 case 'k':
-                    return (int) $size * 1024;
+                    return (int) $size*1024;
                 case 'G':
                 case 'g':
-                    return (int) $size * 1073741824;
+                    return (int) $size*1073741824;
             }
         }
         return (int) $size;
@@ -114,7 +114,7 @@ 
     public static function rgbPercentageToRgbInteger($rgbPercentage)
     {
         if (strpos($rgbPercentage, '%') !== false) {
-            $rgbPercentage = self::roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55);
+            $rgbPercentage = self::roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55);
         }
 
         return intval($rgbPercentage, 10);

classes/external/php/minify-html.php

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)
@@ -259,7 +259,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/autoptimizeHTML.php

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
  * Handles minifying HTML markup.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -27,19 +27,19 @@ 
         '<!--/noindex-->',
     );
 
-    public function read( $options )
+    public function read($options)
     {
         // Remove the HTML comments?
         $this->keepcomments = (bool) $options['keepcomments'];
 
         // Filter to force xhtml.
-        $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false );
+        $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false);
 
         // Filterable strings to be excluded from HTML minification.
-        $exclude = apply_filters( 'autoptimize_filter_html_exclude', '' );
-        if ( '' !== $exclude ) {
-            $exclude_arr   = array_filter( array_map( 'trim', explode( ',', $exclude ) ) );
-            $this->exclude = array_merge( $exclude_arr, $this->exclude );
+        $exclude = apply_filters('autoptimize_filter_html_exclude', '');
+        if ('' !== $exclude) {
+            $exclude_arr   = array_filter(array_map('trim', explode(',', $exclude)));
+            $this->exclude = array_merge($exclude_arr, $this->exclude);
         }
 
         // Nothing else for HTML!
@@ -53,49 +53,49 @@ 
      */
     public function minify()
     {
-        $noptimize = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content );
-        if ( $noptimize ) {
+        $noptimize = apply_filters('autoptimize_filter_html_noptimize', false, $this->content);
+        if ($noptimize) {
             return false;
         }
 
         // Wrap the to-be-excluded strings in noptimize tags.
-        foreach ( $this->exclude as $str ) {
-            if ( false !== strpos( $this->content, $str ) ) {
-                $replacement   = '<!--noptimize-->' . $str . '<!--/noptimize-->';
-                $this->content = str_replace( $str, $replacement, $this->content );
+        foreach ($this->exclude as $str) {
+            if (false !== strpos($this->content, $str)) {
+                $replacement   = '<!--noptimize-->'.$str.'<!--/noptimize-->';
+                $this->content = str_replace($str, $replacement, $this->content);
             }
         }
 
         // Noptimize.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Preparing options for Minify_HTML.
-        $options = array( 'keepComments' => $this->keepcomments );
-        if ( $this->forcexhtml ) {
+        $options = array('keepComments' => $this->keepcomments);
+        if ($this->forcexhtml) {
             $options['xhtml'] = true;
         }
 
-        $tmp_content = Minify_HTML::minify( $this->content, $options );
-        if ( ! empty( $tmp_content ) ) {
+        $tmp_content = Minify_HTML::minify($this->content, $options);
+        if (!empty($tmp_content)) {
             $this->content = $tmp_content;
-            unset( $tmp_content );
+            unset($tmp_content);
         }
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Remove the noptimize-wrapper from around the excluded strings.
-        foreach ( $this->exclude as $str ) {
-            $replacement = '<!--noptimize-->' . $str . '<!--/noptimize-->';
-            if ( false !== strpos( $this->content, $replacement ) ) {
-                $this->content = str_replace( $replacement, $str, $this->content );
+        foreach ($this->exclude as $str) {
+            $replacement = '<!--noptimize-->'.$str.'<!--/noptimize-->';
+            if (false !== strpos($this->content, $replacement)) {
+                $this->content = str_replace($replacement, $str, $this->content);
             }
         }
 
         // Revslider data attribs somehow suffer from HTML optimization, this fixes that!
-        if ( class_exists( 'RevSlider' ) && apply_filters( 'autoptimize_filter_html_dataattrib_cleanup', false ) ) {
-            $this->content = preg_replace( '#\n(data-.*$)\n#Um', ' $1 ', $this->content );
-            $this->content = preg_replace( '#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content );
+        if (class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) {
+            $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content);
+            $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content);
         }
 
         return true;

classes/autoptimizeCLI.php

Spacing +6 added lines, -6 removed lines

@@ -3,12 +3,12 @@ 
  * WP-CLI commands for Autoptimize.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
 // This is a WP-CLI command, so bail if it's not available.
-if ( ! defined( 'WP_CLI' ) ) {
+if (!defined('WP_CLI')) {
     return;
 }
 
@@ -24,11 +24,11 @@ 
      *
      * @return void
      */
-    public function clear( $args, $args_assoc ) {
-        WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
+    public function clear($args, $args_assoc) {
+        WP_CLI::line(esc_html__('Flushing the cache...', 'autoptimize'));
         autoptimizeCache::clearall();
-        WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
+        WP_CLI::success(esc_html__('Cache flushed.', 'autoptimize'));
     }
 }
 
-WP_CLI::add_command( 'autoptimize', 'autoptimizeCLI' );
+WP_CLI::add_command('autoptimize', 'autoptimizeCLI');

classes/autoptimizePartners.php

Spacing +28 added lines, -28 removed lines

@@ -4,7 +4,7 @@ 
  * addons and/or affiliate services.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -17,64 +17,64 @@ 
 
     public function run()
     {
-        if ( $this->enabled() ) {
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_partner_tabs' ), 10, 1 );
+        if ($this->enabled()) {
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_partner_tabs'), 10, 1);
         }
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
+        add_action('admin_menu', array($this, 'add_admin_menu'));
     }
 
     protected function enabled()
     {
-        return apply_filters( 'autoptimize_filter_show_partner_tabs', true );
+        return apply_filters('autoptimize_filter_show_partner_tabs', true);
     }
 
-    public function add_partner_tabs( $in )
+    public function 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;
     }
 
     public function add_admin_menu()
     {
-        if ( $this->enabled() ) {
-            add_submenu_page( null, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', array( $this, 'ao_partners_page' ) );
+        if ($this->enabled()) {
+            add_submenu_page(null, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', array($this, 'ao_partners_page'));
         }
     }
 
     protected function get_ao_partner_feed_markup()
     {
-        $no_feed_text = __( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' );
+        $no_feed_text = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize');
         $output       = '';
-        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);
             }
 
-            if ( 0 == $maxitems ) {
+            if (0 == $maxitems) {
                 $output .= $no_feed_text;
             } else {
                 $output .= '<ul>';
-                foreach ( $rss_items as $item ) {
-                    $item_url  = esc_url( $item->get_permalink() );
+                foreach ($rss_items as $item) {
+                    $item_url  = esc_url($item->get_permalink());
                     $enclosure = $item->get_enclosure();
 
                     $output .= '<li class="itemDetail">';
-                    $output .= '<h3 class="itemTitle"><a href="' . $item_url . '" target="_blank">' . esc_html( $item->get_title() ) . '</a></h3>';
+                    $output .= '<h3 class="itemTitle"><a href="'.$item_url.'" target="_blank">'.esc_html($item->get_title()).'</a></h3>';
 
-                    if ( $enclosure && ( false !== strpos( $enclosure->get_type(), 'image' ) ) ) {
-                        $img_url = esc_url( $enclosure->get_link() );
-                        $output .= '<div class="itemImage"><a href="' . $item_url . '" target="_blank"><img src="' . $img_url . '"></a></div>';
+                    if ($enclosure && (false !== strpos($enclosure->get_type(), 'image'))) {
+                        $img_url = esc_url($enclosure->get_link());
+                        $output .= '<div class="itemImage"><a href="'.$item_url.'" target="_blank"><img src="'.$img_url.'"></a></div>';
                     }
 
-                    $output .= '<div class="itemDescription">' . wp_kses_post( $item->get_description() ) . '</div>';
-                    $output .= '<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="' . $item_url . '" target="_blank">' . __( 'More info', 'autoptimize' ) . '</a></div></div>';
+                    $output .= '<div class="itemDescription">'.wp_kses_post($item->get_description()).'</div>';
+                    $output .= '<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="'.$item_url.'" target="_blank">'.__('More info', 'autoptimize').'</a></div></div>';
                     $output .= '</li>';
                 }
                 $output .= '</ul>';
@@ -133,9 +133,9 @@ 
     }
     </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>'; ?>
+        <?php echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>'; ?>
         <div>
             <?php echo $this->get_ao_partner_feed_markup(); ?>
         </div>

classes/autoptimizeCSSmin.php

Spacing +7 added lines, -7 removed lines

@@ -3,7 +3,7 @@ 
  * Thin wrapper around css minifiers to avoid rewriting a bunch of existing code.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -21,9 +21,9 @@ 
      *
      * @param bool $raise_limits Whether to raise memory limits or not. Default true.
      */
-    public function __construct( $raise_limits = true )
+    public function __construct($raise_limits = true)
     {
-        $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier( $raise_limits );
+        $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier($raise_limits);
     }
 
     /**
@@ -34,9 +34,9 @@ 
      *
      * @return string
      */
-    public function run( $css )
+    public function run($css)
     {
-        $result = $this->minifier->run( $css );
+        $result = $this->minifier->run($css);
 
         return $result;
     }
@@ -48,10 +48,10 @@ 
      *
      * @return string
      */
-    public static function minify( $css )
+    public static function minify($css)
     {
         $minifier = new self();
 
-        return $minifier->run( $css );
+        return $minifier->run($css);
     }
 }

classes/autoptimizeVersionUpdatesHandler.php

Spacing +50 added lines, -50 removed lines

@@ -3,7 +3,7 @@ 
  * Handles version updates and should only be instantiated in autoptimize.php if/when needed.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -16,9 +16,9 @@ 
      */
     protected $current_major_version = null;
 
-    public function __construct( $current_version )
+    public function __construct($current_version)
     {
-        $this->current_major_version = substr( $current_version, 0, 3 );
+        $this->current_major_version = substr($current_version, 0, 3);
     }
 
     /**
@@ -29,7 +29,7 @@ 
     {
         $major_update = false;
 
-        switch ( $this->current_major_version ) {
+        switch ($this->current_major_version) {
             case '1.6':
                 $this->upgrade_from_1_6();
                 $major_update = true;
@@ -48,7 +48,7 @@ 
                 // No break, intentionally, so all upgrades are ran during a single request...
         }
 
-        if ( true === $major_update ) {
+        if (true === $major_update) {
             $this->on_major_version_update();
         }
     }
@@ -60,19 +60,19 @@ 
      *
      * @param string $target Target version to check against (ie., the currently running one).
      */
-    public static function check_installed_and_update( $target )
+    public static function check_installed_and_update($target)
     {
-        $db_version = get_option( 'autoptimize_version', 'none' );
-        if ( $db_version !== $target ) {
-            if ( 'none' === $db_version ) {
-                add_action( 'admin_notices', 'autoptimizeMain::notice_installed' );
+        $db_version = get_option('autoptimize_version', 'none');
+        if ($db_version !== $target) {
+            if ('none' === $db_version) {
+                add_action('admin_notices', 'autoptimizeMain::notice_installed');
             } else {
-                $updater = new self( $db_version );
+                $updater = new self($db_version);
                 $updater->run_needed_major_upgrades();
             }
 
             // Versions differed, upgrades happened if needed, store the new version.
-            update_option( 'autoptimize_version', $target );
+            update_option('autoptimize_version', $target);
         }
     }
 
@@ -83,10 +83,10 @@ 
     protected function on_major_version_update()
     {
         // The transients guard here prevents stale object caches from busting the cache on every request.
-        if ( false == get_transient( 'autoptimize_stale_option_buster' ) ) {
-            set_transient( 'autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS );
+        if (false == get_transient('autoptimize_stale_option_buster')) {
+            set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS);
             autoptimizeCache::clearall();
-            add_action( 'admin_notices', 'autoptimizeMain::notice_updated' );
+            add_action('admin_notices', 'autoptimizeMain::notice_updated');
         }
     }
 
@@ -96,7 +96,7 @@ 
     private function upgrade_from_1_6()
     {
         // If user was on version 1.6.x, force advanced options to be shown by default.
-        update_option( 'autoptimize_show_adv', '1' );
+        update_option('autoptimize_show_adv', '1');
 
         // And remove old options.
         $to_delete_options = array(
@@ -108,8 +108,8 @@ 
             'autoptimize_cdn_img_url',
             'autoptimize_css_yui',
         );
-        foreach ( $to_delete_options as $del_opt ) {
-            delete_option( $del_opt );
+        foreach ($to_delete_options as $del_opt) {
+            delete_option($del_opt);
         }
     }
 
@@ -120,29 +120,29 @@ 
      */
     private function upgrade_from_1_7()
     {
-        if ( ! is_multisite() ) {
-            $css_exclude = get_option( 'autoptimize_css_exclude' );
-            if ( empty( $css_exclude ) ) {
+        if (!is_multisite()) {
+            $css_exclude = get_option('autoptimize_css_exclude');
+            if (empty($css_exclude)) {
                 $css_exclude = 'admin-bar.min.css, dashicons.min.css';
-            } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
+            } elseif (false === strpos($css_exclude, 'dashicons.min.css')) {
                 $css_exclude .= ', dashicons.min.css';
             }
-            update_option( 'autoptimize_css_exclude', $css_exclude );
+            update_option('autoptimize_css_exclude', $css_exclude);
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                $css_exclude = get_option( 'autoptimize_css_exclude' );
-                if ( empty( $css_exclude ) ) {
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                $css_exclude = get_option('autoptimize_css_exclude');
+                if (empty($css_exclude)) {
                     $css_exclude = 'admin-bar.min.css, dashicons.min.css';
-                } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
+                } elseif (false === strpos($css_exclude, 'dashicons.min.css')) {
                     $css_exclude .= ', dashicons.min.css';
                 }
-                update_option( 'autoptimize_css_exclude', $css_exclude );
+                update_option('autoptimize_css_exclude', $css_exclude);
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -154,19 +154,19 @@ 
      */
     private function upgrade_from_1_9()
     {
-        if ( ! is_multisite() ) {
-            update_option( 'autoptimize_css_include_inline', 'on' );
-            update_option( 'autoptimize_js_include_inline', 'on' );
+        if (!is_multisite()) {
+            update_option('autoptimize_css_include_inline', 'on');
+            update_option('autoptimize_js_include_inline', 'on');
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                update_option( 'autoptimize_css_include_inline', 'on' );
-                update_option( 'autoptimize_js_include_inline', 'on' );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                update_option('autoptimize_css_include_inline', 'on');
+                update_option('autoptimize_js_include_inline', 'on');
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -177,17 +177,17 @@ 
      */
     private function upgrade_from_2_2()
     {
-        if ( ! is_multisite() ) {
+        if (!is_multisite()) {
             $this->do_2_2_settings_update();
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
                 $this->do_2_2_settings_update();
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -196,11 +196,11 @@ 
      */
     private function do_2_2_settings_update()
     {
-        $nogooglefont    = get_option( 'autoptimize_css_nogooglefont', '' );
-        $ao_extrasetting = get_option( 'autoptimize_extra_settings', '' );
-        if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) {
-            update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
+        $nogooglefont    = get_option('autoptimize_css_nogooglefont', '');
+        $ao_extrasetting = get_option('autoptimize_extra_settings', '');
+        if (($nogooglefont) && (empty($ao_extrasetting))) {
+            update_option('autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options());
         }
-        delete_option( 'autoptimize_css_nogooglefont' );
+        delete_option('autoptimize_css_nogooglefont');
     }
 }

classes/autoptimizeSpeedupper.php

Spacing +41 added lines, -41 removed lines

@@ -4,7 +4,7 @@ 
  * new in Autoptimize 2.2
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -17,94 +17,94 @@ 
 
     public function add_hooks()
     {
-        if ( apply_filters( 'autoptimize_js_do_minify', true ) ) {
-            add_filter( 'autoptimize_js_individual_script', array( $this, 'js_snippetcacher' ), 10, 2 );
-            add_filter( 'autoptimize_js_after_minify', array( $this, 'js_cleanup' ), 10, 1 );
+        if (apply_filters('autoptimize_js_do_minify', true)) {
+            add_filter('autoptimize_js_individual_script', array($this, 'js_snippetcacher'), 10, 2);
+            add_filter('autoptimize_js_after_minify', array($this, 'js_cleanup'), 10, 1);
         }
-        if ( apply_filters( 'autoptimize_css_do_minify', true ) ) {
-            add_filter( 'autoptimize_css_individual_style', array( $this, 'css_snippetcacher' ), 10, 2 );
-            add_filter( 'autoptimize_css_after_minify', array( $this, 'css_cleanup' ), 10, 1 );
+        if (apply_filters('autoptimize_css_do_minify', true)) {
+            add_filter('autoptimize_css_individual_style', array($this, 'css_snippetcacher'), 10, 2);
+            add_filter('autoptimize_css_after_minify', array($this, 'css_cleanup'), 10, 1);
         }
     }
 
-    public function js_snippetcacher( $jsin, $jsfilename )
+    public function js_snippetcacher($jsin, $jsfilename)
     {
-        $md5hash = 'snippet_' . md5( $jsin );
-        $ccheck  = new autoptimizeCache( $md5hash, 'js' );
-        if ( $ccheck->check() ) {
+        $md5hash = 'snippet_'.md5($jsin);
+        $ccheck  = new autoptimizeCache($md5hash, 'js');
+        if ($ccheck->check()) {
             $scriptsrc = $ccheck->retrieve();
         } else {
-            if ( false === ( strpos( $jsfilename, 'min.js' ) ) && ( false === strpos( $jsfilename, 'js/jquery/jquery.js' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_js_consider_minified', false ), '', $jsfilename ) === $jsfilename ) ) {
-                $tmp_jscode = trim( JSMin::minify( $jsin ) );
-                if ( ! empty( $tmp_jscode ) ) {
+            if (false === (strpos($jsfilename, 'min.js')) && (false === strpos($jsfilename, 'js/jquery/jquery.js')) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) {
+                $tmp_jscode = trim(JSMin::minify($jsin));
+                if (!empty($tmp_jscode)) {
                     $scriptsrc = $tmp_jscode;
-                    unset( $tmp_jscode );
+                    unset($tmp_jscode);
                 } else {
                     $scriptsrc = $jsin;
                 }
             } else {
                 // Removing comments, linebreaks and stuff!
-                $scriptsrc = preg_replace( '#^\s*\/\/.*$#Um', '', $jsin );
-                $scriptsrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc );
-                $scriptsrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc );
+                $scriptsrc = preg_replace('#^\s*\/\/.*$#Um', '', $jsin);
+                $scriptsrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc);
+                $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
             }
 
-            $last_char = substr( $scriptsrc, -1, 1 );
-            if ( ';' !== $last_char && '}' !== $last_char ) {
+            $last_char = substr($scriptsrc, -1, 1);
+            if (';' !== $last_char && '}' !== $last_char) {
                 $scriptsrc .= ';';
             }
 
-            if ( ! empty( $jsfilename ) && str_replace( apply_filters( 'autoptimize_filter_js_speedup_cache', false ), '', $jsfilename ) === $jsfilename ) {
+            if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) {
                 // Don't cache inline CSS or if filter says no!
-                $ccheck->cache( $scriptsrc, 'text/javascript' );
+                $ccheck->cache($scriptsrc, 'text/javascript');
             }
         }
-        unset( $ccheck );
+        unset($ccheck);
 
         return $scriptsrc;
     }
 
-    public function css_snippetcacher( $cssin, $cssfilename )
+    public function css_snippetcacher($cssin, $cssfilename)
     {
-        $md5hash = 'snippet_' . md5( $cssin );
-        $ccheck  = new autoptimizeCache( $md5hash, 'css' );
-        if ( $ccheck->check() ) {
+        $md5hash = 'snippet_'.md5($cssin);
+        $ccheck  = new autoptimizeCache($md5hash, 'css');
+        if ($ccheck->check()) {
             $stylesrc = $ccheck->retrieve();
         } else {
-            if ( ( false === strpos( $cssfilename, 'min.css' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_css_consider_minified', false ), '', $cssfilename ) === $cssfilename ) ) {
+            if ((false === strpos($cssfilename, 'min.css')) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) {
                 $cssmin   = new autoptimizeCSSmin();
-                $tmp_code = trim( $cssmin->run( $cssin ) );
+                $tmp_code = trim($cssmin->run($cssin));
 
-                if ( ! empty( $tmp_code ) ) {
+                if (!empty($tmp_code)) {
                     $stylesrc = $tmp_code;
-                    unset( $tmp_code );
+                    unset($tmp_code);
                 } else {
                     $stylesrc = $cssin;
                 }
             } else {
                 // .min.css -> no heavy-lifting, just some cleanup!
-                $stylesrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin );
-                $stylesrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc );
-                $stylesrc = autoptimizeStyles::fixurls( $cssfilename, $stylesrc );
+                $stylesrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin);
+                $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
+                $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc);
             }
-            if ( ! empty( $cssfilename ) && ( str_replace( apply_filters( 'autoptimize_filter_css_speedup_cache', false ), '', $cssfilename ) === $cssfilename ) ) {
+            if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) {
                 // Only caching CSS if it's not inline and is allowed by filter!
-                $ccheck->cache( $stylesrc, 'text/css' );
+                $ccheck->cache($stylesrc, 'text/css');
             }
         }
-        unset( $ccheck );
+        unset($ccheck);
 
         return $stylesrc;
     }
 
-    public function css_cleanup( $cssin )
+    public function css_cleanup($cssin)
     {
         // Speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating needs to be removed.
-        return trim( str_replace( array( '/*FILESTART*/', '/*FILESTART2*/' ), '', $cssin ) );
+        return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin));
     }
 
-    public function js_cleanup( $jsin )
+    public function js_cleanup($jsin)
     {
-        return trim( $jsin );
+        return trim($jsin);
     }
 }