futtta / autoptimize

classes/autoptimizeToolbar.php

Indentation +12 added lines, -12 removed lines

@@ -75,18 +75,18 @@
         $wp_admin_bar->add_node( array(
             'id'     => 'autoptimize-cache-info',
             'title'  => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' .
-                   '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
-                   '<div class="circle">'.
-                   '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
-                   '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
-                   '<div class="shadow"></div>'.
-                   '</div>'.
-                   '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
-                   '</div>' .
-                   '<table>' .
-                   '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
-                   '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
-                   '</table>',
+                    '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
+                    '<div class="circle">'.
+                    '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
+                    '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
+                    '<div class="shadow"></div>'.
+                    '</div>'.
+                    '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
+                    '</div>' .
+                    '<table>' .
+                    '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
+                    '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
+                    '</table>',
             'parent' => 'autoptimize'
         ));
 

Spacing +44 added lines, -44 removed lines

@@ -1,35 +1,35 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 class autoptimizeToolbar
 {
     public function __construct()
     {
         // If Cache is not available we don't add the Autoptimize Toolbar
-        if( ! autoptimizeCache::cacheavail() ) {
+        if (!autoptimizeCache::cacheavail()) {
             return;
         }
         // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated.
-        add_action( 'wp_loaded', array( $this, 'load_toolbar' ) );
+        add_action('wp_loaded', array($this, 'load_toolbar'));
     }
 
     public function load_toolbar()
     {
         // Check permissions and that toolbar is not hidden via filter
-        if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) {
+        if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) {
             // Create a handler for the AJAX toolbar requests
-            add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) );
+            add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache'));
 
             // Load custom styles, scripts and menu only when needed
-            if ( is_admin_bar_showing() ) {
-                if ( is_admin() ) {
+            if (is_admin_bar_showing()) {
+                if (is_admin()) {
                     // in the case of back-end
-                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+                    add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
                 } else {
                     // in the case of front-end
-                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+                    add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
                 }
                 // Add the Autoptimize Toolbar to the Admin bar
-                add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 );
+                add_action('admin_bar_menu', array($this, 'add_toolbar'), 100);
             }
         }
     }
@@ -42,7 +42,7 @@ 
         $stats = autoptimizeCache::stats();
 
         // Set the Max Size recommended for cache files
-        $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 );
+        $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024);
 
         // Retrieve the current Total Files in cache
         $files = $stats[0];
@@ -52,83 +52,83 @@ 
         $size = $this->format_filesize($bytes);
 
         // We calculated the percentage of cache used
-        $percentage = ceil( $bytes / $max_size * 100 );
-        if ( $percentage > 100 ) {
+        $percentage = ceil($bytes/$max_size*100);
+        if ($percentage > 100) {
             $percentage = 100;
         }
         // We define the type of color indicator for the current state of cache size.
         // "green" if the size is less than 80% of the total recommended
         // "orange" if over 80%
         // "red" if over 100%
-        $color = ( $percentage == 100 ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' );
+        $color = ($percentage == 100) ? 'red' : (($percentage > 80) ? 'orange' : 'green');
 
         // Create or add new items into the Admin Toolbar.
         // Main Autoptimize node
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'    => 'autoptimize',
-            'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( "Autoptimize", 'autoptimize' ) . '</span>',
-            'href'  => admin_url( 'options-general.php?page=autoptimize' ),
-            'meta'  => array( 'class' => 'bullet-' . $color )
+            'title' => '<span class="ab-icon"></span><span class="ab-label">'.__("Autoptimize", 'autoptimize').'</span>',
+            'href'  => admin_url('options-general.php?page=autoptimize'),
+            'meta'  => array('class' => 'bullet-'.$color)
         ));
 
         // Cache Info node
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-cache-info',
-            'title'  => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' .
-                   '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
+            'title'  => '<p>'.__("Cache Info", 'autoptimize').'</p>'.
+                   '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'.
                    '<div class="circle">'.
-                   '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'.
-                   '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'.
+                   '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'.
+                   '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'.
                    '<div class="shadow"></div>'.
                    '</div>'.
