imgix-wordpress / images-via-imgix

includes/options-page.php

Spacing +14 added lines, -14 removed lines

@@ -18,37 +18,37 @@ 
                 <p><strong>Need help getting started?</strong> It's easy! Check out our <a href="https://github.com/imgix-wordpress/imgix-wordpress#getting-started" target="_blank">instructions.</a></p>
 
 		<form method="post" action="options.php">
-			<?php settings_fields( 'imgix_settings_group' ); ?>
+			<?php settings_fields('imgix_settings_group'); ?>
 
 			<table class="form-table">
 
 				<tbody>
 
 					<tr>
-						<th><label class="description" for="imgix_settings[cdn_link]"><?php esc_html_e( 'imgix Source', 'imgix_domain' ); ?></th>
-						<td><input id="imgix_settings[cdn_link]" type="url" name="imgix_settings[cdn_link]" placeholder="https://yourcompany.imgix.net" value="<?php echo isset( $imgix_options['cdn_link'] ) ? esc_url( $imgix_options['cdn_link'] ) : ''; ?>" class="regular-text code" /></td>
+						<th><label class="description" for="imgix_settings[cdn_link]"><?php esc_html_e('imgix Source', 'imgix_domain'); ?></th>
+						<td><input id="imgix_settings[cdn_link]" type="url" name="imgix_settings[cdn_link]" placeholder="https://yourcompany.imgix.net" value="<?php echo isset($imgix_options['cdn_link']) ? esc_url($imgix_options['cdn_link']) : ''; ?>" class="regular-text code" /></td>
 					</tr>
 
 					<tr>
-                                                <th><label class="description" for="imgix_settings[auto_format]"><?php esc_html_e( 'Auto Format Images', 'auto_format' ); ?></label></th>
-						<td><input id="imgix_settings[auto_format]" type="checkbox" name="imgix_settings[auto_format]" value="1" <?php echo isset( $imgix_options['auto_format'] ) && '1' === $imgix_options['auto_format'] ? 'checked="checked"' : ''; ?> /></td>
+                                                <th><label class="description" for="imgix_settings[auto_format]"><?php esc_html_e('Auto Format Images', 'auto_format'); ?></label></th>
+						<td><input id="imgix_settings[auto_format]" type="checkbox" name="imgix_settings[auto_format]" value="1" <?php echo isset($imgix_options['auto_format']) && '1' === $imgix_options['auto_format'] ? 'checked="checked"' : ''; ?> /></td>
 					</tr>
 
 					<tr>
-                                                <th><label class="description" for="imgix_settings[auto_enhance]"><?php esc_html_e( 'Auto Enhance Images', 'auto_enhance' ); ?></label></th>
-						<td><input id="imgix_settings[auto_enhance]" type="checkbox" name="imgix_settings[auto_enhance]" value="1" <?php echo isset( $imgix_options['auto_enhance'] ) && '1' === $imgix_options['auto_enhance'] ? 'checked="checked"' : ''; ?> /></td>
+                                                <th><label class="description" for="imgix_settings[auto_enhance]"><?php esc_html_e('Auto Enhance Images', 'auto_enhance'); ?></label></th>
+						<td><input id="imgix_settings[auto_enhance]" type="checkbox" name="imgix_settings[auto_enhance]" value="1" <?php echo isset($imgix_options['auto_enhance']) && '1' === $imgix_options['auto_enhance'] ? 'checked="checked"' : ''; ?> /></td>
 					</tr>
 
 					<tr>
-						<th><label class="description" for="imgix_settings[add_dpi2_srcset]"><?php esc_html_e( 'Automatically add retina images using srcset', 'add_dpi2_srcset' ); ?></label></th>
-						<td><input id="imgix_settings[add_dpi2_srcset]" type="checkbox" name="imgix_settings[add_dpi2_srcset]" value="1" <?php echo isset( $imgix_options['add_dpi2_srcset'] ) && '1' === $imgix_options['add_dpi2_srcset'] ? 'checked="checked"' : ''; ?> /></td>
+						<th><label class="description" for="imgix_settings[add_dpi2_srcset]"><?php esc_html_e('Automatically add retina images using srcset', 'add_dpi2_srcset'); ?></label></th>
+						<td><input id="imgix_settings[add_dpi2_srcset]" type="checkbox" name="imgix_settings[add_dpi2_srcset]" value="1" <?php echo isset($imgix_options['add_dpi2_srcset']) && '1' === $imgix_options['add_dpi2_srcset'] ? 'checked="checked"' : ''; ?> /></td>
 					</tr>
 
 				</tbody>
 			</table>
 
 			<p class="submit">
