futtta /
autoptimize
@@ -4,45 +4,45 @@ discard block |
||
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | $majorUp = false; |
| 7 | -$autoptimize_major_version=substr($autoptimize_db_version,0,3); |
|
| 7 | +$autoptimize_major_version = substr($autoptimize_db_version, 0, 3); |
|
| 8 | 8 | |
| 9 | -switch($autoptimize_major_version) { |
|
| 9 | +switch ($autoptimize_major_version) { |
|
| 10 | 10 | case "1.6": |
| 11 | 11 | // from back in the days when I did not yet consider multisite |
| 12 | 12 | // if user was on version 1.6.x, force advanced options to be shown by default |
| 13 | - update_option('autoptimize_show_adv','1'); |
|
| 13 | + update_option('autoptimize_show_adv', '1'); |
|
| 14 | 14 | |
| 15 | 15 | // and remove old options |
| 16 | - $to_delete_options=array("autoptimize_cdn_css","autoptimize_cdn_css_url","autoptimize_cdn_js","autoptimize_cdn_js_url","autoptimize_cdn_img","autoptimize_cdn_img_url","autoptimize_css_yui","autoptimize_js_yui"); |
|
| 16 | + $to_delete_options = array("autoptimize_cdn_css", "autoptimize_cdn_css_url", "autoptimize_cdn_js", "autoptimize_cdn_js_url", "autoptimize_cdn_img", "autoptimize_cdn_img_url", "autoptimize_css_yui", "autoptimize_js_yui"); |
|
| 17 | 17 | foreach ($to_delete_options as $del_opt) { |
| 18 | - delete_option( $del_opt ); |
|
| 18 | + delete_option($del_opt); |
|
| 19 | 19 | } |
| 20 | 20 | $majorUp = true; |
| 21 | 21 | case "1.7": |
| 22 | 22 | // force 3.8 dashicons in CSS exclude options when upgrading from 1.7 to 1.8 |
| 23 | - if ( !is_multisite() ) { |
|
| 23 | + if (!is_multisite()) { |
|
| 24 | 24 | $css_exclude = get_option('autoptimize_css_exclude'); |
| 25 | 25 | if (empty($css_exclude)) { |
| 26 | 26 | $css_exclude = "admin-bar.min.css, dashicons.min.css"; |
| 27 | - } else if (strpos($css_exclude,"dashicons.min.css")===false) { |
|
| 27 | + } else if (strpos($css_exclude, "dashicons.min.css") === false) { |
|
| 28 | 28 | $css_exclude .= ", dashicons.min.css"; |
| 29 | 29 | } |
| 30 | - update_option('autoptimize_css_exclude',$css_exclude); |
|
| 30 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 31 | 31 | } else { |
| 32 | 32 | global $wpdb; |
| 33 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 33 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 34 | 34 | $original_blog_id = get_current_blog_id(); |
| 35 | - foreach ( $blog_ids as $blog_id ) { |
|
| 36 | - switch_to_blog( $blog_id ); |
|
| 35 | + foreach ($blog_ids as $blog_id) { |
|
| 36 | + switch_to_blog($blog_id); |
|
| 37 | 37 | $css_exclude = get_option('autoptimize_css_exclude'); |
| 38 | 38 | if (empty($css_exclude)) { |
| 39 | 39 | $css_exclude = "admin-bar.min.css, dashicons.min.css"; |
| 40 | - } else if (strpos($css_exclude,"dashicons.min.css")===false) { |
|
| 40 | + } else if (strpos($css_exclude, "dashicons.min.css") === false) { |
|
| 41 | 41 | $css_exclude .= ", dashicons.min.css"; |
| 42 | 42 | } |
| 43 | - update_option('autoptimize_css_exclude',$css_exclude); |
|
| 43 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 44 | 44 | } |
| 45 | - switch_to_blog( $original_blog_id ); |
|
| 45 | + switch_to_blog($original_blog_id); |
|
| 46 | 46 | } |
| 47 | 47 | $majorUp = true; |
| 48 | 48 | case "1.9": |
@@ -50,24 +50,24 @@ discard block |
||
| 50 | 50 | * 2.0 will not aggregate inline CSS/JS by default, but we want users |
| 51 | 51 | * upgrading from 1.9 to keep their inline code aggregated by default. |
| 52 | 52 | */ |
| 53 | - if ( !is_multisite() ) { |
|
| 54 | - update_option('autoptimize_css_include_inline','on'); |
|
| 55 | - update_option('autoptimize_js_include_inline','on'); |
|
| 53 | + if (!is_multisite()) { |
|
| 54 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 55 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 56 | 56 | } else { |
| 57 | 57 | global $wpdb; |
| 58 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 58 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 59 | 59 | $original_blog_id = get_current_blog_id(); |
| 60 | - foreach ( $blog_ids as $blog_id ) { |
|
| 61 | - switch_to_blog( $blog_id ); |
|
| 62 | - update_option('autoptimize_css_include_inline','on'); |
|
| 63 | - update_option('autoptimize_js_include_inline','on'); |
|
| 60 | + foreach ($blog_ids as $blog_id) { |
|
| 61 | + switch_to_blog($blog_id); |
|
| 62 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 63 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 64 | 64 | } |
| 65 | - switch_to_blog( $original_blog_id ); |
|
| 65 | + switch_to_blog($original_blog_id); |
|
| 66 | 66 | } |
| 67 | 67 | $majorUp = true; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | -if ( $majorUp === true ) { |
|
| 70 | +if ($majorUp === true) { |
|
| 71 | 71 | // clear cache and notify user to check result if major upgrade |
| 72 | 72 | autoptimizeCache::clearall(); |
| 73 | 73 | add_action('admin_notices', 'autoptimize_update_config_notice'); |
@@ -3,52 +3,52 @@ |
||
| 3 | 3 | // hyper cache and gator cache hook into AO, so we don't need to :-) |
| 4 | 4 | |
| 5 | 5 | function autoptimize_flush_pagecache() { |
| 6 | - if(function_exists('wp_cache_clear_cache')) { |
|
| 6 | + if (function_exists('wp_cache_clear_cache')) { |
|
| 7 | 7 | if (is_multisite()) { |
| 8 | 8 | $blog_id = get_current_blog_id(); |
| 9 | 9 | wp_cache_clear_cache($blog_id); |
| 10 | 10 | } else { |
| 11 | 11 | wp_cache_clear_cache(); |
| 12 | 12 | } |
| 13 | - } else if ( has_action('cachify_flush_cache') ) { |
|
| 13 | + } else if (has_action('cachify_flush_cache')) { |
|
| 14 | 14 | do_action('cachify_flush_cache'); |
| 15 | - } else if ( function_exists('w3tc_pgcache_flush') ) { |
|
| 15 | + } else if (function_exists('w3tc_pgcache_flush')) { |
|
| 16 | 16 | w3tc_pgcache_flush(); |
| 17 | - } else if ( function_exists('wp_fast_cache_bulk_delete_all') ) { |
|
| 17 | + } else if (function_exists('wp_fast_cache_bulk_delete_all')) { |
|
| 18 | 18 | wp_fast_cache_bulk_delete_all(); // still to retest |
| 19 | 19 | } else if (class_exists("WpFastestCache")) { |
| 20 | 20 | $wpfc = new WpFastestCache(); |
| 21 | 21 | $wpfc -> deleteCache(); |
| 22 | - } else if ( class_exists("c_ws_plugin__qcache_purging_routines") ) { |
|
| 22 | + } else if (class_exists("c_ws_plugin__qcache_purging_routines")) { |
|
| 23 | 23 | c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache, still to retest |
| 24 | - } else if ( class_exists("zencache") ) { |
|
| 24 | + } else if (class_exists("zencache")) { |
|
| 25 | 25 | zencache::clear(); |
| 26 | - } else if ( class_exists("comet_cache") ) { |
|
| 26 | + } else if (class_exists("comet_cache")) { |
|
| 27 | 27 | comet_cache::clear(); |
| 28 | - } else if ( class_exists("WpeCommon") ) { |
|
| 29 | - if ( apply_filters('autoptimize_flush_wpengine_aggressive', false) ) { |
|
| 30 | - if ( method_exists( "WpeCommon", "purge_memcached" ) ) { |
|
| 28 | + } else if (class_exists("WpeCommon")) { |
|
| 29 | + if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) { |
|
| 30 | + if (method_exists("WpeCommon", "purge_memcached")) { |
|
| 31 | 31 | WpeCommon::purge_memcached(); |
| 32 | 32 | } |
| 33 | - if ( method_exists( "WpeCommon", "clear_maxcdn_cache" ) ) { |
|
| 33 | + if (method_exists("WpeCommon", "clear_maxcdn_cache")) { |
|
| 34 | 34 | WpeCommon::clear_maxcdn_cache(); |
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | - if ( method_exists( "WpeCommon", "purge_varnish_cache" ) ) { |
|
| 37 | + if (method_exists("WpeCommon", "purge_varnish_cache")) { |
|
| 38 | 38 | WpeCommon::purge_varnish_cache(); |
| 39 | 39 | } |
| 40 | - } else if ( function_exists('sg_cachepress_purge_cache') ) { |
|
| 40 | + } else if (function_exists('sg_cachepress_purge_cache')) { |
|
| 41 | 41 | sg_cachepress_purge_cache(); |
| 42 | - } else if(file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')){ |
|
| 42 | + } else if (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) { |
|
| 43 | 43 | // fallback for WP-Super-Cache |
| 44 | 44 | global $cache_path; |
| 45 | 45 | if (is_multisite()) { |
| 46 | 46 | $blog_id = get_current_blog_id(); |
| 47 | - prune_super_cache( get_supercache_dir( $blog_id ), true ); |
|
| 48 | - prune_super_cache( $cache_path . 'blogs/', true ); |
|
| 47 | + prune_super_cache(get_supercache_dir($blog_id), true); |
|
| 48 | + prune_super_cache($cache_path.'blogs/', true); |
|
| 49 | 49 | } else { |
| 50 | - prune_super_cache($cache_path.'supercache/',true); |
|
| 51 | - prune_super_cache($cache_path,true); |
|
| 50 | + prune_super_cache($cache_path.'supercache/', true); |
|
| 51 | + prune_super_cache($cache_path, true); |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /* |
| 5 | 5 | * cachechecker code |
@@ -13,39 +13,39 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | if (is_admin()) { |
| 16 | - add_action('plugins_loaded','ao_cachechecker_setup'); |
|
| 16 | + add_action('plugins_loaded', 'ao_cachechecker_setup'); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | function ao_cachechecker_setup() { |
| 20 | - $doCacheCheck = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true); |
|
| 21 | - $cacheCheckSchedule = wp_get_schedule( 'ao_cachechecker' ); |
|
| 22 | - $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency','daily'); |
|
| 23 | - if (!in_array($AOCCfreq,array('hourly','daily','monthly'))) { |
|
| 24 | - $AOCCfreq='daily'; |
|
| 20 | + $doCacheCheck = (bool) apply_filters('autoptimize_filter_cachecheck_do', true); |
|
| 21 | + $cacheCheckSchedule = wp_get_schedule('ao_cachechecker'); |
|
| 22 | + $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency', 'daily'); |
|
| 23 | + if (!in_array($AOCCfreq, array('hourly', 'daily', 'monthly'))) { |
|
| 24 | + $AOCCfreq = 'daily'; |
|
| 25 | 25 | } |
| 26 | - if ( $doCacheCheck && ( !$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq ) ) { |
|
| 26 | + if ($doCacheCheck && (!$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq)) { |
|
| 27 | 27 | wp_schedule_event(time(), $AOCCfreq, 'ao_cachechecker'); |
| 28 | - } else if ( $cacheCheckSchedule && !$doCacheCheck ) { |
|
| 29 | - wp_clear_scheduled_hook( 'ao_cachechecker' ); |
|
| 28 | + } else if ($cacheCheckSchedule && !$doCacheCheck) { |
|
| 29 | + wp_clear_scheduled_hook('ao_cachechecker'); |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | add_action('ao_cachechecker', 'ao_cachechecker_cronjob'); |
| 34 | 34 | function ao_cachechecker_cronjob() { |
| 35 | - $maxSize = (int) apply_filters( "autoptimize_filter_cachecheck_maxsize", 512000); |
|
| 36 | - $doCacheCheck = (bool) apply_filters( "autoptimize_filter_cachecheck_do", true); |
|
| 37 | - $statArr=autoptimizeCache::stats(); |
|
| 38 | - $cacheSize=round($statArr[1]/1024); |
|
| 39 | - if (($cacheSize>$maxSize) && ($doCacheCheck)) { |
|
| 40 | - update_option("autoptimize_cachesize_notice",true); |
|
| 41 | - if (apply_filters('autoptimize_filter_cachecheck_sendmail',true)) { |
|
| 42 | - $saniSiteUrl=esc_url(site_url()); |
|
| 43 | - $ao_mailto=apply_filters('autoptimize_filter_cachecheck_mailto',get_option('admin_email','')); |
|
| 44 | - $ao_mailsubject=__('Autoptimize cache size warning','autoptimize')." (".$saniSiteUrl.")"; |
|
| 45 | - $ao_mailbody=__('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")"; |
|
| 35 | + $maxSize = (int) apply_filters("autoptimize_filter_cachecheck_maxsize", 512000); |
|
| 36 | + $doCacheCheck = (bool) apply_filters("autoptimize_filter_cachecheck_do", true); |
|
| 37 | + $statArr = autoptimizeCache::stats(); |
|
| 38 | + $cacheSize = round($statArr[1]/1024); |
|
| 39 | + if (($cacheSize > $maxSize) && ($doCacheCheck)) { |
|
| 40 | + update_option("autoptimize_cachesize_notice", true); |
|
| 41 | + if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) { |
|
| 42 | + $saniSiteUrl = esc_url(site_url()); |
|
| 43 | + $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', '')); |
|
| 44 | + $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize')." (".$saniSiteUrl.")"; |
|
| 45 | + $ao_mailbody = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")"; |
|
| 46 | 46 | |
| 47 | 47 | if (!empty($ao_mailto)) { |
| 48 | - $ao_mailresult=wp_mail($ao_mailto,$ao_mailsubject,$ao_mailbody); |
|
| 48 | + $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody); |
|
| 49 | 49 | if (!$ao_mailresult) { |
| 50 | 50 | error_log("Autoptimize could not send cache size warning mail."); |
| 51 | 51 | } |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | add_action('admin_notices', 'autoptimize_cachechecker_notice'); |
| 58 | 58 | function autoptimize_cachechecker_notice() { |
| 59 | - if ((bool) get_option("autoptimize_cachesize_notice",false)) { |
|
| 59 | + if ((bool) get_option("autoptimize_cachesize_notice", false)) { |
|
| 60 | 60 | echo '<div class="notice notice-warning"><p>'; |
| 61 | - _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' ); |
|
| 61 | + _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize'); |
|
| 62 | 62 | echo '</p></div>'; |
| 63 | - update_option("autoptimize_cachesize_notice",false); |
|
| 63 | + update_option("autoptimize_cachesize_notice", false); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -1,5 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | class autoptimizeCache { |
| 5 | 8 | private $filename; |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | class autoptimizeHTML extends autoptimizeBase { |
| 5 | 5 | private $keepcomments = false; |
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | $this->keepcomments = (bool) $options['keepcomments']; |
| 11 | 11 | |
| 12 | 12 | // filter to force xhtml |
| 13 | - $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false ); |
|
| 13 | + $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false); |
|
| 14 | 14 | |
| 15 | 15 | // filter to add strings to be excluded from HTML minification |
| 16 | - $excludeHTML = apply_filters( 'autoptimize_filter_html_exclude','' ); |
|
| 17 | - if ($excludeHTML!=="") { |
|
| 18 | - $exclHTMLArr = array_filter(array_map('trim',explode(",",$excludeHTML))); |
|
| 19 | - $this->exclude = array_merge($exclHTMLArr,$this->exclude); |
|
| 16 | + $excludeHTML = apply_filters('autoptimize_filter_html_exclude', ''); |
|
| 17 | + if ($excludeHTML !== "") { |
|
| 18 | + $exclHTMLArr = array_filter(array_map('trim', explode(",", $excludeHTML))); |
|
| 19 | + $this->exclude = array_merge($exclHTMLArr, $this->exclude); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | // Nothing else for HTML |
@@ -25,16 +25,16 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | //Joins and optimizes CSS |
| 27 | 27 | public function minify() { |
| 28 | - $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content ); |
|
| 28 | + $noptimizeHTML = apply_filters('autoptimize_filter_html_noptimize', false, $this->content); |
|
| 29 | 29 | if ($noptimizeHTML) |
| 30 | 30 | return false; |
| 31 | 31 | |
| 32 | - if(class_exists('Minify_HTML')) { |
|
| 32 | + if (class_exists('Minify_HTML')) { |
|
| 33 | 33 | // wrap the to-be-excluded strings in noptimize tags |
| 34 | 34 | foreach ($this->exclude as $exclString) { |
| 35 | - if (strpos($this->content,$exclString)!==false) { |
|
| 36 | - $replString="<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 37 | - $this->content=str_replace($exclString,$replString,$this->content); |
|
| 35 | + if (strpos($this->content, $exclString) !== false) { |
|
| 36 | + $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 37 | + $this->content = str_replace($exclString, $replString, $this->content); |
|
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | $options['xhtml'] = true; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - if (@is_callable(array("Minify_HTML","minify"))) { |
|
| 51 | - $tmp_content = Minify_HTML::minify($this->content,$options); |
|
| 50 | + if (@is_callable(array("Minify_HTML", "minify"))) { |
|
| 51 | + $tmp_content = Minify_HTML::minify($this->content, $options); |
|
| 52 | 52 | if (!empty($tmp_content)) { |
| 53 | 53 | $this->content = $tmp_content; |
| 54 | 54 | unset($tmp_content); |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | // remove the noptimize-wrapper from around the excluded strings |
| 62 | 62 | foreach ($this->exclude as $exclString) { |
| 63 | - $replString="<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 64 | - if (strpos($this->content,$replString)!==false) { |
|
| 65 | - $this->content=str_replace($replString,$exclString,$this->content); |
|
| 63 | + $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 64 | + if (strpos($this->content, $replString) !== false) { |
|
| 65 | + $this->content = str_replace($replString, $exclString, $this->content); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
@@ -1,5 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | class autoptimizeHTML extends autoptimizeBase { |
| 5 | 8 | private $keepcomments = false; |
@@ -26,8 +29,9 @@ discard block |
||
| 26 | 29 | //Joins and optimizes CSS |
| 27 | 30 | public function minify() { |
| 28 | 31 | $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content ); |
| 29 | - if ($noptimizeHTML) |
|
| 30 | - return false; |
|
| 32 | + if ($noptimizeHTML) { |
|
| 33 | + return false; |
|
| 34 | + } |
|
| 31 | 35 | |
| 32 | 36 | if(class_exists('Minify_HTML')) { |
| 33 | 37 | // wrap the to-be-excluded strings in noptimize tags |
@@ -1,5 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | class autoptimizeScripts extends autoptimizeBase { |
| 5 | 8 | private $scripts = array(); |
@@ -22,7 +25,9 @@ discard block |
||
| 22 | 25 | //Reads the page and collects script tags |
| 23 | 26 | public function read($options) { |
| 24 | 27 | $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); |
| 25 | - if ($noptimizeJS) return false; |
|
| 28 | + if ($noptimizeJS) { |
|
| 29 | + return false; |
|
| 30 | + } |
|
| 26 | 31 | |
| 27 | 32 | // only optimize known good JS? |
| 28 | 33 | $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', "" ); |
@@ -65,8 +70,9 @@ discard block |
||
| 65 | 70 | } |
| 66 | 71 | |
| 67 | 72 | //Should we add try-catch? |
| 68 | - if($options['trycatch'] == true) |
|
| 69 | - $this->trycatch = true; |
|
| 73 | + if($options['trycatch'] == true) { |
|
| 74 | + $this->trycatch = true; |
|
| 75 | + } |
|
| 70 | 76 | |
| 71 | 77 | // force js in head? |
| 72 | 78 | if($options['forcehead'] == true) { |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | $origTag = $tag; |
| 127 | 127 | foreach ($excludeJS as $exclTag => $exclFlags) { |
| 128 | 128 | if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) { |
| 129 | - $tag = str_replace('<script ','<script '.$exclFlags.' ',$tag); |
|
| 129 | + $tag = str_replace('<script ','<script '.$exclFlags.' ',$tag); |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | } |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | |
| 243 | 243 | //$this->jscode has all the uncompressed code now. |
| 244 | 244 | if ($this->alreadyminified!==true) { |
| 245 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 245 | + if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 246 | 246 | if (@is_callable(array("JSMin","minify"))) { |
| 247 | 247 | $tmp_jscode = trim(JSMin::minify($this->jscode)); |
| 248 | 248 | if (!empty($tmp_jscode)) { |
@@ -256,10 +256,10 @@ discard block |
||
| 256 | 256 | $this->jscode = $this->inject_minified($this->jscode); |
| 257 | 257 | return false; |
| 258 | 258 | } |
| 259 | - } else { |
|
| 260 | - $this->jscode = $this->inject_minified($this->jscode); |
|
| 259 | + } else { |
|
| 260 | + $this->jscode = $this->inject_minified($this->jscode); |
|
| 261 | 261 | return false; |
| 262 | - } |
|
| 262 | + } |
|
| 263 | 263 | } |
| 264 | 264 | return true; |
| 265 | 265 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | class autoptimizeScripts extends autoptimizeBase { |
| 5 | 5 | private $scripts = array(); |
| 6 | - private $dontmove = array('document.write','html5.js','show_ads.js','google_ad','blogcatalog.com/w','tweetmeme.com/i','mybloglog.com/','histats.com/js','ads.smowtion.com/ad.js','statcounter.com/counter/counter.js','widgets.amung.us','ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar','intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject','plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize'); |
|
| 7 | - private $domove = array('gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go'); |
|
| 8 | - private $domovelast = array('addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/','jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go'); |
|
| 6 | + private $dontmove = array('document.write', 'html5.js', 'show_ads.js', 'google_ad', 'blogcatalog.com/w', 'tweetmeme.com/i', 'mybloglog.com/', 'histats.com/js', 'ads.smowtion.com/ad.js', 'statcounter.com/counter/counter.js', 'widgets.amung.us', 'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar', 'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject', 'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize'); |
|
| 7 | + private $domove = array('gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go'); |
|
| 8 | + private $domovelast = array('addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/', 'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go'); |
|
| 9 | 9 | private $trycatch = false; |
| 10 | 10 | private $alreadyminified = false; |
| 11 | 11 | private $forcehead = true; |
@@ -21,70 +21,70 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | //Reads the page and collects script tags |
| 23 | 23 | public function read($options) { |
| 24 | - $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); |
|
| 24 | + $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content); |
|
| 25 | 25 | if ($noptimizeJS) return false; |
| 26 | 26 | |
| 27 | 27 | // only optimize known good JS? |
| 28 | - $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', "" ); |
|
| 28 | + $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', ""); |
|
| 29 | 29 | if (!empty($whitelistJS)) { |
| 30 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistJS))); |
|
| 30 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistJS))); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // is there JS we should simply remove |
| 34 | - $removableJS = apply_filters( 'autoptimize_filter_js_removables', ''); |
|
| 34 | + $removableJS = apply_filters('autoptimize_filter_js_removables', ''); |
|
| 35 | 35 | if (!empty($removableJS)) { |
| 36 | - $this->jsremovables = array_filter(array_map('trim',explode(",",$removableJS))); |
|
| 36 | + $this->jsremovables = array_filter(array_map('trim', explode(",", $removableJS))); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // only header? |
| 40 | - if( apply_filters('autoptimize_filter_js_justhead',$options['justhead']) == true ) { |
|
| 41 | - $content = explode('</head>',$this->content,2); |
|
| 40 | + if (apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true) { |
|
| 41 | + $content = explode('</head>', $this->content, 2); |
|
| 42 | 42 | $this->content = $content[0].'</head>'; |
| 43 | 43 | $this->restofcontent = $content[1]; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // include inline? |
| 47 | - if( apply_filters('autoptimize_js_include_inline',$options['include_inline']) == true ) { |
|
| 47 | + if (apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true) { |
|
| 48 | 48 | $this->include_inline = true; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // filter to "late inject minified JS", default to true for now (it is faster) |
| 52 | - $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late',true); |
|
| 52 | + $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true); |
|
| 53 | 53 | |
| 54 | 54 | // filters to override hardcoded do(nt)move(last) array contents (array in, array out!) |
| 55 | - $this->dontmove = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove ); |
|
| 56 | - $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast ); |
|
| 57 | - $this->domove = apply_filters( 'autoptimize_filter_js_domove', $this->domove ); |
|
| 55 | + $this->dontmove = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove); |
|
| 56 | + $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast); |
|
| 57 | + $this->domove = apply_filters('autoptimize_filter_js_domove', $this->domove); |
|
| 58 | 58 | |
| 59 | 59 | // get extra exclusions settings or filter |
| 60 | 60 | $excludeJS = $options['js_exclude']; |
| 61 | - $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS ); |
|
| 62 | - if ($excludeJS!=="") { |
|
| 61 | + $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS); |
|
| 62 | + if ($excludeJS !== "") { |
|
| 63 | 63 | if (is_array($excludeJS)) { |
| 64 | - if(($removeKeys = array_keys($excludeJS,"remove")) !== false) { |
|
| 64 | + if (($removeKeys = array_keys($excludeJS, "remove")) !== false) { |
|
| 65 | 65 | foreach ($removeKeys as $removeKey) { |
| 66 | 66 | unset($excludeJS[$removeKey]); |
| 67 | - $this->jsremovables[]=$removeKey; |
|
| 67 | + $this->jsremovables[] = $removeKey; |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | $exclJSArr = array_keys($excludeJS); |
| 71 | 71 | } else { |
| 72 | - $exclJSArr = array_filter(array_map('trim',explode(",",$excludeJS))); |
|
| 72 | + $exclJSArr = array_filter(array_map('trim', explode(",", $excludeJS))); |
|
| 73 | 73 | } |
| 74 | - $this->dontmove = array_merge($exclJSArr,$this->dontmove); |
|
| 74 | + $this->dontmove = array_merge($exclJSArr, $this->dontmove); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | //Should we add try-catch? |
| 78 | - if($options['trycatch'] == true) |
|
| 78 | + if ($options['trycatch'] == true) |
|
| 79 | 79 | $this->trycatch = true; |
| 80 | 80 | |
| 81 | 81 | // force js in head? |
| 82 | - if($options['forcehead'] == true) { |
|
| 82 | + if ($options['forcehead'] == true) { |
|
| 83 | 83 | $this->forcehead = true; |
| 84 | 84 | } else { |
| 85 | 85 | $this->forcehead = false; |
| 86 | 86 | } |
| 87 | - $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead ); |
|
| 87 | + $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead); |
|
| 88 | 88 | |
| 89 | 89 | // get cdn url |
| 90 | 90 | $this->cdn_url = $options['cdn_url']; |
@@ -99,24 +99,24 @@ discard block |
||
| 99 | 99 | $this->content = $this->hide_comments($this->content); |
| 100 | 100 | |
| 101 | 101 | // Get script files |
| 102 | - if (preg_match_all('#<script.*</script>#Usmi',$this->content,$matches)) { |
|
| 103 | - foreach($matches[0] as $tag) { |
|
| 102 | + if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) { |
|
| 103 | + foreach ($matches[0] as $tag) { |
|
| 104 | 104 | // only consider script aggregation for types whitelisted in should_aggregate-function |
| 105 | - if( !$this->should_aggregate($tag) ) { |
|
| 106 | - $tag=''; |
|
| 105 | + if (!$this->should_aggregate($tag)) { |
|
| 106 | + $tag = ''; |
|
| 107 | 107 | continue; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi',$tag,$source)) { |
|
| 110 | + if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) { |
|
| 111 | 111 | // non-inline script |
| 112 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 113 | - $this->content = str_replace($tag,'',$this->content); |
|
| 112 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 113 | + $this->content = str_replace($tag, '', $this->content); |
|
| 114 | 114 | continue; |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - $url = current(explode('?',$source[2],2)); |
|
| 117 | + $url = current(explode('?', $source[2], 2)); |
|
| 118 | 118 | $path = $this->getpath($url); |
| 119 | - if($path !== false && preg_match('#\.js$#',$path) && $this->ismergeable($tag)) { |
|
| 119 | + if ($path !== false && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) { |
|
| 120 | 120 | // ok to optimize, add to array |
| 121 | 121 | $this->scripts[] = $path; |
| 122 | 122 | } else { |
@@ -125,14 +125,14 @@ discard block |
||
| 125 | 125 | // should we add flags? |
| 126 | 126 | $origTag = $tag; |
| 127 | 127 | foreach ($excludeJS as $exclTag => $exclFlags) { |
| 128 | - if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) { |
|
| 129 | - $tag = str_replace('<script ','<script '.$exclFlags.' ',$tag); |
|
| 128 | + if (strpos($origTag, $exclTag) !== false && in_array($exclFlags, array("async", "defer"))) { |
|
| 129 | + $tag = str_replace('<script ', '<script '.$exclFlags.' ', $tag); |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | - if($this->ismovable($tag)) { |
|
| 133 | + if ($this->ismovable($tag)) { |
|
| 134 | 134 | // can be moved, flags and all |
| 135 | - if($this->movetolast($tag)) { |
|
| 135 | + if ($this->movetolast($tag)) { |
|
| 136 | 136 | $this->move['last'][] = $tag; |
| 137 | 137 | } else { |
| 138 | 138 | $this->move['first'][] = $tag; |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | } else { |
| 141 | 141 | // cannot be moved, so if flag was added re-inject altered tag immediately |
| 142 | 142 | if ($origTag && $origTag !== $tag) { |
| 143 | - $this->content = str_replace($origTag,$tag,$this->content); |
|
| 143 | + $this->content = str_replace($origTag, $tag, $this->content); |
|
| 144 | 144 | $origTag = ''; |
| 145 | 145 | } |
| 146 | 146 | // and forget about the $tag (not to be touched any more) |
@@ -149,23 +149,23 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | } else { |
| 151 | 151 | // Inline script |
| 152 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 153 | - $this->content = str_replace($tag,'',$this->content); |
|
| 152 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 153 | + $this->content = str_replace($tag, '', $this->content); |
|
| 154 | 154 | continue; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | // unhide comments, as javascript may be wrapped in comment-tags for old times' sake |
| 158 | 158 | $tag = $this->restore_comments($tag); |
| 159 | - if($this->ismergeable($tag) && ( $this->include_inline )) { |
|
| 160 | - preg_match('#<script.*>(.*)</script>#Usmi',$tag,$code); |
|
| 161 | - $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm','$1',$code[1]); |
|
| 162 | - $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/','',$code); |
|
| 159 | + if ($this->ismergeable($tag) && ($this->include_inline)) { |
|
| 160 | + preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code); |
|
| 161 | + $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]); |
|
| 162 | + $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code); |
|
| 163 | 163 | $this->scripts[] = 'INLINE;'.$code; |
| 164 | 164 | } else { |
| 165 | 165 | // Can we move this? |
| 166 | - $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag ); |
|
| 167 | - if( $this->ismovable($tag) || $autoptimize_js_moveable !== '' ) { |
|
| 168 | - if( $this->movetolast($tag) || $autoptimize_js_moveable === 'last' ) { |
|
| 166 | + $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag); |
|
| 167 | + if ($this->ismovable($tag) || $autoptimize_js_moveable !== '') { |
|
| 168 | + if ($this->movetolast($tag) || $autoptimize_js_moveable === 'last') { |
|
| 169 | 169 | $this->move['last'][] = $tag; |
| 170 | 170 | } else { |
| 171 | 171 | $this->move['first'][] = $tag; |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | //Remove the original script tag |
| 183 | - $this->content = str_replace($tag,'',$this->content); |
|
| 183 | + $this->content = str_replace($tag, '', $this->content); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | return true; |
@@ -192,37 +192,37 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | //Joins and optimizes JS |
| 194 | 194 | public function minify() { |
| 195 | - foreach($this->scripts as $script) { |
|
| 196 | - if(preg_match('#^INLINE;#',$script)) { |
|
| 195 | + foreach ($this->scripts as $script) { |
|
| 196 | + if (preg_match('#^INLINE;#', $script)) { |
|
| 197 | 197 | //Inline script |
| 198 | - $script = preg_replace('#^INLINE;#','',$script); |
|
| 199 | - $script = rtrim( $script, ";\n\t\r" ) . ';'; |
|
| 198 | + $script = preg_replace('#^INLINE;#', '', $script); |
|
| 199 | + $script = rtrim($script, ";\n\t\r").';'; |
|
| 200 | 200 | //Add try-catch? |
| 201 | - if($this->trycatch) { |
|
| 201 | + if ($this->trycatch) { |
|
| 202 | 202 | $script = 'try{'.$script.'}catch(e){}'; |
| 203 | 203 | } |
| 204 | - $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, "" ); |
|
| 205 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscript) ) { |
|
| 206 | - $script=$tmpscript; |
|
| 207 | - $this->alreadyminified=true; |
|
| 204 | + $tmpscript = apply_filters('autoptimize_js_individual_script', $script, ""); |
|
| 205 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) { |
|
| 206 | + $script = $tmpscript; |
|
| 207 | + $this->alreadyminified = true; |
|
| 208 | 208 | } |
| 209 | - $this->jscode .= "\n" . $script; |
|
| 209 | + $this->jscode .= "\n".$script; |
|
| 210 | 210 | } else { |
| 211 | 211 | //External script |
| 212 | - if($script !== false && file_exists($script) && is_readable($script)) { |
|
| 212 | + if ($script !== false && file_exists($script) && is_readable($script)) { |
|
| 213 | 213 | $scriptsrc = file_get_contents($script); |
| 214 | - $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$scriptsrc); |
|
| 215 | - $scriptsrc = rtrim($scriptsrc,";\n\t\r").';'; |
|
| 214 | + $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc); |
|
| 215 | + $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';'; |
|
| 216 | 216 | //Add try-catch? |
| 217 | - if($this->trycatch) { |
|
| 217 | + if ($this->trycatch) { |
|
| 218 | 218 | $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}'; |
| 219 | 219 | } |
| 220 | - $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script ); |
|
| 221 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc) ) { |
|
| 222 | - $scriptsrc=$tmpscriptsrc; |
|
| 223 | - $this->alreadyminified=true; |
|
| 224 | - } else if ((( strpos($script,"min.js") !== false ) || ( strpos($script,"wp-includes/js/jquery/jquery.js") !== false )) && ( $this->inject_min_late === true )) { |
|
| 225 | - $scriptsrc="%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%"; |
|
| 220 | + $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script); |
|
| 221 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) { |
|
| 222 | + $scriptsrc = $tmpscriptsrc; |
|
| 223 | + $this->alreadyminified = true; |
|
| 224 | + } else if (((strpos($script, "min.js") !== false) || (strpos($script, "wp-includes/js/jquery/jquery.js") !== false)) && ($this->inject_min_late === true)) { |
|
| 225 | + $scriptsrc = "%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%"; |
|
| 226 | 226 | } |
| 227 | 227 | $this->jscode .= "\n".$scriptsrc; |
| 228 | 228 | }/*else{ |
@@ -233,24 +233,24 @@ discard block |
||
| 233 | 233 | |
| 234 | 234 | //Check for already-minified code |
| 235 | 235 | $this->md5hash = md5($this->jscode); |
| 236 | - $ccheck = new autoptimizeCache($this->md5hash,'js'); |
|
| 237 | - if($ccheck->check()) { |
|
| 236 | + $ccheck = new autoptimizeCache($this->md5hash, 'js'); |
|
| 237 | + if ($ccheck->check()) { |
|
| 238 | 238 | $this->jscode = $ccheck->retrieve(); |
| 239 | 239 | return true; |
| 240 | 240 | } |
| 241 | 241 | unset($ccheck); |
| 242 | 242 | |
| 243 | 243 | //$this->jscode has all the uncompressed code now. |
| 244 | - if ($this->alreadyminified!==true) { |
|
| 245 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 246 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 244 | + if ($this->alreadyminified !== true) { |
|
| 245 | + if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) { |
|
| 246 | + if (@is_callable(array("JSMin", "minify"))) { |
|
| 247 | 247 | $tmp_jscode = trim(JSMin::minify($this->jscode)); |
| 248 | 248 | if (!empty($tmp_jscode)) { |
| 249 | 249 | $this->jscode = $tmp_jscode; |
| 250 | 250 | unset($tmp_jscode); |
| 251 | 251 | } |
| 252 | 252 | $this->jscode = $this->inject_minified($this->jscode); |
| 253 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 253 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 254 | 254 | return true; |
| 255 | 255 | } else { |
| 256 | 256 | $this->jscode = $this->inject_minified($this->jscode); |
@@ -265,11 +265,11 @@ discard block |
||
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | //Caches the JS in uncompressed, deflated and gzipped form. |
| 268 | - public function cache() { |
|
| 269 | - $cache = new autoptimizeCache($this->md5hash,'js'); |
|
| 270 | - if(!$cache->check()) { |
|
| 268 | + public function cache() { |
|
| 269 | + $cache = new autoptimizeCache($this->md5hash, 'js'); |
|
| 270 | + if (!$cache->check()) { |
|
| 271 | 271 | //Cache our code |
| 272 | - $cache->cache($this->jscode,'text/javascript'); |
|
| 272 | + $cache->cache($this->jscode, 'text/javascript'); |
|
| 273 | 273 | } |
| 274 | 274 | $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 275 | 275 | $this->url = $this->url_replace_cdn($this->url); |
@@ -278,32 +278,32 @@ discard block |
||
| 278 | 278 | // Returns the content |
| 279 | 279 | public function getcontent() { |
| 280 | 280 | // Restore the full content |
| 281 | - if(!empty($this->restofcontent)) { |
|
| 281 | + if (!empty($this->restofcontent)) { |
|
| 282 | 282 | $this->content .= $this->restofcontent; |
| 283 | 283 | $this->restofcontent = ''; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | // Add the scripts taking forcehead/ deferred (default) into account |
| 287 | - if($this->forcehead == true) { |
|
| 288 | - $replaceTag=array("</head>","before"); |
|
| 289 | - $defer=""; |
|
| 287 | + if ($this->forcehead == true) { |
|
| 288 | + $replaceTag = array("</head>", "before"); |
|
| 289 | + $defer = ""; |
|
| 290 | 290 | } else { |
| 291 | - $replaceTag=array("</body>","before"); |
|
| 292 | - $defer="defer "; |
|
| 291 | + $replaceTag = array("</body>", "before"); |
|
| 292 | + $defer = "defer "; |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | - $defer = apply_filters( 'autoptimize_filter_js_defer', $defer ); |
|
| 295 | + $defer = apply_filters('autoptimize_filter_js_defer', $defer); |
|
| 296 | 296 | $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>'; |
| 297 | - $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload',$bodyreplacementpayload); |
|
| 297 | + $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload); |
|
| 298 | 298 | |
| 299 | - $bodyreplacement = implode('',$this->move['first']); |
|
| 299 | + $bodyreplacement = implode('', $this->move['first']); |
|
| 300 | 300 | $bodyreplacement .= $bodyreplacementpayload; |
| 301 | - $bodyreplacement .= implode('',$this->move['last']); |
|
| 301 | + $bodyreplacement .= implode('', $this->move['last']); |
|
| 302 | 302 | |
| 303 | - $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag ); |
|
| 303 | + $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag); |
|
| 304 | 304 | |
| 305 | - if (strlen($this->jscode)>0) { |
|
| 306 | - $this->inject_in_html($bodyreplacement,$replaceTag); |
|
| 305 | + if (strlen($this->jscode) > 0) { |
|
| 306 | + $this->inject_in_html($bodyreplacement, $replaceTag); |
|
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | // restore comments |
@@ -323,15 +323,15 @@ discard block |
||
| 323 | 323 | private function ismergeable($tag) { |
| 324 | 324 | if (!empty($this->whitelist)) { |
| 325 | 325 | foreach ($this->whitelist as $match) { |
| 326 | - if(strpos($tag,$match)!==false) { |
|
| 326 | + if (strpos($tag, $match) !== false) { |
|
| 327 | 327 | return true; |
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | // no match with whitelist |
| 331 | 331 | return false; |
| 332 | 332 | } else { |
| 333 | - foreach($this->domove as $match) { |
|
| 334 | - if(strpos($tag,$match)!==false) { |
|
| 333 | + foreach ($this->domove as $match) { |
|
| 334 | + if (strpos($tag, $match) !== false) { |
|
| 335 | 335 | // Matched something |
| 336 | 336 | return false; |
| 337 | 337 | } |
@@ -341,8 +341,8 @@ discard block |
||
| 341 | 341 | return false; |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - foreach($this->dontmove as $match) { |
|
| 345 | - if(strpos($tag,$match)!==false) { |
|
| 344 | + foreach ($this->dontmove as $match) { |
|
| 345 | + if (strpos($tag, $match) !== false) { |
|
| 346 | 346 | //Matched something |
| 347 | 347 | return false; |
| 348 | 348 | } |
@@ -355,12 +355,12 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | // Checks againstt the blacklist |
| 357 | 357 | private function ismovable($tag) { |
| 358 | - if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) { |
|
| 358 | + if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable', true)) { |
|
| 359 | 359 | return false; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - foreach($this->domove as $match) { |
|
| 363 | - if(strpos($tag,$match)!==false) { |
|
| 362 | + foreach ($this->domove as $match) { |
|
| 363 | + if (strpos($tag, $match) !== false) { |
|
| 364 | 364 | // Matched something |
| 365 | 365 | return true; |
| 366 | 366 | } |
@@ -370,8 +370,8 @@ discard block |
||
| 370 | 370 | return true; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | - foreach($this->dontmove as $match) { |
|
| 374 | - if(strpos($tag,$match)!==false) { |
|
| 373 | + foreach ($this->dontmove as $match) { |
|
| 374 | + if (strpos($tag, $match) !== false) { |
|
| 375 | 375 | // Matched something |
| 376 | 376 | return false; |
| 377 | 377 | } |
@@ -382,8 +382,8 @@ discard block |
||
| 382 | 382 | } |
| 383 | 383 | |
| 384 | 384 | private function movetolast($tag) { |
| 385 | - foreach($this->domovelast as $match) { |
|
| 386 | - if(strpos($tag,$match)!==false) { |
|
| 385 | + foreach ($this->domovelast as $match) { |
|
| 386 | + if (strpos($tag, $match) !== false) { |
|
| 387 | 387 | // Matched, return true |
| 388 | 388 | return true; |
| 389 | 389 | } |
@@ -409,10 +409,10 @@ discard block |
||
| 409 | 409 | * original function by https://github.com/zytzagoo/ on his AO fork, thanks Tomas! |
| 410 | 410 | */ |
| 411 | 411 | public function should_aggregate($tag) { |
| 412 | - preg_match('#<(script[^>]*)>#i',$tag,$scripttag); |
|
| 413 | - if ( strpos($scripttag[1], 'type')===false ) { |
|
| 412 | + preg_match('#<(script[^>]*)>#i', $tag, $scripttag); |
|
| 413 | + if (strpos($scripttag[1], 'type') === false) { |
|
| 414 | 414 | return true; |
| 415 | - } else if ( preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1]) ) { |
|
| 415 | + } else if (preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1])) { |
|
| 416 | 416 | return true; |
| 417 | 417 | } else { |
| 418 | 418 | return false; |
@@ -273,12 +273,12 @@ discard block |
||
| 273 | 273 | return true; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | - // we have to check for a preceding keyword, and we don't need to pattern |
|
| 277 | - // match over the whole output. |
|
| 278 | - $recentOutput = substr($this->output, -10); |
|
| 276 | + // we have to check for a preceding keyword, and we don't need to pattern |
|
| 277 | + // match over the whole output. |
|
| 278 | + $recentOutput = substr($this->output, -10); |
|
| 279 | 279 | |
| 280 | - // check if return/typeof directly precede a pattern without a space |
|
| 281 | - foreach (array('return', 'typeof') as $keyword) {
|
|
| 280 | + // check if return/typeof directly precede a pattern without a space |
|
| 281 | + foreach (array('return', 'typeof') as $keyword) {
|
|
| 282 | 282 | if ($this->a !== substr($keyword, -1)) {
|
| 283 | 283 | // certainly wasn't keyword |
| 284 | 284 | continue; |
@@ -290,13 +290,13 @@ discard block |
||
| 290 | 290 | } |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | - // check all keywords |
|
| 294 | - if ($this->a === ' ' || $this->a === "\n") {
|
|
| 295 | - if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {
|
|
| 296 | - if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
|
|
| 297 | - return true; |
|
| 298 | - } |
|
| 299 | - } |
|
| 293 | + // check all keywords |
|
| 294 | + if ($this->a === ' ' || $this->a === "\n") {
|
|
| 295 | + if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {
|
|
| 296 | + if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
|
|
| 297 | + return true; |
|
| 298 | + } |
|
| 299 | + } |
|
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | return false; |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected $inputLength = 0; |
| 69 | 69 | protected $lookAhead = null; |
| 70 | 70 | protected $output = ''; |
| 71 | - protected $lastByteOut = ''; |
|
| 71 | + protected $lastByteOut = ''; |
|
| 72 | 72 | protected $keptComment = ''; |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $mbIntEnc = null; |
| 107 | - if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
|
|
| 107 | + if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
|
|
| 108 | 108 | $mbIntEnc = mb_internal_encoding(); |
| 109 | 109 | mb_internal_encoding('8bit');
|
| 110 | 110 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | && ($this->b === $this->lastByteOut)) {
|
| 122 | 122 | // Don't delete this space. If we do, the addition/subtraction |
| 123 | 123 | // could be parsed as a post-increment |
| 124 | - } elseif (! $this->isAlphaNum($this->b)) {
|
|
| 124 | + } elseif (!$this->isAlphaNum($this->b)) {
|
|
| 125 | 125 | $command = self::ACTION_DELETE_A; |
| 126 | 126 | } |
| 127 | 127 | } elseif ($this->a === "\n") {
|
@@ -132,10 +132,10 @@ discard block |
||
| 132 | 132 | // otherwise mb_strpos will give WARNING |
| 133 | 133 | } elseif ($this->b === null |
| 134 | 134 | || (false === strpos('{[(+-!~', $this->b)
|
| 135 | - && ! $this->isAlphaNum($this->b))) {
|
|
| 135 | + && !$this->isAlphaNum($this->b))) {
|
|
| 136 | 136 | $command = self::ACTION_DELETE_A; |
| 137 | 137 | } |
| 138 | - } elseif (! $this->isAlphaNum($this->a)) {
|
|
| 138 | + } elseif (!$this->isAlphaNum($this->a)) {
|
|
| 139 | 139 | if ($this->b === ' ' |
| 140 | 140 | || ($this->b === "\n" |
| 141 | 141 | && (false === strpos('}])+-"\'', $this->a)))) {
|
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $this->a = $this->b; |
| 192 | 192 | if ($this->a === "'" || $this->a === '"') { // string literal
|
| 193 | 193 | $str = $this->a; // in case needed for exception |
| 194 | - for(;;) {
|
|
| 194 | + for (;;) {
|
|
| 195 | 195 | $this->output .= $this->a; |
| 196 | 196 | $this->lastByteOut = $this->a; |
| 197 | 197 | |
@@ -218,13 +218,13 @@ discard block |
||
| 218 | 218 | case self::ACTION_DELETE_A_B: // 3 |
| 219 | 219 | $this->b = $this->next(); |
| 220 | 220 | if ($this->b === '/' && $this->isRegexpLiteral()) {
|
| 221 | - $this->output .= $this->a . $this->b; |
|
| 221 | + $this->output .= $this->a.$this->b; |
|
| 222 | 222 | $pattern = '/'; // keep entire pattern in case we need to report it in the exception |
| 223 | - for(;;) {
|
|
| 223 | + for (;;) {
|
|
| 224 | 224 | $this->a = $this->get(); |
| 225 | 225 | $pattern .= $this->a; |
| 226 | 226 | if ($this->a === '[') {
|
| 227 | - for(;;) {
|
|
| 227 | + for (;;) {
|
|
| 228 | 228 | $this->output .= $this->a; |
| 229 | 229 | $this->a = $this->get(); |
| 230 | 230 | $pattern .= $this->a; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | if ($this->isEOF($this->a)) {
|
| 240 | 240 | throw new JSMin_UnterminatedRegExpException( |
| 241 | 241 | "JSMin: Unterminated set in RegExp at byte " |
| 242 | - . $this->inputIndex .": {$pattern}");
|
|
| 242 | + . $this->inputIndex.": {$pattern}");
|
|
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | // certainly wasn't keyword |
| 284 | 284 | continue; |
| 285 | 285 | } |
| 286 | - if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {
|
|
| 286 | + if (preg_match("~(^|[\\s\\S])".substr($keyword, 0, -1)."$~", $recentOutput, $m)) {
|
|
| 287 | 287 | if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
|
| 288 | 288 | return true; |
| 289 | 289 | } |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | {
|
| 393 | 393 | $this->get(); |
| 394 | 394 | $comment = ''; |
| 395 | - for(;;) {
|
|
| 395 | + for (;;) {
|
|
| 396 | 396 | $get = $this->get(); |
| 397 | 397 | if ($get === '*') {
|
| 398 | 398 | if ($this->peek() === '/') { // end of comment reached
|
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | // don't prepend a newline if two comments right after one another |
| 404 | 404 | $this->keptComment = "\n"; |
| 405 | 405 | } |
| 406 | - $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n"; |
|
| 406 | + $this->keptComment .= "/*!".substr($comment, 1)."*/\n"; |
|
| 407 | 407 | } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
|
| 408 | 408 | // IE conditional |
| 409 | 409 | $this->keptComment .= "/*{$comment}*/";
|
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected $inputLength = 0; |
| 69 | 69 | protected $lookAhead = null; |
| 70 | 70 | protected $output = ''; |
| 71 | - protected $lastByteOut = ''; |
|
| 71 | + protected $lastByteOut = ''; |
|
| 72 | 72 | protected $keptComment = ''; |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $mbIntEnc = null; |
| 107 | - if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) { |
|
| 107 | + if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) { |
|
| 108 | 108 | $mbIntEnc = mb_internal_encoding(); |
| 109 | 109 | mb_internal_encoding('8bit'); |
| 110 | 110 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | && ($this->b === $this->lastByteOut)) { |
| 127 | 127 | // Don't delete this space. If we do, the addition/subtraction |
| 128 | 128 | // could be parsed as a post-increment |
| 129 | - } elseif (! $this->isAlphaNum($this->b)) { |
|
| 129 | + } elseif (!$this->isAlphaNum($this->b)) { |
|
| 130 | 130 | $command = self::ACTION_DELETE_A; |
| 131 | 131 | } |
| 132 | 132 | } elseif ($this->a === "\n") { |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | // otherwise mb_strpos will give WARNING |
| 138 | 138 | } elseif ($this->b === null |
| 139 | 139 | || (false === strpos('{[(+-!~', $this->b) |
| 140 | - && ! $this->isAlphaNum($this->b))) { |
|
| 140 | + && !$this->isAlphaNum($this->b))) { |
|
| 141 | 141 | $command = self::ACTION_DELETE_A; |
| 142 | 142 | } |
| 143 | - } elseif (! $this->isAlphaNum($this->a)) { |
|
| 143 | + } elseif (!$this->isAlphaNum($this->a)) { |
|
| 144 | 144 | if ($this->b === ' ' |
| 145 | 145 | || ($this->b === "\n" |
| 146 | 146 | && (false === strpos('}])+-"\'', $this->a)))) { |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal |
| 198 | 198 | $delimiter = $this->a; |
| 199 | 199 | $str = $this->a; // in case needed for exception |
| 200 | - for(;;) { |
|
| 200 | + for (;;) { |
|
| 201 | 201 | $this->output .= $this->a; |
| 202 | 202 | $this->lastByteOut = $this->a; |
| 203 | 203 | $this->a = $this->get(); |
@@ -225,13 +225,13 @@ discard block |
||
| 225 | 225 | case self::ACTION_DELETE_A_B: // 3 |
| 226 | 226 | $this->b = $this->next(); |
| 227 | 227 | if ($this->b === '/' && $this->isRegexpLiteral()) { |
| 228 | - $this->output .= $this->a . $this->b; |
|
| 228 | + $this->output .= $this->a.$this->b; |
|
| 229 | 229 | $pattern = '/'; // keep entire pattern in case we need to report it in the exception |
| 230 | - for(;;) { |
|
| 230 | + for (;;) { |
|
| 231 | 231 | $this->a = $this->get(); |
| 232 | 232 | $pattern .= $this->a; |
| 233 | 233 | if ($this->a === '[') { |
| 234 | - for(;;) { |
|
| 234 | + for (;;) { |
|
| 235 | 235 | $this->output .= $this->a; |
| 236 | 236 | $this->a = $this->get(); |
| 237 | 237 | $pattern .= $this->a; |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | if ($this->isEOF($this->a)) { |
| 247 | 247 | throw new JSMin_UnterminatedRegExpException( |
| 248 | 248 | "JSMin: Unterminated set in RegExp at byte " |
| 249 | - . $this->inputIndex .": {$pattern}"); |
|
| 249 | + . $this->inputIndex.": {$pattern}"); |
|
| 250 | 250 | } |
| 251 | 251 | } |
| 252 | 252 | } |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | |
| 292 | 292 | // if the "/" follows a keyword, it must be a regexp, otherwise it's best to assume division |
| 293 | 293 | |
| 294 | - $subject = $this->output . trim($this->a); |
|
| 294 | + $subject = $this->output.trim($this->a); |
|
| 295 | 295 | if (!preg_match('/(?:case|else|in|return|typeof)$/', $subject, $m)) { |
| 296 | 296 | // not a keyword |
| 297 | 297 | return false; |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | { |
| 403 | 403 | $this->get(); |
| 404 | 404 | $comment = ''; |
| 405 | - for(;;) { |
|
| 405 | + for (;;) { |
|
| 406 | 406 | $get = $this->get(); |
| 407 | 407 | if ($get === '*') { |
| 408 | 408 | if ($this->peek() === '/') { // end of comment reached |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | // don't prepend a newline if two comments right after one another |
| 414 | 414 | $this->keptComment = "\n"; |
| 415 | 415 | } |
| 416 | - $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n"; |
|
| 416 | + $this->keptComment .= "/*!".substr($comment, 1)."*/\n"; |
|
| 417 | 417 | } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) { |
| 418 | 418 | // IE conditional |
| 419 | 419 | $this->keptComment .= "/*{$comment}*/"; |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | {
|
| 71 | 71 | $this->_html = str_replace("\r\n", "\n", trim($html));
|
| 72 | 72 | if (isset($options['xhtml'])) {
|
| 73 | - $this->_isXhtml = (bool)$options['xhtml']; |
|
| 73 | + $this->_isXhtml = (bool) $options['xhtml']; |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($options['cssMinifier'])) {
|
| 76 | 76 | $this->_cssMinifier = $options['cssMinifier']; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $this->_jsMinifier = $options['jsMinifier']; |
| 80 | 80 | } |
| 81 | 81 | if (isset($options['jsCleanComments'])) {
|
| 82 | - $this->_jsCleanComments = (bool)$options['jsCleanComments']; |
|
| 82 | + $this->_jsCleanComments = (bool) $options['jsCleanComments']; |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML')); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); |
|
| 98 | + $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']); |
|
| 99 | 99 | $this->_placeholders = array(); |
| 100 | 100 | |
| 101 | 101 | // replace SCRIPTs (and minify) with placeholders |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | protected function _reservePlace($content) |
| 173 | 173 | {
|
| 174 | - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; |
|
| 174 | + $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%'; |
|
| 175 | 175 | $this->_placeholders[$placeholder] = $content; |
| 176 | 176 | return $placeholder; |
| 177 | 177 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * |
| 34 | 34 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
| 35 | 35 | * unset, minify will sniff for an XHTML doctype. |
| 36 | - * |
|
| 36 | + * |
|
| 37 | 37 | * 'keepComments' : (optional boolean) should the HTML comments be kept |
| 38 | 38 | * in the HTML Code? |
| 39 | 39 | * |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * |
| 61 | 61 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
| 62 | 62 | * unset, minify will sniff for an XHTML doctype. |
| 63 | - * |
|
| 63 | + * |
|
| 64 | 64 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
| 65 | 65 | * unset, minify will sniff for an XHTML doctype. |
| 66 | 66 | * |
@@ -111,11 +111,11 @@ discard block |
||
| 111 | 111 | ,$this->_html); |
| 112 | 112 | |
| 113 | 113 | // remove HTML comments (not containing IE conditional comments). |
| 114 | - if ($this->_keepComments == false) { |
|
| 115 | - $this->_html = preg_replace_callback( |
|
| 116 | - '/<!--([\\s\\S]*?)-->/' |
|
| 117 | - ,array($this, '_commentCB') |
|
| 118 | - ,$this->_html); |
|
| 114 | + if ($this->_keepComments == false) { |
|
| 115 | + $this->_html = preg_replace_callback( |
|
| 116 | + '/<!--([\\s\\S]*?)-->/' |
|
| 117 | + ,array($this, '_commentCB') |
|
| 118 | + ,$this->_html); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // replace PREs with placeholders |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | ,array($this, '_removeTextareaCB') |
| 130 | 130 | ,$this->_html); |
| 131 | 131 | |
| 132 | - // replace data: URIs with placeholders |
|
| 132 | + // replace data: URIs with placeholders |
|
| 133 | 133 | $this->_html = preg_replace_callback( |
| 134 | 134 | '/(=("|\')data:.*\\2)/Ui' |
| 135 | 135 | ,array($this, '_removeDataURICB') |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | protected $_placeholders = array(); |
| 184 | 184 | protected $_cssMinifier = null; |
| 185 | 185 | protected $_jsMinifier = null; |
| 186 | - protected $_keepComments = false; |
|
| 186 | + protected $_keepComments = false; |
|
| 187 | 187 | |
| 188 | 188 | protected function _outsideTagCB($m) |
| 189 | 189 | { |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | return $this->_reservePlace($m[1]); |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - protected function _removeDataURICB($m) |
|
| 203 | + protected function _removeDataURICB($m) |
|
| 204 | 204 | { |
| 205 | 205 | return $this->_reservePlace($m[1]); |
| 206 | 206 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | { |
| 71 | 71 | $this->_html = str_replace("\r\n", "\n", trim($html)); |
| 72 | 72 | if (isset($options['xhtml'])) { |
| 73 | - $this->_isXhtml = (bool)$options['xhtml']; |
|
| 73 | + $this->_isXhtml = (bool) $options['xhtml']; |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($options['cssMinifier'])) { |
| 76 | 76 | $this->_cssMinifier = $options['cssMinifier']; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML')); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); |
|
| 98 | + $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']); |
|
| 99 | 99 | $this->_placeholders = array(); |
| 100 | 100 | |
| 101 | 101 | // replace SCRIPTs (and minify) with placeholders |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | ,$this->_html); |
| 112 | 112 | |
| 113 | 113 | // remove HTML comments (not containing IE conditional comments). |
| 114 | - if ($this->_keepComments == false) { |
|
| 114 | + if ($this->_keepComments == false) { |
|
| 115 | 115 | $this->_html = preg_replace_callback( |
| 116 | 116 | '/<!--([\\s\\S]*?)-->/' |
| 117 | 117 | ,array($this, '_commentCB') |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | protected function _reservePlace($content) |
| 175 | 175 | { |
| 176 | - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; |
|
| 176 | + $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%'; |
|
| 177 | 177 | $this->_placeholders[$placeholder] = $content; |
| 178 | 178 | return $placeholder; |
| 179 | 179 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | protected function _outsideTagCB($m) |
| 189 | 189 | { |
| 190 | - return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<'; |
|
| 190 | + return '>'.preg_replace('/^\\s+|\\s+$/', ' ', $m[1]).'<'; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | protected function _removePreCB($m) |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | protected function _removeCdata($str) |
| 258 | 258 | { |
| 259 | 259 | return (false !== strpos($str, '<![CDATA[')) |
| 260 | - ? str_replace(array('/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str) |
|
| 260 | + ? str_replace(array('/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str) |
|
| 261 | 261 | : $str; |
| 262 | 262 | } |
| 263 | 263 | |