-                   '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'.
-                   '</div>' .
-                   '<table>' .
-                   '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
-                   '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
+                   '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'.
+                   '</div>'.
+                   '<table>'.
+                   '<tr><td>'.__("Size", 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'.
+                   '<tr><td>'.__("Files", 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'.
                    '</table>',
             'parent' => 'autoptimize'
         ));
 
         // Delete Cache node
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-delete-cache',
-            'title'  => __( "Delete Cache", 'autoptimize' ),
+            'title'  => __("Delete Cache", 'autoptimize'),
             'parent' => 'autoptimize'
         ));
     }
 
     public function delete_cache()
     {
-        check_ajax_referer( 'ao_delcache_nonce', 'nonce' );
+        check_ajax_referer('ao_delcache_nonce', 'nonce');
         $result = false;
-        if ( current_user_can( 'manage_options' ) )
+        if (current_user_can('manage_options'))
         {
             // We call the function for cleaning the Autoptimize cache
             $result = autoptimizeCache::clearall();
         }
-        wp_send_json( $result );
+        wp_send_json($result);
     }
 
     public function enqueue_scripts()
     {
         // Autoptimize Toolbar Styles
-        wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), time(), 'all' );
+        wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), time(), 'all');
         // Autoptimize Toolbar Javascript
-        wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), time(), true );
+        wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), time(), true);
         // Localizes a registered script with data for a JavaScript variable. (We need this for the AJAX work properly in the front-end mode)
-        wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array(
-            'ajaxurl' => admin_url( 'admin-ajax.php' ),
-            'error_msg' => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ),
-            'dismiss_msg' => __( 'Dismiss this notice.' ),
-            'nonce' => wp_create_nonce( 'ao_delcache_nonce' )
-        ) );
+        wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array(
+            'ajaxurl' => admin_url('admin-ajax.php'),
+            'error_msg' => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'),
+            'dismiss_msg' => __('Dismiss this notice.'),
+            'nonce' => wp_create_nonce('ao_delcache_nonce')
+        ));
     }
 
     public function format_filesize($bytes, $decimals = 2)
     {
-        $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' );
-        for ($i = 0; ($bytes / 1024) > 0.9; $i++, $bytes /= 1024) {}
-        return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[$i] );
+        $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+        for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {}
+        return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]);
     }
 }

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 class autoptimizeToolbar
 {
     public function __construct()

classes/autoptimizeBase.php

Doc Comments +20 added lines

@@ -139,6 +139,10 @@ 
     }
 
     // hide everything between noptimize-comment tags
