@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | public function __construct($raisePhpLimits = true) |
73 | 73 | { |
74 | 74 | $this->raisePhpLimits = (bool) $raisePhpLimits; |
75 | - $this->memoryLimit = 128 * 1048576; // 128MB in bytes |
|
76 | - $this->pcreBacktrackLimit = 1000 * 1000; |
|
77 | - $this->pcreRecursionLimit = 500 * 1000; |
|
75 | + $this->memoryLimit = 128*1048576; // 128MB in bytes |
|
76 | + $this->pcreBacktrackLimit = 1000*1000; |
|
77 | + $this->pcreRecursionLimit = 500*1000; |
|
78 | 78 | $this->hexToNamedColorsMap = Colors::getHexToNamedMap(); |
79 | 79 | $this->namedToHexColorsMap = Colors::getNamedToHexMap(); |
80 | 80 | $this->namedToHexColorsRegex = sprintf( |
@@ -176,8 +176,8 @@ discard block |
||
176 | 176 | */ |
177 | 177 | private function setShortenZeroValuesRegexes() |
178 | 178 | { |
179 | - $zeroRegex = '0'. $this->unitsGroupRegex; |
|
180 | - $numOrPosRegex = '('. $this->numRegex .'|top|left|bottom|right|center) '; |
|
179 | + $zeroRegex = '0'.$this->unitsGroupRegex; |
|
180 | + $numOrPosRegex = '('.$this->numRegex.'|top|left|bottom|right|center) '; |
|
181 | 181 | $oneZeroSafeProperties = array( |
182 | 182 | '(?:line-)?height', |
183 | 183 | '(?:(?:min|max)-)?width', |
@@ -195,14 +195,14 @@ discard block |
||
195 | 195 | ); |
196 | 196 | |
197 | 197 | // First zero regex |
198 | - $regex = '/(^|;)('. implode('|', $oneZeroSafeProperties) .'):%s/Si'; |
|
198 | + $regex = '/(^|;)('.implode('|', $oneZeroSafeProperties).'):%s/Si'; |
|
199 | 199 | $this->shortenOneZeroesRegex = sprintf($regex, $zeroRegex); |
200 | 200 | |
201 | 201 | // Multiple zeroes regexes |
202 | 202 | $regex = '/(^|;)(margin|padding|border-(?:width|radius)|background-position):%s/Si'; |
203 | - $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex . $zeroRegex); |
|
204 | - $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $zeroRegex); |
|
205 | - $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $numOrPosRegex . $zeroRegex); |
|
203 | + $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex.$zeroRegex); |
|
204 | + $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex.$numOrPosRegex.$zeroRegex); |
|
205 | + $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex.$numOrPosRegex.$numOrPosRegex.$zeroRegex); |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | $dataStartIndex = $matchStartIndex + 4; // url( length |
390 | 390 | $searchOffset = $matchStartIndex + strlen($m[0][0]); |
391 | 391 | $terminator = $m[1][0]; // ', " or empty (not quoted) |
392 | - $terminatorRegex = '/(?<!\\\\)'. (strlen($terminator) === 0 ? '' : $terminator.'\s*') .'(\))/S'; |
|
392 | + $terminatorRegex = '/(?<!\\\\)'.(strlen($terminator) === 0 ? '' : $terminator.'\s*').'(\))/S'; |
|
393 | 393 | |
394 | 394 | $ret .= substr($css, $substrOffset, $matchStartIndex - $substrOffset); |
395 | 395 | |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | $token = preg_replace('/\s+/S', '', $token); |
405 | 405 | } |
406 | 406 | |
407 | - $ret .= 'url('. $this->registerPreservedToken(trim($token)) .')'; |
|
407 | + $ret .= 'url('.$this->registerPreservedToken(trim($token)).')'; |
|
408 | 408 | // No end terminator found, re-add the whole match. Should we throw/warn here? |
409 | 409 | } else { |
410 | 410 | $ret .= substr($css, $matchStartIndex, $searchOffset - $matchStartIndex); |
@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | */ |
426 | 426 | private function processCommentsCallback($matches) |
427 | 427 | { |
428 | - return '/*'. $this->registerCommentToken($matches[1]) .'*/'; |
|
428 | + return '/*'.$this->registerCommentToken($matches[1]).'*/'; |
|
429 | 429 | } |
430 | 430 | |
431 | 431 | /** |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | */ |
436 | 436 | private function processOldIeSpecificMatrixDefinitionCallback($matches) |
437 | 437 | { |
438 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $this->registerPreservedToken($matches[1]) .')'; |
|
438 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$this->registerPreservedToken($matches[1]).')'; |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | /** |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | // minify alpha opacity in filter strings |
459 | 459 | $match = str_ireplace('progid:DXImageTransform.Microsoft.Alpha(Opacity=', 'alpha(opacity=', $match); |
460 | 460 | |
461 | - return $quote . $this->registerPreservedToken($match) . $quote; |
|
461 | + return $quote.$this->registerPreservedToken($match).$quote; |
|
462 | 462 | } |
463 | 463 | |
464 | 464 | /** |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | */ |
470 | 470 | private function processImportUnquotedUrlAtRulesCallback($matches) |
471 | 471 | { |
472 | - return '@import url('. $this->registerPreservedToken($matches[1]) .')'. $matches[2]; |
|
472 | + return '@import url('.$this->registerPreservedToken($matches[1]).')'.$matches[2]; |
|
473 | 473 | } |
474 | 474 | |
475 | 475 | /** |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | private function processComments($css) |
481 | 481 | { |
482 | 482 | foreach ($this->comments as $commentId => $comment) { |
483 | - $commentIdString = '/*'. $commentId .'*/'; |
|
483 | + $commentIdString = '/*'.$commentId.'*/'; |
|
484 | 484 | |
485 | 485 | // ! in the first position of the comment means preserve |
486 | 486 | // so push to the preserved tokens keeping the ! |
@@ -531,7 +531,7 @@ discard block |
||
531 | 531 | $blockEndPos = strpos($css, '}', $blockStartPos); |
532 | 532 | // When ending curly brace is missing, let's |
533 | 533 | // behave like there was one at the end of the block... |
534 | - if ( false === $blockEndPos ) { |
|
534 | + if (false === $blockEndPos) { |
|
535 | 535 | $blockEndPos = strlen($css) - 1; |
536 | 536 | } |
537 | 537 | $nextBlockStartPos = strpos($css, '{', $blockStartPos + 1); |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | } else { |
544 | 544 | $ruleBody = substr($css, $blockStartPos + 1, $blockEndPos - $blockStartPos - 1); |
545 | 545 | $ruleBodyToken = $this->registerRuleBodyToken($this->processRuleBody($ruleBody)); |
546 | - $ret .= '{'. $ruleBodyToken .'}'; |
|
546 | + $ret .= '{'.$ruleBodyToken.'}'; |
|
547 | 547 | $searchOffset = $blockEndPos + 1; |
548 | 548 | } |
549 | 549 | |
@@ -643,8 +643,8 @@ discard block |
||
643 | 643 | $body = preg_replace('/([ :,(])\+(\.?\d+)/S', '$1$2', $body); |
644 | 644 | |
645 | 645 | // shorten ms to s |
646 | - $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function ($matches) { |
|
647 | - return $matches[1] . $matches[2] . ((int) $matches[3] / 1000) .'s'; |
|
646 | + $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function($matches) { |
|
647 | + return $matches[1].$matches[2].((int) $matches[3]/1000).'s'; |
|
648 | 648 | }, $body); |
649 | 649 | |
650 | 650 | // Remove leading zeros from integer and float numbers. |
@@ -756,13 +756,13 @@ discard block |
||
756 | 756 | $css = preg_replace('/::(before|after|first-(?:line|letter))(\{|,)/Si', ':$1$2', $css); |
757 | 757 | |
758 | 758 | // Retain space for special IE6 cases |
759 | - $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function ($matches) { |
|
760 | - return ':first-'. strtolower($matches[1]) .' '. $matches[2]; |
|
759 | + $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function($matches) { |
|
760 | + return ':first-'.strtolower($matches[1]).' '.$matches[2]; |
|
761 | 761 | }, $css); |
762 | 762 | |
763 | 763 | // Find a fraction that may used in some @media queries such as: (min-aspect-ratio: 1/1) |
764 | 764 | // Add token to add the "/" back in later |
765 | - $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'. self::QUERY_FRACTION .'$3)', $css); |
|
765 | + $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'.self::QUERY_FRACTION.'$3)', $css); |
|
766 | 766 | |
767 | 767 | // Remove empty rule blocks up to 2 levels deep. |
768 | 768 | $css = preg_replace(array_fill(0, 2, '/(\{)[^{};\/\n]+\{\}/S'), '$1', $css); |
@@ -810,7 +810,7 @@ discard block |
||
810 | 810 | } |
811 | 811 | |
812 | 812 | // @import handling |
813 | - $css = preg_replace_callback($this->importRegex, function ($matches) use (&$imports) { |
|
813 | + $css = preg_replace_callback($this->importRegex, function($matches) use (&$imports) { |
|
814 | 814 | // Keep all @import at-rules found for later |
815 | 815 | $imports .= $matches[0]; |
816 | 816 | // Delete all @import at-rules |
@@ -818,7 +818,7 @@ discard block |
||
818 | 818 | }, $css); |
819 | 819 | |
820 | 820 | // @namespace handling |
821 | - $css = preg_replace_callback($this->namespaceRegex, function ($matches) use (&$namespaces) { |
|
821 | + $css = preg_replace_callback($this->namespaceRegex, function($matches) use (&$namespaces) { |
|
822 | 822 | // Keep all @namespace at-rules found for later |
823 | 823 | $namespaces .= $matches[0]; |
824 | 824 | // Delete all @namespace at-rules |
@@ -829,7 +829,7 @@ discard block |
||
829 | 829 | // 1. @charset first |
830 | 830 | // 2. @imports below @charset |
831 | 831 | // 3. @namespaces below @imports |
832 | - $css = $charset . $imports . $namespaces . $css; |
|
832 | + $css = $charset.$imports.$namespaces.$css; |
|
833 | 833 | |
834 | 834 | return $css; |
835 | 835 | } |
@@ -883,10 +883,10 @@ discard block |
||
883 | 883 | // Restore space after rgb() or hsl() function in some cases such as: |
884 | 884 | // background-image: linear-gradient(to bottom, rgb(210,180,140) 10%, rgb(255,0,0) 90%); |
885 | 885 | if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator)) { |
886 | - $terminator = ' '. $terminator; |
|
886 | + $terminator = ' '.$terminator; |
|
887 | 887 | } |
888 | 888 | |
889 | - return '#'. implode('', $hexColors) . $terminator; |
|
889 | + return '#'.implode('', $hexColors).$terminator; |
|
890 | 890 | } |
891 | 891 | |
892 | 892 | /** |
@@ -900,16 +900,16 @@ discard block |
||
900 | 900 | |
901 | 901 | // Shorten suitable 6 chars HEX colors |
902 | 902 | if (strlen($hex) === 6 && preg_match('/^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/Si', $hex, $m)) { |
903 | - $hex = $m[1] . $m[2] . $m[3]; |
|
903 | + $hex = $m[1].$m[2].$m[3]; |
|
904 | 904 | } |
905 | 905 | |
906 | 906 | // Lowercase |
907 | - $hex = '#'. strtolower($hex); |
|
907 | + $hex = '#'.strtolower($hex); |
|
908 | 908 | |
909 | 909 | // Replace Hex colors with shorter color names |
910 | 910 | $color = array_key_exists($hex, $this->hexToNamedColorsMap) ? $this->hexToNamedColorsMap[$hex] : $hex; |
911 | 911 | |
912 | - return $color . $matches[2]; |
|
912 | + return $color.$matches[2]; |
|
913 | 913 | } |
914 | 914 | |
915 | 915 | /** |
@@ -920,7 +920,7 @@ discard block |
||
920 | 920 | */ |
921 | 921 | private function shortenNamedColorsCallback($matches) |
922 | 922 | { |
923 | - return $matches[1] . $this->namedToHexColorsMap[strtolower($matches[2])] . $matches[3]; |
|
923 | + return $matches[1].$this->namedToHexColorsMap[strtolower($matches[2])].$matches[3]; |
|
924 | 924 | } |
925 | 925 | |
926 | 926 | /** |
@@ -3,50 +3,50 @@ discard block |
||
3 | 3 | * WP tests bootstrap. |
4 | 4 | */ |
5 | 5 | |
6 | -$_tests_dir = getenv( 'WP_TESTS_DIR' ); |
|
7 | -if ( ! $_tests_dir ) { |
|
8 | - $tmp_dir = getenv( 'TMPDIR' ); |
|
9 | - if ( ! empty( $tmp_dir ) ) { |
|
10 | - $_tests_dir = rtrim( $tmp_dir, '/' ) . '/wordpress-tests-lib'; |
|
11 | - if ( ! is_dir( $_tests_dir ) ) { |
|
6 | +$_tests_dir = getenv('WP_TESTS_DIR'); |
|
7 | +if (!$_tests_dir) { |
|
8 | + $tmp_dir = getenv('TMPDIR'); |
|
9 | + if (!empty($tmp_dir)) { |
|
10 | + $_tests_dir = rtrim($tmp_dir, '/').'/wordpress-tests-lib'; |
|
11 | + if (!is_dir($_tests_dir)) { |
|
12 | 12 | $_tests_dir = null; |
13 | 13 | } |
14 | 14 | } |
15 | 15 | } |
16 | 16 | |
17 | -if ( ! $_tests_dir ) { |
|
17 | +if (!$_tests_dir) { |
|
18 | 18 | $_tests_dir = '/tmp/wordpress-tests-lib'; |
19 | 19 | } |
20 | 20 | |
21 | -require_once $_tests_dir . '/includes/functions.php'; |
|
21 | +require_once $_tests_dir.'/includes/functions.php'; |
|
22 | 22 | |
23 | 23 | function _manually_load_plugin() { |
24 | - define( 'AUTOPTIMIZE_INIT_EARLIER', true ); |
|
24 | + define('AUTOPTIMIZE_INIT_EARLIER', true); |
|
25 | 25 | |
26 | 26 | // For overriding cache dirs and whatnot. Kinda works if you keep a few things in mind. |
27 | - if ( getenv('CUSTOM_CONSTANTS' ) ) { |
|
28 | - define( 'AUTOPTIMIZE_CACHE_CHILD_DIR', '/c/ao/' ); |
|
29 | - $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR; |
|
30 | - if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) { |
|
27 | + if (getenv('CUSTOM_CONSTANTS')) { |
|
28 | + define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/c/ao/'); |
|
29 | + $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR; |
|
30 | + if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
31 | 31 | $blog_id = get_current_blog_id(); |
32 | - $pathname .= $blog_id . '/'; |
|
32 | + $pathname .= $blog_id.'/'; |
|
33 | 33 | } |
34 | - define( 'AUTOPTIMIZE_CACHE_DIR', $pathname ); |
|
34 | + define('AUTOPTIMIZE_CACHE_DIR', $pathname); |
|
35 | 35 | |
36 | 36 | $custom_site_url = 'http://localhost/wordpress'; |
37 | - define( 'AUTOPTIMIZE_WP_SITE_URL', $custom_site_url ); |
|
38 | - add_filter( 'site_url', function( $url, $path, $scheme, $blog_id ) use ( $custom_site_url ) { |
|
37 | + define('AUTOPTIMIZE_WP_SITE_URL', $custom_site_url); |
|
38 | + add_filter('site_url', function($url, $path, $scheme, $blog_id) use ($custom_site_url) { |
|
39 | 39 | return $custom_site_url; |
40 | - }, 10, 4 ); |
|
41 | - add_filter( 'content_url', function( $url, $path ) use ( $custom_site_url ) { |
|
42 | - return $custom_site_url . '/wp-content'; |
|
43 | - }, 10, 2 ); |
|
44 | - define( 'AO_TEST_SUBFOLDER_INSTALL', true ); |
|
40 | + }, 10, 4); |
|
41 | + add_filter('content_url', function($url, $path) use ($custom_site_url) { |
|
42 | + return $custom_site_url.'/wp-content'; |
|
43 | + }, 10, 2); |
|
44 | + define('AO_TEST_SUBFOLDER_INSTALL', true); |
|
45 | 45 | |
46 | - define( 'CUSTOM_CONSTANTS_USED', true ); |
|
46 | + define('CUSTOM_CONSTANTS_USED', true); |
|
47 | 47 | } else { |
48 | - define( 'CUSTOM_CONSTANTS_USED', false ); |
|
49 | - define( 'AO_TEST_SUBFOLDER_INSTALL', false ); |
|
48 | + define('CUSTOM_CONSTANTS_USED', false); |
|
49 | + define('AO_TEST_SUBFOLDER_INSTALL', false); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /* |
@@ -54,18 +54,18 @@ discard block |
||
54 | 54 | update_option( 'active_plugins', $active_plugins ); |
55 | 55 | */ |
56 | 56 | |
57 | - update_option( 'autoptimize_js', 1 ); |
|
58 | - update_option( 'autoptimize_css', 1 ); |
|
59 | - update_option( 'autoptimize_html', 0 ); |
|
60 | - update_option( 'autoptimize_cdn_url', 'http://cdn.example.org' ); |
|
61 | - update_option( 'autoptimize_cache_nogzip', 1 ); |
|
57 | + update_option('autoptimize_js', 1); |
|
58 | + update_option('autoptimize_css', 1); |
|
59 | + update_option('autoptimize_html', 0); |
|
60 | + update_option('autoptimize_cdn_url', 'http://cdn.example.org'); |
|
61 | + update_option('autoptimize_cache_nogzip', 1); |
|
62 | 62 | |
63 | - add_filter( 'autoptimize_css_include_inline', function( $include_inline ) { |
|
63 | + add_filter('autoptimize_css_include_inline', function($include_inline) { |
|
64 | 64 | return true; |
65 | 65 | }); |
66 | 66 | |
67 | - require dirname( dirname( __FILE__ ) ) . '/autoptimize.php'; |
|
67 | + require dirname(dirname(__FILE__)).'/autoptimize.php'; |
|
68 | 68 | } |
69 | -tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' ); |
|
69 | +tests_add_filter('muplugins_loaded', '_manually_load_plugin'); |
|
70 | 70 | |
71 | -require $_tests_dir . '/includes/bootstrap.php'; |
|
71 | +require $_tests_dir.'/includes/bootstrap.php'; |
@@ -29,131 +29,131 @@ |
||
29 | 29 | * Exit if called directly. |
30 | 30 | */ |
31 | 31 | if ( ! defined( 'ABSPATH' ) ) { |
32 | - die; |
|
32 | + die; |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | if ( ! class_exists( 'PAnD' ) ) { |
36 | 36 | |
37 | - /** |
|
38 | - * Class PAnD |
|
39 | - */ |
|
40 | - class PAnD { |
|
41 | - |
|
42 | - /** |
|
43 | - * Init hooks. |
|
44 | - */ |
|
45 | - public static function init() { |
|
46 | - add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) ); |
|
47 | - add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) ); |
|
48 | - } |
|
49 | - |
|
50 | - /** |
|
51 | - * Enqueue javascript and variables. |
|
52 | - */ |
|
53 | - public static function load_script() { |
|
54 | - |
|
55 | - if ( is_customize_preview() ) { |
|
56 | - return; |
|
57 | - } |
|
58 | - |
|
59 | - wp_enqueue_script( |
|
60 | - 'dismissible-notices', |
|
61 | - plugins_url( 'dismiss-notice.js', __FILE__ ), |
|
62 | - array( 'jquery', 'common' ), |
|
63 | - false, |
|
64 | - true |
|
65 | - ); |
|
66 | - |
|
67 | - wp_localize_script( |
|
68 | - 'dismissible-notices', |
|
69 | - 'dismissible_notice', |
|
70 | - array( |
|
71 | - 'nonce' => wp_create_nonce( 'dismissible-notice' ), |
|
72 | - ) |
|
73 | - ); |
|
74 | - } |
|
75 | - |
|
76 | - /** |
|
77 | - * Handles Ajax request to persist notices dismissal. |
|
78 | - * Uses check_ajax_referer to verify nonce. |
|
79 | - */ |
|
80 | - public static function dismiss_admin_notice() { |
|
81 | - $option_name = sanitize_text_field( $_POST['option_name'] ); |
|
82 | - $dismissible_length = sanitize_text_field( $_POST['dismissible_length'] ); |
|
83 | - |
|
84 | - if ( 'forever' != $dismissible_length ) { |
|
85 | - // If $dismissible_length is not an integer default to 1 |
|
86 | - $dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length; |
|
87 | - $dismissible_length = strtotime( absint( $dismissible_length ) . ' days' ); |
|
88 | - } |
|
89 | - |
|
90 | - check_ajax_referer( 'dismissible-notice', 'nonce' ); |
|
91 | - self::set_admin_notice_cache( $option_name, $dismissible_length ); |
|
92 | - wp_die(); |
|
93 | - } |
|
94 | - |
|
95 | - /** |
|
96 | - * Is admin notice active? |
|
97 | - * |
|
98 | - * @param string $arg data-dismissible content of notice. |
|
99 | - * |
|
100 | - * @return bool |
|
101 | - */ |
|
102 | - public static function is_admin_notice_active( $arg ) { |
|
103 | - $array = explode( '-', $arg ); |
|
104 | - $length = array_pop( $array ); |
|
105 | - $option_name = implode( '-', $array ); |
|
106 | - $db_record = self::get_admin_notice_cache( $option_name ); |
|
107 | - if ( 'forever' == $db_record ) { |
|
108 | - return false; |
|
109 | - } elseif ( absint( $db_record ) >= time() ) { |
|
110 | - return false; |
|
111 | - } else { |
|
112 | - return true; |
|
113 | - } |
|
114 | - } |
|
115 | - |
|
116 | - /** |
|
117 | - * Returns admin notice cached timeout. |
|
118 | - * |
|
119 | - * @access public |
|
120 | - * |
|
121 | - * @param string|bool $id admin notice name or false. |
|
122 | - * |
|
123 | - * @return array|bool The timeout. False if expired. |
|
124 | - */ |
|
125 | - public static function get_admin_notice_cache( $id = false ) { |
|
126 | - if ( ! $id ) { |
|
127 | - return false; |
|
128 | - } |
|
129 | - $cache_key = 'pand-' . md5( $id ); |
|
130 | - $timeout = get_site_option( $cache_key ); |
|
131 | - $timeout = 'forever' === $timeout ? time() + 60 : $timeout; |
|
132 | - |
|
133 | - if ( empty( $timeout ) || time() > $timeout ) { |
|
134 | - return false; |
|
135 | - } |
|
136 | - |
|
137 | - return $timeout; |
|
138 | - } |
|
139 | - |
|
140 | - /** |
|
141 | - * Sets admin notice timeout in site option. |
|
142 | - * |
|
143 | - * @access public |
|
144 | - * |
|
145 | - * @param string $id Data Identifier. |
|
146 | - * @param string|bool $timeout Timeout for admin notice. |
|
147 | - * |
|
148 | - * @return bool |
|
149 | - */ |
|
150 | - public static function set_admin_notice_cache( $id, $timeout ) { |
|
151 | - $cache_key = 'pand-' . md5( $id ); |
|
152 | - update_site_option( $cache_key, $timeout ); |
|
153 | - |
|
154 | - return true; |
|
155 | - } |
|
156 | - |
|
157 | - } |
|
37 | + /** |
|
38 | + * Class PAnD |
|
39 | + */ |
|
40 | + class PAnD { |
|
41 | + |
|
42 | + /** |
|
43 | + * Init hooks. |
|
44 | + */ |
|
45 | + public static function init() { |
|
46 | + add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) ); |
|
47 | + add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) ); |
|
48 | + } |
|
49 | + |
|
50 | + /** |
|
51 | + * Enqueue javascript and variables. |
|
52 | + */ |
|
53 | + public static function load_script() { |
|
54 | + |
|
55 | + if ( is_customize_preview() ) { |
|
56 | + return; |
|
57 | + } |
|
58 | + |
|
59 | + wp_enqueue_script( |
|
60 | + 'dismissible-notices', |
|
61 | + plugins_url( 'dismiss-notice.js', __FILE__ ), |
|
62 | + array( 'jquery', 'common' ), |
|
63 | + false, |
|
64 | + true |
|
65 | + ); |
|
66 | + |
|
67 | + wp_localize_script( |
|
68 | + 'dismissible-notices', |
|
69 | + 'dismissible_notice', |
|
70 | + array( |
|
71 | + 'nonce' => wp_create_nonce( 'dismissible-notice' ), |
|
72 | + ) |
|
73 | + ); |
|
74 | + } |
|
75 | + |
|
76 | + /** |
|
77 | + * Handles Ajax request to persist notices dismissal. |
|
78 | + * Uses check_ajax_referer to verify nonce. |
|
79 | + */ |
|
80 | + public static function dismiss_admin_notice() { |
|
81 | + $option_name = sanitize_text_field( $_POST['option_name'] ); |
|
82 | + $dismissible_length = sanitize_text_field( $_POST['dismissible_length'] ); |
|
83 | + |
|
84 | + if ( 'forever' != $dismissible_length ) { |
|
85 | + // If $dismissible_length is not an integer default to 1 |
|
86 | + $dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length; |
|
87 | + $dismissible_length = strtotime( absint( $dismissible_length ) . ' days' ); |
|
88 | + } |
|
89 | + |
|
90 | + check_ajax_referer( 'dismissible-notice', 'nonce' ); |
|
91 | + self::set_admin_notice_cache( $option_name, $dismissible_length ); |
|
92 | + wp_die(); |
|
93 | + } |
|
94 | + |
|
95 | + /** |
|
96 | + * Is admin notice active? |
|
97 | + * |
|
98 | + * @param string $arg data-dismissible content of notice. |
|
99 | + * |
|
100 | + * @return bool |
|
101 | + */ |
|
102 | + public static function is_admin_notice_active( $arg ) { |
|
103 | + $array = explode( '-', $arg ); |
|
104 | + $length = array_pop( $array ); |
|
105 | + $option_name = implode( '-', $array ); |
|
106 | + $db_record = self::get_admin_notice_cache( $option_name ); |
|
107 | + if ( 'forever' == $db_record ) { |
|
108 | + return false; |
|
109 | + } elseif ( absint( $db_record ) >= time() ) { |
|
110 | + return false; |
|
111 | + } else { |
|
112 | + return true; |
|
113 | + } |
|
114 | + } |
|
115 | + |
|
116 | + /** |
|
117 | + * Returns admin notice cached timeout. |
|
118 | + * |
|
119 | + * @access public |
|
120 | + * |
|
121 | + * @param string|bool $id admin notice name or false. |
|
122 | + * |
|
123 | + * @return array|bool The timeout. False if expired. |
|
124 | + */ |
|
125 | + public static function get_admin_notice_cache( $id = false ) { |
|
126 | + if ( ! $id ) { |
|
127 | + return false; |
|
128 | + } |
|
129 | + $cache_key = 'pand-' . md5( $id ); |
|
130 | + $timeout = get_site_option( $cache_key ); |
|
131 | + $timeout = 'forever' === $timeout ? time() + 60 : $timeout; |
|
132 | + |
|
133 | + if ( empty( $timeout ) || time() > $timeout ) { |
|
134 | + return false; |
|
135 | + } |
|
136 | + |
|
137 | + return $timeout; |
|
138 | + } |
|
139 | + |
|
140 | + /** |
|
141 | + * Sets admin notice timeout in site option. |
|
142 | + * |
|
143 | + * @access public |
|
144 | + * |
|
145 | + * @param string $id Data Identifier. |
|
146 | + * @param string|bool $timeout Timeout for admin notice. |
|
147 | + * |
|
148 | + * @return bool |
|
149 | + */ |
|
150 | + public static function set_admin_notice_cache( $id, $timeout ) { |
|
151 | + $cache_key = 'pand-' . md5( $id ); |
|
152 | + update_site_option( $cache_key, $timeout ); |
|
153 | + |
|
154 | + return true; |
|
155 | + } |
|
156 | + |
|
157 | + } |
|
158 | 158 | |
159 | 159 | } |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | /** |
29 | 29 | * Exit if called directly. |
30 | 30 | */ |
31 | -if ( ! defined( 'ABSPATH' ) ) { |
|
31 | +if (!defined('ABSPATH')) { |
|
32 | 32 | die; |
33 | 33 | } |
34 | 34 | |
35 | -if ( ! class_exists( 'PAnD' ) ) { |
|
35 | +if (!class_exists('PAnD')) { |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * Class PAnD |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | * Init hooks. |
44 | 44 | */ |
45 | 45 | public static function init() { |
46 | - add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) ); |
|
47 | - add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) ); |
|
46 | + add_action('admin_enqueue_scripts', array(__CLASS__, 'load_script')); |
|
47 | + add_action('wp_ajax_dismiss_admin_notice', array(__CLASS__, 'dismiss_admin_notice')); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
@@ -52,14 +52,14 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public static function load_script() { |
54 | 54 | |
55 | - if ( is_customize_preview() ) { |
|
55 | + if (is_customize_preview()) { |
|
56 | 56 | return; |
57 | 57 | } |
58 | 58 | |
59 | 59 | wp_enqueue_script( |
60 | 60 | 'dismissible-notices', |
61 | - plugins_url( 'dismiss-notice.js', __FILE__ ), |
|
62 | - array( 'jquery', 'common' ), |
|
61 | + plugins_url('dismiss-notice.js', __FILE__), |
|
62 | + array('jquery', 'common'), |
|
63 | 63 | false, |
64 | 64 | true |
65 | 65 | ); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | 'dismissible-notices', |
69 | 69 | 'dismissible_notice', |
70 | 70 | array( |
71 | - 'nonce' => wp_create_nonce( 'dismissible-notice' ), |
|
71 | + 'nonce' => wp_create_nonce('dismissible-notice'), |
|
72 | 72 | ) |
73 | 73 | ); |
74 | 74 | } |
@@ -78,17 +78,17 @@ discard block |
||
78 | 78 | * Uses check_ajax_referer to verify nonce. |
79 | 79 | */ |
80 | 80 | public static function dismiss_admin_notice() { |
81 | - $option_name = sanitize_text_field( $_POST['option_name'] ); |
|
82 | - $dismissible_length = sanitize_text_field( $_POST['dismissible_length'] ); |
|
81 | + $option_name = sanitize_text_field($_POST['option_name']); |
|
82 | + $dismissible_length = sanitize_text_field($_POST['dismissible_length']); |
|
83 | 83 | |
84 | - if ( 'forever' != $dismissible_length ) { |
|
84 | + if ('forever' != $dismissible_length) { |
|
85 | 85 | // If $dismissible_length is not an integer default to 1 |
86 | - $dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length; |
|
87 | - $dismissible_length = strtotime( absint( $dismissible_length ) . ' days' ); |
|
86 | + $dismissible_length = (0 == absint($dismissible_length)) ? 1 : $dismissible_length; |
|
87 | + $dismissible_length = strtotime(absint($dismissible_length).' days'); |
|
88 | 88 | } |
89 | 89 | |
90 | - check_ajax_referer( 'dismissible-notice', 'nonce' ); |
|
91 | - self::set_admin_notice_cache( $option_name, $dismissible_length ); |
|
90 | + check_ajax_referer('dismissible-notice', 'nonce'); |
|
91 | + self::set_admin_notice_cache($option_name, $dismissible_length); |
|
92 | 92 | wp_die(); |
93 | 93 | } |
94 | 94 | |
@@ -99,14 +99,14 @@ discard block |
||
99 | 99 | * |
100 | 100 | * @return bool |
101 | 101 | */ |
102 | - public static function is_admin_notice_active( $arg ) { |
|
103 | - $array = explode( '-', $arg ); |
|
104 | - $length = array_pop( $array ); |
|
105 | - $option_name = implode( '-', $array ); |
|
106 | - $db_record = self::get_admin_notice_cache( $option_name ); |
|
107 | - if ( 'forever' == $db_record ) { |
|
102 | + public static function is_admin_notice_active($arg) { |
|
103 | + $array = explode('-', $arg); |
|
104 | + $length = array_pop($array); |
|
105 | + $option_name = implode('-', $array); |
|
106 | + $db_record = self::get_admin_notice_cache($option_name); |
|
107 | + if ('forever' == $db_record) { |
|
108 | 108 | return false; |
109 | - } elseif ( absint( $db_record ) >= time() ) { |
|
109 | + } elseif (absint($db_record) >= time()) { |
|
110 | 110 | return false; |
111 | 111 | } else { |
112 | 112 | return true; |
@@ -122,15 +122,15 @@ discard block |
||
122 | 122 | * |
123 | 123 | * @return array|bool The timeout. False if expired. |
124 | 124 | */ |
125 | - public static function get_admin_notice_cache( $id = false ) { |
|
126 | - if ( ! $id ) { |
|
125 | + public static function get_admin_notice_cache($id = false) { |
|
126 | + if (!$id) { |
|
127 | 127 | return false; |
128 | 128 | } |
129 | - $cache_key = 'pand-' . md5( $id ); |
|
130 | - $timeout = get_site_option( $cache_key ); |
|
129 | + $cache_key = 'pand-'.md5($id); |
|
130 | + $timeout = get_site_option($cache_key); |
|
131 | 131 | $timeout = 'forever' === $timeout ? time() + 60 : $timeout; |
132 | 132 | |
133 | - if ( empty( $timeout ) || time() > $timeout ) { |
|
133 | + if (empty($timeout) || time() > $timeout) { |
|
134 | 134 | return false; |
135 | 135 | } |
136 | 136 | |
@@ -147,9 +147,9 @@ discard block |
||
147 | 147 | * |
148 | 148 | * @return bool |
149 | 149 | */ |
150 | - public static function set_admin_notice_cache( $id, $timeout ) { |
|
151 | - $cache_key = 'pand-' . md5( $id ); |
|
152 | - update_site_option( $cache_key, $timeout ); |
|
150 | + public static function set_admin_notice_cache($id, $timeout) { |
|
151 | + $cache_key = 'pand-'.md5($id); |
|
152 | + update_site_option($cache_key, $timeout); |
|
153 | 153 | |
154 | 154 | return true; |
155 | 155 | } |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | protected $inputLength = 0; |
71 | 71 | protected $lookAhead = null; |
72 | 72 | protected $output = ''; |
73 | - protected $lastByteOut = ''; |
|
73 | + protected $lastByteOut = ''; |
|
74 | 74 | protected $keptComment = ''; |
75 | 75 | |
76 | 76 | /** |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | } |
107 | 107 | |
108 | 108 | $mbIntEnc = null; |
109 | - if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) { |
|
109 | + if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) { |
|
110 | 110 | $mbIntEnc = mb_internal_encoding(); |
111 | 111 | mb_internal_encoding('8bit'); |
112 | 112 | } |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | && ($this->b === $this->lastByteOut)) { |
129 | 129 | // Don't delete this space. If we do, the addition/subtraction |
130 | 130 | // could be parsed as a post-increment |
131 | - } elseif (! $this->isAlphaNum($this->b)) { |
|
131 | + } elseif (!$this->isAlphaNum($this->b)) { |
|
132 | 132 | $command = self::ACTION_DELETE_A; |
133 | 133 | } |
134 | 134 | } elseif ($this->a === "\n") { |
@@ -139,10 +139,10 @@ discard block |
||
139 | 139 | // otherwise mb_strpos will give WARNING |
140 | 140 | } elseif ($this->b === null |
141 | 141 | || (false === strpos('{[(+-!~', $this->b) |
142 | - && ! $this->isAlphaNum($this->b))) { |
|
142 | + && !$this->isAlphaNum($this->b))) { |
|
143 | 143 | $command = self::ACTION_DELETE_A; |
144 | 144 | } |
145 | - } elseif (! $this->isAlphaNum($this->a)) { |
|
145 | + } elseif (!$this->isAlphaNum($this->a)) { |
|
146 | 146 | if ($this->b === ' ' |
147 | 147 | || ($this->b === "\n" |
148 | 148 | && (false === strpos('}])+-"\'', $this->a)))) { |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal |
200 | 200 | $delimiter = $this->a; |
201 | 201 | $str = $this->a; // in case needed for exception |
202 | - for(;;) { |
|
202 | + for (;;) { |
|
203 | 203 | $this->output .= $this->a; |
204 | 204 | $this->lastByteOut = $this->a; |
205 | 205 | |
@@ -229,13 +229,13 @@ discard block |
||
229 | 229 | case self::ACTION_DELETE_A_B: // 3 |
230 | 230 | $this->b = $this->next(); |
231 | 231 | if ($this->b === '/' && $this->isRegexpLiteral()) { |
232 | - $this->output .= $this->a . $this->b; |
|
232 | + $this->output .= $this->a.$this->b; |
|
233 | 233 | $pattern = '/'; // keep entire pattern in case we need to report it in the exception |
234 | - for(;;) { |
|
234 | + for (;;) { |
|
235 | 235 | $this->a = $this->get(); |
236 | 236 | $pattern .= $this->a; |
237 | 237 | if ($this->a === '[') { |
238 | - for(;;) { |
|
238 | + for (;;) { |
|
239 | 239 | $this->output .= $this->a; |
240 | 240 | $this->a = $this->get(); |
241 | 241 | $pattern .= $this->a; |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | if ($this->isEOF($this->a)) { |
251 | 251 | throw new JSMin_UnterminatedRegExpException( |
252 | 252 | "JSMin: Unterminated set in RegExp at byte " |
253 | - . $this->inputIndex .": {$pattern}"); |
|
253 | + . $this->inputIndex.": {$pattern}"); |
|
254 | 254 | } |
255 | 255 | } |
256 | 256 | } |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | |
296 | 296 | // if the "/" follows a keyword, it must be a regexp, otherwise it's best to assume division |
297 | 297 | |
298 | - $subject = $this->output . trim($this->a); |
|
298 | + $subject = $this->output.trim($this->a); |
|
299 | 299 | if (!preg_match('/(?:case|else|in|return|typeof)$/', $subject, $m)) { |
300 | 300 | // not a keyword |
301 | 301 | return false; |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | { |
407 | 407 | $this->get(); |
408 | 408 | $comment = ''; |
409 | - for(;;) { |
|
409 | + for (;;) { |
|
410 | 410 | $get = $this->get(); |
411 | 411 | if ($get === '*') { |
412 | 412 | if ($this->peek() === '/') { // end of comment reached |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | // don't prepend a newline if two comments right after one another |
418 | 418 | $this->keptComment = "\n"; |
419 | 419 | } |
420 | - $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n"; |
|
420 | + $this->keptComment .= "/*!".substr($comment, 1)."*/\n"; |
|
421 | 421 | } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) { |
422 | 422 | // IE conditional |
423 | 423 | $this->keptComment .= "/*{$comment}*/"; |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Handles toolbar-related stuff. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -12,32 +12,32 @@ discard block |
||
12 | 12 | public function __construct() |
13 | 13 | { |
14 | 14 | // If Cache is not available we don't add the toolbar. |
15 | - if ( ! autoptimizeCache::cacheavail() ) { |
|
15 | + if (!autoptimizeCache::cacheavail()) { |
|
16 | 16 | return; |
17 | 17 | } |
18 | 18 | |
19 | 19 | // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated. |
20 | - add_action( 'wp_loaded', array( $this, 'load_toolbar' ) ); |
|
20 | + add_action('wp_loaded', array($this, 'load_toolbar')); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | public function load_toolbar() |
24 | 24 | { |
25 | 25 | // Check permissions and that toolbar is not hidden via filter. |
26 | - if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) { |
|
26 | + if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) { |
|
27 | 27 | |
28 | 28 | // Create a handler for the AJAX toolbar requests. |
29 | - add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) ); |
|
29 | + add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache')); |
|
30 | 30 | |
31 | 31 | // Load custom styles, scripts and menu only when needed. |
32 | - if ( is_admin_bar_showing() ) { |
|
33 | - if ( is_admin() ) { |
|
34 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
32 | + if (is_admin_bar_showing()) { |
|
33 | + if (is_admin()) { |
|
34 | + add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
35 | 35 | } else { |
36 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
36 | + add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | // Add the Autoptimize Toolbar to the Admin bar. |
40 | - add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 ); |
|
40 | + add_action('admin_bar_menu', array($this, 'add_toolbar'), 100); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | } |
@@ -50,17 +50,17 @@ discard block |
||
50 | 50 | $stats = autoptimizeCache::stats(); |
51 | 51 | |
52 | 52 | // Set the Max Size recommended for cache files. |
53 | - $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 ); |
|
53 | + $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024); |
|
54 | 54 | |
55 | 55 | // Retrieve the current Total Files in cache. |
56 | 56 | $files = $stats[0]; |
57 | 57 | // Retrieve the current Total Size of the cache. |
58 | 58 | $bytes = $stats[1]; |
59 | - $size = $this->format_filesize( $bytes ); |
|
59 | + $size = $this->format_filesize($bytes); |
|
60 | 60 | |
61 | 61 | // Calculate the percentage of cache used. |
62 | - $percentage = ceil( $bytes / $max_size * 100 ); |
|
63 | - if ( $percentage > 100 ) { |
|
62 | + $percentage = ceil($bytes/$max_size*100); |
|
63 | + if ($percentage > 100) { |
|
64 | 64 | $percentage = 100; |
65 | 65 | } |
66 | 66 | |
@@ -70,82 +70,82 @@ discard block |
||
70 | 70 | * - "orange" if over 80%. |
71 | 71 | * - "red" if over 100%. |
72 | 72 | */ |
73 | - $color = ( 100 == $percentage ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' ); |
|
73 | + $color = (100 == $percentage) ? 'red' : (($percentage > 80) ? 'orange' : 'green'); |
|
74 | 74 | |
75 | 75 | // Create or add new items into the Admin Toolbar. |
76 | 76 | // Main "Autoptimize" node. |
77 | - $wp_admin_bar->add_node( array( |
|
77 | + $wp_admin_bar->add_node(array( |
|
78 | 78 | 'id' => 'autoptimize', |
79 | - 'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Autoptimize', 'autoptimize' ) . '</span>', |
|
80 | - 'href' => admin_url( 'options-general.php?page=autoptimize' ), |
|
81 | - 'meta' => array( 'class' => 'bullet-' . $color ), |
|
79 | + 'title' => '<span class="ab-icon"></span><span class="ab-label">'.__('Autoptimize', 'autoptimize').'</span>', |
|
80 | + 'href' => admin_url('options-general.php?page=autoptimize'), |
|
81 | + 'meta' => array('class' => 'bullet-'.$color), |
|
82 | 82 | )); |
83 | 83 | |
84 | 84 | // "Cache Info" node. |
85 | - $wp_admin_bar->add_node( array( |
|
85 | + $wp_admin_bar->add_node(array( |
|
86 | 86 | 'id' => 'autoptimize-cache-info', |
87 | - 'title' => '<p>' . __( 'Cache Info', 'autoptimize' ) . '</p>' . |
|
88 | - '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
89 | - '<div class="autoptimize-circle">' . |
|
90 | - '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>' . |
|
91 | - '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>' . |
|
92 | - '<div class="shadow"></div>' . |
|
93 | - '</div>' . |
|
94 | - '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>' . |
|
95 | - '</div>' . |
|
96 | - '<table>' . |
|
97 | - '<tr><td>' . __( 'Size', 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
98 | - '<tr><td>' . __( 'Files', 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
87 | + 'title' => '<p>'.__('Cache Info', 'autoptimize').'</p>'. |
|
88 | + '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'. |
|
89 | + '<div class="autoptimize-circle">'. |
|
90 | + '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'. |
|
91 | + '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'. |
|
92 | + '<div class="shadow"></div>'. |
|
93 | + '</div>'. |
|
94 | + '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'. |
|
95 | + '</div>'. |
|
96 | + '<table>'. |
|
97 | + '<tr><td>'.__('Size', 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'. |
|
98 | + '<tr><td>'.__('Files', 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'. |
|
99 | 99 | '</table>', |
100 | 100 | 'parent' => 'autoptimize', |
101 | 101 | )); |
102 | 102 | |
103 | 103 | // "Delete Cache" node. |
104 | - $wp_admin_bar->add_node( array( |
|
104 | + $wp_admin_bar->add_node(array( |
|
105 | 105 | 'id' => 'autoptimize-delete-cache', |
106 | - 'title' => __( 'Delete Cache', 'autoptimize' ), |
|
106 | + 'title' => __('Delete Cache', 'autoptimize'), |
|
107 | 107 | 'parent' => 'autoptimize', |
108 | 108 | )); |
109 | 109 | } |
110 | 110 | |
111 | 111 | public function delete_cache() |
112 | 112 | { |
113 | - check_ajax_referer( 'ao_delcache_nonce', 'nonce' ); |
|
113 | + check_ajax_referer('ao_delcache_nonce', 'nonce'); |
|
114 | 114 | |
115 | 115 | $result = false; |
116 | - if ( current_user_can( 'manage_options' ) ) { |
|
116 | + if (current_user_can('manage_options')) { |
|
117 | 117 | // We call the function for cleaning the Autoptimize cache. |
118 | 118 | $result = autoptimizeCache::clearall(); |
119 | 119 | } |
120 | 120 | |
121 | - wp_send_json( $result ); |
|
121 | + wp_send_json($result); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | public function enqueue_scripts() |
125 | 125 | { |
126 | 126 | // Autoptimize Toolbar Styles. |
127 | - wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all' ); |
|
127 | + wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all'); |
|
128 | 128 | |
129 | 129 | // Autoptimize Toolbar Javascript. |
130 | - wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), AUTOPTIMIZE_PLUGIN_VERSION, true ); |
|
130 | + wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), AUTOPTIMIZE_PLUGIN_VERSION, true); |
|
131 | 131 | |
132 | 132 | // Localizes a registered script with data for a JavaScript variable. |
133 | 133 | // Needed for the AJAX to work properly on the frontend. |
134 | - wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
135 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
|
134 | + wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
135 | + 'ajaxurl' => admin_url('admin-ajax.php'), |
|
136 | 136 | // translators: links to the Autoptimize settings page. |
137 | - 'error_msg' => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ), |
|
138 | - 'dismiss_msg' => __( 'Dismiss this notice.' ), |
|
139 | - 'nonce' => wp_create_nonce( 'ao_delcache_nonce' ), |
|
140 | - ) ); |
|
137 | + 'error_msg' => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'), |
|
138 | + 'dismiss_msg' => __('Dismiss this notice.'), |
|
139 | + 'nonce' => wp_create_nonce('ao_delcache_nonce'), |
|
140 | + )); |
|
141 | 141 | } |
142 | 142 | |
143 | - public function format_filesize( $bytes, $decimals = 2 ) |
|
143 | + public function format_filesize($bytes, $decimals = 2) |
|
144 | 144 | { |
145 | - $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ); |
|
145 | + $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); |
|
146 | 146 | |
147 | - for ( $i = 0; ( $bytes / 1024) > 0.9; $i++, $bytes /= 1024 ) {} // @codingStandardsIgnoreLine |
|
147 | + for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} // @codingStandardsIgnoreLine |
|
148 | 148 | |
149 | - return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[ $i ] ); |
|
149 | + return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]); |
|
150 | 150 | } |
151 | 151 | } |
@@ -798,6 +798,9 @@ discard block |
||
798 | 798 | return $preload_onload; |
799 | 799 | } |
800 | 800 | |
801 | + /** |
|
802 | + * @param string $key |
|
803 | + */ |
|
801 | 804 | public function get( $key ) |
802 | 805 | { |
803 | 806 | if ( ! is_array( $this->config ) ) { |
@@ -824,6 +827,9 @@ discard block |
||
824 | 827 | return false; |
825 | 828 | } |
826 | 829 | |
830 | + /** |
|
831 | + * @param string $url |
|
832 | + */ |
|
827 | 833 | private function get_futtta_feeds( $url ) { |
828 | 834 | if ( $this->settings_screen_do_remote_http ) { |
829 | 835 | $rss = fetch_feed( $url ); |
@@ -837,10 +837,13 @@ |
||
837 | 837 | <ul> |
838 | 838 | <?php if ( 0 == $maxitems ) : ?> |
839 | 839 | <li><?php _e( 'No items', 'autoptimize' ); ?></li> |
840 | - <?php else : ?> |
|
840 | + <?php else { |
|
841 | + : ?> |
|
841 | 842 | <?php foreach ( $rss_items as $item ) : ?> |
842 | 843 | <li> |
843 | - <a href="<?php echo esc_url( $item->get_permalink() ); ?>" |
|
844 | + <a href="<?php echo esc_url( $item->get_permalink() ); |
|
845 | +} |
|
846 | +?>" |
|
844 | 847 | <?php // translators: the variable contains a date. ?> |
845 | 848 | title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date( 'j F Y | g:i a' ) ); ?>"> |
846 | 849 | <?php echo esc_html( $item->get_title() ); ?> |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Main configuration logic. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -35,32 +35,32 @@ discard block |
||
35 | 35 | */ |
36 | 36 | private function __construct() |
37 | 37 | { |
38 | - if ( is_admin() ) { |
|
38 | + if (is_admin()) { |
|
39 | 39 | // Add the admin page and settings. |
40 | - if ( autoptimizeOptionWrapper::is_ao_active_for_network() ) { |
|
41 | - add_action( 'network_admin_menu', array( $this, 'addmenu' ) ); |
|
40 | + if (autoptimizeOptionWrapper::is_ao_active_for_network()) { |
|
41 | + add_action('network_admin_menu', array($this, 'addmenu')); |
|
42 | 42 | } |
43 | 43 | |
44 | - add_action( 'admin_menu', array( $this, 'addmenu' ) ); |
|
45 | - add_action( 'admin_init', array( $this, 'registersettings' ) ); |
|
44 | + add_action('admin_menu', array($this, 'addmenu')); |
|
45 | + add_action('admin_init', array($this, 'registersettings')); |
|
46 | 46 | |
47 | 47 | // Set meta info. |
48 | - if ( function_exists( 'plugin_row_meta' ) ) { |
|
48 | + if (function_exists('plugin_row_meta')) { |
|
49 | 49 | // 2.8 and higher. |
50 | - add_filter( 'plugin_row_meta', array( $this, 'setmeta' ), 10, 2 ); |
|
51 | - } elseif ( function_exists( 'post_class' ) ) { |
|
50 | + add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2); |
|
51 | + } elseif (function_exists('post_class')) { |
|
52 | 52 | // 2.7 and lower. |
53 | - $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' ); |
|
54 | - add_filter( 'plugin_action_links_' . $plugin, array( $this, 'setmeta' ) ); |
|
53 | + $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
|
54 | + add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta')); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | // Clean cache? |
58 | - if ( autoptimizeOptionWrapper::get_option( 'autoptimize_cache_clean' ) ) { |
|
58 | + if (autoptimizeOptionWrapper::get_option('autoptimize_cache_clean')) { |
|
59 | 59 | autoptimizeCache::clearall(); |
60 | - autoptimizeOptionWrapper::update_option( 'autoptimize_cache_clean', 0 ); |
|
60 | + autoptimizeOptionWrapper::update_option('autoptimize_cache_clean', 0); |
|
61 | 61 | } |
62 | 62 | |
63 | - $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http ); |
|
63 | + $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | // Adds the Autoptimize Toolbar to the Admin bar. |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | static public function instance() |
77 | 77 | { |
78 | 78 | // Only one instance. |
79 | - if ( null === self::$instance ) { |
|
79 | + if (null === self::$instance) { |
|
80 | 80 | self::$instance = new autoptimizeConfig(); |
81 | 81 | } |
82 | 82 | |
@@ -86,9 +86,9 @@ discard block |
||
86 | 86 | public function show_network_message() { |
87 | 87 | ?> |
88 | 88 | <div class="wrap"> |
89 | - <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
89 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
90 | 90 | <?php echo $this->ao_admin_tabs(); ?> |
91 | - <p style="font-size:120%;"><?php echo apply_filters( 'autoptimize_filter_settingsscreen_multisite_network_message', __( 'Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize' ) ); ?></p> |
|
91 | + <p style="font-size:120%;"><?php echo apply_filters('autoptimize_filter_settingsscreen_multisite_network_message', __('Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize')); ?></p> |
|
92 | 92 | </div> |
93 | 93 | <?php |
94 | 94 | } |
@@ -181,32 +181,32 @@ discard block |
||
181 | 181 | <div class="wrap"> |
182 | 182 | |
183 | 183 | <!-- Temporary nudge to disable aoccss power-up. --> |
184 | -<?php if ( autoptimizeUtils::is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) { ?> |
|
184 | +<?php if (autoptimizeUtils::is_plugin_active('autoptimize-criticalcss/ao_criticss_aas.php')) { ?> |
|
185 | 185 | <div class="notice-info notice"><p> |
186 | - <?php _e( 'Autoptimize now includes the criticalcss.com integration that was previously part of the separate power-up. If you want you can simply disable the power-up and Autoptimize will take over immediately.', 'autoptimize' ); ?> |
|
186 | + <?php _e('Autoptimize now includes the criticalcss.com integration that was previously part of the separate power-up. If you want you can simply disable the power-up and Autoptimize will take over immediately.', 'autoptimize'); ?> |
|
187 | 187 | </p></div> |
188 | 188 | <?php } ?> |
189 | 189 | |
190 | 190 | <div id="autoptimize_main"> |
191 | - <h1 id="ao_title"><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
191 | + <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
192 | 192 | <?php echo $this->ao_admin_tabs(); ?> |
193 | 193 | |
194 | -<form method="post" action="<?php echo admin_url( 'options.php' ); ?>"> |
|
195 | -<?php settings_fields( 'autoptimize' ); ?> |
|
194 | +<form method="post" action="<?php echo admin_url('options.php'); ?>"> |
|
195 | +<?php settings_fields('autoptimize'); ?> |
|
196 | 196 | |
197 | 197 | <ul> |
198 | 198 | |
199 | 199 | <?php |
200 | 200 | // Only show enable site configuration in network site option. |
201 | -if ( is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) { |
|
201 | +if (is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) { |
|
202 | 202 | ?> |
203 | 203 | <li class="itemDetail multiSite"> |
204 | - <h2 class="itemTitle"><?php _e( 'Multisite Options', 'autoptimize' ); ?></h2> |
|
204 | + <h2 class="itemTitle"><?php _e('Multisite Options', 'autoptimize'); ?></h2> |
|
205 | 205 | <table class="form-table"> |
206 | 206 | <tr valign="top"> |
207 | - <th scope="row"><?php _e( 'Enable site configuration?', 'autoptimize' ); ?></th> |
|
208 | - <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ? 'checked="checked" ' : ''; ?>/> |
|
209 | - <?php _e( 'Enable Autoptimize configuration per site.', 'autoptimize' ); ?></label></td> |
|
207 | + <th scope="row"><?php _e('Enable site configuration?', 'autoptimize'); ?></th> |
|
208 | + <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config') ? 'checked="checked" ' : ''; ?>/> |
|
209 | + <?php _e('Enable Autoptimize configuration per site.', 'autoptimize'); ?></label></td> |
|
210 | 210 | </tr> |
211 | 211 | </table> |
212 | 212 | </li> |
@@ -215,115 +215,115 @@ discard block |
||
215 | 215 | <?php } ?> |
216 | 216 | |
217 | 217 | <li class="itemDetail"> |
218 | -<h2 class="itemTitle"><?php _e( 'JavaScript Options', 'autoptimize' ); ?></h2> |
|
218 | +<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2> |
|
219 | 219 | <table class="form-table"> |
220 | 220 | <tr valign="top"> |
221 | -<th scope="row"><?php _e( 'Optimize JavaScript Code?', 'autoptimize' ); ?></th> |
|
222 | -<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js' ) ? 'checked="checked" ' : ''; ?>/></td> |
|
221 | +<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th> |
|
222 | +<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td> |
|
223 | 223 | </tr> |
224 | 224 | <tr valign="top" class="js_sub"> |
225 | -<th scope="row"><?php _e( 'Aggregate JS-files?', 'autoptimize' ); ?></th> |
|
226 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get( 'autoptimize_js_aggregate' ) ? 'checked="checked" ' : ''; ?>/> |
|
227 | -<?php _e( 'Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td> |
|
225 | +<th scope="row"><?php _e('Aggregate JS-files?', 'autoptimize'); ?></th> |
|
226 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get('autoptimize_js_aggregate') ? 'checked="checked" ' : ''; ?>/> |
|
227 | +<?php _e('Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td> |
|
228 | 228 | </tr> |
229 | 229 | <tr valign="top" class="js_sub js_aggregate"> |
230 | -<th scope="row"><?php _e( 'Also aggregate inline JS?', 'autoptimize' ); ?></th> |
|
231 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_include_inline' ) ? 'checked="checked" ' : ''; ?>/> |
|
232 | -<?php _e( 'Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize' ); ?></label></td> |
|
230 | +<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th> |
|
231 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/> |
|
232 | +<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize'); ?></label></td> |
|
233 | 233 | </tr> |
234 | 234 | <tr valign="top" class="js_sub js_aggregate"> |
235 | -<th scope="row"><?php _e( 'Force JavaScript in <head>?', 'autoptimize' ); ?></th> |
|
236 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_forcehead' ) ? 'checked="checked" ' : ''; ?>/> |
|
237 | -<?php _e( 'Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize' ); ?></label></td> |
|
235 | +<th scope="row"><?php _e('Force JavaScript in <head>?', 'autoptimize'); ?></th> |
|
236 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/> |
|
237 | +<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td> |
|
238 | 238 | </tr> |
239 | -<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ) { ?> |
|
239 | +<?php if (autoptimizeOptionWrapper::get_option('autoptimize_js_justhead')) { ?> |
|
240 | 240 | <tr valign="top" class="js_sub js_aggregate"> |
241 | 241 | <th scope="row"> |
242 | 242 | <?php |
243 | - _e( 'Look for scripts only in <head>?', 'autoptimize' ); |
|
244 | - echo ' <i>' . __( '(deprecated)', 'autoptimize' ) . '</i>'; |
|
243 | + _e('Look for scripts only in <head>?', 'autoptimize'); |
|
244 | + echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; |
|
245 | 245 | ?> |
246 | 246 | </th> |
247 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ? 'checked="checked" ' : ''; ?>/> |
|
248 | -<?php _e( 'Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize' ); ?></label></td> |
|
247 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
248 | +<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td> |
|
249 | 249 | </tr> |
250 | 250 | <?php } ?> |
251 | 251 | <tr valign="top" class="js_sub"> |
252 | -<th scope="row"><?php _e( 'Exclude scripts from Autoptimize:', 'autoptimize' ); ?></th> |
|
253 | -<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo esc_html( autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude', 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js' ) ); ?>"/><br /> |
|
252 | +<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th> |
|
253 | +<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo esc_html(autoptimizeOptionWrapper::get_option('autoptimize_js_exclude', 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js')); ?>"/><br /> |
|
254 | 254 | <?php |
255 | -echo __( 'A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize' ) . ' ' . __( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' ); |
|
255 | +echo __('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize').' '.__('Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize'); |
|
256 | 256 | ?> |
257 | 257 | </label></td> |
258 | 258 | </tr> |
259 | 259 | <tr valign="top" class="js_sub js_aggregate"> |
260 | -<th scope="row"><?php _e( 'Add try-catch wrapping?', 'autoptimize' ); ?></th> |
|
261 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_trycatch' ) ? 'checked="checked" ' : ''; ?>/> |
|
262 | -<?php _e( 'If your scripts break because of a JS-error, you might want to try this.', 'autoptimize' ); ?></label></td> |
|
260 | +<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th> |
|
261 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/> |
|
262 | +<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td> |
|
263 | 263 | </tr> |
264 | 264 | </table> |
265 | 265 | </li> |
266 | 266 | |
267 | 267 | <li class="itemDetail"> |
268 | -<h2 class="itemTitle"><?php _e( 'CSS Options', 'autoptimize' ); ?></h2> |
|
268 | +<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2> |
|
269 | 269 | <table class="form-table"> |
270 | 270 | <tr valign="top"> |
271 | -<th scope="row"><?php _e( 'Optimize CSS Code?', 'autoptimize' ); ?></th> |
|
272 | -<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css' ) ? 'checked="checked" ' : ''; ?>/></td> |
|
271 | +<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th> |
|
272 | +<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td> |
|
273 | 273 | </tr> |
274 | 274 | <tr class="css_sub" valign="top"> |
275 | -<th scope="row"><?php _e( 'Aggregate CSS-files?', 'autoptimize' ); ?></th> |
|
276 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get( 'autoptimize_css_aggregate' ) ? 'checked="checked" ' : ''; ?>/> |
|
277 | -<?php _e( 'Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td> |
|
275 | +<th scope="row"><?php _e('Aggregate CSS-files?', 'autoptimize'); ?></th> |
|
276 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get('autoptimize_css_aggregate') ? 'checked="checked" ' : ''; ?>/> |
|
277 | +<?php _e('Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td> |
|
278 | 278 | </tr> |
279 | 279 | <tr valign="top" class="css_sub css_aggregate"> |
280 | -<th scope="row"><?php _e( 'Also aggregate inline CSS?', 'autoptimize' ); ?></th> |
|
281 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_include_inline', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
282 | -<?php _e( 'Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize' ); ?></label></td> |
|
280 | +<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th> |
|
281 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/> |
|
282 | +<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td> |
|
283 | 283 | </tr> |
284 | 284 | <tr class="css_sub css_aggregate" valign="top"> |
285 | -<th scope="row"><?php _e( 'Generate data: URIs for images?', 'autoptimize' ); ?></th> |
|
286 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_datauris' ) ? 'checked="checked" ' : ''; ?>/> |
|
287 | -<?php _e( 'Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize' ); ?></label></td> |
|
285 | +<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th> |
|
286 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/> |
|
287 | +<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td> |
|
288 | 288 | </tr> |
289 | -<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ) { ?> |
|
289 | +<?php if (autoptimizeOptionWrapper::get_option('autoptimize_css_justhead')) { ?> |
|
290 | 290 | <tr valign="top" class="css_sub css_aggregate"> |
291 | 291 | <th scope="row"> |
292 | 292 | <?php |
293 | -_e( 'Look for styles only in <head>?', 'autoptimize' ); |
|
294 | -echo ' <i>' . __( '(deprecated)', 'autoptimize' ) . '</i>'; |
|
293 | +_e('Look for styles only in <head>?', 'autoptimize'); |
|
294 | +echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; |
|
295 | 295 | ?> |
296 | 296 | </th> |
297 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ? 'checked="checked" ' : ''; ?>/> |
|
298 | -<?php _e( 'Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize' ); ?></label></td> |
|
297 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
298 | +<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td> |
|
299 | 299 | </tr> |
300 | 300 | <?php } ?> |
301 | 301 | <tr valign="top" class="css_sub"> |
302 | -<th scope="row"><?php _e( 'Inline and Defer CSS?', 'autoptimize' ); ?></th> |
|
303 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer' ) ? 'checked="checked" ' : ''; ?>/> |
|
302 | +<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th> |
|
303 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/> |
|
304 | 304 | <?php |
305 | -_e( 'Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize' ); |
|
305 | +_e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize'); |
|
306 | 306 | echo ' '; |
307 | -$critcss_settings_url = get_admin_url( null, 'options-general.php?page=ao_critcss' ); |
|
307 | +$critcss_settings_url = get_admin_url(null, 'options-general.php?page=ao_critcss'); |
|
308 | 308 | // translators: links "autoptimize critical CSS" tab. |
309 | -echo sprintf( __( 'This can be fully automated for different types of pages on the %s tab.', 'autoptimize' ), '<a href="' . $critcss_settings_url . '">CriticalCSS</a>' ); |
|
309 | +echo sprintf(__('This can be fully automated for different types of pages on the %s tab.', 'autoptimize'), '<a href="'.$critcss_settings_url.'">CriticalCSS</a>'); |
|
310 | 310 | ?> |
311 | 311 | </label></td> |
312 | 312 | </tr> |
313 | 313 | <tr valign="top" class="css_sub" id="autoptimize_css_defer_inline"> |
314 | 314 | <th scope="row"></th> |
315 | -<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize' ); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' ); ?></textarea></label></td> |
|
315 | +<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_defer_inline'); ?></textarea></label></td> |
|
316 | 316 | </tr> |
317 | 317 | <tr valign="top" class="css_sub css_aggregate"> |
318 | -<th scope="row"><?php _e( 'Inline all CSS?', 'autoptimize' ); ?></th> |
|
319 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_inline' ) ? 'checked="checked" ' : ''; ?>/> |
|
320 | -<?php _e( 'Inlining all CSS is an easy way to stop the CSS from being render-blocking, but is generally not recommended because the size of the HTML increases significantly. Additionally it might push meta-tags down to a position where e.g. Facebook and Whatsapp will not find them any more, breaking thumbnails when sharing.', 'autoptimize' ); ?></label></td> |
|
318 | +<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th> |
|
319 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/> |
|
320 | +<?php _e('Inlining all CSS is an easy way to stop the CSS from being render-blocking, but is generally not recommended because the size of the HTML increases significantly. Additionally it might push meta-tags down to a position where e.g. Facebook and Whatsapp will not find them any more, breaking thumbnails when sharing.', 'autoptimize'); ?></label></td> |
|
321 | 321 | </tr> |
322 | 322 | <tr valign="top" class="css_sub"> |
323 | -<th scope="row"><?php _e( 'Exclude CSS from Autoptimize:', 'autoptimize' ); ?></th> |
|
324 | -<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo esc_html( autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css' ) ); ?>"/><br /> |
|
323 | +<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th> |
|
324 | +<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo esc_html(autoptimizeOptionWrapper::get_option('autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css')); ?>"/><br /> |
|
325 | 325 | <?php |
326 | -echo __( 'A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize' ) . ' ' . __( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' ); |
|
326 | +echo __('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize').' '.__('Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize'); |
|
327 | 327 | ?> |
328 | 328 | </label></td> |
329 | 329 | </tr> |
@@ -331,55 +331,55 @@ discard block |
||
331 | 331 | </li> |
332 | 332 | |
333 | 333 | <li class="itemDetail"> |
334 | -<h2 class="itemTitle"><?php _e( 'HTML Options', 'autoptimize' ); ?></h2> |
|
334 | +<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2> |
|
335 | 335 | <table class="form-table"> |
336 | 336 | <tr valign="top"> |
337 | -<th scope="row"><?php _e( 'Optimize HTML Code?', 'autoptimize' ); ?></th> |
|
338 | -<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_html' ) ? 'checked="checked" ' : ''; ?>/></td> |
|
337 | +<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th> |
|
338 | +<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td> |
|
339 | 339 | </tr> |
340 | 340 | <tr class="html_sub" valign="top"> |
341 | -<th scope="row"><?php _e( 'Keep HTML comments?', 'autoptimize' ); ?></th> |
|
342 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_html_keepcomments' ) ? 'checked="checked" ' : ''; ?>/> |
|
343 | -<?php _e( 'Enable this if you want HTML comments to remain in the page.', 'autoptimize' ); ?></label></td> |
|
341 | +<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th> |
|
342 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/> |
|
343 | +<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td> |
|
344 | 344 | </tr> |
345 | 345 | </table> |
346 | 346 | </li> |
347 | 347 | |
348 | 348 | <li class="itemDetail"> |
349 | -<h2 class="itemTitle"><?php _e( 'CDN Options', 'autoptimize' ); ?></h2> |
|
349 | +<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2> |
|
350 | 350 | <table class="form-table"> |
351 | 351 | <tr valign="top"> |
352 | -<th scope="row"><?php _e( 'CDN Base URL', 'autoptimize' ); ?></th> |
|
353 | -<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url( autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url', '' ), array( 'http', 'https' ) ); ?>" /><br /> |
|
354 | -<?php _e( 'Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize' ); ?></label></td> |
|
352 | +<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th> |
|
353 | +<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(autoptimizeOptionWrapper::get_option('autoptimize_cdn_url', ''), array('http', 'https')); ?>" /><br /> |
|
354 | +<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize'); ?></label></td> |
|
355 | 355 | </tr> |
356 | 356 | </table> |
357 | 357 | </li> |
358 | 358 | |
359 | 359 | <li class="itemDetail"> |
360 | -<h2 class="itemTitle"><?php _e( 'Cache Info', 'autoptimize' ); ?></h2> |
|
360 | +<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2> |
|
361 | 361 | <table class="form-table" > |
362 | 362 | <tr valign="top" > |
363 | -<th scope="row"><?php _e( 'Cache folder', 'autoptimize' ); ?></th> |
|
364 | -<td><?php echo htmlentities( AUTOPTIMIZE_CACHE_DIR ); ?></td> |
|
363 | +<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th> |
|
364 | +<td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td> |
|
365 | 365 | </tr> |
366 | 366 | <tr valign="top" > |
367 | -<th scope="row"><?php _e( 'Can we write?', 'autoptimize' ); ?></th> |
|
368 | -<td><?php echo ( autoptimizeCache::cacheavail() ? __( 'Yes', 'autoptimize' ) : __( 'No', 'autoptimize' ) ); ?></td> |
|
367 | +<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th> |
|
368 | +<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td> |
|
369 | 369 | </tr> |
370 | 370 | <tr valign="top" > |
371 | -<th scope="row"><?php _e( 'Cached styles and scripts', 'autoptimize' ); ?></th> |
|
371 | +<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th> |
|
372 | 372 | <td> |
373 | 373 | <?php |
374 | 374 | $ao_stat_arr = autoptimizeCache::stats(); |
375 | - if ( ! empty( $ao_stat_arr ) && is_array( $ao_stat_arr ) ) { |
|
376 | - $ao_cache_size = size_format( $ao_stat_arr[1], 2 ); |
|
375 | + if (!empty($ao_stat_arr) && is_array($ao_stat_arr)) { |
|
376 | + $ao_cache_size = size_format($ao_stat_arr[1], 2); |
|
377 | 377 | $details = ''; |
378 | - if ( $ao_cache_size > 0 ) { |
|
379 | - $details = ', ~' . $ao_cache_size . ' total'; |
|
378 | + if ($ao_cache_size > 0) { |
|
379 | + $details = ', ~'.$ao_cache_size.' total'; |
|
380 | 380 | } |
381 | 381 | // translators: Kilobytes + timestamp shown. |
382 | - printf( __( '%1$s files, totalling %2$s (calculated at %3$s)', 'autoptimize' ), $ao_stat_arr[0], $ao_cache_size, date( 'H:i e', $ao_stat_arr[2] ) ); |
|
382 | + printf(__('%1$s files, totalling %2$s (calculated at %3$s)', 'autoptimize'), $ao_stat_arr[0], $ao_cache_size, date('H:i e', $ao_stat_arr[2])); |
|
383 | 383 | } |
384 | 384 | ?> |
385 | 385 | </td> |
@@ -388,41 +388,41 @@ discard block |
||
388 | 388 | </li> |
389 | 389 | |
390 | 390 | <li class="itemDetail"> |
391 | -<h2 class="itemTitle"><?php _e( 'Misc Options', 'autoptimize' ); ?></h2> |
|
391 | +<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2> |
|
392 | 392 | <table class="form-table"> |
393 | 393 | <tr valign="top" > |
394 | - <th scope="row"><?php _e( 'Save aggregated script/css as static files?', 'autoptimize' ); ?></th> |
|
395 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_cache_nogzip', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
396 | - <?php _e( 'By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize' ); ?></label></td> |
|
394 | + <th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th> |
|
395 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/> |
|
396 | + <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label></td> |
|
397 | 397 | </tr> |
398 | 398 | <?php |
399 | 399 | $_min_excl_class = ''; |
400 | - if ( ! $conf->get( 'autoptimize_css_aggregate' ) && ! $conf->get( 'autoptimize_js_aggregate' ) ) { |
|
400 | + if (!$conf->get('autoptimize_css_aggregate') && !$conf->get('autoptimize_js_aggregate')) { |
|
401 | 401 | $_min_excl_class = 'hidden'; |
402 | 402 | } |
403 | 403 | ?> |
404 | 404 | <tr valign="top" id="min_excl_row" class="<?php echo $_min_excl_class; ?>"> |
405 | - <th scope="row"><?php _e( 'Minify excluded CSS and JS files?', 'autoptimize' ); ?></th> |
|
406 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_minify_excluded', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
407 | - <?php _e( 'When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize' ); ?></label></td> |
|
405 | + <th scope="row"><?php _e('Minify excluded CSS and JS files?', 'autoptimize'); ?></th> |
|
406 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_minify_excluded', '1') ? 'checked="checked" ' : ''; ?>/> |
|
407 | + <?php _e('When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize'); ?></label></td> |
|
408 | 408 | </tr> |
409 | 409 | <tr valign="top"> |
410 | - <th scope="row"><?php _e( 'Enable 404 fallbacks?', 'autoptimize' ); ?></th> |
|
411 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_fallback" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_cache_fallback', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
412 | - <?php _e( 'Sometimes Autoptimized JS/ CSS is referenced in cached HTML but is already removed, resulting in broken sites. With this option on, Autoptimize will try to redirect those not-found files to "fallback"-versions, keeping the page/ site somewhat intact. In some cases this will require extra web-server level configuration to ensure <code>wp-content/autoptimize_404_handler.php</code> is set to handle 404\'s in <code>wp-content/cache/autoptimize</code>.', 'autoptimize' ); ?></label></td> |
|
410 | + <th scope="row"><?php _e('Enable 404 fallbacks?', 'autoptimize'); ?></th> |
|
411 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_fallback" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_cache_fallback', '1') ? 'checked="checked" ' : ''; ?>/> |
|
412 | + <?php _e('Sometimes Autoptimized JS/ CSS is referenced in cached HTML but is already removed, resulting in broken sites. With this option on, Autoptimize will try to redirect those not-found files to "fallback"-versions, keeping the page/ site somewhat intact. In some cases this will require extra web-server level configuration to ensure <code>wp-content/autoptimize_404_handler.php</code> is set to handle 404\'s in <code>wp-content/cache/autoptimize</code>.', 'autoptimize'); ?></label></td> |
|
413 | 413 | </tr> |
414 | 414 | <tr valign="top"> |
415 | - <th scope="row"><?php _e( 'Also optimize for logged in editors/ administrators?', 'autoptimize' ); ?></th> |
|
416 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_logged', '1' ) ? 'checked="checked" ' : ''; ?>/> |
|
417 | - <?php _e( 'By default Autoptimize is also active for logged on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize' ); ?></label></td> |
|
415 | + <th scope="row"><?php _e('Also optimize for logged in editors/ administrators?', 'autoptimize'); ?></th> |
|
416 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/> |
|
417 | + <?php _e('By default Autoptimize is also active for logged on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label></td> |
|
418 | 418 | </tr> |
419 | 419 | <?php |
420 | - if ( function_exists( 'is_checkout' ) || function_exists( 'is_cart' ) || function_exists( 'edd_is_checkout' ) || function_exists( 'wpsc_is_cart' ) || function_exists( 'wpsc_is_checkout' ) ) { |
|
420 | + if (function_exists('is_checkout') || function_exists('is_cart') || function_exists('edd_is_checkout') || function_exists('wpsc_is_cart') || function_exists('wpsc_is_checkout')) { |
|
421 | 421 | ?> |
422 | 422 | <tr valign="top" > |
423 | - <th scope="row"><?php _e( 'Also optimize shop cart/ checkout?', 'autoptimize' ); ?></th> |
|
424 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_checkout', '0' ) ? 'checked="checked" ' : ''; ?>/> |
|
425 | - <?php _e( 'By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize' ); ?></label> |
|
423 | + <th scope="row"><?php _e('Also optimize shop cart/ checkout?', 'autoptimize'); ?></th> |
|
424 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_optimize_checkout', '0') ? 'checked="checked" ' : ''; ?>/> |
|
425 | + <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize'); ?></label> |
|
426 | 426 | </td> |
427 | 427 | </tr> |
428 | 428 | <?php } ?> |
@@ -432,8 +432,8 @@ discard block |
||
432 | 432 | </ul> |
433 | 433 | |
434 | 434 | <p class="submit"> |
435 | -<input type="submit" class="button-secondary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /> |
|
436 | -<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e( 'Save Changes and Empty Cache', 'autoptimize' ); ?>" /> |
|
435 | +<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /> |
|
436 | +<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize'); ?>" /> |
|
437 | 437 | </p> |
438 | 438 | |
439 | 439 | </form> |
@@ -442,46 +442,46 @@ discard block |
||
442 | 442 | <div class="autoptimize_banner hidden"> |
443 | 443 | <ul> |
444 | 444 | <?php |
445 | - if ( $this->settings_screen_do_remote_http ) { |
|
446 | - $ao_banner = get_transient( 'autoptimize_banner' ); |
|
447 | - if ( empty( $ao_banner ) ) { |
|
448 | - $banner_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver=' . AUTOPTIMIZE_PLUGIN_VERSION ); |
|
449 | - if ( ! is_wp_error( $banner_resp ) ) { |
|
450 | - if ( '200' == wp_remote_retrieve_response_code( $banner_resp ) ) { |
|
451 | - $ao_banner = wp_kses_post( wp_remote_retrieve_body( $banner_resp ) ); |
|
452 | - set_transient( 'autoptimize_banner', $ao_banner, WEEK_IN_SECONDS ); |
|
445 | + if ($this->settings_screen_do_remote_http) { |
|
446 | + $ao_banner = get_transient('autoptimize_banner'); |
|
447 | + if (empty($ao_banner)) { |
|
448 | + $banner_resp = wp_remote_get('https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION); |
|
449 | + if (!is_wp_error($banner_resp)) { |
|
450 | + if ('200' == wp_remote_retrieve_response_code($banner_resp)) { |
|
451 | + $ao_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp)); |
|
452 | + set_transient('autoptimize_banner', $ao_banner, WEEK_IN_SECONDS); |
|
453 | 453 | } |
454 | 454 | } |
455 | 455 | } |
456 | 456 | echo $ao_banner; |
457 | 457 | } |
458 | 458 | ?> |
459 | - <li><?php _e( "Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", 'autoptimize' ); ?></li> |
|
460 | - <li><?php _e( 'Happy with Autoptimize?', 'autoptimize' ); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e( 'Try my other plugins!', 'autoptimize' ); ?></a></li> |
|
459 | + <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", 'autoptimize'); ?></li> |
|
460 | + <li><?php _e('Happy with Autoptimize?', 'autoptimize'); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e('Try my other plugins!', 'autoptimize'); ?></a></li> |
|
461 | 461 | </ul> |
462 | 462 | </div> |
463 | 463 | <div style="margin-left:10px;margin-top:-5px;"> |
464 | 464 | <h2> |
465 | - <?php _e( 'futtta about', 'autoptimize' ); ?> |
|
465 | + <?php _e('futtta about', 'autoptimize'); ?> |
|
466 | 466 | <select id="feed_dropdown" > |
467 | - <option value="1"><?php _e( 'Autoptimize', 'autoptimize' ); ?></option> |
|
468 | - <option value="2"><?php _e( 'WordPress', 'autoptimize' ); ?></option> |
|
469 | - <option value="3"><?php _e( 'Web Technology', 'autoptimize' ); ?></option> |
|
467 | + <option value="1"><?php _e('Autoptimize', 'autoptimize'); ?></option> |
|
468 | + <option value="2"><?php _e('WordPress', 'autoptimize'); ?></option> |
|
469 | + <option value="3"><?php _e('Web Technology', 'autoptimize'); ?></option> |
|
470 | 470 | </select> |
471 | 471 | </h2> |
472 | 472 | <div id="futtta_feed"> |
473 | 473 | <div id="autoptimizefeed"> |
474 | - <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_autoptimize' ); ?> |
|
474 | + <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_autoptimize'); ?> |
|
475 | 475 | </div> |
476 | 476 | <div id="wordpressfeed"> |
477 | - <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_wordpress' ); ?> |
|
477 | + <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_wordpress'); ?> |
|
478 | 478 | </div> |
479 | 479 | <div id="webtechfeed"> |
480 | - <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_webtech' ); ?> |
|
480 | + <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_webtech'); ?> |
|
481 | 481 | </div> |
482 | 482 | </div> |
483 | 483 | </div> |
484 | - <div style="float:right;margin:50px 15px;"><a href="https://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url() . '/' . plugin_basename( dirname( __FILE__ ) ) . '/external/do_not_donate_smallest.png'; ?>" title="<?php _e( 'Do not donate for this plugin!', 'autoptimize' ); ?>"></a></div> |
|
484 | + <div style="float:right;margin:50px 15px;"><a href="https://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e('Do not donate for this plugin!', 'autoptimize'); ?>"></a></div> |
|
485 | 485 | </div> |
486 | 486 | |
487 | 487 | <script type="text/javascript"> |
@@ -630,81 +630,81 @@ discard block |
||
630 | 630 | |
631 | 631 | public function addmenu() |
632 | 632 | { |
633 | - if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) { |
|
633 | + if (is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) { |
|
634 | 634 | // multisite, network admin, ao network activated: add normal settings page at network level. |
635 | - $hook = add_submenu_page( 'settings.php', __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show_config' ) ); |
|
636 | - } elseif ( is_multisite() && ! is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) { |
|
635 | + $hook = add_submenu_page('settings.php', __('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_network_options', 'autoptimize', array($this, 'show_config')); |
|
636 | + } elseif (is_multisite() && !is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config')) { |
|
637 | 637 | // multisite, ao network activated, not network admin so site specific settings, but "autoptimize_enable_site_config" is off: show "sorry, ask network admin" message iso options. |
638 | - $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_network_message' ) ); |
|
638 | + $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_network_message')); |
|
639 | 639 | } else { |
640 | 640 | // default: show normal options page if not multisite, if multisite but not network activated, if multisite and network activated and "autoptimize_enable_site_config" is on. |
641 | - $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_config' ) ); |
|
641 | + $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_config')); |
|
642 | 642 | } |
643 | 643 | |
644 | - add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) ); |
|
645 | - add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) ); |
|
644 | + add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts')); |
|
645 | + add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles')); |
|
646 | 646 | } |
647 | 647 | |
648 | 648 | public function autoptimize_admin_scripts() |
649 | 649 | { |
650 | - wp_enqueue_script( 'jqcookie', plugins_url( '/external/js/jquery.cookie.min.js', __FILE__ ), array( 'jquery' ), null, true ); |
|
651 | - wp_enqueue_script( 'unslider', plugins_url( '/external/js/unslider-min.js', __FILE__ ), array( 'jquery' ), null, true ); |
|
650 | + wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true); |
|
651 | + wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true); |
|
652 | 652 | } |
653 | 653 | |
654 | 654 | public function autoptimize_admin_styles() |
655 | 655 | { |
656 | - wp_enqueue_style( 'unslider', plugins_url( '/external/js/unslider.css', __FILE__ ) ); |
|
657 | - wp_enqueue_style( 'unslider-dots', plugins_url( '/external/js/unslider-dots.css', __FILE__ ) ); |
|
656 | + wp_enqueue_style('unslider', plugins_url('/external/js/unslider.css', __FILE__)); |
|
657 | + wp_enqueue_style('unslider-dots', plugins_url('/external/js/unslider-dots.css', __FILE__)); |
|
658 | 658 | } |
659 | 659 | |
660 | 660 | public function registersettings() { |
661 | - register_setting( 'autoptimize', 'autoptimize_html' ); |
|
662 | - register_setting( 'autoptimize', 'autoptimize_html_keepcomments' ); |
|
663 | - register_setting( 'autoptimize', 'autoptimize_enable_site_config' ); |
|
664 | - register_setting( 'autoptimize', 'autoptimize_js' ); |
|
665 | - register_setting( 'autoptimize', 'autoptimize_js_aggregate' ); |
|
666 | - register_setting( 'autoptimize', 'autoptimize_js_exclude' ); |
|
667 | - register_setting( 'autoptimize', 'autoptimize_js_trycatch' ); |
|
668 | - register_setting( 'autoptimize', 'autoptimize_js_justhead' ); |
|
669 | - register_setting( 'autoptimize', 'autoptimize_js_forcehead' ); |
|
670 | - register_setting( 'autoptimize', 'autoptimize_js_include_inline' ); |
|
671 | - register_setting( 'autoptimize', 'autoptimize_css' ); |
|
672 | - register_setting( 'autoptimize', 'autoptimize_css_aggregate' ); |
|
673 | - register_setting( 'autoptimize', 'autoptimize_css_exclude' ); |
|
674 | - register_setting( 'autoptimize', 'autoptimize_css_justhead' ); |
|
675 | - register_setting( 'autoptimize', 'autoptimize_css_datauris' ); |
|
676 | - register_setting( 'autoptimize', 'autoptimize_css_defer' ); |
|
677 | - register_setting( 'autoptimize', 'autoptimize_css_defer_inline' ); |
|
678 | - register_setting( 'autoptimize', 'autoptimize_css_inline' ); |
|
679 | - register_setting( 'autoptimize', 'autoptimize_css_include_inline' ); |
|
680 | - register_setting( 'autoptimize', 'autoptimize_cdn_url' ); |
|
681 | - register_setting( 'autoptimize', 'autoptimize_cache_clean' ); |
|
682 | - register_setting( 'autoptimize', 'autoptimize_cache_nogzip' ); |
|
683 | - register_setting( 'autoptimize', 'autoptimize_optimize_logged' ); |
|
684 | - register_setting( 'autoptimize', 'autoptimize_optimize_checkout' ); |
|
685 | - register_setting( 'autoptimize', 'autoptimize_minify_excluded' ); |
|
686 | - register_setting( 'autoptimize', 'autoptimize_cache_fallback' ); |
|
661 | + register_setting('autoptimize', 'autoptimize_html'); |
|
662 | + register_setting('autoptimize', 'autoptimize_html_keepcomments'); |
|
663 | + register_setting('autoptimize', 'autoptimize_enable_site_config'); |
|
664 | + register_setting('autoptimize', 'autoptimize_js'); |
|
665 | + register_setting('autoptimize', 'autoptimize_js_aggregate'); |
|
666 | + register_setting('autoptimize', 'autoptimize_js_exclude'); |
|
667 | + register_setting('autoptimize', 'autoptimize_js_trycatch'); |
|
668 | + register_setting('autoptimize', 'autoptimize_js_justhead'); |
|
669 | + register_setting('autoptimize', 'autoptimize_js_forcehead'); |
|
670 | + register_setting('autoptimize', 'autoptimize_js_include_inline'); |
|
671 | + register_setting('autoptimize', 'autoptimize_css'); |
|
672 | + register_setting('autoptimize', 'autoptimize_css_aggregate'); |
|
673 | + register_setting('autoptimize', 'autoptimize_css_exclude'); |
|
674 | + register_setting('autoptimize', 'autoptimize_css_justhead'); |
|
675 | + register_setting('autoptimize', 'autoptimize_css_datauris'); |
|
676 | + register_setting('autoptimize', 'autoptimize_css_defer'); |
|
677 | + register_setting('autoptimize', 'autoptimize_css_defer_inline'); |
|
678 | + register_setting('autoptimize', 'autoptimize_css_inline'); |
|
679 | + register_setting('autoptimize', 'autoptimize_css_include_inline'); |
|
680 | + register_setting('autoptimize', 'autoptimize_cdn_url'); |
|
681 | + register_setting('autoptimize', 'autoptimize_cache_clean'); |
|
682 | + register_setting('autoptimize', 'autoptimize_cache_nogzip'); |
|
683 | + register_setting('autoptimize', 'autoptimize_optimize_logged'); |
|
684 | + register_setting('autoptimize', 'autoptimize_optimize_checkout'); |
|
685 | + register_setting('autoptimize', 'autoptimize_minify_excluded'); |
|
686 | + register_setting('autoptimize', 'autoptimize_cache_fallback'); |
|
687 | 687 | } |
688 | 688 | |
689 | - public function setmeta( $links, $file = null ) |
|
689 | + public function setmeta($links, $file = null) |
|
690 | 690 | { |
691 | 691 | // Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/. |
692 | 692 | // Do it only once - saves time. |
693 | 693 | static $plugin; |
694 | - if ( empty( $plugin ) ) { |
|
695 | - $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' ); |
|
694 | + if (empty($plugin)) { |
|
695 | + $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
|
696 | 696 | } |
697 | 697 | |
698 | - if ( null === $file ) { |
|
698 | + if (null === $file) { |
|
699 | 699 | // 2.7 and lower. |
700 | - $settings_link = sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) ); |
|
701 | - array_unshift( $links, $settings_link ); |
|
700 | + $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')); |
|
701 | + array_unshift($links, $settings_link); |
|
702 | 702 | } else { |
703 | 703 | // 2.8 and higher. |
704 | 704 | // If it's us, add the link. |
705 | - if ( $file === $plugin ) { |
|
706 | - $newlink = array( sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) ) ); |
|
707 | - $links = array_merge( $links, $newlink ); |
|
705 | + if ($file === $plugin) { |
|
706 | + $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'))); |
|
707 | + $links = array_merge($links, $newlink); |
|
708 | 708 | } |
709 | 709 | } |
710 | 710 | |
@@ -780,7 +780,7 @@ discard block |
||
780 | 780 | 'autoptimize_imgopt_select_field_2' => '2', // quality glossy. |
781 | 781 | 'autoptimize_imgopt_checkbox_field_3' => '0', // lazy load off. |
782 | 782 | 'autoptimize_imgopt_checkbox_field_4' => '0', // webp off (might be removed). |
783 | - 'autoptimize_imgopt_text_field_5' => '', // lazy load exclusions empty. |
|
783 | + 'autoptimize_imgopt_text_field_5' => '', // lazy load exclusions empty. |
|
784 | 784 | ); |
785 | 785 | return $defaults; |
786 | 786 | } |
@@ -792,58 +792,58 @@ discard block |
||
792 | 792 | * |
793 | 793 | * @return string |
794 | 794 | */ |
795 | - public static function get_ao_css_preload_onload( $media = 'all' ) |
|
795 | + public static function get_ao_css_preload_onload($media = 'all') |
|
796 | 796 | { |
797 | - $preload_onload = apply_filters( 'autoptimize_filter_css_preload_onload', "this.onload=null;this.media='" . $media . "';" ); |
|
797 | + $preload_onload = apply_filters('autoptimize_filter_css_preload_onload', "this.onload=null;this.media='".$media."';"); |
|
798 | 798 | return $preload_onload; |
799 | 799 | } |
800 | 800 | |
801 | - public function get( $key ) |
|
801 | + public function get($key) |
|
802 | 802 | { |
803 | - if ( ! is_array( $this->config ) ) { |
|
803 | + if (!is_array($this->config)) { |
|
804 | 804 | // Default config. |
805 | 805 | $config = self::get_defaults(); |
806 | 806 | |
807 | 807 | // Override with user settings. |
808 | - foreach ( array_keys( $config ) as $name ) { |
|
809 | - $conf = autoptimizeOptionWrapper::get_option( $name ); |
|
810 | - if ( false !== $conf ) { |
|
808 | + foreach (array_keys($config) as $name) { |
|
809 | + $conf = autoptimizeOptionWrapper::get_option($name); |
|
810 | + if (false !== $conf) { |
|
811 | 811 | // It was set before! |
812 | - $config[ $name ] = $conf; |
|
812 | + $config[$name] = $conf; |
|
813 | 813 | } |
814 | 814 | } |
815 | 815 | |
816 | 816 | // Save for next call. |
817 | - $this->config = apply_filters( 'autoptimize_filter_get_config', $config ); |
|
817 | + $this->config = apply_filters('autoptimize_filter_get_config', $config); |
|
818 | 818 | } |
819 | 819 | |
820 | - if ( isset( $this->config[ $key ] ) ) { |
|
821 | - return $this->config[ $key ]; |
|
820 | + if (isset($this->config[$key])) { |
|
821 | + return $this->config[$key]; |
|
822 | 822 | } |
823 | 823 | |
824 | 824 | return false; |
825 | 825 | } |
826 | 826 | |
827 | - private function get_futtta_feeds( $url ) { |
|
828 | - if ( $this->settings_screen_do_remote_http ) { |
|
829 | - $rss = fetch_feed( $url ); |
|
827 | + private function get_futtta_feeds($url) { |
|
828 | + if ($this->settings_screen_do_remote_http) { |
|
829 | + $rss = fetch_feed($url); |
|
830 | 830 | $maxitems = 0; |
831 | 831 | |
832 | - if ( ! is_wp_error( $rss ) ) { |
|
833 | - $maxitems = $rss->get_item_quantity( 7 ); |
|
834 | - $rss_items = $rss->get_items( 0, $maxitems ); |
|
832 | + if (!is_wp_error($rss)) { |
|
833 | + $maxitems = $rss->get_item_quantity(7); |
|
834 | + $rss_items = $rss->get_items(0, $maxitems); |
|
835 | 835 | } |
836 | 836 | ?> |
837 | 837 | <ul> |
838 | - <?php if ( 0 == $maxitems ) : ?> |
|
839 | - <li><?php _e( 'No items', 'autoptimize' ); ?></li> |
|
838 | + <?php if (0 == $maxitems) : ?> |
|
839 | + <li><?php _e('No items', 'autoptimize'); ?></li> |
|
840 | 840 | <?php else : ?> |
841 | - <?php foreach ( $rss_items as $item ) : ?> |
|
841 | + <?php foreach ($rss_items as $item) : ?> |
|
842 | 842 | <li> |
843 | - <a href="<?php echo esc_url( $item->get_permalink() ); ?>" |
|
843 | + <a href="<?php echo esc_url($item->get_permalink()); ?>" |
|
844 | 844 | <?php // translators: the variable contains a date. ?> |
845 | - title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date( 'j F Y | g:i a' ) ); ?>"> |
|
846 | - <?php echo esc_html( $item->get_title() ); ?> |
|
845 | + title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>"> |
|
846 | + <?php echo esc_html($item->get_title()); ?> |
|
847 | 847 | </a> |
848 | 848 | </li> |
849 | 849 | <?php endforeach; ?> |
@@ -856,23 +856,23 @@ discard block |
||
856 | 856 | static function ao_admin_tabs() |
857 | 857 | { |
858 | 858 | // based on http://wordpress.stackexchange.com/a/58826 . |
859 | - $tabs = apply_filters( 'autoptimize_filter_settingsscreen_tabs', array( 'autoptimize' => __( 'JS, CSS & HTML', 'autoptimize' ) ) ); |
|
859 | + $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('JS, CSS & HTML', 'autoptimize'))); |
|
860 | 860 | $tab_content = ''; |
861 | - $tabs_count = count( $tabs ); |
|
862 | - if ( $tabs_count > 1 ) { |
|
863 | - if ( isset( $_GET['page'] ) ) { |
|
861 | + $tabs_count = count($tabs); |
|
862 | + if ($tabs_count > 1) { |
|
863 | + if (isset($_GET['page'])) { |
|
864 | 864 | $current_id = $_GET['page']; |
865 | 865 | } else { |
866 | 866 | $current_id = 'autoptimize'; |
867 | 867 | } |
868 | 868 | $tab_content .= '<h2 class="nav-tab-wrapper">'; |
869 | - foreach ( $tabs as $tab_id => $tab_name ) { |
|
870 | - if ( $current_id == $tab_id ) { |
|
869 | + foreach ($tabs as $tab_id => $tab_name) { |
|
870 | + if ($current_id == $tab_id) { |
|
871 | 871 | $class = ' nav-tab-active'; |
872 | 872 | } else { |
873 | 873 | $class = ''; |
874 | 874 | } |
875 | - $tab_content .= '<a class="nav-tab' . $class . '" href="?page=' . $tab_id . '">' . $tab_name . '</a>'; |
|
875 | + $tab_content .= '<a class="nav-tab'.$class.'" href="?page='.$tab_id.'">'.$tab_name.'</a>'; |
|
876 | 876 | } |
877 | 877 | $tab_content .= '</h2>'; |
878 | 878 | } else { |
@@ -889,7 +889,7 @@ discard block |
||
889 | 889 | */ |
890 | 890 | public static function is_admin_and_not_ajax() |
891 | 891 | { |
892 | - return ( is_admin() && ! self::doing_ajax() ); |
|
892 | + return (is_admin() && !self::doing_ajax()); |
|
893 | 893 | } |
894 | 894 | |
895 | 895 | /** |
@@ -899,10 +899,10 @@ discard block |
||
899 | 899 | */ |
900 | 900 | protected static function doing_ajax() |
901 | 901 | { |
902 | - if ( function_exists( 'wp_doing_ajax' ) ) { |
|
902 | + if (function_exists('wp_doing_ajax')) { |
|
903 | 903 | return wp_doing_ajax(); |
904 | 904 | } |
905 | - return ( defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
905 | + return (defined('DOING_AJAX') && DOING_AJAX); |
|
906 | 906 | } |
907 | 907 | |
908 | 908 | /** |
@@ -911,7 +911,7 @@ discard block |
||
911 | 911 | * @return bool |
912 | 912 | */ |
913 | 913 | public static function should_show_menu_tabs() { |
914 | - if ( ! is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) { |
|
914 | + if (!is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config')) { |
|
915 | 915 | return true; |
916 | 916 | } else { |
917 | 917 | return false; |
@@ -296,7 +296,7 @@ |
||
296 | 296 | * |
297 | 297 | * @param bool $doing_tests Allows overriding the optimization of only |
298 | 298 | * deciding once per request (for use in tests). |
299 | - * @return bool |
|
299 | + * @return boolean|null |
|
300 | 300 | */ |
301 | 301 | public static function should_buffer( $doing_tests = false ) |
302 | 302 | { |
@@ -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,102 +50,102 @@ discard block |
||
50 | 50 | |
51 | 51 | protected function add_hooks() |
52 | 52 | { |
53 | - if ( ! defined( 'AUTOPTIMIZE_SETUP_INITHOOK' ) ) { |
|
54 | - define( 'AUTOPTIMIZE_SETUP_INITHOOK', 'plugins_loaded' ); |
|
53 | + if (!defined('AUTOPTIMIZE_SETUP_INITHOOK')) { |
|
54 | + define('AUTOPTIMIZE_SETUP_INITHOOK', 'plugins_loaded'); |
|
55 | 55 | } |
56 | 56 | |
57 | - add_action( AUTOPTIMIZE_SETUP_INITHOOK, array( $this, 'setup' ) ); |
|
58 | - add_action( AUTOPTIMIZE_SETUP_INITHOOK, array( $this, 'hook_page_cache_purge' ) ); |
|
57 | + add_action(AUTOPTIMIZE_SETUP_INITHOOK, array($this, 'setup')); |
|
58 | + add_action(AUTOPTIMIZE_SETUP_INITHOOK, array($this, 'hook_page_cache_purge')); |
|
59 | 59 | |
60 | - add_action( 'autoptimize_setup_done', array( $this, 'version_upgrades_check' ) ); |
|
61 | - add_action( 'autoptimize_setup_done', array( $this, 'check_cache_and_run' ) ); |
|
62 | - add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_ao_extra' ), 15 ); |
|
63 | - add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_partners_tab' ), 20 ); |
|
64 | - add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_criticalcss' ), 11 ); |
|
65 | - add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_notfound_fallback' ), 10 ); |
|
60 | + add_action('autoptimize_setup_done', array($this, 'version_upgrades_check')); |
|
61 | + add_action('autoptimize_setup_done', array($this, 'check_cache_and_run')); |
|
62 | + add_action('autoptimize_setup_done', array($this, 'maybe_run_ao_extra'), 15); |
|
63 | + add_action('autoptimize_setup_done', array($this, 'maybe_run_partners_tab'), 20); |
|
64 | + add_action('autoptimize_setup_done', array($this, 'maybe_run_criticalcss'), 11); |
|
65 | + add_action('autoptimize_setup_done', array($this, 'maybe_run_notfound_fallback'), 10); |
|
66 | 66 | |
67 | - add_action( 'init', array( $this, 'load_textdomain' ) ); |
|
68 | - add_action( 'admin_init', array( 'PAnD', 'init' ) ); |
|
67 | + add_action('init', array($this, 'load_textdomain')); |
|
68 | + add_action('admin_init', array('PAnD', 'init')); |
|
69 | 69 | |
70 | - if ( is_multisite() && is_admin() ) { |
|
70 | + if (is_multisite() && is_admin()) { |
|
71 | 71 | // Only if multisite and if in admin we want to check if we need to save options on network level. |
72 | - add_action( 'init', 'autoptimizeOptionWrapper::check_multisite_on_saving_options' ); |
|
72 | + add_action('init', 'autoptimizeOptionWrapper::check_multisite_on_saving_options'); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | // register uninstall & deactivation hooks. |
76 | - register_uninstall_hook( $this->filepath, 'autoptimizeMain::on_uninstall' ); |
|
77 | - register_deactivation_hook( $this->filepath, 'autoptimizeMain::on_deactivation' ); |
|
76 | + register_uninstall_hook($this->filepath, 'autoptimizeMain::on_uninstall'); |
|
77 | + register_deactivation_hook($this->filepath, 'autoptimizeMain::on_deactivation'); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | public function load_textdomain() |
81 | 81 | { |
82 | - load_plugin_textdomain( 'autoptimize' ); |
|
82 | + load_plugin_textdomain('autoptimize'); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | public function setup() |
86 | 86 | { |
87 | 87 | // Do we gzip in php when caching or is the webserver doing it? |
88 | - define( 'AUTOPTIMIZE_CACHE_NOGZIP', (bool) autoptimizeOptionWrapper::get_option( 'autoptimize_cache_nogzip' ) ); |
|
88 | + define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) autoptimizeOptionWrapper::get_option('autoptimize_cache_nogzip')); |
|
89 | 89 | |
90 | 90 | // These can be overridden by specifying them in wp-config.php or such. |
91 | - if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_NAME' ) ) { |
|
92 | - define( 'AUTOPTIMIZE_WP_CONTENT_NAME', '/' . wp_basename( WP_CONTENT_DIR ) ); |
|
91 | + if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { |
|
92 | + define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); |
|
93 | 93 | } |
94 | - if ( ! defined( 'AUTOPTIMIZE_CACHE_CHILD_DIR' ) ) { |
|
95 | - define( 'AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/' ); |
|
94 | + if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { |
|
95 | + define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); |
|
96 | 96 | } |
97 | - if ( ! defined( 'AUTOPTIMIZE_CACHEFILE_PREFIX' ) ) { |
|
98 | - define( 'AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_' ); |
|
97 | + if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { |
|
98 | + define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); |
|
99 | 99 | } |
100 | 100 | // Note: trailing slash is not optional! |
101 | - if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) { |
|
102 | - define( 'AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname() ); |
|
101 | + if (!defined('AUTOPTIMIZE_CACHE_DIR')) { |
|
102 | + define('AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname()); |
|
103 | 103 | } |
104 | 104 | |
105 | - define( 'WP_ROOT_DIR', substr( WP_CONTENT_DIR, 0, strlen( WP_CONTENT_DIR ) - strlen( AUTOPTIMIZE_WP_CONTENT_NAME ) ) ); |
|
105 | + define('WP_ROOT_DIR', substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR) - strlen(AUTOPTIMIZE_WP_CONTENT_NAME))); |
|
106 | 106 | |
107 | - if ( ! defined( 'AUTOPTIMIZE_WP_SITE_URL' ) ) { |
|
108 | - if ( function_exists( 'domain_mapping_siteurl' ) ) { |
|
109 | - define( 'AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl( get_current_blog_id() ) ); |
|
107 | + if (!defined('AUTOPTIMIZE_WP_SITE_URL')) { |
|
108 | + if (function_exists('domain_mapping_siteurl')) { |
|
109 | + define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id())); |
|
110 | 110 | } else { |
111 | - define( 'AUTOPTIMIZE_WP_SITE_URL', site_url() ); |
|
111 | + define('AUTOPTIMIZE_WP_SITE_URL', site_url()); |
|
112 | 112 | } |
113 | 113 | } |
114 | - if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_URL' ) ) { |
|
115 | - if ( function_exists( 'get_original_url' ) ) { |
|
116 | - define( 'AUTOPTIMIZE_WP_CONTENT_URL', str_replace( get_original_url( AUTOPTIMIZE_WP_SITE_URL ), AUTOPTIMIZE_WP_SITE_URL, content_url() ) ); |
|
114 | + if (!defined('AUTOPTIMIZE_WP_CONTENT_URL')) { |
|
115 | + if (function_exists('get_original_url')) { |
|
116 | + define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url())); |
|
117 | 117 | } else { |
118 | - define( 'AUTOPTIMIZE_WP_CONTENT_URL', content_url() ); |
|
118 | + define('AUTOPTIMIZE_WP_CONTENT_URL', content_url()); |
|
119 | 119 | } |
120 | 120 | } |
121 | - if ( ! defined( 'AUTOPTIMIZE_CACHE_URL' ) ) { |
|
122 | - if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) { |
|
121 | + if (!defined('AUTOPTIMIZE_CACHE_URL')) { |
|
122 | + if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
123 | 123 | $blog_id = get_current_blog_id(); |
124 | - define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR . $blog_id . '/' ); |
|
124 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
125 | 125 | } else { |
126 | - define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR ); |
|
126 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
127 | 127 | } |
128 | 128 | } |
129 | - if ( ! defined( 'AUTOPTIMIZE_WP_ROOT_URL' ) ) { |
|
130 | - define( 'AUTOPTIMIZE_WP_ROOT_URL', str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL ) ); |
|
129 | + if (!defined('AUTOPTIMIZE_WP_ROOT_URL')) { |
|
130 | + define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL)); |
|
131 | 131 | } |
132 | - if ( ! defined( 'AUTOPTIMIZE_HASH' ) ) { |
|
133 | - define( 'AUTOPTIMIZE_HASH', wp_hash( AUTOPTIMIZE_CACHE_URL ) ); |
|
132 | + if (!defined('AUTOPTIMIZE_HASH')) { |
|
133 | + define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_URL)); |
|
134 | 134 | } |
135 | - if ( ! defined( 'AUTOPTIMIZE_SITE_DOMAIN' ) ) { |
|
136 | - define( 'AUTOPTIMIZE_SITE_DOMAIN', parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) ); |
|
135 | + if (!defined('AUTOPTIMIZE_SITE_DOMAIN')) { |
|
136 | + define('AUTOPTIMIZE_SITE_DOMAIN', parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | // Multibyte-capable string replacements are available with a filter. |
140 | 140 | // Also requires 'mbstring' extension. |
141 | - $with_mbstring = apply_filters( 'autoptimize_filter_main_use_mbstring', false ); |
|
142 | - if ( $with_mbstring ) { |
|
143 | - autoptimizeUtils::mbstring_available( \extension_loaded( 'mbstring' ) ); |
|
141 | + $with_mbstring = apply_filters('autoptimize_filter_main_use_mbstring', false); |
|
142 | + if ($with_mbstring) { |
|
143 | + autoptimizeUtils::mbstring_available(\extension_loaded('mbstring')); |
|
144 | 144 | } else { |
145 | - autoptimizeUtils::mbstring_available( false ); |
|
145 | + autoptimizeUtils::mbstring_available(false); |
|
146 | 146 | } |
147 | 147 | |
148 | - do_action( 'autoptimize_setup_done' ); |
|
148 | + do_action('autoptimize_setup_done'); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
@@ -155,61 +155,61 @@ discard block |
||
155 | 155 | */ |
156 | 156 | public function version_upgrades_check() |
157 | 157 | { |
158 | - autoptimizeVersionUpdatesHandler::check_installed_and_update( $this->version ); |
|
158 | + autoptimizeVersionUpdatesHandler::check_installed_and_update($this->version); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | public function check_cache_and_run() |
162 | 162 | { |
163 | - if ( autoptimizeCache::cacheavail() ) { |
|
163 | + if (autoptimizeCache::cacheavail()) { |
|
164 | 164 | $conf = autoptimizeConfig::instance(); |
165 | - if ( $conf->get( 'autoptimize_html' ) || $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) || autoptimizeImages::imgopt_active() || autoptimizeImages::should_lazyload_wrapper() ) { |
|
166 | - if ( ! defined( 'AUTOPTIMIZE_NOBUFFER_OPTIMIZE' ) ) { |
|
165 | + if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') || autoptimizeImages::imgopt_active() || autoptimizeImages::should_lazyload_wrapper()) { |
|
166 | + if (!defined('AUTOPTIMIZE_NOBUFFER_OPTIMIZE')) { |
|
167 | 167 | // Hook into WordPress frontend. |
168 | - if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) { |
|
168 | + if (defined('AUTOPTIMIZE_INIT_EARLIER')) { |
|
169 | 169 | add_action( |
170 | 170 | 'init', |
171 | - array( $this, 'start_buffering' ), |
|
171 | + array($this, 'start_buffering'), |
|
172 | 172 | self::INIT_EARLIER_PRIORITY |
173 | 173 | ); |
174 | 174 | } else { |
175 | - if ( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) ) { |
|
176 | - define( 'AUTOPTIMIZE_HOOK_INTO', 'template_redirect' ); |
|
175 | + if (!defined('AUTOPTIMIZE_HOOK_INTO')) { |
|
176 | + define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); |
|
177 | 177 | } |
178 | 178 | add_action( |
179 | - constant( 'AUTOPTIMIZE_HOOK_INTO' ), |
|
180 | - array( $this, 'start_buffering' ), |
|
179 | + constant('AUTOPTIMIZE_HOOK_INTO'), |
|
180 | + array($this, 'start_buffering'), |
|
181 | 181 | self::DEFAULT_HOOK_PRIORITY |
182 | 182 | ); |
183 | 183 | } |
184 | 184 | } |
185 | 185 | |
186 | 186 | // And disable Jetpack's site accelerator if JS or CSS opt. are active. |
187 | - if ( class_exists( 'Jetpack' ) && apply_filters( 'autoptimize_filter_main_disable_jetpack_cdn', true ) && ( $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) ) ) { |
|
188 | - add_filter( 'jetpack_force_disable_site_accelerator', '__return_true' ); |
|
187 | + if (class_exists('Jetpack') && apply_filters('autoptimize_filter_main_disable_jetpack_cdn', true) && ($conf->get('autoptimize_js') || $conf->get('autoptimize_css'))) { |
|
188 | + add_filter('jetpack_force_disable_site_accelerator', '__return_true'); |
|
189 | 189 | } |
190 | 190 | } |
191 | 191 | } else { |
192 | - add_action( 'admin_notices', 'autoptimizeMain::notice_cache_unavailable' ); |
|
192 | + add_action('admin_notices', 'autoptimizeMain::notice_cache_unavailable'); |
|
193 | 193 | } |
194 | 194 | } |
195 | 195 | |
196 | 196 | public function maybe_run_ao_extra() |
197 | 197 | { |
198 | - if ( apply_filters( 'autoptimize_filter_extra_activate', true ) ) { |
|
198 | + if (apply_filters('autoptimize_filter_extra_activate', true)) { |
|
199 | 199 | $ao_imgopt = new autoptimizeImages(); |
200 | 200 | $ao_imgopt->run(); |
201 | 201 | $ao_extra = new autoptimizeExtra(); |
202 | 202 | $ao_extra->run(); |
203 | 203 | |
204 | 204 | // And show the imgopt notice. |
205 | - add_action( 'admin_notices', 'autoptimizeMain::notice_plug_imgopt' ); |
|
205 | + add_action('admin_notices', 'autoptimizeMain::notice_plug_imgopt'); |
|
206 | 206 | } |
207 | 207 | } |
208 | 208 | |
209 | 209 | public function maybe_run_partners_tab() |
210 | 210 | { |
211 | 211 | // Loads partners tab code if in admin (and not in admin-ajax.php)! |
212 | - if ( autoptimizeConfig::is_admin_and_not_ajax() ) { |
|
212 | + if (autoptimizeConfig::is_admin_and_not_ajax()) { |
|
213 | 213 | new autoptimizePartners(); |
214 | 214 | } |
215 | 215 | } |
@@ -217,22 +217,22 @@ discard block |
||
217 | 217 | public function maybe_run_criticalcss() |
218 | 218 | { |
219 | 219 | // Loads criticalcss if the power-up is not active and if the filter returns true. |
220 | - if ( apply_filters( 'autoptimize_filter_criticalcss_active', true ) && ! autoptimizeUtils::is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) { |
|
220 | + if (apply_filters('autoptimize_filter_criticalcss_active', true) && !autoptimizeUtils::is_plugin_active('autoptimize-criticalcss/ao_criticss_aas.php')) { |
|
221 | 221 | new autoptimizeCriticalCSSBase(); |
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
225 | 225 | public function maybe_run_notfound_fallback() |
226 | 226 | { |
227 | - if ( autoptimizeCache::do_fallback() ) { |
|
228 | - add_action( 'template_redirect', array( 'autoptimizeCache', 'wordpress_notfound_fallback' ) ); |
|
227 | + if (autoptimizeCache::do_fallback()) { |
|
228 | + add_action('template_redirect', array('autoptimizeCache', 'wordpress_notfound_fallback')); |
|
229 | 229 | } |
230 | 230 | } |
231 | 231 | |
232 | 232 | public function hook_page_cache_purge() |
233 | 233 | { |
234 | 234 | // hook into a collection of page cache purge actions if filter allows. |
235 | - if ( apply_filters( 'autoptimize_filter_main_hookpagecachepurge', true ) ) { |
|
235 | + if (apply_filters('autoptimize_filter_main_hookpagecachepurge', true)) { |
|
236 | 236 | $page_cache_purge_actions = array( |
237 | 237 | 'after_rocket_clean_domain', // exists. |
238 | 238 | 'hyper_cache_purged', // Stefano confirmed this will be added. |
@@ -247,9 +247,9 @@ discard block |
||
247 | 247 | 'wpo_cache_flush', // wp-optimize. |
248 | 248 | 'rt_nginx_helper_after_fastcgi_purge_all', // nginx helper. |
249 | 249 | ); |
250 | - $page_cache_purge_actions = apply_filters( 'autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions ); |
|
251 | - foreach ( $page_cache_purge_actions as $purge_action ) { |
|
252 | - add_action( $purge_action, 'autoptimizeCache::clearall_actionless' ); |
|
250 | + $page_cache_purge_actions = apply_filters('autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions); |
|
251 | + foreach ($page_cache_purge_actions as $purge_action) { |
|
252 | + add_action($purge_action, 'autoptimizeCache::clearall_actionless'); |
|
253 | 253 | } |
254 | 254 | } |
255 | 255 | } |
@@ -261,38 +261,38 @@ discard block |
||
261 | 261 | */ |
262 | 262 | public function start_buffering() |
263 | 263 | { |
264 | - if ( $this->should_buffer() ) { |
|
264 | + if ($this->should_buffer()) { |
|
265 | 265 | |
266 | 266 | // Load speedupper conditionally (true by default). |
267 | - if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) { |
|
267 | + if (apply_filters('autoptimize_filter_speedupper', true)) { |
|
268 | 268 | $ao_speedupper = new autoptimizeSpeedupper(); |
269 | 269 | } |
270 | 270 | |
271 | 271 | $conf = autoptimizeConfig::instance(); |
272 | 272 | |
273 | - if ( $conf->get( 'autoptimize_js' ) ) { |
|
274 | - if ( ! defined( 'CONCATENATE_SCRIPTS' ) ) { |
|
275 | - define( 'CONCATENATE_SCRIPTS', false ); |
|
273 | + if ($conf->get('autoptimize_js')) { |
|
274 | + if (!defined('CONCATENATE_SCRIPTS')) { |
|
275 | + define('CONCATENATE_SCRIPTS', false); |
|
276 | 276 | } |
277 | - if ( ! defined( 'COMPRESS_SCRIPTS' ) ) { |
|
278 | - define( 'COMPRESS_SCRIPTS', false ); |
|
277 | + if (!defined('COMPRESS_SCRIPTS')) { |
|
278 | + define('COMPRESS_SCRIPTS', false); |
|
279 | 279 | } |
280 | 280 | } |
281 | 281 | |
282 | - if ( $conf->get( 'autoptimize_css' ) ) { |
|
283 | - if ( ! defined( 'COMPRESS_CSS' ) ) { |
|
284 | - define( 'COMPRESS_CSS', false ); |
|
282 | + if ($conf->get('autoptimize_css')) { |
|
283 | + if (!defined('COMPRESS_CSS')) { |
|
284 | + define('COMPRESS_CSS', false); |
|
285 | 285 | } |
286 | 286 | } |
287 | 287 | |
288 | - if ( apply_filters( 'autoptimize_filter_obkiller', false ) ) { |
|
289 | - while ( ob_get_level() > 0 ) { |
|
288 | + if (apply_filters('autoptimize_filter_obkiller', false)) { |
|
289 | + while (ob_get_level() > 0) { |
|
290 | 290 | ob_end_clean(); |
291 | 291 | } |
292 | 292 | } |
293 | 293 | |
294 | 294 | // Now, start the real thing! |
295 | - ob_start( array( $this, 'end_buffering' ) ); |
|
295 | + ob_start(array($this, 'end_buffering')); |
|
296 | 296 | } |
297 | 297 | } |
298 | 298 | |
@@ -303,31 +303,31 @@ discard block |
||
303 | 303 | * deciding once per request (for use in tests). |
304 | 304 | * @return bool |
305 | 305 | */ |
306 | - public static function should_buffer( $doing_tests = false ) |
|
306 | + public static function should_buffer($doing_tests = false) |
|
307 | 307 | { |
308 | 308 | static $do_buffering = null; |
309 | 309 | |
310 | 310 | // Only check once in case we're called multiple times by others but |
311 | 311 | // still allows multiple calls when doing tests. |
312 | - if ( null === $do_buffering || $doing_tests ) { |
|
312 | + if (null === $do_buffering || $doing_tests) { |
|
313 | 313 | |
314 | 314 | $ao_noptimize = false; |
315 | 315 | |
316 | 316 | // Checking for DONOTMINIFY constant as used by e.g. WooCommerce POS. |
317 | - if ( defined( 'DONOTMINIFY' ) && ( constant( 'DONOTMINIFY' ) === true || constant( 'DONOTMINIFY' ) === 'true' ) ) { |
|
317 | + if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === 'true')) { |
|
318 | 318 | $ao_noptimize = true; |
319 | 319 | } |
320 | 320 | |
321 | 321 | // Skip checking query strings if they're disabled. |
322 | - if ( apply_filters( 'autoptimize_filter_honor_qs_noptimize', true ) ) { |
|
322 | + if (apply_filters('autoptimize_filter_honor_qs_noptimize', true)) { |
|
323 | 323 | // Check for `ao_noptimize` (and other) keys in the query string |
324 | 324 | // to get non-optimized page for debugging. |
325 | 325 | $keys = array( |
326 | 326 | 'ao_noptimize', |
327 | 327 | 'ao_noptirocket', |
328 | 328 | ); |
329 | - foreach ( $keys as $key ) { |
|
330 | - if ( array_key_exists( $key, $_GET ) && '1' === $_GET[ $key ] ) { |
|
329 | + foreach ($keys as $key) { |
|
330 | + if (array_key_exists($key, $_GET) && '1' === $_GET[$key]) { |
|
331 | 331 | $ao_noptimize = true; |
332 | 332 | break; |
333 | 333 | } |
@@ -335,15 +335,15 @@ discard block |
||
335 | 335 | } |
336 | 336 | |
337 | 337 | // If setting says not to optimize logged in user and user is logged in... |
338 | - if ( false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_logged', 'on' ) && is_user_logged_in() && current_user_can( 'edit_posts' ) ) { |
|
338 | + if (false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_optimize_logged', 'on') && is_user_logged_in() && current_user_can('edit_posts')) { |
|
339 | 339 | $ao_noptimize = true; |
340 | 340 | } |
341 | 341 | |
342 | 342 | // If setting says not to optimize cart/checkout. |
343 | - if ( false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_checkout', 'off' ) ) { |
|
343 | + if (false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_optimize_checkout', 'off')) { |
|
344 | 344 | // Checking for woocommerce, easy digital downloads and wp ecommerce... |
345 | - foreach ( array( 'is_checkout', 'is_cart', 'is_account_page', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout' ) as $func ) { |
|
346 | - if ( function_exists( $func ) && $func() ) { |
|
345 | + foreach (array('is_checkout', 'is_cart', 'is_account_page', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout') as $func) { |
|
346 | + if (function_exists($func) && $func()) { |
|
347 | 347 | $ao_noptimize = true; |
348 | 348 | break; |
349 | 349 | } |
@@ -351,10 +351,10 @@ discard block |
||
351 | 351 | } |
352 | 352 | |
353 | 353 | // And make sure pagebuilder previews don't get optimized HTML/ JS/ CSS/ ... |
354 | - if ( false === $ao_noptimize ) { |
|
355 | - $_qs_pagebuilders = array( 'tve', 'elementor-preview', 'fl_builder', 'vc_action', 'et_fb', 'bt-beaverbuildertheme', 'ct_builder', 'fb-edit', 'siteorigin_panels_live_editor' ); |
|
356 | - foreach ( $_qs_pagebuilders as $_pagebuilder ) { |
|
357 | - if ( array_key_exists( $_pagebuilder, $_GET ) ) { |
|
354 | + if (false === $ao_noptimize) { |
|
355 | + $_qs_pagebuilders = array('tve', 'elementor-preview', 'fl_builder', 'vc_action', 'et_fb', 'bt-beaverbuildertheme', 'ct_builder', 'fb-edit', 'siteorigin_panels_live_editor'); |
|
356 | + foreach ($_qs_pagebuilders as $_pagebuilder) { |
|
357 | + if (array_key_exists($_pagebuilder, $_GET)) { |
|
358 | 358 | $ao_noptimize = true; |
359 | 359 | break; |
360 | 360 | } |
@@ -363,16 +363,16 @@ discard block |
||
363 | 363 | |
364 | 364 | // Also honor PageSpeed=off parameter as used by mod_pagespeed, in use by some pagebuilders, |
365 | 365 | // see https://www.modpagespeed.com/doc/experiment#ModPagespeed for info on that. |
366 | - if ( false === $ao_noptimize && array_key_exists( 'PageSpeed', $_GET ) && 'off' === $_GET['PageSpeed'] ) { |
|
366 | + if (false === $ao_noptimize && array_key_exists('PageSpeed', $_GET) && 'off' === $_GET['PageSpeed']) { |
|
367 | 367 | $ao_noptimize = true; |
368 | 368 | } |
369 | 369 | |
370 | 370 | // And finally allows blocking of autoptimization on your own terms regardless of above decisions. |
371 | - $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize ); |
|
371 | + $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize); |
|
372 | 372 | |
373 | 373 | // Check for site being previewed in the Customizer (available since WP 4.0). |
374 | 374 | $is_customize_preview = false; |
375 | - if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) { |
|
375 | + if (function_exists('is_customize_preview') && is_customize_preview()) { |
|
376 | 376 | $is_customize_preview = is_customize_preview(); |
377 | 377 | } |
378 | 378 | |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | * while the main query hasn't been ran yet. Thats why we use |
384 | 384 | * AUTOPTIMIZE_INIT_EARLIER in tests. |
385 | 385 | */ |
386 | - $do_buffering = ( ! is_admin() && ! is_feed() && ! is_embed() && ! $ao_noptimize && ! $is_customize_preview ); |
|
386 | + $do_buffering = (!is_admin() && !is_feed() && !is_embed() && !$ao_noptimize && !$is_customize_preview); |
|
387 | 387 | } |
388 | 388 | |
389 | 389 | return $do_buffering; |
@@ -396,25 +396,25 @@ discard block |
||
396 | 396 | * |
397 | 397 | * @return bool |
398 | 398 | */ |
399 | - public function is_valid_buffer( $content ) |
|
399 | + public function is_valid_buffer($content) |
|
400 | 400 | { |
401 | 401 | // Defaults to true. |
402 | 402 | $valid = true; |
403 | 403 | |
404 | - $has_no_html_tag = ( false === stripos( $content, '<html' ) ); |
|
405 | - $has_xsl_stylesheet = ( false !== stripos( $content, '<xsl:stylesheet' ) || false !== stripos( $content, '<?xml-stylesheet' ) ); |
|
406 | - $has_html5_doctype = ( preg_match( '/^<!DOCTYPE.+html>/i', ltrim( $content ) ) > 0 ); |
|
407 | - $has_noptimize_page = ( false !== stripos( $content, '<!-- noptimize-page -->' ) ); |
|
404 | + $has_no_html_tag = (false === stripos($content, '<html')); |
|
405 | + $has_xsl_stylesheet = (false !== stripos($content, '<xsl:stylesheet') || false !== stripos($content, '<?xml-stylesheet')); |
|
406 | + $has_html5_doctype = (preg_match('/^<!DOCTYPE.+html>/i', ltrim($content)) > 0); |
|
407 | + $has_noptimize_page = (false !== stripos($content, '<!-- noptimize-page -->')); |
|
408 | 408 | |
409 | - if ( $has_no_html_tag ) { |
|
409 | + if ($has_no_html_tag) { |
|
410 | 410 | // Can't be valid amp markup without an html tag preceding it. |
411 | 411 | $is_amp_markup = false; |
412 | 412 | } else { |
413 | - $is_amp_markup = self::is_amp_markup( $content ); |
|
413 | + $is_amp_markup = self::is_amp_markup($content); |
|
414 | 414 | } |
415 | 415 | |
416 | 416 | // If it's not html, or if it's amp or contains xsl stylesheets we don't touch it. |
417 | - if ( $has_no_html_tag && ! $has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet || $has_noptimize_page ) { |
|
417 | + if ($has_no_html_tag && !$has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet || $has_noptimize_page) { |
|
418 | 418 | $valid = false; |
419 | 419 | } |
420 | 420 | |
@@ -429,14 +429,14 @@ discard block |
||
429 | 429 | * |
430 | 430 | * @return bool |
431 | 431 | */ |
432 | - public static function is_amp_markup( $content ) |
|
432 | + public static function is_amp_markup($content) |
|
433 | 433 | { |
434 | 434 | // Short-circuit when a function is available to determine whether the response is (or will be) an AMP page. |
435 | - if ( function_exists( 'is_amp_endpoint' ) ) { |
|
435 | + if (function_exists('is_amp_endpoint')) { |
|
436 | 436 | return is_amp_endpoint(); |
437 | 437 | } |
438 | 438 | |
439 | - $is_amp_markup = preg_match( '/<html[^>]*(?:amp|⚡)/i', $content ); |
|
439 | + $is_amp_markup = preg_match('/<html[^>]*(?:amp|⚡)/i', $content); |
|
440 | 440 | |
441 | 441 | return (bool) $is_amp_markup; |
442 | 442 | } |
@@ -449,10 +449,10 @@ discard block |
||
449 | 449 | * |
450 | 450 | * @return string |
451 | 451 | */ |
452 | - public function end_buffering( $content ) |
|
452 | + public function end_buffering($content) |
|
453 | 453 | { |
454 | 454 | // Bail early without modifying anything if we can't handle the content. |
455 | - if ( ! $this->is_valid_buffer( $content ) ) { |
|
455 | + if (!$this->is_valid_buffer($content)) { |
|
456 | 456 | return $content; |
457 | 457 | } |
458 | 458 | |
@@ -460,73 +460,73 @@ discard block |
||
460 | 460 | |
461 | 461 | // Determine what needs to be ran. |
462 | 462 | $classes = array(); |
463 | - if ( $conf->get( 'autoptimize_js' ) ) { |
|
463 | + if ($conf->get('autoptimize_js')) { |
|
464 | 464 | $classes[] = 'autoptimizeScripts'; |
465 | 465 | } |
466 | - if ( $conf->get( 'autoptimize_css' ) ) { |
|
466 | + if ($conf->get('autoptimize_css')) { |
|
467 | 467 | $classes[] = 'autoptimizeStyles'; |
468 | 468 | } |
469 | - if ( $conf->get( 'autoptimize_html' ) ) { |
|
469 | + if ($conf->get('autoptimize_html')) { |
|
470 | 470 | $classes[] = 'autoptimizeHTML'; |
471 | 471 | } |
472 | 472 | |
473 | 473 | $classoptions = array( |
474 | 474 | 'autoptimizeScripts' => array( |
475 | - 'aggregate' => $conf->get( 'autoptimize_js_aggregate' ), |
|
476 | - 'justhead' => $conf->get( 'autoptimize_js_justhead' ), |
|
477 | - 'forcehead' => $conf->get( 'autoptimize_js_forcehead' ), |
|
478 | - 'trycatch' => $conf->get( 'autoptimize_js_trycatch' ), |
|
479 | - 'js_exclude' => $conf->get( 'autoptimize_js_exclude' ), |
|
480 | - 'cdn_url' => $conf->get( 'autoptimize_cdn_url' ), |
|
481 | - 'include_inline' => $conf->get( 'autoptimize_js_include_inline' ), |
|
482 | - 'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ), |
|
475 | + 'aggregate' => $conf->get('autoptimize_js_aggregate'), |
|
476 | + 'justhead' => $conf->get('autoptimize_js_justhead'), |
|
477 | + 'forcehead' => $conf->get('autoptimize_js_forcehead'), |
|
478 | + 'trycatch' => $conf->get('autoptimize_js_trycatch'), |
|
479 | + 'js_exclude' => $conf->get('autoptimize_js_exclude'), |
|
480 | + 'cdn_url' => $conf->get('autoptimize_cdn_url'), |
|
481 | + 'include_inline' => $conf->get('autoptimize_js_include_inline'), |
|
482 | + 'minify_excluded' => $conf->get('autoptimize_minify_excluded'), |
|
483 | 483 | ), |
484 | 484 | 'autoptimizeStyles' => array( |
485 | - 'aggregate' => $conf->get( 'autoptimize_css_aggregate' ), |
|
486 | - 'justhead' => $conf->get( 'autoptimize_css_justhead' ), |
|
487 | - 'datauris' => $conf->get( 'autoptimize_css_datauris' ), |
|
488 | - 'defer' => $conf->get( 'autoptimize_css_defer' ), |
|
489 | - 'defer_inline' => $conf->get( 'autoptimize_css_defer_inline' ), |
|
490 | - 'inline' => $conf->get( 'autoptimize_css_inline' ), |
|
491 | - 'css_exclude' => $conf->get( 'autoptimize_css_exclude' ), |
|
492 | - 'cdn_url' => $conf->get( 'autoptimize_cdn_url' ), |
|
493 | - 'include_inline' => $conf->get( 'autoptimize_css_include_inline' ), |
|
494 | - 'nogooglefont' => $conf->get( 'autoptimize_css_nogooglefont' ), |
|
495 | - 'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ), |
|
485 | + 'aggregate' => $conf->get('autoptimize_css_aggregate'), |
|
486 | + 'justhead' => $conf->get('autoptimize_css_justhead'), |
|
487 | + 'datauris' => $conf->get('autoptimize_css_datauris'), |
|
488 | + 'defer' => $conf->get('autoptimize_css_defer'), |
|
489 | + 'defer_inline' => $conf->get('autoptimize_css_defer_inline'), |
|
490 | + 'inline' => $conf->get('autoptimize_css_inline'), |
|
491 | + 'css_exclude' => $conf->get('autoptimize_css_exclude'), |
|
492 | + 'cdn_url' => $conf->get('autoptimize_cdn_url'), |
|
493 | + 'include_inline' => $conf->get('autoptimize_css_include_inline'), |
|
494 | + 'nogooglefont' => $conf->get('autoptimize_css_nogooglefont'), |
|
495 | + 'minify_excluded' => $conf->get('autoptimize_minify_excluded'), |
|
496 | 496 | ), |
497 | 497 | 'autoptimizeHTML' => array( |
498 | - 'keepcomments' => $conf->get( 'autoptimize_html_keepcomments' ), |
|
498 | + 'keepcomments' => $conf->get('autoptimize_html_keepcomments'), |
|
499 | 499 | ), |
500 | 500 | ); |
501 | 501 | |
502 | - $content = apply_filters( 'autoptimize_filter_html_before_minify', $content ); |
|
502 | + $content = apply_filters('autoptimize_filter_html_before_minify', $content); |
|
503 | 503 | |
504 | 504 | // Run the classes! |
505 | - foreach ( $classes as $name ) { |
|
506 | - $instance = new $name( $content ); |
|
507 | - if ( $instance->read( $classoptions[ $name ] ) ) { |
|
505 | + foreach ($classes as $name) { |
|
506 | + $instance = new $name($content); |
|
507 | + if ($instance->read($classoptions[$name])) { |
|
508 | 508 | $instance->minify(); |
509 | 509 | $instance->cache(); |
510 | 510 | $content = $instance->getcontent(); |
511 | 511 | } |
512 | - unset( $instance ); |
|
512 | + unset($instance); |
|
513 | 513 | } |
514 | 514 | |
515 | - $content = apply_filters( 'autoptimize_html_after_minify', $content ); |
|
515 | + $content = apply_filters('autoptimize_html_after_minify', $content); |
|
516 | 516 | |
517 | 517 | return $content; |
518 | 518 | } |
519 | 519 | |
520 | - public static function autoptimize_nobuffer_optimize( $html_in ) { |
|
520 | + public static function autoptimize_nobuffer_optimize($html_in) { |
|
521 | 521 | $html_out = $html_in; |
522 | 522 | |
523 | - if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) { |
|
523 | + if (apply_filters('autoptimize_filter_speedupper', true)) { |
|
524 | 524 | $ao_speedupper = new autoptimizeSpeedupper(); |
525 | 525 | } |
526 | 526 | |
527 | - $self = new self( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE ); |
|
528 | - if ( $self->should_buffer() ) { |
|
529 | - $html_out = $self->end_buffering( $html_in ); |
|
527 | + $self = new self(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE); |
|
528 | + if ($self->should_buffer()) { |
|
529 | + $html_out = $self->end_buffering($html_in); |
|
530 | 530 | } |
531 | 531 | return $html_out; |
532 | 532 | } |
@@ -588,45 +588,45 @@ discard block |
||
588 | 588 | 'autoptimize_ccss_unloadccss', |
589 | 589 | ); |
590 | 590 | |
591 | - if ( ! is_multisite() ) { |
|
592 | - foreach ( $delete_options as $del_opt ) { |
|
593 | - delete_option( $del_opt ); |
|
591 | + if (!is_multisite()) { |
|
592 | + foreach ($delete_options as $del_opt) { |
|
593 | + delete_option($del_opt); |
|
594 | 594 | } |
595 | 595 | autoptimizeMain::remove_cronjobs(); |
596 | 596 | } else { |
597 | 597 | global $wpdb; |
598 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
598 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
599 | 599 | $original_blog_id = get_current_blog_id(); |
600 | - foreach ( $blog_ids as $blog_id ) { |
|
601 | - switch_to_blog( $blog_id ); |
|
602 | - foreach ( $delete_options as $del_opt ) { |
|
603 | - delete_option( $del_opt ); |
|
600 | + foreach ($blog_ids as $blog_id) { |
|
601 | + switch_to_blog($blog_id); |
|
602 | + foreach ($delete_options as $del_opt) { |
|
603 | + delete_option($del_opt); |
|
604 | 604 | } |
605 | 605 | autoptimizeMain::remove_cronjobs(); |
606 | 606 | } |
607 | - switch_to_blog( $original_blog_id ); |
|
607 | + switch_to_blog($original_blog_id); |
|
608 | 608 | } |
609 | 609 | |
610 | 610 | // Remove AO CCSS cached files and directory. |
611 | - $ao_ccss_dir = WP_CONTENT_DIR . '/uploads/ao_ccss/'; |
|
612 | - if ( file_exists( $ao_ccss_dir ) && is_dir( $ao_ccss_dir ) ) { |
|
611 | + $ao_ccss_dir = WP_CONTENT_DIR.'/uploads/ao_ccss/'; |
|
612 | + if (file_exists($ao_ccss_dir) && is_dir($ao_ccss_dir)) { |
|
613 | 613 | // fixme: should check for subdirs when in multisite and remove contents of those as well. |
614 | - array_map( 'unlink', glob( $ao_ccss_dir . '*.{css,html,json,log,zip,lock}', GLOB_BRACE ) ); |
|
615 | - rmdir( $ao_ccss_dir ); |
|
614 | + array_map('unlink', glob($ao_ccss_dir.'*.{css,html,json,log,zip,lock}', GLOB_BRACE)); |
|
615 | + rmdir($ao_ccss_dir); |
|
616 | 616 | } |
617 | 617 | } |
618 | 618 | |
619 | 619 | public static function on_deactivation() |
620 | 620 | { |
621 | - if ( is_multisite() && is_network_admin() ) { |
|
621 | + if (is_multisite() && is_network_admin()) { |
|
622 | 622 | global $wpdb; |
623 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
623 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
624 | 624 | $original_blog_id = get_current_blog_id(); |
625 | - foreach ( $blog_ids as $blog_id ) { |
|
626 | - switch_to_blog( $blog_id ); |
|
625 | + foreach ($blog_ids as $blog_id) { |
|
626 | + switch_to_blog($blog_id); |
|
627 | 627 | autoptimizeMain::remove_cronjobs(); |
628 | 628 | } |
629 | - switch_to_blog( $original_blog_id ); |
|
629 | + switch_to_blog($original_blog_id); |
|
630 | 630 | } else { |
631 | 631 | autoptimizeMain::remove_cronjobs(); |
632 | 632 | } |
@@ -635,9 +635,9 @@ discard block |
||
635 | 635 | |
636 | 636 | public static function remove_cronjobs() { |
637 | 637 | // Remove scheduled events. |
638 | - foreach ( array( 'ao_cachechecker', 'ao_ccss_queue', 'ao_ccss_maintenance' ) as $_event ) { |
|
639 | - if ( wp_get_schedule( $_event ) ) { |
|
640 | - wp_clear_scheduled_hook( $_event ); |
|
638 | + foreach (array('ao_cachechecker', 'ao_ccss_queue', 'ao_ccss_maintenance') as $_event) { |
|
639 | + if (wp_get_schedule($_event)) { |
|
640 | + wp_clear_scheduled_hook($_event); |
|
641 | 641 | } |
642 | 642 | } |
643 | 643 | } |
@@ -646,35 +646,35 @@ discard block |
||
646 | 646 | { |
647 | 647 | echo '<div class="error"><p>'; |
648 | 648 | // Translators: %s is the cache directory location. |
649 | - printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR ); |
|
649 | + printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR); |
|
650 | 650 | echo '</p></div>'; |
651 | 651 | } |
652 | 652 | |
653 | 653 | public static function notice_installed() |
654 | 654 | { |
655 | 655 | echo '<div class="updated"><p>'; |
656 | - _e( 'Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' ); |
|
656 | + _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize'); |
|
657 | 657 | echo '</p></div>'; |
658 | 658 | } |
659 | 659 | |
660 | 660 | public static function notice_updated() |
661 | 661 | { |
662 | 662 | echo '<div class="updated"><p>'; |
663 | - _e( 'Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' ); |
|
663 | + _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize'); |
|
664 | 664 | echo '</p></div>'; |
665 | 665 | } |
666 | 666 | |
667 | 667 | public static function notice_plug_imgopt() |
668 | 668 | { |
669 | 669 | // Translators: the URL added points to the Autopmize Extra settings. |
670 | - $_ao_imgopt_plug_notice = sprintf( __( 'Did you know Autoptimize includes on-the-fly image optimization (with support for WebP) and CDN via ShortPixel? Check out the %1$sAutoptimize Image settings%2$s to activate this option.', 'autoptimize' ), '<a href="options-general.php?page=autoptimize_imgopt">', '</a>' ); |
|
671 | - $_ao_imgopt_plug_notice = apply_filters( 'autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice ); |
|
670 | + $_ao_imgopt_plug_notice = sprintf(__('Did you know Autoptimize includes on-the-fly image optimization (with support for WebP) and CDN via ShortPixel? Check out the %1$sAutoptimize Image settings%2$s to activate this option.', 'autoptimize'), '<a href="options-general.php?page=autoptimize_imgopt">', '</a>'); |
|
671 | + $_ao_imgopt_plug_notice = apply_filters('autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice); |
|
672 | 672 | $_ao_imgopt_launch_ok = autoptimizeImages::launch_ok_wrapper(); |
673 | 673 | $_ao_imgopt_plug_dismissible = 'ao-img-opt-plug-123'; |
674 | 674 | $_ao_imgopt_active = autoptimizeImages::imgopt_active(); |
675 | 675 | |
676 | - 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 ) ) { |
|
677 | - echo '<div class="notice notice-info is-dismissible" data-dismissible="' . $_ao_imgopt_plug_dismissible . '"><p>'; |
|
676 | + 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)) { |
|
677 | + echo '<div class="notice notice-info is-dismissible" data-dismissible="'.$_ao_imgopt_plug_dismissible.'"><p>'; |
|
678 | 678 | echo $_ao_imgopt_plug_notice; |
679 | 679 | echo '</p></div>'; |
680 | 680 | } |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Handles version updates and should only be instantiated in autoptimize.php if/when needed. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -16,9 +16,9 @@ discard block |
||
16 | 16 | */ |
17 | 17 | protected $current_major_version = null; |
18 | 18 | |
19 | - public function __construct( $current_version ) |
|
19 | + public function __construct($current_version) |
|
20 | 20 | { |
21 | - $this->current_major_version = substr( $current_version, 0, 3 ); |
|
21 | + $this->current_major_version = substr($current_version, 0, 3); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | { |
30 | 30 | $major_update = false; |
31 | 31 | |
32 | - switch ( $this->current_major_version ) { |
|
32 | + switch ($this->current_major_version) { |
|
33 | 33 | case '1.6': |
34 | 34 | $this->upgrade_from_1_6(); |
35 | 35 | $major_update = true; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $major_update = true; |
48 | 48 | // No break, intentionally, so all upgrades are ran during a single request... |
49 | 49 | case '2.4': |
50 | - if ( autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' ) == '2.4.2' ) { |
|
50 | + if (autoptimizeOptionWrapper::get_option('autoptimize_version', 'none') == '2.4.2') { |
|
51 | 51 | $this->upgrade_from_2_4_2(); |
52 | 52 | } |
53 | 53 | $this->upgrade_from_2_4(); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | // No break, intentionally, so all upgrades are ran during a single request... |
56 | 56 | } |
57 | 57 | |
58 | - if ( true === $major_update ) { |
|
58 | + if (true === $major_update) { |
|
59 | 59 | $this->on_major_version_update(); |
60 | 60 | } |
61 | 61 | } |
@@ -67,19 +67,19 @@ discard block |
||
67 | 67 | * |
68 | 68 | * @param string $target Target version to check against (ie., the currently running one). |
69 | 69 | */ |
70 | - public static function check_installed_and_update( $target ) |
|
70 | + public static function check_installed_and_update($target) |
|
71 | 71 | { |
72 | - $db_version = autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' ); |
|
73 | - if ( $db_version !== $target ) { |
|
74 | - if ( 'none' === $db_version ) { |
|
75 | - add_action( 'admin_notices', 'autoptimizeMain::notice_installed' ); |
|
72 | + $db_version = autoptimizeOptionWrapper::get_option('autoptimize_version', 'none'); |
|
73 | + if ($db_version !== $target) { |
|
74 | + if ('none' === $db_version) { |
|
75 | + add_action('admin_notices', 'autoptimizeMain::notice_installed'); |
|
76 | 76 | } else { |
77 | - $updater = new self( $db_version ); |
|
77 | + $updater = new self($db_version); |
|
78 | 78 | $updater->run_needed_major_upgrades(); |
79 | 79 | } |
80 | 80 | |
81 | 81 | // Versions differed, upgrades happened if needed, store the new version. |
82 | - autoptimizeOptionWrapper::update_option( 'autoptimize_version', $target ); |
|
82 | + autoptimizeOptionWrapper::update_option('autoptimize_version', $target); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
@@ -90,10 +90,10 @@ discard block |
||
90 | 90 | protected function on_major_version_update() |
91 | 91 | { |
92 | 92 | // The transients guard here prevents stale object caches from busting the cache on every request. |
93 | - if ( false == get_transient( 'autoptimize_stale_option_buster' ) ) { |
|
94 | - set_transient( 'autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS ); |
|
93 | + if (false == get_transient('autoptimize_stale_option_buster')) { |
|
94 | + set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS); |
|
95 | 95 | autoptimizeCache::clearall(); |
96 | - add_action( 'admin_notices', 'autoptimizeMain::notice_updated' ); |
|
96 | + add_action('admin_notices', 'autoptimizeMain::notice_updated'); |
|
97 | 97 | } |
98 | 98 | } |
99 | 99 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | private function upgrade_from_1_6() |
104 | 104 | { |
105 | 105 | // If user was on version 1.6.x, force advanced options to be shown by default. |
106 | - autoptimizeOptionWrapper::update_option( 'autoptimize_show_adv', '1' ); |
|
106 | + autoptimizeOptionWrapper::update_option('autoptimize_show_adv', '1'); |
|
107 | 107 | |
108 | 108 | // And remove old options. |
109 | 109 | $to_delete_options = array( |
@@ -115,8 +115,8 @@ discard block |
||
115 | 115 | 'autoptimize_cdn_img_url', |
116 | 116 | 'autoptimize_css_yui', |
117 | 117 | ); |
118 | - foreach ( $to_delete_options as $del_opt ) { |
|
119 | - delete_option( $del_opt ); |
|
118 | + foreach ($to_delete_options as $del_opt) { |
|
119 | + delete_option($del_opt); |
|
120 | 120 | } |
121 | 121 | } |
122 | 122 | |
@@ -127,29 +127,29 @@ discard block |
||
127 | 127 | */ |
128 | 128 | private function upgrade_from_1_7() |
129 | 129 | { |
130 | - if ( ! is_multisite() ) { |
|
131 | - $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' ); |
|
132 | - if ( empty( $css_exclude ) ) { |
|
130 | + if (!is_multisite()) { |
|
131 | + $css_exclude = autoptimizeOptionWrapper::get_option('autoptimize_css_exclude'); |
|
132 | + if (empty($css_exclude)) { |
|
133 | 133 | $css_exclude = 'admin-bar.min.css, dashicons.min.css'; |
134 | - } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) { |
|
134 | + } elseif (false === strpos($css_exclude, 'dashicons.min.css')) { |
|
135 | 135 | $css_exclude .= ', dashicons.min.css'; |
136 | 136 | } |
137 | - autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude ); |
|
137 | + autoptimizeOptionWrapper::update_option('autoptimize_css_exclude', $css_exclude); |
|
138 | 138 | } else { |
139 | 139 | global $wpdb; |
140 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
140 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
141 | 141 | $original_blog_id = get_current_blog_id(); |
142 | - foreach ( $blog_ids as $blog_id ) { |
|
143 | - switch_to_blog( $blog_id ); |
|
144 | - $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' ); |
|
145 | - if ( empty( $css_exclude ) ) { |
|
142 | + foreach ($blog_ids as $blog_id) { |
|
143 | + switch_to_blog($blog_id); |
|
144 | + $css_exclude = autoptimizeOptionWrapper::get_option('autoptimize_css_exclude'); |
|
145 | + if (empty($css_exclude)) { |
|
146 | 146 | $css_exclude = 'admin-bar.min.css, dashicons.min.css'; |
147 | - } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) { |
|
147 | + } elseif (false === strpos($css_exclude, 'dashicons.min.css')) { |
|
148 | 148 | $css_exclude .= ', dashicons.min.css'; |
149 | 149 | } |
150 | - autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude ); |
|
150 | + autoptimizeOptionWrapper::update_option('autoptimize_css_exclude', $css_exclude); |
|
151 | 151 | } |
152 | - switch_to_blog( $original_blog_id ); |
|
152 | + switch_to_blog($original_blog_id); |
|
153 | 153 | } |
154 | 154 | } |
155 | 155 | |
@@ -161,19 +161,19 @@ discard block |
||
161 | 161 | */ |
162 | 162 | private function upgrade_from_1_9() |
163 | 163 | { |
164 | - if ( ! is_multisite() ) { |
|
165 | - autoptimizeOptionWrapper::update_option( 'autoptimize_css_include_inline', 'on' ); |
|
166 | - autoptimizeOptionWrapper::update_option( 'autoptimize_js_include_inline', 'on' ); |
|
164 | + if (!is_multisite()) { |
|
165 | + autoptimizeOptionWrapper::update_option('autoptimize_css_include_inline', 'on'); |
|
166 | + autoptimizeOptionWrapper::update_option('autoptimize_js_include_inline', 'on'); |
|
167 | 167 | } else { |
168 | 168 | global $wpdb; |
169 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
169 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
170 | 170 | $original_blog_id = get_current_blog_id(); |
171 | - foreach ( $blog_ids as $blog_id ) { |
|
172 | - switch_to_blog( $blog_id ); |
|
173 | - autoptimizeOptionWrapper::update_option( 'autoptimize_css_include_inline', 'on' ); |
|
174 | - autoptimizeOptionWrapper::update_option( 'autoptimize_js_include_inline', 'on' ); |
|
171 | + foreach ($blog_ids as $blog_id) { |
|
172 | + switch_to_blog($blog_id); |
|
173 | + autoptimizeOptionWrapper::update_option('autoptimize_css_include_inline', 'on'); |
|
174 | + autoptimizeOptionWrapper::update_option('autoptimize_js_include_inline', 'on'); |
|
175 | 175 | } |
176 | - switch_to_blog( $original_blog_id ); |
|
176 | + switch_to_blog($original_blog_id); |
|
177 | 177 | } |
178 | 178 | } |
179 | 179 | |
@@ -184,17 +184,17 @@ discard block |
||
184 | 184 | */ |
185 | 185 | private function upgrade_from_2_2() |
186 | 186 | { |
187 | - if ( ! is_multisite() ) { |
|
187 | + if (!is_multisite()) { |
|
188 | 188 | $this->do_2_2_settings_update(); |
189 | 189 | } else { |
190 | 190 | global $wpdb; |
191 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
191 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
192 | 192 | $original_blog_id = get_current_blog_id(); |
193 | - foreach ( $blog_ids as $blog_id ) { |
|
194 | - switch_to_blog( $blog_id ); |
|
193 | + foreach ($blog_ids as $blog_id) { |
|
194 | + switch_to_blog($blog_id); |
|
195 | 195 | $this->do_2_2_settings_update(); |
196 | 196 | } |
197 | - switch_to_blog( $original_blog_id ); |
|
197 | + switch_to_blog($original_blog_id); |
|
198 | 198 | } |
199 | 199 | } |
200 | 200 | |
@@ -203,12 +203,12 @@ discard block |
||
203 | 203 | */ |
204 | 204 | private function do_2_2_settings_update() |
205 | 205 | { |
206 | - $nogooglefont = autoptimizeOptionWrapper::get_option( 'autoptimize_css_nogooglefont', '' ); |
|
207 | - $ao_extrasetting = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' ); |
|
208 | - if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) { |
|
209 | - autoptimizeOptionWrapper::update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() ); |
|
206 | + $nogooglefont = autoptimizeOptionWrapper::get_option('autoptimize_css_nogooglefont', ''); |
|
207 | + $ao_extrasetting = autoptimizeOptionWrapper::get_option('autoptimize_extra_settings', ''); |
|
208 | + if (($nogooglefont) && (empty($ao_extrasetting))) { |
|
209 | + autoptimizeOptionWrapper::update_option('autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options()); |
|
210 | 210 | } |
211 | - delete_option( 'autoptimize_css_nogooglefont' ); |
|
211 | + delete_option('autoptimize_css_nogooglefont'); |
|
212 | 212 | } |
213 | 213 | |
214 | 214 | /** |
@@ -220,33 +220,33 @@ discard block |
||
220 | 220 | $jobs = _get_cron_array(); |
221 | 221 | |
222 | 222 | // Remove all ao_cachechecker cron jobs (for now). |
223 | - foreach ( $jobs as $when => $job ) { |
|
224 | - $name = key( $job ); |
|
223 | + foreach ($jobs as $when => $job) { |
|
224 | + $name = key($job); |
|
225 | 225 | |
226 | - if ( false !== strpos( $name, 'ao_cachechecker' ) ) { |
|
227 | - unset( $jobs[ $when ] ); |
|
226 | + if (false !== strpos($name, 'ao_cachechecker')) { |
|
227 | + unset($jobs[$when]); |
|
228 | 228 | } |
229 | 229 | } |
230 | 230 | |
231 | 231 | // Save the data. |
232 | - _set_cron_array( $jobs ); |
|
232 | + _set_cron_array($jobs); |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | /** |
236 | 236 | * Migrate imgopt options from autoptimize_extra_settings to autoptimize_imgopt_settings |
237 | 237 | */ |
238 | 238 | private function upgrade_from_2_4() { |
239 | - $extra_settings = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' ); |
|
240 | - $imgopt_settings = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_settings', '' ); |
|
241 | - if ( empty( $imgopt_settings ) && ! empty( $extra_settings ) ) { |
|
239 | + $extra_settings = autoptimizeOptionWrapper::get_option('autoptimize_extra_settings', ''); |
|
240 | + $imgopt_settings = autoptimizeOptionWrapper::get_option('autoptimize_imgopt_settings', ''); |
|
241 | + if (empty($imgopt_settings) && !empty($extra_settings)) { |
|
242 | 242 | $imgopt_settings = autoptimizeConfig::get_ao_imgopt_default_options(); |
243 | - if ( array_key_exists( 'autoptimize_extra_checkbox_field_5', $extra_settings ) ) { |
|
243 | + if (array_key_exists('autoptimize_extra_checkbox_field_5', $extra_settings)) { |
|
244 | 244 | $imgopt_settings['autoptimize_imgopt_checkbox_field_1'] = $extra_settings['autoptimize_extra_checkbox_field_5']; |
245 | 245 | } |
246 | - if ( array_key_exists( 'autoptimize_extra_select_field_6', $extra_settings ) ) { |
|
246 | + if (array_key_exists('autoptimize_extra_select_field_6', $extra_settings)) { |
|
247 | 247 | $imgopt_settings['autoptimize_imgopt_select_field_2'] = $extra_settings['autoptimize_extra_select_field_6']; |
248 | 248 | } |
249 | - autoptimizeOptionWrapper::update_option( 'autoptimize_imgopt_settings', $imgopt_settings ); |
|
249 | + autoptimizeOptionWrapper::update_option('autoptimize_imgopt_settings', $imgopt_settings); |
|
250 | 250 | } |
251 | 251 | } |
252 | 252 | } |
@@ -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,51 +25,51 @@ 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 | - if ( $schedule ) { |
|
45 | - wp_clear_scheduled_hook( self::SCHEDULE_HOOK ); |
|
43 | + if ($do_cache_check && (!$schedule || $schedule !== $frequency)) { |
|
44 | + if ($schedule) { |
|
45 | + wp_clear_scheduled_hook(self::SCHEDULE_HOOK); |
|
46 | 46 | } |
47 | - wp_schedule_event( time(), $frequency, self::SCHEDULE_HOOK ); |
|
48 | - } elseif ( $schedule && ! $do_cache_check ) { |
|
49 | - wp_clear_scheduled_hook( self::SCHEDULE_HOOK ); |
|
47 | + wp_schedule_event(time(), $frequency, self::SCHEDULE_HOOK); |
|
48 | + } elseif ($schedule && !$do_cache_check) { |
|
49 | + wp_clear_scheduled_hook(self::SCHEDULE_HOOK); |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | 53 | public function cronjob() |
54 | 54 | { |
55 | 55 | // Check cachesize and act accordingly. |
56 | - $max_size = (int) apply_filters( 'autoptimize_filter_cachecheck_maxsize', 536870912 ); |
|
57 | - $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true ); |
|
56 | + $max_size = (int) apply_filters('autoptimize_filter_cachecheck_maxsize', 536870912); |
|
57 | + $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true); |
|
58 | 58 | $stat_array = autoptimizeCache::stats(); |
59 | - $cache_size = round( $stat_array[1] ); |
|
60 | - if ( ( $cache_size > $max_size ) && ( $do_cache_check ) ) { |
|
61 | - autoptimizeOptionWrapper::update_option( 'autoptimize_cachesize_notice', true ); |
|
62 | - if ( apply_filters( 'autoptimize_filter_cachecheck_sendmail', true ) ) { |
|
63 | - $home_url = esc_url( home_url() ); |
|
64 | - $ao_mailto = apply_filters( 'autoptimize_filter_cachecheck_mailto', autoptimizeOptionWrapper::get_option( 'admin_email', '' ) ); |
|
65 | - |
|
66 | - $ao_mailsubject = __( 'Autoptimize cache size warning', 'autoptimize' ) . ' (' . $home_url . ')'; |
|
67 | - $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: ' . $home_url . ')'; |
|
68 | - |
|
69 | - if ( ! empty( $ao_mailto ) ) { |
|
70 | - $ao_mailresult = wp_mail( $ao_mailto, $ao_mailsubject, $ao_mailbody ); |
|
71 | - if ( ! $ao_mailresult ) { |
|
72 | - error_log( 'Autoptimize could not send cache size warning mail.' ); |
|
59 | + $cache_size = round($stat_array[1]); |
|
60 | + if (($cache_size > $max_size) && ($do_cache_check)) { |
|
61 | + autoptimizeOptionWrapper::update_option('autoptimize_cachesize_notice', true); |
|
62 | + if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) { |
|
63 | + $home_url = esc_url(home_url()); |
|
64 | + $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', autoptimizeOptionWrapper::get_option('admin_email', '')); |
|
65 | + |
|
66 | + $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize').' ('.$home_url.')'; |
|
67 | + $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: '.$home_url.')'; |
|
68 | + |
|
69 | + if (!empty($ao_mailto)) { |
|
70 | + $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody); |
|
71 | + if (!$ao_mailresult) { |
|
72 | + error_log('Autoptimize could not send cache size warning mail.'); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | } |
@@ -87,16 +87,16 @@ discard block |
||
87 | 87 | |
88 | 88 | public function show_admin_notice() |
89 | 89 | { |
90 | - if ( (bool) autoptimizeOptionWrapper::get_option( 'autoptimize_cachesize_notice', false ) && current_user_can( 'manage_options' ) ) { |
|
90 | + if ((bool) autoptimizeOptionWrapper::get_option('autoptimize_cachesize_notice', false) && current_user_can('manage_options')) { |
|
91 | 91 | echo '<div class="notice notice-warning"><p>'; |
92 | - _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' ); |
|
92 | + _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'); |
|
93 | 93 | echo '</p></div>'; |
94 | - autoptimizeOptionWrapper::update_option( 'autoptimize_cachesize_notice', false ); |
|
94 | + autoptimizeOptionWrapper::update_option('autoptimize_cachesize_notice', false); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | // Notice for image proxy usage. |
98 | 98 | $_imgopt_notice = autoptimizeImages::instance()->get_imgopt_status_notice_wrapper(); |
99 | - 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, -3 ) ) ) { |
|
99 | + 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, -3))) { |
|
100 | 100 | $_dismissible = 'ao-img-opt-notice-'; |
101 | 101 | $_hide_notice = '7'; |
102 | 102 | |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | $_hide_notice = '1'; |
105 | 105 | } |
106 | 106 | |
107 | - $_imgopt_notice_dismissible = apply_filters( 'autoptimize_filter_imgopt_notice_dismissable', $_dismissible . $_hide_notice ); |
|
107 | + $_imgopt_notice_dismissible = apply_filters('autoptimize_filter_imgopt_notice_dismissable', $_dismissible.$_hide_notice); |
|
108 | 108 | |
109 | - if ( $_imgopt_notice && PAnD::is_admin_notice_active( $_imgopt_notice_dismissible ) ) { |
|
110 | - echo '<div class="notice notice-warning is-dismissible" data-dismissible="' . $_imgopt_notice_dismissible . '"><p><strong>' . __( 'Autoptimize', 'autoptimize' ) . '</strong>: ' . $_imgopt_notice['notice'] . '</p></div>'; |
|
109 | + if ($_imgopt_notice && PAnD::is_admin_notice_active($_imgopt_notice_dismissible)) { |
|
110 | + echo '<div class="notice notice-warning is-dismissible" data-dismissible="'.$_imgopt_notice_dismissible.'"><p><strong>'.__('Autoptimize', 'autoptimize').'</strong>: '.$_imgopt_notice['notice'].'</p></div>'; |
|
111 | 111 | } |
112 | 112 | } |
113 | 113 | } |