@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Handles disk-cache-related operations. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -38,17 +38,17 @@ discard block |
||
38 | 38 | * @param string $md5 Hash. |
39 | 39 | * @param string $ext Extension. |
40 | 40 | */ |
41 | - public function __construct( $md5, $ext = 'php' ) |
|
41 | + public function __construct($md5, $ext = 'php') |
|
42 | 42 | { |
43 | 43 | $this->cachedir = AUTOPTIMIZE_CACHE_DIR; |
44 | 44 | $this->nogzip = AUTOPTIMIZE_CACHE_NOGZIP; |
45 | - if ( ! $this->nogzip ) { |
|
46 | - $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.php'; |
|
45 | + if (!$this->nogzip) { |
|
46 | + $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.php'; |
|
47 | 47 | } else { |
48 | - if ( in_array( $ext, array( 'js', 'css' ) ) ) { |
|
49 | - $this->filename = $ext . '/' . AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.' . $ext; |
|
48 | + if (in_array($ext, array('js', 'css'))) { |
|
49 | + $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext; |
|
50 | 50 | } else { |
51 | - $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.' . $ext; |
|
51 | + $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext; |
|
52 | 52 | } |
53 | 53 | } |
54 | 54 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public function check() |
62 | 62 | { |
63 | - return file_exists( $this->cachedir . $this->filename ); |
|
63 | + return file_exists($this->cachedir.$this->filename); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
@@ -70,11 +70,11 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function retrieve() |
72 | 72 | { |
73 | - if ( $this->check() ) { |
|
74 | - if ( false == $this->nogzip ) { |
|
75 | - return file_get_contents( $this->cachedir . $this->filename . '.none' ); |
|
73 | + if ($this->check()) { |
|
74 | + if (false == $this->nogzip) { |
|
75 | + return file_get_contents($this->cachedir.$this->filename.'.none'); |
|
76 | 76 | } else { |
77 | - return file_get_contents( $this->cachedir . $this->filename ); |
|
77 | + return file_get_contents($this->cachedir.$this->filename); |
|
78 | 78 | } |
79 | 79 | } |
80 | 80 | return false; |
@@ -88,22 +88,22 @@ discard block |
||
88 | 88 | * |
89 | 89 | * @return void |
90 | 90 | */ |
91 | - public function cache( $data, $mime ) |
|
91 | + public function cache($data, $mime) |
|
92 | 92 | { |
93 | - if ( false === $this->nogzip ) { |
|
93 | + if (false === $this->nogzip) { |
|
94 | 94 | // We handle gzipping ourselves. |
95 | 95 | $file = 'default.php'; |
96 | - $phpcode = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $file ); |
|
97 | - $phpcode = str_replace( array( '%%CONTENT%%', 'exit;' ), array( $mime, '' ), $phpcode ); |
|
96 | + $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$file); |
|
97 | + $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode); |
|
98 | 98 | |
99 | - file_put_contents( $this->cachedir . $this->filename, $phpcode ); |
|
100 | - file_put_contents( $this->cachedir . $this->filename . '.none', $data ); |
|
99 | + file_put_contents($this->cachedir.$this->filename, $phpcode); |
|
100 | + file_put_contents($this->cachedir.$this->filename.'.none', $data); |
|
101 | 101 | } else { |
102 | 102 | // Write code to cache without doing anything else. |
103 | - file_put_contents( $this->cachedir . $this->filename, $data ); |
|
104 | - if ( apply_filters( 'autoptimize_filter_cache_create_static_gzip', false ) ) { |
|
103 | + file_put_contents($this->cachedir.$this->filename, $data); |
|
104 | + if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) { |
|
105 | 105 | // Create an additional cached gzip file. |
106 | - file_put_contents( $this->cachedir . $this->filename . '.gz', gzencode( $data, 9, FORCE_GZIP ) ); |
|
106 | + file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($data, 9, FORCE_GZIP)); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | // The original idea here was to provide 3rd party code a hook so that |
121 | 121 | // it can "listen" to all the complete autoptimized-urls that the page |
122 | 122 | // will emit... Or something to that effect I think? |
123 | - apply_filters( 'autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL . $this->filename ); |
|
123 | + apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename); |
|
124 | 124 | |
125 | 125 | return $this->filename; |
126 | 126 | } |
@@ -133,11 +133,11 @@ discard block |
||
133 | 133 | * @param string $file Filename. |
134 | 134 | * @return bool |
135 | 135 | */ |
136 | - protected static function is_valid_cache_file( $dir, $file ) |
|
136 | + protected static function is_valid_cache_file($dir, $file) |
|
137 | 137 | { |
138 | - if ( '.' !== $file && '..' !== $file && |
|
139 | - false !== strpos( $file, AUTOPTIMIZE_CACHEFILE_PREFIX ) && |
|
140 | - is_file( $dir . $file ) ) { |
|
138 | + if ('.' !== $file && '..' !== $file && |
|
139 | + false !== strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) && |
|
140 | + is_file($dir.$file)) { |
|
141 | 141 | |
142 | 142 | // It's a valid file! |
143 | 143 | return true; |
@@ -155,16 +155,16 @@ discard block |
||
155 | 155 | protected static function clear_cache_classic() |
156 | 156 | { |
157 | 157 | $contents = self::get_cache_contents(); |
158 | - foreach ( $contents as $name => $files ) { |
|
159 | - $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/'; |
|
160 | - foreach ( $files as $file ) { |
|
161 | - if ( self::is_valid_cache_file( $dir, $file ) ) { |
|
162 | - @unlink( $dir . $file ); // @codingStandardsIgnoreLine |
|
158 | + foreach ($contents as $name => $files) { |
|
159 | + $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/'; |
|
160 | + foreach ($files as $file) { |
|
161 | + if (self::is_valid_cache_file($dir, $file)) { |
|
162 | + @unlink($dir.$file); // @codingStandardsIgnoreLine |
|
163 | 163 | } |
164 | 164 | } |
165 | 165 | } |
166 | 166 | |
167 | - @unlink( AUTOPTIMIZE_CACHE_DIR . '/.htaccess' ); // @codingStandardsIgnoreLine |
|
167 | + @unlink(AUTOPTIMIZE_CACHE_DIR.'/.htaccess'); // @codingStandardsIgnoreLine |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | /** |
@@ -175,19 +175,19 @@ discard block |
||
175 | 175 | * |
176 | 176 | * @return bool |
177 | 177 | */ |
178 | - protected static function rmdir( $pathname ) |
|
178 | + protected static function rmdir($pathname) |
|
179 | 179 | { |
180 | - $files = self::get_dir_contents( $pathname ); |
|
181 | - foreach ( $files as $file ) { |
|
182 | - $path = $pathname . '/' . $file; |
|
183 | - if ( is_dir( $path ) ) { |
|
184 | - self::rmdir( $path ); |
|
180 | + $files = self::get_dir_contents($pathname); |
|
181 | + foreach ($files as $file) { |
|
182 | + $path = $pathname.'/'.$file; |
|
183 | + if (is_dir($path)) { |
|
184 | + self::rmdir($path); |
|
185 | 185 | } else { |
186 | - unlink( $path ); |
|
186 | + unlink($path); |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 | |
190 | - return rmdir( $pathname ); |
|
190 | + return rmdir($pathname); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | /** |
@@ -204,12 +204,12 @@ discard block |
||
204 | 204 | $new_name = self::get_unique_name(); |
205 | 205 | |
206 | 206 | // Makes sure the new pathname is on the same level... |
207 | - $new_pathname = dirname( $dir ) . '/' . $new_name; |
|
208 | - $renamed = @rename( $dir, $new_pathname ); // @codingStandardsIgnoreLine |
|
207 | + $new_pathname = dirname($dir).'/'.$new_name; |
|
208 | + $renamed = @rename($dir, $new_pathname); // @codingStandardsIgnoreLine |
|
209 | 209 | |
210 | 210 | // When renamed, re-create the default cache directory back so it's |
211 | 211 | // available again... |
212 | - if ( $renamed ) { |
|
212 | + if ($renamed) { |
|
213 | 213 | $ok = self::cacheavail(); |
214 | 214 | } |
215 | 215 | |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | */ |
224 | 224 | public static function advanced_cache_clear_enabled() |
225 | 225 | { |
226 | - return apply_filters( 'autoptimize_filter_cache_clear_advanced', false ); |
|
226 | + return apply_filters('autoptimize_filter_cache_clear_advanced', false); |
|
227 | 227 | } |
228 | 228 | |
229 | 229 | /** |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | protected static function get_unique_name() |
235 | 235 | { |
236 | 236 | $prefix = self::get_advanced_cache_clear_prefix(); |
237 | - $new_name = uniqid( $prefix, true ); |
|
237 | + $new_name = uniqid($prefix, true); |
|
238 | 238 | |
239 | 239 | return $new_name; |
240 | 240 | } |
@@ -247,8 +247,8 @@ discard block |
||
247 | 247 | protected static function get_advanced_cache_clear_prefix() |
248 | 248 | { |
249 | 249 | $pathname = self::get_pathname_base(); |
250 | - $basename = basename( $pathname ); |
|
251 | - $prefix = $basename . '-'; |
|
250 | + $basename = basename($pathname); |
|
251 | + $prefix = $basename.'-'; |
|
252 | 252 | |
253 | 253 | return $prefix; |
254 | 254 | } |
@@ -261,9 +261,9 @@ discard block |
||
261 | 261 | * |
262 | 262 | * @return array |
263 | 263 | */ |
264 | - protected static function get_dir_contents( $pathname ) |
|
264 | + protected static function get_dir_contents($pathname) |
|
265 | 265 | { |
266 | - return array_slice( scandir( $pathname ), 2 ); |
|
266 | + return array_slice(scandir($pathname), 2); |
|
267 | 267 | } |
268 | 268 | |
269 | 269 | /** |
@@ -277,18 +277,18 @@ discard block |
||
277 | 277 | { |
278 | 278 | $dir = self::get_pathname_base(); |
279 | 279 | $prefix = self::get_advanced_cache_clear_prefix(); |
280 | - $parent = dirname( $dir ); |
|
280 | + $parent = dirname($dir); |
|
281 | 281 | $ok = false; |
282 | 282 | |
283 | 283 | // Returns the list of files without '.' and '..' elements. |
284 | - $files = self::get_dir_contents( $parent ); |
|
285 | - if ( is_array( $files ) && ! empty( $files ) ) { |
|
286 | - foreach ( $files as $file ) { |
|
287 | - $path = $parent . '/' . $file; |
|
288 | - $prefixed = ( false !== strpos( $path, $prefix ) ); |
|
284 | + $files = self::get_dir_contents($parent); |
|
285 | + if (is_array($files) && !empty($files)) { |
|
286 | + foreach ($files as $file) { |
|
287 | + $path = $parent.'/'.$file; |
|
288 | + $prefixed = (false !== strpos($path, $prefix)); |
|
289 | 289 | // Removing only our own (prefixed) directories... |
290 | - if ( is_dir( $path ) && $prefixed ) { |
|
291 | - $ok = self::rmdir( $path ); |
|
290 | + if (is_dir($path) && $prefixed) { |
|
291 | + $ok = self::rmdir($path); |
|
292 | 292 | } |
293 | 293 | } |
294 | 294 | } |
@@ -308,9 +308,9 @@ discard block |
||
308 | 308 | { |
309 | 309 | $pathname = self::get_pathname_base(); |
310 | 310 | |
311 | - if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) { |
|
311 | + if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
312 | 312 | $blog_id = get_current_blog_id(); |
313 | - $pathname .= $blog_id . '/'; |
|
313 | + $pathname .= $blog_id.'/'; |
|
314 | 314 | } |
315 | 315 | |
316 | 316 | return $pathname; |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | */ |
324 | 324 | protected static function get_pathname_base() |
325 | 325 | { |
326 | - $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR; |
|
326 | + $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR; |
|
327 | 327 | |
328 | 328 | return $pathname; |
329 | 329 | } |
@@ -335,38 +335,38 @@ discard block |
||
335 | 335 | * |
336 | 336 | * @return bool |
337 | 337 | */ |
338 | - public static function clearall( $propagate = true ) |
|
338 | + public static function clearall($propagate = true) |
|
339 | 339 | { |
340 | - if ( ! self::cacheavail() ) { |
|
340 | + if (!self::cacheavail()) { |
|
341 | 341 | return false; |
342 | 342 | } |
343 | 343 | |
344 | 344 | // TODO/FIXME: If cache is big, switch to advanced/new cache clearing automatically? |
345 | - if ( self::advanced_cache_clear_enabled() ) { |
|
345 | + if (self::advanced_cache_clear_enabled()) { |
|
346 | 346 | self::clear_cache_via_rename(); |
347 | 347 | } else { |
348 | 348 | self::clear_cache_classic(); |
349 | 349 | } |
350 | 350 | |
351 | 351 | // Remove the transient so it gets regenerated... |
352 | - delete_transient( 'autoptimize_stats' ); |
|
352 | + delete_transient('autoptimize_stats'); |
|
353 | 353 | |
354 | 354 | // Cache was just purged, clear page cache and allow others to hook into our purging... |
355 | - if ( true === $propagate ) { |
|
356 | - if ( ! function_exists( 'autoptimize_do_cachepurged_action' ) ) { |
|
355 | + if (true === $propagate) { |
|
356 | + if (!function_exists('autoptimize_do_cachepurged_action')) { |
|
357 | 357 | function autoptimize_do_cachepurged_action() { |
358 | - do_action( 'autoptimize_action_cachepurged' ); |
|
358 | + do_action('autoptimize_action_cachepurged'); |
|
359 | 359 | } |
360 | 360 | } |
361 | - add_action( 'shutdown', 'autoptimize_do_cachepurged_action', 11 ); |
|
362 | - add_action( 'autoptimize_action_cachepurged', array( 'autoptimizeCache', 'flushPageCache' ), 10, 0 ); |
|
361 | + add_action('shutdown', 'autoptimize_do_cachepurged_action', 11); |
|
362 | + add_action('autoptimize_action_cachepurged', array('autoptimizeCache', 'flushPageCache'), 10, 0); |
|
363 | 363 | } |
364 | 364 | |
365 | 365 | // Warm cache (part of speedupper)! |
366 | - if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) { |
|
367 | - $url = site_url() . '/?ao_speedup_cachebuster=' . rand( 1, 100000 ); |
|
368 | - $cache = @wp_remote_get( $url ); // @codingStandardsIgnoreLine |
|
369 | - unset( $cache ); |
|
366 | + if (apply_filters('autoptimize_filter_speedupper', true)) { |
|
367 | + $url = site_url().'/?ao_speedup_cachebuster='.rand(1, 100000); |
|
368 | + $cache = @wp_remote_get($url); // @codingStandardsIgnoreLine |
|
369 | + unset($cache); |
|
370 | 370 | } |
371 | 371 | |
372 | 372 | return true; |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | */ |
382 | 382 | public static function clearall_actionless() |
383 | 383 | { |
384 | - return self::clearall( false ); |
|
384 | + return self::clearall(false); |
|
385 | 385 | } |
386 | 386 | |
387 | 387 | /** |
@@ -393,8 +393,8 @@ discard block |
||
393 | 393 | { |
394 | 394 | $contents = array(); |
395 | 395 | |
396 | - foreach ( array( '', 'js', 'css' ) as $dir ) { |
|
397 | - $contents[ $dir ] = scandir( AUTOPTIMIZE_CACHE_DIR . $dir ); |
|
396 | + foreach (array('', 'js', 'css') as $dir) { |
|
397 | + $contents[$dir] = scandir(AUTOPTIMIZE_CACHE_DIR.$dir); |
|
398 | 398 | } |
399 | 399 | |
400 | 400 | return $contents; |
@@ -407,21 +407,21 @@ discard block |
||
407 | 407 | */ |
408 | 408 | public static function stats() |
409 | 409 | { |
410 | - $stats = get_transient( 'autoptimize_stats' ); |
|
410 | + $stats = get_transient('autoptimize_stats'); |
|
411 | 411 | |
412 | 412 | // If no transient, do the actual scan! |
413 | - if ( ! is_array( $stats ) ) { |
|
414 | - if ( ! self::cacheavail() ) { |
|
413 | + if (!is_array($stats)) { |
|
414 | + if (!self::cacheavail()) { |
|
415 | 415 | return 0; |
416 | 416 | } |
417 | 417 | $stats = self::stats_scan(); |
418 | 418 | $count = $stats[0]; |
419 | - if ( $count > 100 ) { |
|
419 | + if ($count > 100) { |
|
420 | 420 | // Store results in transient. |
421 | 421 | set_transient( |
422 | 422 | 'autoptimize_stats', |
423 | 423 | $stats, |
424 | - apply_filters( 'autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS ) |
|
424 | + apply_filters('autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS) |
|
425 | 425 | ); |
426 | 426 | } |
427 | 427 | } |
@@ -444,30 +444,30 @@ discard block |
||
444 | 444 | $size = 0; |
445 | 445 | |
446 | 446 | // Scan everything in our cache directories. |
447 | - foreach ( self::get_cache_contents() as $name => $files ) { |
|
448 | - $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/'; |
|
449 | - foreach ( $files as $file ) { |
|
450 | - if ( self::is_valid_cache_file( $dir, $file ) ) { |
|
451 | - if ( AUTOPTIMIZE_CACHE_NOGZIP && |
|
447 | + foreach (self::get_cache_contents() as $name => $files) { |
|
448 | + $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/'; |
|
449 | + foreach ($files as $file) { |
|
450 | + if (self::is_valid_cache_file($dir, $file)) { |
|
451 | + if (AUTOPTIMIZE_CACHE_NOGZIP && |
|
452 | 452 | ( |
453 | - false !== strpos( $file, '.js' ) || |
|
454 | - false !== strpos( $file, '.css' ) || |
|
455 | - false !== strpos( $file, '.img' ) || |
|
456 | - false !== strpos( $file, '.txt' ) |
|
453 | + false !== strpos($file, '.js') || |
|
454 | + false !== strpos($file, '.css') || |
|
455 | + false !== strpos($file, '.img') || |
|
456 | + false !== strpos($file, '.txt') |
|
457 | 457 | ) |
458 | 458 | ) { |
459 | 459 | // Web server is gzipping, we count .js|.css|.img|.txt files. |
460 | 460 | $count++; |
461 | - } elseif ( ! AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos( $file, '.none' ) ) { |
|
461 | + } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos($file, '.none')) { |
|
462 | 462 | // We are gzipping ourselves via php, counting only .none files. |
463 | 463 | $count++; |
464 | 464 | } |
465 | - $size += filesize( $dir . $file ); |
|
465 | + $size += filesize($dir.$file); |
|
466 | 466 | } |
467 | 467 | } |
468 | 468 | } |
469 | 469 | |
470 | - $stats = array( $count, $size, time() ); |
|
470 | + $stats = array($count, $size, time()); |
|
471 | 471 | |
472 | 472 | return $stats; |
473 | 473 | } |
@@ -481,29 +481,29 @@ discard block |
||
481 | 481 | */ |
482 | 482 | public static function cacheavail() |
483 | 483 | { |
484 | - if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) { |
|
484 | + if (!defined('AUTOPTIMIZE_CACHE_DIR')) { |
|
485 | 485 | // We didn't set a cache. |
486 | 486 | return false; |
487 | 487 | } |
488 | 488 | |
489 | - foreach ( array( '', 'js', 'css' ) as $dir ) { |
|
490 | - if ( ! self::check_cache_dir( AUTOPTIMIZE_CACHE_DIR . $dir ) ) { |
|
489 | + foreach (array('', 'js', 'css') as $dir) { |
|
490 | + if (!self::check_cache_dir(AUTOPTIMIZE_CACHE_DIR.$dir)) { |
|
491 | 491 | return false; |
492 | 492 | } |
493 | 493 | } |
494 | 494 | |
495 | 495 | // Using .htaccess inside our cache folder to overrule wp-super-cache. |
496 | - $htaccess = AUTOPTIMIZE_CACHE_DIR . '/.htaccess'; |
|
497 | - if ( ! is_file( $htaccess ) ) { |
|
496 | + $htaccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess'; |
|
497 | + if (!is_file($htaccess)) { |
|
498 | 498 | /** |
499 | 499 | * Create `wp-content/AO_htaccess_tmpl` file with |
500 | 500 | * whatever htaccess rules you might need |
501 | 501 | * if you want to override default AO htaccess |
502 | 502 | */ |
503 | - $htaccess_tmpl = WP_CONTENT_DIR . '/AO_htaccess_tmpl'; |
|
504 | - if ( is_file( $htaccess_tmpl ) ) { |
|
505 | - $content = file_get_contents( $htaccess_tmpl ); |
|
506 | - } elseif ( is_multisite() || ! AUTOPTIMIZE_CACHE_NOGZIP ) { |
|
503 | + $htaccess_tmpl = WP_CONTENT_DIR.'/AO_htaccess_tmpl'; |
|
504 | + if (is_file($htaccess_tmpl)) { |
|
505 | + $content = file_get_contents($htaccess_tmpl); |
|
506 | + } elseif (is_multisite() || !AUTOPTIMIZE_CACHE_NOGZIP) { |
|
507 | 507 | $content = '<IfModule mod_expires.c> |
508 | 508 | ExpiresActive On |
509 | 509 | ExpiresByType text/css A30672000 |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | </Files> |
557 | 557 | </IfModule>'; |
558 | 558 | } |
559 | - @file_put_contents( $htaccess, $content ); // @codingStandardsIgnoreLine |
|
559 | + @file_put_contents($htaccess, $content); // @codingStandardsIgnoreLine |
|
560 | 560 | } |
561 | 561 | |
562 | 562 | // All OK! |
@@ -571,25 +571,25 @@ discard block |
||
571 | 571 | * |
572 | 572 | * @return bool |
573 | 573 | */ |
574 | - protected static function check_cache_dir( $dir ) |
|
574 | + protected static function check_cache_dir($dir) |
|
575 | 575 | { |
576 | 576 | // Try creating the dir if it doesn't exist. |
577 | - if ( ! file_exists( $dir ) ) { |
|
578 | - @mkdir( $dir, 0775, true ); // @codingStandardsIgnoreLine |
|
579 | - if ( ! file_exists( $dir ) ) { |
|
577 | + if (!file_exists($dir)) { |
|
578 | + @mkdir($dir, 0775, true); // @codingStandardsIgnoreLine |
|
579 | + if (!file_exists($dir)) { |
|
580 | 580 | return false; |
581 | 581 | } |
582 | 582 | } |
583 | 583 | |
584 | 584 | // If we still cannot write, bail. |
585 | - if ( ! is_writable( $dir ) ) { |
|
585 | + if (!is_writable($dir)) { |
|
586 | 586 | return false; |
587 | 587 | } |
588 | 588 | |
589 | 589 | // Create an index.html in there to avoid prying eyes! |
590 | - $idx_file = rtrim( $dir, '/\\' ) . '/index.html'; |
|
591 | - if ( ! is_file( $idx_file ) ) { |
|
592 | - @file_put_contents( $idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' ); // @codingStandardsIgnoreLine |
|
590 | + $idx_file = rtrim($dir, '/\\').'/index.html'; |
|
591 | + if (!is_file($idx_file)) { |
|
592 | + @file_put_contents($idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); // @codingStandardsIgnoreLine |
|
593 | 593 | } |
594 | 594 | |
595 | 595 | return true; |
@@ -603,59 +603,59 @@ discard block |
||
603 | 603 | // @codingStandardsIgnoreStart |
604 | 604 | public static function flushPageCache() |
605 | 605 | { |
606 | - if ( function_exists( 'wp_cache_clear_cache' ) ) { |
|
607 | - if ( is_multisite() ) { |
|
606 | + if (function_exists('wp_cache_clear_cache')) { |
|
607 | + if (is_multisite()) { |
|
608 | 608 | $blog_id = get_current_blog_id(); |
609 | - wp_cache_clear_cache( $blog_id ); |
|
609 | + wp_cache_clear_cache($blog_id); |
|
610 | 610 | } else { |
611 | 611 | wp_cache_clear_cache(); |
612 | 612 | } |
613 | - } elseif ( has_action( 'cachify_flush_cache' ) ) { |
|
614 | - do_action( 'cachify_flush_cache' ); |
|
615 | - } elseif ( function_exists( 'w3tc_pgcache_flush' ) ) { |
|
613 | + } elseif (has_action('cachify_flush_cache')) { |
|
614 | + do_action('cachify_flush_cache'); |
|
615 | + } elseif (function_exists('w3tc_pgcache_flush')) { |
|
616 | 616 | w3tc_pgcache_flush(); |
617 | - } elseif ( function_exists( 'wp_fast_cache_bulk_delete_all' ) ) { |
|
617 | + } elseif (function_exists('wp_fast_cache_bulk_delete_all')) { |
|
618 | 618 | wp_fast_cache_bulk_delete_all(); |
619 | - } elseif ( class_exists( 'WpFastestCache' ) ) { |
|
619 | + } elseif (class_exists('WpFastestCache')) { |
|
620 | 620 | $wpfc = new WpFastestCache(); |
621 | 621 | $wpfc->deleteCache(); |
622 | - } elseif ( class_exists( 'c_ws_plugin__qcache_purging_routines' ) ) { |
|
622 | + } elseif (class_exists('c_ws_plugin__qcache_purging_routines')) { |
|
623 | 623 | c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache |
624 | - } elseif ( class_exists( 'zencache' ) ) { |
|
624 | + } elseif (class_exists('zencache')) { |
|
625 | 625 | zencache::clear(); |
626 | - } elseif ( class_exists( 'comet_cache' ) ) { |
|
626 | + } elseif (class_exists('comet_cache')) { |
|
627 | 627 | comet_cache::clear(); |
628 | - } elseif ( class_exists( 'WpeCommon' ) ) { |
|
628 | + } elseif (class_exists('WpeCommon')) { |
|
629 | 629 | // WPEngine cache purge/flush methods to call by default |
630 | 630 | $wpe_methods = array( |
631 | 631 | 'purge_varnish_cache', |
632 | 632 | ); |
633 | 633 | |
634 | 634 | // More agressive clear/flush/purge behind a filter |
635 | - if ( apply_filters( 'autoptimize_flush_wpengine_aggressive', false ) ) { |
|
636 | - $wpe_methods = array_merge( $wpe_methods, array( 'purge_memcached', 'clear_maxcdn_cache' ) ); |
|
635 | + if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) { |
|
636 | + $wpe_methods = array_merge($wpe_methods, array('purge_memcached', 'clear_maxcdn_cache')); |
|
637 | 637 | } |
638 | 638 | |
639 | 639 | // Filtering the entire list of WpeCommon methods to be called (for advanced usage + easier testing) |
640 | - $wpe_methods = apply_filters( 'autoptimize_flush_wpengine_methods', $wpe_methods ); |
|
640 | + $wpe_methods = apply_filters('autoptimize_flush_wpengine_methods', $wpe_methods); |
|
641 | 641 | |
642 | - foreach ( $wpe_methods as $wpe_method ) { |
|
643 | - if ( method_exists( 'WpeCommon', $wpe_method ) ) { |
|
642 | + foreach ($wpe_methods as $wpe_method) { |
|
643 | + if (method_exists('WpeCommon', $wpe_method)) { |
|
644 | 644 | WpeCommon::$wpe_method(); |
645 | 645 | } |
646 | 646 | } |
647 | - } elseif ( function_exists( 'sg_cachepress_purge_cache' ) ) { |
|
647 | + } elseif (function_exists('sg_cachepress_purge_cache')) { |
|
648 | 648 | sg_cachepress_purge_cache(); |
649 | - } elseif ( file_exists( WP_CONTENT_DIR . '/wp-cache-config.php' ) && function_exists( 'prune_super_cache' ) ) { |
|
649 | + } elseif (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) { |
|
650 | 650 | // fallback for WP-Super-Cache |
651 | 651 | global $cache_path; |
652 | - if ( is_multisite() ) { |
|
652 | + if (is_multisite()) { |
|
653 | 653 | $blog_id = get_current_blog_id(); |
654 | - prune_super_cache( get_supercache_dir( $blog_id ), true ); |
|
655 | - prune_super_cache( $cache_path . 'blogs/', true ); |
|
654 | + prune_super_cache(get_supercache_dir($blog_id), true); |
|
655 | + prune_super_cache($cache_path.'blogs/', true); |
|
656 | 656 | } else { |
657 | - prune_super_cache( $cache_path . 'supercache/', true ); |
|
658 | - prune_super_cache( $cache_path, true ); |
|
657 | + prune_super_cache($cache_path.'supercache/', true); |
|
658 | + prune_super_cache($cache_path, true); |
|
659 | 659 | } |
660 | 660 | } |
661 | 661 | } |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Wraps base plugin logic/hooks and handles activation/deactivation/uninstall. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param string $version Version. |
34 | 34 | * @param string $filepath Filepath. Needed for activation/deactivation/uninstall hooks. |
35 | 35 | */ |
36 | - public function __construct( $version, $filepath ) |
|
36 | + public function __construct($version, $filepath) |
|
37 | 37 | { |
38 | 38 | $this->version = $version; |
39 | 39 | $this->filepath = $filepath; |
@@ -50,94 +50,94 @@ discard block |
||
50 | 50 | |
51 | 51 | protected function add_hooks() |
52 | 52 | { |
53 | - add_action( 'plugins_loaded', array( $this, 'setup' ) ); |
|
53 | + add_action('plugins_loaded', array($this, 'setup')); |
|
54 | 54 | |
55 | - add_action( 'autoptimize_setup_done', array( $this, 'version_upgrades_check' ) ); |
|
56 | - add_action( 'autoptimize_setup_done', array( $this, 'check_cache_and_run' ) ); |
|
57 | - add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_ao_extra' ) ); |
|
58 | - add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_partners_tab' ) ); |
|
55 | + add_action('autoptimize_setup_done', array($this, 'version_upgrades_check')); |
|
56 | + add_action('autoptimize_setup_done', array($this, 'check_cache_and_run')); |
|
57 | + add_action('autoptimize_setup_done', array($this, 'maybe_run_ao_extra')); |
|
58 | + add_action('autoptimize_setup_done', array($this, 'maybe_run_partners_tab')); |
|
59 | 59 | |
60 | - add_action( 'init', array( $this, 'load_textdomain' ) ); |
|
61 | - add_action( 'plugins_loaded', array( $this, 'hook_page_cache_purge' ) ); |
|
62 | - add_action( 'admin_init', array( 'PAnD', 'init' ) ); |
|
60 | + add_action('init', array($this, 'load_textdomain')); |
|
61 | + add_action('plugins_loaded', array($this, 'hook_page_cache_purge')); |
|
62 | + add_action('admin_init', array('PAnD', 'init')); |
|
63 | 63 | |
64 | - register_activation_hook( $this->filepath, array( $this, 'on_activate' ) ); |
|
64 | + register_activation_hook($this->filepath, array($this, 'on_activate')); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | public function on_activate() |
68 | 68 | { |
69 | - register_uninstall_hook( $this->filepath, 'autoptimizeMain::on_uninstall' ); |
|
69 | + register_uninstall_hook($this->filepath, 'autoptimizeMain::on_uninstall'); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | public function load_textdomain() |
73 | 73 | { |
74 | - load_plugin_textdomain( 'autoptimize' ); |
|
74 | + load_plugin_textdomain('autoptimize'); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | public function setup() |
78 | 78 | { |
79 | 79 | // Do we gzip in php when caching or is the webserver doing it? |
80 | - define( 'AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option( 'autoptimize_cache_nogzip' ) ); |
|
80 | + define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip')); |
|
81 | 81 | |
82 | 82 | // These can be overridden by specifying them in wp-config.php or such. |
83 | - if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_NAME' ) ) { |
|
84 | - define( 'AUTOPTIMIZE_WP_CONTENT_NAME', '/' . wp_basename( WP_CONTENT_DIR ) ); |
|
83 | + if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { |
|
84 | + define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); |
|
85 | 85 | } |
86 | - if ( ! defined( 'AUTOPTIMIZE_CACHE_CHILD_DIR' ) ) { |
|
87 | - define( 'AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/' ); |
|
86 | + if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { |
|
87 | + define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); |
|
88 | 88 | } |
89 | - if ( ! defined( 'AUTOPTIMIZE_CACHEFILE_PREFIX' ) ) { |
|
90 | - define( 'AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_' ); |
|
89 | + if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { |
|
90 | + define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); |
|
91 | 91 | } |
92 | 92 | // Note: trailing slash is not optional! |
93 | - if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) { |
|
94 | - define( 'AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname() ); |
|
93 | + if (!defined('AUTOPTIMIZE_CACHE_DIR')) { |
|
94 | + define('AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname()); |
|
95 | 95 | } |
96 | 96 | |
97 | - define( 'WP_ROOT_DIR', substr( WP_CONTENT_DIR, 0, strlen( WP_CONTENT_DIR ) - strlen( AUTOPTIMIZE_WP_CONTENT_NAME ) ) ); |
|
97 | + define('WP_ROOT_DIR', substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR) - strlen(AUTOPTIMIZE_WP_CONTENT_NAME))); |
|
98 | 98 | |
99 | - if ( ! defined( 'AUTOPTIMIZE_WP_SITE_URL' ) ) { |
|
100 | - if ( function_exists( 'domain_mapping_siteurl' ) ) { |
|
101 | - define( 'AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl( get_current_blog_id() ) ); |
|
99 | + if (!defined('AUTOPTIMIZE_WP_SITE_URL')) { |
|
100 | + if (function_exists('domain_mapping_siteurl')) { |
|
101 | + define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id())); |
|
102 | 102 | } else { |
103 | - define( 'AUTOPTIMIZE_WP_SITE_URL', site_url() ); |
|
103 | + define('AUTOPTIMIZE_WP_SITE_URL', site_url()); |
|
104 | 104 | } |
105 | 105 | } |
106 | - if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_URL' ) ) { |
|
107 | - if ( function_exists( 'domain_mapping_siteurl' ) ) { |
|
108 | - define( 'AUTOPTIMIZE_WP_CONTENT_URL', str_replace( get_original_url( AUTOPTIMIZE_WP_SITE_URL ), AUTOPTIMIZE_WP_SITE_URL, content_url() ) ); |
|
106 | + if (!defined('AUTOPTIMIZE_WP_CONTENT_URL')) { |
|
107 | + if (function_exists('domain_mapping_siteurl')) { |
|
108 | + define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url())); |
|
109 | 109 | } else { |
110 | - define( 'AUTOPTIMIZE_WP_CONTENT_URL', content_url() ); |
|
110 | + define('AUTOPTIMIZE_WP_CONTENT_URL', content_url()); |
|
111 | 111 | } |
112 | 112 | } |
113 | - if ( ! defined( 'AUTOPTIMIZE_CACHE_URL' ) ) { |
|
114 | - if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) { |
|
113 | + if (!defined('AUTOPTIMIZE_CACHE_URL')) { |
|
114 | + if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
115 | 115 | $blog_id = get_current_blog_id(); |
116 | - define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR . $blog_id . '/' ); |
|
116 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
117 | 117 | } else { |
118 | - define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR ); |
|
118 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
119 | 119 | } |
120 | 120 | } |
121 | - if ( ! defined( 'AUTOPTIMIZE_WP_ROOT_URL' ) ) { |
|
122 | - define( 'AUTOPTIMIZE_WP_ROOT_URL', str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL ) ); |
|
121 | + if (!defined('AUTOPTIMIZE_WP_ROOT_URL')) { |
|
122 | + define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL)); |
|
123 | 123 | } |
124 | - if ( ! defined( 'AUTOPTIMIZE_HASH' ) ) { |
|
125 | - define( 'AUTOPTIMIZE_HASH', wp_hash( AUTOPTIMIZE_CACHE_URL ) ); |
|
124 | + if (!defined('AUTOPTIMIZE_HASH')) { |
|
125 | + define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_URL)); |
|
126 | 126 | } |
127 | - if ( ! defined( 'AUTOPTIMIZE_SITE_DOMAIN' ) ) { |
|
128 | - define( 'AUTOPTIMIZE_SITE_DOMAIN', parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) ); |
|
127 | + if (!defined('AUTOPTIMIZE_SITE_DOMAIN')) { |
|
128 | + define('AUTOPTIMIZE_SITE_DOMAIN', parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | // Multibyte-capable string replacements are available with a filter. |
132 | 132 | // Also requires 'mbstring' extension. |
133 | - $with_mbstring = apply_filters( 'autoptimize_filter_main_use_mbstring', false ); |
|
134 | - if ( $with_mbstring ) { |
|
135 | - autoptimizeUtils::mbstring_available( \extensions_loaded( 'mbstring' ) ); |
|
133 | + $with_mbstring = apply_filters('autoptimize_filter_main_use_mbstring', false); |
|
134 | + if ($with_mbstring) { |
|
135 | + autoptimizeUtils::mbstring_available(\extensions_loaded('mbstring')); |
|
136 | 136 | } else { |
137 | - autoptimizeUtils::mbstring_available( false ); |
|
137 | + autoptimizeUtils::mbstring_available(false); |
|
138 | 138 | } |
139 | 139 | |
140 | - do_action( 'autoptimize_setup_done' ); |
|
140 | + do_action('autoptimize_setup_done'); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -147,52 +147,52 @@ discard block |
||
147 | 147 | */ |
148 | 148 | public function version_upgrades_check() |
149 | 149 | { |
150 | - autoptimizeVersionUpdatesHandler::check_installed_and_update( $this->version ); |
|
150 | + autoptimizeVersionUpdatesHandler::check_installed_and_update($this->version); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | public function check_cache_and_run() |
154 | 154 | { |
155 | - if ( autoptimizeCache::cacheavail() ) { |
|
155 | + if (autoptimizeCache::cacheavail()) { |
|
156 | 156 | $conf = autoptimizeConfig::instance(); |
157 | - if ( $conf->get( 'autoptimize_html' ) || $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) ) { |
|
157 | + if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) { |
|
158 | 158 | // Hook into WordPress frontend. |
159 | - if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) { |
|
159 | + if (defined('AUTOPTIMIZE_INIT_EARLIER')) { |
|
160 | 160 | add_action( |
161 | 161 | 'init', |
162 | - array( $this, 'start_buffering' ), |
|
162 | + array($this, 'start_buffering'), |
|
163 | 163 | self::INIT_EARLIER_PRIORITY |
164 | 164 | ); |
165 | 165 | } else { |
166 | - if ( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) ) { |
|
167 | - define( 'AUTOPTIMIZE_HOOK_INTO', 'template_redirect' ); |
|
166 | + if (!defined('AUTOPTIMIZE_HOOK_INTO')) { |
|
167 | + define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); |
|
168 | 168 | } |
169 | 169 | add_action( |
170 | - constant( 'AUTOPTIMIZE_HOOK_INTO' ), |
|
171 | - array( $this, 'start_buffering' ), |
|
170 | + constant('AUTOPTIMIZE_HOOK_INTO'), |
|
171 | + array($this, 'start_buffering'), |
|
172 | 172 | self::DEFAULT_HOOK_PRIORITY |
173 | 173 | ); |
174 | 174 | } |
175 | 175 | } |
176 | 176 | } else { |
177 | - add_action( 'admin_notices', 'autoptimizeMain::notice_cache_unavailable' ); |
|
177 | + add_action('admin_notices', 'autoptimizeMain::notice_cache_unavailable'); |
|
178 | 178 | } |
179 | 179 | } |
180 | 180 | |
181 | 181 | public function maybe_run_ao_extra() |
182 | 182 | { |
183 | - if ( apply_filters( 'autoptimize_filter_extra_activate', true ) ) { |
|
183 | + if (apply_filters('autoptimize_filter_extra_activate', true)) { |
|
184 | 184 | $ao_extra = new autoptimizeExtra(); |
185 | 185 | $ao_extra->run(); |
186 | 186 | |
187 | 187 | // And show the imgopt notice. |
188 | - add_action( 'admin_notices', 'autoptimizeMain::notice_plug_imgopt' ); |
|
188 | + add_action('admin_notices', 'autoptimizeMain::notice_plug_imgopt'); |
|
189 | 189 | } |
190 | 190 | } |
191 | 191 | |
192 | 192 | public function maybe_run_partners_tab() |
193 | 193 | { |
194 | 194 | // Loads partners tab code if in admin (and not in admin-ajax.php)! |
195 | - if ( autoptimizeConfig::is_admin_and_not_ajax() ) { |
|
195 | + if (autoptimizeConfig::is_admin_and_not_ajax()) { |
|
196 | 196 | new autoptimizePartners(); |
197 | 197 | } |
198 | 198 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | public function hook_page_cache_purge() |
201 | 201 | { |
202 | 202 | // hook into a collection of page cache purge actions if filter allows. |
203 | - if ( apply_filters( 'autoptimize_filter_main_hookpagecachepurge', true ) ) { |
|
203 | + if (apply_filters('autoptimize_filter_main_hookpagecachepurge', true)) { |
|
204 | 204 | $page_cache_purge_actions = array( |
205 | 205 | 'after_rocket_clean_domain', // exists. |
206 | 206 | 'hyper_cache_purged', // Stefano confirmed this will be added. |
@@ -212,9 +212,9 @@ discard block |
||
212 | 212 | 'wpfc_delete_cache', // Emre confirmed this will be added this. |
213 | 213 | 'swift_performance_after_clear_all_cache', // swift perf. yeah! |
214 | 214 | ); |
215 | - $page_cache_purge_actions = apply_filters( 'autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions ); |
|
216 | - foreach ( $page_cache_purge_actions as $purge_action ) { |
|
217 | - add_action( $purge_action, 'autoptimizeCache::clearall_actionless' ); |
|
215 | + $page_cache_purge_actions = apply_filters('autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions); |
|
216 | + foreach ($page_cache_purge_actions as $purge_action) { |
|
217 | + add_action($purge_action, 'autoptimizeCache::clearall_actionless'); |
|
218 | 218 | } |
219 | 219 | } |
220 | 220 | } |
@@ -226,38 +226,38 @@ discard block |
||
226 | 226 | */ |
227 | 227 | public function start_buffering() |
228 | 228 | { |
229 | - if ( $this->should_buffer() ) { |
|
229 | + if ($this->should_buffer()) { |
|
230 | 230 | |
231 | 231 | // Load speedupper conditionally (true by default). |
232 | - if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) { |
|
232 | + if (apply_filters('autoptimize_filter_speedupper', true)) { |
|
233 | 233 | $ao_speedupper = new autoptimizeSpeedupper(); |
234 | 234 | } |
235 | 235 | |
236 | 236 | $conf = autoptimizeConfig::instance(); |
237 | 237 | |
238 | - if ( $conf->get( 'autoptimize_js' ) ) { |
|
239 | - if ( ! defined( 'CONCATENATE_SCRIPTS' ) ) { |
|
240 | - define( 'CONCATENATE_SCRIPTS', false ); |
|
238 | + if ($conf->get('autoptimize_js')) { |
|
239 | + if (!defined('CONCATENATE_SCRIPTS')) { |
|
240 | + define('CONCATENATE_SCRIPTS', false); |
|
241 | 241 | } |
242 | - if ( ! defined( 'COMPRESS_SCRIPTS' ) ) { |
|
243 | - define( 'COMPRESS_SCRIPTS', false ); |
|
242 | + if (!defined('COMPRESS_SCRIPTS')) { |
|
243 | + define('COMPRESS_SCRIPTS', false); |
|
244 | 244 | } |
245 | 245 | } |
246 | 246 | |
247 | - if ( $conf->get( 'autoptimize_css' ) ) { |
|
248 | - if ( ! defined( 'COMPRESS_CSS' ) ) { |
|
249 | - define( 'COMPRESS_CSS', false ); |
|
247 | + if ($conf->get('autoptimize_css')) { |
|
248 | + if (!defined('COMPRESS_CSS')) { |
|
249 | + define('COMPRESS_CSS', false); |
|
250 | 250 | } |
251 | 251 | } |
252 | 252 | |
253 | - if ( apply_filters( 'autoptimize_filter_obkiller', false ) ) { |
|
254 | - while ( ob_get_level() > 0 ) { |
|
253 | + if (apply_filters('autoptimize_filter_obkiller', false)) { |
|
254 | + while (ob_get_level() > 0) { |
|
255 | 255 | ob_end_clean(); |
256 | 256 | } |
257 | 257 | } |
258 | 258 | |
259 | 259 | // Now, start the real thing! |
260 | - ob_start( array( $this, 'end_buffering' ) ); |
|
260 | + ob_start(array($this, 'end_buffering')); |
|
261 | 261 | } |
262 | 262 | } |
263 | 263 | |
@@ -268,31 +268,31 @@ discard block |
||
268 | 268 | * deciding once per request (for use in tests). |
269 | 269 | * @return bool |
270 | 270 | */ |
271 | - public function should_buffer( $doing_tests = false ) |
|
271 | + public function should_buffer($doing_tests = false) |
|
272 | 272 | { |
273 | 273 | static $do_buffering = null; |
274 | 274 | |
275 | 275 | // Only check once in case we're called multiple times by others but |
276 | 276 | // still allows multiple calls when doing tests. |
277 | - if ( null === $do_buffering || $doing_tests ) { |
|
277 | + if (null === $do_buffering || $doing_tests) { |
|
278 | 278 | |
279 | 279 | $ao_noptimize = false; |
280 | 280 | |
281 | 281 | // Checking for DONOTMINIFY constant as used by e.g. WooCommerce POS. |
282 | - if ( defined( 'DONOTMINIFY' ) && ( constant( 'DONOTMINIFY' ) === true || constant( 'DONOTMINIFY' ) === 'true' ) ) { |
|
282 | + if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === 'true')) { |
|
283 | 283 | $ao_noptimize = true; |
284 | 284 | } |
285 | 285 | |
286 | 286 | // Skip checking query strings if they're disabled. |
287 | - if ( apply_filters( 'autoptimize_filter_honor_qs_noptimize', true ) ) { |
|
287 | + if (apply_filters('autoptimize_filter_honor_qs_noptimize', true)) { |
|
288 | 288 | // Check for `ao_noptimize` (and other) keys in the query string |
289 | 289 | // to get non-optimized page for debugging. |
290 | 290 | $keys = array( |
291 | 291 | 'ao_noptimize', |
292 | 292 | 'ao_noptirocket', |
293 | 293 | ); |
294 | - foreach ( $keys as $key ) { |
|
295 | - if ( array_key_exists( $key, $_GET ) && '1' === $_GET[ $key ] ) { |
|
294 | + foreach ($keys as $key) { |
|
295 | + if (array_key_exists($key, $_GET) && '1' === $_GET[$key]) { |
|
296 | 296 | $ao_noptimize = true; |
297 | 297 | break; |
298 | 298 | } |
@@ -300,15 +300,15 @@ discard block |
||
300 | 300 | } |
301 | 301 | |
302 | 302 | // If setting says not to optimize logged in user and user is logged in... |
303 | - if ( 'on' !== get_option( 'autoptimize_optimize_logged', 'on' ) && is_user_logged_in() && current_user_can( 'edit_posts' ) ) { |
|
303 | + if ('on' !== get_option('autoptimize_optimize_logged', 'on') && is_user_logged_in() && current_user_can('edit_posts')) { |
|
304 | 304 | $ao_noptimize = true; |
305 | 305 | } |
306 | 306 | |
307 | 307 | // If setting says not to optimize cart/checkout. |
308 | - if ( 'on' !== get_option( 'autoptimize_optimize_checkout', 'on' ) ) { |
|
308 | + if ('on' !== get_option('autoptimize_optimize_checkout', 'on')) { |
|
309 | 309 | // Checking for woocommerce, easy digital downloads and wp ecommerce... |
310 | - foreach ( array( 'is_checkout', 'is_cart', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout' ) as $func ) { |
|
311 | - if ( function_exists( $func ) && $func() ) { |
|
310 | + foreach (array('is_checkout', 'is_cart', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout') as $func) { |
|
311 | + if (function_exists($func) && $func()) { |
|
312 | 312 | $ao_noptimize = true; |
313 | 313 | break; |
314 | 314 | } |
@@ -316,11 +316,11 @@ discard block |
||
316 | 316 | } |
317 | 317 | |
318 | 318 | // Allows blocking of autoptimization on your own terms regardless of above decisions. |
319 | - $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize ); |
|
319 | + $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize); |
|
320 | 320 | |
321 | 321 | // Check for site being previewed in the Customizer (available since WP 4.0). |
322 | 322 | $is_customize_preview = false; |
323 | - if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) { |
|
323 | + if (function_exists('is_customize_preview') && is_customize_preview()) { |
|
324 | 324 | $is_customize_preview = is_customize_preview(); |
325 | 325 | } |
326 | 326 | |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | * while the main query hasn't been ran yet. Thats why we use |
332 | 332 | * AUTOPTIMIZE_INIT_EARLIER in tests. |
333 | 333 | */ |
334 | - $do_buffering = ( ! is_admin() && ! is_feed() && ! $ao_noptimize && ! $is_customize_preview ); |
|
334 | + $do_buffering = (!is_admin() && !is_feed() && !$ao_noptimize && !$is_customize_preview); |
|
335 | 335 | } |
336 | 336 | |
337 | 337 | return $do_buffering; |
@@ -344,24 +344,24 @@ discard block |
||
344 | 344 | * |
345 | 345 | * @return bool |
346 | 346 | */ |
347 | - public function is_valid_buffer( $content ) |
|
347 | + public function is_valid_buffer($content) |
|
348 | 348 | { |
349 | 349 | // Defaults to true. |
350 | 350 | $valid = true; |
351 | 351 | |
352 | - $has_no_html_tag = ( false === stripos( $content, '<html' ) ); |
|
353 | - $has_xsl_stylesheet = ( false !== stripos( $content, '<xsl:stylesheet' ) ); |
|
354 | - $has_html5_doctype = ( preg_match( '/^<!DOCTYPE.+html>/i', ltrim( $content ) ) > 0 ); |
|
352 | + $has_no_html_tag = (false === stripos($content, '<html')); |
|
353 | + $has_xsl_stylesheet = (false !== stripos($content, '<xsl:stylesheet')); |
|
354 | + $has_html5_doctype = (preg_match('/^<!DOCTYPE.+html>/i', ltrim($content)) > 0); |
|
355 | 355 | |
356 | - if ( $has_no_html_tag ) { |
|
356 | + if ($has_no_html_tag) { |
|
357 | 357 | // Can't be valid amp markup without an html tag preceding it. |
358 | 358 | $is_amp_markup = false; |
359 | 359 | } else { |
360 | - $is_amp_markup = self::is_amp_markup( $content ); |
|
360 | + $is_amp_markup = self::is_amp_markup($content); |
|
361 | 361 | } |
362 | 362 | |
363 | 363 | // If it's not html, or if it's amp or contains xsl stylesheets we don't touch it. |
364 | - if ( $has_no_html_tag && ! $has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet ) { |
|
364 | + if ($has_no_html_tag && !$has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet) { |
|
365 | 365 | $valid = false; |
366 | 366 | } |
367 | 367 | |
@@ -376,9 +376,9 @@ discard block |
||
376 | 376 | * |
377 | 377 | * @return bool |
378 | 378 | */ |
379 | - public static function is_amp_markup( $content ) |
|
379 | + public static function is_amp_markup($content) |
|
380 | 380 | { |
381 | - $is_amp_markup = preg_match( '/<html[^>]*(?:amp|⚡)/i', $content ); |
|
381 | + $is_amp_markup = preg_match('/<html[^>]*(?:amp|⚡)/i', $content); |
|
382 | 382 | |
383 | 383 | return (bool) $is_amp_markup; |
384 | 384 | } |
@@ -391,10 +391,10 @@ discard block |
||
391 | 391 | * |
392 | 392 | * @return string |
393 | 393 | */ |
394 | - public function end_buffering( $content ) |
|
394 | + public function end_buffering($content) |
|
395 | 395 | { |
396 | 396 | // Bail early without modifying anything if we can't handle the content. |
397 | - if ( ! $this->is_valid_buffer( $content ) ) { |
|
397 | + if (!$this->is_valid_buffer($content)) { |
|
398 | 398 | return $content; |
399 | 399 | } |
400 | 400 | |
@@ -402,57 +402,57 @@ discard block |
||
402 | 402 | |
403 | 403 | // Determine what needs to be ran. |
404 | 404 | $classes = array(); |
405 | - if ( $conf->get( 'autoptimize_js' ) ) { |
|
405 | + if ($conf->get('autoptimize_js')) { |
|
406 | 406 | $classes[] = 'autoptimizeScripts'; |
407 | 407 | } |
408 | - if ( $conf->get( 'autoptimize_css' ) ) { |
|
408 | + if ($conf->get('autoptimize_css')) { |
|
409 | 409 | $classes[] = 'autoptimizeStyles'; |
410 | 410 | } |
411 | - if ( $conf->get( 'autoptimize_html' ) ) { |
|
411 | + if ($conf->get('autoptimize_html')) { |
|
412 | 412 | $classes[] = 'autoptimizeHTML'; |
413 | 413 | } |
414 | 414 | |
415 | 415 | $classoptions = array( |
416 | 416 | 'autoptimizeScripts' => array( |
417 | - 'aggregate' => $conf->get( 'autoptimize_js_aggregate' ), |
|
418 | - 'justhead' => $conf->get( 'autoptimize_js_justhead' ), |
|
419 | - 'forcehead' => $conf->get( 'autoptimize_js_forcehead' ), |
|
420 | - 'trycatch' => $conf->get( 'autoptimize_js_trycatch' ), |
|
421 | - 'js_exclude' => $conf->get( 'autoptimize_js_exclude' ), |
|
422 | - 'cdn_url' => $conf->get( 'autoptimize_cdn_url' ), |
|
423 | - 'include_inline' => $conf->get( 'autoptimize_js_include_inline' ), |
|
417 | + 'aggregate' => $conf->get('autoptimize_js_aggregate'), |
|
418 | + 'justhead' => $conf->get('autoptimize_js_justhead'), |
|
419 | + 'forcehead' => $conf->get('autoptimize_js_forcehead'), |
|
420 | + 'trycatch' => $conf->get('autoptimize_js_trycatch'), |
|
421 | + 'js_exclude' => $conf->get('autoptimize_js_exclude'), |
|
422 | + 'cdn_url' => $conf->get('autoptimize_cdn_url'), |
|
423 | + 'include_inline' => $conf->get('autoptimize_js_include_inline'), |
|
424 | 424 | ), |
425 | 425 | 'autoptimizeStyles' => array( |
426 | - 'aggregate' => $conf->get( 'autoptimize_css_aggregate' ), |
|
427 | - 'justhead' => $conf->get( 'autoptimize_css_justhead' ), |
|
428 | - 'datauris' => $conf->get( 'autoptimize_css_datauris' ), |
|
429 | - 'defer' => $conf->get( 'autoptimize_css_defer' ), |
|
430 | - 'defer_inline' => $conf->get( 'autoptimize_css_defer_inline' ), |
|
431 | - 'inline' => $conf->get( 'autoptimize_css_inline' ), |
|
432 | - 'css_exclude' => $conf->get( 'autoptimize_css_exclude' ), |
|
433 | - 'cdn_url' => $conf->get( 'autoptimize_cdn_url' ), |
|
434 | - 'include_inline' => $conf->get( 'autoptimize_css_include_inline' ), |
|
435 | - 'nogooglefont' => $conf->get( 'autoptimize_css_nogooglefont' ), |
|
426 | + 'aggregate' => $conf->get('autoptimize_css_aggregate'), |
|
427 | + 'justhead' => $conf->get('autoptimize_css_justhead'), |
|
428 | + 'datauris' => $conf->get('autoptimize_css_datauris'), |
|
429 | + 'defer' => $conf->get('autoptimize_css_defer'), |
|
430 | + 'defer_inline' => $conf->get('autoptimize_css_defer_inline'), |
|
431 | + 'inline' => $conf->get('autoptimize_css_inline'), |
|
432 | + 'css_exclude' => $conf->get('autoptimize_css_exclude'), |
|
433 | + 'cdn_url' => $conf->get('autoptimize_cdn_url'), |
|
434 | + 'include_inline' => $conf->get('autoptimize_css_include_inline'), |
|
435 | + 'nogooglefont' => $conf->get('autoptimize_css_nogooglefont'), |
|
436 | 436 | ), |
437 | 437 | 'autoptimizeHTML' => array( |
438 | - 'keepcomments' => $conf->get( 'autoptimize_html_keepcomments' ), |
|
438 | + 'keepcomments' => $conf->get('autoptimize_html_keepcomments'), |
|
439 | 439 | ), |
440 | 440 | ); |
441 | 441 | |
442 | - $content = apply_filters( 'autoptimize_filter_html_before_minify', $content ); |
|
442 | + $content = apply_filters('autoptimize_filter_html_before_minify', $content); |
|
443 | 443 | |
444 | 444 | // Run the classes! |
445 | - foreach ( $classes as $name ) { |
|
446 | - $instance = new $name( $content ); |
|
447 | - if ( $instance->read( $classoptions[ $name ] ) ) { |
|
445 | + foreach ($classes as $name) { |
|
446 | + $instance = new $name($content); |
|
447 | + if ($instance->read($classoptions[$name])) { |
|
448 | 448 | $instance->minify(); |
449 | 449 | $instance->cache(); |
450 | 450 | $content = $instance->getcontent(); |
451 | 451 | } |
452 | - unset( $instance ); |
|
452 | + unset($instance); |
|
453 | 453 | } |
454 | 454 | |
455 | - $content = apply_filters( 'autoptimize_html_after_minify', $content ); |
|
455 | + $content = apply_filters('autoptimize_html_after_minify', $content); |
|
456 | 456 | |
457 | 457 | return $content; |
458 | 458 | } |
@@ -494,25 +494,25 @@ discard block |
||
494 | 494 | 'autoptimize_imgopt_launched', |
495 | 495 | ); |
496 | 496 | |
497 | - if ( ! is_multisite() ) { |
|
498 | - foreach ( $delete_options as $del_opt ) { |
|
499 | - delete_option( $del_opt ); |
|
497 | + if (!is_multisite()) { |
|
498 | + foreach ($delete_options as $del_opt) { |
|
499 | + delete_option($del_opt); |
|
500 | 500 | } |
501 | 501 | } else { |
502 | 502 | global $wpdb; |
503 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
503 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
504 | 504 | $original_blog_id = get_current_blog_id(); |
505 | - foreach ( $blog_ids as $blog_id ) { |
|
506 | - switch_to_blog( $blog_id ); |
|
507 | - foreach ( $delete_options as $del_opt ) { |
|
508 | - delete_option( $del_opt ); |
|
505 | + foreach ($blog_ids as $blog_id) { |
|
506 | + switch_to_blog($blog_id); |
|
507 | + foreach ($delete_options as $del_opt) { |
|
508 | + delete_option($del_opt); |
|
509 | 509 | } |
510 | 510 | } |
511 | - switch_to_blog( $original_blog_id ); |
|
511 | + switch_to_blog($original_blog_id); |
|
512 | 512 | } |
513 | 513 | |
514 | - if ( wp_get_schedule( 'ao_cachechecker' ) ) { |
|
515 | - wp_clear_scheduled_hook( 'ao_cachechecker' ); |
|
514 | + if (wp_get_schedule('ao_cachechecker')) { |
|
515 | + wp_clear_scheduled_hook('ao_cachechecker'); |
|
516 | 516 | } |
517 | 517 | } |
518 | 518 | |
@@ -520,41 +520,41 @@ discard block |
||
520 | 520 | { |
521 | 521 | echo '<div class="error"><p>'; |
522 | 522 | // Translators: %s is the cache directory location. |
523 | - printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR ); |
|
523 | + printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR); |
|
524 | 524 | echo '</p></div>'; |
525 | 525 | } |
526 | 526 | |
527 | 527 | public static function notice_installed() |
528 | 528 | { |
529 | 529 | echo '<div class="updated"><p>'; |
530 | - _e( 'Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' ); |
|
530 | + _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize'); |
|
531 | 531 | echo '</p></div>'; |
532 | 532 | } |
533 | 533 | |
534 | 534 | public static function notice_updated() |
535 | 535 | { |
536 | 536 | echo '<div class="updated"><p>'; |
537 | - _e( 'Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' ); |
|
537 | + _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize'); |
|
538 | 538 | echo '</p></div>'; |
539 | 539 | } |
540 | 540 | |
541 | 541 | public static function notice_plug_imgopt() |
542 | 542 | { |
543 | 543 | // Translators: the URL added points to the Autopmize Extra settings. |
544 | - $_ao_imgopt_plug_notice = sprintf( __( 'Did you know Autoptimize includes on-the-fly image optimization and CDN via ShortPixel? Check out the %1$sAutoptimize Extra settings%2$s to activate this option.', 'autoptimize' ), '<a href="options-general.php?page=autoptimize_extra">', '</a>' ); |
|
545 | - $_ao_imgopt_plug_notice = apply_filters( 'autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice ); |
|
544 | + $_ao_imgopt_plug_notice = sprintf(__('Did you know Autoptimize includes on-the-fly image optimization and CDN via ShortPixel? Check out the %1$sAutoptimize Extra settings%2$s to activate this option.', 'autoptimize'), '<a href="options-general.php?page=autoptimize_extra">', '</a>'); |
|
545 | + $_ao_imgopt_plug_notice = apply_filters('autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice); |
|
546 | 546 | $_ao_imgopt_launch_ok = autoptimizeExtra::imgopt_launch_ok_wrapper(); |
547 | 547 | $_ao_imgopt_plug_dismissible = 'ao-img-opt-plug-123'; |
548 | 548 | |
549 | 549 | // check if AO is optimizing images already. |
550 | 550 | $_ao_imgopt_active = false; |
551 | - $_ao_extra_options = get_option( 'autoptimize_extra_settings', '' ); |
|
552 | - if ( is_array( $_ao_extra_options ) && array_key_exists( 'autoptimize_extra_checkbox_field_5', $_ao_extra_options ) && ! empty( $_ao_extra_options['autoptimize_extra_checkbox_field_5'] ) ) { |
|
551 | + $_ao_extra_options = get_option('autoptimize_extra_settings', ''); |
|
552 | + if (is_array($_ao_extra_options) && array_key_exists('autoptimize_extra_checkbox_field_5', $_ao_extra_options) && !empty($_ao_extra_options['autoptimize_extra_checkbox_field_5'])) { |
|
553 | 553 | $_ao_imgopt_active = true; |
554 | 554 | } |
555 | 555 | |
556 | - if ( current_user_can( 'manage_options' ) && '' !== $_ao_imgopt_plug_notice && ! $_ao_imgopt_active && $_ao_imgopt_launch_ok && PAnD::is_admin_notice_active( $_ao_imgopt_plug_dismissible ) ) { |
|
557 | - echo '<div class="notice notice-info is-dismissible" data-dismissible="' . $_ao_imgopt_plug_dismissible . '"><p>'; |
|
556 | + if (current_user_can('manage_options') && '' !== $_ao_imgopt_plug_notice && !$_ao_imgopt_active && $_ao_imgopt_launch_ok && PAnD::is_admin_notice_active($_ao_imgopt_plug_dismissible)) { |
|
557 | + echo '<div class="notice notice-info is-dismissible" data-dismissible="'.$_ao_imgopt_plug_dismissible.'"><p>'; |
|
558 | 558 | echo $_ao_imgopt_plug_notice; |
559 | 559 | echo '</p></div>'; |
560 | 560 | } |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | * Checks if cachesize is > 0.5GB (size is filterable), if so, an option is set which controls showing an admin notice. |
7 | 7 | */ |
8 | 8 | |
9 | -if ( ! defined( 'ABSPATH' ) ) { |
|
9 | +if (!defined('ABSPATH')) { |
|
10 | 10 | exit; |
11 | 11 | } |
12 | 12 | |
@@ -25,48 +25,48 @@ discard block |
||
25 | 25 | |
26 | 26 | public function add_hooks() |
27 | 27 | { |
28 | - if ( is_admin() ) { |
|
29 | - add_action( 'plugins_loaded', array( $this, 'setup' ) ); |
|
28 | + if (is_admin()) { |
|
29 | + add_action('plugins_loaded', array($this, 'setup')); |
|
30 | 30 | } |
31 | - add_action( self::SCHEDULE_HOOK, array( $this, 'cronjob' ) ); |
|
32 | - add_action( 'admin_notices', array( $this, 'show_admin_notice' ) ); |
|
31 | + add_action(self::SCHEDULE_HOOK, array($this, 'cronjob')); |
|
32 | + add_action('admin_notices', array($this, 'show_admin_notice')); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public function setup() |
36 | 36 | { |
37 | - $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true ); |
|
38 | - $schedule = wp_get_schedule( self::SCHEDULE_HOOK ); |
|
39 | - $frequency = apply_filters( 'autoptimize_filter_cachecheck_frequency', 'twicedaily' ); |
|
40 | - if ( ! in_array( $frequency, array( 'hourly', 'twicedaily', 'daily', 'weekly', 'monthly' ) ) ) { |
|
37 | + $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true); |
|
38 | + $schedule = wp_get_schedule(self::SCHEDULE_HOOK); |
|
39 | + $frequency = apply_filters('autoptimize_filter_cachecheck_frequency', 'twicedaily'); |
|
40 | + if (!in_array($frequency, array('hourly', 'twicedaily', 'daily', 'weekly', 'monthly'))) { |
|
41 | 41 | $frequency = 'twicedaily'; |
42 | 42 | } |
43 | - if ( $do_cache_check && ( ! $schedule || $schedule !== $frequency ) ) { |
|
44 | - wp_schedule_event( time(), $frequency, self::SCHEDULE_HOOK ); |
|
45 | - } elseif ( $schedule && ! $do_cache_check ) { |
|
46 | - wp_clear_scheduled_hook( self::SCHEDULE_HOOK ); |
|
43 | + if ($do_cache_check && (!$schedule || $schedule !== $frequency)) { |
|
44 | + wp_schedule_event(time(), $frequency, self::SCHEDULE_HOOK); |
|
45 | + } elseif ($schedule && !$do_cache_check) { |
|
46 | + wp_clear_scheduled_hook(self::SCHEDULE_HOOK); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | |
50 | 50 | public function cronjob() |
51 | 51 | { |
52 | 52 | // Check cachesize and act accordingly. |
53 | - $max_size = (int) apply_filters( 'autoptimize_filter_cachecheck_maxsize', 536870912 ); |
|
54 | - $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true ); |
|
53 | + $max_size = (int) apply_filters('autoptimize_filter_cachecheck_maxsize', 536870912); |
|
54 | + $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true); |
|
55 | 55 | $stat_array = autoptimizeCache::stats(); |
56 | - $cache_size = round( $stat_array[1] ); |
|
57 | - if ( ( $cache_size > $max_size ) && ( $do_cache_check ) ) { |
|
58 | - update_option( 'autoptimize_cachesize_notice', true ); |
|
59 | - if ( apply_filters( 'autoptimize_filter_cachecheck_sendmail', true ) ) { |
|
60 | - $site_url = esc_url( site_url() ); |
|
61 | - $ao_mailto = apply_filters( 'autoptimize_filter_cachecheck_mailto', get_option( 'admin_email', '' ) ); |
|
62 | - |
|
63 | - $ao_mailsubject = __( 'Autoptimize cache size warning', 'autoptimize' ) . ' (' . $site_url . ')'; |
|
64 | - $ao_mailbody = __( 'Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize' ) . ' (site: ' . $site_url . ')'; |
|
65 | - |
|
66 | - if ( ! empty( $ao_mailto ) ) { |
|
67 | - $ao_mailresult = wp_mail( $ao_mailto, $ao_mailsubject, $ao_mailbody ); |
|
68 | - if ( ! $ao_mailresult ) { |
|
69 | - error_log( 'Autoptimize could not send cache size warning mail.' ); |
|
56 | + $cache_size = round($stat_array[1]); |
|
57 | + if (($cache_size > $max_size) && ($do_cache_check)) { |
|
58 | + update_option('autoptimize_cachesize_notice', true); |
|
59 | + if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) { |
|
60 | + $site_url = esc_url(site_url()); |
|
61 | + $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', '')); |
|
62 | + |
|
63 | + $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize').' ('.$site_url.')'; |
|
64 | + $ao_mailbody = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize').' (site: '.$site_url.')'; |
|
65 | + |
|
66 | + if (!empty($ao_mailto)) { |
|
67 | + $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody); |
|
68 | + if (!$ao_mailresult) { |
|
69 | + error_log('Autoptimize could not send cache size warning mail.'); |
|
70 | 70 | } |
71 | 71 | } |
72 | 72 | } |
@@ -85,16 +85,16 @@ discard block |
||
85 | 85 | public function show_admin_notice() |
86 | 86 | { |
87 | 87 | // fixme: make notices dismissable. |
88 | - if ( (bool) get_option( 'autoptimize_cachesize_notice', false ) && current_user_can( 'manage_options' ) ) { |
|
88 | + if ((bool) get_option('autoptimize_cachesize_notice', false) && current_user_can('manage_options')) { |
|
89 | 89 | echo '<div class="notice notice-warning"><p>'; |
90 | - _e( '<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank" rel="noopener noreferrer">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' ); |
|
90 | + _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank" rel="noopener noreferrer">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize'); |
|
91 | 91 | echo '</p></div>'; |
92 | - update_option( 'autoptimize_cachesize_notice', false ); |
|
92 | + update_option('autoptimize_cachesize_notice', false); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | // Notice for image proxy usage. |
96 | 96 | $_imgopt_notice = autoptimizeExtra::get_imgopt_status_notice_wrapper(); |
97 | - if ( current_user_can( 'manage_options' ) && is_array( $_imgopt_notice ) && array_key_exists( 'status', $_imgopt_notice ) && in_array( $_imgopt_notice['status'], array( 1, -1, -2 ) ) ) { |
|
97 | + if (current_user_can('manage_options') && is_array($_imgopt_notice) && array_key_exists('status', $_imgopt_notice) && in_array($_imgopt_notice['status'], array(1, -1, -2))) { |
|
98 | 98 | $_dismissible = 'ao-img-opt-notice-'; |
99 | 99 | $_hide_notice = '7'; |
100 | 100 | |
@@ -102,10 +102,10 @@ discard block |
||
102 | 102 | $_hide_notice = '1'; |
103 | 103 | } |
104 | 104 | |
105 | - $_imgopt_notice_dismissible = apply_filters( 'autoptimize_filter_imgopt_notice_dismissable', $_dismissible . $_hide_notice ); |
|
105 | + $_imgopt_notice_dismissible = apply_filters('autoptimize_filter_imgopt_notice_dismissable', $_dismissible.$_hide_notice); |
|
106 | 106 | |
107 | - if ( $_imgopt_notice && PAnD::is_admin_notice_active( $_imgopt_notice_dismissible ) ) { |
|
108 | - echo '<div class="notice notice-warning is-dismissible" data-dismissible="' . $_imgopt_notice_dismissible . '"><p>' . $_imgopt_notice['notice'] . '</p></div>'; |
|
107 | + if ($_imgopt_notice && PAnD::is_admin_notice_active($_imgopt_notice_dismissible)) { |
|
108 | + echo '<div class="notice notice-warning is-dismissible" data-dismissible="'.$_imgopt_notice_dismissible.'"><p>'.$_imgopt_notice['notice'].'</p></div>'; |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | } |
@@ -16,66 +16,66 @@ discard block |
||
16 | 16 | */ |
17 | 17 | |
18 | 18 | |
19 | -if ( ! defined( 'ABSPATH' ) ) { |
|
19 | +if (!defined('ABSPATH')) { |
|
20 | 20 | exit; |
21 | 21 | } |
22 | 22 | |
23 | -define( 'AUTOPTIMIZE_PLUGIN_VERSION', '2.4.2' ); |
|
23 | +define('AUTOPTIMIZE_PLUGIN_VERSION', '2.4.2'); |
|
24 | 24 | |
25 | 25 | // plugin_dir_path() returns the trailing slash! |
26 | -define( 'AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); |
|
27 | -define( 'AUTOPTIMIZE_PLUGIN_FILE', __FILE__ ); |
|
26 | +define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__)); |
|
27 | +define('AUTOPTIMIZE_PLUGIN_FILE', __FILE__); |
|
28 | 28 | |
29 | 29 | // Bail early if attempting to run on non-supported php versions. |
30 | -if ( version_compare( PHP_VERSION, '5.3', '<' ) ) { |
|
30 | +if (version_compare(PHP_VERSION, '5.3', '<')) { |
|
31 | 31 | function autoptimize_incompatible_admin_notice() { |
32 | - echo '<div class="error"><p>' . __( 'Autoptimize requires PHP 5.3 (or higher) to function properly. Please upgrade PHP. The Plugin has been auto-deactivated.', 'autoptimize' ) . '</p></div>'; |
|
33 | - if ( isset( $_GET['activate'] ) ) { |
|
34 | - unset( $_GET['activate'] ); |
|
32 | + echo '<div class="error"><p>'.__('Autoptimize requires PHP 5.3 (or higher) to function properly. Please upgrade PHP. The Plugin has been auto-deactivated.', 'autoptimize').'</p></div>'; |
|
33 | + if (isset($_GET['activate'])) { |
|
34 | + unset($_GET['activate']); |
|
35 | 35 | } |
36 | 36 | } |
37 | 37 | function autoptimize_deactivate_self() { |
38 | - deactivate_plugins( plugin_basename( AUTOPTIMIZE_PLUGIN_FILE ) ); |
|
38 | + deactivate_plugins(plugin_basename(AUTOPTIMIZE_PLUGIN_FILE)); |
|
39 | 39 | } |
40 | - add_action( 'admin_notices', 'autoptimize_incompatible_admin_notice' ); |
|
41 | - add_action( 'admin_init', 'autoptimize_deactivate_self' ); |
|
40 | + add_action('admin_notices', 'autoptimize_incompatible_admin_notice'); |
|
41 | + add_action('admin_init', 'autoptimize_deactivate_self'); |
|
42 | 42 | return; |
43 | 43 | } |
44 | 44 | |
45 | -function autoptimize_autoload( $class_name ) { |
|
46 | - if ( in_array( $class_name, array( 'Minify_HTML', 'JSMin' ) ) ) { |
|
47 | - $file = strtolower( $class_name ); |
|
48 | - $file = str_replace( '_', '-', $file ); |
|
49 | - $path = dirname( __FILE__ ) . '/classes/external/php/'; |
|
50 | - $filepath = $path . $file . '.php'; |
|
51 | - } elseif ( false !== strpos( $class_name, 'Autoptimize\\tubalmartin\\CssMin' ) ) { |
|
52 | - $file = str_replace( 'Autoptimize\\tubalmartin\\CssMin\\', '', $class_name ); |
|
53 | - $path = dirname( __FILE__ ) . '/classes/external/php/yui-php-cssmin-bundled/'; |
|
54 | - $filepath = $path . $file . '.php'; |
|
55 | - } elseif ( 'autoptimize' === substr( $class_name, 0, 11 ) ) { |
|
45 | +function autoptimize_autoload($class_name) { |
|
46 | + if (in_array($class_name, array('Minify_HTML', 'JSMin'))) { |
|
47 | + $file = strtolower($class_name); |
|
48 | + $file = str_replace('_', '-', $file); |
|
49 | + $path = dirname(__FILE__).'/classes/external/php/'; |
|
50 | + $filepath = $path.$file.'.php'; |
|
51 | + } elseif (false !== strpos($class_name, 'Autoptimize\\tubalmartin\\CssMin')) { |
|
52 | + $file = str_replace('Autoptimize\\tubalmartin\\CssMin\\', '', $class_name); |
|
53 | + $path = dirname(__FILE__).'/classes/external/php/yui-php-cssmin-bundled/'; |
|
54 | + $filepath = $path.$file.'.php'; |
|
55 | + } elseif ('autoptimize' === substr($class_name, 0, 11)) { |
|
56 | 56 | // One of our "old" classes. |
57 | 57 | $file = $class_name; |
58 | - $path = dirname( __FILE__ ) . '/classes/'; |
|
59 | - $filepath = $path . $file . '.php'; |
|
60 | - } elseif ( 'PAnD' === $class_name ) { |
|
58 | + $path = dirname(__FILE__).'/classes/'; |
|
59 | + $filepath = $path.$file.'.php'; |
|
60 | + } elseif ('PAnD' === $class_name) { |
|
61 | 61 | $file = 'persist-admin-notices-dismissal'; |
62 | - $path = dirname( __FILE__ ) . '/classes/external/php/persist-admin-notices-dismissal/'; |
|
63 | - $filepath = $path . $file . '.php'; |
|
62 | + $path = dirname(__FILE__).'/classes/external/php/persist-admin-notices-dismissal/'; |
|
63 | + $filepath = $path.$file.'.php'; |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | // If we didn't match one of our rules, bail! |
67 | - if ( ! isset( $filepath ) ) { |
|
67 | + if (!isset($filepath)) { |
|
68 | 68 | return; |
69 | 69 | } |
70 | 70 | |
71 | 71 | require $filepath; |
72 | 72 | } |
73 | 73 | |
74 | -spl_autoload_register( 'autoptimize_autoload' ); |
|
74 | +spl_autoload_register('autoptimize_autoload'); |
|
75 | 75 | |
76 | 76 | // Load WP CLI command(s) on demand. |
77 | -if ( defined( 'WP_CLI' ) && WP_CLI ) { |
|
78 | - require AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php'; |
|
77 | +if (defined('WP_CLI') && WP_CLI) { |
|
78 | + require AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCLI.php'; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -86,8 +86,8 @@ discard block |
||
86 | 86 | function autoptimize() { |
87 | 87 | static $plugin = null; |
88 | 88 | |
89 | - if ( null === $plugin ) { |
|
90 | - $plugin = new autoptimizeMain( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE ); |
|
89 | + if (null === $plugin) { |
|
90 | + $plugin = new autoptimizeMain(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | return $plugin; |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Handles autoptimizeExtra frontend features + admin options page |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -21,9 +21,9 @@ discard block |
||
21 | 21 | * |
22 | 22 | * @param array $options Optional. Allows overriding options without having to specify them via admin options page. |
23 | 23 | */ |
24 | - public function __construct( $options = array() ) |
|
24 | + public function __construct($options = array()) |
|
25 | 25 | { |
26 | - if ( empty( $options ) ) { |
|
26 | + if (empty($options)) { |
|
27 | 27 | $options = $this->fetch_options(); |
28 | 28 | } |
29 | 29 | |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | |
33 | 33 | public function run() |
34 | 34 | { |
35 | - if ( is_admin() ) { |
|
36 | - add_action( 'admin_menu', array( $this, 'admin_menu' ) ); |
|
37 | - add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) ); |
|
35 | + if (is_admin()) { |
|
36 | + add_action('admin_menu', array($this, 'admin_menu')); |
|
37 | + add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_extra_tab')); |
|
38 | 38 | } else { |
39 | 39 | $this->run_on_frontend(); |
40 | 40 | } |
@@ -42,17 +42,17 @@ discard block |
||
42 | 42 | |
43 | 43 | protected function fetch_options() |
44 | 44 | { |
45 | - $value = get_option( 'autoptimize_extra_settings' ); |
|
46 | - if ( empty( $value ) ) { |
|
45 | + $value = get_option('autoptimize_extra_settings'); |
|
46 | + if (empty($value)) { |
|
47 | 47 | // Fallback to returning defaults when no stored option exists yet. |
48 | 48 | $value = autoptimizeConfig::get_ao_extra_default_options(); |
49 | 49 | } |
50 | 50 | |
51 | 51 | // get service availability. |
52 | - $value['availabilities'] = get_option( 'autoptimize_service_availablity' ); |
|
52 | + $value['availabilities'] = get_option('autoptimize_service_availablity'); |
|
53 | 53 | |
54 | - if ( empty( $value['availabilities'] ) ) { |
|
55 | - $value['availabilities'] = autoptimizeUtils::check_service_availability( true ); |
|
54 | + if (empty($value['availabilities'])) { |
|
55 | + $value['availabilities'] = autoptimizeUtils::check_service_availability(true); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | return $value; |
@@ -61,54 +61,54 @@ discard block |
||
61 | 61 | public function disable_emojis() |
62 | 62 | { |
63 | 63 | // Removing all actions related to emojis! |
64 | - remove_action( 'admin_print_styles', 'print_emoji_styles' ); |
|
65 | - remove_action( 'wp_head', 'print_emoji_detection_script', 7 ); |
|
66 | - remove_action( 'admin_print_scripts', 'print_emoji_detection_script' ); |
|
67 | - remove_action( 'wp_print_styles', 'print_emoji_styles' ); |
|
68 | - remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' ); |
|
69 | - remove_filter( 'the_content_feed', 'wp_staticize_emoji' ); |
|
70 | - remove_filter( 'comment_text_rss', 'wp_staticize_emoji' ); |
|
64 | + remove_action('admin_print_styles', 'print_emoji_styles'); |
|
65 | + remove_action('wp_head', 'print_emoji_detection_script', 7); |
|
66 | + remove_action('admin_print_scripts', 'print_emoji_detection_script'); |
|
67 | + remove_action('wp_print_styles', 'print_emoji_styles'); |
|
68 | + remove_filter('wp_mail', 'wp_staticize_emoji_for_email'); |
|
69 | + remove_filter('the_content_feed', 'wp_staticize_emoji'); |
|
70 | + remove_filter('comment_text_rss', 'wp_staticize_emoji'); |
|
71 | 71 | |
72 | 72 | // Removes TinyMCE emojis. |
73 | - add_filter( 'tiny_mce_plugins', array( $this, 'filter_disable_emojis_tinymce' ) ); |
|
73 | + add_filter('tiny_mce_plugins', array($this, 'filter_disable_emojis_tinymce')); |
|
74 | 74 | |
75 | 75 | // Removes emoji dns-preftech. |
76 | - add_filter( 'wp_resource_hints', array( $this, 'filter_remove_emoji_dns_prefetch' ), 10, 2 ); |
|
76 | + add_filter('wp_resource_hints', array($this, 'filter_remove_emoji_dns_prefetch'), 10, 2); |
|
77 | 77 | } |
78 | 78 | |
79 | - public function filter_disable_emojis_tinymce( $plugins ) |
|
79 | + public function filter_disable_emojis_tinymce($plugins) |
|
80 | 80 | { |
81 | - if ( is_array( $plugins ) ) { |
|
82 | - return array_diff( $plugins, array( 'wpemoji' ) ); |
|
81 | + if (is_array($plugins)) { |
|
82 | + return array_diff($plugins, array('wpemoji')); |
|
83 | 83 | } else { |
84 | 84 | return array(); |
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - public function filter_remove_qs( $src ) { |
|
89 | - if ( strpos( $src, '?ver=' ) ) { |
|
90 | - $src = remove_query_arg( 'ver', $src ); |
|
88 | + public function filter_remove_qs($src) { |
|
89 | + if (strpos($src, '?ver=')) { |
|
90 | + $src = remove_query_arg('ver', $src); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | return $src; |
94 | 94 | } |
95 | 95 | |
96 | - public function extra_async_js( $in ) |
|
96 | + public function extra_async_js($in) |
|
97 | 97 | { |
98 | 98 | $exclusions = array(); |
99 | - if ( ! empty( $in ) ) { |
|
100 | - $exclusions = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $in ) ) ), '' ); |
|
99 | + if (!empty($in)) { |
|
100 | + $exclusions = array_fill_keys(array_filter(array_map('trim', explode(',', $in))), ''); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | $settings = $this->options['autoptimize_extra_text_field_3']; |
104 | - $async = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $settings ) ) ), '' ); |
|
105 | - $attr = apply_filters( 'autoptimize_filter_extra_async', 'async' ); |
|
106 | - foreach ( $async as $k => $v ) { |
|
107 | - $async[ $k ] = $attr; |
|
104 | + $async = array_fill_keys(array_filter(array_map('trim', explode(',', $settings))), ''); |
|
105 | + $attr = apply_filters('autoptimize_filter_extra_async', 'async'); |
|
106 | + foreach ($async as $k => $v) { |
|
107 | + $async[$k] = $attr; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | // Merge exclusions & asyncs in one array and return to AO API. |
111 | - $merged = array_merge( $exclusions, $async ); |
|
111 | + $merged = array_merge($exclusions, $async); |
|
112 | 112 | |
113 | 113 | return $merged; |
114 | 114 | } |
@@ -118,39 +118,39 @@ discard block |
||
118 | 118 | $options = $this->options; |
119 | 119 | |
120 | 120 | // Disable emojis if specified. |
121 | - if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) ) { |
|
121 | + if (!empty($options['autoptimize_extra_checkbox_field_1'])) { |
|
122 | 122 | $this->disable_emojis(); |
123 | 123 | } |
124 | 124 | |
125 | 125 | // Remove version query parameters. |
126 | - if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) ) { |
|
127 | - add_filter( 'script_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 ); |
|
128 | - add_filter( 'style_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 ); |
|
126 | + if (!empty($options['autoptimize_extra_checkbox_field_0'])) { |
|
127 | + add_filter('script_loader_src', array($this, 'filter_remove_qs'), 15, 1); |
|
128 | + add_filter('style_loader_src', array($this, 'filter_remove_qs'), 15, 1); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | // Making sure is_plugin_active() exists when we need it. |
132 | - if ( ! function_exists( 'is_plugin_active' ) ) { |
|
133 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; |
|
132 | + if (!function_exists('is_plugin_active')) { |
|
133 | + require_once ABSPATH.'wp-admin/includes/plugin.php'; |
|
134 | 134 | } |
135 | 135 | // Avoiding conflicts of interest when async-javascript plugin is active! |
136 | 136 | $async_js_plugin_active = false; |
137 | - if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'async-javascript/async-javascript.php' ) ) { |
|
137 | + if (function_exists('is_plugin_active') && is_plugin_active('async-javascript/async-javascript.php')) { |
|
138 | 138 | $async_js_plugin_active = true; |
139 | 139 | } |
140 | - if ( ! empty( $options['autoptimize_extra_text_field_3'] ) && ! $async_js_plugin_active ) { |
|
141 | - add_filter( 'autoptimize_filter_js_exclude', array( $this, 'extra_async_js' ), 10, 1 ); |
|
140 | + if (!empty($options['autoptimize_extra_text_field_3']) && !$async_js_plugin_active) { |
|
141 | + add_filter('autoptimize_filter_js_exclude', array($this, 'extra_async_js'), 10, 1); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | // Optimize google fonts! |
145 | - if ( ! empty( $options['autoptimize_extra_radio_field_4'] ) && ( '1' !== $options['autoptimize_extra_radio_field_4'] ) ) { |
|
146 | - add_filter( 'wp_resource_hints', array( $this, 'filter_remove_gfonts_dnsprefetch' ), 10, 2 ); |
|
147 | - add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_google_fonts' ), 10, 1 ); |
|
148 | - add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_google_fonts' ), 10, 1 ); |
|
145 | + if (!empty($options['autoptimize_extra_radio_field_4']) && ('1' !== $options['autoptimize_extra_radio_field_4'])) { |
|
146 | + add_filter('wp_resource_hints', array($this, 'filter_remove_gfonts_dnsprefetch'), 10, 2); |
|
147 | + add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_google_fonts'), 10, 1); |
|
148 | + add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_google_fonts'), 10, 1); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | // Preconnect! |
152 | - if ( ! empty( $options['autoptimize_extra_text_field_2'] ) || has_filter( 'autoptimize_extra_filter_tobepreconn' ) ) { |
|
153 | - add_filter( 'wp_resource_hints', array( $this, 'filter_preconnect' ), 10, 2 ); |
|
152 | + if (!empty($options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) { |
|
153 | + add_filter('wp_resource_hints', array($this, 'filter_preconnect'), 10, 2); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | // Optimize Images kicks in if; |
@@ -164,40 +164,40 @@ discard block |
||
164 | 164 | $_do_cdn = false; |
165 | 165 | } |
166 | 166 | |
167 | - if ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && $_do_cdn && 'down' !== $options['availabilities']['extra_imgopt']['status'] && ( 'launch' !== $options['availabilities']['extra_imgopt']['status'] || $this->imgopt_launch_ok() ) ) { |
|
168 | - if ( apply_filters( 'autoptimize_filter_extra_imgopt_do', true ) ) { |
|
169 | - add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_images' ), 10, 1 ); |
|
167 | + if (!empty($options['autoptimize_extra_checkbox_field_5']) && $_do_cdn && 'down' !== $options['availabilities']['extra_imgopt']['status'] && ('launch' !== $options['availabilities']['extra_imgopt']['status'] || $this->imgopt_launch_ok())) { |
|
168 | + if (apply_filters('autoptimize_filter_extra_imgopt_do', true)) { |
|
169 | + add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_images'), 10, 1); |
|
170 | 170 | $_imgopt_active = true; |
171 | 171 | } |
172 | - if ( apply_filters( 'autoptimize_filter_extra_imgopt_do_css', true ) ) { |
|
173 | - add_filter( 'autoptimize_filter_base_replace_cdn', array( $this, 'filter_optimize_css_images' ), 10, 1 ); |
|
172 | + if (apply_filters('autoptimize_filter_extra_imgopt_do_css', true)) { |
|
173 | + add_filter('autoptimize_filter_base_replace_cdn', array($this, 'filter_optimize_css_images'), 10, 1); |
|
174 | 174 | $_imgopt_active = true; |
175 | 175 | } |
176 | - if ( $_imgopt_active ) { |
|
177 | - add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_imgopt_url' ), 10, 1 ); |
|
176 | + if ($_imgopt_active) { |
|
177 | + add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_imgopt_url'), 10, 1); |
|
178 | 178 | } |
179 | 179 | } |
180 | 180 | } |
181 | 181 | |
182 | - public function filter_remove_emoji_dns_prefetch( $urls, $relation_type ) |
|
182 | + public function filter_remove_emoji_dns_prefetch($urls, $relation_type) |
|
183 | 183 | { |
184 | - $emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/' ); |
|
184 | + $emoji_svg_url = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/'); |
|
185 | 185 | |
186 | - return $this->filter_remove_dns_prefetch( $urls, $relation_type, $emoji_svg_url ); |
|
186 | + return $this->filter_remove_dns_prefetch($urls, $relation_type, $emoji_svg_url); |
|
187 | 187 | } |
188 | 188 | |
189 | - public function filter_remove_gfonts_dnsprefetch( $urls, $relation_type ) |
|
189 | + public function filter_remove_gfonts_dnsprefetch($urls, $relation_type) |
|
190 | 190 | { |
191 | - return $this->filter_remove_dns_prefetch( $urls, $relation_type, 'fonts.googleapis.com' ); |
|
191 | + return $this->filter_remove_dns_prefetch($urls, $relation_type, 'fonts.googleapis.com'); |
|
192 | 192 | } |
193 | 193 | |
194 | - public function filter_remove_dns_prefetch( $urls, $relation_type, $url_to_remove ) |
|
194 | + public function filter_remove_dns_prefetch($urls, $relation_type, $url_to_remove) |
|
195 | 195 | { |
196 | - if ( 'dns-prefetch' === $relation_type ) { |
|
196 | + if ('dns-prefetch' === $relation_type) { |
|
197 | 197 | $cnt = 0; |
198 | - foreach ( $urls as $url ) { |
|
199 | - if ( false !== strpos( $url, $url_to_remove ) ) { |
|
200 | - unset( $urls[ $cnt ] ); |
|
198 | + foreach ($urls as $url) { |
|
199 | + if (false !== strpos($url, $url_to_remove)) { |
|
200 | + unset($urls[$cnt]); |
|
201 | 201 | } |
202 | 202 | $cnt++; |
203 | 203 | } |
@@ -206,136 +206,136 @@ discard block |
||
206 | 206 | return $urls; |
207 | 207 | } |
208 | 208 | |
209 | - public function filter_optimize_google_fonts( $in ) |
|
209 | + public function filter_optimize_google_fonts($in) |
|
210 | 210 | { |
211 | 211 | // Extract fonts, partly based on wp rocket's extraction code. |
212 | - $markup = preg_replace( '/<!--(.*)-->/Uis', '', $in ); |
|
213 | - preg_match_all( '#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches ); |
|
212 | + $markup = preg_replace('/<!--(.*)-->/Uis', '', $in); |
|
213 | + preg_match_all('#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches); |
|
214 | 214 | |
215 | 215 | $fonts_collection = array(); |
216 | - if ( ! $matches[2] ) { |
|
216 | + if (!$matches[2]) { |
|
217 | 217 | return $in; |
218 | 218 | } |
219 | 219 | |
220 | 220 | // Store them in $fonts array. |
221 | 221 | $i = 0; |
222 | - foreach ( $matches[2] as $font ) { |
|
223 | - if ( ! preg_match( '/rel=["\']dns-prefetch["\']/', $matches[0][ $i ] ) ) { |
|
222 | + foreach ($matches[2] as $font) { |
|
223 | + if (!preg_match('/rel=["\']dns-prefetch["\']/', $matches[0][$i])) { |
|
224 | 224 | // Get fonts name. |
225 | - $font = str_replace( array( '%7C', '%7c' ), '|', $font ); |
|
226 | - $font = explode( 'family=', $font ); |
|
227 | - $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array(); |
|
225 | + $font = str_replace(array('%7C', '%7c'), '|', $font); |
|
226 | + $font = explode('family=', $font); |
|
227 | + $font = (isset($font[1])) ? explode('&', $font[1]) : array(); |
|
228 | 228 | // Add font to $fonts[$i] but make sure not to pollute with an empty family! |
229 | - $_thisfont = array_values( array_filter( explode( '|', reset( $font ) ) ) ); |
|
230 | - if ( ! empty( $_thisfont ) ) { |
|
231 | - $fonts_collection[ $i ]['fonts'] = $_thisfont; |
|
229 | + $_thisfont = array_values(array_filter(explode('|', reset($font)))); |
|
230 | + if (!empty($_thisfont)) { |
|
231 | + $fonts_collection[$i]['fonts'] = $_thisfont; |
|
232 | 232 | // And add subset if any! |
233 | - $subset = ( is_array( $font ) ) ? end( $font ) : ''; |
|
234 | - if ( false !== strpos( $subset, 'subset=' ) ) { |
|
235 | - $subset = str_replace( array( '%2C', '%2c' ), ',', $subset ); |
|
236 | - $subset = explode( 'subset=', $subset ); |
|
237 | - $fonts_collection[ $i ]['subsets'] = explode( ',', $subset[1] ); |
|
233 | + $subset = (is_array($font)) ? end($font) : ''; |
|
234 | + if (false !== strpos($subset, 'subset=')) { |
|
235 | + $subset = str_replace(array('%2C', '%2c'), ',', $subset); |
|
236 | + $subset = explode('subset=', $subset); |
|
237 | + $fonts_collection[$i]['subsets'] = explode(',', $subset[1]); |
|
238 | 238 | } |
239 | 239 | } |
240 | 240 | // And remove Google Fonts. |
241 | - $in = str_replace( $matches[0][ $i ], '', $in ); |
|
241 | + $in = str_replace($matches[0][$i], '', $in); |
|
242 | 242 | } |
243 | 243 | $i++; |
244 | 244 | } |
245 | 245 | |
246 | 246 | $options = $this->options; |
247 | 247 | $fonts_markup = ''; |
248 | - if ( '2' === $options['autoptimize_extra_radio_field_4'] ) { |
|
248 | + if ('2' === $options['autoptimize_extra_radio_field_4']) { |
|
249 | 249 | // Remove Google Fonts. |
250 | - unset( $fonts_collection ); |
|
250 | + unset($fonts_collection); |
|
251 | 251 | return $in; |
252 | - } elseif ( '3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4'] ) { |
|
252 | + } elseif ('3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4']) { |
|
253 | 253 | // Aggregate & link! |
254 | 254 | $fonts_string = ''; |
255 | 255 | $subset_string = ''; |
256 | - foreach ( $fonts_collection as $font ) { |
|
257 | - $fonts_string .= '|' . trim( implode( '|', $font['fonts'] ), '|' ); |
|
258 | - if ( ! empty( $font['subsets'] ) ) { |
|
259 | - $subset_string .= ',' . trim( implode( ',', $font['subsets'] ), ',' ); |
|
256 | + foreach ($fonts_collection as $font) { |
|
257 | + $fonts_string .= '|'.trim(implode('|', $font['fonts']), '|'); |
|
258 | + if (!empty($font['subsets'])) { |
|
259 | + $subset_string .= ','.trim(implode(',', $font['subsets']), ','); |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | |
263 | - if ( ! empty( $subset_string ) ) { |
|
264 | - $subset_string = str_replace( ',', '%2C', ltrim( $subset_string, ',' ) ); |
|
265 | - $fonts_string = $fonts_string . '&subset=' . $subset_string; |
|
263 | + if (!empty($subset_string)) { |
|
264 | + $subset_string = str_replace(',', '%2C', ltrim($subset_string, ',')); |
|
265 | + $fonts_string = $fonts_string.'&subset='.$subset_string; |
|
266 | 266 | } |
267 | 267 | |
268 | - $fonts_string = str_replace( '|', '%7C', ltrim( $fonts_string, '|' ) ); |
|
268 | + $fonts_string = str_replace('|', '%7C', ltrim($fonts_string, '|')); |
|
269 | 269 | |
270 | - if ( ! empty( $fonts_string ) ) { |
|
271 | - if ( '5' === $options['autoptimize_extra_radio_field_4'] ) { |
|
272 | - $rel_string = 'rel="preload" as="style" onload="' . autoptimizeConfig::get_ao_css_preload_onload() . '"'; |
|
270 | + if (!empty($fonts_string)) { |
|
271 | + if ('5' === $options['autoptimize_extra_radio_field_4']) { |
|
272 | + $rel_string = 'rel="preload" as="style" onload="'.autoptimizeConfig::get_ao_css_preload_onload().'"'; |
|
273 | 273 | } else { |
274 | 274 | $rel_string = 'rel="stylesheet"'; |
275 | 275 | } |
276 | - $fonts_markup = '<link ' . $rel_string . ' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family=' . $fonts_string . '" />'; |
|
276 | + $fonts_markup = '<link '.$rel_string.' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family='.$fonts_string.'" />'; |
|
277 | 277 | } |
278 | - } elseif ( '4' === $options['autoptimize_extra_radio_field_4'] ) { |
|
278 | + } elseif ('4' === $options['autoptimize_extra_radio_field_4']) { |
|
279 | 279 | // Aggregate & load async (webfont.js impl.)! |
280 | 280 | $fonts_array = array(); |
281 | - foreach ( $fonts_collection as $_fonts ) { |
|
282 | - if ( ! empty( $_fonts['subsets'] ) ) { |
|
283 | - $_subset = implode( ',', $_fonts['subsets'] ); |
|
284 | - foreach ( $_fonts['fonts'] as $key => $_one_font ) { |
|
285 | - $_one_font = $_one_font . ':' . $_subset; |
|
286 | - $_fonts['fonts'][ $key ] = $_one_font; |
|
281 | + foreach ($fonts_collection as $_fonts) { |
|
282 | + if (!empty($_fonts['subsets'])) { |
|
283 | + $_subset = implode(',', $_fonts['subsets']); |
|
284 | + foreach ($_fonts['fonts'] as $key => $_one_font) { |
|
285 | + $_one_font = $_one_font.':'.$_subset; |
|
286 | + $_fonts['fonts'][$key] = $_one_font; |
|
287 | 287 | } |
288 | 288 | } |
289 | - $fonts_array = array_merge( $fonts_array, $_fonts['fonts'] ); |
|
289 | + $fonts_array = array_merge($fonts_array, $_fonts['fonts']); |
|
290 | 290 | } |
291 | 291 | |
292 | 292 | $fonts_markup = '<script data-cfasync="false" id="ao_optimized_gfonts" type="text/javascript">WebFontConfig={google:{families:[\''; |
293 | - foreach ( $fonts_array as $fnt ) { |
|
294 | - $fonts_markup .= $fnt . "','"; |
|
293 | + foreach ($fonts_array as $fnt) { |
|
294 | + $fonts_markup .= $fnt."','"; |
|
295 | 295 | } |
296 | - $fonts_markup = trim( trim( $fonts_markup, "'" ), ',' ); |
|
296 | + $fonts_markup = trim(trim($fonts_markup, "'"), ','); |
|
297 | 297 | $fonts_markup .= '] },classes:false, events:false, timeout:1500};</script>'; |
298 | 298 | |
299 | 299 | $fonts_library_markup = '<script data-cfasync="false" id="ao_optimized_gfonts" type="text/javascript">(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.async=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>'; |
300 | - $in = substr_replace( $in, $fonts_library_markup . '</head>', strpos( $in, '</head>' ), strlen( '</head>' ) ); |
|
300 | + $in = substr_replace($in, $fonts_library_markup.'</head>', strpos($in, '</head>'), strlen('</head>')); |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | // Replace back in markup. |
304 | - $out = substr_replace( $in, $fonts_markup . '<link', strpos( $in, '<link' ), strlen( '<link' ) ); |
|
305 | - unset( $fonts_collection ); |
|
304 | + $out = substr_replace($in, $fonts_markup.'<link', strpos($in, '<link'), strlen('<link')); |
|
305 | + unset($fonts_collection); |
|
306 | 306 | |
307 | 307 | // and insert preload polyfill if "link preload" and if the polyfill isn't there yet (courtesy of inline&defer). |
308 | 308 | $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill(); |
309 | - if ( '5' === $options['autoptimize_extra_radio_field_4'] && strpos( $out, $preload_polyfill ) === false ) { |
|
310 | - $out = str_replace( '</body>', $preload_polyfill . '</body>', $out ); |
|
309 | + if ('5' === $options['autoptimize_extra_radio_field_4'] && strpos($out, $preload_polyfill) === false) { |
|
310 | + $out = str_replace('</body>', $preload_polyfill.'</body>', $out); |
|
311 | 311 | } |
312 | 312 | return $out; |
313 | 313 | } |
314 | 314 | |
315 | - public function filter_preconnect( $hints, $relation_type ) |
|
315 | + public function filter_preconnect($hints, $relation_type) |
|
316 | 316 | { |
317 | 317 | $options = $this->options; |
318 | 318 | |
319 | 319 | // Get settings and store in array. |
320 | - $preconns = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_2'] ) ) ); |
|
321 | - $preconns = apply_filters( 'autoptimize_extra_filter_tobepreconn', $preconns ); |
|
320 | + $preconns = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_2']))); |
|
321 | + $preconns = apply_filters('autoptimize_extra_filter_tobepreconn', $preconns); |
|
322 | 322 | |
323 | 323 | // Walk array, extract domain and add to new array with crossorigin attribute. |
324 | - foreach ( $preconns as $preconn ) { |
|
325 | - $parsed = parse_url( $preconn ); |
|
324 | + foreach ($preconns as $preconn) { |
|
325 | + $parsed = parse_url($preconn); |
|
326 | 326 | |
327 | - if ( is_array( $parsed ) && empty( $parsed['scheme'] ) ) { |
|
328 | - $domain = '//' . $parsed['host']; |
|
329 | - } elseif ( is_array( $parsed ) ) { |
|
330 | - $domain = $parsed['scheme'] . '://' . $parsed['host']; |
|
327 | + if (is_array($parsed) && empty($parsed['scheme'])) { |
|
328 | + $domain = '//'.$parsed['host']; |
|
329 | + } elseif (is_array($parsed)) { |
|
330 | + $domain = $parsed['scheme'].'://'.$parsed['host']; |
|
331 | 331 | } |
332 | 332 | |
333 | - if ( ! empty( $domain ) ) { |
|
334 | - $hint = array( 'href' => $domain ); |
|
333 | + if (!empty($domain)) { |
|
334 | + $hint = array('href' => $domain); |
|
335 | 335 | // Fonts don't get preconnected unless crossorigin flag is set, non-fonts don't get preconnected if origin flag is set |
336 | 336 | // so hardcode fonts.gstatic.com to come with crossorigin and have filter to add other domains if needed. |
337 | - $crossorigins = apply_filters( 'autoptimize_extra_filter_preconn_crossorigin', array( 'https://fonts.gstatic.com' ) ); |
|
338 | - if ( in_array( $domain, $crossorigins ) ) { |
|
337 | + $crossorigins = apply_filters('autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com')); |
|
338 | + if (in_array($domain, $crossorigins)) { |
|
339 | 339 | $hint['crossorigin'] = 'anonymous'; |
340 | 340 | } |
341 | 341 | $new_hints[] = $hint; |
@@ -343,21 +343,21 @@ discard block |
||
343 | 343 | } |
344 | 344 | |
345 | 345 | // Merge in WP's preconnect hints. |
346 | - if ( 'preconnect' === $relation_type && ! empty( $new_hints ) ) { |
|
347 | - $hints = array_merge( $hints, $new_hints ); |
|
346 | + if ('preconnect' === $relation_type && !empty($new_hints)) { |
|
347 | + $hints = array_merge($hints, $new_hints); |
|
348 | 348 | } |
349 | 349 | |
350 | 350 | return $hints; |
351 | 351 | } |
352 | 352 | |
353 | - public function filter_preconnect_google_fonts( $in ) |
|
353 | + public function filter_preconnect_google_fonts($in) |
|
354 | 354 | { |
355 | - if ( '2' !== $this->options['autoptimize_extra_radio_field_4'] ) { |
|
355 | + if ('2' !== $this->options['autoptimize_extra_radio_field_4']) { |
|
356 | 356 | // Preconnect to fonts.gstatic.com unless we remove gfonts. |
357 | 357 | $in[] = 'https://fonts.gstatic.com'; |
358 | 358 | } |
359 | 359 | |
360 | - if ( '4' === $this->options['autoptimize_extra_radio_field_4'] ) { |
|
360 | + if ('4' === $this->options['autoptimize_extra_radio_field_4']) { |
|
361 | 361 | // Preconnect even more hosts for webfont.js! |
362 | 362 | $in[] = 'https://ajax.googleapis.com'; |
363 | 363 | $in[] = 'https://fonts.googleapis.com'; |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | return $in; |
367 | 367 | } |
368 | 368 | |
369 | - public function filter_optimize_images( $in ) |
|
369 | + public function filter_optimize_images($in) |
|
370 | 370 | { |
371 | 371 | /* |
372 | 372 | * potential future functional improvements: |
@@ -379,26 +379,26 @@ discard block |
||
379 | 379 | $to_replace = array(); |
380 | 380 | |
381 | 381 | // extract img tags. |
382 | - if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $in, $matches ) ) { |
|
383 | - foreach ( $matches[0] as $tag ) { |
|
382 | + if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $in, $matches)) { |
|
383 | + foreach ($matches[0] as $tag) { |
|
384 | 384 | $orig_tag = $tag; |
385 | 385 | $imgopt_w = ''; |
386 | 386 | $imgopt_h = ''; |
387 | 387 | |
388 | 388 | // first do (data-)srcsets. |
389 | - if ( preg_match_all( '#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER ) ) { |
|
390 | - foreach ( $allsrcsets as $srcset ) { |
|
389 | + if (preg_match_all('#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER)) { |
|
390 | + foreach ($allsrcsets as $srcset) { |
|
391 | 391 | $srcset = $srcset[2]; |
392 | - $srcsets = explode( ',', $srcset ); |
|
393 | - foreach ( $srcsets as $indiv_srcset ) { |
|
394 | - $indiv_srcset_parts = explode( ' ', trim( $indiv_srcset ) ); |
|
395 | - if ( $indiv_srcset_parts[1] && rtrim( $indiv_srcset_parts[1], 'w' ) !== $indiv_srcset_parts[1] ) { |
|
396 | - $imgopt_w = rtrim( $indiv_srcset_parts[1], 'w' ); |
|
392 | + $srcsets = explode(',', $srcset); |
|
393 | + foreach ($srcsets as $indiv_srcset) { |
|
394 | + $indiv_srcset_parts = explode(' ', trim($indiv_srcset)); |
|
395 | + if ($indiv_srcset_parts[1] && rtrim($indiv_srcset_parts[1], 'w') !== $indiv_srcset_parts[1]) { |
|
396 | + $imgopt_w = rtrim($indiv_srcset_parts[1], 'w'); |
|
397 | 397 | } |
398 | - if ( $this->can_optimize_image( $indiv_srcset_parts[0] ) ) { |
|
399 | - $imgopt_url = $this->build_imgopt_url( $indiv_srcset_parts[0], $imgopt_w, '' ); |
|
400 | - $tag = str_replace( $indiv_srcset_parts[0], $imgopt_url, $tag ); |
|
401 | - $to_replace[ $orig_tag ] = $tag; |
|
398 | + if ($this->can_optimize_image($indiv_srcset_parts[0])) { |
|
399 | + $imgopt_url = $this->build_imgopt_url($indiv_srcset_parts[0], $imgopt_w, ''); |
|
400 | + $tag = str_replace($indiv_srcset_parts[0], $imgopt_url, $tag); |
|
401 | + $to_replace[$orig_tag] = $tag; |
|
402 | 402 | } |
403 | 403 | } |
404 | 404 | } |
@@ -408,35 +408,35 @@ discard block |
||
408 | 408 | // first reset and then get width and height and add to $imgopt_size. |
409 | 409 | $imgopt_w = ''; |
410 | 410 | $imgopt_h = ''; |
411 | - if ( preg_match( '#width=("|\')(.*)("|\')#Usmi', $tag, $width ) ) { |
|
411 | + if (preg_match('#width=("|\')(.*)("|\')#Usmi', $tag, $width)) { |
|
412 | 412 | $imgopt_w = $width[2]; |
413 | 413 | } |
414 | - if ( preg_match( '#height=("|\')(.*)("|\')#Usmi', $tag, $height ) ) { |
|
414 | + if (preg_match('#height=("|\')(.*)("|\')#Usmi', $tag, $height)) { |
|
415 | 415 | $imgopt_h = $height[2]; |
416 | 416 | } |
417 | 417 | |
418 | 418 | // then start replacing images src. |
419 | - if ( preg_match_all( '#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER ) ) { |
|
420 | - foreach ( $urls as $url ) { |
|
419 | + if (preg_match_all('#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER)) { |
|
420 | + foreach ($urls as $url) { |
|
421 | 421 | $full_src_orig = $url[0]; |
422 | 422 | $url = $url[1]; |
423 | - if ( $this->can_optimize_image( $url ) ) { |
|
424 | - $imgopt_url = $this->build_imgopt_url( $url, $imgopt_w, $imgopt_h ); |
|
425 | - $full_imgopt_src = str_replace( $url, $imgopt_url, $full_src_orig ); |
|
426 | - $tag = str_replace( $full_src_orig, $full_imgopt_src, $tag ); |
|
427 | - $to_replace[ $orig_tag ] = $tag; |
|
423 | + if ($this->can_optimize_image($url)) { |
|
424 | + $imgopt_url = $this->build_imgopt_url($url, $imgopt_w, $imgopt_h); |
|
425 | + $full_imgopt_src = str_replace($url, $imgopt_url, $full_src_orig); |
|
426 | + $tag = str_replace($full_src_orig, $full_imgopt_src, $tag); |
|
427 | + $to_replace[$orig_tag] = $tag; |
|
428 | 428 | } |
429 | 429 | } |
430 | 430 | } |
431 | 431 | } |
432 | 432 | } |
433 | - $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $in ); |
|
433 | + $out = str_replace(array_keys($to_replace), array_values($to_replace), $in); |
|
434 | 434 | |
435 | 435 | // img thumbnails in e.g. woocommerce. |
436 | - if ( strpos( $out, 'data-thumb' ) !== false && apply_filters( 'autoptimize_filter_extra_imgopt_datathumbs', true ) ) { |
|
436 | + if (strpos($out, 'data-thumb') !== false && apply_filters('autoptimize_filter_extra_imgopt_datathumbs', true)) { |
|
437 | 437 | $out = preg_replace_callback( |
438 | 438 | '/\<div(?:[^>]?)\sdata-thumb\=(?:\"|\')(.+?)(?:\"|\')(?:[^>]*)?\>/s', |
439 | - array( $this, 'replace_data_thumbs' ), |
|
439 | + array($this, 'replace_data_thumbs'), |
|
440 | 440 | $out |
441 | 441 | ); |
442 | 442 | } |
@@ -444,13 +444,13 @@ discard block |
||
444 | 444 | return $out; |
445 | 445 | } |
446 | 446 | |
447 | - public function filter_optimize_css_images( $in ) |
|
447 | + public function filter_optimize_css_images($in) |
|
448 | 448 | { |
449 | 449 | $imgopt_base_url = $this->get_imgopt_base_url(); |
450 | - $in = $this->normalize_img_urls( $in ); |
|
450 | + $in = $this->normalize_img_urls($in); |
|
451 | 451 | |
452 | - if ( $this->can_optimize_image( $in ) ) { |
|
453 | - return $this->build_imgopt_url( $in, '', '' ); |
|
452 | + if ($this->can_optimize_image($in)) { |
|
453 | + return $this->build_imgopt_url($in, '', ''); |
|
454 | 454 | } else { |
455 | 455 | return $in; |
456 | 456 | } |
@@ -460,47 +460,47 @@ discard block |
||
460 | 460 | { |
461 | 461 | static $imgopt_base_url = null; |
462 | 462 | |
463 | - if ( is_null( $imgopt_base_url ) ) { |
|
463 | + if (is_null($imgopt_base_url)) { |
|
464 | 464 | $imgopt_host = $this->get_imgopt_host(); |
465 | 465 | $quality = $this->get_img_quality_string(); |
466 | - $ret_val = apply_filters( 'autoptimize_filter_extra_imgopt_wait', 'ret_img' ); // values: ret_wait, ret_img, ret_json, ret_blank. |
|
467 | - $imgopt_base_url = $imgopt_host . 'client/' . $quality . ',' . $ret_val; |
|
468 | - $imgopt_base_url = apply_filters( 'autoptimize_filter_extra_imgopt_base_url', $imgopt_base_url ); |
|
466 | + $ret_val = apply_filters('autoptimize_filter_extra_imgopt_wait', 'ret_img'); // values: ret_wait, ret_img, ret_json, ret_blank. |
|
467 | + $imgopt_base_url = $imgopt_host.'client/'.$quality.','.$ret_val; |
|
468 | + $imgopt_base_url = apply_filters('autoptimize_filter_extra_imgopt_base_url', $imgopt_base_url); |
|
469 | 469 | } |
470 | 470 | |
471 | 471 | return $imgopt_base_url; |
472 | 472 | } |
473 | 473 | |
474 | - private function can_optimize_image( $url ) |
|
474 | + private function can_optimize_image($url) |
|
475 | 475 | { |
476 | 476 | static $cdn_url = null; |
477 | 477 | static $nopti_images = null; |
478 | 478 | |
479 | - if ( is_null( $cdn_url ) ) { |
|
480 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', get_option( 'autoptimize_cdn_url', '' ) ); |
|
479 | + if (is_null($cdn_url)) { |
|
480 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', get_option('autoptimize_cdn_url', '')); |
|
481 | 481 | } |
482 | 482 | |
483 | - if ( is_null( $nopti_images ) ) { |
|
484 | - $nopti_images = apply_filters( 'autoptimize_filter_extra_imgopt_noptimize', '' ); |
|
483 | + if (is_null($nopti_images)) { |
|
484 | + $nopti_images = apply_filters('autoptimize_filter_extra_imgopt_noptimize', ''); |
|
485 | 485 | } |
486 | 486 | |
487 | 487 | $imgopt_base_url = $this->get_imgopt_base_url(); |
488 | 488 | $site_host = AUTOPTIMIZE_SITE_DOMAIN; |
489 | - $url_parsed = parse_url( $url ); |
|
489 | + $url_parsed = parse_url($url); |
|
490 | 490 | |
491 | - if ( array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host && empty( $cdn_url ) ) { |
|
491 | + if (array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host && empty($cdn_url)) { |
|
492 | 492 | return false; |
493 | - } elseif ( ! empty( $cdn_url ) && strpos( $url, $cdn_url ) === false && array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host ) { |
|
493 | + } elseif (!empty($cdn_url) && strpos($url, $cdn_url) === false && array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host) { |
|
494 | 494 | return false; |
495 | - } elseif ( strpos( $url, '.php' ) !== false ) { |
|
495 | + } elseif (strpos($url, '.php') !== false) { |
|
496 | 496 | return false; |
497 | - } elseif ( str_ireplace( array( '.png', '.gif', '.jpg', '.jpeg', '.webp' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) { |
|
497 | + } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg', '.webp'), '', $url_parsed['path']) === $url_parsed['path']) { |
|
498 | 498 | // fixme: better check against end of string. |
499 | 499 | return false; |
500 | - } elseif ( ! empty( $nopti_images ) ) { |
|
501 | - $nopti_images_array = array_filter( array_map( 'trim', explode( ',', $nopti_images ) ) ); |
|
502 | - foreach ( $nopti_images_array as $nopti_image ) { |
|
503 | - if ( strpos( $url, $nopti_image ) !== false ) { |
|
500 | + } elseif (!empty($nopti_images)) { |
|
501 | + $nopti_images_array = array_filter(array_map('trim', explode(',', $nopti_images))); |
|
502 | + foreach ($nopti_images_array as $nopti_image) { |
|
503 | + if (strpos($url, $nopti_image) !== false) { |
|
504 | 504 | return false; |
505 | 505 | } |
506 | 506 | } |
@@ -508,94 +508,94 @@ discard block |
||
508 | 508 | return true; |
509 | 509 | } |
510 | 510 | |
511 | - private function build_imgopt_url( $orig_url, $width = 0, $height = 0 ) |
|
511 | + private function build_imgopt_url($orig_url, $width = 0, $height = 0) |
|
512 | 512 | { |
513 | 513 | // sanitize width and height. |
514 | - if ( strpos( $width, '%' ) !== false ) { |
|
514 | + if (strpos($width, '%') !== false) { |
|
515 | 515 | $width = 0; |
516 | 516 | } |
517 | - if ( strpos( $height, '%' ) !== false ) { |
|
517 | + if (strpos($height, '%') !== false) { |
|
518 | 518 | $height = 0; |
519 | 519 | } |
520 | 520 | $width = (int) $width; |
521 | 521 | $height = (int) $height; |
522 | 522 | |
523 | - $filtered_url = apply_filters( 'autoptimize_filter_extra_imgopt_build_url', $orig_url, $width, $height ); |
|
523 | + $filtered_url = apply_filters('autoptimize_filter_extra_imgopt_build_url', $orig_url, $width, $height); |
|
524 | 524 | |
525 | - if ( $filtered_url !== $orig_url ) { |
|
525 | + if ($filtered_url !== $orig_url) { |
|
526 | 526 | return $filtered_url; |
527 | 527 | } |
528 | 528 | |
529 | - $orig_url = $this->normalize_img_urls( $orig_url ); |
|
529 | + $orig_url = $this->normalize_img_urls($orig_url); |
|
530 | 530 | $imgopt_base_url = $this->get_imgopt_base_url(); |
531 | 531 | $imgopt_size = ''; |
532 | 532 | |
533 | - if ( $width && 0 !== $width ) { |
|
534 | - $imgopt_size = ',w_' . $width; |
|
533 | + if ($width && 0 !== $width) { |
|
534 | + $imgopt_size = ',w_'.$width; |
|
535 | 535 | } |
536 | 536 | |
537 | - if ( $height && 0 !== $height ) { |
|
538 | - $imgopt_size .= ',h_' . $height; |
|
537 | + if ($height && 0 !== $height) { |
|
538 | + $imgopt_size .= ',h_'.$height; |
|
539 | 539 | } |
540 | 540 | |
541 | - $url = $imgopt_base_url . $imgopt_size . '/' . $orig_url; |
|
541 | + $url = $imgopt_base_url.$imgopt_size.'/'.$orig_url; |
|
542 | 542 | |
543 | 543 | return $url; |
544 | 544 | } |
545 | 545 | |
546 | - public function replace_data_thumbs( $matches ) |
|
546 | + public function replace_data_thumbs($matches) |
|
547 | 547 | { |
548 | - if ( $this->can_optimize_image( $matches[1] ) ) { |
|
549 | - return str_replace( $matches[1], $this->build_imgopt_url( $matches[1], 150, 150 ), $matches[0] ); |
|
548 | + if ($this->can_optimize_image($matches[1])) { |
|
549 | + return str_replace($matches[1], $this->build_imgopt_url($matches[1], 150, 150), $matches[0]); |
|
550 | 550 | } else { |
551 | 551 | return $matches[0]; |
552 | 552 | } |
553 | 553 | } |
554 | 554 | |
555 | - public function filter_preconnect_imgopt_url( $in ) |
|
555 | + public function filter_preconnect_imgopt_url($in) |
|
556 | 556 | { |
557 | - $imgopt_url_array = parse_url( $this->get_imgopt_base_url() ); |
|
558 | - $in[] = $imgopt_url_array['scheme'] . '://' . $imgopt_url_array['host']; |
|
557 | + $imgopt_url_array = parse_url($this->get_imgopt_base_url()); |
|
558 | + $in[] = $imgopt_url_array['scheme'].'://'.$imgopt_url_array['host']; |
|
559 | 559 | |
560 | 560 | return $in; |
561 | 561 | } |
562 | 562 | |
563 | - private function normalize_img_urls( $in ) |
|
563 | + private function normalize_img_urls($in) |
|
564 | 564 | { |
565 | 565 | static $cdn_domain = null; |
566 | - if ( is_null( $cdn_domain ) ) { |
|
567 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', get_option( 'autoptimize_cdn_url', '' ) ); |
|
568 | - if ( ! empty( $cdn_url ) ) { |
|
569 | - $cdn_domain = parse_url( $cdn_url, PHP_URL_HOST ); |
|
566 | + if (is_null($cdn_domain)) { |
|
567 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', get_option('autoptimize_cdn_url', '')); |
|
568 | + if (!empty($cdn_url)) { |
|
569 | + $cdn_domain = parse_url($cdn_url, PHP_URL_HOST); |
|
570 | 570 | } else { |
571 | 571 | $cdn_domain = ''; |
572 | 572 | } |
573 | 573 | } |
574 | 574 | |
575 | - $parsed_site_url = parse_url( site_url() ); |
|
575 | + $parsed_site_url = parse_url(site_url()); |
|
576 | 576 | |
577 | - if ( strpos( $in, 'http' ) !== 0 && strpos( $in, '//' ) === 0 ) { |
|
578 | - $in = $parsed_site_url['scheme'] . ':' . $in; |
|
579 | - } elseif ( strpos( $in, '/' ) === 0 ) { |
|
580 | - $in = $parsed_site_url['scheme'] . '://' . $parsed_site_url['host'] . $in; |
|
581 | - } elseif ( ! empty( $cdn_domain ) && strpos( $in, $cdn_domain ) !== 0 ) { |
|
582 | - $in = str_replace( $cdn_domain, $parsed_site_url['host'], $in ); |
|
577 | + if (strpos($in, 'http') !== 0 && strpos($in, '//') === 0) { |
|
578 | + $in = $parsed_site_url['scheme'].':'.$in; |
|
579 | + } elseif (strpos($in, '/') === 0) { |
|
580 | + $in = $parsed_site_url['scheme'].'://'.$parsed_site_url['host'].$in; |
|
581 | + } elseif (!empty($cdn_domain) && strpos($in, $cdn_domain) !== 0) { |
|
582 | + $in = str_replace($cdn_domain, $parsed_site_url['host'], $in); |
|
583 | 583 | } |
584 | 584 | |
585 | - return apply_filters( 'autoptimize_filter_extra_imgopt_normalized_url', $in ); |
|
585 | + return apply_filters('autoptimize_filter_extra_imgopt_normalized_url', $in); |
|
586 | 586 | } |
587 | 587 | |
588 | 588 | private function get_img_quality_array() |
589 | 589 | { |
590 | 590 | static $img_quality_array = null; |
591 | 591 | |
592 | - if ( is_null( $img_quality_array ) ) { |
|
592 | + if (is_null($img_quality_array)) { |
|
593 | 593 | $img_quality_array = array( |
594 | 594 | '1' => 'lossy', |
595 | 595 | '2' => 'glossy', |
596 | 596 | '3' => 'lossless', |
597 | 597 | ); |
598 | - $img_quality_array = apply_filters( 'autoptimize_filter_extra_imgopt_quality_array', $img_quality_array ); |
|
598 | + $img_quality_array = apply_filters('autoptimize_filter_extra_imgopt_quality_array', $img_quality_array); |
|
599 | 599 | } |
600 | 600 | |
601 | 601 | return $img_quality_array; |
@@ -605,12 +605,12 @@ discard block |
||
605 | 605 | { |
606 | 606 | static $_img_q = null; |
607 | 607 | |
608 | - if ( is_null( $_img_q ) ) { |
|
609 | - if ( is_array( $this->options ) && array_key_exists( 'autoptimize_extra_select_field_6', $this->options ) ) { |
|
608 | + if (is_null($_img_q)) { |
|
609 | + if (is_array($this->options) && array_key_exists('autoptimize_extra_select_field_6', $this->options)) { |
|
610 | 610 | $_setting = $this->options['autoptimize_extra_select_field_6']; |
611 | 611 | } |
612 | 612 | |
613 | - if ( ! isset( $_setting ) || empty( $_setting ) || ( '1' !== $_setting && '3' !== $_setting ) ) { |
|
613 | + if (!isset($_setting) || empty($_setting) || ('1' !== $_setting && '3' !== $_setting)) { |
|
614 | 614 | // default image opt. value is 2 ("glossy"). |
615 | 615 | $_img_q = '2'; |
616 | 616 | } else { |
@@ -625,10 +625,10 @@ discard block |
||
625 | 625 | { |
626 | 626 | static $_img_q_string = null; |
627 | 627 | |
628 | - if ( is_null( $_img_q_string ) ) { |
|
628 | + if (is_null($_img_q_string)) { |
|
629 | 629 | $_quality_array = $this->get_img_quality_array(); |
630 | 630 | $_setting = $this->get_img_quality_setting(); |
631 | - $_img_q_string = apply_filters( 'autoptimize_filter_extra_imgopt_quality', 'q_' . $_quality_array[ $_setting ] ); |
|
631 | + $_img_q_string = apply_filters('autoptimize_filter_extra_imgopt_quality', 'q_'.$_quality_array[$_setting]); |
|
632 | 632 | } |
633 | 633 | |
634 | 634 | return $_img_q_string; |
@@ -643,26 +643,26 @@ discard block |
||
643 | 643 | |
644 | 644 | public function query_img_provider_stats() |
645 | 645 | { |
646 | - if ( ! empty( $this->options['autoptimize_extra_checkbox_field_5'] ) ) { |
|
646 | + if (!empty($this->options['autoptimize_extra_checkbox_field_5'])) { |
|
647 | 647 | $_img_provider_stat_url = ''; |
648 | - $_img_provider_endpoint = $this->get_imgopt_host() . 'read-domain/'; |
|
648 | + $_img_provider_endpoint = $this->get_imgopt_host().'read-domain/'; |
|
649 | 649 | $_site_host = AUTOPTIMIZE_SITE_DOMAIN; |
650 | 650 | |
651 | 651 | // make sure parse_url result makes sense, keeping $_img_provider_stat_url empty if not. |
652 | - if ( $_site_host && ! empty( $_site_host ) ) { |
|
653 | - $_img_provider_stat_url = $_img_provider_endpoint . $_site_host; |
|
652 | + if ($_site_host && !empty($_site_host)) { |
|
653 | + $_img_provider_stat_url = $_img_provider_endpoint.$_site_host; |
|
654 | 654 | } |
655 | 655 | |
656 | - $_img_provider_stat_url = apply_filters( 'autoptimize_filter_extra_imgopt_stat_url', $_img_provider_stat_url ); |
|
656 | + $_img_provider_stat_url = apply_filters('autoptimize_filter_extra_imgopt_stat_url', $_img_provider_stat_url); |
|
657 | 657 | |
658 | 658 | // only do the remote call if $_img_provider_stat_url is not empty to make sure no parse_url weirdness results in useless calls. |
659 | - if ( ! empty( $_img_provider_stat_url ) ) { |
|
660 | - $_img_stat_resp = wp_remote_get( $_img_provider_stat_url ); |
|
661 | - if ( ! is_wp_error( $_img_stat_resp ) ) { |
|
662 | - if ( '200' == wp_remote_retrieve_response_code( $_img_stat_resp ) ) { |
|
663 | - $_img_provider_stat = json_decode( wp_remote_retrieve_body( $_img_stat_resp ), true ); |
|
659 | + if (!empty($_img_provider_stat_url)) { |
|
660 | + $_img_stat_resp = wp_remote_get($_img_provider_stat_url); |
|
661 | + if (!is_wp_error($_img_stat_resp)) { |
|
662 | + if ('200' == wp_remote_retrieve_response_code($_img_stat_resp)) { |
|
663 | + $_img_provider_stat = json_decode(wp_remote_retrieve_body($_img_stat_resp), true); |
|
664 | 664 | $_img_provider_stat['timestamp'] = time(); |
665 | - update_option( 'autoptimize_imgopt_provider_stat', $_img_provider_stat ); |
|
665 | + update_option('autoptimize_imgopt_provider_stat', $_img_provider_stat); |
|
666 | 666 | } |
667 | 667 | } |
668 | 668 | } |
@@ -673,14 +673,14 @@ discard block |
||
673 | 673 | { |
674 | 674 | static $launch_status = null; |
675 | 675 | |
676 | - if ( is_null( $launch_status ) ) { |
|
676 | + if (is_null($launch_status)) { |
|
677 | 677 | $avail_imgopt = $this->options['availabilities']['extra_imgopt']; |
678 | - $magic_number = intval( substr( md5( parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) ), 0, 3 ), 16 ); |
|
679 | - $has_launched = get_option( 'autoptimize_imgopt_launched', '' ); |
|
680 | - if ( $has_launched || ( is_array( $avail_imgopt ) && array_key_exists( 'launch-threshold', $avail_imgopt ) && $magic_number < $avail_imgopt['launch-threshold'] ) ) { |
|
678 | + $magic_number = intval(substr(md5(parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)), 0, 3), 16); |
|
679 | + $has_launched = get_option('autoptimize_imgopt_launched', ''); |
|
680 | + if ($has_launched || (is_array($avail_imgopt) && array_key_exists('launch-threshold', $avail_imgopt) && $magic_number < $avail_imgopt['launch-threshold'])) { |
|
681 | 681 | $launch_status = true; |
682 | - if ( ! $has_launched ) { |
|
683 | - update_option( 'autoptimize_imgopt_launched', 'on' ); |
|
682 | + if (!$has_launched) { |
|
683 | + update_option('autoptimize_imgopt_launched', 'on'); |
|
684 | 684 | } |
685 | 685 | } else { |
686 | 686 | $launch_status = false; |
@@ -701,10 +701,10 @@ discard block |
||
701 | 701 | { |
702 | 702 | static $imgopt_host = null; |
703 | 703 | |
704 | - if ( is_null( $imgopt_host ) ) { |
|
704 | + if (is_null($imgopt_host)) { |
|
705 | 705 | $avail_imgopt = $this->options['availabilities']['extra_imgopt']; |
706 | - if ( ! empty( $avail_imgopt ) && array_key_exists( 'hosts', $avail_imgopt ) && is_array( $avail_imgopt['hosts'] ) ) { |
|
707 | - $imgopt_host = array_rand( array_flip( $avail_imgopt['hosts'] ) ); |
|
706 | + if (!empty($avail_imgopt) && array_key_exists('hosts', $avail_imgopt) && is_array($avail_imgopt['hosts'])) { |
|
707 | + $imgopt_host = array_rand(array_flip($avail_imgopt['hosts'])); |
|
708 | 708 | } else { |
709 | 709 | $imgopt_host = 'https://cdn.shortpixel.ai/'; |
710 | 710 | } |
@@ -722,37 +722,37 @@ discard block |
||
722 | 722 | |
723 | 723 | public function get_imgopt_status_notice() { |
724 | 724 | $_extra_options = $this->options; |
725 | - if ( ! empty( $_extra_options ) && is_array( $_extra_options ) && array_key_exists( 'autoptimize_extra_checkbox_field_5', $_extra_options ) && ! empty( $_extra_options['autoptimize_extra_checkbox_field_5'] ) ) { |
|
725 | + if (!empty($_extra_options) && is_array($_extra_options) && array_key_exists('autoptimize_extra_checkbox_field_5', $_extra_options) && !empty($_extra_options['autoptimize_extra_checkbox_field_5'])) { |
|
726 | 726 | $_imgopt_notice = ''; |
727 | 727 | $_stat = $this->get_imgopt_provider_userstatus(); |
728 | 728 | $_site_host = AUTOPTIMIZE_SITE_DOMAIN; |
729 | - $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . $_site_host; |
|
729 | + $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.$_site_host; |
|
730 | 730 | |
731 | - if ( is_array( $_stat ) ) { |
|
732 | - if ( 1 == $_stat['Status'] ) { |
|
731 | + if (is_array($_stat)) { |
|
732 | + if (1 == $_stat['Status']) { |
|
733 | 733 | // translators: "add more credits" will appear in a "a href". |
734 | - $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' ); |
|
734 | + $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>'); |
|
735 | 735 | } elseif ( -1 == $_stat['Status'] || -2 == $_stat['Status'] ) { |
736 | 736 | // translators: "add more credits" will appear in a "a href". |
737 | - $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' ); |
|
738 | - $_imgopt_stats_refresh_url = add_query_arg( array( |
|
737 | + $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>'); |
|
738 | + $_imgopt_stats_refresh_url = add_query_arg(array( |
|
739 | 739 | 'page' => 'autoptimize_extra', |
740 | 740 | 'refreshImgProvStats' => '1', |
741 | - ), admin_url( 'options-general.php' ) ); |
|
742 | - if ( $_stat && array_key_exists( 'timestamp', $_stat ) && ! empty( $_stat['timestamp'] ) ) { |
|
743 | - $_imgopt_stats_last_run = __( 'based on status at ', 'autoptimize' ) . date_i18n( get_option( 'time_format' ), $_stat['timestamp'] ); |
|
741 | + ), admin_url('options-general.php')); |
|
742 | + if ($_stat && array_key_exists('timestamp', $_stat) && !empty($_stat['timestamp'])) { |
|
743 | + $_imgopt_stats_last_run = __('based on status at ', 'autoptimize').date_i18n(get_option('time_format'), $_stat['timestamp']); |
|
744 | 744 | } else { |
745 | - $_imgopt_stats_last_run = __( 'based on previously fetched data', 'autoptimize' ); |
|
745 | + $_imgopt_stats_last_run = __('based on previously fetched data', 'autoptimize'); |
|
746 | 746 | } |
747 | - $_imgopt_notice .= ' (' . $_imgopt_stats_last_run . ', '; |
|
747 | + $_imgopt_notice .= ' ('.$_imgopt_stats_last_run.', '; |
|
748 | 748 | // translators: "here to refresh" links to the Autoptimize Extra page and forces a refresh of the img opt stats. |
749 | - $_imgopt_notice .= sprintf( __( 'click %1$shere to refresh%2$s', 'autoptimize' ), '<a href="' . $_imgopt_stats_refresh_url . '">', '</a>).' ); |
|
749 | + $_imgopt_notice .= sprintf(__('click %1$shere to refresh%2$s', 'autoptimize'), '<a href="'.$_imgopt_stats_refresh_url.'">', '</a>).'); |
|
750 | 750 | } else { |
751 | 751 | $_imgopt_upsell = 'https://shortpixel.com/g/af/GWRGFLW109483'; |
752 | 752 | // translators: "log in to check your account" will appear in a "a href". |
753 | - $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' ); |
|
753 | + $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>'); |
|
754 | 754 | } |
755 | - $_imgopt_notice = apply_filters( 'autoptimize_filter_imgopt_notice', $_imgopt_notice ); |
|
755 | + $_imgopt_notice = apply_filters('autoptimize_filter_imgopt_notice', $_imgopt_notice); |
|
756 | 756 | |
757 | 757 | return array( |
758 | 758 | 'status' => $_stat['Status'], |
@@ -772,16 +772,16 @@ discard block |
||
772 | 772 | public function get_imgopt_provider_userstatus() { |
773 | 773 | static $_provider_userstatus = null; |
774 | 774 | |
775 | - if ( is_null( $_provider_userstatus ) ) { |
|
776 | - $_stat = get_option( 'autoptimize_imgopt_provider_stat', '' ); |
|
777 | - if ( is_array( $_stat ) ) { |
|
778 | - if ( array_key_exists( 'Status', $_stat ) ) { |
|
775 | + if (is_null($_provider_userstatus)) { |
|
776 | + $_stat = get_option('autoptimize_imgopt_provider_stat', ''); |
|
777 | + if (is_array($_stat)) { |
|
778 | + if (array_key_exists('Status', $_stat)) { |
|
779 | 779 | $_provider_userstatus['Status'] = $_stat['Status']; |
780 | 780 | } else { |
781 | 781 | // if no stats then we assume all is well. |
782 | 782 | $_provider_userstatus['Status'] = 2; |
783 | 783 | } |
784 | - if ( array_key_exists( 'timestamp', $_stat ) ) { |
|
784 | + if (array_key_exists('timestamp', $_stat)) { |
|
785 | 785 | $_provider_userstatus['timestamp'] = $_stat['timestamp']; |
786 | 786 | } else { |
787 | 787 | // if no timestamp then we return "". |
@@ -795,13 +795,13 @@ discard block |
||
795 | 795 | |
796 | 796 | public function admin_menu() |
797 | 797 | { |
798 | - add_submenu_page( null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', array( $this, 'options_page' ) ); |
|
799 | - register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' ); |
|
798 | + add_submenu_page(null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', array($this, 'options_page')); |
|
799 | + register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings'); |
|
800 | 800 | } |
801 | 801 | |
802 | - public function add_extra_tab( $in ) |
|
802 | + public function add_extra_tab($in) |
|
803 | 803 | { |
804 | - $in = array_merge( $in, array( 'autoptimize_extra' => __( 'Extra', 'autoptimize' ) ) ); |
|
804 | + $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize'))); |
|
805 | 805 | |
806 | 806 | return $in; |
807 | 807 | } |
@@ -809,7 +809,7 @@ discard block |
||
809 | 809 | public function options_page() |
810 | 810 | { |
811 | 811 | // Check querystring for "refreshCacheChecker" and call cachechecker if so. |
812 | - if ( array_key_exists( 'refreshImgProvStats', $_GET ) && 1 == $_GET['refreshImgProvStats'] ) { |
|
812 | + if (array_key_exists('refreshImgProvStats', $_GET) && 1 == $_GET['refreshImgProvStats']) { |
|
813 | 813 | $this->query_img_provider_stats(); |
814 | 814 | } |
815 | 815 | |
@@ -819,7 +819,7 @@ discard block |
||
819 | 819 | // behavior being persisted in the DB even if save is done here. |
820 | 820 | $options = $this->fetch_options(); |
821 | 821 | $gfonts = $options['autoptimize_extra_radio_field_4']; |
822 | - $sp_url_suffix = '/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN; |
|
822 | + $sp_url_suffix = '/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN; |
|
823 | 823 | ?> |
824 | 824 | <style> |
825 | 825 | #ao_settings_form {background: white;border: 1px solid #ccc;padding: 1px 15px;margin: 15px 10px 10px 0;} |
@@ -827,35 +827,35 @@ discard block |
||
827 | 827 | #autoptimize_extra_descr{font-size: 120%;} |
828 | 828 | </style> |
829 | 829 | <div class="wrap"> |
830 | - <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
830 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
831 | 831 | <?php echo autoptimizeConfig::ao_admin_tabs(); ?> |
832 | 832 | <?php |
833 | - if ( 'on' !== get_option( 'autoptimize_js' ) && 'on' !== get_option( 'autoptimize_css' ) && 'on' !== get_option( 'autoptimize_html' ) ) { |
|
833 | + if ('on' !== get_option('autoptimize_js') && 'on' !== get_option('autoptimize_css') && 'on' !== get_option('autoptimize_html')) { |
|
834 | 834 | ?> |
835 | 835 | <div class="notice-warning notice"><p> |
836 | 836 | <?php |
837 | - _e( 'Most of below Extra optimizations require at least one of HTML, JS or CSS autoptimizations being active.', 'autoptimize' ); |
|
837 | + _e('Most of below Extra optimizations require at least one of HTML, JS or CSS autoptimizations being active.', 'autoptimize'); |
|
838 | 838 | ?> |
839 | 839 | </p></div> |
840 | 840 | <?php |
841 | 841 | } |
842 | 842 | |
843 | - if ( 'down' === $options['availabilities']['extra_imgopt']['status'] ) { |
|
843 | + if ('down' === $options['availabilities']['extra_imgopt']['status']) { |
|
844 | 844 | ?> |
845 | 845 | <div class="notice-warning notice"><p> |
846 | 846 | <?php |
847 | 847 | // translators: "Autoptimize support forum" will appear in a "a href". |
848 | - echo sprintf( __( 'The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize' ), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>' ); |
|
848 | + echo sprintf(__('The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize'), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>'); |
|
849 | 849 | ?> |
850 | 850 | </p></div> |
851 | 851 | <?php |
852 | 852 | } |
853 | 853 | |
854 | - if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] && ! $this->imgopt_launch_ok() ) { |
|
854 | + if ('launch' === $options['availabilities']['extra_imgopt']['status'] && !$this->imgopt_launch_ok()) { |
|
855 | 855 | ?> |
856 | 856 | <div class="notice-warning notice"><p> |
857 | 857 | <?php |
858 | - _e( 'The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize' ); |
|
858 | + _e('The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize'); |
|
859 | 859 | ?> |
860 | 860 | </p></div> |
861 | 861 | <?php |
@@ -863,29 +863,29 @@ discard block |
||
863 | 863 | |
864 | 864 | ?> |
865 | 865 | <form id='ao_settings_form' action='options.php' method='post'> |
866 | - <?php settings_fields( 'autoptimize_extra_settings' ); ?> |
|
867 | - <h2><?php _e( 'Extra Auto-Optimizations', 'autoptimize' ); ?></h2> |
|
868 | - <span id='autoptimize_extra_descr'><?php _e( 'The following settings can improve your site\'s performance even more.', 'autoptimize' ); ?></span> |
|
866 | + <?php settings_fields('autoptimize_extra_settings'); ?> |
|
867 | + <h2><?php _e('Extra Auto-Optimizations', 'autoptimize'); ?></h2> |
|
868 | + <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.', 'autoptimize'); ?></span> |
|
869 | 869 | <table class="form-table"> |
870 | 870 | <tr> |
871 | - <th scope="row"><?php _e( 'Google Fonts', 'autoptimize' ); ?></th> |
|
871 | + <th scope="row"><?php _e('Google Fonts', 'autoptimize'); ?></th> |
|
872 | 872 | <td> |
873 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if ( ! in_array( $gfonts, array( 2, 3, 4, 5 ) ) ) { echo 'checked'; } ?> ><?php _e( 'Leave as is', 'autoptimize' ); ?><br/> |
|
874 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked( 2, $gfonts, true ); ?> ><?php _e( 'Remove Google Fonts', 'autoptimize' ); ?><br/> |
|
875 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked( 3, $gfonts, true ); ?> ><?php _e( 'Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize' ); ?><br/> |
|
876 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked( 5, $gfonts, true ); ?> ><?php _e( 'Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize' ); ?><br/> |
|
877 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked( 4, $gfonts, true ); ?> ><?php _e( 'Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize' ); ?><br/> |
|
873 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($gfonts, array(2, 3, 4, 5))) { echo 'checked'; } ?> ><?php _e('Leave as is', 'autoptimize'); ?><br/> |
|
874 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $gfonts, true); ?> ><?php _e('Remove Google Fonts', 'autoptimize'); ?><br/> |
|
875 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $gfonts, true); ?> ><?php _e('Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize'); ?><br/> |
|
876 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked(5, $gfonts, true); ?> ><?php _e('Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize'); ?><br/> |
|
877 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $gfonts, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize'); ?><br/> |
|
878 | 878 | </td> |
879 | 879 | </tr> |
880 | 880 | <tr> |
881 | - <th scope="row"><?php _e( 'Optimize Images', 'autoptimize' ); ?></th> |
|
881 | + <th scope="row"><?php _e('Optimize Images', 'autoptimize'); ?></th> |
|
882 | 882 | <td> |
883 | - <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_5]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && '1' === $options['autoptimize_extra_checkbox_field_5'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Optimize images on the fly and serve them from a CDN.', 'autoptimize' ); ?></label> |
|
883 | + <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_5]' <?php if (!empty($options['autoptimize_extra_checkbox_field_5']) && '1' === $options['autoptimize_extra_checkbox_field_5']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Optimize images on the fly and serve them from a CDN.', 'autoptimize'); ?></label> |
|
884 | 884 | <?php |
885 | 885 | // show shortpixel status. |
886 | 886 | $_notice = $this->get_imgopt_status_notice(); |
887 | - if ( $_notice ) { |
|
888 | - switch ( $_notice['status'] ) { |
|
887 | + if ($_notice) { |
|
888 | + switch ($_notice['status']) { |
|
889 | 889 | case 2: |
890 | 890 | $_notice_color = 'green'; |
891 | 891 | break; |
@@ -901,28 +901,28 @@ discard block |
||
901 | 901 | default: |
902 | 902 | $_notice_color = 'green'; |
903 | 903 | } |
904 | - echo apply_filters( 'autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:' . $_notice_color . ';">' . __( 'Shortpixel status: ', 'autoptimize' ) . '</span></strong>' . $_notice['notice'] . '</p>' ); |
|
904 | + echo apply_filters('autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:'.$_notice_color.';">'.__('Shortpixel status: ', 'autoptimize').'</span></strong>'.$_notice['notice'].'</p>'); |
|
905 | 905 | } else { |
906 | 906 | // translators: link points to shortpixel. |
907 | - $upsell_msg_1 = '<p>' . sprintf( __( 'Get more Google love and improve your website\'s loading speed by having the images optimized on the fly by %1$sShortPixel%2$s and then cached and served fast from a CDN.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' ); |
|
908 | - if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] ) { |
|
909 | - $upsell_msg_2 = __( 'For a limited time only, this service is offered free for all Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize' ); |
|
907 | + $upsell_msg_1 = '<p>'.sprintf(__('Get more Google love and improve your website\'s loading speed by having the images optimized on the fly by %1$sShortPixel%2$s and then cached and served fast from a CDN.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>'); |
|
908 | + if ('launch' === $options['availabilities']['extra_imgopt']['status']) { |
|
909 | + $upsell_msg_2 = __('For a limited time only, this service is offered free for all Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize'); |
|
910 | 910 | } else { |
911 | 911 | // translators: link points to shortpixel. |
912 | - $upsell_msg_2 = sprintf( __( '%1$sSign-up now%2$s to receive a 1 000 bonus + 50% more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' ); |
|
912 | + $upsell_msg_2 = sprintf(__('%1$sSign-up now%2$s to receive a 1 000 bonus + 50% more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>'); |
|
913 | 913 | } |
914 | - echo apply_filters( 'autoptimize_extra_imgopt_settings_copy', $upsell_msg_1 . ' ' . $upsell_msg_2 . '</p>' ); |
|
914 | + echo apply_filters('autoptimize_extra_imgopt_settings_copy', $upsell_msg_1.' '.$upsell_msg_2.'</p>'); |
|
915 | 915 | } |
916 | 916 | // translators: link points to shortpixel FAQ. |
917 | - $faqcopy = sprintf( __( '<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize' ), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>' ); |
|
917 | + $faqcopy = sprintf(__('<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize'), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>'); |
|
918 | 918 | // translators: links points to shortpixel TOS & Privacy Policy. |
919 | - $toscopy = sprintf( __( 'Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize' ), '<a href="https://shortpixel.com/tos' . $sp_url_suffix . '" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp' . $sp_url_suffix . '" target="_blank">', '</a>' ); |
|
920 | - echo apply_filters( 'autoptimize_extra_imgopt_settings_tos', '<p>' . $faqcopy . ' ' . $toscopy . '</p>' ); |
|
919 | + $toscopy = sprintf(__('Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize'), '<a href="https://shortpixel.com/tos'.$sp_url_suffix.'" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp'.$sp_url_suffix.'" target="_blank">', '</a>'); |
|
920 | + echo apply_filters('autoptimize_extra_imgopt_settings_tos', '<p>'.$faqcopy.' '.$toscopy.'</p>'); |
|
921 | 921 | ?> |
922 | 922 | </td> |
923 | 923 | </tr> |
924 | - <tr id='autoptimize_imgopt_quality' <?php if ( ! array_key_exists( 'autoptimize_extra_checkbox_field_5', $options ) || ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && '1' !== $options['autoptimize_extra_checkbox_field_5'] ) ) { echo 'class="hidden"'; } ?>> |
|
925 | - <th scope="row"><?php _e( 'Image Optimization quality', 'autoptimize' ); ?></th> |
|
924 | + <tr id='autoptimize_imgopt_quality' <?php if (!array_key_exists('autoptimize_extra_checkbox_field_5', $options) || (!empty($options['autoptimize_extra_checkbox_field_5']) && '1' !== $options['autoptimize_extra_checkbox_field_5'])) { echo 'class="hidden"'; } ?>> |
|
925 | + <th scope="row"><?php _e('Image Optimization quality', 'autoptimize'); ?></th> |
|
926 | 926 | <td> |
927 | 927 | <label> |
928 | 928 | <select name='autoptimize_extra_settings[autoptimize_extra_select_field_6]'> |
@@ -930,12 +930,12 @@ discard block |
||
930 | 930 | $_imgopt_array = $this->get_img_quality_array(); |
931 | 931 | $_imgopt_val = $this->get_img_quality_setting(); |
932 | 932 | |
933 | - foreach ( $_imgopt_array as $key => $value ) { |
|
934 | - echo '<option value="' . $key . '"'; |
|
935 | - if ( $_imgopt_val == $key ) { |
|
933 | + foreach ($_imgopt_array as $key => $value) { |
|
934 | + echo '<option value="'.$key.'"'; |
|
935 | + if ($_imgopt_val == $key) { |
|
936 | 936 | echo ' selected'; |
937 | 937 | } |
938 | - echo '>' . ucfirst( $value ) . '</option>'; |
|
938 | + echo '>'.ucfirst($value).'</option>'; |
|
939 | 939 | } |
940 | 940 | echo "\n"; |
941 | 941 | ?> |
@@ -944,69 +944,69 @@ discard block |
||
944 | 944 | <p> |
945 | 945 | <?php |
946 | 946 | // translators: link points to shortpixel image test page. |
947 | - echo apply_filters( 'autoptimize_extra_imgopt_quality_copy', sprintf( __( 'You can %1$stest compression levels here%2$s.', 'autoptimize' ), '<a href="https://shortpixel.com/oic' . $sp_url_suffix . '" target="_blank">', '</a>' ) ); |
|
947 | + echo apply_filters('autoptimize_extra_imgopt_quality_copy', sprintf(__('You can %1$stest compression levels here%2$s.', 'autoptimize'), '<a href="https://shortpixel.com/oic'.$sp_url_suffix.'" target="_blank">', '</a>')); |
|
948 | 948 | ?> |
949 | 949 | </p> |
950 | 950 | </td> |
951 | 951 | </tr> |
952 | 952 | <tr> |
953 | - <th scope="row"><?php _e( 'Remove emojis', 'autoptimize' ); ?></th> |
|
953 | + <th scope="row"><?php _e('Remove emojis', 'autoptimize'); ?></th> |
|
954 | 954 | <td> |
955 | - <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) && '1' === $options['autoptimize_extra_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize' ); ?></label> |
|
955 | + <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($options['autoptimize_extra_checkbox_field_1']) && '1' === $options['autoptimize_extra_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize'); ?></label> |
|
956 | 956 | </td> |
957 | 957 | </tr> |
958 | 958 | <tr> |
959 | - <th scope="row"><?php _e( 'Remove query strings from static resources', 'autoptimize' ); ?></th> |
|
959 | + <th scope="row"><?php _e('Remove query strings from static resources', 'autoptimize'); ?></th> |
|
960 | 960 | <td> |
961 | - <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) && '1' === $options['autoptimize_extra_checkbox_field_0'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize' ); ?></label> |
|
961 | + <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty($options['autoptimize_extra_checkbox_field_0']) && '1' === $options['autoptimize_extra_checkbox_field_0']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize'); ?></label> |
|
962 | 962 | </td> |
963 | 963 | </tr> |
964 | 964 | <tr> |
965 | - <th scope="row"><?php _e( 'Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize' ); ?></th> |
|
965 | + <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize'); ?></th> |
|
966 | 966 | <td> |
967 | - <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_2', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_2'] ); } ?>'><br /><?php _e( 'Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize' ); ?></label> |
|
967 | + <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php if (array_key_exists('autoptimize_extra_text_field_2', $options)) { echo esc_attr($options['autoptimize_extra_text_field_2']); } ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize'); ?></label> |
|
968 | 968 | </td> |
969 | 969 | </tr> |
970 | 970 | <tr> |
971 | - <th scope="row"><?php _e( 'Async Javascript-files <em>(advanced users)</em>', 'autoptimize' ); ?></th> |
|
971 | + <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th> |
|
972 | 972 | <td> |
973 | 973 | <?php |
974 | - if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'async-javascript/async-javascript.php' ) ) { |
|
974 | + if (function_exists('is_plugin_active') && is_plugin_active('async-javascript/async-javascript.php')) { |
|
975 | 975 | // translators: link points Async Javascript settings page. |
976 | - printf( __( 'You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize' ), '<a href="' . 'options-general.php?page=async-javascript' . '">', '</a>' ); |
|
976 | + printf(__('You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize'), '<a href="'.'options-general.php?page=async-javascript'.'">', '</a>'); |
|
977 | 977 | } else { |
978 | 978 | ?> |
979 | - <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_3', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_3'] ); } ?>'> |
|
979 | + <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php if (array_key_exists('autoptimize_extra_text_field_3', $options)) { echo esc_attr($options['autoptimize_extra_text_field_3']); } ?>'> |
|
980 | 980 | <br /> |
981 | 981 | <?php |
982 | - _e( 'Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize' ); |
|
982 | + _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize'); |
|
983 | 983 | // translators: %s will be replaced by a link to the "async javascript" plugin. |
984 | - echo sprintf( __( 'Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize' ), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"' ); |
|
985 | - $asj_install_url = network_admin_url() . 'plugin-install.php?s=async+javascript&tab=search&type=term'; |
|
986 | - echo sprintf( ' <a href="' . $asj_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) ); |
|
984 | + echo sprintf(__('Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize'), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"'); |
|
985 | + $asj_install_url = network_admin_url().'plugin-install.php?s=async+javascript&tab=search&type=term'; |
|
986 | + echo sprintf(' <a href="'.$asj_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize')); |
|
987 | 987 | } |
988 | 988 | ?> |
989 | 989 | </td> |
990 | 990 | </tr> |
991 | 991 | <tr> |
992 | - <th scope="row"><?php _e( 'Optimize YouTube videos', 'autoptimize' ); ?></th> |
|
992 | + <th scope="row"><?php _e('Optimize YouTube videos', 'autoptimize'); ?></th> |
|
993 | 993 | <td> |
994 | 994 | <?php |
995 | - if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'wp-youtube-lyte/wp-youtube-lyte.php' ) ) { |
|
996 | - _e( 'Great, you have WP YouTube Lyte installed.', 'autoptimize' ); |
|
995 | + if (function_exists('is_plugin_active') && is_plugin_active('wp-youtube-lyte/wp-youtube-lyte.php')) { |
|
996 | + _e('Great, you have WP YouTube Lyte installed.', 'autoptimize'); |
|
997 | 997 | $lyte_config_url = 'options-general.php?page=lyte_settings_page'; |
998 | - echo sprintf( ' <a href="' . $lyte_config_url . '">%s</a>', __( 'Click here to configure it.', 'autoptimize' ) ); |
|
998 | + echo sprintf(' <a href="'.$lyte_config_url.'">%s</a>', __('Click here to configure it.', 'autoptimize')); |
|
999 | 999 | } else { |
1000 | 1000 | // translators: %s will be replaced by a link to "wp youtube lyte" plugin. |
1001 | - echo sprintf( __( '%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize' ), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>' ); |
|
1002 | - $lyte_install_url = network_admin_url() . 'plugin-install.php?s=lyte&tab=search&type=term'; |
|
1003 | - echo sprintf( ' <a href="' . $lyte_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) ); |
|
1001 | + echo sprintf(__('%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize'), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>'); |
|
1002 | + $lyte_install_url = network_admin_url().'plugin-install.php?s=lyte&tab=search&type=term'; |
|
1003 | + echo sprintf(' <a href="'.$lyte_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize')); |
|
1004 | 1004 | } |
1005 | 1005 | ?> |
1006 | 1006 | </td> |
1007 | 1007 | </tr> |
1008 | 1008 | </table> |
1009 | - <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /></p> |
|
1009 | + <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /></p> |
|
1010 | 1010 | </form> |
1011 | 1011 | <script> |
1012 | 1012 | jQuery(document).ready(function() { |