+
+    /**
+     * @param string $noptimize_in
+     */
     protected function hide_noptimize($noptimize_in) {
         if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { 
             $noptimize_out = preg_replace_callback(
@@ -267,6 +271,9 @@ 
         return $url;
     }
 
+    /**
+     * @param string $payload
+     */
     protected function inject_in_html($payload,$replaceTag) {
         if (strpos($this->content,$replaceTag[0])!== false) {
             if ($replaceTag[1]==="after") {
@@ -286,6 +293,9 @@ 
         }
     }
     
+    /**
+     * @param string $tag
+     */
     protected function isremovable($tag, $removables) {
         foreach ($removables as $match) {
             if (strpos($tag,$match)!==false) {
@@ -296,6 +306,10 @@ 
     }
     
     // inject already minified code in optimized JS/CSS
+
+    /**
+     * @return string
+     */
     protected function inject_minified($in) {
         if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
             $out = preg_replace_callback(
@@ -340,6 +354,9 @@ 
         return $out;
     }
     
+    /**
+     * @param string $pathIn
+     */
     protected function minify_single($pathIn) {
 		// determine JS or CSS and set var (also mimetype), return false if neither
 		if ( $this->str_ends_in($pathIn,".js") === true ) {
@@ -403,6 +420,9 @@ 
 		return $_CachedMinifiedUrl;
 	}
 	
+	/**
+	 * @param string $needle
+	 */
 	protected function str_ends_in($haystack,$needle) {
 		$needleLength = strlen($needle);
 		$haystackLength = strlen($haystack);

Indentation +57 added lines, -57 removed lines

@@ -341,43 +341,43 @@ 
     }
     
     protected function minify_single($pathIn) {
-		// determine JS or CSS and set var (also mimetype), return false if neither
-		if ( $this->str_ends_in($pathIn,".js") === true ) {
-			$codeType="js";
-			$codeMime="text/javascript";
-		} else if ( $this->str_ends_in($pathIn,".css") === true ) {
-			$codeType="css";
-			$codeMime="text/css";			
-		} else {
-			return false;
-		}
+        // determine JS or CSS and set var (also mimetype), return false if neither
+        if ( $this->str_ends_in($pathIn,".js") === true ) {
+            $codeType="js";
+            $codeMime="text/javascript";
+        } else if ( $this->str_ends_in($pathIn,".css") === true ) {
+            $codeType="css";
+            $codeMime="text/css";			
+        } else {
+            return false;
+        }
 		
-		// if min.js or min.css return false
-		if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
-			return false;
-		}
+        // if min.js or min.css return false
+        if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
+            return false;
+        }
 		
-		// read file, return false if empty
-		$_toMinify = file_get_contents($pathIn);
-		if ( empty($_toMinify) ) return false;
+        // read file, return false if empty
+        $_toMinify = file_get_contents($pathIn);
+        if ( empty($_toMinify) ) return false;
 		
-		// check cache
-		$_md5hash = "single_".md5($_toMinify);
-		$_cache = new autoptimizeCache($_md5hash,$codeType);
-		if ($_cache->check() ) {
-			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
-		} else {
-			// if not in cache first minify
-			$_Minified = $_toMinify;
-			if ($codeType === "js") {
-				if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
-					if (@is_callable(array("JSMin","minify"))) {
-						$tmp_code = trim(JSMin::minify($_toMinify));
-					}
-				}
-			} else if ($codeType === "css") {
+        // check cache
+        $_md5hash = "single_".md5($_toMinify);
+        $_cache = new autoptimizeCache($_md5hash,$codeType);
+        if ($_cache->check() ) {
+            $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
+        } else {
+            // if not in cache first minify
+            $_Minified = $_toMinify;
+            if ($codeType === "js") {
+                if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
+                    if (@is_callable(array("JSMin","minify"))) {
+                        $tmp_code = trim(JSMin::minify($_toMinify));
+                    }
+                }
+            } else if ($codeType === "css") {
                 if (class_exists('Minify_CSS_Compressor')) {
-					$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
+                    $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
                 } else if(class_exists('CSSmin')) {
                     $cssmin = new CSSmin();
                     if (method_exists($cssmin,"run")) {
@@ -386,31 +386,31 @@ 
                         $tmp_code = trim(CssMin::minify($_toMinify));
                     }
                 }
-			}
-			if (!empty($tmp_code)) {
-				$_Minified = $tmp_code;
-				unset($tmp_code);
-			}
-			// and then cache
-			$_cache->cache($_Minified,$codeMime);
-			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
-		}
-		unset($_cache);
+            }
+            if (!empty($tmp_code)) {
+                $_Minified = $tmp_code;
+                unset($tmp_code);
+            }
+            // and then cache
+            $_cache->cache($_Minified,$codeMime);
+            $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
+        }
+        unset($_cache);
 	
-		// if CDN, then CDN
-		$_CachedMinfiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);									
+        // if CDN, then CDN
+        $_CachedMinfiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);									
 
-		return $_CachedMinifiedUrl;
-	}
+        return $_CachedMinifiedUrl;
+    }
 	