-				<input type="submit" class="button-primary" value="<?php esc_html_e( 'Save Options', 'imgix_domain' ); ?>" />
+				<input type="submit" class="button-primary" value="<?php esc_html_e('Save Options', 'imgix_domain'); ?>" />
 			</p>
 		</form>
 
@@ -63,15 +63,15 @@ 
  *  Adds link to options page in Admin > Settings menu.
  */
 function imgix_add_options_link() {
-	add_options_page( 'imgix', 'imgix', 'manage_options', 'imgix-options', 'imgix_options_page' );
+	add_options_page('imgix', 'imgix', 'manage_options', 'imgix-options', 'imgix_options_page');
 }
-add_action( 'admin_menu', 'imgix_add_options_link' );
+add_action('admin_menu', 'imgix_add_options_link');
 
 /**
  *  Creates our settings in the options table.
  */
 function imgix_register_settings() {
-	register_setting( 'imgix_settings_group', 'imgix_settings' );
+	register_setting('imgix_settings_group', 'imgix_settings');
 }
 
-add_action( 'admin_init', 'imgix_register_settings' );
+add_action('admin_init', 'imgix_register_settings');

includes/compability.php

Spacing +22 added lines, -22 removed lines

@@ -5,7 +5,7 @@ 
  * @package imgix
  */
 
