@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Handles optimizing images. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -23,17 +23,17 @@ discard block |
||
23 | 23 | */ |
24 | 24 | protected static $instance = null; |
25 | 25 | |
26 | - public function __construct( array $options = array() ) |
|
26 | + public function __construct(array $options = array()) |
|
27 | 27 | { |
28 | 28 | // If options are not provided, fetch them. |
29 | - if ( empty( $options ) ) { |
|
29 | + if (empty($options)) { |
|
30 | 30 | $options = $this->fetch_options(); |
31 | 31 | } |
32 | 32 | |
33 | - $this->set_options( $options ); |
|
33 | + $this->set_options($options); |
|
34 | 34 | } |
35 | 35 | |
36 | - public function set_options( array $options ) |
|
36 | + public function set_options(array $options) |
|
37 | 37 | { |
38 | 38 | $this->options = $options; |
39 | 39 | |
@@ -42,17 +42,17 @@ discard block |
||
42 | 42 | |
43 | 43 | public static function fetch_options() |
44 | 44 | { |
45 | - $value = get_option( 'autoptimize_imgopt_settings' ); |
|
46 | - if ( empty( $value ) ) { |
|
45 | + $value = get_option('autoptimize_imgopt_settings'); |
|
46 | + if (empty($value)) { |
|
47 | 47 | // Fallback to returning defaults when no stored option exists yet. |
48 | 48 | $value = autoptimizeConfig::get_ao_imgopt_default_options(); |
49 | 49 | } |
50 | 50 | |
51 | 51 | // get service availability and add it to the options-array. |
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; |
@@ -65,9 +65,9 @@ discard block |
||
65 | 65 | // and does not use/ request the availablity data (which could slow things down). |
66 | 66 | static $imgopt_active = null; |
67 | 67 | |
68 | - if ( null === $imgopt_active ) { |
|
69 | - $opts = get_option( 'autoptimize_imgopt_settings', '' ); |
|
70 | - if ( ! empty( $opts ) && is_array( $opts ) && array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $opts ) && ! empty( $opts['autoptimize_imgopt_checkbox_field_1'] ) && '1' === $opts['autoptimize_imgopt_checkbox_field_1'] ) { |
|
68 | + if (null === $imgopt_active) { |
|
69 | + $opts = get_option('autoptimize_imgopt_settings', ''); |
|
70 | + if (!empty($opts) && is_array($opts) && array_key_exists('autoptimize_imgopt_checkbox_field_1', $opts) && !empty($opts['autoptimize_imgopt_checkbox_field_1']) && '1' === $opts['autoptimize_imgopt_checkbox_field_1']) { |
|
71 | 71 | $imgopt_active = true; |
72 | 72 | } else { |
73 | 73 | $imgopt_active = false; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | */ |
88 | 88 | public static function instance() |
89 | 89 | { |
90 | - if ( null === self::$instance ) { |
|
90 | + if (null === self::$instance) { |
|
91 | 91 | self::$instance = new self(); |
92 | 92 | } |
93 | 93 | |
@@ -96,26 +96,26 @@ discard block |
||
96 | 96 | |
97 | 97 | public function run() |
98 | 98 | { |
99 | - if ( is_admin() ) { |
|
100 | - add_action( 'admin_menu', array( $this, 'imgopt_admin_menu' ) ); |
|
101 | - add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_imgopt_tab' ), 9 ); |
|
99 | + if (is_admin()) { |
|
100 | + add_action('admin_menu', array($this, 'imgopt_admin_menu')); |
|
101 | + add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_imgopt_tab'), 9); |
|
102 | 102 | } else { |
103 | 103 | $this->run_on_frontend(); |
104 | 104 | } |
105 | 105 | } |
106 | 106 | |
107 | 107 | public function run_on_frontend() { |
108 | - if ( ! $this->should_run() ) { |
|
109 | - if ( $this->should_lazyload() ) { |
|
108 | + if (!$this->should_run()) { |
|
109 | + if ($this->should_lazyload()) { |
|
110 | 110 | add_filter( |
111 | 111 | 'autoptimize_html_after_minify', |
112 | - array( $this, 'filter_lazyload_images' ), |
|
112 | + array($this, 'filter_lazyload_images'), |
|
113 | 113 | 10, |
114 | 114 | 1 |
115 | 115 | ); |
116 | 116 | add_action( |
117 | 117 | 'wp_footer', |
118 | - array( $this, 'add_lazyload_js_footer' ), |
|
118 | + array($this, 'add_lazyload_js_footer'), |
|
119 | 119 | 10, |
120 | 120 | 0 |
121 | 121 | ); |
@@ -125,39 +125,39 @@ discard block |
||
125 | 125 | |
126 | 126 | $active = false; |
127 | 127 | |
128 | - if ( apply_filters( 'autoptimize_filter_imgopt_do', true ) ) { |
|
128 | + if (apply_filters('autoptimize_filter_imgopt_do', true)) { |
|
129 | 129 | add_filter( |
130 | 130 | 'autoptimize_html_after_minify', |
131 | - array( $this, 'filter_optimize_images' ), |
|
131 | + array($this, 'filter_optimize_images'), |
|
132 | 132 | 10, |
133 | 133 | 1 |
134 | 134 | ); |
135 | 135 | $active = true; |
136 | 136 | } |
137 | 137 | |
138 | - if ( apply_filters( 'autoptimize_filter_imgopt_do_css', true ) ) { |
|
138 | + if (apply_filters('autoptimize_filter_imgopt_do_css', true)) { |
|
139 | 139 | add_filter( |
140 | 140 | 'autoptimize_filter_base_replace_cdn', |
141 | - array( $this, 'filter_optimize_css_images' ), |
|
141 | + array($this, 'filter_optimize_css_images'), |
|
142 | 142 | 10, |
143 | 143 | 1 |
144 | 144 | ); |
145 | 145 | $active = true; |
146 | 146 | } |
147 | 147 | |
148 | - if ( $active ) { |
|
148 | + if ($active) { |
|
149 | 149 | add_filter( |
150 | 150 | 'autoptimize_extra_filter_tobepreconn', |
151 | - array( $this, 'filter_preconnect_imgopt_url' ), |
|
151 | + array($this, 'filter_preconnect_imgopt_url'), |
|
152 | 152 | 10, |
153 | 153 | 1 |
154 | 154 | ); |
155 | 155 | } |
156 | 156 | |
157 | - if ( $this->should_lazyload() ) { |
|
157 | + if ($this->should_lazyload()) { |
|
158 | 158 | add_action( |
159 | 159 | 'wp_footer', |
160 | - array( $this, 'add_lazyload_js_footer' ) |
|
160 | + array($this, 'add_lazyload_js_footer') |
|
161 | 161 | ); |
162 | 162 | } |
163 | 163 | } |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | protected function should_run() |
171 | 171 | { |
172 | 172 | $opts = $this->options; |
173 | - $service_not_down = ( 'down' !== $opts['availabilities']['extra_imgopt']['status'] ); |
|
174 | - $not_launch_status = ( 'launch' !== $opts['availabilities']['extra_imgopt']['status'] ); |
|
173 | + $service_not_down = ('down' !== $opts['availabilities']['extra_imgopt']['status']); |
|
174 | + $not_launch_status = ('launch' !== $opts['availabilities']['extra_imgopt']['status']); |
|
175 | 175 | |
176 | 176 | $do_cdn = true; |
177 | 177 | $_userstatus = $this->get_imgopt_provider_userstatus(); |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $this->imgopt_active() |
184 | 184 | && $do_cdn |
185 | 185 | && $service_not_down |
186 | - && ( $not_launch_status || $this->launch_ok() ) |
|
186 | + && ($not_launch_status || $this->launch_ok()) |
|
187 | 187 | ) { |
188 | 188 | return true; |
189 | 189 | } |
@@ -194,13 +194,13 @@ discard block |
||
194 | 194 | { |
195 | 195 | static $imgopt_host = null; |
196 | 196 | |
197 | - if ( null === $imgopt_host ) { |
|
197 | + if (null === $imgopt_host) { |
|
198 | 198 | $imgopt_host = 'https://cdn.shortpixel.ai/'; |
199 | 199 | $avail_imgopt = $this->options['availabilities']['extra_imgopt']; |
200 | - if ( ! empty( $avail_imgopt ) && array_key_exists( 'hosts', $avail_imgopt ) && is_array( $avail_imgopt['hosts'] ) ) { |
|
201 | - $imgopt_host = array_rand( array_flip( $avail_imgopt['hosts'] ) ); |
|
200 | + if (!empty($avail_imgopt) && array_key_exists('hosts', $avail_imgopt) && is_array($avail_imgopt['hosts'])) { |
|
201 | + $imgopt_host = array_rand(array_flip($avail_imgopt['hosts'])); |
|
202 | 202 | } |
203 | - $imgopt_host = apply_filters( 'autoptimize_filter_imgopt_host', $imgopt_host ); |
|
203 | + $imgopt_host = apply_filters('autoptimize_filter_imgopt_host', $imgopt_host); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | return $imgopt_host; |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | |
216 | 216 | public static function get_service_url_suffix() |
217 | 217 | { |
218 | - $suffix = '/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN; |
|
218 | + $suffix = '/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN; |
|
219 | 219 | |
220 | 220 | return $suffix; |
221 | 221 | } |
@@ -224,12 +224,12 @@ discard block |
||
224 | 224 | { |
225 | 225 | static $quality = null; |
226 | 226 | |
227 | - if ( null === $quality ) { |
|
227 | + if (null === $quality) { |
|
228 | 228 | $q_array = $this->get_img_quality_array(); |
229 | 229 | $setting = $this->get_img_quality_setting(); |
230 | 230 | $quality = apply_filters( |
231 | 231 | 'autoptimize_filter_imgopt_quality', |
232 | - 'q_' . $q_array[ $setting ] |
|
232 | + 'q_'.$q_array[$setting] |
|
233 | 233 | ); |
234 | 234 | } |
235 | 235 | |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | { |
241 | 241 | static $map = null; |
242 | 242 | |
243 | - if ( null === $map ) { |
|
243 | + if (null === $map) { |
|
244 | 244 | $map = array( |
245 | 245 | '1' => 'lossy', |
246 | 246 | '2' => 'glossy', |
@@ -259,12 +259,12 @@ discard block |
||
259 | 259 | { |
260 | 260 | static $q = null; |
261 | 261 | |
262 | - if ( null === $q ) { |
|
263 | - if ( is_array( $this->options ) && array_key_exists( 'autoptimize_imgopt_select_field_2', $this->options ) ) { |
|
262 | + if (null === $q) { |
|
263 | + if (is_array($this->options) && array_key_exists('autoptimize_imgopt_select_field_2', $this->options)) { |
|
264 | 264 | $setting = $this->options['autoptimize_imgopt_select_field_2']; |
265 | 265 | } |
266 | 266 | |
267 | - if ( ! isset( $setting ) || empty( $setting ) || ( '1' !== $setting && '3' !== $setting ) ) { |
|
267 | + if (!isset($setting) || empty($setting) || ('1' !== $setting && '3' !== $setting)) { |
|
268 | 268 | // default image opt. value is 2 ("glossy"). |
269 | 269 | $q = '2'; |
270 | 270 | } else { |
@@ -275,10 +275,10 @@ discard block |
||
275 | 275 | return $q; |
276 | 276 | } |
277 | 277 | |
278 | - public function filter_preconnect_imgopt_url( array $in ) |
|
278 | + public function filter_preconnect_imgopt_url(array $in) |
|
279 | 279 | { |
280 | - $url_parts = parse_url( $this->get_imgopt_base_url() ); |
|
281 | - $in[] = $url_parts['scheme'] . '://' . $url_parts['host']; |
|
280 | + $url_parts = parse_url($this->get_imgopt_base_url()); |
|
281 | + $in[] = $url_parts['scheme'].'://'.$url_parts['host']; |
|
282 | 282 | |
283 | 283 | return $in; |
284 | 284 | } |
@@ -291,20 +291,20 @@ discard block |
||
291 | 291 | * |
292 | 292 | * @return string |
293 | 293 | */ |
294 | - private function normalize_img_url( $in ) |
|
294 | + private function normalize_img_url($in) |
|
295 | 295 | { |
296 | 296 | // Only parse the site url once. |
297 | 297 | static $parsed_site_url = null; |
298 | - if ( null === $parsed_site_url ) { |
|
299 | - $parsed_site_url = parse_url( site_url() ); |
|
298 | + if (null === $parsed_site_url) { |
|
299 | + $parsed_site_url = parse_url(site_url()); |
|
300 | 300 | } |
301 | 301 | |
302 | 302 | // get CDN domain once. |
303 | 303 | static $cdn_domain = null; |
304 | - if ( is_null( $cdn_domain ) ) { |
|
305 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', get_option( 'autoptimize_cdn_url', '' ) ); |
|
306 | - if ( ! empty( $cdn_url ) ) { |
|
307 | - $cdn_domain = parse_url( $cdn_url, PHP_URL_HOST ); |
|
304 | + if (is_null($cdn_domain)) { |
|
305 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', get_option('autoptimize_cdn_url', '')); |
|
306 | + if (!empty($cdn_url)) { |
|
307 | + $cdn_domain = parse_url($cdn_url, PHP_URL_HOST); |
|
308 | 308 | } else { |
309 | 309 | $cdn_domain = ''; |
310 | 310 | } |
@@ -320,43 +320,43 @@ discard block |
||
320 | 320 | * identical string operations). |
321 | 321 | */ |
322 | 322 | static $cache = null; |
323 | - if ( null === $cache ) { |
|
323 | + if (null === $cache) { |
|
324 | 324 | $cache = array(); |
325 | 325 | } |
326 | 326 | |
327 | 327 | // Do the work on cache miss only. |
328 | - if ( ! isset( $cache[ $in ] ) ) { |
|
328 | + if (!isset($cache[$in])) { |
|
329 | 329 | // Default to what was given to us. |
330 | 330 | $result = $in; |
331 | - if ( autoptimizeUtils::is_protocol_relative( $in ) ) { |
|
332 | - $result = $parsed_site_url['scheme'] . ':' . $in; |
|
333 | - } elseif ( 0 === strpos( $in, '/' ) ) { |
|
331 | + if (autoptimizeUtils::is_protocol_relative($in)) { |
|
332 | + $result = $parsed_site_url['scheme'].':'.$in; |
|
333 | + } elseif (0 === strpos($in, '/')) { |
|
334 | 334 | // Root-relative... |
335 | - $result = $parsed_site_url['scheme'] . '://' . $parsed_site_url['host']; |
|
335 | + $result = $parsed_site_url['scheme'].'://'.$parsed_site_url['host']; |
|
336 | 336 | // Add the path for subfolder installs. |
337 | - if ( isset( $parsed_site_url['path'] ) ) { |
|
337 | + if (isset($parsed_site_url['path'])) { |
|
338 | 338 | $result .= $parsed_site_url['path']; |
339 | 339 | } |
340 | 340 | $result .= $in; |
341 | - } elseif ( ! empty( $cdn_domain ) && strpos( $in, $cdn_domain ) !== 0 ) { |
|
342 | - $result = str_replace( $cdn_domain, $parsed_site_url['host'], $in ); |
|
341 | + } elseif (!empty($cdn_domain) && strpos($in, $cdn_domain) !== 0) { |
|
342 | + $result = str_replace($cdn_domain, $parsed_site_url['host'], $in); |
|
343 | 343 | } |
344 | 344 | |
345 | - $result = apply_filters( 'autoptimize_filter_imgopt_normalized_url', $result ); |
|
345 | + $result = apply_filters('autoptimize_filter_imgopt_normalized_url', $result); |
|
346 | 346 | |
347 | 347 | // Store in cache. |
348 | - $cache[ $in ] = $result; |
|
348 | + $cache[$in] = $result; |
|
349 | 349 | } |
350 | 350 | |
351 | - return $cache[ $in ]; |
|
351 | + return $cache[$in]; |
|
352 | 352 | } |
353 | 353 | |
354 | - public function filter_optimize_css_images( $in ) |
|
354 | + public function filter_optimize_css_images($in) |
|
355 | 355 | { |
356 | - $in = $this->normalize_img_url( $in ); |
|
356 | + $in = $this->normalize_img_url($in); |
|
357 | 357 | |
358 | - if ( $this->can_optimize_image( $in ) ) { |
|
359 | - return $this->build_imgopt_url( $in, '', '' ); |
|
358 | + if ($this->can_optimize_image($in)) { |
|
359 | + return $this->build_imgopt_url($in, '', ''); |
|
360 | 360 | } else { |
361 | 361 | return $in; |
362 | 362 | } |
@@ -366,50 +366,50 @@ discard block |
||
366 | 366 | { |
367 | 367 | static $imgopt_base_url = null; |
368 | 368 | |
369 | - if ( null === $imgopt_base_url ) { |
|
369 | + if (null === $imgopt_base_url) { |
|
370 | 370 | $imgopt_host = $this->get_imgopt_host(); |
371 | 371 | $quality = $this->get_img_quality_string(); |
372 | - $ret_val = apply_filters( 'autoptimize_filter_imgopt_wait', 'ret_img' ); // values: ret_wait, ret_img, ret_json, ret_blank. |
|
373 | - $imgopt_base_url = $imgopt_host . 'client/' . $quality . ',' . $ret_val; |
|
374 | - $imgopt_base_url = apply_filters( 'autoptimize_filter_imgopt_base_url', $imgopt_base_url ); |
|
372 | + $ret_val = apply_filters('autoptimize_filter_imgopt_wait', 'ret_img'); // values: ret_wait, ret_img, ret_json, ret_blank. |
|
373 | + $imgopt_base_url = $imgopt_host.'client/'.$quality.','.$ret_val; |
|
374 | + $imgopt_base_url = apply_filters('autoptimize_filter_imgopt_base_url', $imgopt_base_url); |
|
375 | 375 | } |
376 | 376 | |
377 | 377 | return $imgopt_base_url; |
378 | 378 | } |
379 | 379 | |
380 | - private function can_optimize_image( $url ) |
|
380 | + private function can_optimize_image($url) |
|
381 | 381 | { |
382 | 382 | static $cdn_url = null; |
383 | 383 | static $nopti_images = null; |
384 | 384 | |
385 | - if ( null === $cdn_url ) { |
|
385 | + if (null === $cdn_url) { |
|
386 | 386 | $cdn_url = apply_filters( |
387 | 387 | 'autoptimize_filter_base_cdnurl', |
388 | - get_option( 'autoptimize_cdn_url', '' ) |
|
388 | + get_option('autoptimize_cdn_url', '') |
|
389 | 389 | ); |
390 | 390 | } |
391 | 391 | |
392 | - if ( null === $nopti_images ) { |
|
393 | - $nopti_images = apply_filters( 'autoptimize_filter_imgopt_noptimize', '' ); |
|
392 | + if (null === $nopti_images) { |
|
393 | + $nopti_images = apply_filters('autoptimize_filter_imgopt_noptimize', ''); |
|
394 | 394 | } |
395 | 395 | |
396 | 396 | $site_host = AUTOPTIMIZE_SITE_DOMAIN; |
397 | - $url = $this->normalize_img_url( $url ); |
|
398 | - $url_parsed = parse_url( $url ); |
|
397 | + $url = $this->normalize_img_url($url); |
|
398 | + $url_parsed = parse_url($url); |
|
399 | 399 | |
400 | - if ( array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host && empty( $cdn_url ) ) { |
|
400 | + if (array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host && empty($cdn_url)) { |
|
401 | 401 | return false; |
402 | - } elseif ( ! empty( $cdn_url ) && strpos( $url, $cdn_url ) === false && array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host ) { |
|
402 | + } elseif (!empty($cdn_url) && strpos($url, $cdn_url) === false && array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host) { |
|
403 | 403 | return false; |
404 | - } elseif ( strpos( $url, '.php' ) !== false ) { |
|
404 | + } elseif (strpos($url, '.php') !== false) { |
|
405 | 405 | return false; |
406 | - } elseif ( str_ireplace( array( '.png', '.gif', '.jpg', '.jpeg', '.webp' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) { |
|
406 | + } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg', '.webp'), '', $url_parsed['path']) === $url_parsed['path']) { |
|
407 | 407 | // fixme: better check against end of string. |
408 | 408 | return false; |
409 | - } elseif ( ! empty( $nopti_images ) ) { |
|
410 | - $nopti_images_array = array_filter( array_map( 'trim', explode( ',', $nopti_images ) ) ); |
|
411 | - foreach ( $nopti_images_array as $nopti_image ) { |
|
412 | - if ( strpos( $url, $nopti_image ) !== false ) { |
|
409 | + } elseif (!empty($nopti_images)) { |
|
410 | + $nopti_images_array = array_filter(array_map('trim', explode(',', $nopti_images))); |
|
411 | + foreach ($nopti_images_array as $nopti_image) { |
|
412 | + if (strpos($url, $nopti_image) !== false) { |
|
413 | 413 | return false; |
414 | 414 | } |
415 | 415 | } |
@@ -417,13 +417,13 @@ discard block |
||
417 | 417 | return true; |
418 | 418 | } |
419 | 419 | |
420 | - private function build_imgopt_url( $orig_url, $width = 0, $height = 0 ) |
|
420 | + private function build_imgopt_url($orig_url, $width = 0, $height = 0) |
|
421 | 421 | { |
422 | 422 | // sanitize width and height. |
423 | - if ( strpos( $width, '%' ) !== false ) { |
|
423 | + if (strpos($width, '%') !== false) { |
|
424 | 424 | $width = 0; |
425 | 425 | } |
426 | - if ( strpos( $height, '%' ) !== false ) { |
|
426 | + if (strpos($height, '%') !== false) { |
|
427 | 427 | $height = 0; |
428 | 428 | } |
429 | 429 | $width = (int) $width; |
@@ -437,42 +437,42 @@ discard block |
||
437 | 437 | ); |
438 | 438 | |
439 | 439 | // If filter modified the url, return that. |
440 | - if ( $filtered_url !== $orig_url ) { |
|
440 | + if ($filtered_url !== $orig_url) { |
|
441 | 441 | return $filtered_url; |
442 | 442 | } |
443 | 443 | |
444 | - $orig_url = $this->normalize_img_url( $orig_url ); |
|
444 | + $orig_url = $this->normalize_img_url($orig_url); |
|
445 | 445 | $imgopt_base_url = $this->get_imgopt_base_url(); |
446 | 446 | $imgopt_size = ''; |
447 | 447 | |
448 | - if ( $width && 0 !== $width ) { |
|
449 | - $imgopt_size = ',w_' . $width; |
|
448 | + if ($width && 0 !== $width) { |
|
449 | + $imgopt_size = ',w_'.$width; |
|
450 | 450 | } |
451 | 451 | |
452 | - if ( $height && 0 !== $height ) { |
|
453 | - $imgopt_size .= ',h_' . $height; |
|
452 | + if ($height && 0 !== $height) { |
|
453 | + $imgopt_size .= ',h_'.$height; |
|
454 | 454 | } |
455 | 455 | |
456 | - $url = $imgopt_base_url . $imgopt_size . '/' . $orig_url; |
|
456 | + $url = $imgopt_base_url.$imgopt_size.'/'.$orig_url; |
|
457 | 457 | |
458 | 458 | return $url; |
459 | 459 | } |
460 | 460 | |
461 | - public function replace_data_thumbs( $matches ) |
|
461 | + public function replace_data_thumbs($matches) |
|
462 | 462 | { |
463 | - return $this->replace_img_callback( $matches, 150, 150 ); |
|
463 | + return $this->replace_img_callback($matches, 150, 150); |
|
464 | 464 | } |
465 | 465 | |
466 | - public function replace_img_callback( $matches, $width = 0, $height = 0 ) |
|
466 | + public function replace_img_callback($matches, $width = 0, $height = 0) |
|
467 | 467 | { |
468 | - if ( $this->can_optimize_image( $matches[1] ) ) { |
|
469 | - return str_replace( $matches[1], $this->build_imgopt_url( $matches[1], $width, $height ), $matches[0] ); |
|
468 | + if ($this->can_optimize_image($matches[1])) { |
|
469 | + return str_replace($matches[1], $this->build_imgopt_url($matches[1], $width, $height), $matches[0]); |
|
470 | 470 | } else { |
471 | 471 | return $matches[0]; |
472 | 472 | } |
473 | 473 | } |
474 | 474 | |
475 | - public function filter_optimize_images( $in ) |
|
475 | + public function filter_optimize_images($in) |
|
476 | 476 | { |
477 | 477 | /* |
478 | 478 | * potential future functional improvements: |
@@ -483,7 +483,7 @@ discard block |
||
483 | 483 | $to_replace = array(); |
484 | 484 | |
485 | 485 | // hide noscript tags to avoid nesting noscript tags (as lazyloaded images add noscript). |
486 | - if ( $this->should_lazyload() ) { |
|
486 | + if ($this->should_lazyload()) { |
|
487 | 487 | $in = autoptimizeBase::replace_contents_with_marker_if_exists( |
488 | 488 | 'SCRIPT', |
489 | 489 | '<script', |
@@ -493,25 +493,25 @@ discard block |
||
493 | 493 | } |
494 | 494 | |
495 | 495 | // extract img tags. |
496 | - if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $in, $matches ) ) { |
|
497 | - foreach ( $matches[0] as $tag ) { |
|
496 | + if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $in, $matches)) { |
|
497 | + foreach ($matches[0] as $tag) { |
|
498 | 498 | $orig_tag = $tag; |
499 | 499 | $imgopt_w = ''; |
500 | 500 | $imgopt_h = ''; |
501 | 501 | |
502 | 502 | // first do (data-)srcsets. |
503 | - if ( preg_match_all( '#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER ) ) { |
|
504 | - foreach ( $allsrcsets as $srcset ) { |
|
503 | + if (preg_match_all('#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER)) { |
|
504 | + foreach ($allsrcsets as $srcset) { |
|
505 | 505 | $srcset = $srcset[2]; |
506 | - $srcsets = explode( ',', $srcset ); |
|
507 | - foreach ( $srcsets as $indiv_srcset ) { |
|
508 | - $indiv_srcset_parts = explode( ' ', trim( $indiv_srcset ) ); |
|
509 | - if ( isset( $indiv_srcset_parts[1] ) && rtrim( $indiv_srcset_parts[1], 'w' ) !== $indiv_srcset_parts[1] ) { |
|
510 | - $imgopt_w = rtrim( $indiv_srcset_parts[1], 'w' ); |
|
506 | + $srcsets = explode(',', $srcset); |
|
507 | + foreach ($srcsets as $indiv_srcset) { |
|
508 | + $indiv_srcset_parts = explode(' ', trim($indiv_srcset)); |
|
509 | + if (isset($indiv_srcset_parts[1]) && rtrim($indiv_srcset_parts[1], 'w') !== $indiv_srcset_parts[1]) { |
|
510 | + $imgopt_w = rtrim($indiv_srcset_parts[1], 'w'); |
|
511 | 511 | } |
512 | - if ( $this->can_optimize_image( $indiv_srcset_parts[0] ) ) { |
|
513 | - $imgopt_url = $this->build_imgopt_url( $indiv_srcset_parts[0], $imgopt_w, '' ); |
|
514 | - $tag = str_replace( $indiv_srcset_parts[0], $imgopt_url, $tag ); |
|
512 | + if ($this->can_optimize_image($indiv_srcset_parts[0])) { |
|
513 | + $imgopt_url = $this->build_imgopt_url($indiv_srcset_parts[0], $imgopt_w, ''); |
|
514 | + $tag = str_replace($indiv_srcset_parts[0], $imgopt_url, $tag); |
|
515 | 515 | } |
516 | 516 | } |
517 | 517 | } |
@@ -519,136 +519,136 @@ discard block |
||
519 | 519 | |
520 | 520 | // proceed with img src. |
521 | 521 | // get width and height and add to $imgopt_size. |
522 | - $_get_size = $this->get_size_from_tag( $tag ); |
|
522 | + $_get_size = $this->get_size_from_tag($tag); |
|
523 | 523 | $imgopt_w = $_get_size['width']; |
524 | 524 | $imgopt_h = $_get_size['height']; |
525 | 525 | |
526 | 526 | // then start replacing images src. |
527 | - if ( preg_match_all( '#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER ) ) { |
|
528 | - foreach ( $urls as $url ) { |
|
527 | + if (preg_match_all('#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER)) { |
|
528 | + foreach ($urls as $url) { |
|
529 | 529 | $full_src_orig = $url[0]; |
530 | 530 | $url = $url[1]; |
531 | - if ( $this->can_optimize_image( $url ) ) { |
|
532 | - $imgopt_url = $this->build_imgopt_url( $url, $imgopt_w, $imgopt_h ); |
|
533 | - $full_imgopt_src = str_replace( $url, $imgopt_url, $full_src_orig ); |
|
534 | - $tag = str_replace( $full_src_orig, $full_imgopt_src, $tag ); |
|
531 | + if ($this->can_optimize_image($url)) { |
|
532 | + $imgopt_url = $this->build_imgopt_url($url, $imgopt_w, $imgopt_h); |
|
533 | + $full_imgopt_src = str_replace($url, $imgopt_url, $full_src_orig); |
|
534 | + $tag = str_replace($full_src_orig, $full_imgopt_src, $tag); |
|
535 | 535 | } |
536 | 536 | } |
537 | 537 | } |
538 | 538 | |
539 | 539 | // do lazyload stuff. |
540 | - if ( $this->should_lazyload() && str_ireplace( $this->get_lazyload_exclusions(), '', $tag ) === $tag ) { |
|
541 | - $noscript_tag = '<noscript>' . $tag . '</noscript>'; |
|
542 | - $tag = str_replace( 'srcset=', 'data-srcset=', $tag ); |
|
540 | + if ($this->should_lazyload() && str_ireplace($this->get_lazyload_exclusions(), '', $tag) === $tag) { |
|
541 | + $noscript_tag = '<noscript>'.$tag.'</noscript>'; |
|
542 | + $tag = str_replace('srcset=', 'data-srcset=', $tag); |
|
543 | 543 | |
544 | 544 | // add lazyload class. |
545 | - $tag = $this->inject_classes_in_tag( $tag, 'lazyload ' ); |
|
545 | + $tag = $this->inject_classes_in_tag($tag, 'lazyload '); |
|
546 | 546 | |
547 | 547 | // set placeholder. |
548 | - if ( strpos( $url, $this->get_imgopt_host() ) === 0 ) { |
|
548 | + if (strpos($url, $this->get_imgopt_host()) === 0) { |
|
549 | 549 | // if all img src have been replaced during srcset, we have to extract the |
550 | 550 | // origin url from the imgopt one to be able to set a lqip placeholder. |
551 | - $_url = substr( $url, strpos( $url, '/http' ) + 1 ); |
|
551 | + $_url = substr($url, strpos($url, '/http') + 1); |
|
552 | 552 | } else { |
553 | 553 | $_url = $url; |
554 | 554 | } |
555 | - if ( $this->can_optimize_image( $_url ) && apply_filters( 'autoptimize_filter_imgopt_lazyload_dolqip', true ) ) { |
|
555 | + if ($this->can_optimize_image($_url) && apply_filters('autoptimize_filter_imgopt_lazyload_dolqip', true)) { |
|
556 | 556 | $lqip_w = ''; |
557 | 557 | $lqip_h = ''; |
558 | - if ( isset( $imgopt_w ) ) { |
|
559 | - $lqip_w = ',w_' . $imgopt_w; |
|
558 | + if (isset($imgopt_w)) { |
|
559 | + $lqip_w = ',w_'.$imgopt_w; |
|
560 | 560 | } |
561 | - if ( isset( $imgopt_h ) ) { |
|
562 | - $lqip_h = ',h_' . $imgopt_h; |
|
561 | + if (isset($imgopt_h)) { |
|
562 | + $lqip_h = ',h_'.$imgopt_h; |
|
563 | 563 | } |
564 | - $placeholder = $this->get_imgopt_host() . 'client/q_lqip,ret_wait' . $lqip_w . $lqip_h . '/' . $_url; |
|
564 | + $placeholder = $this->get_imgopt_host().'client/q_lqip,ret_wait'.$lqip_w.$lqip_h.'/'.$_url; |
|
565 | 565 | } else { |
566 | - $placeholder = $this->get_default_lazyload_placeholder( $imgopt_w, $imgopt_h ); |
|
566 | + $placeholder = $this->get_default_lazyload_placeholder($imgopt_w, $imgopt_h); |
|
567 | 567 | } |
568 | - $placeholder = ' src=\'' . apply_filters( 'autoptimize_filter_imgopt_lazyload_placeholder', $placeholder ); |
|
568 | + $placeholder = ' src=\''.apply_filters('autoptimize_filter_imgopt_lazyload_placeholder', $placeholder); |
|
569 | 569 | |
570 | 570 | // add min-heigth off by default as it can deform images, can be enabled with filter. |
571 | 571 | $min_height = ''; |
572 | - if ( apply_filters( 'autoptimize_filter_imgopt_lazyload_addminheight', false ) ) { |
|
573 | - $min_height = ' style="min-height:' . $imgopt_h . 'px;"'; |
|
572 | + if (apply_filters('autoptimize_filter_imgopt_lazyload_addminheight', false)) { |
|
573 | + $min_height = ' style="min-height:'.$imgopt_h.'px;"'; |
|
574 | 574 | } |
575 | 575 | |
576 | 576 | // add noscript & placeholder. |
577 | - $tag = $noscript_tag . str_replace( ' src=', $min_height . $placeholder . '\' data-src=', $tag ); |
|
578 | - $tag = apply_filters( 'autoptimize_filter_imgopt_lazyloaded_img', $tag ); |
|
577 | + $tag = $noscript_tag.str_replace(' src=', $min_height.$placeholder.'\' data-src=', $tag); |
|
578 | + $tag = apply_filters('autoptimize_filter_imgopt_lazyloaded_img', $tag); |
|
579 | 579 | } |
580 | 580 | |
581 | 581 | // add tag to array for later replacement. |
582 | - if ( $tag !== $orig_tag ) { |
|
583 | - $to_replace[ $orig_tag ] = $tag; |
|
582 | + if ($tag !== $orig_tag) { |
|
583 | + $to_replace[$orig_tag] = $tag; |
|
584 | 584 | } |
585 | 585 | } |
586 | 586 | } |
587 | 587 | |
588 | 588 | // and replace all. |
589 | - $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $in ); |
|
589 | + $out = str_replace(array_keys($to_replace), array_values($to_replace), $in); |
|
590 | 590 | |
591 | 591 | // img thumbnails in e.g. woocommerce. |
592 | - if ( strpos( $out, 'data-thumb' ) !== false && apply_filters( 'autoptimize_filter_imgopt_datathumbs', true ) ) { |
|
592 | + if (strpos($out, 'data-thumb') !== false && apply_filters('autoptimize_filter_imgopt_datathumbs', true)) { |
|
593 | 593 | $out = preg_replace_callback( |
594 | 594 | '/\<div(?:[^>]?)\sdata-thumb\=(?:\"|\')(.+?)(?:\"|\')(?:[^>]*)?\>/s', |
595 | - array( $this, 'replace_data_thumbs' ), |
|
595 | + array($this, 'replace_data_thumbs'), |
|
596 | 596 | $out |
597 | 597 | ); |
598 | 598 | } |
599 | 599 | |
600 | 600 | // background-image in inline style. |
601 | - if ( strpos( $out, 'background-image:' ) !== false && apply_filters( 'autoptimize_filter_imgopt_backgroundimages', true ) ) { |
|
601 | + if (strpos($out, 'background-image:') !== false && apply_filters('autoptimize_filter_imgopt_backgroundimages', true)) { |
|
602 | 602 | $out = preg_replace_callback( |
603 | 603 | '/style=(?:"|\').*?background-image:\s?url\((?:"|\')?([^"\')]*)(?:"|\')?\)/', |
604 | - array( $this, 'replace_img_callback' ), |
|
604 | + array($this, 'replace_img_callback'), |
|
605 | 605 | $out |
606 | 606 | ); |
607 | 607 | } |
608 | 608 | |
609 | 609 | // lazyload: restore noscript tags + lazyload picture source tags. |
610 | - if ( $this->should_lazyload() ) { |
|
610 | + if ($this->should_lazyload()) { |
|
611 | 611 | $out = autoptimizeBase::restore_marked_content( |
612 | 612 | 'SCRIPT', |
613 | 613 | $out |
614 | 614 | ); |
615 | 615 | |
616 | - $out = $this->process_picture_tag( $out, true, true ); |
|
616 | + $out = $this->process_picture_tag($out, true, true); |
|
617 | 617 | } else { |
618 | - $out = $this->process_picture_tag( $out, true, false ); |
|
618 | + $out = $this->process_picture_tag($out, true, false); |
|
619 | 619 | } |
620 | 620 | |
621 | 621 | return $out; |
622 | 622 | } |
623 | 623 | |
624 | - public function get_size_from_tag( $tag ) { |
|
624 | + public function get_size_from_tag($tag) { |
|
625 | 625 | // reusable function to extract widht and height from an image tag |
626 | 626 | // enforcing a filterable maximum width and height (default 4999X4999). |
627 | 627 | $width = ''; |
628 | 628 | $height = ''; |
629 | 629 | |
630 | - if ( preg_match( '#width=("|\')(.*)("|\')#Usmi', $tag, $_width ) ) { |
|
631 | - if ( strpos( $_width[2], '%' ) === false ) { |
|
630 | + if (preg_match('#width=("|\')(.*)("|\')#Usmi', $tag, $_width)) { |
|
631 | + if (strpos($_width[2], '%') === false) { |
|
632 | 632 | $width = (int) $_width[2]; |
633 | 633 | } |
634 | 634 | } |
635 | - if ( preg_match( '#height=("|\')(.*)("|\')#Usmi', $tag, $_height ) ) { |
|
636 | - if ( strpos( $_height[2], '%' ) === false ) { |
|
635 | + if (preg_match('#height=("|\')(.*)("|\')#Usmi', $tag, $_height)) { |
|
636 | + if (strpos($_height[2], '%') === false) { |
|
637 | 637 | $height = (int) $_height[2]; |
638 | 638 | } |
639 | 639 | } |
640 | 640 | |
641 | 641 | // check for and enforce (filterable) max sizes. |
642 | - $_max_width = apply_filters( 'autoptimize_filter_imgopt_max_width', 4999 ); |
|
643 | - if ( $width > $_max_width ) { |
|
642 | + $_max_width = apply_filters('autoptimize_filter_imgopt_max_width', 4999); |
|
643 | + if ($width > $_max_width) { |
|
644 | 644 | $_width = $_max_width; |
645 | - $height = $_width / $width * $height; |
|
645 | + $height = $_width/$width*$height; |
|
646 | 646 | $width = $_width; |
647 | 647 | } |
648 | - $_max_height = apply_filters( 'autoptimize_filter_imgopt_max_height', 4999 ); |
|
649 | - if ( $height > $_max_height ) { |
|
648 | + $_max_height = apply_filters('autoptimize_filter_imgopt_max_height', 4999); |
|
649 | + if ($height > $_max_height) { |
|
650 | 650 | $_height = $_max_height; |
651 | - $width = $_height / $height * $width; |
|
651 | + $width = $_height/$height*$width; |
|
652 | 652 | $height = $_height; |
653 | 653 | } |
654 | 654 | |
@@ -662,12 +662,12 @@ discard block |
||
662 | 662 | * Lazyload functions |
663 | 663 | */ |
664 | 664 | public function should_lazyload() { |
665 | - if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_3'] ) ) { |
|
665 | + if (!empty($this->options['autoptimize_imgopt_checkbox_field_3'])) { |
|
666 | 666 | $lazyload_return = true; |
667 | 667 | } else { |
668 | 668 | $lazyload_return = false; |
669 | 669 | } |
670 | - $lazyload_return = apply_filters( 'autoptimize_filter_imgopt_should_lazyload', $lazyload_return ); |
|
670 | + $lazyload_return = apply_filters('autoptimize_filter_imgopt_should_lazyload', $lazyload_return); |
|
671 | 671 | |
672 | 672 | return $lazyload_return; |
673 | 673 | } |
@@ -678,7 +678,7 @@ discard block |
||
678 | 678 | return $self->should_lazyload(); |
679 | 679 | } |
680 | 680 | |
681 | - public function filter_lazyload_images( $in ) |
|
681 | + public function filter_lazyload_images($in) |
|
682 | 682 | { |
683 | 683 | // only used is image optimization is NOT active but lazyload is. |
684 | 684 | $to_replace = array(); |
@@ -693,15 +693,15 @@ discard block |
||
693 | 693 | ); |
694 | 694 | |
695 | 695 | // extract img tags and add lazyload attribs. |
696 | - if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $out, $matches ) ) { |
|
697 | - foreach ( $matches[0] as $tag ) { |
|
698 | - $to_replace[ $tag ] = $this->add_lazyload( $tag ); |
|
696 | + if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $out, $matches)) { |
|
697 | + foreach ($matches[0] as $tag) { |
|
698 | + $to_replace[$tag] = $this->add_lazyload($tag); |
|
699 | 699 | } |
700 | - $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $out ); |
|
700 | + $out = str_replace(array_keys($to_replace), array_values($to_replace), $out); |
|
701 | 701 | } |
702 | 702 | |
703 | 703 | // and also lazyload picture tag. |
704 | - $out = $this->process_picture_tag( $out, false, true ); |
|
704 | + $out = $this->process_picture_tag($out, false, true); |
|
705 | 705 | |
706 | 706 | // restore noscript tags. |
707 | 707 | $out = autoptimizeBase::restore_marked_content( |
@@ -712,35 +712,35 @@ discard block |
||
712 | 712 | return $out; |
713 | 713 | } |
714 | 714 | |
715 | - public function add_lazyload( $tag ) { |
|
715 | + public function add_lazyload($tag) { |
|
716 | 716 | // adds actual lazyload-attributes to an image node. |
717 | - if ( str_ireplace( $this->get_lazyload_exclusions(), '', $tag ) === $tag ) { |
|
717 | + if (str_ireplace($this->get_lazyload_exclusions(), '', $tag) === $tag) { |
|
718 | 718 | // store original tag for use in noscript version. |
719 | - $noscript_tag = '<noscript>' . $tag . '</noscript>'; |
|
719 | + $noscript_tag = '<noscript>'.$tag.'</noscript>'; |
|
720 | 720 | |
721 | 721 | // insert lazyload class. |
722 | - $tag = $this->inject_classes_in_tag( $tag, 'lazyload ' ); |
|
722 | + $tag = $this->inject_classes_in_tag($tag, 'lazyload '); |
|
723 | 723 | |
724 | 724 | // get image width & heigth for placeholder fun (and to prevent content reflow). |
725 | - $_get_size = $this->get_size_from_tag( $tag ); |
|
725 | + $_get_size = $this->get_size_from_tag($tag); |
|
726 | 726 | $width = $_get_size['width']; |
727 | 727 | $height = $_get_size['height']; |
728 | - if ( false === $width ) { |
|
728 | + if (false === $width) { |
|
729 | 729 | $widht = 210; // default width for SVG placeholder. |
730 | 730 | } |
731 | - if ( false === $height ) { |
|
732 | - $heigth = $width / 3 * 2; // if no height, base it on width using the 3/2 aspect ratio. |
|
731 | + if (false === $height) { |
|
732 | + $heigth = $width/3*2; // if no height, base it on width using the 3/2 aspect ratio. |
|
733 | 733 | } |
734 | 734 | |
735 | 735 | // insert the actual lazyload stuff. |
736 | 736 | // see https://css-tricks.com/preventing-content-reflow-from-lazy-loaded-images/ for great read on why we're using empty svg's. |
737 | - $placeholder = apply_filters( 'autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder( $width, $height ) ); |
|
738 | - $tag = str_replace( ' src=', ' src=\'' . $placeholder . '\' data-src=', $tag ); |
|
739 | - $tag = str_replace( ' srcset=', ' data-srcset=', $tag ); |
|
737 | + $placeholder = apply_filters('autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder($width, $height)); |
|
738 | + $tag = str_replace(' src=', ' src=\''.$placeholder.'\' data-src=', $tag); |
|
739 | + $tag = str_replace(' srcset=', ' data-srcset=', $tag); |
|
740 | 740 | |
741 | 741 | // add the noscript-tag from earlier. |
742 | - $tag = $noscript_tag . $tag; |
|
743 | - $tag = apply_filters( 'autoptimize_filter_imgopt_lazyloaded_img', $tag ); |
|
742 | + $tag = $noscript_tag.$tag; |
|
743 | + $tag = apply_filters('autoptimize_filter_imgopt_lazyloaded_img', $tag); |
|
744 | 744 | } |
745 | 745 | |
746 | 746 | return $tag; |
@@ -749,20 +749,20 @@ discard block |
||
749 | 749 | public function add_lazyload_js_footer() { |
750 | 750 | // The JS will by default be excluded form autoptimization but this can be changed with a filter. |
751 | 751 | $noptimize_flag = ''; |
752 | - if ( apply_filters( 'autoptimize_filter_imgopt_lazyload_js_noptimize', true ) ) { |
|
752 | + if (apply_filters('autoptimize_filter_imgopt_lazyload_js_noptimize', true)) { |
|
753 | 753 | $noptimize_flag = ' data-noptimize="1"'; |
754 | 754 | } |
755 | 755 | |
756 | 756 | // Adds lazyload CSS & JS to footer, using echo because wp_enqueue_script seems not to support pushing attributes (async). |
757 | - echo apply_filters( 'autoptimize_filter_imgopt_lazyload_cssoutput', '<style>.lazyload,.lazyloading{opacity:0;}.lazyloaded{opacity:1;transition:opacity 300ms;}</style><noscript><style>.lazyload{display:none;}</style></noscript>' ); |
|
758 | - echo apply_filters( 'autoptimize_filter_imgopt_lazyload_jsconfig', '<script' . $noptimize_flag . '>window.lazySizesConfig=window.lazySizesConfig||{};window.lazySizesConfig.loadMode=1;</script>' ); |
|
759 | - echo '<script async' . $noptimize_flag . ' src=\'' . plugins_url( 'external/js/lazysizes.min.js', __FILE__ ) . '\'></script>'; |
|
757 | + echo apply_filters('autoptimize_filter_imgopt_lazyload_cssoutput', '<style>.lazyload,.lazyloading{opacity:0;}.lazyloaded{opacity:1;transition:opacity 300ms;}</style><noscript><style>.lazyload{display:none;}</style></noscript>'); |
|
758 | + echo apply_filters('autoptimize_filter_imgopt_lazyload_jsconfig', '<script'.$noptimize_flag.'>window.lazySizesConfig=window.lazySizesConfig||{};window.lazySizesConfig.loadMode=1;</script>'); |
|
759 | + echo '<script async'.$noptimize_flag.' src=\''.plugins_url('external/js/lazysizes.min.js', __FILE__).'\'></script>'; |
|
760 | 760 | |
761 | 761 | // And add webp detection and loading JS. |
762 | - if ( $this->should_webp() ) { |
|
762 | + if ($this->should_webp()) { |
|
763 | 763 | $_webp_detect = "function c_webp(A){var n=new Image;n.onload=function(){var e=0<n.width&&0<n.height;A(e)},n.onerror=function(){A(!1)},n.src='data:image/webp;base64,UklGRhoAAABXRUJQVlA4TA0AAAAvAAAAEAcQERGIiP4HAA=='}function s_webp(e){window.supportsWebP=e}c_webp(s_webp);"; |
764 | 764 | $_webp_load = "document.addEventListener('lazybeforeunveil',function({target:c}){supportsWebP&&['data-src','data-srcset'].forEach(function(a){attr=c.getAttribute(a),null!==attr&&c.setAttribute(a,attr.replace(/\/client\//,'/client/to_webp,'))})});"; |
765 | - echo apply_filters( 'autoptimize_filter_imgopt_webp_js', '<script' . $noptimize_flag . '>' . $_webp_detect . $_webp_load . '</script>' ); |
|
765 | + echo apply_filters('autoptimize_filter_imgopt_webp_js', '<script'.$noptimize_flag.'>'.$_webp_detect.$_webp_load.'</script>'); |
|
766 | 766 | } |
767 | 767 | } |
768 | 768 | |
@@ -770,47 +770,47 @@ discard block |
||
770 | 770 | // returns array of strings that if found in an <img tag will stop the img from being lazy-loaded. |
771 | 771 | static $exclude_lazyload_array = null; |
772 | 772 | |
773 | - if ( null === $exclude_lazyload_array ) { |
|
773 | + if (null === $exclude_lazyload_array) { |
|
774 | 774 | $options = $this->options; |
775 | 775 | |
776 | 776 | // set default exclusions. |
777 | - $exclude_lazyload_array = array( 'skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload' ); |
|
777 | + $exclude_lazyload_array = array('skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload'); |
|
778 | 778 | |
779 | 779 | // add from setting. |
780 | - if ( array_key_exists( 'autoptimize_imgopt_text_field_5', $options ) ) { |
|
780 | + if (array_key_exists('autoptimize_imgopt_text_field_5', $options)) { |
|
781 | 781 | $exclude_lazyload_option = $options['autoptimize_imgopt_text_field_5']; |
782 | - if ( ! empty( $exclude_lazyload_option ) ) { |
|
783 | - $exclude_lazyload_array = array_merge( $exclude_lazyload_array, array_filter( array_map( 'trim', explode( ',', $options['autoptimize_imgopt_text_field_5'] ) ) ) ); |
|
782 | + if (!empty($exclude_lazyload_option)) { |
|
783 | + $exclude_lazyload_array = array_merge($exclude_lazyload_array, array_filter(array_map('trim', explode(',', $options['autoptimize_imgopt_text_field_5'])))); |
|
784 | 784 | } |
785 | 785 | } |
786 | 786 | |
787 | 787 | // and filter for developer-initiated changes. |
788 | - $exclude_lazyload_array = apply_filters( 'autoptimize_filter_imgopt_lazyload_exclude_array', $exclude_lazyload_array ); |
|
788 | + $exclude_lazyload_array = apply_filters('autoptimize_filter_imgopt_lazyload_exclude_array', $exclude_lazyload_array); |
|
789 | 789 | } |
790 | 790 | |
791 | 791 | return $exclude_lazyload_array; |
792 | 792 | } |
793 | 793 | |
794 | - public function inject_classes_in_tag( $tag, $target_class ) { |
|
795 | - if ( strpos( $tag, 'class=' ) !== false ) { |
|
796 | - $tag = preg_replace( '/(\sclass\s?=\s?("|\'))/', '$1' . $target_class, $tag ); |
|
794 | + public function inject_classes_in_tag($tag, $target_class) { |
|
795 | + if (strpos($tag, 'class=') !== false) { |
|
796 | + $tag = preg_replace('/(\sclass\s?=\s?("|\'))/', '$1'.$target_class, $tag); |
|
797 | 797 | } else { |
798 | - $tag = str_replace( '<img ', '<img class="' . trim( $target_class ) . '" ', $tag ); |
|
798 | + $tag = str_replace('<img ', '<img class="'.trim($target_class).'" ', $tag); |
|
799 | 799 | } |
800 | 800 | |
801 | 801 | return $tag; |
802 | 802 | } |
803 | 803 | |
804 | - public function get_default_lazyload_placeholder( $imgopt_w, $imgopt_h ) { |
|
805 | - return 'data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%20' . $imgopt_w . '%20' . $imgopt_h . '%22%3E%3C/svg%3E'; |
|
804 | + public function get_default_lazyload_placeholder($imgopt_w, $imgopt_h) { |
|
805 | + return 'data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%20'.$imgopt_w.'%20'.$imgopt_h.'%22%3E%3C/svg%3E'; |
|
806 | 806 | } |
807 | 807 | |
808 | 808 | public function should_webp() { |
809 | 809 | static $webp_return = null; |
810 | 810 | |
811 | - if ( is_null( $webp_return ) ) { |
|
811 | + if (is_null($webp_return)) { |
|
812 | 812 | // webp only works if imgopt and lazyload are also active. |
813 | - if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_4'] ) && ! empty( $this->options['autoptimize_imgopt_checkbox_field_3'] ) && $this->imgopt_active() ) { |
|
813 | + if (!empty($this->options['autoptimize_imgopt_checkbox_field_4']) && !empty($this->options['autoptimize_imgopt_checkbox_field_3']) && $this->imgopt_active()) { |
|
814 | 814 | $webp_return = true; |
815 | 815 | } else { |
816 | 816 | $webp_return = false; |
@@ -820,9 +820,9 @@ discard block |
||
820 | 820 | return $webp_return; |
821 | 821 | } |
822 | 822 | |
823 | - public function process_picture_tag( $in, $imgopt = false, $lazy = false ) { |
|
823 | + public function process_picture_tag($in, $imgopt = false, $lazy = false) { |
|
824 | 824 | // check if "<picture" is present and if filter allows us to process <picture>. |
825 | - if ( strpos( $in, '<picture' ) === false || apply_filters( 'autoptimize_filter_imgopt_dopicture', true ) === false ) { |
|
825 | + if (strpos($in, '<picture') === false || apply_filters('autoptimize_filter_imgopt_dopicture', true) === false) { |
|
826 | 826 | return $in; |
827 | 827 | } |
828 | 828 | |
@@ -830,27 +830,27 @@ discard block |
||
830 | 830 | $to_replace_pict = array(); |
831 | 831 | |
832 | 832 | // extract and process each picture-node. |
833 | - preg_match_all( '#<picture.*</picture>#Usmi', $in, $_pictures, PREG_SET_ORDER ); |
|
834 | - foreach ( $_pictures as $_picture ) { |
|
835 | - if ( strpos( $_picture[0], '<source ' ) !== false && preg_match_all( '#<source .*srcset=(?:"|\')(?!data)(.*)(?:"|\').*>#Usmi', $_picture[0], $_sources, PREG_SET_ORDER ) !== false ) { |
|
836 | - foreach ( $_sources as $_source ) { |
|
833 | + preg_match_all('#<picture.*</picture>#Usmi', $in, $_pictures, PREG_SET_ORDER); |
|
834 | + foreach ($_pictures as $_picture) { |
|
835 | + if (strpos($_picture[0], '<source ') !== false && preg_match_all('#<source .*srcset=(?:"|\')(?!data)(.*)(?:"|\').*>#Usmi', $_picture[0], $_sources, PREG_SET_ORDER) !== false) { |
|
836 | + foreach ($_sources as $_source) { |
|
837 | 837 | $_picture_replacement = $_source[0]; |
838 | 838 | |
839 | 839 | // should we optimize the image? |
840 | - if ( $imgopt && $this->can_optimize_image( $_source[1] ) ) { |
|
841 | - $_picture_replacement = str_replace( $_source[1], $this->build_imgopt_url( $_source[1] ), $_picture_replacement ); |
|
840 | + if ($imgopt && $this->can_optimize_image($_source[1])) { |
|
841 | + $_picture_replacement = str_replace($_source[1], $this->build_imgopt_url($_source[1]), $_picture_replacement); |
|
842 | 842 | } |
843 | 843 | // should we lazy-load? |
844 | - if ( $lazy && str_ireplace( $_exclusions, '', $_picture_replacement ) === $_picture_replacement ) { |
|
845 | - $_picture_replacement = str_replace( ' srcset=', ' data-srcset=', $_picture_replacement ); |
|
844 | + if ($lazy && str_ireplace($_exclusions, '', $_picture_replacement) === $_picture_replacement) { |
|
845 | + $_picture_replacement = str_replace(' srcset=', ' data-srcset=', $_picture_replacement); |
|
846 | 846 | } |
847 | - $to_replace_pict[ $_source[0] ] = $_picture_replacement; |
|
847 | + $to_replace_pict[$_source[0]] = $_picture_replacement; |
|
848 | 848 | } |
849 | 849 | } |
850 | 850 | } |
851 | 851 | |
852 | 852 | // and return the fully procesed $in. |
853 | - $out = str_replace( array_keys( $to_replace_pict ), array_values( $to_replace_pict ), $in ); |
|
853 | + $out = str_replace(array_keys($to_replace_pict), array_values($to_replace_pict), $in); |
|
854 | 854 | |
855 | 855 | return $out; |
856 | 856 | } |
@@ -866,14 +866,14 @@ discard block |
||
866 | 866 | 'autoptimize_imgopt', |
867 | 867 | 'manage_options', |
868 | 868 | 'autoptimize_imgopt', |
869 | - array( $this, 'imgopt_options_page' ) |
|
869 | + array($this, 'imgopt_options_page') |
|
870 | 870 | ); |
871 | - register_setting( 'autoptimize_imgopt_settings', 'autoptimize_imgopt_settings' ); |
|
871 | + register_setting('autoptimize_imgopt_settings', 'autoptimize_imgopt_settings'); |
|
872 | 872 | } |
873 | 873 | |
874 | - public function add_imgopt_tab( $in ) |
|
874 | + public function add_imgopt_tab($in) |
|
875 | 875 | { |
876 | - $in = array_merge( $in, array( 'autoptimize_imgopt' => __( 'Images', 'autoptimize' ) ) ); |
|
876 | + $in = array_merge($in, array('autoptimize_imgopt' => __('Images', 'autoptimize'))); |
|
877 | 877 | |
878 | 878 | return $in; |
879 | 879 | } |
@@ -881,7 +881,7 @@ discard block |
||
881 | 881 | public function imgopt_options_page() |
882 | 882 | { |
883 | 883 | // Check querystring for "refreshCacheChecker" and call cachechecker if so. |
884 | - if ( array_key_exists( 'refreshImgProvStats', $_GET ) && 1 == $_GET['refreshImgProvStats'] ) { |
|
884 | + if (array_key_exists('refreshImgProvStats', $_GET) && 1 == $_GET['refreshImgProvStats']) { |
|
885 | 885 | $this->query_img_provider_stats(); |
886 | 886 | } |
887 | 887 | |
@@ -894,45 +894,45 @@ discard block |
||
894 | 894 | #autoptimize_imgopt_descr{font-size: 120%;} |
895 | 895 | </style> |
896 | 896 | <div class="wrap"> |
897 | - <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
897 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
898 | 898 | <?php echo autoptimizeConfig::ao_admin_tabs(); ?> |
899 | - <?php if ( 'down' === $options['availabilities']['extra_imgopt']['status'] ) { ?> |
|
899 | + <?php if ('down' === $options['availabilities']['extra_imgopt']['status']) { ?> |
|
900 | 900 | <div class="notice-warning notice"><p> |
901 | 901 | <?php |
902 | 902 | // translators: "Autoptimize support forum" will appear in a "a href". |
903 | - 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>' ); |
|
903 | + 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>'); |
|
904 | 904 | ?> |
905 | 905 | </p></div> |
906 | 906 | <?php } ?> |
907 | 907 | |
908 | - <?php if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] && ! autoptimizeImages::instance()->launch_ok() ) { ?> |
|
908 | + <?php if ('launch' === $options['availabilities']['extra_imgopt']['status'] && !autoptimizeImages::instance()->launch_ok()) { ?> |
|
909 | 909 | <div class="notice-warning notice"><p> |
910 | - <?php _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' ); ?> |
|
910 | + <?php _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'); ?> |
|
911 | 911 | </p></div> |
912 | 912 | <?php } ?> |
913 | 913 | |
914 | - <?php if ( class_exists( 'Jetpack' ) && method_exists( 'Jetpack', 'get_active_modules' ) && in_array( 'photon', Jetpack::get_active_modules() ) ) { ?> |
|
914 | + <?php if (class_exists('Jetpack') && method_exists('Jetpack', 'get_active_modules') && in_array('photon', Jetpack::get_active_modules())) { ?> |
|
915 | 915 | <div class="notice-warning notice"><p> |
916 | 916 | <?php |
917 | 917 | // translators: "disable Jetpack's site accelerator for images" will appear in a "a href" linking to the jetpack settings page. |
918 | - echo sprintf( __( 'Please %1$sdisable Jetpack\'s site accelerator for images%2$s to be able to use Autoptomize\'s advanced image optimization features below.', 'autoptimize' ), '<a href="admin.php?page=jetpack#/settings">', '</a>' ); |
|
918 | + echo sprintf(__('Please %1$sdisable Jetpack\'s site accelerator for images%2$s to be able to use Autoptomize\'s advanced image optimization features below.', 'autoptimize'), '<a href="admin.php?page=jetpack#/settings">', '</a>'); |
|
919 | 919 | ?> |
920 | 920 | </p></div> |
921 | 921 | <?php } ?> |
922 | 922 | <form id='ao_settings_form' action='options.php' method='post'> |
923 | - <?php settings_fields( 'autoptimize_imgopt_settings' ); ?> |
|
924 | - <h2><?php _e( 'Image optimization', 'autoptimize' ); ?></h2> |
|
925 | - <span id='autoptimize_imgopt_descr'><?php _e( 'Make your site significantly faster by just ticking a couple of checkboxes to optimize and lazy load your images, WebP support included!', 'autoptimize' ); ?></span> |
|
923 | + <?php settings_fields('autoptimize_imgopt_settings'); ?> |
|
924 | + <h2><?php _e('Image optimization', 'autoptimize'); ?></h2> |
|
925 | + <span id='autoptimize_imgopt_descr'><?php _e('Make your site significantly faster by just ticking a couple of checkboxes to optimize and lazy load your images, WebP support included!', 'autoptimize'); ?></span> |
|
926 | 926 | <table class="form-table"> |
927 | 927 | <tr> |
928 | - <th scope="row"><?php _e( 'Optimize Images', 'autoptimize' ); ?></th> |
|
928 | + <th scope="row"><?php _e('Optimize Images', 'autoptimize'); ?></th> |
|
929 | 929 | <td> |
930 | - <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Optimize images on the fly and serve them from Shortpixel\'s global CDN.', 'autoptimize' ); ?></label> |
|
930 | + <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_1]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_1']) && '1' === $options['autoptimize_imgopt_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Optimize images on the fly and serve them from Shortpixel\'s global CDN.', 'autoptimize'); ?></label> |
|
931 | 931 | <?php |
932 | 932 | // show shortpixel status. |
933 | 933 | $_notice = autoptimizeImages::instance()->get_status_notice(); |
934 | - if ( $_notice ) { |
|
935 | - switch ( $_notice['status'] ) { |
|
934 | + if ($_notice) { |
|
935 | + switch ($_notice['status']) { |
|
936 | 936 | case 2: |
937 | 937 | $_notice_color = 'green'; |
938 | 938 | break; |
@@ -948,28 +948,28 @@ discard block |
||
948 | 948 | default: |
949 | 949 | $_notice_color = 'green'; |
950 | 950 | } |
951 | - echo apply_filters( 'autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:' . $_notice_color . ';">' . __( 'Shortpixel status: ', 'autoptimize' ) . '</span></strong>' . $_notice['notice'] . '</p>' ); |
|
951 | + echo apply_filters('autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:'.$_notice_color.';">'.__('Shortpixel status: ', 'autoptimize').'</span></strong>'.$_notice['notice'].'</p>'); |
|
952 | 952 | } else { |
953 | 953 | // translators: link points to shortpixel. |
954 | - $upsell_msg_1 = '<p>' . sprintf( __( 'Get more Google love and improve your website\'s loading speed by having the images optimized on the fly (also in the "next-gen" WebP image format) by %1$sShortPixel%2$s and then cached and served fast from Shortpixel\'s global CDN.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' ); |
|
955 | - if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] ) { |
|
956 | - $upsell_msg_2 = __( 'For a limited time only, this service is offered free for all Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize' ); |
|
954 | + $upsell_msg_1 = '<p>'.sprintf(__('Get more Google love and improve your website\'s loading speed by having the images optimized on the fly (also in the "next-gen" WebP image format) by %1$sShortPixel%2$s and then cached and served fast from Shortpixel\'s global CDN.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>'); |
|
955 | + if ('launch' === $options['availabilities']['extra_imgopt']['status']) { |
|
956 | + $upsell_msg_2 = __('For a limited time only, this service is offered free for all Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize'); |
|
957 | 957 | } else { |
958 | 958 | // translators: link points to shortpixel. |
959 | - $upsell_msg_2 = sprintf( __( '%1$sSign-up now%2$s to receive a 1 000 bonus + 50% more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' ); |
|
959 | + $upsell_msg_2 = sprintf(__('%1$sSign-up now%2$s to receive a 1 000 bonus + 50% more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>'); |
|
960 | 960 | } |
961 | - echo apply_filters( 'autoptimize_imgopt_imgopt_settings_copy', $upsell_msg_1 . ' ' . $upsell_msg_2 . '</p>' ); |
|
961 | + echo apply_filters('autoptimize_imgopt_imgopt_settings_copy', $upsell_msg_1.' '.$upsell_msg_2.'</p>'); |
|
962 | 962 | } |
963 | 963 | // translators: link points to shortpixel FAQ. |
964 | - $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>' ); |
|
964 | + $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>'); |
|
965 | 965 | // translators: links points to shortpixel TOS & Privacy Policy. |
966 | - $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>' ); |
|
967 | - echo apply_filters( 'autoptimize_imgopt_imgopt_settings_tos', '<p>' . $faqcopy . ' ' . $toscopy . '</p>' ); |
|
966 | + $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>'); |
|
967 | + echo apply_filters('autoptimize_imgopt_imgopt_settings_tos', '<p>'.$faqcopy.' '.$toscopy.'</p>'); |
|
968 | 968 | ?> |
969 | 969 | </td> |
970 | 970 | </tr> |
971 | - <tr id='autoptimize_imgopt_quality' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'] ) ) { echo 'class="hidden"'; } ?>> |
|
972 | - <th scope="row"><?php _e( 'Image Optimization quality', 'autoptimize' ); ?></th> |
|
971 | + <tr id='autoptimize_imgopt_quality' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_1', $options) || (isset($options['autoptimize_imgopt_checkbox_field_1']) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'])) { echo 'class="hidden"'; } ?>> |
|
972 | + <th scope="row"><?php _e('Image Optimization quality', 'autoptimize'); ?></th> |
|
973 | 973 | <td> |
974 | 974 | <label> |
975 | 975 | <select name='autoptimize_imgopt_settings[autoptimize_imgopt_select_field_2]'> |
@@ -977,12 +977,12 @@ discard block |
||
977 | 977 | $_imgopt_array = autoptimizeImages::instance()->get_img_quality_array(); |
978 | 978 | $_imgopt_val = autoptimizeImages::instance()->get_img_quality_setting(); |
979 | 979 | |
980 | - foreach ( $_imgopt_array as $key => $value ) { |
|
981 | - echo '<option value="' . $key . '"'; |
|
982 | - if ( $_imgopt_val == $key ) { |
|
980 | + foreach ($_imgopt_array as $key => $value) { |
|
981 | + echo '<option value="'.$key.'"'; |
|
982 | + if ($_imgopt_val == $key) { |
|
983 | 983 | echo ' selected'; |
984 | 984 | } |
985 | - echo '>' . ucfirst( $value ) . '</option>'; |
|
985 | + echo '>'.ucfirst($value).'</option>'; |
|
986 | 986 | } |
987 | 987 | echo "\n"; |
988 | 988 | ?> |
@@ -991,31 +991,31 @@ discard block |
||
991 | 991 | <p> |
992 | 992 | <?php |
993 | 993 | // translators: link points to shortpixel image test page. |
994 | - echo apply_filters( 'autoptimize_imgopt_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>' ) ); |
|
994 | + echo apply_filters('autoptimize_imgopt_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>')); |
|
995 | 995 | ?> |
996 | 996 | </p> |
997 | 997 | </td> |
998 | 998 | </tr> |
999 | - <tr id='autoptimize_imgopt_webp' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'] ) ) { echo 'class="hidden"'; } ?>> |
|
1000 | - <th scope="row"><?php _e( 'Load WebP in supported browsers?', 'autoptimize' ); ?></th> |
|
999 | + <tr id='autoptimize_imgopt_webp' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_1', $options) || (isset($options['autoptimize_imgopt_checkbox_field_1']) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'])) { echo 'class="hidden"'; } ?>> |
|
1000 | + <th scope="row"><?php _e('Load WebP in supported browsers?', 'autoptimize'); ?></th> |
|
1001 | 1001 | <td> |
1002 | - <label><input type='checkbox' id='autoptimize_imgopt_webp_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_4]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_4'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_3'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Automatically serve "next-gen" WebP image format to any browser that supports it (requires lazy load to be active).', 'autoptimize' ); ?></label> |
|
1002 | + <label><input type='checkbox' id='autoptimize_imgopt_webp_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_4]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_4']) && '1' === $options['autoptimize_imgopt_checkbox_field_3']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Automatically serve "next-gen" WebP image format to any browser that supports it (requires lazy load to be active).', 'autoptimize'); ?></label> |
|
1003 | 1003 | </td> |
1004 | 1004 | </tr> |
1005 | 1005 | <tr> |
1006 | - <th scope="row"><?php _e( 'Lazy-load images?', 'autoptimize' ); ?></th> |
|
1006 | + <th scope="row"><?php _e('Lazy-load images?', 'autoptimize'); ?></th> |
|
1007 | 1007 | <td> |
1008 | - <label><input type='checkbox' id='autoptimize_imgopt_lazyload_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_3]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_3'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_3'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Image lazy-loading will delay the loading of non-visible images to allow the browser to optimally load all resources for the "above the fold"-page first.', 'autoptimize' ); ?></label> |
|
1008 | + <label><input type='checkbox' id='autoptimize_imgopt_lazyload_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_3]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_3']) && '1' === $options['autoptimize_imgopt_checkbox_field_3']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Image lazy-loading will delay the loading of non-visible images to allow the browser to optimally load all resources for the "above the fold"-page first.', 'autoptimize'); ?></label> |
|
1009 | 1009 | </td> |
1010 | 1010 | </tr> |
1011 | - <tr id='autoptimize_imgopt_lazyload_exclusions' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_3', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_3'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_3'] ) ) { echo 'class="hidden"'; } ?>> |
|
1012 | - <th scope="row"><?php _e( 'Lazy-load exclusions', 'autoptimize' ); ?></th> |
|
1011 | + <tr id='autoptimize_imgopt_lazyload_exclusions' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_3', $options) || (isset($options['autoptimize_imgopt_checkbox_field_3']) && '1' !== $options['autoptimize_imgopt_checkbox_field_3'])) { echo 'class="hidden"'; } ?>> |
|
1012 | + <th scope="row"><?php _e('Lazy-load exclusions', 'autoptimize'); ?></th> |
|
1013 | 1013 | <td> |
1014 | - <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_5]' value='<?php if ( ! empty( $options['autoptimize_imgopt_text_field_5'] ) ) { echo esc_attr( $options['autoptimize_imgopt_text_field_5'] ); } ?>'><br /><?php _e( 'Comma-separated list of to be excluded image classes or filenames.', 'autoptimize' ); ?></label> |
|
1014 | + <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_5]' value='<?php if (!empty($options['autoptimize_imgopt_text_field_5'])) { echo esc_attr($options['autoptimize_imgopt_text_field_5']); } ?>'><br /><?php _e('Comma-separated list of to be excluded image classes or filenames.', 'autoptimize'); ?></label> |
|
1015 | 1015 | </td> |
1016 | 1016 | </tr> |
1017 | 1017 | </table> |
1018 | - <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /></p> |
|
1018 | + <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /></p> |
|
1019 | 1019 | </form> |
1020 | 1020 | <script> |
1021 | 1021 | jQuery(document).ready(function() { |
@@ -1051,37 +1051,37 @@ discard block |
||
1051 | 1051 | * Ïmg opt status as used on dashboard. |
1052 | 1052 | */ |
1053 | 1053 | public function get_imgopt_status_notice() { |
1054 | - if ( $this->imgopt_active() ) { |
|
1054 | + if ($this->imgopt_active()) { |
|
1055 | 1055 | $_imgopt_notice = ''; |
1056 | - $_stat = get_option( 'autoptimize_imgopt_provider_stat', '' ); |
|
1056 | + $_stat = get_option('autoptimize_imgopt_provider_stat', ''); |
|
1057 | 1057 | $_site_host = AUTOPTIMIZE_SITE_DOMAIN; |
1058 | - $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . $_site_host; |
|
1058 | + $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.$_site_host; |
|
1059 | 1059 | |
1060 | - if ( is_array( $_stat ) ) { |
|
1061 | - if ( 1 == $_stat['Status'] ) { |
|
1060 | + if (is_array($_stat)) { |
|
1061 | + if (1 == $_stat['Status']) { |
|
1062 | 1062 | // translators: "add more credits" will appear in a "a href". |
1063 | - $_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>' ); |
|
1063 | + $_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>'); |
|
1064 | 1064 | } elseif ( -1 == $_stat['Status'] || -2 == $_stat['Status'] ) { |
1065 | 1065 | // translators: "add more credits" will appear in a "a href". |
1066 | - $_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>' ); |
|
1067 | - $_imgopt_stats_refresh_url = add_query_arg( array( |
|
1066 | + $_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>'); |
|
1067 | + $_imgopt_stats_refresh_url = add_query_arg(array( |
|
1068 | 1068 | 'page' => 'autoptimize_imgopt', |
1069 | 1069 | 'refreshImgProvStats' => '1', |
1070 | - ), admin_url( 'options-general.php' ) ); |
|
1071 | - if ( $_stat && array_key_exists( 'timestamp', $_stat ) && ! empty( $_stat['timestamp'] ) ) { |
|
1072 | - $_imgopt_stats_last_run = __( 'based on status at ', 'autoptimize' ) . date_i18n( get_option( 'time_format' ), $_stat['timestamp'] ); |
|
1070 | + ), admin_url('options-general.php')); |
|
1071 | + if ($_stat && array_key_exists('timestamp', $_stat) && !empty($_stat['timestamp'])) { |
|
1072 | + $_imgopt_stats_last_run = __('based on status at ', 'autoptimize').date_i18n(get_option('time_format'), $_stat['timestamp']); |
|
1073 | 1073 | } else { |
1074 | - $_imgopt_stats_last_run = __( 'based on previously fetched data', 'autoptimize' ); |
|
1074 | + $_imgopt_stats_last_run = __('based on previously fetched data', 'autoptimize'); |
|
1075 | 1075 | } |
1076 | - $_imgopt_notice .= ' (' . $_imgopt_stats_last_run . ', '; |
|
1076 | + $_imgopt_notice .= ' ('.$_imgopt_stats_last_run.', '; |
|
1077 | 1077 | // translators: "here to refresh" links to the Autoptimize Extra page and forces a refresh of the img opt stats. |
1078 | - $_imgopt_notice .= sprintf( __( 'click %1$shere to refresh%2$s', 'autoptimize' ), '<a href="' . $_imgopt_stats_refresh_url . '">', '</a>).' ); |
|
1078 | + $_imgopt_notice .= sprintf(__('click %1$shere to refresh%2$s', 'autoptimize'), '<a href="'.$_imgopt_stats_refresh_url.'">', '</a>).'); |
|
1079 | 1079 | } else { |
1080 | 1080 | $_imgopt_upsell = 'https://shortpixel.com/g/af/GWRGFLW109483'; |
1081 | 1081 | // translators: "log in to check your account" will appear in a "a href". |
1082 | - $_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>' ); |
|
1082 | + $_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>'); |
|
1083 | 1083 | } |
1084 | - $_imgopt_notice = apply_filters( 'autoptimize_filter_imgopt_notice', $_imgopt_notice ); |
|
1084 | + $_imgopt_notice = apply_filters('autoptimize_filter_imgopt_notice', $_imgopt_notice); |
|
1085 | 1085 | |
1086 | 1086 | return array( |
1087 | 1087 | 'status' => $_stat['Status'], |
@@ -1102,14 +1102,14 @@ discard block |
||
1102 | 1102 | * Get img provider stats (used to display notice). |
1103 | 1103 | */ |
1104 | 1104 | public function query_img_provider_stats() { |
1105 | - if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_1'] ) ) { |
|
1105 | + if (!empty($this->options['autoptimize_imgopt_checkbox_field_1'])) { |
|
1106 | 1106 | $url = ''; |
1107 | - $endpoint = $this->get_imgopt_host() . 'read-domain/'; |
|
1107 | + $endpoint = $this->get_imgopt_host().'read-domain/'; |
|
1108 | 1108 | $domain = AUTOPTIMIZE_SITE_DOMAIN; |
1109 | 1109 | |
1110 | 1110 | // make sure parse_url result makes sense, keeping $url empty if not. |
1111 | - if ( $domain && ! empty( $domain ) ) { |
|
1112 | - $url = $endpoint . $domain; |
|
1111 | + if ($domain && !empty($domain)) { |
|
1112 | + $url = $endpoint.$domain; |
|
1113 | 1113 | } |
1114 | 1114 | |
1115 | 1115 | $url = apply_filters( |
@@ -1119,12 +1119,12 @@ discard block |
||
1119 | 1119 | |
1120 | 1120 | // only do the remote call if $url is not empty to make sure no parse_url |
1121 | 1121 | // weirdness results in useless calls. |
1122 | - if ( ! empty( $url ) ) { |
|
1123 | - $response = wp_remote_get( $url ); |
|
1124 | - if ( ! is_wp_error( $response ) ) { |
|
1125 | - if ( '200' == wp_remote_retrieve_response_code( $response ) ) { |
|
1126 | - $stats = json_decode( wp_remote_retrieve_body( $response ), true ); |
|
1127 | - update_option( 'autoptimize_imgopt_provider_stat', $stats ); |
|
1122 | + if (!empty($url)) { |
|
1123 | + $response = wp_remote_get($url); |
|
1124 | + if (!is_wp_error($response)) { |
|
1125 | + if ('200' == wp_remote_retrieve_response_code($response)) { |
|
1126 | + $stats = json_decode(wp_remote_retrieve_body($response), true); |
|
1127 | + update_option('autoptimize_imgopt_provider_stat', $stats); |
|
1128 | 1128 | } |
1129 | 1129 | } |
1130 | 1130 | } |
@@ -1147,15 +1147,15 @@ discard block |
||
1147 | 1147 | { |
1148 | 1148 | static $launch_status = null; |
1149 | 1149 | |
1150 | - if ( null === $launch_status ) { |
|
1150 | + if (null === $launch_status) { |
|
1151 | 1151 | $avail_imgopt = $this->options['availabilities']['extra_imgopt']; |
1152 | - $magic_number = intval( substr( md5( parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) ), 0, 3 ), 16 ); |
|
1153 | - $has_launched = get_option( 'autoptimize_imgopt_launched', '' ); |
|
1152 | + $magic_number = intval(substr(md5(parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)), 0, 3), 16); |
|
1153 | + $has_launched = get_option('autoptimize_imgopt_launched', ''); |
|
1154 | 1154 | $launch_status = false; |
1155 | - if ( $has_launched || ( is_array( $avail_imgopt ) && array_key_exists( 'launch-threshold', $avail_imgopt ) && $magic_number < $avail_imgopt['launch-threshold'] ) ) { |
|
1155 | + if ($has_launched || (is_array($avail_imgopt) && array_key_exists('launch-threshold', $avail_imgopt) && $magic_number < $avail_imgopt['launch-threshold'])) { |
|
1156 | 1156 | $launch_status = true; |
1157 | - if ( ! $has_launched ) { |
|
1158 | - update_option( 'autoptimize_imgopt_launched', 'on' ); |
|
1157 | + if (!$has_launched) { |
|
1158 | + update_option('autoptimize_imgopt_launched', 'on'); |
|
1159 | 1159 | } |
1160 | 1160 | } |
1161 | 1161 | } |
@@ -1172,16 +1172,16 @@ discard block |
||
1172 | 1172 | public function get_imgopt_provider_userstatus() { |
1173 | 1173 | static $_provider_userstatus = null; |
1174 | 1174 | |
1175 | - if ( is_null( $_provider_userstatus ) ) { |
|
1176 | - $_stat = get_option( 'autoptimize_imgopt_provider_stat', '' ); |
|
1177 | - if ( is_array( $_stat ) ) { |
|
1178 | - if ( array_key_exists( 'Status', $_stat ) ) { |
|
1175 | + if (is_null($_provider_userstatus)) { |
|
1176 | + $_stat = get_option('autoptimize_imgopt_provider_stat', ''); |
|
1177 | + if (is_array($_stat)) { |
|
1178 | + if (array_key_exists('Status', $_stat)) { |
|
1179 | 1179 | $_provider_userstatus['Status'] = $_stat['Status']; |
1180 | 1180 | } else { |
1181 | 1181 | // if no stats then we assume all is well. |
1182 | 1182 | $_provider_userstatus['Status'] = 2; |
1183 | 1183 | } |
1184 | - if ( array_key_exists( 'timestamp', $_stat ) ) { |
|
1184 | + if (array_key_exists('timestamp', $_stat)) { |
|
1185 | 1185 | $_provider_userstatus['timestamp'] = $_stat['timestamp']; |
1186 | 1186 | } else { |
1187 | 1187 | // if no timestamp then we return "". |
@@ -1194,27 +1194,27 @@ discard block |
||
1194 | 1194 | } |
1195 | 1195 | |
1196 | 1196 | public function get_status_notice() { |
1197 | - if ( $this->imgopt_active() ) { |
|
1197 | + if ($this->imgopt_active()) { |
|
1198 | 1198 | $notice = ''; |
1199 | 1199 | $stat = $this->get_imgopt_provider_userstatus(); |
1200 | - $upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN; |
|
1200 | + $upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN; |
|
1201 | 1201 | $assoc = 'https://shortpixel.helpscoutdocs.com/article/94-how-to-associate-a-domain-to-my-account'; |
1202 | 1202 | |
1203 | - if ( is_array( $stat ) ) { |
|
1204 | - if ( 1 == $stat['Status'] ) { |
|
1203 | + if (is_array($stat)) { |
|
1204 | + if (1 == $stat['Status']) { |
|
1205 | 1205 | // translators: "add more credits" will appear in a "a href". |
1206 | - $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 rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' ); |
|
1206 | + $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 rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>'); |
|
1207 | 1207 | } elseif ( -1 == $stat['Status'] || -2 == $stat['Status'] ) { |
1208 | 1208 | // translators: "add more credits" will appear in a "a href". |
1209 | - $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 rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' ); |
|
1209 | + $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 rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>'); |
|
1210 | 1210 | // translators: "associate your domain" will appear in a "a href". |
1211 | - $notice = $notice . ' ' . sprintf( __( 'If you already have enough credits then you may need to %1$sassociate your domain%2$s to your Shortpixel account.', 'autoptimize' ), '<a rel="noopener noreferrer" href="' . $assoc . '" target="_blank">', '</a>' ); |
|
1211 | + $notice = $notice.' '.sprintf(__('If you already have enough credits then you may need to %1$sassociate your domain%2$s to your Shortpixel account.', 'autoptimize'), '<a rel="noopener noreferrer" href="'.$assoc.'" target="_blank">', '</a>'); |
|
1212 | 1212 | } else { |
1213 | 1213 | $upsell = 'https://shortpixel.com/g/af/GWRGFLW109483'; |
1214 | 1214 | // translators: "log in to check your account" will appear in a "a href". |
1215 | - $notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' ); |
|
1215 | + $notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>'); |
|
1216 | 1216 | } |
1217 | - $notice = apply_filters( 'autoptimize_filter_imgopt_notice', $notice ); |
|
1217 | + $notice = apply_filters('autoptimize_filter_imgopt_notice', $notice); |
|
1218 | 1218 | |
1219 | 1219 | return array( |
1220 | 1220 | 'status' => $stat['Status'], |