-	protected function str_ends_in($haystack,$needle) {
-		$needleLength = strlen($needle);
-		$haystackLength = strlen($haystack);
-		$lastPos=strrpos($haystack,$needle);
-		if ($lastPos === $haystackLength - $needleLength) {
-			return true;
-		} else {
-			return false;
-		}
-	}
+    protected function str_ends_in($haystack,$needle) {
+        $needleLength = strlen($needle);
+        $haystackLength = strlen($haystack);
+        $lastPos=strrpos($haystack,$needle);
+        if ($lastPos === $haystackLength - $needleLength) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

Spacing +80 added lines, -80 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 abstract class autoptimizeBase {
     protected $content = '';
@@ -23,37 +23,37 @@ 
     
     //Converts an URL to a full path
     protected function getpath($url) {
-        $url=apply_filters( 'autoptimize_filter_cssjs_alter_url', $url);
+        $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url);
         
-        if (strpos($url,'%')!==false) {
-            $url=urldecode($url);
+        if (strpos($url, '%') !== false) {
+            $url = urldecode($url);
         }
 
-        $siteHost=parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST);
-        $contentHost=parse_url(AUTOPTIMIZE_WP_ROOT_URL,PHP_URL_HOST);
+        $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
+        $contentHost = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST);
         
         // normalize
-        if (strpos($url,'//')===0) {
+        if (strpos($url, '//') === 0) {
             if (is_ssl()) {
                 $url = "https:".$url;
             } else {
                 $url = "http:".$url;
             }
-        } else if ((strpos($url,'//')===false) && (strpos($url,$siteHost)===false)) {
+        } else if ((strpos($url, '//') === false) && (strpos($url, $siteHost) === false)) {
             if (AUTOPTIMIZE_WP_SITE_URL === $siteHost) {
                 $url = AUTOPTIMIZE_WP_SITE_URL.$url;
             } else {
-                $subdir_levels=substr_count(preg_replace("/https?:\/\//","",AUTOPTIMIZE_WP_SITE_URL),"/");
-                $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..",$subdir_levels).$url;
+                $subdir_levels = substr_count(preg_replace("/https?:\/\//", "", AUTOPTIMIZE_WP_SITE_URL), "/");
+                $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..", $subdir_levels).$url;
             }
         }
         
         if ($siteHost !== $contentHost) {
-            $url=str_replace(AUTOPTIMIZE_WP_CONTENT_URL,AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME,$url);
+            $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url);
         }
 
         // first check; hostname wp site should be hostname of url
-        $thisHost=@parse_url($url,PHP_URL_HOST);
+        $thisHost = @parse_url($url, PHP_URL_HOST);
         if ($thisHost !== $siteHost) {
             /* 
             * first try to get all domains from WPML (if available)
@@ -65,18 +65,18 @@ 
             
             $multidomainsWPML = apply_filters('wpml_setting', array(), 'language_domains');
             if (!empty($multidomainsWPML)) {
-                $multidomains = array_map(array($this,"ao_getDomain"),$multidomainsWPML);
+                $multidomains = array_map(array($this, "ao_getDomain"), $multidomainsWPML);
             }
             
             if (!empty($this->cdn_url)) {
-                $multidomains[]=parse_url($this->cdn_url,PHP_URL_HOST);
+                $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST);
             }
             
             $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains);
             
             if (!empty($multidomains)) {
-                if (in_array($thisHost,$multidomains)) {
-                    $url=str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST), $url);
+                if (in_array($thisHost, $multidomains)) {
+                    $url = str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST), $url);
                 } else {
                     return false;
                 }
@@ -86,22 +86,22 @@ 
         }
         
         // try to remove "wp root url" from url while not minding http<>https
-        $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL);
+        $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
         if ($siteHost !== $contentHost) {
             // as we replaced the content-domain with the site-domain, we should match against that 
-            $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_SITE_URL);
+            $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL);
         }
-        $tmp_url = preg_replace('/https?:/','',$url);
-        $path = str_replace($tmp_ao_root,'',$tmp_url);
+        $tmp_url = preg_replace('/https?:/', '', $url);
+        $path = str_replace($tmp_ao_root, '', $tmp_url);
         
         // if path starts with :// or //, this is not a URL in the WP context and we have to assume we can't aggregate
-        if (preg_match('#^:?//#',$path)) {
+        if (preg_match('#^:?//#', $path)) {
             /** External script/css (adsense, etc) */
             return false;
         }
 
         // prepend with WP_ROOT_DIR to have full path to file
-        $path = str_replace('//','/',WP_ROOT_DIR.$path);
+        $path = str_replace('//', '/', WP_ROOT_DIR.$path);
         
         // final check: does file exist and is it readable
         if (file_exists($path) && is_file($path) && is_readable($path)) {
@@ -114,25 +114,25 @@ 
     // needed for WPML-filter
     protected function ao_getDomain($in) {
         // make sure the url starts with something vaguely resembling a protocol
-        if ((strpos($in,"http")!==0) && (strpos($in,"//")!==0)) {
-            $in="http://".$in;
+        if ((strpos($in, "http") !== 0) && (strpos($in, "//") !== 0)) {
+            $in = "http://".$in;
         }
         
         // do the actual parse_url
-        $out = parse_url($in,PHP_URL_HOST);
+        $out = parse_url($in, PHP_URL_HOST);
         
         // fallback if parse_url does not understand the url is in fact a url
-        if (empty($out)) $out=$in;
+        if (empty($out)) $out = $in;
         
         return $out;
     }
 
 
     // logger
-    protected function ao_logger($logmsg,$appendHTML=true) {
+    protected function ao_logger($logmsg, $appendHTML = true) {
         if ($appendHTML) {
-            $logmsg="<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
-            $this->content.=$logmsg;
+            $logmsg = "<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
+            $this->content .= $logmsg;
         } else {
             error_log("Autoptimize: ".$logmsg);
         }
@@ -140,7 +140,7 @@ 
 
     // hide everything between noptimize-comment tags
     protected function hide_noptimize($noptimize_in) {
-        if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { 
+        if (preg_match('/<!--\s?noptimize\s?-->/', $noptimize_in)) { 
             $noptimize_out = preg_replace_callback(
                 '#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is',
                 create_function(
@@ -157,7 +157,7 @@ 
     
     // unhide noptimize-tags
     protected function restore_noptimize($noptimize_in) {
-        if ( strpos( $noptimize_in, '%%NOPTIMIZE%%' ) !== false ) { 
+        if (strpos($noptimize_in, '%%NOPTIMIZE%%') !== false) { 
             $noptimize_out = preg_replace_callback(
                 '#%%NOPTIMIZE%%(.*?)%%NOPTIMIZE%%#is',
                 create_function(
@@ -173,7 +173,7 @@ 
     }
 
     protected function hide_iehacks($iehacks_in) {
-        if ( strpos( $iehacks_in, '<!--[if' ) !== false ) { 
+        if (strpos($iehacks_in, '<!--[if') !== false) { 
             $iehacks_out = preg_replace_callback(
                 '#<!--\[if.*?\[endif\]-->#is',
                 create_function(
@@ -189,7 +189,7 @@ 
     }
 
     protected function restore_iehacks($iehacks_in) {
-        if ( strpos( $iehacks_in, '%%IEHACK%%' ) !== false ) { 
+        if (strpos($iehacks_in, '%%IEHACK%%') !== false) { 
             $iehacks_out = preg_replace_callback(
                 '#%%IEHACK%%(.*?)%%IEHACK%%#is',
                 create_function(
@@ -199,13 +199,13 @@ 
                 $iehacks_in
             );
         } else {
-            $iehacks_out=$iehacks_in;
+            $iehacks_out = $iehacks_in;
         }
         return $iehacks_out;
     }
 
     protected function hide_comments($comments_in) {
-        if ( strpos( $comments_in, '<!--' ) !== false ) {
+        if (strpos($comments_in, '<!--') !== false) {
             $comments_out = preg_replace_callback(
                 '#<!--.*?-->#is',
                 create_function(
@@ -221,7 +221,7 @@ 
     }
 
     protected function restore_comments($comments_in) {
-        if ( strpos( $comments_in, '%%COMMENTS%%' ) !== false ) {
+        if (strpos($comments_in, '%%COMMENTS%%') !== false) {
             $comments_out = preg_replace_callback(
                 '#%%COMMENTS%%(.*?)%%COMMENTS%%#is',
                 create_function(
@@ -231,31 +231,31 @@ 
                 $comments_in
             );
         } else {
-            $comments_out=$comments_in;
+            $comments_out = $comments_in;
         }
         return $comments_out;
     }
 
-    protected function url_replace_cdn( $url ) {
+    protected function url_replace_cdn($url) {
         // API filter to change base CDN URL
-        $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $this->cdn_url );
+        $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $this->cdn_url);
 
-        if ( !empty($cdn_url) )  {
+        if (!empty($cdn_url)) {
             // prepend domain-less absolute URL's
-            if ( ( substr( $url, 0, 1 ) === '/' ) && ( substr( $url, 1, 1 ) !== '/' ) ) {
-                $url = rtrim( $cdn_url, '/' ) . $url;
+            if ((substr($url, 0, 1) === '/') && (substr($url, 1, 1) !== '/')) {
+                $url = rtrim($cdn_url, '/').$url;
             } else {
                 // get wordpress base URL
-                $WPSiteBreakdown = parse_url( AUTOPTIMIZE_WP_SITE_URL );
-                $WPBaseUrl       = $WPSiteBreakdown['scheme'] . '://' . $WPSiteBreakdown['host'];
-                if ( ! empty( $WPSiteBreakdown['port'] ) ) {
-                    $WPBaseUrl .= ":" . $WPSiteBreakdown['port'];
+                $WPSiteBreakdown = parse_url(AUTOPTIMIZE_WP_SITE_URL);
+                $WPBaseUrl       = $WPSiteBreakdown['scheme'].'://'.$WPSiteBreakdown['host'];
+                if (!empty($WPSiteBreakdown['port'])) {
+                    $WPBaseUrl .= ":".$WPSiteBreakdown['port'];
                 }
                 // replace full url's with scheme
-                $tmp_url = str_replace( $WPBaseUrl, rtrim( $cdn_url, '/' ), $url );
-                if ( $tmp_url === $url ) {
+                $tmp_url = str_replace($WPBaseUrl, rtrim($cdn_url, '/'), $url);
+                if ($tmp_url === $url) {
                     // last attempt; replace scheme-less URL's
-                    $url = str_replace( preg_replace( '/https?:/', '', $WPBaseUrl ), rtrim( $cdn_url, '/' ), $url );
+                    $url = str_replace(preg_replace('/https?:/', '', $WPBaseUrl), rtrim($cdn_url, '/'), $url);
                 } else {
                     $url = $tmp_url;
                 }
@@ -263,32 +263,32 @@ 
         }
 
         // allow API filter to alter URL after CDN replacement
-        $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url );
+        $url = apply_filters('autoptimize_filter_base_replace_cdn', $url);
         return $url;
     }
 
-    protected function inject_in_html($payload,$replaceTag) {
-        if (strpos($this->content,$replaceTag[0])!== false) {
-            if ($replaceTag[1]==="after") {
-                $replaceBlock=$replaceTag[0].$payload;
-            } else if ($replaceTag[1]==="replace"){
-                $replaceBlock=$payload;
+    protected function inject_in_html($payload, $replaceTag) {
+        if (strpos($this->content, $replaceTag[0]) !== false) {
+            if ($replaceTag[1] === "after") {
+                $replaceBlock = $replaceTag[0].$payload;
+            } else if ($replaceTag[1] === "replace") {
+                $replaceBlock = $payload;
             } else {
-                $replaceBlock=$payload.$replaceTag[0];
+                $replaceBlock = $payload.$replaceTag[0];
             }
-            $this->content = substr_replace($this->content,$replaceBlock,strpos($this->content,$replaceTag[0]),strlen($replaceTag[0]));
+            $this->content = substr_replace($this->content, $replaceBlock, strpos($this->content, $replaceTag[0]), strlen($replaceTag[0]));
         } else {
             $this->content .= $payload;
             if (!$this->tagWarning) {
-                $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<",">"),"",$replaceTag[0])."\" missing --><!--/noptimize-->";
-                $this->tagWarning=true;
+                $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<", ">"), "", $replaceTag[0])."\" missing --><!--/noptimize-->";
+                $this->tagWarning = true;
             }
         }
     }
     
     protected function isremovable($tag, $removables) {
         foreach ($removables as $match) {
-            if (strpos($tag,$match)!==false) {
+            if (strpos($tag, $match) !== false) {
                 return true;
             }
         }
@@ -297,7 +297,7 @@ 
     
     // inject already minified code in optimized JS/CSS
     protected function inject_minified($in) {
-        if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
+        if (strpos($in, '%%INJECTLATER%%') !== false) {
             $out = preg_replace_callback(
                 '#%%INJECTLATER%%(.*?)%%INJECTLATER%%#is',
                 create_function(
@@ -342,47 +342,47 @@ 
     
     protected function minify_single($pathIn) {
 		// determine JS or CSS and set var (also mimetype), return false if neither
-		if ( $this->str_ends_in($pathIn,".js") === true ) {
-			$codeType="js";
-			$codeMime="text/javascript";
-		} else if ( $this->str_ends_in($pathIn,".css") === true ) {
-			$codeType="css";
-			$codeMime="text/css";			
+		if ($this->str_ends_in($pathIn, ".js") === true) {
+			$codeType = "js";
+			$codeMime = "text/javascript";
+		} else if ($this->str_ends_in($pathIn, ".css") === true) {
+			$codeType = "css";
+			$codeMime = "text/css";			
 		} else {
 			return false;
 		}
 		
 		// if min.js or min.css return false
-		if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
+		if (($this->str_ends_in($pathIn, "-min.".$codeType) === true) || ($this->str_ends_in($pathIn, ".min.".$codeType) === true) || ($this->str_ends_in($pathIn, "js/jquery/jquery.js") === true)) {
 			return false;
 		}
 		
 		// read file, return false if empty
 		$_toMinify = file_get_contents($pathIn);
-		if ( empty($_toMinify) ) return false;
+		if (empty($_toMinify)) return false;
 		
 		// check cache
 		$_md5hash = "single_".md5($_toMinify);
-		$_cache = new autoptimizeCache($_md5hash,$codeType);
-		if ($_cache->check() ) {
+		$_cache = new autoptimizeCache($_md5hash, $codeType);
+		if ($_cache->check()) {
 			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
 		} else {
 			// if not in cache first minify
 			$_Minified = $_toMinify;
 			if ($codeType === "js") {
-				if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
-					if (@is_callable(array("JSMin","minify"))) {
+				if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) {
+					if (@is_callable(array("JSMin", "minify"))) {
 						$tmp_code = trim(JSMin::minify($_toMinify));
 					}
 				}
 			} else if ($codeType === "css") {
                 if (class_exists('Minify_CSS_Compressor')) {
 					$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
-                } else if(class_exists('CSSmin')) {
+                } else if (class_exists('CSSmin')) {
                     $cssmin = new CSSmin();
-                    if (method_exists($cssmin,"run")) {
+                    if (method_exists($cssmin, "run")) {
                         $tmp_code = trim($cssmin->run($_toMinify));
-                    } elseif (@is_callable(array($cssmin,"minify"))) {
+                    } elseif (@is_callable(array($cssmin, "minify"))) {
                         $tmp_code = trim(CssMin::minify($_toMinify));
                     }
                 }
@@ -392,7 +392,7 @@ 
 				unset($tmp_code);
 			}
 			// and then cache
-			$_cache->cache($_Minified,$codeMime);
+			$_cache->cache($_Minified, $codeMime);
 			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
 		}
 		unset($_cache);
@@ -403,10 +403,10 @@ 
 		return $_CachedMinifiedUrl;
 	}
 	
-	protected function str_ends_in($haystack,$needle) {
+	protected function str_ends_in($haystack, $needle) {
 		$needleLength = strlen($needle);
 		$haystackLength = strlen($haystack);
-		$lastPos=strrpos($haystack,$needle);
+		$lastPos = strrpos($haystack, $needle);
 		if ($lastPos === $haystackLength - $needleLength) {
 			return true;
 		} else {

Braces +10 added lines, -3 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 abstract class autoptimizeBase {
     protected $content = '';
@@ -122,7 +125,9 @@ 
         $out = parse_url($in,PHP_URL_HOST);
         
         // fallback if parse_url does not understand the url is in fact a url
-        if (empty($out)) $out=$in;
+        if (empty($out)) {
+            $out=$in;
+        }
         
         return $out;
     }
@@ -359,7 +364,9 @@ 
 		
 		// read file, return false if empty
 		$_toMinify = file_get_contents($pathIn);
-		if ( empty($_toMinify) ) return false;
+		if ( empty($_toMinify) ) {
+		    return false;
+		}
 		
 		// check cache
 		$_md5hash = "single_".md5($_toMinify);