@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Handles autoptimizeExtra frontend features + admin options page |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -21,9 +21,9 @@ discard block |
||
21 | 21 | * |
22 | 22 | * @param array $options Optional. Allows overriding options without having to specify them via admin options page. |
23 | 23 | */ |
24 | - public function __construct( $options = array() ) |
|
24 | + public function __construct($options = array()) |
|
25 | 25 | { |
26 | - if ( empty( $options ) ) { |
|
26 | + if (empty($options)) { |
|
27 | 27 | $options = $this->fetch_options(); |
28 | 28 | } |
29 | 29 | |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | |
33 | 33 | public function run() |
34 | 34 | { |
35 | - if ( is_admin() ) { |
|
36 | - add_action( 'admin_menu', array( $this, 'admin_menu' ) ); |
|
37 | - add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) ); |
|
35 | + if (is_admin()) { |
|
36 | + add_action('admin_menu', array($this, 'admin_menu')); |
|
37 | + add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_extra_tab')); |
|
38 | 38 | } else { |
39 | 39 | $this->run_on_frontend(); |
40 | 40 | } |
@@ -42,17 +42,17 @@ discard block |
||
42 | 42 | |
43 | 43 | protected function fetch_options() |
44 | 44 | { |
45 | - $value = get_option( 'autoptimize_extra_settings' ); |
|
46 | - if ( empty( $value ) ) { |
|
45 | + $value = get_option('autoptimize_extra_settings'); |
|
46 | + if (empty($value)) { |
|
47 | 47 | // Fallback to returning defaults when no stored option exists yet. |
48 | 48 | $value = autoptimizeConfig::get_ao_extra_default_options(); |
49 | 49 | } |
50 | 50 | |
51 | 51 | // get service availability. |
52 | - $value['availabilities'] = get_option( 'autoptimize_service_availablity' ); |
|
52 | + $value['availabilities'] = get_option('autoptimize_service_availablity'); |
|
53 | 53 | |
54 | - if ( empty( $value['availabilities'] ) ) { |
|
55 | - $value['availabilities'] = autoptimizeUtils::check_service_availability( true ); |
|
54 | + if (empty($value['availabilities'])) { |
|
55 | + $value['availabilities'] = autoptimizeUtils::check_service_availability(true); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | return $value; |
@@ -61,54 +61,54 @@ discard block |
||
61 | 61 | public function disable_emojis() |
62 | 62 | { |
63 | 63 | // Removing all actions related to emojis! |
64 | - remove_action( 'admin_print_styles', 'print_emoji_styles' ); |
|
65 | - remove_action( 'wp_head', 'print_emoji_detection_script', 7 ); |
|
66 | - remove_action( 'admin_print_scripts', 'print_emoji_detection_script' ); |
|
67 | - remove_action( 'wp_print_styles', 'print_emoji_styles' ); |
|
68 | - remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' ); |
|
69 | - remove_filter( 'the_content_feed', 'wp_staticize_emoji' ); |
|
70 | - remove_filter( 'comment_text_rss', 'wp_staticize_emoji' ); |
|
64 | + remove_action('admin_print_styles', 'print_emoji_styles'); |
|
65 | + remove_action('wp_head', 'print_emoji_detection_script', 7); |
|
66 | + remove_action('admin_print_scripts', 'print_emoji_detection_script'); |
|
67 | + remove_action('wp_print_styles', 'print_emoji_styles'); |
|
68 | + remove_filter('wp_mail', 'wp_staticize_emoji_for_email'); |
|
69 | + remove_filter('the_content_feed', 'wp_staticize_emoji'); |
|
70 | + remove_filter('comment_text_rss', 'wp_staticize_emoji'); |
|
71 | 71 | |
72 | 72 | // Removes TinyMCE emojis. |
73 | - add_filter( 'tiny_mce_plugins', array( $this, 'filter_disable_emojis_tinymce' ) ); |
|
73 | + add_filter('tiny_mce_plugins', array($this, 'filter_disable_emojis_tinymce')); |
|
74 | 74 | |
75 | 75 | // Removes emoji dns-preftech. |
76 | - add_filter( 'wp_resource_hints', array( $this, 'filter_remove_emoji_dns_prefetch' ), 10, 2 ); |
|
76 | + add_filter('wp_resource_hints', array($this, 'filter_remove_emoji_dns_prefetch'), 10, 2); |
|
77 | 77 | } |
78 | 78 | |
79 | - public function filter_disable_emojis_tinymce( $plugins ) |
|
79 | + public function filter_disable_emojis_tinymce($plugins) |
|
80 | 80 | { |
81 | - if ( is_array( $plugins ) ) { |
|
82 | - return array_diff( $plugins, array( 'wpemoji' ) ); |
|
81 | + if (is_array($plugins)) { |
|
82 | + return array_diff($plugins, array('wpemoji')); |
|
83 | 83 | } else { |
84 | 84 | return array(); |
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
88 | - public function filter_remove_qs( $src ) { |
|
89 | - if ( strpos( $src, '?ver=' ) ) { |
|
90 | - $src = remove_query_arg( 'ver', $src ); |
|
88 | + public function filter_remove_qs($src) { |
|
89 | + if (strpos($src, '?ver=')) { |
|
90 | + $src = remove_query_arg('ver', $src); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | return $src; |
94 | 94 | } |
95 | 95 | |
96 | - public function extra_async_js( $in ) |
|
96 | + public function extra_async_js($in) |
|
97 | 97 | { |
98 | 98 | $exclusions = array(); |
99 | - if ( ! empty( $in ) ) { |
|
100 | - $exclusions = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $in ) ) ), '' ); |
|
99 | + if (!empty($in)) { |
|
100 | + $exclusions = array_fill_keys(array_filter(array_map('trim', explode(',', $in))), ''); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | $settings = $this->options['autoptimize_extra_text_field_3']; |
104 | - $async = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $settings ) ) ), '' ); |
|
105 | - $attr = apply_filters( 'autoptimize_filter_extra_async', 'async' ); |
|
106 | - foreach ( $async as $k => $v ) { |
|
107 | - $async[ $k ] = $attr; |
|
104 | + $async = array_fill_keys(array_filter(array_map('trim', explode(',', $settings))), ''); |
|
105 | + $attr = apply_filters('autoptimize_filter_extra_async', 'async'); |
|
106 | + foreach ($async as $k => $v) { |
|
107 | + $async[$k] = $attr; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | // Merge exclusions & asyncs in one array and return to AO API. |
111 | - $merged = array_merge( $exclusions, $async ); |
|
111 | + $merged = array_merge($exclusions, $async); |
|
112 | 112 | |
113 | 113 | return $merged; |
114 | 114 | } |
@@ -118,76 +118,76 @@ discard block |
||
118 | 118 | $options = $this->options; |
119 | 119 | |
120 | 120 | // Disable emojis if specified. |
121 | - if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) ) { |
|
121 | + if (!empty($options['autoptimize_extra_checkbox_field_1'])) { |
|
122 | 122 | $this->disable_emojis(); |
123 | 123 | } |
124 | 124 | |
125 | 125 | // Remove version query parameters. |
126 | - if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) ) { |
|
127 | - add_filter( 'script_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 ); |
|
128 | - add_filter( 'style_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 ); |
|
126 | + if (!empty($options['autoptimize_extra_checkbox_field_0'])) { |
|
127 | + add_filter('script_loader_src', array($this, 'filter_remove_qs'), 15, 1); |
|
128 | + add_filter('style_loader_src', array($this, 'filter_remove_qs'), 15, 1); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | // Making sure is_plugin_active() exists when we need it. |
132 | - if ( ! function_exists( 'is_plugin_active' ) ) { |
|
133 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; |
|
132 | + if (!function_exists('is_plugin_active')) { |
|
133 | + require_once ABSPATH.'wp-admin/includes/plugin.php'; |
|
134 | 134 | } |
135 | 135 | // Avoiding conflicts of interest when async-javascript plugin is active! |
136 | 136 | $async_js_plugin_active = false; |
137 | - if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'async-javascript/async-javascript.php' ) ) { |
|
137 | + if (function_exists('is_plugin_active') && is_plugin_active('async-javascript/async-javascript.php')) { |
|
138 | 138 | $async_js_plugin_active = true; |
139 | 139 | } |
140 | - if ( ! empty( $options['autoptimize_extra_text_field_3'] ) && ! $async_js_plugin_active ) { |
|
141 | - add_filter( 'autoptimize_filter_js_exclude', array( $this, 'extra_async_js' ), 10, 1 ); |
|
140 | + if (!empty($options['autoptimize_extra_text_field_3']) && !$async_js_plugin_active) { |
|
141 | + add_filter('autoptimize_filter_js_exclude', array($this, 'extra_async_js'), 10, 1); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | // Optimize google fonts! |
145 | - if ( ! empty( $options['autoptimize_extra_radio_field_4'] ) && ( '1' !== $options['autoptimize_extra_radio_field_4'] ) ) { |
|
146 | - add_filter( 'wp_resource_hints', array( $this, 'filter_remove_gfonts_dnsprefetch' ), 10, 2 ); |
|
147 | - add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_google_fonts' ), 10, 1 ); |
|
148 | - add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_google_fonts' ), 10, 1 ); |
|
145 | + if (!empty($options['autoptimize_extra_radio_field_4']) && ('1' !== $options['autoptimize_extra_radio_field_4'])) { |
|
146 | + add_filter('wp_resource_hints', array($this, 'filter_remove_gfonts_dnsprefetch'), 10, 2); |
|
147 | + add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_google_fonts'), 10, 1); |
|
148 | + add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_google_fonts'), 10, 1); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | // Preconnect! |
152 | - if ( ! empty( $options['autoptimize_extra_text_field_2'] ) || has_filter( 'autoptimize_extra_filter_tobepreconn' ) ) { |
|
153 | - add_filter( 'wp_resource_hints', array( $this, 'filter_preconnect' ), 10, 2 ); |
|
152 | + if (!empty($options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) { |
|
153 | + add_filter('wp_resource_hints', array($this, 'filter_preconnect'), 10, 2); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | // Optimize Images! |
157 | - if ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && 'down' !== $options['availabilities']['extra_imgopt']['status'] && ( 'launch' !== $options['availabilities']['extra_imgopt']['status'] || $this->imgopt_launch_ok() ) ) { |
|
158 | - if ( apply_filters( 'autoptimize_filter_extra_imgopt_do', true ) ) { |
|
159 | - add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_images' ), 10, 1 ); |
|
157 | + if (!empty($options['autoptimize_extra_checkbox_field_5']) && 'down' !== $options['availabilities']['extra_imgopt']['status'] && ('launch' !== $options['availabilities']['extra_imgopt']['status'] || $this->imgopt_launch_ok())) { |
|
158 | + if (apply_filters('autoptimize_filter_extra_imgopt_do', true)) { |
|
159 | + add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_images'), 10, 1); |
|
160 | 160 | $_imgopt_active = true; |
161 | 161 | } |
162 | - if ( apply_filters( 'autoptimize_filter_extra_imgopt_do_css', true ) ) { |
|
163 | - add_filter( 'autoptimize_filter_base_replace_cdn', array( $this, 'filter_optimize_css_images' ), 10, 1 ); |
|
162 | + if (apply_filters('autoptimize_filter_extra_imgopt_do_css', true)) { |
|
163 | + add_filter('autoptimize_filter_base_replace_cdn', array($this, 'filter_optimize_css_images'), 10, 1); |
|
164 | 164 | $_imgopt_active = true; |
165 | 165 | } |
166 | - if ( $_imgopt_active ) { |
|
167 | - add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_imgopt_url' ), 10, 1 ); |
|
166 | + if ($_imgopt_active) { |
|
167 | + add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_imgopt_url'), 10, 1); |
|
168 | 168 | } |
169 | 169 | } |
170 | 170 | } |
171 | 171 | |
172 | - public function filter_remove_emoji_dns_prefetch( $urls, $relation_type ) |
|
172 | + public function filter_remove_emoji_dns_prefetch($urls, $relation_type) |
|
173 | 173 | { |
174 | - $emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/' ); |
|
174 | + $emoji_svg_url = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/'); |
|
175 | 175 | |
176 | - return $this->filter_remove_dns_prefetch( $urls, $relation_type, $emoji_svg_url ); |
|
176 | + return $this->filter_remove_dns_prefetch($urls, $relation_type, $emoji_svg_url); |
|
177 | 177 | } |
178 | 178 | |
179 | - public function filter_remove_gfonts_dnsprefetch( $urls, $relation_type ) |
|
179 | + public function filter_remove_gfonts_dnsprefetch($urls, $relation_type) |
|
180 | 180 | { |
181 | - return $this->filter_remove_dns_prefetch( $urls, $relation_type, 'fonts.googleapis.com' ); |
|
181 | + return $this->filter_remove_dns_prefetch($urls, $relation_type, 'fonts.googleapis.com'); |
|
182 | 182 | } |
183 | 183 | |
184 | - public function filter_remove_dns_prefetch( $urls, $relation_type, $url_to_remove ) |
|
184 | + public function filter_remove_dns_prefetch($urls, $relation_type, $url_to_remove) |
|
185 | 185 | { |
186 | - if ( 'dns-prefetch' === $relation_type ) { |
|
186 | + if ('dns-prefetch' === $relation_type) { |
|
187 | 187 | $cnt = 0; |
188 | - foreach ( $urls as $url ) { |
|
189 | - if ( false !== strpos( $url, $url_to_remove ) ) { |
|
190 | - unset( $urls[ $cnt ] ); |
|
188 | + foreach ($urls as $url) { |
|
189 | + if (false !== strpos($url, $url_to_remove)) { |
|
190 | + unset($urls[$cnt]); |
|
191 | 191 | } |
192 | 192 | $cnt++; |
193 | 193 | } |
@@ -196,133 +196,133 @@ discard block |
||
196 | 196 | return $urls; |
197 | 197 | } |
198 | 198 | |
199 | - public function filter_optimize_google_fonts( $in ) |
|
199 | + public function filter_optimize_google_fonts($in) |
|
200 | 200 | { |
201 | 201 | // Extract fonts, partly based on wp rocket's extraction code. |
202 | - $markup = preg_replace( '/<!--(.*)-->/Uis', '', $in ); |
|
203 | - preg_match_all( '#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches ); |
|
202 | + $markup = preg_replace('/<!--(.*)-->/Uis', '', $in); |
|
203 | + preg_match_all('#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches); |
|
204 | 204 | |
205 | 205 | $fonts_collection = array(); |
206 | - if ( ! $matches[2] ) { |
|
206 | + if (!$matches[2]) { |
|
207 | 207 | return $in; |
208 | 208 | } |
209 | 209 | |
210 | 210 | // Store them in $fonts array. |
211 | 211 | $i = 0; |
212 | - foreach ( $matches[2] as $font ) { |
|
213 | - if ( ! preg_match( '/rel=["\']dns-prefetch["\']/', $matches[0][ $i ] ) ) { |
|
212 | + foreach ($matches[2] as $font) { |
|
213 | + if (!preg_match('/rel=["\']dns-prefetch["\']/', $matches[0][$i])) { |
|
214 | 214 | // Get fonts name. |
215 | - $font = str_replace( array( '%7C', '%7c' ), '|', $font ); |
|
216 | - $font = explode( 'family=', $font ); |
|
217 | - $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array(); |
|
215 | + $font = str_replace(array('%7C', '%7c'), '|', $font); |
|
216 | + $font = explode('family=', $font); |
|
217 | + $font = (isset($font[1])) ? explode('&', $font[1]) : array(); |
|
218 | 218 | // Add font to $fonts[$i] but make sure not to pollute with an empty family! |
219 | - $_thisfont = array_values( array_filter( explode( '|', reset( $font ) ) ) ); |
|
220 | - if ( ! empty( $_thisfont ) ) { |
|
221 | - $fonts_collection[ $i ]['fonts'] = $_thisfont; |
|
219 | + $_thisfont = array_values(array_filter(explode('|', reset($font)))); |
|
220 | + if (!empty($_thisfont)) { |
|
221 | + $fonts_collection[$i]['fonts'] = $_thisfont; |
|
222 | 222 | // And add subset if any! |
223 | - $subset = ( is_array( $font ) ) ? end( $font ) : ''; |
|
224 | - if ( false !== strpos( $subset, 'subset=' ) ) { |
|
225 | - $subset = str_replace( array( '%2C', '%2c' ), ',', $subset ); |
|
226 | - $subset = explode( 'subset=', $subset ); |
|
227 | - $fonts_collection[ $i ]['subsets'] = explode( ',', $subset[1] ); |
|
223 | + $subset = (is_array($font)) ? end($font) : ''; |
|
224 | + if (false !== strpos($subset, 'subset=')) { |
|
225 | + $subset = str_replace(array('%2C', '%2c'), ',', $subset); |
|
226 | + $subset = explode('subset=', $subset); |
|
227 | + $fonts_collection[$i]['subsets'] = explode(',', $subset[1]); |
|
228 | 228 | } |
229 | 229 | } |
230 | 230 | // And remove Google Fonts. |
231 | - $in = str_replace( $matches[0][ $i ], '', $in ); |
|
231 | + $in = str_replace($matches[0][$i], '', $in); |
|
232 | 232 | } |
233 | 233 | $i++; |
234 | 234 | } |
235 | 235 | |
236 | 236 | $options = $this->options; |
237 | 237 | $fonts_markup = ''; |
238 | - if ( '2' === $options['autoptimize_extra_radio_field_4'] ) { |
|
238 | + if ('2' === $options['autoptimize_extra_radio_field_4']) { |
|
239 | 239 | // Remove Google Fonts. |
240 | - unset( $fonts_collection ); |
|
240 | + unset($fonts_collection); |
|
241 | 241 | return $in; |
242 | - } elseif ( '3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4'] ) { |
|
242 | + } elseif ('3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4']) { |
|
243 | 243 | // Aggregate & link! |
244 | 244 | $fonts_string = ''; |
245 | 245 | $subset_string = ''; |
246 | - foreach ( $fonts_collection as $font ) { |
|
247 | - $fonts_string .= '|' . trim( implode( '|', $font['fonts'] ), '|' ); |
|
248 | - if ( ! empty( $font['subsets'] ) ) { |
|
249 | - $subset_string .= ',' . trim( implode( ',', $font['subsets'] ), ',' ); |
|
246 | + foreach ($fonts_collection as $font) { |
|
247 | + $fonts_string .= '|'.trim(implode('|', $font['fonts']), '|'); |
|
248 | + if (!empty($font['subsets'])) { |
|
249 | + $subset_string .= ','.trim(implode(',', $font['subsets']), ','); |
|
250 | 250 | } |
251 | 251 | } |
252 | 252 | |
253 | - if ( ! empty( $subset_string ) ) { |
|
254 | - $subset_string = str_replace( ',', '%2C', ltrim( $subset_string, ',' ) ); |
|
255 | - $fonts_string = $fonts_string . '&subset=' . $subset_string; |
|
253 | + if (!empty($subset_string)) { |
|
254 | + $subset_string = str_replace(',', '%2C', ltrim($subset_string, ',')); |
|
255 | + $fonts_string = $fonts_string.'&subset='.$subset_string; |
|
256 | 256 | } |
257 | 257 | |
258 | - $fonts_string = str_replace( '|', '%7C', ltrim( $fonts_string, '|' ) ); |
|
258 | + $fonts_string = str_replace('|', '%7C', ltrim($fonts_string, '|')); |
|
259 | 259 | |
260 | - if ( ! empty( $fonts_string ) ) { |
|
261 | - if ( '5' === $options['autoptimize_extra_radio_field_4'] ) { |
|
262 | - $rel_string = 'rel="preload" as="style" onload="' . autoptimizeConfig::get_ao_css_preload_onload() . '"'; |
|
260 | + if (!empty($fonts_string)) { |
|
261 | + if ('5' === $options['autoptimize_extra_radio_field_4']) { |
|
262 | + $rel_string = 'rel="preload" as="style" onload="'.autoptimizeConfig::get_ao_css_preload_onload().'"'; |
|
263 | 263 | } else { |
264 | 264 | $rel_string = 'rel="stylesheet"'; |
265 | 265 | } |
266 | - $fonts_markup = '<link ' . $rel_string . ' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family=' . $fonts_string . '" />'; |
|
266 | + $fonts_markup = '<link '.$rel_string.' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family='.$fonts_string.'" />'; |
|
267 | 267 | } |
268 | - } elseif ( '4' === $options['autoptimize_extra_radio_field_4'] ) { |
|
268 | + } elseif ('4' === $options['autoptimize_extra_radio_field_4']) { |
|
269 | 269 | // Aggregate & load async (webfont.js impl.)! |
270 | 270 | $fonts_array = array(); |
271 | - foreach ( $fonts_collection as $_fonts ) { |
|
272 | - if ( ! empty( $_fonts['subsets'] ) ) { |
|
273 | - $_subset = implode( ',', $_fonts['subsets'] ); |
|
274 | - foreach ( $_fonts['fonts'] as $key => $_one_font ) { |
|
275 | - $_one_font = $_one_font . ':' . $_subset; |
|
276 | - $_fonts['fonts'][ $key ] = $_one_font; |
|
271 | + foreach ($fonts_collection as $_fonts) { |
|
272 | + if (!empty($_fonts['subsets'])) { |
|
273 | + $_subset = implode(',', $_fonts['subsets']); |
|
274 | + foreach ($_fonts['fonts'] as $key => $_one_font) { |
|
275 | + $_one_font = $_one_font.':'.$_subset; |
|
276 | + $_fonts['fonts'][$key] = $_one_font; |
|
277 | 277 | } |
278 | 278 | } |
279 | - $fonts_array = array_merge( $fonts_array, $_fonts['fonts'] ); |
|
279 | + $fonts_array = array_merge($fonts_array, $_fonts['fonts']); |
|
280 | 280 | } |
281 | 281 | |
282 | 282 | $fonts_markup = '<script data-cfasync="false" id="ao_optimized_gfonts" type="text/javascript">WebFontConfig={google:{families:[\''; |
283 | - foreach ( $fonts_array as $fnt ) { |
|
284 | - $fonts_markup .= $fnt . "','"; |
|
283 | + foreach ($fonts_array as $fnt) { |
|
284 | + $fonts_markup .= $fnt."','"; |
|
285 | 285 | } |
286 | - $fonts_markup = trim( trim( $fonts_markup, "'" ), ',' ); |
|
286 | + $fonts_markup = trim(trim($fonts_markup, "'"), ','); |
|
287 | 287 | $fonts_markup .= '] },classes:false, events:false, timeout:1500};(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.async=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>'; |
288 | 288 | } |
289 | 289 | |
290 | 290 | // Replace back in markup. |
291 | - $out = substr_replace( $in, $fonts_markup . '<link', strpos( $in, '<link' ), strlen( '<link' ) ); |
|
292 | - unset( $fonts_collection ); |
|
291 | + $out = substr_replace($in, $fonts_markup.'<link', strpos($in, '<link'), strlen('<link')); |
|
292 | + unset($fonts_collection); |
|
293 | 293 | |
294 | 294 | // and insert preload polyfill if "link preload" and if the polyfill isn't there yet (courtesy of inline&defer). |
295 | 295 | $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill(); |
296 | - if ( '5' === $options['autoptimize_extra_radio_field_4'] && strpos( $out, $preload_polyfill ) === false ) { |
|
297 | - $out = str_replace( '</body>', $preload_polyfill . '</body>', $out ); |
|
296 | + if ('5' === $options['autoptimize_extra_radio_field_4'] && strpos($out, $preload_polyfill) === false) { |
|
297 | + $out = str_replace('</body>', $preload_polyfill.'</body>', $out); |
|
298 | 298 | } |
299 | 299 | return $out; |
300 | 300 | } |
301 | 301 | |
302 | - public function filter_preconnect( $hints, $relation_type ) |
|
302 | + public function filter_preconnect($hints, $relation_type) |
|
303 | 303 | { |
304 | 304 | $options = $this->options; |
305 | 305 | |
306 | 306 | // Get settings and store in array. |
307 | - $preconns = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_2'] ) ) ); |
|
308 | - $preconns = apply_filters( 'autoptimize_extra_filter_tobepreconn', $preconns ); |
|
307 | + $preconns = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_2']))); |
|
308 | + $preconns = apply_filters('autoptimize_extra_filter_tobepreconn', $preconns); |
|
309 | 309 | |
310 | 310 | // Walk array, extract domain and add to new array with crossorigin attribute. |
311 | - foreach ( $preconns as $preconn ) { |
|
312 | - $parsed = parse_url( $preconn ); |
|
311 | + foreach ($preconns as $preconn) { |
|
312 | + $parsed = parse_url($preconn); |
|
313 | 313 | |
314 | - if ( is_array( $parsed ) && empty( $parsed['scheme'] ) ) { |
|
315 | - $domain = '//' . $parsed['host']; |
|
316 | - } elseif ( is_array( $parsed ) ) { |
|
317 | - $domain = $parsed['scheme'] . '://' . $parsed['host']; |
|
314 | + if (is_array($parsed) && empty($parsed['scheme'])) { |
|
315 | + $domain = '//'.$parsed['host']; |
|
316 | + } elseif (is_array($parsed)) { |
|
317 | + $domain = $parsed['scheme'].'://'.$parsed['host']; |
|
318 | 318 | } |
319 | 319 | |
320 | - if ( ! empty( $domain ) ) { |
|
321 | - $hint = array( 'href' => $domain ); |
|
320 | + if (!empty($domain)) { |
|
321 | + $hint = array('href' => $domain); |
|
322 | 322 | // Fonts don't get preconnected unless crossorigin flag is set, non-fonts don't get preconnected if origin flag is set |
323 | 323 | // so hardcode fonts.gstatic.com to come with crossorigin and have filter to add other domains if needed. |
324 | - $crossorigins = apply_filters( 'autoptimize_extra_filter_preconn_crossorigin', array( 'https://fonts.gstatic.com' ) ); |
|
325 | - if ( in_array( $domain, $crossorigins ) ) { |
|
324 | + $crossorigins = apply_filters('autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com')); |
|
325 | + if (in_array($domain, $crossorigins)) { |
|
326 | 326 | $hint['crossorigin'] = 'anonymous'; |
327 | 327 | } |
328 | 328 | $new_hints[] = $hint; |
@@ -330,21 +330,21 @@ discard block |
||
330 | 330 | } |
331 | 331 | |
332 | 332 | // Merge in WP's preconnect hints. |
333 | - if ( 'preconnect' === $relation_type && ! empty( $new_hints ) ) { |
|
334 | - $hints = array_merge( $hints, $new_hints ); |
|
333 | + if ('preconnect' === $relation_type && !empty($new_hints)) { |
|
334 | + $hints = array_merge($hints, $new_hints); |
|
335 | 335 | } |
336 | 336 | |
337 | 337 | return $hints; |
338 | 338 | } |
339 | 339 | |
340 | - public function filter_preconnect_google_fonts( $in ) |
|
340 | + public function filter_preconnect_google_fonts($in) |
|
341 | 341 | { |
342 | - if ( '2' !== $this->options['autoptimize_extra_radio_field_4'] ) { |
|
342 | + if ('2' !== $this->options['autoptimize_extra_radio_field_4']) { |
|
343 | 343 | // Preconnect to fonts.gstatic.com unless we remove gfonts. |
344 | 344 | $in[] = 'https://fonts.gstatic.com'; |
345 | 345 | } |
346 | 346 | |
347 | - if ( '4' === $this->options['autoptimize_extra_radio_field_4'] ) { |
|
347 | + if ('4' === $this->options['autoptimize_extra_radio_field_4']) { |
|
348 | 348 | // Preconnect even more hosts for webfont.js! |
349 | 349 | $in[] = 'https://ajax.googleapis.com'; |
350 | 350 | $in[] = 'https://fonts.googleapis.com'; |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | return $in; |
354 | 354 | } |
355 | 355 | |
356 | - public function filter_optimize_images( $in ) |
|
356 | + public function filter_optimize_images($in) |
|
357 | 357 | { |
358 | 358 | /* |
359 | 359 | * potential future functional improvements: |
@@ -366,26 +366,26 @@ discard block |
||
366 | 366 | $to_replace = array(); |
367 | 367 | |
368 | 368 | // extract img tags. |
369 | - if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $in, $matches ) ) { |
|
370 | - foreach ( $matches[0] as $tag ) { |
|
369 | + if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $in, $matches)) { |
|
370 | + foreach ($matches[0] as $tag) { |
|
371 | 371 | $orig_tag = $tag; |
372 | 372 | $imgopt_w = ''; |
373 | 373 | $imgopt_h = ''; |
374 | 374 | |
375 | 375 | // first do (data-)srcsets. |
376 | - if ( preg_match_all( '#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER ) ) { |
|
377 | - foreach ( $allsrcsets as $srcset ) { |
|
376 | + if (preg_match_all('#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER)) { |
|
377 | + foreach ($allsrcsets as $srcset) { |
|
378 | 378 | $srcset = $srcset[2]; |
379 | - $srcsets = explode( ',', $srcset ); |
|
380 | - foreach ( $srcsets as $indiv_srcset ) { |
|
381 | - $indiv_srcset_parts = explode( ' ', trim( $indiv_srcset ) ); |
|
382 | - if ( $indiv_srcset_parts[1] && rtrim( $indiv_srcset_parts[1], 'w' ) !== $indiv_srcset_parts[1] ) { |
|
383 | - $imgopt_w = rtrim( $indiv_srcset_parts[1], 'w' ); |
|
379 | + $srcsets = explode(',', $srcset); |
|
380 | + foreach ($srcsets as $indiv_srcset) { |
|
381 | + $indiv_srcset_parts = explode(' ', trim($indiv_srcset)); |
|
382 | + if ($indiv_srcset_parts[1] && rtrim($indiv_srcset_parts[1], 'w') !== $indiv_srcset_parts[1]) { |
|
383 | + $imgopt_w = rtrim($indiv_srcset_parts[1], 'w'); |
|
384 | 384 | } |
385 | - if ( $this->can_optimize_image( $indiv_srcset_parts[0] ) ) { |
|
386 | - $imgopt_url = $this->build_imgopt_url( $indiv_srcset_parts[0], $imgopt_w, '' ); |
|
387 | - $tag = str_replace( $indiv_srcset_parts[0], $imgopt_url, $tag ); |
|
388 | - $to_replace[ $orig_tag ] = $tag; |
|
385 | + if ($this->can_optimize_image($indiv_srcset_parts[0])) { |
|
386 | + $imgopt_url = $this->build_imgopt_url($indiv_srcset_parts[0], $imgopt_w, ''); |
|
387 | + $tag = str_replace($indiv_srcset_parts[0], $imgopt_url, $tag); |
|
388 | + $to_replace[$orig_tag] = $tag; |
|
389 | 389 | } |
390 | 390 | } |
391 | 391 | } |
@@ -395,35 +395,35 @@ discard block |
||
395 | 395 | // first reset and then get width and height and add to $imgopt_size. |
396 | 396 | $imgopt_w = ''; |
397 | 397 | $imgopt_h = ''; |
398 | - if ( preg_match( '#width=("|\')(.*)("|\')#Usmi', $tag, $width ) ) { |
|
398 | + if (preg_match('#width=("|\')(.*)("|\')#Usmi', $tag, $width)) { |
|
399 | 399 | $imgopt_w = $width[2]; |
400 | 400 | } |
401 | - if ( preg_match( '#height=("|\')(.*)("|\')#Usmi', $tag, $height ) ) { |
|
401 | + if (preg_match('#height=("|\')(.*)("|\')#Usmi', $tag, $height)) { |
|
402 | 402 | $imgopt_h = $height[2]; |
403 | 403 | } |
404 | 404 | |
405 | 405 | // then start replacing images src. |
406 | - if ( preg_match_all( '#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER ) ) { |
|
407 | - foreach ( $urls as $url ) { |
|
406 | + if (preg_match_all('#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER)) { |
|
407 | + foreach ($urls as $url) { |
|
408 | 408 | $full_src_orig = $url[0]; |
409 | 409 | $url = $url[1]; |
410 | - if ( $this->can_optimize_image( $url ) ) { |
|
411 | - $imgopt_url = $this->build_imgopt_url( $url, $imgopt_w, $imgopt_h ); |
|
412 | - $full_imgopt_src = str_replace( $url, $imgopt_url, $full_src_orig ); |
|
413 | - $tag = str_replace( $full_src_orig, $full_imgopt_src, $tag ); |
|
414 | - $to_replace[ $orig_tag ] = $tag; |
|
410 | + if ($this->can_optimize_image($url)) { |
|
411 | + $imgopt_url = $this->build_imgopt_url($url, $imgopt_w, $imgopt_h); |
|
412 | + $full_imgopt_src = str_replace($url, $imgopt_url, $full_src_orig); |
|
413 | + $tag = str_replace($full_src_orig, $full_imgopt_src, $tag); |
|
414 | + $to_replace[$orig_tag] = $tag; |
|
415 | 415 | } |
416 | 416 | } |
417 | 417 | } |
418 | 418 | } |
419 | 419 | } |
420 | - $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $in ); |
|
420 | + $out = str_replace(array_keys($to_replace), array_values($to_replace), $in); |
|
421 | 421 | |
422 | 422 | // img thumbnails in e.g. woocommerce. |
423 | - if ( strpos( $out, 'data-thumb' ) !== false && apply_filters( 'autoptimize_filter_extra_imgopt_datathumbs', true ) ) { |
|
423 | + if (strpos($out, 'data-thumb') !== false && apply_filters('autoptimize_filter_extra_imgopt_datathumbs', true)) { |
|
424 | 424 | $out = preg_replace_callback( |
425 | 425 | '/\<div(?:[^>]?)\sdata-thumb\=(?:\"|\')(.+?)(?:\"|\')(?:[^>]*)?\>/s', |
426 | - array( $this, 'replace_data_thumbs' ), |
|
426 | + array($this, 'replace_data_thumbs'), |
|
427 | 427 | $out |
428 | 428 | ); |
429 | 429 | } |
@@ -431,13 +431,13 @@ discard block |
||
431 | 431 | return $out; |
432 | 432 | } |
433 | 433 | |
434 | - public function filter_optimize_css_images( $in ) |
|
434 | + public function filter_optimize_css_images($in) |
|
435 | 435 | { |
436 | 436 | $imgopt_base_url = $this->get_imgopt_base_url(); |
437 | - $in = $this->normalize_img_urls( $in ); |
|
437 | + $in = $this->normalize_img_urls($in); |
|
438 | 438 | |
439 | - if ( $this->can_optimize_image( $in ) ) { |
|
440 | - return $this->build_imgopt_url( $in, '', '' ); |
|
439 | + if ($this->can_optimize_image($in)) { |
|
440 | + return $this->build_imgopt_url($in, '', ''); |
|
441 | 441 | } else { |
442 | 442 | return $in; |
443 | 443 | } |
@@ -447,47 +447,47 @@ discard block |
||
447 | 447 | { |
448 | 448 | static $imgopt_base_url = null; |
449 | 449 | |
450 | - if ( is_null( $imgopt_base_url ) ) { |
|
450 | + if (is_null($imgopt_base_url)) { |
|
451 | 451 | $imgopt_host = $this->get_imgopt_host(); |
452 | 452 | $quality = $this->get_img_quality_string(); |
453 | - $ret_val = apply_filters( 'autoptimize_filter_extra_imgopt_wait', 'ret_img' ); // values: ret_wait, ret_img, ret_json, ret_blank. |
|
454 | - $imgopt_base_url = $imgopt_host . 'client/' . $quality . ',' . $ret_val; |
|
455 | - $imgopt_base_url = apply_filters( 'autoptimize_filter_extra_imgopt_base_url', $imgopt_base_url ); |
|
453 | + $ret_val = apply_filters('autoptimize_filter_extra_imgopt_wait', 'ret_img'); // values: ret_wait, ret_img, ret_json, ret_blank. |
|
454 | + $imgopt_base_url = $imgopt_host.'client/'.$quality.','.$ret_val; |
|
455 | + $imgopt_base_url = apply_filters('autoptimize_filter_extra_imgopt_base_url', $imgopt_base_url); |
|
456 | 456 | } |
457 | 457 | |
458 | 458 | return $imgopt_base_url; |
459 | 459 | } |
460 | 460 | |
461 | - private function can_optimize_image( $url ) |
|
461 | + private function can_optimize_image($url) |
|
462 | 462 | { |
463 | 463 | static $cdn_url = null; |
464 | 464 | static $nopti_images = null; |
465 | 465 | |
466 | - if ( is_null( $cdn_url ) ) { |
|
467 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', get_option( 'autoptimize_cdn_url', '' ) ); |
|
466 | + if (is_null($cdn_url)) { |
|
467 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', get_option('autoptimize_cdn_url', '')); |
|
468 | 468 | } |
469 | 469 | |
470 | - if ( is_null( $nopti_images ) ) { |
|
471 | - $nopti_images = apply_filters( 'autoptimize_filter_extra_imgopt_noptimize', '' ); |
|
470 | + if (is_null($nopti_images)) { |
|
471 | + $nopti_images = apply_filters('autoptimize_filter_extra_imgopt_noptimize', ''); |
|
472 | 472 | } |
473 | 473 | |
474 | 474 | $imgopt_base_url = $this->get_imgopt_base_url(); |
475 | 475 | $site_host = AUTOPTIMIZE_SITE_DOMAIN; |
476 | - $url_parsed = parse_url( $url ); |
|
476 | + $url_parsed = parse_url($url); |
|
477 | 477 | |
478 | - if ( $url_parsed['host'] !== $site_host && empty( $cdn_url ) ) { |
|
478 | + if ($url_parsed['host'] !== $site_host && empty($cdn_url)) { |
|
479 | 479 | return false; |
480 | - } elseif ( ! empty( $cdn_url ) && strpos( $url, $cdn_url ) === false && $url_parsed['host'] !== $site_host ) { |
|
480 | + } elseif (!empty($cdn_url) && strpos($url, $cdn_url) === false && $url_parsed['host'] !== $site_host) { |
|
481 | 481 | return false; |
482 | - } elseif ( strpos( $url, '.php' ) !== false ) { |
|
482 | + } elseif (strpos($url, '.php') !== false) { |
|
483 | 483 | return false; |
484 | - } elseif ( str_ireplace( array( '.png', '.gif', '.jpg', '.jpeg', '.webp' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) { |
|
484 | + } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg', '.webp'), '', $url_parsed['path']) === $url_parsed['path']) { |
|
485 | 485 | // fixme: better check against end of string. |
486 | 486 | return false; |
487 | - } elseif ( ! empty( $nopti_images ) ) { |
|
488 | - $nopti_images_array = array_filter( array_map( 'trim', explode( ',', $nopti_images ) ) ); |
|
489 | - foreach ( $nopti_images_array as $nopti_image ) { |
|
490 | - if ( strpos( $url, $nopti_image ) !== false ) { |
|
487 | + } elseif (!empty($nopti_images)) { |
|
488 | + $nopti_images_array = array_filter(array_map('trim', explode(',', $nopti_images))); |
|
489 | + foreach ($nopti_images_array as $nopti_image) { |
|
490 | + if (strpos($url, $nopti_image) !== false) { |
|
491 | 491 | return false; |
492 | 492 | } |
493 | 493 | } |
@@ -495,82 +495,82 @@ discard block |
||
495 | 495 | return true; |
496 | 496 | } |
497 | 497 | |
498 | - private function build_imgopt_url( $orig_url, $width = 0, $height = 0 ) |
|
498 | + private function build_imgopt_url($orig_url, $width = 0, $height = 0) |
|
499 | 499 | { |
500 | 500 | // sanitize width and height. |
501 | - if ( strpos( $width, '%' ) !== false ) { |
|
501 | + if (strpos($width, '%') !== false) { |
|
502 | 502 | $width = 0; |
503 | 503 | } |
504 | - if ( strpos( $height, '%' ) !== false ) { |
|
504 | + if (strpos($height, '%') !== false) { |
|
505 | 505 | $height = 0; |
506 | 506 | } |
507 | 507 | $width = (int) $width; |
508 | 508 | $height = (int) $height; |
509 | 509 | |
510 | - $filtered_url = apply_filters( 'autoptimize_filter_extra_imgopt_build_url', $orig_url, $width, $height ); |
|
510 | + $filtered_url = apply_filters('autoptimize_filter_extra_imgopt_build_url', $orig_url, $width, $height); |
|
511 | 511 | |
512 | - if ( $filtered_url !== $orig_url ) { |
|
512 | + if ($filtered_url !== $orig_url) { |
|
513 | 513 | return $filtered_url; |
514 | 514 | } |
515 | 515 | |
516 | - $orig_url = $this->normalize_img_urls( $orig_url ); |
|
516 | + $orig_url = $this->normalize_img_urls($orig_url); |
|
517 | 517 | $imgopt_base_url = $this->get_imgopt_base_url(); |
518 | 518 | $imgopt_size = ''; |
519 | 519 | |
520 | - if ( $width && 0 !== $width ) { |
|
521 | - $imgopt_size = ',w_' . $width; |
|
520 | + if ($width && 0 !== $width) { |
|
521 | + $imgopt_size = ',w_'.$width; |
|
522 | 522 | } |
523 | 523 | |
524 | - if ( $height && 0 !== $height ) { |
|
525 | - $imgopt_size .= ',h_' . $height; |
|
524 | + if ($height && 0 !== $height) { |
|
525 | + $imgopt_size .= ',h_'.$height; |
|
526 | 526 | } |
527 | 527 | |
528 | - $url = $imgopt_base_url . $imgopt_size . '/' . $orig_url; |
|
528 | + $url = $imgopt_base_url.$imgopt_size.'/'.$orig_url; |
|
529 | 529 | |
530 | 530 | return $url; |
531 | 531 | } |
532 | 532 | |
533 | - public function replace_data_thumbs( $matches ) |
|
533 | + public function replace_data_thumbs($matches) |
|
534 | 534 | { |
535 | - if ( $this->can_optimize_image( $matches[1] ) ) { |
|
536 | - return str_replace( $matches[1], $this->build_imgopt_url( $matches[1], 150, 150 ), $matches[0] ); |
|
535 | + if ($this->can_optimize_image($matches[1])) { |
|
536 | + return str_replace($matches[1], $this->build_imgopt_url($matches[1], 150, 150), $matches[0]); |
|
537 | 537 | } else { |
538 | 538 | return $matches[0]; |
539 | 539 | } |
540 | 540 | } |
541 | 541 | |
542 | - public function filter_preconnect_imgopt_url( $in ) |
|
542 | + public function filter_preconnect_imgopt_url($in) |
|
543 | 543 | { |
544 | - $imgopt_url_array = parse_url( $this->get_imgopt_base_url() ); |
|
545 | - $in[] = $imgopt_url_array['scheme'] . '://' . $imgopt_url_array['host']; |
|
544 | + $imgopt_url_array = parse_url($this->get_imgopt_base_url()); |
|
545 | + $in[] = $imgopt_url_array['scheme'].'://'.$imgopt_url_array['host']; |
|
546 | 546 | |
547 | 547 | return $in; |
548 | 548 | } |
549 | 549 | |
550 | - private function normalize_img_urls( $in ) |
|
550 | + private function normalize_img_urls($in) |
|
551 | 551 | { |
552 | - $parsed_site_url = parse_url( site_url() ); |
|
552 | + $parsed_site_url = parse_url(site_url()); |
|
553 | 553 | |
554 | - if ( strpos( $in, 'http' ) !== 0 && strpos( $in, '//' ) === 0 ) { |
|
555 | - $in = $parsed_site_url['scheme'] . ':' . $in; |
|
556 | - } elseif ( strpos( $in, '/' ) === 0 ) { |
|
557 | - $in = $parsed_site_url['scheme'] . '://' . $parsed_site_url['host'] . $in; |
|
554 | + if (strpos($in, 'http') !== 0 && strpos($in, '//') === 0) { |
|
555 | + $in = $parsed_site_url['scheme'].':'.$in; |
|
556 | + } elseif (strpos($in, '/') === 0) { |
|
557 | + $in = $parsed_site_url['scheme'].'://'.$parsed_site_url['host'].$in; |
|
558 | 558 | } |
559 | 559 | |
560 | - return apply_filters( 'autoptimize_filter_extra_imgopt_normalized_url', $in ); |
|
560 | + return apply_filters('autoptimize_filter_extra_imgopt_normalized_url', $in); |
|
561 | 561 | } |
562 | 562 | |
563 | 563 | private function get_img_quality_array() |
564 | 564 | { |
565 | 565 | static $img_quality_array = null; |
566 | 566 | |
567 | - if ( is_null( $img_quality_array ) ) { |
|
567 | + if (is_null($img_quality_array)) { |
|
568 | 568 | $img_quality_array = array( |
569 | 569 | '1' => 'lossy', |
570 | 570 | '2' => 'glossy', |
571 | 571 | '3' => 'lossless', |
572 | 572 | ); |
573 | - $img_quality_array = apply_filters( 'autoptimize_filter_extra_imgopt_quality_array', $img_quality_array ); |
|
573 | + $img_quality_array = apply_filters('autoptimize_filter_extra_imgopt_quality_array', $img_quality_array); |
|
574 | 574 | } |
575 | 575 | |
576 | 576 | return $img_quality_array; |
@@ -580,12 +580,12 @@ discard block |
||
580 | 580 | { |
581 | 581 | static $_img_q = null; |
582 | 582 | |
583 | - if ( is_null( $_img_q ) ) { |
|
584 | - if ( is_array( $this->options ) && array_key_exists( 'autoptimize_extra_select_field_6', $this->options ) ) { |
|
583 | + if (is_null($_img_q)) { |
|
584 | + if (is_array($this->options) && array_key_exists('autoptimize_extra_select_field_6', $this->options)) { |
|
585 | 585 | $_setting = $this->options['autoptimize_extra_select_field_6']; |
586 | 586 | } |
587 | 587 | |
588 | - if ( ! $_setting || empty( $_setting ) || ( '1' !== $_setting && '3' !== $_setting ) ) { |
|
588 | + if (!$_setting || empty($_setting) || ('1' !== $_setting && '3' !== $_setting)) { |
|
589 | 589 | // default image opt. value is 2 ("glossy"). |
590 | 590 | $_img_q = '2'; |
591 | 591 | } else { |
@@ -600,10 +600,10 @@ discard block |
||
600 | 600 | { |
601 | 601 | static $_img_q_string = null; |
602 | 602 | |
603 | - if ( is_null( $_img_q_string ) ) { |
|
603 | + if (is_null($_img_q_string)) { |
|
604 | 604 | $_quality_array = $this->get_img_quality_array(); |
605 | 605 | $_setting = $this->get_img_quality_setting(); |
606 | - $_img_q_string = apply_filters( 'autoptimize_filter_extra_imgopt_quality', 'q_' . $_quality_array[ $_setting ] ); |
|
606 | + $_img_q_string = apply_filters('autoptimize_filter_extra_imgopt_quality', 'q_'.$_quality_array[$_setting]); |
|
607 | 607 | } |
608 | 608 | |
609 | 609 | return $_img_q_string; |
@@ -618,25 +618,25 @@ discard block |
||
618 | 618 | |
619 | 619 | public function query_img_provider_stats() |
620 | 620 | { |
621 | - if ( ! empty( $this->options['autoptimize_extra_checkbox_field_5'] ) ) { |
|
621 | + if (!empty($this->options['autoptimize_extra_checkbox_field_5'])) { |
|
622 | 622 | $_img_provider_stat_url = ''; |
623 | - $_img_provider_endpoint = $this->get_imgopt_host() . 'read-domain/'; |
|
623 | + $_img_provider_endpoint = $this->get_imgopt_host().'read-domain/'; |
|
624 | 624 | $_site_host = AUTOPTIMIZE_SITE_DOMAIN; |
625 | 625 | |
626 | 626 | // make sure parse_url result makes sense, keeping $_img_provider_stat_url empty if not. |
627 | - if ( $_site_host && ! empty( $_site_host ) ) { |
|
628 | - $_img_provider_stat_url = $_img_provider_endpoint . $_site_host; |
|
627 | + if ($_site_host && !empty($_site_host)) { |
|
628 | + $_img_provider_stat_url = $_img_provider_endpoint.$_site_host; |
|
629 | 629 | } |
630 | 630 | |
631 | - $_img_provider_stat_url = apply_filters( 'autoptimize_filter_extra_imgopt_stat_url', $_img_provider_stat_url ); |
|
631 | + $_img_provider_stat_url = apply_filters('autoptimize_filter_extra_imgopt_stat_url', $_img_provider_stat_url); |
|
632 | 632 | |
633 | 633 | // only do the remote call if $_img_provider_stat_url is not empty to make sure no parse_url weirdness results in useless calls. |
634 | - if ( ! empty( $_img_provider_stat_url ) ) { |
|
635 | - $_img_stat_resp = wp_remote_get( $_img_provider_stat_url ); |
|
636 | - if ( ! is_wp_error( $_img_stat_resp ) ) { |
|
637 | - if ( '200' == wp_remote_retrieve_response_code( $_img_stat_resp ) ) { |
|
638 | - $_img_provider_stat = json_decode( wp_remote_retrieve_body( $_img_stat_resp ), true ); |
|
639 | - update_option( 'autoptimize_imgopt_provider_stat', $_img_provider_stat ); |
|
634 | + if (!empty($_img_provider_stat_url)) { |
|
635 | + $_img_stat_resp = wp_remote_get($_img_provider_stat_url); |
|
636 | + if (!is_wp_error($_img_stat_resp)) { |
|
637 | + if ('200' == wp_remote_retrieve_response_code($_img_stat_resp)) { |
|
638 | + $_img_provider_stat = json_decode(wp_remote_retrieve_body($_img_stat_resp), true); |
|
639 | + update_option('autoptimize_imgopt_provider_stat', $_img_provider_stat); |
|
640 | 640 | } |
641 | 641 | } |
642 | 642 | } |
@@ -647,14 +647,14 @@ discard block |
||
647 | 647 | { |
648 | 648 | static $launch_status = null; |
649 | 649 | |
650 | - if ( is_null( $launch_status ) ) { |
|
650 | + if (is_null($launch_status)) { |
|
651 | 651 | $avail_imgopt = $this->options['availabilities']['extra_imgopt']; |
652 | - $magic_number = intval( substr( md5( parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) ), 0, 3 ), 16 ); |
|
653 | - $has_launched = get_option( 'autoptimize_imgopt_launched', '' ); |
|
654 | - if ( $has_launched || ( is_array( $avail_imgopt ) && array_key_exists( 'launch-threshold', $avail_imgopt ) && $magic_number < $avail_imgopt['launch-threshold'] ) ) { |
|
652 | + $magic_number = intval(substr(md5(parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)), 0, 3), 16); |
|
653 | + $has_launched = get_option('autoptimize_imgopt_launched', ''); |
|
654 | + if ($has_launched || (is_array($avail_imgopt) && array_key_exists('launch-threshold', $avail_imgopt) && $magic_number < $avail_imgopt['launch-threshold'])) { |
|
655 | 655 | $launch_status = true; |
656 | - if ( ! $has_launched ) { |
|
657 | - update_option( 'autoptimize_imgopt_launched', 'on' ); |
|
656 | + if (!$has_launched) { |
|
657 | + update_option('autoptimize_imgopt_launched', 'on'); |
|
658 | 658 | } |
659 | 659 | } else { |
660 | 660 | $launch_status = false; |
@@ -675,10 +675,10 @@ discard block |
||
675 | 675 | { |
676 | 676 | static $imgopt_host = null; |
677 | 677 | |
678 | - if ( is_null( $imgopt_host ) ) { |
|
678 | + if (is_null($imgopt_host)) { |
|
679 | 679 | $avail_imgopt = $this->options['availabilities']['extra_imgopt']; |
680 | - if ( ! empty( $avail_imgopt ) && array_key_exists( 'hosts', $avail_imgopt ) && is_array( $avail_imgopt['hosts'] ) ) { |
|
681 | - $imgopt_host = array_rand( array_flip( $avail_imgopt['hosts'] ) ); |
|
680 | + if (!empty($avail_imgopt) && array_key_exists('hosts', $avail_imgopt) && is_array($avail_imgopt['hosts'])) { |
|
681 | + $imgopt_host = array_rand(array_flip($avail_imgopt['hosts'])); |
|
682 | 682 | } else { |
683 | 683 | $imgopt_host = 'https://cdn.shortpixel.ai/'; |
684 | 684 | } |
@@ -696,25 +696,25 @@ discard block |
||
696 | 696 | |
697 | 697 | public function get_imgopt_status_notice() { |
698 | 698 | $_extra_options = $this->options; |
699 | - if ( ! empty( $_extra_options ) && is_array( $_extra_options ) && array_key_exists( 'autoptimize_extra_checkbox_field_5', $_extra_options ) && ! empty( $_extra_options['autoptimize_extra_checkbox_field_5'] ) ) { |
|
699 | + if (!empty($_extra_options) && is_array($_extra_options) && array_key_exists('autoptimize_extra_checkbox_field_5', $_extra_options) && !empty($_extra_options['autoptimize_extra_checkbox_field_5'])) { |
|
700 | 700 | $_imgopt_notice = ''; |
701 | - $_stat = get_option( 'autoptimize_imgopt_provider_stat', '' ); |
|
701 | + $_stat = get_option('autoptimize_imgopt_provider_stat', ''); |
|
702 | 702 | $_site_host = AUTOPTIMIZE_SITE_DOMAIN; |
703 | - $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . $_site_host; |
|
703 | + $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.$_site_host; |
|
704 | 704 | |
705 | - if ( is_array( $_stat ) ) { |
|
706 | - if ( 1 == $_stat['Status'] ) { |
|
705 | + if (is_array($_stat)) { |
|
706 | + if (1 == $_stat['Status']) { |
|
707 | 707 | // translators: "add more credits" will appear in a "a href". |
708 | - $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' ); |
|
708 | + $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>'); |
|
709 | 709 | } elseif ( -1 == $_stat['Status'] ) { |
710 | 710 | // translators: "add more credits" will appear in a "a href". |
711 | - $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' ); |
|
711 | + $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>'); |
|
712 | 712 | } else { |
713 | 713 | $_imgopt_upsell = 'https://shortpixel.com/g/af/GWRGFLW109483'; |
714 | 714 | // translators: "log in to check your account" will appear in a "a href". |
715 | - $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' ); |
|
715 | + $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>'); |
|
716 | 716 | } |
717 | - $_imgopt_notice = apply_filters( 'autoptimize_filter_imgopt_notice', $_imgopt_notice ); |
|
717 | + $_imgopt_notice = apply_filters('autoptimize_filter_imgopt_notice', $_imgopt_notice); |
|
718 | 718 | |
719 | 719 | return array( |
720 | 720 | 'status' => $_stat['Status'], |
@@ -733,13 +733,13 @@ discard block |
||
733 | 733 | |
734 | 734 | public function admin_menu() |
735 | 735 | { |
736 | - add_submenu_page( null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', array( $this, 'options_page' ) ); |
|
737 | - register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' ); |
|
736 | + add_submenu_page(null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', array($this, 'options_page')); |
|
737 | + register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings'); |
|
738 | 738 | } |
739 | 739 | |
740 | - public function add_extra_tab( $in ) |
|
740 | + public function add_extra_tab($in) |
|
741 | 741 | { |
742 | - $in = array_merge( $in, array( 'autoptimize_extra' => __( 'Extra', 'autoptimize' ) ) ); |
|
742 | + $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize'))); |
|
743 | 743 | |
744 | 744 | return $in; |
745 | 745 | } |
@@ -752,7 +752,7 @@ discard block |
||
752 | 752 | // behavior being persisted in the DB even if save is done here. |
753 | 753 | $options = $this->fetch_options(); |
754 | 754 | $gfonts = $options['autoptimize_extra_radio_field_4']; |
755 | - $sp_url_suffix = '/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN; |
|
755 | + $sp_url_suffix = '/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN; |
|
756 | 756 | ?> |
757 | 757 | <style> |
758 | 758 | #ao_settings_form {background: white;border: 1px solid #ccc;padding: 1px 15px;margin: 15px 10px 10px 0;} |
@@ -760,35 +760,35 @@ discard block |
||
760 | 760 | #autoptimize_extra_descr{font-size: 120%;} |
761 | 761 | </style> |
762 | 762 | <div class="wrap"> |
763 | - <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
763 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
764 | 764 | <?php echo autoptimizeConfig::ao_admin_tabs(); ?> |
765 | 765 | <?php |
766 | - if ( 'on' !== get_option( 'autoptimize_js' ) && 'on' !== get_option( 'autoptimize_css' ) && 'on' !== get_option( 'autoptimize_html' ) ) { |
|
766 | + if ('on' !== get_option('autoptimize_js') && 'on' !== get_option('autoptimize_css') && 'on' !== get_option('autoptimize_html')) { |
|
767 | 767 | ?> |
768 | 768 | <div class="notice-warning notice"><p> |
769 | 769 | <?php |
770 | - _e( 'Most of below Extra optimizations require at least one of HTML, JS or CSS autoptimizations being active.', 'autoptimize' ); |
|
770 | + _e('Most of below Extra optimizations require at least one of HTML, JS or CSS autoptimizations being active.', 'autoptimize'); |
|
771 | 771 | ?> |
772 | 772 | </p></div> |
773 | 773 | <?php |
774 | 774 | } |
775 | 775 | |
776 | - if ( 'down' === $options['availabilities']['extra_imgopt']['status'] ) { |
|
776 | + if ('down' === $options['availabilities']['extra_imgopt']['status']) { |
|
777 | 777 | ?> |
778 | 778 | <div class="notice-warning notice"><p> |
779 | 779 | <?php |
780 | 780 | // translators: "Autoptimize support forum" will appear in a "a href". |
781 | - echo sprintf( __( 'The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize' ), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>' ); |
|
781 | + echo sprintf(__('The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize'), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>'); |
|
782 | 782 | ?> |
783 | 783 | </p></div> |
784 | 784 | <?php |
785 | 785 | } |
786 | 786 | |
787 | - if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] && ! $this->imgopt_launch_ok() ) { |
|
787 | + if ('launch' === $options['availabilities']['extra_imgopt']['status'] && !$this->imgopt_launch_ok()) { |
|
788 | 788 | ?> |
789 | 789 | <div class="notice-warning notice"><p> |
790 | 790 | <?php |
791 | - _e( 'The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize' ); |
|
791 | + _e('The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize'); |
|
792 | 792 | ?> |
793 | 793 | </p></div> |
794 | 794 | <?php |
@@ -796,29 +796,29 @@ discard block |
||
796 | 796 | |
797 | 797 | ?> |
798 | 798 | <form id='ao_settings_form' action='options.php' method='post'> |
799 | - <?php settings_fields( 'autoptimize_extra_settings' ); ?> |
|
800 | - <h2><?php _e( 'Extra Auto-Optimizations', 'autoptimize' ); ?></h2> |
|
801 | - <span id='autoptimize_extra_descr'><?php _e( 'The following settings can improve your site\'s performance even more.', 'autoptimize' ); ?></span> |
|
799 | + <?php settings_fields('autoptimize_extra_settings'); ?> |
|
800 | + <h2><?php _e('Extra Auto-Optimizations', 'autoptimize'); ?></h2> |
|
801 | + <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.', 'autoptimize'); ?></span> |
|
802 | 802 | <table class="form-table"> |
803 | 803 | <tr> |
804 | - <th scope="row"><?php _e( 'Google Fonts', 'autoptimize' ); ?></th> |
|
804 | + <th scope="row"><?php _e('Google Fonts', 'autoptimize'); ?></th> |
|
805 | 805 | <td> |
806 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if ( ! in_array( $gfonts, array( 2, 3, 4, 5 ) ) ) { echo 'checked'; } ?> ><?php _e( 'Leave as is', 'autoptimize' ); ?><br/> |
|
807 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked( 2, $gfonts, true ); ?> ><?php _e( 'Remove Google Fonts', 'autoptimize' ); ?><br/> |
|
808 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked( 3, $gfonts, true ); ?> ><?php _e( 'Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize' ); ?><br/> |
|
809 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked( 5, $gfonts, true ); ?> ><?php _e( 'Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize' ); ?><br/> |
|
810 | - <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked( 4, $gfonts, true ); ?> ><?php _e( 'Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize' ); ?><br/> |
|
806 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($gfonts, array(2, 3, 4, 5))) { echo 'checked'; } ?> ><?php _e('Leave as is', 'autoptimize'); ?><br/> |
|
807 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $gfonts, true); ?> ><?php _e('Remove Google Fonts', 'autoptimize'); ?><br/> |
|
808 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $gfonts, true); ?> ><?php _e('Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize'); ?><br/> |
|
809 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked(5, $gfonts, true); ?> ><?php _e('Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize'); ?><br/> |
|
810 | + <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $gfonts, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize'); ?><br/> |
|
811 | 811 | </td> |
812 | 812 | </tr> |
813 | 813 | <tr> |
814 | - <th scope="row"><?php _e( 'Optimize Images', 'autoptimize' ); ?></th> |
|
814 | + <th scope="row"><?php _e('Optimize Images', 'autoptimize'); ?></th> |
|
815 | 815 | <td> |
816 | - <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_5]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && '1' === $options['autoptimize_extra_checkbox_field_5'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Optimize images on the fly and serve them from a CDN.', 'autoptimize' ); ?></label> |
|
816 | + <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_5]' <?php if (!empty($options['autoptimize_extra_checkbox_field_5']) && '1' === $options['autoptimize_extra_checkbox_field_5']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Optimize images on the fly and serve them from a CDN.', 'autoptimize'); ?></label> |
|
817 | 817 | <?php |
818 | 818 | // show shortpixel status. |
819 | 819 | $_notice = $this->get_imgopt_status_notice(); |
820 | - if ( $_notice ) { |
|
821 | - switch ( $_notice['status'] ) { |
|
820 | + if ($_notice) { |
|
821 | + switch ($_notice['status']) { |
|
822 | 822 | case 2: |
823 | 823 | $_notice_color = 'green'; |
824 | 824 | break; |
@@ -831,27 +831,27 @@ discard block |
||
831 | 831 | default: |
832 | 832 | $_notice_color = 'green'; |
833 | 833 | } |
834 | - echo apply_filters( 'autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:' . $_notice_color . ';">' . __( 'Shortpixel status: ', 'autoptimize' ) . '</span></strong>' . $_notice['notice'] . '</p>' ); |
|
834 | + echo apply_filters('autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:'.$_notice_color.';">'.__('Shortpixel status: ', 'autoptimize').'</span></strong>'.$_notice['notice'].'</p>'); |
|
835 | 835 | } else { |
836 | 836 | // translators: link points to shortpixel. |
837 | - $upsell_msg_1 = '<p>' . sprintf( __( 'Get more Google love and improve your website\'s loading speed by having the images optimized on the fly by %1$sShortPixel%2$s and then cached and served fast from a CDN.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' ); |
|
838 | - if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] ) { |
|
839 | - $upsell_msg_2 = __( 'For a limited time only, this service is offered free-for-all, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize' ); |
|
837 | + $upsell_msg_1 = '<p>'.sprintf(__('Get more Google love and improve your website\'s loading speed by having the images optimized on the fly by %1$sShortPixel%2$s and then cached and served fast from a CDN.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>'); |
|
838 | + if ('launch' === $options['availabilities']['extra_imgopt']['status']) { |
|
839 | + $upsell_msg_2 = __('For a limited time only, this service is offered free-for-all, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize'); |
|
840 | 840 | } else { |
841 | - $upsell_msg_2 = __( 'The service is offered for free for 100 images/month regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize' ); |
|
841 | + $upsell_msg_2 = __('The service is offered for free for 100 images/month regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize'); |
|
842 | 842 | } |
843 | - echo apply_filters( 'autoptimize_extra_imgopt_settings_copy', $upsell_msg_1 . ' ' . $upsell_msg_2 . '</p>' ); |
|
843 | + echo apply_filters('autoptimize_extra_imgopt_settings_copy', $upsell_msg_1.' '.$upsell_msg_2.'</p>'); |
|
844 | 844 | } |
845 | 845 | // translators: link points to shortpixel FAQ. |
846 | - $faqcopy = sprintf( __( '<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize' ), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>' ); |
|
846 | + $faqcopy = sprintf(__('<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize'), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>'); |
|
847 | 847 | // translators: links points to shortpixel TOS & Privacy Policy. |
848 | - $toscopy = sprintf( __( 'Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize' ), '<a href="https://shortpixel.com/tos' . $sp_url_suffix . '" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp' . $sp_url_suffix . '" target="_blank">', '</a>' ); |
|
849 | - echo apply_filters( 'autoptimize_extra_imgopt_settings_tos', '<p>' . $faqcopy . ' ' . $toscopy . '</p>' ); |
|
848 | + $toscopy = sprintf(__('Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize'), '<a href="https://shortpixel.com/tos'.$sp_url_suffix.'" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp'.$sp_url_suffix.'" target="_blank">', '</a>'); |
|
849 | + echo apply_filters('autoptimize_extra_imgopt_settings_tos', '<p>'.$faqcopy.' '.$toscopy.'</p>'); |
|
850 | 850 | ?> |
851 | 851 | </td> |
852 | 852 | </tr> |
853 | - <tr id='autoptimize_imgopt_quality' <?php if ( ! array_key_exists( 'autoptimize_extra_checkbox_field_5', $options ) || ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && '1' !== $options['autoptimize_extra_checkbox_field_5'] ) ) { echo 'class="hidden"'; } ?>> |
|
854 | - <th scope="row"><?php _e( 'Image Optimization quality', 'autoptimize' ); ?></th> |
|
853 | + <tr id='autoptimize_imgopt_quality' <?php if (!array_key_exists('autoptimize_extra_checkbox_field_5', $options) || (!empty($options['autoptimize_extra_checkbox_field_5']) && '1' !== $options['autoptimize_extra_checkbox_field_5'])) { echo 'class="hidden"'; } ?>> |
|
854 | + <th scope="row"><?php _e('Image Optimization quality', 'autoptimize'); ?></th> |
|
855 | 855 | <td> |
856 | 856 | <label> |
857 | 857 | <select name='autoptimize_extra_settings[autoptimize_extra_select_field_6]'> |
@@ -859,12 +859,12 @@ discard block |
||
859 | 859 | $_imgopt_array = $this->get_img_quality_array(); |
860 | 860 | $_imgopt_val = $this->get_img_quality_setting(); |
861 | 861 | |
862 | - foreach ( $_imgopt_array as $key => $value ) { |
|
863 | - echo '<option value="' . $key . '"'; |
|
864 | - if ( $_imgopt_val == $key ) { |
|
862 | + foreach ($_imgopt_array as $key => $value) { |
|
863 | + echo '<option value="'.$key.'"'; |
|
864 | + if ($_imgopt_val == $key) { |
|
865 | 865 | echo ' selected'; |
866 | 866 | } |
867 | - echo '>' . ucfirst( $value ) . '</option>'; |
|
867 | + echo '>'.ucfirst($value).'</option>'; |
|
868 | 868 | } |
869 | 869 | echo "\n"; |
870 | 870 | ?> |
@@ -873,69 +873,69 @@ discard block |
||
873 | 873 | <p> |
874 | 874 | <?php |
875 | 875 | // translators: link points to shortpixel image test page. |
876 | - echo apply_filters( 'autoptimize_extra_imgopt_quality_copy', sprintf( __( 'You can %1$stest compression levels here%2$s.', 'autoptimize' ), '<a href="https://shortpixel.com/oic' . $sp_url_suffix . '" target="_blank">', '</a>' ) ); |
|
876 | + echo apply_filters('autoptimize_extra_imgopt_quality_copy', sprintf(__('You can %1$stest compression levels here%2$s.', 'autoptimize'), '<a href="https://shortpixel.com/oic'.$sp_url_suffix.'" target="_blank">', '</a>')); |
|
877 | 877 | ?> |
878 | 878 | </p> |
879 | 879 | </td> |
880 | 880 | </tr> |
881 | 881 | <tr> |
882 | - <th scope="row"><?php _e( 'Remove emojis', 'autoptimize' ); ?></th> |
|
882 | + <th scope="row"><?php _e('Remove emojis', 'autoptimize'); ?></th> |
|
883 | 883 | <td> |
884 | - <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) && '1' === $options['autoptimize_extra_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize' ); ?></label> |
|
884 | + <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($options['autoptimize_extra_checkbox_field_1']) && '1' === $options['autoptimize_extra_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize'); ?></label> |
|
885 | 885 | </td> |
886 | 886 | </tr> |
887 | 887 | <tr> |
888 | - <th scope="row"><?php _e( 'Remove query strings from static resources', 'autoptimize' ); ?></th> |
|
888 | + <th scope="row"><?php _e('Remove query strings from static resources', 'autoptimize'); ?></th> |
|
889 | 889 | <td> |
890 | - <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) && '1' === $options['autoptimize_extra_checkbox_field_0'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize' ); ?></label> |
|
890 | + <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty($options['autoptimize_extra_checkbox_field_0']) && '1' === $options['autoptimize_extra_checkbox_field_0']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize'); ?></label> |
|
891 | 891 | </td> |
892 | 892 | </tr> |
893 | 893 | <tr> |
894 | - <th scope="row"><?php _e( 'Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize' ); ?></th> |
|
894 | + <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize'); ?></th> |
|
895 | 895 | <td> |
896 | - <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php echo esc_attr( $options['autoptimize_extra_text_field_2'] ); ?>'><br /><?php _e( 'Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize' ); ?></label> |
|
896 | + <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php echo esc_attr($options['autoptimize_extra_text_field_2']); ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize'); ?></label> |
|
897 | 897 | </td> |
898 | 898 | </tr> |
899 | 899 | <tr> |
900 | - <th scope="row"><?php _e( 'Async Javascript-files <em>(advanced users)</em>', 'autoptimize' ); ?></th> |
|
900 | + <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th> |
|
901 | 901 | <td> |
902 | 902 | <?php |
903 | - if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'async-javascript/async-javascript.php' ) ) { |
|
903 | + if (function_exists('is_plugin_active') && is_plugin_active('async-javascript/async-javascript.php')) { |
|
904 | 904 | // translators: link points Async Javascript settings page. |
905 | - printf( __( 'You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize' ), '<a href="' . 'options-general.php?page=async-javascript' . '">', '</a>' ); |
|
905 | + printf(__('You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize'), '<a href="'.'options-general.php?page=async-javascript'.'">', '</a>'); |
|
906 | 906 | } else { |
907 | 907 | ?> |
908 | - <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php echo esc_attr( $options['autoptimize_extra_text_field_3'] ); ?>'> |
|
908 | + <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php echo esc_attr($options['autoptimize_extra_text_field_3']); ?>'> |
|
909 | 909 | <br /> |
910 | 910 | <?php |
911 | - _e( 'Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize' ); |
|
911 | + _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize'); |
|
912 | 912 | // translators: %s will be replaced by a link to the "async javascript" plugin. |
913 | - echo sprintf( __( 'Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize' ), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"' ); |
|
914 | - $asj_install_url = network_admin_url() . 'plugin-install.php?s=async+javascript&tab=search&type=term'; |
|
915 | - echo sprintf( ' <a href="' . $asj_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) ); |
|
913 | + echo sprintf(__('Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize'), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"'); |
|
914 | + $asj_install_url = network_admin_url().'plugin-install.php?s=async+javascript&tab=search&type=term'; |
|
915 | + echo sprintf(' <a href="'.$asj_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize')); |
|
916 | 916 | } |
917 | 917 | ?> |
918 | 918 | </td> |
919 | 919 | </tr> |
920 | 920 | <tr> |
921 | - <th scope="row"><?php _e( 'Optimize YouTube videos', 'autoptimize' ); ?></th> |
|
921 | + <th scope="row"><?php _e('Optimize YouTube videos', 'autoptimize'); ?></th> |
|
922 | 922 | <td> |
923 | 923 | <?php |
924 | - if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'wp-youtube-lyte/wp-youtube-lyte.php' ) ) { |
|
925 | - _e( 'Great, you have WP YouTube Lyte installed.', 'autoptimize' ); |
|
924 | + if (function_exists('is_plugin_active') && is_plugin_active('wp-youtube-lyte/wp-youtube-lyte.php')) { |
|
925 | + _e('Great, you have WP YouTube Lyte installed.', 'autoptimize'); |
|
926 | 926 | $lyte_config_url = 'options-general.php?page=lyte_settings_page'; |
927 | - echo sprintf( ' <a href="' . $lyte_config_url . '">%s</a>', __( 'Click here to configure it.', 'autoptimize' ) ); |
|
927 | + echo sprintf(' <a href="'.$lyte_config_url.'">%s</a>', __('Click here to configure it.', 'autoptimize')); |
|
928 | 928 | } else { |
929 | 929 | // translators: %s will be replaced by a link to "wp youtube lyte" plugin. |
930 | - echo sprintf( __( '%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize' ), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>' ); |
|
931 | - $lyte_install_url = network_admin_url() . 'plugin-install.php?s=lyte&tab=search&type=term'; |
|
932 | - echo sprintf( ' <a href="' . $lyte_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) ); |
|
930 | + echo sprintf(__('%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize'), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>'); |
|
931 | + $lyte_install_url = network_admin_url().'plugin-install.php?s=lyte&tab=search&type=term'; |
|
932 | + echo sprintf(' <a href="'.$lyte_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize')); |
|
933 | 933 | } |
934 | 934 | ?> |
935 | 935 | </td> |
936 | 936 | </tr> |
937 | 937 | </table> |
938 | - <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /></p> |
|
938 | + <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /></p> |
|
939 | 939 | </form> |
940 | 940 | <script> |
941 | 941 | jQuery(document).ready(function() { |