futtta / autoptimize

classlesses/autoptimizePartners.php

Spacing +22 added lines, -22 removed lines

@@ -3,24 +3,24 @@ 
 Classlessly add a "more tools" tab to promote (future) AO addons and/ or affiliate services
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 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
     }
 }
@@ -71,10 +71,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(); ?>
@@ -84,32 +84,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; ?>

Braces +4 added lines, -1 removed lines

@@ -3,7 +3,10 @@
 Classlessly add a "more tools" tab to promote (future) AO addons and/ or affiliate services
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 add_action('admin_init', 'ao_partner_tabs_preinit');
 function ao_partner_tabs_preinit() {

classlesses/autoptimizePageCacheFlush.php

Spacing +19 added lines, -19 removed lines

@@ -2,55 +2,55 @@
 // flush as many page cache plugin's caches as possible
 // hyper cache and gator cache hook into AO, so we don't need to :-)
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 function autoptimize_flush_pagecache() {
-    if(function_exists('wp_cache_clear_cache')) {
+    if (function_exists('wp_cache_clear_cache')) {
         if (is_multisite()) {
             $blog_id = get_current_blog_id();
             wp_cache_clear_cache($blog_id);
         } else {
             wp_cache_clear_cache();
         }
-    } else if ( has_action('cachify_flush_cache') ) {
+    } else if (has_action('cachify_flush_cache')) {
         do_action('cachify_flush_cache');
-    } else if ( function_exists('w3tc_pgcache_flush') ) {
+    } else if (function_exists('w3tc_pgcache_flush')) {
         w3tc_pgcache_flush();
-    } else if ( function_exists('wp_fast_cache_bulk_delete_all') ) {
+    } else if (function_exists('wp_fast_cache_bulk_delete_all')) {
         wp_fast_cache_bulk_delete_all(); // still to retest
     } else if (class_exists("WpFastestCache")) {
         $wpfc = new WpFastestCache();
         $wpfc -> deleteCache();
-    } else if ( class_exists("c_ws_plugin__qcache_purging_routines") ) {
+    } else if (class_exists("c_ws_plugin__qcache_purging_routines")) {
         c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache, still to retest
-    } else if ( class_exists("zencache") ) {
+    } else if (class_exists("zencache")) {
         zencache::clear();
-    } else if ( class_exists("comet_cache") ) {
+    } else if (class_exists("comet_cache")) {
         comet_cache::clear();
-    } else if ( class_exists("WpeCommon") ) {
-        if ( apply_filters('autoptimize_flush_wpengine_aggressive', false) ) {
-            if ( method_exists( "WpeCommon", "purge_memcached" ) ) {
+    } else if (class_exists("WpeCommon")) {
+        if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) {
+            if (method_exists("WpeCommon", "purge_memcached")) {
                 WpeCommon::purge_memcached();
             }
-            if ( method_exists( "WpeCommon", "clear_maxcdn_cache" ) ) {  
+            if (method_exists("WpeCommon", "clear_maxcdn_cache")) {  
                 WpeCommon::clear_maxcdn_cache();
             }
         }
-        if ( method_exists( "WpeCommon", "purge_varnish_cache" ) ) {
+        if (method_exists("WpeCommon", "purge_varnish_cache")) {
             WpeCommon::purge_varnish_cache();   
         }
-    } else if ( function_exists('sg_cachepress_purge_cache') ) {
+    } else if (function_exists('sg_cachepress_purge_cache')) {
         sg_cachepress_purge_cache();
-    } else if(file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')){
+    } else if (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) {
         // fallback for WP-Super-Cache
         global $cache_path;
         if (is_multisite()) {
             $blog_id = get_current_blog_id();
-            prune_super_cache( get_supercache_dir( $blog_id ), true );
-            prune_super_cache( $cache_path . 'blogs/', true );
+            prune_super_cache(get_supercache_dir($blog_id), true);
+            prune_super_cache($cache_path.'blogs/', true);
         } else {
-            prune_super_cache($cache_path.'supercache/',true);
-            prune_super_cache($cache_path,true);
+            prune_super_cache($cache_path.'supercache/', true);
+            prune_super_cache($cache_path, true);
         }
     }
 }
\ No newline at end of file

Braces +4 added lines, -1 removed lines

@@ -2,7 +2,10 @@
 // flush as many page cache plugin's caches as possible
 // hyper cache and gator cache hook into AO, so we don't need to :-)
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 function autoptimize_flush_pagecache() {
     if(function_exists('wp_cache_clear_cache')) {

classlesses/autoptimizeSpeedupper.php

Indentation +4 added lines, -4 removed lines

@@ -88,13 +88,13 @@
 }
 
 function ao_css_speedup_cleanup($cssin) {
-	// speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
-	return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
+    // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
+    return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
 }
 
 function ao_js_speedup_cleanup($jsin) {
-	// cleanup
-	return trim($jsin);
+    // cleanup
+    return trim($jsin);
 }
 
 add_filter('autoptimize_css_individual_style','ao_css_snippetcacher',10,2);

Spacing +34 added lines, -34 removed lines

@@ -4,64 +4,64 @@ 
 * new in Autoptimize 2.2
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-function ao_js_snippetcacher($jsin,$jsfilename) {
+function ao_js_snippetcacher($jsin, $jsfilename) {
     $md5hash = "snippet_".md5($jsin);
-    $ccheck = new autoptimizeCache($md5hash,'js');
-    if($ccheck->check()) {
+    $ccheck = new autoptimizeCache($md5hash, 'js');
+    if ($ccheck->check()) {
         $scriptsrc = $ccheck->retrieve();
     } else {
-        if ( (strpos($jsfilename,"min.js") === false) && ( strpos($jsfilename,"js/jquery/jquery.js") === false ) && ( str_replace(apply_filters('autoptimize_filter_js_consider_minified',false), '', $jsfilename) === $jsfilename ) ) {
-            if(class_exists('JSMin')) {
+        if ((strpos($jsfilename, "min.js") === false) && (strpos($jsfilename, "js/jquery/jquery.js") === false) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) {
+            if (class_exists('JSMin')) {
                 $tmp_jscode = trim(JSMin::minify($jsin));
                 if (!empty($tmp_jscode)) {
                         $scriptsrc = $tmp_jscode;
                         unset($tmp_jscode);
                 } else {
-                        $scriptsrc=$jsin;
+                        $scriptsrc = $jsin;
                 }
             } else {
-                $scriptsrc=$jsin;
+                $scriptsrc = $jsin;
             }
         } else {
             // do some housekeeping here to remove comments & linebreaks and stuff
-            $scriptsrc=preg_replace("#^\s*\/\/.*$#Um","",$jsin);
-            $scriptsrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$scriptsrc);
-            $scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
+            $scriptsrc = preg_replace("#^\s*\/\/.*$#Um", "", $jsin);
+            $scriptsrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $scriptsrc);
+            $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
 
-            if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) {
-                $scriptsrc.=";";
+            if ((substr($scriptsrc, -1, 1) !== ";") && (substr($scriptsrc, -1, 1) !== "}")) {
+                $scriptsrc .= ";";
             }
         }
-        if ( !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);
 
-    if (get_option("autoptimize_js_trycatch")==="on") {
-        $scriptsrc="try{".$scriptsrc."}catch(e){}";
+    if (get_option("autoptimize_js_trycatch") === "on") {
+        $scriptsrc = "try{".$scriptsrc."}catch(e){}";
     }
 
     return $scriptsrc;
 }
 
-function ao_css_snippetcacher($cssin,$cssfilename) {
+function ao_css_snippetcacher($cssin, $cssfilename) {
     $md5hash = "snippet_".md5($cssin);
-    $ccheck = new autoptimizeCache($md5hash,'css');
-    if($ccheck->check()) {
+    $ccheck = new autoptimizeCache($md5hash, 'css');
+    if ($ccheck->check()) {
         $stylesrc = $ccheck->retrieve();
     } else {
-        if ( ( strpos($cssfilename,"min.css") === false ) && ( str_replace( apply_filters('autoptimize_filter_css_consider_minified',false), '', $cssfilename ) === $cssfilename ) ) {
+        if ((strpos($cssfilename, "min.css") === false) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) {
             if (class_exists('Minify_CSS_Compressor')) {
                 $tmp_code = trim(Minify_CSS_Compressor::process($cssin));
-            } else if(class_exists('CSSmin')) {
+            } else if (class_exists('CSSmin')) {
                 $cssmin = new CSSmin();
-                if (method_exists($cssmin,"run")) {
+                if (method_exists($cssmin, "run")) {
                     $tmp_code = trim($cssmin->run($cssin));
-                } elseif (@is_callable(array($cssmin,"minify"))) {
+                } elseif (@is_callable(array($cssmin, "minify"))) {
                     $tmp_code = trim(CssMin::minify($cssin));
                 }
             }
@@ -74,13 +74,13 @@ 
             }
         } 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 cache CSS if not inline and allowed by filter
-            $ccheck->cache($stylesrc,'text/css');
+            $ccheck->cache($stylesrc, 'text/css');
         }
     }
     unset($ccheck);
@@ -89,7 +89,7 @@ 
 
 function ao_css_speedup_cleanup($cssin) {
 	// speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
-	return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
+	return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin));
 }
 
 function ao_js_speedup_cleanup($jsin) {
@@ -97,7 +97,7 @@ 
 	return trim($jsin);
 }
 
-add_filter('autoptimize_css_individual_style','ao_css_snippetcacher',10,2);
-add_filter('autoptimize_js_individual_script','ao_js_snippetcacher',10,2);
-add_filter('autoptimize_css_after_minify','ao_css_speedup_cleanup',10,1);
-add_filter('autoptimize_js_after_minify','ao_js_speedup_cleanup',10,1);
+add_filter('autoptimize_css_individual_style', 'ao_css_snippetcacher', 10, 2);
+add_filter('autoptimize_js_individual_script', 'ao_js_snippetcacher', 10, 2);
+add_filter('autoptimize_css_after_minify', 'ao_css_speedup_cleanup', 10, 1);
+add_filter('autoptimize_js_after_minify', 'ao_js_speedup_cleanup', 10, 1);

Braces +4 added lines, -1 removed lines

@@ -4,7 +4,10 @@
 * new in Autoptimize 2.2
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 function ao_js_snippetcacher($jsin,$jsfilename) {
     $md5hash = "snippet_".md5($jsin);

classes/autoptimizeCLI.php

Indentation +11 added lines, -11 removed lines

@@ -1,21 +1,21 @@
 <?php
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 class autoptimizeCLI extends WP_CLI_Command {
 
-	/**
-	 * Clears the cache.
-	 *
-	 * @subcommand clear
-	 */
-	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' ) );
-	}
+    /**
+     * Clears the cache.
+     *
+     * @subcommand clear
+     */
+    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' ) );
+    }
 
 }
 

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -11,12 +11,12 @@ 
 	 *
 	 * @subcommand clear
 	 */
-	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');