@@ -107,10 +107,10 @@ discard block |
||
107 | 107 | } |
108 | 108 | } |
109 | 109 | if ( ! empty( $this->options['external_cdn_link'] ) ) { |
110 | - //Modify the CDN URL, we won't need any parts after the host. |
|
111 | - $parsed_cdn_url = parse_url( $this->options['external_cdn_link'] ); |
|
112 | - $parsed_url['path'] = str_replace( $parsed_cdn_url['path'], "", $parsed_url['path'] ); |
|
113 | - } |
|
110 | + //Modify the CDN URL, we won't need any parts after the host. |
|
111 | + $parsed_cdn_url = parse_url( $this->options['external_cdn_link'] ); |
|
112 | + $parsed_url['path'] = str_replace( $parsed_cdn_url['path'], "", $parsed_url['path'] ); |
|
113 | + } |
|
114 | 114 | |
115 | 115 | $url = http_build_url( $parsed_url ); |
116 | 116 | |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | * @return string |
201 | 201 | */ |
202 | 202 | public function replace_images_in_content( $content ) { |
203 | - // Added null to apply filters wp_get_attachment_url to improve compatibility with https://en-gb.wordpress.org/plugins/amazon-s3-and-cloudfront/ - does not break wordpress if the plugin isn't present. |
|
203 | + // Added null to apply filters wp_get_attachment_url to improve compatibility with https://en-gb.wordpress.org/plugins/amazon-s3-and-cloudfront/ - does not break wordpress if the plugin isn't present. |
|
204 | 204 | if ( ! empty ( $this->options['cdn_link'] ) ) { |
205 | 205 | if ( preg_match_all( '/<img\s[^>]*src=([\"\']??)([^\" >]*?)\1[^>]*>/iU', $content, $matches ) ) { |
206 | 206 | foreach ( $matches[2] as $image_src ) { |
@@ -27,21 +27,21 @@ discard block |
||
27 | 27 | * ImagesViaImgix constructor. |
28 | 28 | */ |
29 | 29 | public function __construct() { |
30 | - $this->options = get_option( 'imgix_settings', [] ); |
|
30 | + $this->options = get_option('imgix_settings', []); |
|
31 | 31 | |
32 | 32 | // Change filter load order to ensure it loads after other CDN url transformations i.e. Amazon S3 which loads at position 99. |
33 | - add_filter( 'wp_get_attachment_url', [ $this, 'replace_image_url' ], 100 ); |
|
34 | - add_filter( 'imgix/add-image-url', [ $this, 'replace_image_url' ] ); |
|
33 | + add_filter('wp_get_attachment_url', [$this, 'replace_image_url'], 100); |
|
34 | + add_filter('imgix/add-image-url', [$this, 'replace_image_url']); |
|
35 | 35 | |
36 | - add_filter( 'image_downsize', [ $this, 'image_downsize' ], 10, 3 ); |
|
36 | + add_filter('image_downsize', [$this, 'image_downsize'], 10, 3); |
|
37 | 37 | |
38 | - add_filter( 'wp_calculate_image_srcset', [ $this, 'calculate_image_srcset' ], 10, 5 ); |
|
38 | + add_filter('wp_calculate_image_srcset', [$this, 'calculate_image_srcset'], 10, 5); |
|
39 | 39 | |
40 | - add_filter( 'the_content', [ $this, 'replace_images_in_content' ] ); |
|
41 | - add_action( 'wp_head', [ $this, 'prefetch_cdn' ], 1 ); |
|
40 | + add_filter('the_content', [$this, 'replace_images_in_content']); |
|
41 | + add_action('wp_head', [$this, 'prefetch_cdn'], 1); |
|
42 | 42 | |
43 | - add_action( 'after_setup_theme', [ $this, 'buffer_start_for_retina' ] ); |
|
44 | - add_action( 'shutdown', [ $this, 'buffer_end_for_retina' ] ); |
|
43 | + add_action('after_setup_theme', [$this, 'buffer_start_for_retina']); |
|
44 | + add_action('shutdown', [$this, 'buffer_end_for_retina']); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * @return Images_Via_Imgix |
51 | 51 | */ |
52 | 52 | public static function instance() { |
53 | - if ( ! isset( self::$instance ) ) { |
|
53 | + if ( ! isset(self::$instance)) { |
|
54 | 54 | self::$instance = new self; |
55 | 55 | } |
56 | 56 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * |
64 | 64 | * @param array $options |
65 | 65 | */ |
66 | - public function set_options( $options ) { |
|
66 | + public function set_options($options) { |
|
67 | 67 | $this->options = $options; |
68 | 68 | } |
69 | 69 | |
@@ -76,13 +76,13 @@ discard block |
||
76 | 76 | * |
77 | 77 | * @return string Content with retina-enriched image tags. |
78 | 78 | */ |
79 | - public function add_retina( $content ) { |
|
79 | + public function add_retina($content) { |
|
80 | 80 | $pattern = '/<img((?![^>]+srcset )([^>]*)'; |
81 | 81 | $pattern .= 'src=[\'"]([^\'"]*imgix.net[^\'"]*\?[^\'"]*w=[^\'"]*)[\'"]([^>]*)*?)>/i'; |
82 | 82 | $repl = '<img$2src="$3" srcset="${3}, ${3}&dpr=2 2x, ${3}&dpr=3 3x,"$4>'; |
83 | - $content = preg_replace( $pattern, $repl, $content ); |
|
83 | + $content = preg_replace($pattern, $repl, $content); |
|
84 | 84 | |
85 | - return preg_replace( $pattern, $repl, $content ); |
|
85 | + return preg_replace($pattern, $repl, $content); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -92,29 +92,29 @@ discard block |
||
92 | 92 | * |
93 | 93 | * @return string |
94 | 94 | */ |
95 | - public function replace_image_url( $url ) { |
|
96 | - if ( ! empty ( $this->options['cdn_link'] ) ) { |
|
97 | - $parsed_url = parse_url( $url ); |
|
95 | + public function replace_image_url($url) { |
|
96 | + if ( ! empty ($this->options['cdn_link'])) { |
|
97 | + $parsed_url = parse_url($url); |
|
98 | 98 | |
99 | 99 | //Check if image is hosted on current site url -OR- the CDN url specified. Using strpos because we're comparing the host to a full CDN url. |
100 | - if ( isset( $parsed_url['host'], $parsed_url['path'] ) && ($parsed_url['host'] === parse_url( home_url( '/' ), PHP_URL_HOST ) || strpos( ( $this->options['external_cdn_link'] ? $this->options['external_cdn_link'] : "" ), $parsed_url['host'] ) !== false) && preg_match( '/\.(jpg|jpeg|gif|png)$/i', $parsed_url['path'] ) ) { |
|
101 | - $cdn = parse_url( $this->options['cdn_link'] ); |
|
102 | - foreach ( [ 'scheme', 'host', 'port' ] as $url_part ) { |
|
103 | - if ( isset( $cdn[ $url_part ] ) ) { |
|
104 | - $parsed_url[ $url_part ] = $cdn[ $url_part ]; |
|
100 | + if (isset($parsed_url['host'], $parsed_url['path']) && ($parsed_url['host'] === parse_url(home_url('/'), PHP_URL_HOST) || strpos(($this->options['external_cdn_link'] ? $this->options['external_cdn_link'] : ""), $parsed_url['host']) !== false) && preg_match('/\.(jpg|jpeg|gif|png)$/i', $parsed_url['path'])) { |
|
101 | + $cdn = parse_url($this->options['cdn_link']); |
|
102 | + foreach (['scheme', 'host', 'port'] as $url_part) { |
|
103 | + if (isset($cdn[$url_part])) { |
|
104 | + $parsed_url[$url_part] = $cdn[$url_part]; |
|
105 | 105 | } else { |
106 | - unset( $parsed_url[ $url_part ] ); |
|
106 | + unset($parsed_url[$url_part]); |
|
107 | 107 | } |
108 | 108 | } |
109 | - if ( ! empty( $this->options['external_cdn_link'] ) ) { |
|
109 | + if ( ! empty($this->options['external_cdn_link'])) { |
|
110 | 110 | //Modify the CDN URL, we won't need any parts after the host. |
111 | - $parsed_cdn_url = parse_url( $this->options['external_cdn_link'] ); |
|
112 | - $parsed_url['path'] = str_replace( $parsed_cdn_url['path'], "", $parsed_url['path'] ); |
|
111 | + $parsed_cdn_url = parse_url($this->options['external_cdn_link']); |
|
112 | + $parsed_url['path'] = str_replace($parsed_cdn_url['path'], "", $parsed_url['path']); |
|
113 | 113 | } |
114 | 114 | |
115 | - $url = http_build_url( $parsed_url ); |
|
115 | + $url = http_build_url($parsed_url); |
|
116 | 116 | |
117 | - $url = add_query_arg( $this->get_global_params(), $url ); |
|
117 | + $url = add_query_arg($this->get_global_params(), $url); |
|
118 | 118 | } |
119 | 119 | } |
120 | 120 | |
@@ -130,35 +130,35 @@ discard block |
||
130 | 130 | * |
131 | 131 | * @return false|array |
132 | 132 | */ |
133 | - public function image_downsize( $return, $attachment_id, $size ) { |
|
134 | - if ( ! empty ( $this->options['cdn_link'] ) ) { |
|
135 | - $img_url = wp_get_attachment_url( $attachment_id ); |
|
133 | + public function image_downsize($return, $attachment_id, $size) { |
|
134 | + if ( ! empty ($this->options['cdn_link'])) { |
|
135 | + $img_url = wp_get_attachment_url($attachment_id); |
|
136 | 136 | |
137 | 137 | $params = []; |
138 | - if ( is_array( $size ) ) { |
|
139 | - $params['w'] = $width = isset( $size[0] ) ? $size[0] : 0; |
|
140 | - $params['h'] = $height = isset( $size[1] ) ? $size[1] : 0; |
|
138 | + if (is_array($size)) { |
|
139 | + $params['w'] = $width = isset($size[0]) ? $size[0] : 0; |
|
140 | + $params['h'] = $height = isset($size[1]) ? $size[1] : 0; |
|
141 | 141 | } else { |
142 | 142 | $available_sizes = $this->get_all_defined_sizes(); |
143 | - if ( isset( $available_sizes[ $size ] ) ) { |
|
144 | - $size = $available_sizes[ $size ]; |
|
143 | + if (isset($available_sizes[$size])) { |
|
144 | + $size = $available_sizes[$size]; |
|
145 | 145 | $params['w'] = $width = $size['width']; |
146 | 146 | $params['h'] = $height = $size['height']; |
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
150 | - $params = array_filter( $params ); |
|
150 | + $params = array_filter($params); |
|
151 | 151 | |
152 | - $img_url = add_query_arg( $params, $img_url ); |
|
152 | + $img_url = add_query_arg($params, $img_url); |
|
153 | 153 | |
154 | - if ( ! isset( $width ) || ! isset( $height ) ) { |
|
154 | + if ( ! isset($width) || ! isset($height)) { |
|
155 | 155 | // any other type: use the real image |
156 | - $meta = wp_get_attachment_metadata( $attachment_id ); |
|
157 | - $width = isset( $width ) ? $width : $meta['width']; |
|
158 | - $height = isset( $height ) ? $height : $meta['height']; |
|
156 | + $meta = wp_get_attachment_metadata($attachment_id); |
|
157 | + $width = isset($width) ? $width : $meta['width']; |
|
158 | + $height = isset($height) ? $height : $meta['height']; |
|
159 | 159 | } |
160 | 160 | |
161 | - $return = [ $img_url, $width, $height, true ]; |
|
161 | + $return = [$img_url, $width, $height, true]; |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | return $return; |
@@ -175,16 +175,16 @@ discard block |
||
175 | 175 | * |
176 | 176 | * @return array |
177 | 177 | */ |
178 | - public function calculate_image_srcset( $sources, $size_array, $image_src, $image_meta, $attachment_id ) { |
|
179 | - if ( ! empty ( $this->options['cdn_link'] ) ) { |
|
180 | - foreach ( $sources as $i => $image_size ) { |
|
181 | - if ( $image_size['descriptor'] === 'w' ) { |
|
182 | - if ( $attachment_id ) { |
|
183 | - $image_src = wp_get_attachment_url( $attachment_id ); |
|
178 | + public function calculate_image_srcset($sources, $size_array, $image_src, $image_meta, $attachment_id) { |
|
179 | + if ( ! empty ($this->options['cdn_link'])) { |
|
180 | + foreach ($sources as $i => $image_size) { |
|
181 | + if ($image_size['descriptor'] === 'w') { |
|
182 | + if ($attachment_id) { |
|
183 | + $image_src = wp_get_attachment_url($attachment_id); |
|
184 | 184 | } |
185 | 185 | |
186 | - $image_src = remove_query_arg( 'h', $image_src ); |
|
187 | - $sources[ $i ]['url'] = add_query_arg( 'w', $image_size['value'], $image_src ); |
|
186 | + $image_src = remove_query_arg('h', $image_src); |
|
187 | + $sources[$i]['url'] = add_query_arg('w', $image_size['value'], $image_src); |
|
188 | 188 | } |
189 | 189 | } |
190 | 190 | } |
@@ -199,29 +199,29 @@ discard block |
||
199 | 199 | * |
200 | 200 | * @return string |
201 | 201 | */ |
202 | - public function replace_images_in_content( $content ) { |
|
202 | + public function replace_images_in_content($content) { |
|
203 | 203 | // Added null to apply filters wp_get_attachment_url to improve compatibility with https://en-gb.wordpress.org/plugins/amazon-s3-and-cloudfront/ - does not break wordpress if the plugin isn't present. |
204 | - if ( ! empty ( $this->options['cdn_link'] ) ) { |
|
205 | - if ( preg_match_all( '/<img\s[^>]*src=([\"\']??)([^\" >]*?)\1[^>]*>/iU', $content, $matches ) ) { |
|
206 | - foreach ( $matches[2] as $image_src ) { |
|
207 | - $content = str_replace( $image_src, apply_filters( 'wp_get_attachment_url', $image_src, null ), $content ); |
|
204 | + if ( ! empty ($this->options['cdn_link'])) { |
|
205 | + if (preg_match_all('/<img\s[^>]*src=([\"\']??)([^\" >]*?)\1[^>]*>/iU', $content, $matches)) { |
|
206 | + foreach ($matches[2] as $image_src) { |
|
207 | + $content = str_replace($image_src, apply_filters('wp_get_attachment_url', $image_src, null), $content); |
|
208 | 208 | } |
209 | 209 | } |
210 | 210 | |
211 | - if ( preg_match_all( '/<img\s[^>]*srcset=([\"\']??)([^\">]*?)\1[^>]*\/?>/iU', $content, $matches ) ) { |
|
211 | + if (preg_match_all('/<img\s[^>]*srcset=([\"\']??)([^\">]*?)\1[^>]*\/?>/iU', $content, $matches)) { |
|
212 | 212 | |
213 | - foreach ( $matches[2] as $image_srcset ) { |
|
214 | - $new_image_srcset = preg_replace_callback( '/(\S+)(\s\d+\w)/', function ( $srcset_matches ) { |
|
215 | - return apply_filters( 'wp_get_attachment_url', $srcset_matches[1], null ) . $srcset_matches[2]; |
|
216 | - }, $image_srcset ); |
|
213 | + foreach ($matches[2] as $image_srcset) { |
|
214 | + $new_image_srcset = preg_replace_callback('/(\S+)(\s\d+\w)/', function($srcset_matches) { |
|
215 | + return apply_filters('wp_get_attachment_url', $srcset_matches[1], null) . $srcset_matches[2]; |
|
216 | + }, $image_srcset); |
|
217 | 217 | |
218 | - $content = str_replace( $image_srcset, $new_image_srcset, $content ); |
|
218 | + $content = str_replace($image_srcset, $new_image_srcset, $content); |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | |
222 | - if ( preg_match_all( '/<a\s[^>]*href=([\"\']??)([^\" >]*?)\1[^>]*>(.*)<\/a>/iU', $content, $matches ) ) { |
|
223 | - foreach ( $matches[0] as $link ) { |
|
224 | - $content = str_replace( $link[2], apply_filters( 'wp_get_attachment_url', $link[2], null ), $content ); |
|
222 | + if (preg_match_all('/<a\s[^>]*href=([\"\']??)([^\" >]*?)\1[^>]*>(.*)<\/a>/iU', $content, $matches)) { |
|
223 | + foreach ($matches[0] as $link) { |
|
224 | + $content = str_replace($link[2], apply_filters('wp_get_attachment_url', $link[2], null), $content); |
|
225 | 225 | } |
226 | 226 | } |
227 | 227 | } |
@@ -232,12 +232,12 @@ discard block |
||
232 | 232 | * Add tag to dns prefetch cdn host |
233 | 233 | */ |
234 | 234 | public function prefetch_cdn() { |
235 | - if ( ! empty ( $this->options['cdn_link'] ) ) { |
|
236 | - $host = parse_url( $this->options['cdn_link'], PHP_URL_HOST ); |
|
235 | + if ( ! empty ($this->options['cdn_link'])) { |
|
236 | + $host = parse_url($this->options['cdn_link'], PHP_URL_HOST); |
|
237 | 237 | |
238 | 238 | printf( |
239 | 239 | '<link rel="dns-prefetch" href="%s"/>', |
240 | - esc_attr( '//' . $host ) |
|
240 | + esc_attr('//' . $host) |
|
241 | 241 | ); |
242 | 242 | } |
243 | 243 | } |
@@ -246,9 +246,9 @@ discard block |
||
246 | 246 | * Start output buffer if auto retina is enabled |
247 | 247 | */ |
248 | 248 | public function buffer_start_for_retina() { |
249 | - if ( ! empty ( $this->options['add_dpi2_srcset'] ) ) { |
|
249 | + if ( ! empty ($this->options['add_dpi2_srcset'])) { |
|
250 | 250 | $this->buffer_started = true; |
251 | - ob_start( [ $this, 'add_retina' ] ); |
|
251 | + ob_start([$this, 'add_retina']); |
|
252 | 252 | } |
253 | 253 | } |
254 | 254 | |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | * Stop output buffer if it was enabled by the plugin |
257 | 257 | */ |
258 | 258 | public function buffer_end_for_retina() { |
259 | - if ( $this->buffer_started === true ) { |
|
259 | + if ($this->buffer_started === true) { |
|
260 | 260 | ob_end_flush(); |
261 | 261 | } |
262 | 262 | } |
@@ -272,20 +272,20 @@ discard block |
||
272 | 272 | |
273 | 273 | // For now, only "auto" is supported. |
274 | 274 | $auto = []; |
275 | - if ( ! empty ( $this->options['auto_format'] ) ) { |
|
276 | - array_push( $auto, 'format' ); |
|
275 | + if ( ! empty ($this->options['auto_format'])) { |
|
276 | + array_push($auto, 'format'); |
|
277 | 277 | } |
278 | 278 | |
279 | - if ( ! empty ( $this->options['auto_enhance'] ) ) { |
|
280 | - array_push( $auto, 'enhance' ); |
|
279 | + if ( ! empty ($this->options['auto_enhance'])) { |
|
280 | + array_push($auto, 'enhance'); |
|
281 | 281 | } |
282 | 282 | |
283 | - if ( ! empty ( $this->options['auto_compress'] ) ) { |
|
284 | - array_push( $auto, 'compress' ); |
|
283 | + if ( ! empty ($this->options['auto_compress'])) { |
|
284 | + array_push($auto, 'compress'); |
|
285 | 285 | } |
286 | 286 | |
287 | - if ( ! empty( $auto ) ) { |
|
288 | - $params['auto'] = implode( '%2C', $auto ); |
|
287 | + if ( ! empty($auto)) { |
|
288 | + $params['auto'] = implode('%2C', $auto); |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | return $params; |
@@ -301,18 +301,18 @@ discard block |
||
301 | 301 | $theme_image_sizes = wp_get_additional_image_sizes(); |
302 | 302 | |
303 | 303 | $sizes = []; |
304 | - foreach ( get_intermediate_image_sizes() as $s ) { |
|
305 | - $sizes[ $s ] = [ 'width' => '', 'height' => '', 'crop' => false ]; |
|
306 | - if ( isset( $theme_image_sizes[ $s ] ) ) { |
|
304 | + foreach (get_intermediate_image_sizes() as $s) { |
|
305 | + $sizes[$s] = ['width' => '', 'height' => '', 'crop' => false]; |
|
306 | + if (isset($theme_image_sizes[$s])) { |
|
307 | 307 | // For theme-added sizes |
308 | - $sizes[ $s ]['width'] = intval( $theme_image_sizes[ $s ]['width'] ); |
|
309 | - $sizes[ $s ]['height'] = intval( $theme_image_sizes[ $s ]['height'] ); |
|
310 | - $sizes[ $s ]['crop'] = $theme_image_sizes[ $s ]['crop']; |
|
308 | + $sizes[$s]['width'] = intval($theme_image_sizes[$s]['width']); |
|
309 | + $sizes[$s]['height'] = intval($theme_image_sizes[$s]['height']); |
|
310 | + $sizes[$s]['crop'] = $theme_image_sizes[$s]['crop']; |
|
311 | 311 | } else { |
312 | 312 | // For default sizes set in options |
313 | - $sizes[ $s ]['width'] = get_option( "{$s}_size_w" ); |
|
314 | - $sizes[ $s ]['height'] = get_option( "{$s}_size_h" ); |
|
315 | - $sizes[ $s ]['crop'] = get_option( "{$s}_crop" ); |
|
313 | + $sizes[$s]['width'] = get_option("{$s}_size_w"); |
|
314 | + $sizes[$s]['height'] = get_option("{$s}_size_h"); |
|
315 | + $sizes[$s]['crop'] = get_option("{$s}_crop"); |
|
316 | 316 | } |
317 | 317 | } |
318 | 318 |
@@ -18,9 +18,9 @@ discard block |
||
18 | 18 | |
19 | 19 | |
20 | 20 | public function __construct() { |
21 | - $this->options = get_option( 'imgix_settings', [] ); |
|
22 | - add_action( 'admin_init', [ $this, 'imgix_register_settings' ] ); |
|
23 | - add_action( 'admin_menu', [ $this, 'imgix_add_options_link' ] ); |
|
21 | + $this->options = get_option('imgix_settings', []); |
|
22 | + add_action('admin_init', [$this, 'imgix_register_settings']); |
|
23 | + add_action('admin_menu', [$this, 'imgix_add_options_link']); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @return Imgix_Options_page |
30 | 30 | */ |
31 | 31 | public static function instance() { |
32 | - if ( ! isset( self::$instance ) ) { |
|
32 | + if ( ! isset(self::$instance)) { |
|
33 | 33 | self::$instance = new self; |
34 | 34 | } |
35 | 35 | |
@@ -44,70 +44,70 @@ discard block |
||
44 | 44 | <div class="wrap"> |
45 | 45 | |
46 | 46 | <h1> |
47 | - <img src="<?php echo plugins_url( 'assets/images/imgix-logo.png', __DIR__ ); ?>" alt="imgix Logo"> |
|
47 | + <img src="<?php echo plugins_url('assets/images/imgix-logo.png', __DIR__); ?>" alt="imgix Logo"> |
|
48 | 48 | </h1> |
49 | 49 | |
50 | 50 | <p><strong>Need help getting started?</strong> It's easy! Check out our |
51 | 51 | <a href="https://github.com/imgix-wordpress/imgix-wordpress#getting-started" target="_blank">instructions.</a> |
52 | 52 | </p> |
53 | 53 | |
54 | - <form method="post" action="<?php echo admin_url( 'options.php' ); ?>"> |
|
55 | - <?php settings_fields( 'imgix_settings_group' ); ?> |
|
54 | + <form method="post" action="<?php echo admin_url('options.php'); ?>"> |
|
55 | + <?php settings_fields('imgix_settings_group'); ?> |
|
56 | 56 | <table class="form-table"> |
57 | 57 | <tbody> |
58 | 58 | <tr> |
59 | 59 | <th> |
60 | - <label class="description" for="imgix_settings[cdn_link]"><?php esc_html_e( 'imgix Source', 'imgix' ); ?> |
|
60 | + <label class="description" for="imgix_settings[cdn_link]"><?php esc_html_e('imgix Source', 'imgix'); ?> |
|
61 | 61 | </th> |
62 | 62 | <td> |
63 | - <input id="imgix_settings[cdn_link]" type="url" name="imgix_settings[cdn_link]" placeholder="https://yourcompany.imgix.net" value="<?php echo $this->get_option( 'cdn_link' ); ?>" class="regular-text code"/> |
|
63 | + <input id="imgix_settings[cdn_link]" type="url" name="imgix_settings[cdn_link]" placeholder="https://yourcompany.imgix.net" value="<?php echo $this->get_option('cdn_link'); ?>" class="regular-text code"/> |
|
64 | 64 | </td> |
65 | 65 | </tr> |
66 | 66 | <tr> |
67 | 67 | <th> |
68 | - <label class="description" for="imgix_settings[external_cdn_link]"><?php esc_html_e( 'CDN URL', 'imgix' ); ?> |
|
68 | + <label class="description" for="imgix_settings[external_cdn_link]"><?php esc_html_e('CDN URL', 'imgix'); ?> |
|
69 | 69 | </th> |
70 | 70 | <td> |
71 | - <input id="imgix_settings[external_cdn_link]" type="url" name="imgix_settings[external_cdn_link]" placeholder="http://s3-eu-west-2.amazonaws.com/your-bucket" value="<?php echo $this->get_option( 'external_cdn_link' ); ?>" class="regular-text code"/> |
|
71 | + <input id="imgix_settings[external_cdn_link]" type="url" name="imgix_settings[external_cdn_link]" placeholder="http://s3-eu-west-2.amazonaws.com/your-bucket" value="<?php echo $this->get_option('external_cdn_link'); ?>" class="regular-text code"/> |
|
72 | 72 | </td> |
73 | 73 | </tr> |
74 | 74 | <tr> |
75 | 75 | <th> |
76 | - <label class="description" for="imgix_settings[auto_format]"><?php esc_html_e( 'Auto Format Images', 'imgix' ); ?></label> |
|
76 | + <label class="description" for="imgix_settings[auto_format]"><?php esc_html_e('Auto Format Images', 'imgix'); ?></label> |
|
77 | 77 | </th> |
78 | 78 | <td> |
79 | - <input id="imgix_settings[auto_format]" type="checkbox" name="imgix_settings[auto_format]" value="1" <?php checked( $this->get_option( 'auto_format' ) ) ?> /> |
|
79 | + <input id="imgix_settings[auto_format]" type="checkbox" name="imgix_settings[auto_format]" value="1" <?php checked($this->get_option('auto_format')) ?> /> |
|
80 | 80 | </td> |
81 | 81 | </tr> |
82 | 82 | <tr> |
83 | 83 | <th> |
84 | - <label class="description" for="imgix_settings[auto_enhance]"><?php esc_html_e( 'Auto Enhance Images', 'imgix' ); ?></label> |
|
84 | + <label class="description" for="imgix_settings[auto_enhance]"><?php esc_html_e('Auto Enhance Images', 'imgix'); ?></label> |
|
85 | 85 | </th> |
86 | 86 | <td> |
87 | - <input id="imgix_settings[auto_enhance]" type="checkbox" name="imgix_settings[auto_enhance]" value="1" <?php checked( $this->get_option( 'auto_enhance' ) ) ?> /> |
|
87 | + <input id="imgix_settings[auto_enhance]" type="checkbox" name="imgix_settings[auto_enhance]" value="1" <?php checked($this->get_option('auto_enhance')) ?> /> |
|
88 | 88 | </td> |
89 | 89 | </tr> |
90 | 90 | <tr> |
91 | 91 | <th> |
92 | - <label class="description" for="imgix_settings[auto_compress]"><?php esc_html_e( 'Auto Compress Images', 'imgix' ); ?></label> |
|
92 | + <label class="description" for="imgix_settings[auto_compress]"><?php esc_html_e('Auto Compress Images', 'imgix'); ?></label> |
|
93 | 93 | </th> |
94 | 94 | <td> |
95 | - <input id="imgix_settings[auto_compress]" type="checkbox" name="imgix_settings[auto_compress]" value="1" <?php checked( $this->get_option( 'auto_compress' ) ) ?> /> |
|
95 | + <input id="imgix_settings[auto_compress]" type="checkbox" name="imgix_settings[auto_compress]" value="1" <?php checked($this->get_option('auto_compress')) ?> /> |
|
96 | 96 | </td> |
97 | 97 | </tr> |
98 | 98 | <tr> |
99 | 99 | <th> |
100 | - <label class="description" for="imgix_settings[add_dpi2_srcset]"><?php esc_html_e( 'Automatically add retina images using srcset', 'imgix' ); ?></label> |
|
100 | + <label class="description" for="imgix_settings[add_dpi2_srcset]"><?php esc_html_e('Automatically add retina images using srcset', 'imgix'); ?></label> |
|
101 | 101 | </th> |
102 | 102 | <td> |
103 | - <input id="imgix_settings[add_dpi2_srcset]" type="checkbox" name="imgix_settings[add_dpi2_srcset]" value="1" <?php checked( $this->get_option( 'add_dpi2_srcset' ) ) ?> /> |
|
103 | + <input id="imgix_settings[add_dpi2_srcset]" type="checkbox" name="imgix_settings[add_dpi2_srcset]" value="1" <?php checked($this->get_option('add_dpi2_srcset')) ?> /> |
|
104 | 104 | </td> |
105 | 105 | </tr> |
106 | 106 | </tbody> |
107 | 107 | </table> |
108 | 108 | |
109 | 109 | <p class="submit"> |
110 | - <input type="submit" class="button-primary" value="<?php esc_html_e( 'Save Options', 'imgix' ); ?>"/> |
|
110 | + <input type="submit" class="button-primary" value="<?php esc_html_e('Save Options', 'imgix'); ?>"/> |
|
111 | 111 | </p> |
112 | 112 | </form> |
113 | 113 | |
@@ -124,14 +124,14 @@ discard block |
||
124 | 124 | * Adds link to options page in Admin > Settings menu. |
125 | 125 | */ |
126 | 126 | public function imgix_add_options_link() { |
127 | - add_options_page( 'imgix', 'imgix', 'manage_options', 'imgix-options', [ $this, 'imgix_options_page' ] ); |
|
127 | + add_options_page('imgix', 'imgix', 'manage_options', 'imgix-options', [$this, 'imgix_options_page']); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
131 | 131 | * Creates our settings in the options table. |
132 | 132 | */ |
133 | 133 | public function imgix_register_settings() { |
134 | - register_setting( 'imgix_settings_group', 'imgix_settings' ); |
|
134 | + register_setting('imgix_settings_group', 'imgix_settings'); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -141,8 +141,8 @@ discard block |
||
141 | 141 | * |
142 | 142 | * @return mixed |
143 | 143 | */ |
144 | - protected function get_option( $key ) { |
|
145 | - return isset( $this->options[ $key ] ) ? $this->options[ $key ] : ''; |
|
144 | + protected function get_option($key) { |
|
145 | + return isset($this->options[$key]) ? $this->options[$key] : ''; |
|
146 | 146 | } |
147 | 147 | } |
148 | 148 |