@@ -12,15 +12,15 @@ discard block |
||
12 | 12 | http://www.gnu.org/licenses/gpl.txt |
13 | 13 | */ |
14 | 14 | |
15 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
15 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
16 | 16 | |
17 | -define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__)); |
|
17 | +define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__)); |
|
18 | 18 | |
19 | 19 | // Load config class |
20 | 20 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeConfig.php'); |
21 | 21 | |
22 | 22 | // Load toolbar class |
23 | -include( AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php' ); |
|
23 | +include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php'); |
|
24 | 24 | |
25 | 25 | // Load partners tab if admin |
26 | 26 | if (is_admin()) { |
@@ -28,25 +28,25 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | // Do we gzip when caching (needed early to load autoptimizeCache.php) |
31 | -define('AUTOPTIMIZE_CACHE_NOGZIP',(bool) get_option('autoptimize_cache_nogzip')); |
|
31 | +define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip')); |
|
32 | 32 | |
33 | 33 | // Load cache class |
34 | 34 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCache.php'); |
35 | 35 | |
36 | 36 | // wp-content dir name (automagically set, should not be needed), dirname of AO cache dir and AO-prefix can be overridden in wp-config.php |
37 | -if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME','/'.wp_basename( WP_CONTENT_DIR )); } |
|
38 | -if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR','/cache/autoptimize/'); } |
|
37 | +if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); } |
|
38 | +if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); } |
|
39 | 39 | if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); } |
40 | 40 | |
41 | 41 | // Plugin dir constants (plugin url's defined later to accomodate domain mapped sites) |
42 | -if (is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true )) { |
|
42 | +if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
43 | 43 | $blog_id = get_current_blog_id(); |
44 | - define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' ); |
|
44 | + define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
45 | 45 | } else { |
46 | 46 | define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR); |
47 | 47 | } |
48 | -define('AUTOPTIMIZE_CACHE_DELAY',true); |
|
49 | -define('WP_ROOT_DIR',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',WP_CONTENT_DIR)); |
|
48 | +define('AUTOPTIMIZE_CACHE_DELAY', true); |
|
49 | +define('WP_ROOT_DIR', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', WP_CONTENT_DIR)); |
|
50 | 50 | |
51 | 51 | // Initialize the cache at least once |
52 | 52 | $conf = autoptimizeConfig::instance(); |
@@ -54,59 +54,59 @@ discard block |
||
54 | 54 | /* Check if we're updating, in which case we might need to do stuff and flush the cache |
55 | 55 | to avoid old versions of aggregated files lingering around */ |
56 | 56 | |
57 | -$autoptimize_version="2.1.0"; |
|
58 | -$autoptimize_db_version=get_option('autoptimize_version','none'); |
|
57 | +$autoptimize_version = "2.1.0"; |
|
58 | +$autoptimize_db_version = get_option('autoptimize_version', 'none'); |
|
59 | 59 | |
60 | 60 | if ($autoptimize_db_version !== $autoptimize_version) { |
61 | - if ($autoptimize_db_version==="none") { |
|
61 | + if ($autoptimize_db_version === "none") { |
|
62 | 62 | add_action('admin_notices', 'autoptimize_install_config_notice'); |
63 | 63 | } else { |
64 | 64 | // updating, include the update-code |
65 | 65 | include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeUpdateCode.php'); |
66 | 66 | } |
67 | 67 | |
68 | - update_option('autoptimize_version',$autoptimize_version); |
|
69 | - $autoptimize_db_version=$autoptimize_version; |
|
68 | + update_option('autoptimize_version', $autoptimize_version); |
|
69 | + $autoptimize_db_version = $autoptimize_version; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | // Load translations |
73 | 73 | function autoptimize_load_plugin_textdomain() { |
74 | - load_plugin_textdomain('autoptimize',false,plugin_basename(dirname( __FILE__ )).'/localization'); |
|
74 | + load_plugin_textdomain('autoptimize', false, plugin_basename(dirname(__FILE__)).'/localization'); |
|
75 | 75 | } |
76 | -add_action( 'init', 'autoptimize_load_plugin_textdomain' ); |
|
76 | +add_action('init', 'autoptimize_load_plugin_textdomain'); |
|
77 | 77 | |
78 | -function autoptimize_uninstall(){ |
|
78 | +function autoptimize_uninstall() { |
|
79 | 79 | autoptimizeCache::clearall(); |
80 | 80 | |
81 | - $delete_options=array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice","autoptimize_css_include_inline","autoptimize_js_include_inline","autoptimize_css_nogooglefont"); |
|
81 | + $delete_options = array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice", "autoptimize_css_include_inline", "autoptimize_js_include_inline", "autoptimize_css_nogooglefont"); |
|
82 | 82 | |
83 | - if ( !is_multisite() ) { |
|
84 | - foreach ($delete_options as $del_opt) { delete_option( $del_opt ); } |
|
83 | + if (!is_multisite()) { |
|
84 | + foreach ($delete_options as $del_opt) { delete_option($del_opt); } |
|
85 | 85 | } else { |
86 | 86 | global $wpdb; |
87 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
87 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
88 | 88 | $original_blog_id = get_current_blog_id(); |
89 | - foreach ( $blog_ids as $blog_id ) { |
|
90 | - switch_to_blog( $blog_id ); |
|
91 | - foreach ($delete_options as $del_opt) { delete_option( $del_opt ); } |
|
89 | + foreach ($blog_ids as $blog_id) { |
|
90 | + switch_to_blog($blog_id); |
|
91 | + foreach ($delete_options as $del_opt) { delete_option($del_opt); } |
|
92 | 92 | } |
93 | - switch_to_blog( $original_blog_id ); |
|
93 | + switch_to_blog($original_blog_id); |
|
94 | 94 | } |
95 | 95 | |
96 | - if ( wp_get_schedule( 'ao_cachechecker' ) ) { |
|
97 | - wp_clear_scheduled_hook( 'ao_cachechecker' ); |
|
96 | + if (wp_get_schedule('ao_cachechecker')) { |
|
97 | + wp_clear_scheduled_hook('ao_cachechecker'); |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | |
101 | 101 | function autoptimize_install_config_notice() { |
102 | 102 | echo '<div class="updated"><p>'; |
103 | - _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' ); |
|
103 | + _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize'); |
|
104 | 104 | echo '</p></div>'; |
105 | 105 | } |
106 | 106 | |
107 | 107 | function autoptimize_update_config_notice() { |
108 | 108 | echo '<div class="updated"><p>'; |
109 | - _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' ); |
|
109 | + _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize'); |
|
110 | 110 | echo '</p></div>'; |
111 | 111 | } |
112 | 112 | |
@@ -126,21 +126,21 @@ discard block |
||
126 | 126 | $ao_noptimize = false; |
127 | 127 | |
128 | 128 | // noptimize in qs to get non-optimized page for debugging |
129 | - if (array_key_exists("ao_noptimize",$_GET)) { |
|
130 | - if ( ($_GET["ao_noptimize"]==="1") && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) { |
|
129 | + if (array_key_exists("ao_noptimize", $_GET)) { |
|
130 | + if (($_GET["ao_noptimize"] === "1") && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) { |
|
131 | 131 | $ao_noptimize = true; |
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
135 | 135 | // check for DONOTMINIFY constant as used by e.g. WooCommerce POS |
136 | - if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true || constant('DONOTMINIFY')==="true")) { |
|
136 | + if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === "true")) { |
|
137 | 137 | $ao_noptimize = true; |
138 | 138 | } |
139 | 139 | |
140 | 140 | // filter you can use to block autoptimization on your own terms |
141 | - $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize ); |
|
141 | + $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize); |
|
142 | 142 | |
143 | - if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') || !is_customize_preview() ) ) { |
|
143 | + if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') || !is_customize_preview())) { |
|
144 | 144 | // Config element |
145 | 145 | $conf = autoptimizeConfig::instance(); |
146 | 146 | |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php'); |
149 | 149 | |
150 | 150 | // Load extra classes and set some vars |
151 | - if($conf->get('autoptimize_html')) { |
|
151 | + if ($conf->get('autoptimize_html')) { |
|
152 | 152 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php'); |
153 | 153 | // BUG: new minify-html does not support keeping HTML comments, skipping for now |
154 | 154 | // if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | // } |
159 | 159 | } |
160 | 160 | |
161 | - if($conf->get('autoptimize_js')) { |
|
161 | + if ($conf->get('autoptimize_js')) { |
|
162 | 162 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php'); |
163 | 163 | if (!class_exists('JSMin')) { |
164 | 164 | if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
@@ -167,15 +167,15 @@ discard block |
||
167 | 167 | @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php'); |
168 | 168 | } |
169 | 169 | } |
170 | - if ( ! defined( 'CONCATENATE_SCRIPTS' )) { |
|
171 | - define('CONCATENATE_SCRIPTS',false); |
|
170 | + if (!defined('CONCATENATE_SCRIPTS')) { |
|
171 | + define('CONCATENATE_SCRIPTS', false); |
|
172 | 172 | } |
173 | - if ( ! defined( 'COMPRESS_SCRIPTS' )) { |
|
174 | - define('COMPRESS_SCRIPTS',false); |
|
173 | + if (!defined('COMPRESS_SCRIPTS')) { |
|
174 | + define('COMPRESS_SCRIPTS', false); |
|
175 | 175 | } |
176 | 176 | } |
177 | 177 | |
178 | - if($conf->get('autoptimize_css')) { |
|
178 | + if ($conf->get('autoptimize_css')) { |
|
179 | 179 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php'); |
180 | 180 | if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
181 | 181 | if (!class_exists('Minify_CSS_Compressor')) { |
@@ -186,13 +186,13 @@ discard block |
||
186 | 186 | @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php'); |
187 | 187 | } |
188 | 188 | } |
189 | - if ( ! defined( 'COMPRESS_CSS' )) { |
|
190 | - define('COMPRESS_CSS',false); |
|
189 | + if (!defined('COMPRESS_CSS')) { |
|
190 | + define('COMPRESS_CSS', false); |
|
191 | 191 | } |
192 | 192 | } |
193 | 193 | |
194 | 194 | // filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned! |
195 | - if (apply_filters('autoptimize_filter_obkiller',false)) { |
|
195 | + if (apply_filters('autoptimize_filter_obkiller', false)) { |
|
196 | 196 | while (ob_get_level() > 0) { |
197 | 197 | ob_end_clean(); |
198 | 198 | } |
@@ -205,35 +205,35 @@ discard block |
||
205 | 205 | |
206 | 206 | // Action on end, this is where the magic happens |
207 | 207 | function autoptimize_end_buffering($content) { |
208 | - if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/',$content) === 1 || stripos($content,"<xsl:stylesheet") !== false ) { return $content; } |
|
208 | + if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/', $content) === 1 || stripos($content, "<xsl:stylesheet") !== false) { return $content; } |
|
209 | 209 | |
210 | 210 | // load URL constants as late as possible to allow domain mapper to kick in |
211 | 211 | if (function_exists("domain_mapping_siteurl")) { |
212 | - define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id())); |
|
213 | - define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url())); |
|
212 | + define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id())); |
|
213 | + define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url())); |
|
214 | 214 | } else { |
215 | - define('AUTOPTIMIZE_WP_SITE_URL',site_url()); |
|
216 | - define('AUTOPTIMIZE_WP_CONTENT_URL',content_url()); |
|
215 | + define('AUTOPTIMIZE_WP_SITE_URL', site_url()); |
|
216 | + define('AUTOPTIMIZE_WP_CONTENT_URL', content_url()); |
|
217 | 217 | } |
218 | 218 | |
219 | - if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) { |
|
219 | + if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
220 | 220 | $blog_id = get_current_blog_id(); |
221 | - define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' ); |
|
221 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
222 | 222 | } else { |
223 | - define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
223 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
224 | 224 | } |
225 | - define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL)); |
|
225 | + define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL)); |
|
226 | 226 | |
227 | 227 | // Config element |
228 | 228 | $conf = autoptimizeConfig::instance(); |
229 | 229 | |
230 | 230 | // Choose the classes |
231 | 231 | $classes = array(); |
232 | - if($conf->get('autoptimize_js')) |
|
232 | + if ($conf->get('autoptimize_js')) |
|
233 | 233 | $classes[] = 'autoptimizeScripts'; |
234 | - if($conf->get('autoptimize_css')) |
|
234 | + if ($conf->get('autoptimize_css')) |
|
235 | 235 | $classes[] = 'autoptimizeStyles'; |
236 | - if($conf->get('autoptimize_html')) |
|
236 | + if ($conf->get('autoptimize_html')) |
|
237 | 237 | $classes[] = 'autoptimizeHTML'; |
238 | 238 | |
239 | 239 | // Set some options |
@@ -262,12 +262,12 @@ discard block |
||
262 | 262 | ) |
263 | 263 | ); |
264 | 264 | |
265 | - $content = apply_filters( 'autoptimize_filter_html_before_minify', $content ); |
|
265 | + $content = apply_filters('autoptimize_filter_html_before_minify', $content); |
|
266 | 266 | |
267 | 267 | // Run the classes |
268 | - foreach($classes as $name) { |
|
268 | + foreach ($classes as $name) { |
|
269 | 269 | $instance = new $name($content); |
270 | - if($instance->read($classoptions[$name])) { |
|
270 | + if ($instance->read($classoptions[$name])) { |
|
271 | 271 | $instance->minify(); |
272 | 272 | $instance->cache(); |
273 | 273 | $content = $instance->getcontent(); |
@@ -275,19 +275,19 @@ discard block |
||
275 | 275 | unset($instance); |
276 | 276 | } |
277 | 277 | |
278 | - $content = apply_filters( 'autoptimize_html_after_minify', $content ); |
|
278 | + $content = apply_filters('autoptimize_html_after_minify', $content); |
|
279 | 279 | return $content; |
280 | 280 | } |
281 | 281 | |
282 | -if ( autoptimizeCache::cacheavail() ) { |
|
282 | +if (autoptimizeCache::cacheavail()) { |
|
283 | 283 | $conf = autoptimizeConfig::instance(); |
284 | - if( $conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') ) { |
|
284 | + if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) { |
|
285 | 285 | // Hook to wordpress |
286 | 286 | if (defined('AUTOPTIMIZE_INIT_EARLIER')) { |
287 | - add_action('init','autoptimize_start_buffering',-1); |
|
287 | + add_action('init', 'autoptimize_start_buffering', -1); |
|
288 | 288 | } else { |
289 | 289 | if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); } |
290 | - add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2); |
|
290 | + add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2); |
|
291 | 291 | } |
292 | 292 | } |
293 | 293 | } else { |
@@ -295,9 +295,9 @@ discard block |
||
295 | 295 | } |
296 | 296 | |
297 | 297 | function autoptimize_activate() { |
298 | - register_uninstall_hook( __FILE__, 'autoptimize_uninstall' ); |
|
298 | + register_uninstall_hook(__FILE__, 'autoptimize_uninstall'); |
|
299 | 299 | } |
300 | -register_activation_hook( __FILE__, 'autoptimize_activate' ); |
|
300 | +register_activation_hook(__FILE__, 'autoptimize_activate'); |
|
301 | 301 | |
302 | 302 | include_once('classlesses/autoptimizeCacheChecker.php'); |
303 | 303 |