-if ( ! function_exists( 'wp_parse_url' ) ) {
+if ( ! function_exists('wp_parse_url')) {
 	/**
 	 * A wrapper for PHP's parse_url() function that handles edgecases in < PHP 5.4.7
 	 *
@@ -23,30 +23,30 @@ 
 	 * @return bool|array False on failure; Array of URL components on success;
 	 *                    See parse_url()'s return values.
 	 */
-	function wp_parse_url( $url ) {
-		$parts = @parse_url( $url );
-		if ( ! $parts ) {
+	function wp_parse_url($url) {
+		$parts = @parse_url($url);
+		if ( ! $parts) {
 			// < PHP 5.4.7 compat, trouble with relative paths including a scheme break in the path
-			if ( '/' == $url[0] && false !== strpos( $url, '://' ) ) {
+			if ('/' == $url[0] && false !== strpos($url, '://')) {
 				// Since we know it's a relative path, prefix with a scheme/host placeholder and try again
-				if ( ! $parts = @parse_url( 'placeholder://placeholder' . $url ) ) {
+				if ( ! $parts = @parse_url('placeholder://placeholder' . $url)) {
 					return $parts;
 				}
 				// Remove the placeholder values
-				unset( $parts['scheme'], $parts['host'] );
+				unset($parts['scheme'], $parts['host']);
 			} else {
 				return $parts;
 			}
 		}
 
 		// < PHP 5.4.7 compat, doesn't detect schemeless URL's host field
-		if ( '//' == substr( $url, 0, 2 ) && ! isset( $parts['host'] ) ) {
-			$path_parts    = explode( '/', substr( $parts['path'], 2 ), 2 );
+		if ('//' == substr($url, 0, 2) && ! isset($parts['host'])) {
+			$path_parts    = explode('/', substr($parts['path'], 2), 2);
 			$parts['host'] = $path_parts[0];
-			if ( isset( $path_parts[1] ) ) {
+			if (isset($path_parts[1])) {
 				$parts['path'] = '/' . $path_parts[1];
 			} else {
-				unset( $parts['path'] );
+				unset($parts['path']);
 			}
 		}
 
@@ -54,7 +54,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'http_build_url' ) ) {
+if ( ! function_exists('http_build_url')) {
 	/**
 	 * This is a simplified version of http_build_url if pecl_http is missing
 	 *
@@ -62,16 +62,16 @@ 
 	 *
 	 * @return string
 	 */
-	function http_build_url( $parsed_url ) {
-		$scheme   = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : '';
-		$host     = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
-		$port     = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : '';
-		$user     = isset( $parsed_url['user'] ) ? $parsed_url['user'] : '';
-		$pass     = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : '';
-		$pass     = ( $user || $pass ) ? "$pass@" : '';
-		$path     = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '';
-		$query    = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '';
-		$fragment = isset( $parsed_url['fragment'] ) ? '#' . $parsed_url['fragment'] : '';
+	function http_build_url($parsed_url) {
+		$scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+		$host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
+		$port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
+		$user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
+		$pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : '';
+		$pass     = ($user || $pass) ? "$pass@" : '';
+		$path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+		$query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
+		$fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
 
 		return "$scheme$user$pass$host$port$path$query$fragment";
 	}

includes/do-functions.php

Spacing +54 added lines, -54 removed lines

@@ -13,13 +13,13 @@ 
  *
  * @return string Content with retina-enriched image tags.
  */
-function imgix_add_retina( $content ) {
+function imgix_add_retina($content) {
 	$pattern = '/<img((?![^>]+srcset )([^>]*)';
 	$pattern .= 'src=[\'"]([^\'"]*imgix.net[^\'"]*\?[^\'"]*w=[^\'"]*)[\'"]([^>]*)*?)>/i';
 	$repl    = '<img$2src="$3" srcset="${3}, ${3}&amp;dpr=2 2x, ${3}&amp;dpr=3 3x,"$4>';
-	$content = preg_replace( $pattern, $repl, $content );
+	$content = preg_replace($pattern, $repl, $content);
 
-	return preg_replace( $pattern, $repl, $content );
+	return preg_replace($pattern, $repl, $content);
 }
 
 /**
@@ -35,16 +35,16 @@ 
 	// For now, only "auto" is supported.
 
 	$auto = [];
-	if ( ! empty( $imgix_options['auto_format'] ) ) {
-		array_push( $auto, 'format' );
+	if ( ! empty($imgix_options['auto_format'])) {
+		array_push($auto, 'format');
 	}
 
-	if ( ! empty( $imgix_options['auto_enhance'] ) ) {
-		array_push( $auto, 'enhance' );
+	if ( ! empty($imgix_options['auto_enhance'])) {
+		array_push($auto, 'enhance');
 	}
 
-	if ( ! empty( $auto ) ) {
-		$params['auto'] = implode( ',', $auto );
+	if ( ! empty($auto)) {
+		$params['auto'] = implode(',', $auto);
 	}
 
 	return $params;
@@ -58,19 +58,19 @@ 
  *
  * @return array with filename and size arguments.
  */
-function convert_filename_to_size_args( $filename ) {
+function convert_filename_to_size_args($filename) {
 	$arguments = [];
 
-	$filename = preg_replace_callback( '/-(?<width>\d+)x(?<height>\d+)(?<extension>\.\w{3,4}$)/', function ( $match ) use ( &$arguments ) {
+	$filename = preg_replace_callback('/-(?<width>\d+)x(?<height>\d+)(?<extension>\.\w{3,4}$)/', function($match) use (&$arguments) {
 		$arguments = [
 			'w' => $match['width'],
 			'h' => $match['height']
 		];
 
 		return $match['extension'];
-	}, $filename );
+	}, $filename);
 
-	return [ $filename, $arguments ];
+	return [$filename, $arguments];
 }
 
 /**
@@ -80,25 +80,25 @@ 
  *
  * @return string
  */
-function imgix_file_url( $url ) {
+function imgix_file_url($url) {
 
 	global $imgix_options;
 
-	if ( empty ( $imgix_options['cdn_link'] ) ) {
+	if (empty ($imgix_options['cdn_link'])) {
 		return $url;
 	}
 
-	$file = pathinfo( $url );
+	$file = pathinfo($url);
 
-	if ( in_array( $file['extension'], [ 'jpg', 'gif', 'png', 'jpeg' ] ) ) {
-		return str_replace( trailingslashit( home_url( '/' ) ), trailingslashit( $imgix_options['cdn_link'] ), $url );
+	if (in_array($file['extension'], ['jpg', 'gif', 'png', 'jpeg'])) {
+		return str_replace(trailingslashit(home_url('/')), trailingslashit($imgix_options['cdn_link']), $url);
 	}
 
 	return $url;
 }
 
-add_filter( 'wp_get_attachment_url', 'imgix_file_url' );
-add_filter( 'imgix/add-image-url', 'imgix_file_url' );
+add_filter('wp_get_attachment_url', 'imgix_file_url');
+add_filter('imgix/add-image-url', 'imgix_file_url');
 
 /**
  * Modify image urls in srcset to use imgix host.
@@ -107,15 +107,15 @@ 
  *
  * @return array $sources
  */
-function imgix_cdn_srcset( $sources ) {
-	foreach ( $sources as $source ) {
-		$sources[ $source['value'] ]['url'] = apply_filters( 'imgix/add-image-url', $sources[ $source['value'] ]['url'] );
+function imgix_cdn_srcset($sources) {
+	foreach ($sources as $source) {
+		$sources[$source['value']]['url'] = apply_filters('imgix/add-image-url', $sources[$source['value']]['url']);
 	}
 
 	return $sources;
 }
 
-add_filter( 'wp_calculate_image_srcset', 'imgix_cdn_srcset', 10 );
+add_filter('wp_calculate_image_srcset', 'imgix_cdn_srcset', 10);
 
 /**
  * Modify image urls in content to use imgix host.
@@ -124,75 +124,75 @@ 
  *
  * @return string
  */
-function imgix_replace_non_wp_images( $content ) {
+function imgix_replace_non_wp_images($content) {
 	global $imgix_options;
 
-	if ( ! empty( $imgix_options['cdn_link'] ) ) {
+	if ( ! empty($imgix_options['cdn_link'])) {
 
-		$content = preg_replace_callback( '/(?<=\shref="|\ssrc="|\shref=\'|\ssrc=\').*(?=\'|")/', function ( $match ) use ( $imgix_options ) {
+		$content = preg_replace_callback('/(?<=\shref="|\ssrc="|\shref=\'|\ssrc=\').*(?=\'|")/', function($match) use ($imgix_options) {
 			$url = $match[0];
 
-			$pathinfo = pathinfo( $url );
+			$pathinfo = pathinfo($url);
 
-			if ( in_array( $pathinfo['extension'], [ 'jpg', 'gif', 'png', 'jpeg' ], true ) ) {
-				$file_url = parse_url( $url );
-				if ( $file_url['host'] === parse_url( home_url( '/' ), PHP_URL_HOST ) ) {
-					$cdn = parse_url( $imgix_options['cdn_link'] );
-					foreach ( [ 'scheme', 'host', 'port' ] as $url_part ) {
-						if ( isset( $cdn[ $url_part ] ) ) {
-							$file_url[ $url_part ] = $cdn[ $url_part ];
+			if (in_array($pathinfo['extension'], ['jpg', 'gif', 'png', 'jpeg'], true)) {
+				$file_url = parse_url($url);
+				if ($file_url['host'] === parse_url(home_url('/'), PHP_URL_HOST)) {
+					$cdn = parse_url($imgix_options['cdn_link']);
+					foreach (['scheme', 'host', 'port'] as $url_part) {
+						if (isset($cdn[$url_part])) {
+							$file_url[$url_part] = $cdn[$url_part];
 						} else {
-							unset( $file_url[ $url_part ] );
+							unset($file_url[$url_part]);
 						}
 					}
 
-					list( $filename, $arguments ) = convert_filename_to_size_args( $pathinfo['basename'] );
+					list($filename, $arguments) = convert_filename_to_size_args($pathinfo['basename']);
 
-					$arguments = array_merge( $arguments, imgix_get_global_params() );
+					$arguments = array_merge($arguments, imgix_get_global_params());
 
-					$file_url['path'] = trailingslashit( dirname( $file_url['path'] ) ) . $filename;
+					$file_url['path'] = trailingslashit(dirname($file_url['path'])) . $filename;
 
-					if ( ! empty( $arguments ) ) {
-						$file_url['query'] = empty( $file_url['query'] ) ? build_query( $arguments ) : $file_url['query'] . '&' . build_query( $arguments );
+					if ( ! empty($arguments)) {
+						$file_url['query'] = empty($file_url['query']) ? build_query($arguments) : $file_url['query'] . '&' . build_query($arguments);
 					}
 
-					$url = http_build_url( $file_url );
+					$url = http_build_url($file_url);
 				}
 			}
 
 
-			return esc_url_raw( $url );
-		}, $content );
+			return esc_url_raw($url);
+		}, $content);
 
 	}
 
 	return $content;
 }
 
-add_filter( 'the_content', 'imgix_replace_non_wp_images' );
+add_filter('the_content', 'imgix_replace_non_wp_images');
 
 function imgix_wp_head() {
 	global $imgix_options;
 
-	if ( isset( $imgix_options['cdn_link'] ) && $imgix_options['cdn_link'] ) {
-		printf( "<link rel='dns-prefetch' href='%s'/>",
-			esc_url( preg_replace( '/^https?:/', '', untrailingslashit( $imgix_options['cdn_link'] ) ) )
+	if (isset($imgix_options['cdn_link']) && $imgix_options['cdn_link']) {
+		printf("<link rel='dns-prefetch' href='%s'/>",
+			esc_url(preg_replace('/^https?:/', '', untrailingslashit($imgix_options['cdn_link'])))
 		);
 	}
 }
 
-add_action( 'wp_head', 'imgix_wp_head', 1 );
+add_action('wp_head', 'imgix_wp_head', 1);
 
-if ( isset( $imgix_options['add_dpi2_srcset'] ) && $imgix_options['add_dpi2_srcset'] ) {
+if (isset($imgix_options['add_dpi2_srcset']) && $imgix_options['add_dpi2_srcset']) {
 	function imgix_buffer_start() {
-		ob_start( 'imgix_add_retina' );
+		ob_start('imgix_add_retina');
 	}
 
 	function imgix_buffer_end() {
 		ob_end_flush();
 	}
 
-	add_action( 'after_setup_theme', 'imgix_buffer_start' );
-	add_action( 'shutdown', 'imgix_buffer_end' );
-	add_filter( 'the_content', 'imgix_add_retina' );
+	add_action('after_setup_theme', 'imgix_buffer_start');
+	add_action('shutdown', 'imgix_buffer_end');
+	add_filter('the_content', 'imgix_add_retina');
 }

imgix.php

Spacing +11 added lines, -11 removed lines

@@ -16,26 +16,26 @@
  * Author URI:  http://github.com/imgix-wordpress
  */
 
-define('IMGIX_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+define('IMGIX_PLUGIN_URL', plugin_dir_url(__FILE__));
 
-$imgix_options = get_option( 'imgix_settings' );
+$imgix_options = get_option('imgix_settings');
 
-include( 'includes/compability.php' );
-include( 'includes/do-functions.php' );
-include( 'includes/options-page.php' );
+include('includes/compability.php');
+include('includes/do-functions.php');
+include('includes/options-page.php');
 
-function imgix_plugin_admin_action_links( $links, $file ) {
+function imgix_plugin_admin_action_links($links, $file) {
 	static $my_plugin;
 
-	if ( ! $my_plugin ) {
-		$my_plugin = plugin_basename( __FILE__ );
+	if ( ! $my_plugin) {
+		$my_plugin = plugin_basename(__FILE__);
 	}
 
-	if ( $file === $my_plugin ) {
+	if ($file === $my_plugin) {
 		$settings_link = '<a href="options-general.php?page=imgix-options">Settings</a>';
-		array_unshift( $links, $settings_link );
+		array_unshift($links, $settings_link);
 	}
 	return $links;
 }
 
-add_filter( 'plugin_action_links', 'imgix_plugin_admin_action_links', 10, 2 );
+add_filter('plugin_action_links', 'imgix_plugin_admin_action_links', 10, 2);