From a7f751e9f19e6415e3f161cfb68b52055ea625d9 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Sun, 25 Aug 2013 11:26:50 +0200 Subject: [PATCH 1/8] + Adds a new Tabbed Settings page + Adds option to disable minification alltogether + Adds option to disable minification based on specific conditions ( islogged, is_admin, query var present ) + Adds option to exclude resources, line-delimited, based on string search not matching, means it matches any part of the url * Note: Disabling minification does not disable serving minified files, so cached pages does not break. --- admin.css | 13 ++++ admin.js | 20 +++++ dependency-minification.php | 141 ++++++++++++++++++++++++++++++++---- 3 files changed, 160 insertions(+), 14 deletions(-) diff --git a/admin.css b/admin.css index 5199a48..3c63c93 100644 --- a/admin.css +++ b/admin.css @@ -14,3 +14,16 @@ .fixed .column-expires { width: 12%; } + +.nav-tab-content { + display: none; +} +.form-table th small { + display: block; + clear: both; + color: #999; +} +.form-table td label { + display: block; + clear:both; +} \ No newline at end of file diff --git a/admin.js b/admin.js index e69de29..2b6d574 100644 --- a/admin.js +++ b/admin.js @@ -0,0 +1,20 @@ +jQuery(function($){ + + // Admin page tabs + var $tabs = $('.nav-tab-wrapper'), + $panels = $('.nav-tab-content'), + currentHash = window.location.hash; + + $tabs.on('click', 'a', function(e){ + var hash = $(this).attr('href').replace('#tab-', '#tab-content-'); // prevents page scrolling if hash is present + $panels.hide().filter(hash).show(); + $tabs.find('a').removeClass('nav-tab-active').filter($(this)).addClass('nav-tab-active'); + }); + $tabs.find( currentHash ? 'a[href="'+currentHash+'"]' : ':first').trigger('click'); + + // Fix input-inside-label glitch + $panels.on('click', 'input[type=text]', function(e){ + e.preventDefault(); + }) + +}); \ No newline at end of file diff --git a/dependency-minification.php b/dependency-minification.php index 1cc347b..e0c7d36 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -14,13 +14,14 @@ class Dependency_Minification { protected static $minified_count = 0; static $admin_page_hook; - const DEFAULT_ENDPOINT = '_minify'; - const CRON_MINIFY_ACTION = 'minify_dependencies'; - const CACHE_KEY_PREFIX = 'depmin_cache_'; - const FILENAME_PATTERN = '([^/]+?)\.([0-9a-f]+)(?:\.([0-9a-f]+))?\.(css|js)'; - const AJAX_ACTION = 'dependency_minification'; - const ADMIN_PAGE_SLUG = 'dependency-minification'; - const ADMIN_PARENT_PAGE = 'tools.php'; + const DEFAULT_ENDPOINT = '_minify'; + const CRON_MINIFY_ACTION = 'minify_dependencies'; + const CACHE_KEY_PREFIX = 'depmin_cache_'; + const FILENAME_PATTERN = '([^/]+?)\.([0-9a-f]+)(?:\.([0-9a-f]+))?\.(css|js)'; + const AJAX_ACTION = 'dependency_minification'; + const AJAX_OPTIONS_ACTION = 'dependency_minification_options'; + const ADMIN_PAGE_SLUG = 'dependency-minification'; + const ADMIN_PARENT_PAGE = 'tools.php'; static $query_vars = array( 'depmin_handles', @@ -30,8 +31,7 @@ class Dependency_Minification { ); static function setup() { - self::$options = apply_filters( 'dependency_minification_options', array_merge( - array( + $defaults = array( 'endpoint' => self::DEFAULT_ENDPOINT, 'default_exclude_remote_dependencies' => true, 'cache_control_max_age_cache' => 2629743, // 1 month in seconds @@ -40,8 +40,13 @@ static function setup() { 'admin_page_capability' => 'edit_theme_options', 'show_error_messages' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ), 'disable_if_wp_debug' => true, - ), - self::$options + 'exclude_dependencies' => '', + 'disabled_on_conditions' => array(), + ); + $options = get_option( 'dependency_minification_options', array() ); + self::$options = apply_filters( 'dependency_minification_options', array_merge( + $defaults, + $options ) ); $is_frontend = ! ( @@ -49,7 +54,21 @@ static function setup() { || in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) ); - if ( $is_frontend ) { + $disabled = ( + ! empty( self::$options['disabled_on_conditions']['all'] ) + || ( !empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) + || ( !empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_plugins' ) ) + || ( !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && !empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) + ) + ); + + if ( + $is_frontend + && + ! $disabled + ) { add_filter( 'print_scripts_array', array( __CLASS__, 'filter_print_scripts_array' ) ); add_filter( 'print_styles_array', array( __CLASS__, 'filter_print_styles_array' ) ); } @@ -59,6 +78,7 @@ static function setup() { add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) ); add_action( 'admin_enqueue_scripts', array( __CLASS__, 'admin_enqueue_scripts' ) ); add_action( 'wp_ajax_' . self::AJAX_ACTION, array( __CLASS__, 'admin_ajax_handler' ) ); + add_action( 'wp_ajax_' . self::AJAX_OPTIONS_ACTION, array( __CLASS__, 'admin_ajax_options_handler' ) ); add_filter( 'plugin_action_links', array( __CLASS__, 'admin_plugin_action_links' ), 10, 2 ); } @@ -237,6 +257,32 @@ static function admin_ajax_handler() { exit; } + /** + * @action wp_ajax_dependency_minification_options + */ + static function admin_ajax_options_handler() { + if ( ! current_user_can( self::$options['admin_page_capability'] ) ) { + wp_die( __( 'You are not allowed to do that.', 'depmin' ) ); + } + if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], self::AJAX_OPTIONS_ACTION ) ) { + wp_die( __( 'Nonce check failed. Try reloading the previous page.', 'depmin' ) ); + } + $updated_count = 0; + if ( ! empty( $_REQUEST['options'] ) ) { + $options = get_option( 'dependency_minification_options' ); + $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_REQUEST['options']['exclude_dependencies'] ) ); + $options['disabled_on_conditions'] = $_REQUEST['options']['disabled_on_conditions']; + update_option( 'dependency_minification_options', $options ); + } + + $redirect_url = add_query_arg( 'page', self::ADMIN_PAGE_SLUG, admin_url( self::ADMIN_PARENT_PAGE ) ); + $redirect_url = add_query_arg( 'updated', 1, $redirect_url ); + $redirect_url.= '#tab-settings'; + wp_redirect( $redirect_url ); + + die(); + } + /** * @filter plugin_action_links */ @@ -258,8 +304,11 @@ static function admin_page() {

- - +

+ + +

+
@@ -447,6 +496,60 @@ static function admin_page() {
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + +
+
+ +
+
+
registered[$handle]->src; $is_local = self::is_self_hosted_src( $src ); $is_excluded = !$is_local && self::$options['default_exclude_remote_dependencies']; + $is_excluded = $is_excluded || self::is_url_included( $src, self::$options['exclude_dependencies'] ); $is_excluded = apply_filters( 'dependency_minification_excluded', $is_excluded, $handle, $src ); if ( $last_was_excluded !== $is_excluded ) { From a0c2b874bb10482523aa204e9d96c8f9cadd4084 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Sun, 25 Aug 2013 12:04:20 +0200 Subject: [PATCH 2/8] + Exposes the option of defaulting to exclude the external dependencies. #5 * Fix a small translation missing text domain --- dependency-minification.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dependency-minification.php b/dependency-minification.php index e0c7d36..383d747 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -272,6 +272,7 @@ static function admin_ajax_options_handler() { $options = get_option( 'dependency_minification_options' ); $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_REQUEST['options']['exclude_dependencies'] ) ); $options['disabled_on_conditions'] = $_REQUEST['options']['disabled_on_conditions']; + $options['default_exclude_remote_dependencies'] = isset( $_REQUEST['options']['default_exclude_remote_dependencies'] ); update_option( 'dependency_minification_options', $options ); } @@ -515,6 +516,15 @@ static function admin_page() { + + + + + + + @@ -535,7 +545,7 @@ static function admin_page() { - + From f29016831c83c45f43092b33f284559527738f67 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Sun, 25 Aug 2013 12:56:23 +0200 Subject: [PATCH 3/8] * Fix manage_plugins to manage_options * Remove trailing spaces --- dependency-minification.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependency-minification.php b/dependency-minification.php index 383d747..64bcba9 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -55,17 +55,17 @@ static function setup() { in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) ); $disabled = ( - ! empty( self::$options['disabled_on_conditions']['all'] ) - || ( !empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) - || ( !empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_plugins' ) ) - || ( !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + ! empty( self::$options['disabled_on_conditions']['all'] ) + || ( !empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) + || ( !empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) + || ( !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) && !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) && !empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) ) ); - if ( - $is_frontend + if ( + $is_frontend && ! $disabled ) { @@ -174,7 +174,7 @@ static function admin_notices() { ?>

%1$s: %2$s', __( 'Dependency Minification', 'depmin' ), sprintf( From 15a71391586aa47a218621466230f001ea2786c9 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Mon, 14 Oct 2013 12:18:21 +0200 Subject: [PATCH 4/8] Notices / CS fixes, Related #27 --- dependency-minification.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dependency-minification.php b/dependency-minification.php index 64bcba9..5a2b9ff 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -55,12 +55,12 @@ static function setup() { in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) ); $disabled = ( - ! empty( self::$options['disabled_on_conditions']['all'] ) - || ( !empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) - || ( !empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) - || ( !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) - && !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) - && !empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) + ( isset( self::$options['disabled_on_conditions']['all'] ) && ! empty( self::$options['disabled_on_conditions']['all'] ) ) + || ( isset( self::$options['disabled_on_conditions']['loggedin'] ) && ! empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) + || ( ! empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) + || ( ! empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && ! empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && ! empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) ) ); @@ -534,7 +534,7 @@ static function admin_page() {

%1$s: %2$s', __( 'Dependency Minification', 'depmin' ), sprintf( @@ -217,6 +216,7 @@ static function admin_notices() { __( 'Permalinks Settings', 'depmin' ) ) ) + ) ); ?>

@@ -239,19 +239,23 @@ static function admin_notices() {

- +

@@ -296,21 +300,21 @@ static function admin_ajax_options_handler() { if ( ! current_user_can( self::$options['admin_page_capability'] ) ) { wp_die( __( 'You are not allowed to do that.', 'depmin' ) ); } - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], self::AJAX_OPTIONS_ACTION ) ) { + if ( ! wp_verify_nonce( $_POST['_wpnonce'], self::AJAX_OPTIONS_ACTION ) ) { wp_die( __( 'Nonce check failed. Try reloading the previous page.', 'depmin' ) ); } $updated_count = 0; - if ( ! empty( $_REQUEST['options'] ) ) { + if ( ! empty( $_POST['options'] ) ) { $options = get_option( 'dependency_minification_options' ); - $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_REQUEST['options']['exclude_dependencies'] ) ); - $options['disabled_on_conditions'] = $_REQUEST['options']['disabled_on_conditions']; - $options['default_exclude_remote_dependencies'] = isset( $_REQUEST['options']['default_exclude_remote_dependencies'] ); + $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_POST['options']['exclude_dependencies'] ) ); + $options['disabled_on_conditions'] = $_POST['options']['disabled_on_conditions']; + $options['default_exclude_remote_dependencies'] = isset( $_POST['options']['default_exclude_remote_dependencies'] ); update_option( 'dependency_minification_options', $options ); } - $redirect_url = add_query_arg( 'page', self::ADMIN_PAGE_SLUG, admin_url( self::ADMIN_PARENT_PAGE ) ); - $redirect_url = add_query_arg( 'updated', 1, $redirect_url ); - $redirect_url.= '#tab-settings'; + $redirect_url = add_query_arg( 'page', self::ADMIN_PAGE_SLUG, admin_url( self::ADMIN_PARENT_PAGE ) ); + $redirect_url = add_query_arg( 'updated', 1, $redirect_url ); + $redirect_url .= '#tab-settings'; wp_redirect( $redirect_url ); die(); @@ -335,7 +339,7 @@ static function admin_page() { $nonce = wp_create_nonce( self::AJAX_ACTION ); ?>
-

+

@@ -352,7 +356,7 @@ static function admin_page() { $option_names = $wpdb->get_col( $sql ); $minified_dependencies = array(); foreach ( $option_names as $option_name ) { - $minified_dependencies[$option_name] = get_option($option_name); + $minified_dependencies[$option_name] = get_option( $option_name ); } $minified_dependencies = array_filter( $minified_dependencies ); @@ -428,10 +432,10 @@ static function admin_page() { 'depmin_option_name[]' => $option_name, ); ?> - + - - > + + > @@ -475,7 +479,7 @@ static function admin_page() { - + column-"> - + @@ -534,7 +538,7 @@ static function admin_page() { $nonce = wp_create_nonce( self::AJAX_OPTIONS_ACTION ); ?>
-
+ @@ -544,7 +548,7 @@ static function admin_page() { @@ -553,7 +557,7 @@ static function admin_page() { @@ -562,15 +566,15 @@ static function admin_page() {
@@ -619,12 +623,15 @@ static function get_dependency_minified_url( array $deps, $type ) { $src_hash = self::hash_array( wp_list_pluck( $deps, 'src' ) ); $ver_hash = self::hash_array( wp_list_pluck( $deps, 'ver' ) ); $src = trailingslashit( home_url( self::$options['endpoint'] ) ); - $src .= join( '.', array( - join( ',', wp_list_pluck( $deps, 'handle' ) ), - $src_hash, - $ver_hash, - $type === 'scripts' ? 'js' : 'css', - ) ); + $src .= join( + '.', + array( + join( ',', wp_list_pluck( $deps, 'handle' ) ), + $src_hash, + $ver_hash, + $type === 'scripts' ? 'js' : 'css', + ) + ); return $src; } @@ -635,10 +642,10 @@ static function get_dependency_minified_url( array $deps, $type ) { * @param {string} $type (scripts|styles) */ static function filter_print_dependency_array( array $handles, $type ) { - assert( in_array($type, array( 'scripts', 'styles' ) ) ); - assert( isset($GLOBALS["wp_{$type}"]) ); + assert( in_array( $type, array( 'scripts', 'styles' ) ) ); + assert( isset( $GLOBALS["wp_{$type}"] ) ); $wp_deps = &$GLOBALS["wp_{$type}"]; - assert( is_a($wp_deps, 'WP_Dependencies') ); + assert( is_a( $wp_deps, 'WP_Dependencies' ) ); /** * Determine if minification is enabled for the provided $handles. @@ -667,7 +674,7 @@ static function filter_print_dependency_array( array $handles, $type ) { ( $wp_deps->groups[$handle] < $current_group && - !in_array($handle, $wp_deps->done) + ! in_array( $handle, $wp_deps->done ) ) ); @@ -766,13 +773,13 @@ static function filter_print_dependency_array( array $handles, $type ) { $filtered_handles = array_merge( $filtered_handles, $group['handles'] ); } else { self::$minified_count += 1; - $new_handle = sprintf('minified-%d', self::$minified_count); + $new_handle = sprintf( 'minified-%d', self::$minified_count ); $filtered_handles[] = $new_handle; $src = self::get_dependency_minified_url( $deps, $type ); // Deps are registered without versions since the URL includes the version (ver_hash) if ( 'scripts' === $type ) { - $in_footer = !empty( $extra['group'] ); // @todo what if the group is not 0 or 1? + $in_footer = ! empty( $extra['group'] ); // @todo what if the group is not 0 or 1? wp_register_script( $new_handle, $src, array(), null, $in_footer ); } elseif ( 'styles' === $type ) { wp_register_style( $new_handle, $src, array(), null, $extra['media'] ); @@ -830,7 +837,7 @@ static function is_self_hosted_src( $src ) { ( empty( $parsed_url['host'] ) && - substr( $parsed_url['path'], 0, 1) === '/' + substr( $parsed_url['path'], 0, 1 ) === '/' ) || ( @@ -861,7 +868,7 @@ static function group_dependencies_by_exclusion( $handles, WP_Dependencies $wp_d foreach ( $handles as $handle ) { $src = $wp_deps->registered[$handle]->src; $is_local = self::is_self_hosted_src( $src ); - $is_excluded = !$is_local && self::$options['default_exclude_remote_dependencies']; + $is_excluded = ! $is_local && self::$options['default_exclude_remote_dependencies']; $is_excluded = $is_excluded || self::is_url_included( $src, self::$options['exclude_dependencies'] ); $is_excluded = apply_filters( 'dependency_minification_excluded', $is_excluded, $handle, $src ); @@ -905,8 +912,8 @@ static function group_handles_by_extra( array $handles, WP_Dependencies $wp_deps foreach ( $handles as $handle ) { $dep = &$wp_deps->registered[$handle]; $extra = (array) $dep->extra; - if ( is_a($wp_deps, 'WP_Styles') ) { - $extra['media'] = is_string($dep->args) ? $dep->args : 'all'; + if ( is_a( $wp_deps, 'WP_Styles' ) ) { + $extra['media'] = is_string( $dep->args ) ? $dep->args : 'all'; } unset($extra['suffix']); unset($extra['rtl']); @@ -915,8 +922,8 @@ static function group_handles_by_extra( array $handles, WP_Dependencies $wp_deps if ( is_a( $wp_deps, 'WP_Scripts' ) && empty( $extra['group'] ) && is_int( $dep->args ) ) { $extra['group'] = $dep->args; } - ksort($extra); - $key = serialize($extra); + ksort( $extra ); + $key = serialize( $extra ); $bundles[$key][] = $handle; } return $bundles; @@ -936,10 +943,10 @@ static function minify( $cached ) { try { $is_css = ( 'styles' === $type ); if ( 'scripts' === $type ) { - require_once( dirname(__FILE__) . '/minify/JS/JSMin.php' ); + require_once( dirname( __FILE__ ) . '/minify/JS/JSMin.php' ); } elseif ( 'styles' === $type ) { - require_once( dirname(__FILE__) . '/minify/CSS/UriRewriter.php' ); - require_once( dirname(__FILE__) . '/minify/CSS/Compressor.php' ); + require_once( dirname( __FILE__ ) . '/minify/CSS/UriRewriter.php' ); + require_once( dirname( __FILE__ ) . '/minify/CSS/Compressor.php' ); } $unminified_size = 0; @@ -965,17 +972,17 @@ static function minify( $cached ) { // Dependency is not self-hosted or it the filesystem read failed, so do HTTP request if ( false === $contents ) { $r = wp_remote_get( $src ); - if ( is_wp_error($r) ) { - throw new Exception("Failed to retrieve $src: " . $r->get_error_message()); + if ( is_wp_error( $r ) ) { + throw new Exception( "Failed to retrieve $src: " . $r->get_error_message() ); } elseif ( intval( wp_remote_retrieve_response_code( $r ) ) !== 200 ) { - throw new Dependency_Minification_Exception( sprintf('Request for %s returned with HTTP %d %s', $src, wp_remote_retrieve_response_code( $r ), wp_remote_retrieve_response_message( $r )) ); + throw new Dependency_Minification_Exception( sprintf( 'Request for %s returned with HTTP %d %s', $src, wp_remote_retrieve_response_code( $r ), wp_remote_retrieve_response_message( $r ) ) ); } $contents = wp_remote_retrieve_body( $r ); } $unminified_size += strlen( $contents ); // Remove the BOM - $contents = preg_replace("/^\xEF\xBB\xBF/", '', $contents); + $contents = preg_replace( "/^\xEF\xBB\xBF/", '', $contents ); // Rewrite relative paths in CSS $src_dir_path = dirname( parse_url( $src, PHP_URL_PATH ) ); @@ -989,13 +996,13 @@ static function minify( $cached ) { $contents = ''; // Print a manifest of the dependencies - $contents .= sprintf("/*! This minified dependency bundle includes:\n"); + $contents .= sprintf( "/*! This minified dependency bundle includes:\n" ); $i = 0; foreach ( $srcs as $src ) { $i += 1; $contents .= sprintf( " * %02d. %s\n", $i, $src ); } - $contents .= sprintf(" */\n\n"); + $contents .= sprintf( " */\n\n" ); // Minify // Note: semicolon needed in case a file lacks trailing semicolon @@ -1006,13 +1013,13 @@ static function minify( $cached ) { // is the comment-reply.js in WordPress. if ( 'scripts' === $type ) { $minified_contents = join( "\n;;\n", $contents_for_each_dep ); - $minified_contents = JSMin::minify($minified_contents); + $minified_contents = JSMin::minify( $minified_contents ); if ( false === $minified_contents ) { throw new Dependency_Minification_Exception( 'JavaScript parse error' ); } } elseif ( 'styles' === $type ) { $minified_contents = join( "\n\n", $contents_for_each_dep ); - $minified_contents = Minify_CSS_Compressor::process($minified_contents); + $minified_contents = Minify_CSS_Compressor::process( $minified_contents ); } $contents .= $minified_contents; @@ -1023,12 +1030,15 @@ static function minify( $cached ) { $cached['error'] = null; } catch (Exception $e) { - error_log( sprintf( '%s in %s: %s for srcs %s', - get_class( $e ), - __FUNCTION__, - $e->getMessage(), - join( ',', $srcs ) - ) ); + error_log( + sprintf( + '%s in %s: %s for srcs %s', + get_class( $e ), + __FUNCTION__, + $e->getMessage(), + join( ',', $srcs ) + ) + ); $cached['error'] = $e->getMessage(); $max_age = apply_filters( 'dependency_minification_cache_control_max_age_error', (int) self::$options['cache_control_max_age_error'], $srcs ); $cached['expires'] = time() + $max_age; @@ -1064,7 +1074,7 @@ static function handle_request() { } $cache_option_name = self::get_cache_option_name( $src_hash ); - $cached = get_option($cache_option_name); + $cached = get_option( $cache_option_name ); if ( empty( $cached ) ) { throw new Dependency_Minification_Exception( 'Unknown minified dependency bundle.', 404 ); } @@ -1073,9 +1083,9 @@ static function handle_request() { } // Send the response headers for caching - header( 'Expires: ' . str_replace('+0000', 'GMT', gmdate('r', $cached['expires'])) ); + header( 'Expires: ' . str_replace( '+0000', 'GMT', gmdate( 'r', $cached['expires'] ) ) ); if ( ! empty( $cached['last_modified'] ) ) { - header( 'Last-Modified: ' . str_replace('+0000', 'GMT', gmdate('r', $cached['last_modified'])) ); + header( 'Last-Modified: ' . str_replace( '+0000', 'GMT', gmdate( 'r', $cached['last_modified'] ) ) ); } if ( ! empty( $cached['etag'] ) ) { header( 'ETag: ' . $cached['etag'] ); @@ -1103,24 +1113,24 @@ static function handle_request() { } if ( $is_not_modified ) { - status_header(304); + status_header( 304 ); } else { - status_header(200); + status_header( 200 ); $out = $cached['contents']; global $compress_scripts, $compress_css; script_concat_settings(); $compress = ( 'js' === $ext ? $compress_scripts : $compress_css ); - $force_gzip = ( $compress && defined('ENFORCE_GZIP') && ENFORCE_GZIP ); + $force_gzip = ( $compress && defined( 'ENFORCE_GZIP' ) && ENFORCE_GZIP ); // Copied from /wp-admin/load-scripts.php - if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) { - header('Vary: Accept-Encoding'); // Handle proxies - if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) { - header('Content-Encoding: deflate'); + if ( $compress && ! ini_get( 'zlib.output_compression' ) && 'ob_gzhandler' != ini_get( 'output_handler' ) && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) { + header( 'Vary: Accept-Encoding' ); // Handle proxies + if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) { + header( 'Content-Encoding: deflate' ); $out = gzdeflate( $out, 3 ); - } elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) { - header('Content-Encoding: gzip'); + } elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) { + header( 'Content-Encoding: gzip' ); $out = gzencode( $out, 3 ); } } @@ -1137,7 +1147,14 @@ static function handle_request() { $status = $e->getCode(); $message = $e->getMessage(); } else { - error_log( sprintf('%s: %s via URI %s', __METHOD__, $e->getMessage(), esc_url_raw( $_SERVER['REQUEST_URI'] )) ); + error_log( + sprintf( + '%s: %s via URI %s', + __METHOD__, + $e->getMessage(), + esc_url_raw( $_SERVER['REQUEST_URI'] ) + ) + ); $message = 'Unexpected error occurred.'; } if ( empty($status) ) { From 4f1449c62f58f3f846f4923e3abadc494a568c47 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Wed, 16 Oct 2013 17:21:47 +0200 Subject: [PATCH 7/8] Fix notices on settings screen on first install. --- dependency-minification.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dependency-minification.php b/dependency-minification.php index be045ff..5b154e6 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -60,7 +60,12 @@ static function setup() { 'show_error_messages' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ), 'disable_if_wp_debug' => true, 'exclude_dependencies' => array(), - 'disabled_on_conditions' => array(), + 'disabled_on_conditions' => array( + 'all' => false, + 'loggedin' => false, + 'admin' => false, + 'queryvar' => false, + ), ); $options = get_option( 'dependency_minification_options', array() ); self::$options = apply_filters( From a18558f2df1f43ef92f412a1b5b562724b376cb7 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Wed, 16 Oct 2013 20:16:07 +0200 Subject: [PATCH 8/8] Remove faulty esc_html --- dependency-minification.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dependency-minification.php b/dependency-minification.php index 5b154e6..e8bc78e 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -209,8 +209,7 @@ static function admin_notices() { ?>

%1$s: %2$s', __( 'Dependency Minification', 'depmin' ), sprintf( @@ -221,8 +220,7 @@ static function admin_notices() { __( 'Permalinks Settings', 'depmin' ) ) ) - ) - ); + ); // xss ok ?>