| @@ -1,5 +1,8 @@ | ||
| 1 | 1 | <?php |
| 2 | +/** | |
| 3 | + * Class for JS optimization. | |
| 4 | + */ | |
| 2 | 5 | |
| 3 | 6 | if ( ! defined( 'ABSPATH' ) ) { |
| 4 | 7 | exit; |
| 5 | 8 | } |
| @@ -5,62 +8,243 @@ | ||
| 5 | 8 | } |
| 6 | 9 | |
| 7 | 10 | class autoptimizeScripts extends autoptimizeBase |
| 8 | 11 | { |
| 12 | + | |
| 13 | + /** | |
| 14 | + * Stores founds scripts. | |
| 15 | + * | |
| 16 | + * @var array | |
| 17 | + */ | |
| 9 | 18 | private $scripts = array(); |
| 10 | - private $move = array( | |
| 19 | + | |
| 20 | + /** | |
| 21 | + * Stores to be moved JS. | |
| 22 | + * | |
| 23 | + * @var array | |
| 24 | + */ | |
| 25 | + private $move = array( | |
| 11 | 26 | 'first' => array(), |
| 12 | - 'last' => array() | |
| 27 | + 'last' => array(), | |
| 13 | 28 | ); |
| 14 | 29 | |
| 30 | + /** | |
| 31 | + * List of not to be moved JS. | |
| 32 | + * | |
| 33 | + * @var array | |
| 34 | + */ | |
| 15 | 35 | private $dontmove = array( |
| 16 | - 'document.write','html5.js','show_ads.js','google_ad','histats.com/js','statcounter.com/counter/counter.js', | |
| 17 | - 'ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar', | |
| 18 | - 'intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject', | |
| 19 | - 'plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize' | |
| 20 | - ,'logHuman' | |
| 36 | + 'document.write', | |
| 37 | + 'html5.js', | |
| 38 | + 'show_ads.js', | |
| 39 | + 'google_ad', | |
| 40 | + 'histats.com/js', | |
| 41 | + 'statcounter.com/counter/counter.js', | |
| 42 | + 'ws.amazon.com/widgets', | |
| 43 | + 'media.fastclick.net', | |
| 44 | + '/ads/', | |
| 45 | + 'comment-form-quicktags/quicktags.php', | |
| 46 | + 'edToolbar', | |
| 47 | + 'intensedebate.com', | |
| 48 | + 'scripts.chitika.net/', | |
| 49 | + '_gaq.push', | |
| 50 | + 'jotform.com/', | |
| 51 | + 'admin-bar.min.js', | |
| 52 | + 'GoogleAnalyticsObject', | |
| 53 | + 'plupload.full.min.js', | |
| 54 | + 'syntaxhighlighter', | |
| 55 | + 'adsbygoogle', | |
| 56 | + 'gist.github.com', | |
| 57 | + '_stq', | |
| 58 | + 'nonce', | |
| 59 | + 'post_id', | |
| 60 | + 'data-noptimize', | |
| 61 | + 'data-cfasync', | |
| 62 | + 'data-pagespeed-no-defer', | |
| 63 | + 'logHuman', | |
| 64 | + 'amp-mobile-version-switcher', | |
| 65 | + 'data-rocketlazyloadscript', | |
| 66 | + 'rocket-browser-checker-js-after', | |
| 21 | 67 | ); |
| 22 | - private $domove = array( | |
| 23 | - 'gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go' | |
| 68 | + | |
| 69 | + /** | |
| 70 | + * List of to be moved JS. | |
| 71 | + * | |
| 72 | + * @var array | |
| 73 | + */ | |
| 74 | + private $domove = array( | |
| 75 | + 'gaJsHost', | |
| 76 | + 'load_cmc', | |
| 77 | + 'jd.gallery.transitions.js', | |
| 78 | + 'swfobject.embedSWF(', | |
| 79 | + 'tiny_mce.js', | |
| 80 | + 'tinyMCEPreInit.go', | |
| 24 | 81 | ); |
| 82 | + | |
| 83 | + /** | |
| 84 | + * List of JS that can be moved last (not used any more). | |
| 85 | + * | |
| 86 | + * @var array | |
| 87 | + */ | |
| 25 | 88 | private $domovelast = array( |
| 26 | - 'addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/', | |
| 27 | - 'jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go' | |
| 89 | + 'addthis.com', | |
| 90 | + '/afsonline/show_afs_search.js', | |
| 91 | + 'disqus.js', | |
| 92 | + 'networkedblogs.com/getnetworkwidget', | |
| 93 | + 'infolinks.com/js/', | |
| 94 | + 'jd.gallery.js.php', | |
| 95 | + 'jd.gallery.transitions.js', | |
| 96 | + 'swfobject.embedSWF(', | |
| 97 | + 'linkwithin.com/widget.js', | |
| 98 | + 'tiny_mce.js', | |
| 99 | + 'tinyMCEPreInit.go', | |
| 28 | 100 | ); |
| 101 | + | |
| 102 | + /** | |
| 103 | + * Setting CDN base URL. | |
| 104 | + * | |
| 105 | + * @var string | |
| 106 | + */ | |
| 29 | 107 | public $cdn_url = ''; |
| 30 | 108 | |
| 31 | - private $aggregate = true; | |
| 32 | - private $trycatch = false; | |
| 109 | + /** | |
| 110 | + * Setting; aggregate or not. | |
| 111 | + * | |
| 112 | + * @var bool | |
| 113 | + */ | |
| 114 | + private $aggregate = true; | |
| 115 | + | |
| 116 | + /** | |
| 117 | + * Setting; if not aggregated, should we defer? | |
| 118 | + * | |
| 119 | + * @var bool | |
| 120 | + */ | |
| 121 | + private $defer_not_aggregate = false; | |
| 122 | + | |
| 123 | + /** | |
| 124 | + * Setting; defer inline JS? | |
| 125 | + * | |
| 126 | + * @var bool | |
| 127 | + */ | |
| 128 | + private $defer_inline = false; | |
| 129 | + | |
| 130 | + /** | |
| 131 | + * Setting; try/catch wrapping or not. | |
| 132 | + * | |
| 133 | + * @var bool | |
| 134 | + */ | |
| 135 | + private $trycatch = false; | |
| 136 | + | |
| 137 | + /** | |
| 138 | + * State; is JS already minified. | |
| 139 | + * | |
| 140 | + * @var bool | |
| 141 | + */ | |
| 33 | 142 | private $alreadyminified = false; |
| 34 | - private $forcehead = true; | |
| 35 | - private $include_inline = false; | |
| 36 | - private $jscode = ''; | |
| 37 | - private $url = ''; | |
| 38 | - private $restofcontent = ''; | |
| 39 | - private $md5hash = ''; | |
| 40 | - private $whitelist = ''; | |
| 41 | - private $jsremovables = array(); | |
| 42 | - private $inject_min_late = ''; | |
| 143 | + | |
| 144 | + /** | |
| 145 | + * Setting; force JS in head or not. | |
| 146 | + * | |
| 147 | + * @var bool | |
| 148 | + */ | |
| 149 | + private $forcehead = true; | |
| 150 | + | |
| 151 | + /** | |
| 152 | + * Setting; aggregate inline JS or not. | |
| 153 | + * | |
| 154 | + * @var bool | |
| 155 | + */ | |
| 156 | + private $include_inline = false; | |
| 157 | + | |
| 158 | + /** | |
| 159 | + * State; holds JS code. | |
| 160 | + * | |
| 161 | + * @var string | |
| 162 | + */ | |
| 163 | + private $jscode = ''; | |
| 164 | + | |
| 165 | + /** | |
| 166 | + * State; holds URL of JS-file. | |
| 167 | + * | |
| 168 | + * @var string | |
| 169 | + */ | |
| 170 | + private $url = ''; | |
| 171 | + | |
| 172 | + /** | |
| 173 | + * State; stores rest of HTML if (old) option "only in head" is on. | |
| 174 | + * | |
| 175 | + * @var string | |
| 176 | + */ | |
| 177 | + private $restofcontent = ''; | |
| 178 | + | |
| 179 | + /** | |
| 180 | + * State; holds md5-hash. | |
| 181 | + * | |
| 182 | + * @var string | |
| 183 | + */ | |
| 184 | + private $md5hash = ''; | |
| 185 | + | |
| 186 | + /** | |
| 187 | + * Setting (filter); allowlist of to be aggregated JS. | |
| 188 | + * | |
| 189 | + * @var string | |
| 190 | + */ | |
| 191 | + private $allowlist = ''; | |
| 192 | + | |
| 193 | + /** | |
| 194 | + * Setting (filter); holds JS that should be removed. | |
| 195 | + * | |
| 196 | + * @var array | |
| 197 | + */ | |
| 198 | + private $jsremovables = array(); | |
| 199 | + | |
| 200 | + /** | |
| 201 | + * Setting (filter); can we inject already minified files after the | |
| 202 | + * unminified aggregate JS has been minified. | |
| 203 | + * | |
| 204 | + * @var bool | |
| 205 | + */ | |
| 206 | + private $inject_min_late = true; | |
| 207 | + | |
| 208 | + /** | |
| 209 | + * Setting; should excluded JS be minified (if not already). | |
| 210 | + * | |
| 211 | + * @var bool | |
| 212 | + */ | |
| 43 | 213 | private $minify_excluded = true; |
| 44 | 214 | |
| 45 | - // Reads the page and collects script tags. | |
| 215 | + /** | |
| 216 | + * Reads the page and collects script tags. | |
| 217 | + * | |
| 218 | + * @param array $options all options. | |
| 219 | + */ | |
| 46 | 220 | public function read( $options ) |
| 47 | 221 | { |
| 48 | - $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); | |
| 49 | - if ( $noptimizeJS ) { | |
| 222 | + $noptimize_js = false; | |
| 223 | + | |
| 224 | + // If page/ post check post_meta to see if optimize is off. | |
| 225 | + if ( false === autoptimizeConfig::get_post_meta_ao_settings( 'ao_post_js_optimize' ) ) { | |
| 226 | + $noptimize_js = true; | |
| 227 | + } | |
| 228 | + | |
| 229 | + // And a filter to enforce JS noptimize. | |
| 230 | + $noptimize_js = apply_filters( 'autoptimize_filter_js_noptimize', $noptimize_js, $this->content ); | |
| 231 | + | |
| 232 | + // And finally bail if noptimize_js is true. | |
| 233 | + if ( $noptimize_js ) { | |
| 50 | 234 | return false; |
| 51 | 235 | } |
| 52 | 236 | |
| 53 | 237 | // only optimize known good JS? |
| 54 | - $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content ); | |
| 55 | - if ( ! empty( $whitelistJS ) ) { | |
| 56 | - $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelistJS ) ) ); | |
| 238 | + $allowlist_js = apply_filters( 'autoptimize_filter_js_allowlist', '', $this->content ); | |
| 239 | + if ( ! empty( $allowlist_js ) ) { | |
| 240 | + $this->allowlist = array_filter( array_map( 'trim', explode( ',', $allowlist_js ) ) ); | |
| 57 | 241 | } |
| 58 | 242 | |
| 59 | 243 | // is there JS we should simply remove? |
| 60 | - $removableJS = apply_filters( 'autoptimize_filter_js_removables', '', $this->content ); | |
| 61 | - if ( !empty( $removableJS ) ) { | |
| 62 | - $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $removableJS ) ) ); | |
| 244 | + $removable_js = apply_filters( 'autoptimize_filter_js_removables', '', $this->content ); | |
| 245 | + if ( ! empty( $removable_js ) ) { | |
| 246 | + $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $removable_js ) ) ); | |
| 63 | 247 | } |
| 64 | 248 | |
| 65 | 249 | // only header? |
| 66 | 250 | if ( apply_filters( 'autoptimize_filter_js_justhead', $options['justhead'] ) ) { |
| @@ -76,8 +260,20 @@ | ||
| 76 | 260 | // Returning true for "dontaggregate" turns off aggregation. |
| 77 | 261 | if ( $this->aggregate && apply_filters( 'autoptimize_filter_js_dontaggregate', false ) ) { |
| 78 | 262 | $this->aggregate = false; |
| 79 | 263 | } |
| 264 | + // and the filter that should have been there to begin with. | |
| 265 | + $this->aggregate = apply_filters( 'autoptimize_filter_js_aggregate', $this->aggregate ); | |
| 266 | + | |
| 267 | + // Defer when not aggregating. | |
| 268 | + if ( false === $this->aggregate && apply_filters( 'autoptimize_filter_js_defer_not_aggregate', $options['defer_not_aggregate'] ) ) { | |
| 269 | + $this->defer_not_aggregate = true; | |
| 270 | + } | |
| 271 | + | |
| 272 | + // Defer inline JS? | |
| 273 | + if ( ( true === $this->defer_not_aggregate && apply_filters( 'autoptimize_js_filter_defer_inline', $options['defer_inline'] ) ) || apply_filters( 'autoptimize_js_filter_force_defer_inline', false ) ) { | |
| 274 | + $this->defer_inline = true; | |
| 275 | + } | |
| 80 | 276 | |
| 81 | 277 | // include inline? |
| 82 | 278 | if ( apply_filters( 'autoptimize_js_include_inline', $options['include_inline'] ) ) { |
| 83 | 279 | $this->include_inline = true; |
| @@ -97,24 +293,25 @@ | ||
| 97 | 293 | } |
| 98 | 294 | $this->minify_excluded = apply_filters( 'autoptimize_filter_js_minify_excluded', $this->minify_excluded, '' ); |
| 99 | 295 | |
| 100 | 296 | // get extra exclusions settings or filter. |
| 101 | - $excludeJS = $options['js_exclude']; | |
| 102 | - $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS, $this->content ); | |
| 297 | + $exclude_js = $options['js_exclude']; | |
| 298 | + $exclude_js = apply_filters( 'autoptimize_filter_js_exclude', $exclude_js, $this->content ); | |
| 103 | 299 | |
| 104 | - if ( '' !== $excludeJS ) { | |
| 105 | - if ( is_array( $excludeJS ) ) { | |
| 106 | - if ( ( $removeKeys = array_keys( $excludeJS, 'remove' ) ) !== false ) { | |
| 107 | - foreach ( $removeKeys as $removeKey ) { | |
| 108 | - unset( $excludeJS[$removeKey] ); | |
| 109 | - $this->jsremovables[] = $removeKey; | |
| 300 | + if ( '' !== $exclude_js ) { | |
| 301 | + if ( is_array( $exclude_js ) ) { | |
| 302 | + $remove_keys = array_keys( $exclude_js, 'remove' ); | |
| 303 | + if ( false !== $remove_keys ) { | |
| 304 | + foreach ( $remove_keys as $remove_key ) { | |
| 305 | + unset( $exclude_js[ $remove_key ] ); | |
| 306 | + $this->jsremovables[] = $remove_key; | |
| 110 | 307 | } |
| 111 | 308 | } |
| 112 | - $exclJSArr = array_keys( $excludeJS ); | |
| 309 | + $excl_js_arr = array_keys( $exclude_js ); | |
| 113 | 310 | } else { |
| 114 | - $exclJSArr = array_filter( array_map( 'trim', explode( ',', $excludeJS ) ) ); | |
| 311 | + $excl_js_arr = array_filter( array_map( 'trim', explode( ',', $exclude_js ) ) ); | |
| 115 | 312 | } |
| 116 | - $this->dontmove = array_merge( $exclJSArr, $this->dontmove ); | |
| 313 | + $this->dontmove = array_merge( $excl_js_arr, $this->dontmove ); | |
| 117 | 314 | } |
| 118 | 315 | |
| 119 | 316 | // Should we add try-catch? |
| 120 | 317 | if ( $options['trycatch'] ) { |
| @@ -133,21 +330,21 @@ | ||
| 133 | 330 | // get cdn url. |
| 134 | 331 | $this->cdn_url = $options['cdn_url']; |
| 135 | 332 | |
| 136 | 333 | // noptimize me. |
| 137 | - $this->content = $this->hide_noptimize($this->content); | |
| 334 | + $this->content = $this->hide_noptimize( $this->content ); | |
| 138 | 335 | |
| 139 | 336 | // Save IE hacks. |
| 140 | - $this->content = $this->hide_iehacks($this->content); | |
| 337 | + $this->content = $this->hide_iehacks( $this->content ); | |
| 141 | 338 | |
| 142 | 339 | // comments. |
| 143 | - $this->content = $this->hide_comments($this->content); | |
| 340 | + $this->content = $this->hide_comments( $this->content ); | |
| 144 | 341 | |
| 145 | 342 | // Get script files. |
| 146 | 343 | if ( preg_match_all( '#<script.*</script>#Usmi', $this->content, $matches ) ) { |
| 147 | - foreach( $matches[0] as $tag ) { | |
| 148 | - // only consider script aggregation for types whitelisted in should_aggregate-function. | |
| 149 | - $should_aggregate = $this->should_aggregate($tag); | |
| 344 | + foreach ( $matches[0] as $tag ) { | |
| 345 | + // only consider script aggregation for types allowlisted in should_aggregate-function. | |
| 346 | + $should_aggregate = $this->should_aggregate( $tag ); | |
| 150 | 347 | if ( ! $should_aggregate ) { |
| 151 | 348 | $tag = ''; |
| 152 | 349 | continue; |
| 153 | 350 | } |
| @@ -153,33 +350,38 @@ | ||
| 153 | 350 | } |
| 154 | 351 | |
| 155 | 352 | if ( preg_match( '#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source ) ) { |
| 156 | 353 | // non-inline script. |
| 157 | - if ( $this->isremovable($tag, $this->jsremovables) ) { | |
| 354 | + if ( $this->isremovable( $tag, $this->jsremovables ) ) { | |
| 158 | 355 | $this->content = str_replace( $tag, '', $this->content ); |
| 159 | 356 | continue; |
| 160 | 357 | } |
| 161 | 358 | |
| 162 | - $origTag = null; | |
| 163 | - $url = current( explode( '?', $source[2], 2 ) ); | |
| 164 | - $path = $this->getpath($url); | |
| 165 | - if ( false !== $path && preg_match( '#\.js$#', $path ) && $this->ismergeable($tag) ) { | |
| 359 | + $orig_tag = null; | |
| 360 | + $url = current( explode( '?', $source[2], 2 ) ); | |
| 361 | + $path = $this->getpath( $url ); | |
| 362 | + if ( false !== $path && preg_match( '#\.js$#', $path ) && $this->ismergeable( $tag ) ) { | |
| 166 | 363 | // ok to optimize, add to array. |
| 167 | 364 | $this->scripts[] = $path; |
| 168 | 365 | } else { |
| 169 | - $origTag = $tag; | |
| 170 | - $newTag = $tag; | |
| 366 | + $orig_tag = $tag; | |
| 367 | + $new_tag = $tag; | |
| 171 | 368 | |
| 172 | 369 | // non-mergeable script (excluded or dynamic or external). |
| 173 | - if ( is_array( $excludeJS ) ) { | |
| 370 | + if ( is_array( $exclude_js ) ) { | |
| 174 | 371 | // should we add flags? |
| 175 | - foreach ( $excludeJS as $exclTag => $exclFlags) { | |
| 176 | - if ( false !== strpos( $origTag, $exclTag ) && in_array( $exclFlags, array( 'async', 'defer' ) ) ) { | |
| 177 | - $newTag = str_replace( '<script ', '<script ' . $exclFlags . ' ', $newTag ); | |
| 372 | + foreach ( $exclude_js as $excl_tag => $excl_flags ) { | |
| 373 | + if ( false !== strpos( $orig_tag, $excl_tag ) && in_array( $excl_flags, array( 'async', 'defer' ) ) ) { | |
| 374 | + $new_tag = str_replace( '<script ', '<script ' . $excl_flags . ' ', $new_tag ); | |
| 178 | 375 | } |
| 179 | 376 | } |
| 180 | 377 | } |
| 181 | 378 | |
| 379 | + // not aggregating but deferring? | |
| 380 | + if ( $this->defer_not_aggregate && false === $this->aggregate && ( str_replace( $this->dontmove, '', $path ) === $path || ( apply_filters( 'autoptimize_filter_js_defer_external', true ) && str_replace( $this->dontmove, '', $orig_tag ) === $orig_tag ) ) && strpos( $new_tag, ' defer' ) === false && strpos( $new_tag, ' async' ) === false ) { | |
| 381 | + $new_tag = str_replace( '<script ', '<script defer ', $new_tag ); | |
| 382 | + } | |
| 383 | + | |
| 182 | 384 | // Should we minify the non-aggregated script? |
| 183 | 385 | // -> if aggregate is on and exclude minify is on |
| 184 | 386 | // -> if aggregate is off and the file is not in dontmove. |
| 185 | 387 | if ( $path && $this->minify_excluded ) { |
| @@ -185,27 +387,36 @@ | ||
| 185 | 387 | if ( $path && $this->minify_excluded ) { |
| 186 | 388 | $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false ); |
| 187 | 389 | if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) { |
| 188 | 390 | $minified_url = $this->minify_single( $path ); |
| 189 | - // replace orig URL with minified URL from cache if so. | |
| 190 | 391 | if ( ! empty( $minified_url ) ) { |
| 191 | - $newTag = str_replace( $url, $minified_url, $newTag ); | |
| 392 | + // Replace original URL with minified URL from cache. | |
| 393 | + $new_tag = str_replace( $url, $minified_url, $new_tag ); | |
| 394 | + } elseif ( apply_filters( 'autoptimize_filter_ccsjs_remove_empty_minified_url', false ) ) { | |
| 395 | + // Remove the original script tag, because cache content is empty but only if filter | |
| 396 | + // is trued because $minified_url is also false if original JS is minified already. | |
| 397 | + $new_tag = ''; | |
| 192 | 398 | } |
| 193 | 399 | } |
| 194 | 400 | } |
| 195 | 401 | |
| 196 | - if ( $this->ismovable($newTag) ) { | |
| 402 | + // Check if we still need to CDN (esp. for already minified resources). | |
| 403 | + if ( ! empty( $this->cdn_url ) || has_filter( 'autoptimize_filter_base_replace_cdn' ) ) { | |
| 404 | + $new_tag = str_replace( $url, $this->url_replace_cdn( $url ), $new_tag ); | |
| 405 | + } | |
| 406 | + | |
| 407 | + if ( $this->ismovable( $new_tag ) ) { | |
| 197 | 408 | // can be moved, flags and all. |
| 198 | - if ( $this->movetolast($newTag) ) { | |
| 199 | - $this->move['last'][] = $newTag; | |
| 409 | + if ( $this->movetolast( $new_tag ) ) { | |
| 410 | + $this->move['last'][] = $new_tag; | |
| 200 | 411 | } else { |
| 201 | - $this->move['first'][] = $newTag; | |
| 412 | + $this->move['first'][] = $new_tag; | |
| 202 | 413 | } |
| 203 | 414 | } else { |
| 204 | 415 | // cannot be moved, so if flag was added re-inject altered tag immediately. |
| 205 | - if ( $origTag !== $newTag ) { | |
| 206 | - $this->content = str_replace( $origTag, $newTag, $this->content ); | |
| 207 | - $origTag = ''; | |
| 416 | + if ( ( '' !== $new_tag && $orig_tag !== $new_tag ) || ( '' === $new_tag && apply_filters( 'autoptimize_filter_js_remove_empty_files', false ) ) ) { | |
| 417 | + $this->content = str_replace( $orig_tag, $new_tag, $this->content ); | |
| 418 | + $orig_tag = ''; | |
| 208 | 419 | } |
| 209 | 420 | // and forget about the $tag (not to be touched any more). |
| 210 | 421 | $tag = ''; |
| 211 | 422 | } |
| @@ -211,39 +422,57 @@ | ||
| 211 | 422 | } |
| 212 | 423 | } |
| 213 | 424 | } else { |
| 214 | 425 | // Inline script. |
| 215 | - if ( $this->isremovable($tag, $this->jsremovables) ) { | |
| 426 | + if ( $this->isremovable( $tag, $this->jsremovables ) ) { | |
| 216 | 427 | $this->content = str_replace( $tag, '', $this->content ); |
| 217 | 428 | continue; |
| 218 | 429 | } |
| 219 | 430 | |
| 220 | 431 | // unhide comments, as javascript may be wrapped in comment-tags for old times' sake. |
| 221 | - $tag = $this->restore_comments($tag); | |
| 222 | - if ( $this->ismergeable($tag) && $this->include_inline ) { | |
| 223 | - preg_match( '#<script.*>(.*)</script>#Usmi', $tag , $code ); | |
| 224 | - $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1] ); | |
| 225 | - $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code ); | |
| 432 | + $tag = $this->restore_comments( $tag ); | |
| 433 | + if ( $this->ismergeable( $tag ) && $this->include_inline ) { | |
| 434 | + preg_match( '#<script.*>(.*)</script>#Usmi', $tag, $code ); | |
| 435 | + $code = preg_replace( '#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1] ); | |
| 436 | + $code = preg_replace( '/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code ); | |
| 226 | 437 | $this->scripts[] = 'INLINE;' . $code; |
| 227 | 438 | } else { |
| 228 | - // Can we move this? | |
| 229 | - $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag ); | |
| 230 | - if ( $this->ismovable($tag) || '' !== $autoptimize_js_moveable ) { | |
| 231 | - if ( $this->movetolast($tag) || 'last' === $autoptimize_js_moveable ) { | |
| 232 | - $this->move['last'][] = $tag; | |
| 439 | + $_inline_deferable = apply_filters( 'autoptimize_filters_js_inline_deferable', array( 'nonce', 'post_id', 'syntaxhighlighter' ) ); | |
| 440 | + $_inline_dontmove = array_values( array_diff( $this->dontmove, $_inline_deferable ) ); | |
| 441 | + if ( false === $this->defer_inline ) { | |
| 442 | + // Can we move this? | |
| 443 | + $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag ); | |
| 444 | + if ( $this->ismovable( $tag ) || '' !== $autoptimize_js_moveable ) { | |
| 445 | + if ( $this->movetolast( $tag ) || 'last' === $autoptimize_js_moveable ) { | |
| 446 | + $this->move['last'][] = $tag; | |
| 447 | + } else { | |
| 448 | + $this->move['first'][] = $tag; | |
| 449 | + } | |
| 233 | 450 | } else { |
| 234 | - $this->move['first'][] = $tag; | |
| 451 | + $tag = ''; | |
| 235 | 452 | } |
| 453 | + } else if ( str_replace( $_inline_dontmove, '', $tag ) === $tag ) { | |
| 454 | + // defer inline JS by base64 encoding it. | |
| 455 | + // preg_match( '#<script.*>(.*)</script>#Usmi', $tag, $match ); | |
| 456 | + preg_match( '#<script(?:[^>](?!id=))*\s*(?:id=(["\'])([^"\']+)\1)*+[^>]*+>(.*?)<\/script>#is', $tag, $match ); | |
| 457 | + if ( $match[2] ) { | |
| 458 | + $_id = 'id="' . $match[2] . '" '; | |
| 459 | + } else { | |
| 460 | + $_id = ''; | |
| 461 | + } | |
| 462 | + | |
| 463 | + $new_tag = '<script defer ' . $_id . 'src="data:text/javascript;base64,' . base64_encode( $match[3] ) . '"></script>'; | |
| 464 | + $this->content = str_replace( $tag, $new_tag, $this->content ); | |
| 465 | + $tag = ''; | |
| 236 | 466 | } else { |
| 237 | - // We shouldn't touch this. | |
| 238 | 467 | $tag = ''; |
| 239 | 468 | } |
| 240 | 469 | } |
| 241 | 470 | // Re-hide comments to be able to do the removal based on tag from $this->content. |
| 242 | - $tag = $this->hide_comments($tag); | |
| 471 | + $tag = $this->hide_comments( $tag ); | |
| 243 | 472 | } |
| 244 | 473 | |
| 245 | - //Remove the original script tag. | |
| 474 | + // Remove the original script tag. | |
| 246 | 475 | $this->content = str_replace( $tag, '', $this->content ); |
| 247 | 476 | } |
| 248 | 477 | |
| 249 | 478 | return true; |
| @@ -248,9 +477,9 @@ | ||
| 248 | 477 | |
| 249 | 478 | return true; |
| 250 | 479 | } |
| 251 | 480 | |
| 252 | - // No script files, great ;-) | |
| 481 | + // No script files, great ;-) . | |
| 253 | 482 | return false; |
| 254 | 483 | } |
| 255 | 484 | |
| 256 | 485 | /** |
| @@ -264,17 +493,21 @@ | ||
| 264 | 493 | * Everything else should return false. |
| 265 | 494 | * |
| 266 | 495 | * @link https://developer.mozilla.org/en/docs/Web/HTML/Element/script#attr-type |
| 267 | 496 | * |
| 268 | - * @param string $tag | |
| 497 | + * @param string $tag Script node & child(ren). | |
| 269 | 498 | * @return bool |
| 270 | 499 | */ |
| 271 | - public function should_aggregate($tag) | |
| 500 | + public static function should_aggregate( $tag ) | |
| 272 | 501 | { |
| 502 | + if ( empty( $tag ) ) { | |
| 503 | + return false; | |
| 504 | + } | |
| 505 | + | |
| 273 | 506 | // We're only interested in the type attribute of the <script> tag itself, not any possible |
| 274 | 507 | // inline code that might just contain the 'type=' string... |
| 275 | 508 | $tag_parts = array(); |
| 276 | - preg_match( '#<(script[^>]*)>#i', $tag, $tag_parts); | |
| 509 | + preg_match( '#<(script[^>]*)>#i', $tag, $tag_parts ); | |
| 277 | 510 | $tag_without_contents = null; |
| 278 | 511 | if ( ! empty( $tag_parts[1] ) ) { |
| 279 | 512 | $tag_without_contents = $tag_parts[1]; |
| 280 | 513 | } |
| @@ -293,15 +526,21 @@ | ||
| 293 | 526 | |
| 294 | 527 | return $should_aggregate; |
| 295 | 528 | } |
| 296 | 529 | |
| 297 | - //Joins and optimizes JS | |
| 530 | + /** | |
| 531 | + * Joins and optimizes JS. | |
| 532 | + */ | |
| 298 | 533 | public function minify() |
| 299 | 534 | { |
| 300 | 535 | foreach ( $this->scripts as $script ) { |
| 301 | - // TODO/FIXME: some duplicate code here, can be reduced/simplified | |
| 536 | + if ( empty( $script ) ) { | |
| 537 | + continue; | |
| 538 | + } | |
| 539 | + | |
| 540 | + // TODO/FIXME: some duplicate code here, can be reduced/simplified. | |
| 302 | 541 | if ( preg_match( '#^INLINE;#', $script ) ) { |
| 303 | - // Inline script | |
| 542 | + // Inline script. | |
| 304 | 543 | $script = preg_replace( '#^INLINE;#', '', $script ); |
| 305 | 544 | $script = rtrim( $script, ";\n\t\r" ) . ';'; |
| 306 | 545 | // Add try-catch? |
| 307 | 546 | if ( $this->trycatch ) { |
| @@ -308,14 +547,14 @@ | ||
| 308 | 547 | $script = 'try{' . $script . '}catch(e){}'; |
| 309 | 548 | } |
| 310 | 549 | $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' ); |
| 311 | 550 | if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscript ) ) { |
| 312 | - $script = $tmpscript; | |
| 551 | + $script = $tmpscript; | |
| 313 | 552 | $this->alreadyminified = true; |
| 314 | 553 | } |
| 315 | 554 | $this->jscode .= "\n" . $script; |
| 316 | 555 | } else { |
| 317 | - // External script | |
| 556 | + // External script. | |
| 318 | 557 | if ( false !== $script && file_exists( $script ) && is_readable( $script ) ) { |
| 319 | 558 | $scriptsrc = file_get_contents( $script ); |
| 320 | 559 | $scriptsrc = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc ); |
| 321 | 560 | $scriptsrc = rtrim( $scriptsrc, ";\n\t\r" ) . ';'; |
| @@ -324,23 +563,21 @@ | ||
| 324 | 563 | $scriptsrc = 'try{' . $scriptsrc . '}catch(e){}'; |
| 325 | 564 | } |
| 326 | 565 | $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script ); |
| 327 | 566 | if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscriptsrc ) ) { |
| 328 | - $scriptsrc = $tmpscriptsrc; | |
| 567 | + $scriptsrc = $tmpscriptsrc; | |
| 329 | 568 | $this->alreadyminified = true; |
| 330 | - } else if ( $this->can_inject_late($script) ) { | |
| 331 | - $scriptsrc = self::build_injectlater_marker($script, md5($scriptsrc)); | |
| 569 | + } elseif ( $this->can_inject_late( $script ) ) { | |
| 570 | + $scriptsrc = self::build_injectlater_marker( $script, md5( $scriptsrc ) ); | |
| 332 | 571 | } |
| 333 | 572 | $this->jscode .= "\n" . $scriptsrc; |
| 334 | - }/*else{ | |
| 335 | - //Couldn't read JS. Maybe getpath isn't working? | |
| 336 | - }*/ | |
| 573 | + } | |
| 337 | 574 | } |
| 338 | 575 | } |
| 339 | 576 | |
| 340 | - // Check for already-minified code | |
| 577 | + // Check for already-minified code. | |
| 341 | 578 | $this->md5hash = md5( $this->jscode ); |
| 342 | - $ccheck = new autoptimizeCache($this->md5hash, 'js'); | |
| 579 | + $ccheck = new autoptimizeCache( $this->md5hash, 'js' ); | |
| 343 | 580 | if ( $ccheck->check() ) { |
| 344 | 581 | $this->jscode = $ccheck->retrieve(); |
| 345 | 582 | return true; |
| 346 | 583 | } |
| @@ -366,36 +603,40 @@ | ||
| 366 | 603 | $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
| 367 | 604 | return true; |
| 368 | 605 | } |
| 369 | 606 | |
| 370 | - // Caches the JS in uncompressed, deflated and gzipped form. | |
| 607 | + /** | |
| 608 | + * Caches the JS in uncompressed, deflated and gzipped form. | |
| 609 | + */ | |
| 371 | 610 | public function cache() |
| 372 | 611 | { |
| 373 | - $cache = new autoptimizeCache($this->md5hash, 'js'); | |
| 612 | + $cache = new autoptimizeCache( $this->md5hash, 'js' ); | |
| 374 | 613 | if ( ! $cache->check() ) { |
| 375 | - // Cache our code | |
| 376 | - $cache->cache($this->jscode, 'text/javascript'); | |
| 614 | + // Cache our code. | |
| 615 | + $cache->cache( $this->jscode, 'text/javascript' ); | |
| 377 | 616 | } |
| 378 | 617 | $this->url = AUTOPTIMIZE_CACHE_URL . $cache->getname(); |
| 379 | - $this->url = $this->url_replace_cdn($this->url); | |
| 618 | + $this->url = $this->url_replace_cdn( $this->url ); | |
| 380 | 619 | } |
| 381 | 620 | |
| 382 | - // Returns the content | |
| 621 | + /** | |
| 622 | + * Returns the content. | |
| 623 | + */ | |
| 383 | 624 | public function getcontent() |
| 384 | 625 | { |
| 385 | - // Restore the full content | |
| 626 | + // Restore the full content. | |
| 386 | 627 | if ( ! empty( $this->restofcontent ) ) { |
| 387 | - $this->content .= $this->restofcontent; | |
| 628 | + $this->content .= $this->restofcontent; | |
| 388 | 629 | $this->restofcontent = ''; |
| 389 | 630 | } |
| 390 | 631 | |
| 391 | - // Add the scripts taking forcehead/ deferred (default) into account | |
| 632 | + // Add the scripts taking forcehead/ deferred (default) into account. | |
| 392 | 633 | if ( $this->forcehead ) { |
| 393 | - $replaceTag = array( '</head>', 'before' ); | |
| 394 | - $defer = ''; | |
| 634 | + $replace_tag = array( '</head>', 'before' ); | |
| 635 | + $defer = ''; | |
| 395 | 636 | } else { |
| 396 | - $replaceTag = array( '</body>', 'before' ); | |
| 397 | - $defer = 'defer '; | |
| 637 | + $replace_tag = array( '</body>', 'before' ); | |
| 638 | + $defer = 'defer '; | |
| 398 | 639 | } |
| 399 | 640 | |
| 400 | 641 | $defer = apply_filters( 'autoptimize_filter_js_defer', $defer ); |
| 401 | 642 | $type_js = ''; |
| @@ -405,16 +646,16 @@ | ||
| 405 | 646 | |
| 406 | 647 | $bodyreplacementpayload = '<script ' . $type_js . $defer . 'src="' . $this->url . '"></script>'; |
| 407 | 648 | $bodyreplacementpayload = apply_filters( 'autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload ); |
| 408 | 649 | |
| 409 | - $bodyreplacement = implode( '', $this->move['first'] ); | |
| 650 | + $bodyreplacement = implode( '', $this->move['first'] ); | |
| 410 | 651 | $bodyreplacement .= $bodyreplacementpayload; |
| 411 | 652 | $bodyreplacement .= implode( '', $this->move['last'] ); |
| 412 | 653 | |
| 413 | - $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag ); | |
| 654 | + $replace_tag = apply_filters( 'autoptimize_filter_js_replacetag', $replace_tag ); | |
| 414 | 655 | |
| 415 | 656 | if ( strlen( $this->jscode ) > 0 ) { |
| 416 | - $this->inject_in_html( $bodyreplacement, $replaceTag ); | |
| 657 | + $this->inject_in_html( $bodyreplacement, $replace_tag ); | |
| 417 | 658 | } |
| 418 | 659 | |
| 419 | 660 | // Restore comments. |
| 420 | 661 | $this->content = $this->restore_comments( $this->content ); |
| @@ -428,86 +669,98 @@ | ||
| 428 | 669 | // Return the modified HTML. |
| 429 | 670 | return $this->content; |
| 430 | 671 | } |
| 431 | 672 | |
| 432 | - // Checks against the white- and blacklists | |
| 433 | - private function ismergeable($tag) | |
| 673 | + /** | |
| 674 | + * Checks against the allow- and blocklists. | |
| 675 | + * | |
| 676 | + * @param string $tag JS tag. | |
| 677 | + */ | |
| 678 | + private function ismergeable( $tag ) | |
| 434 | 679 | { |
| 435 | - if ( ! $this->aggregate ) { | |
| 680 | + if ( empty( $tag ) || ! $this->aggregate ) { | |
| 436 | 681 | return false; |
| 437 | 682 | } |
| 438 | 683 | |
| 439 | - if ( ! empty( $this->whitelist ) ) { | |
| 440 | - foreach ( $this->whitelist as $match ) { | |
| 441 | - if (false !== strpos( $tag, $match ) ) { | |
| 684 | + if ( ! empty( $this->allowlist ) ) { | |
| 685 | + foreach ( $this->allowlist as $match ) { | |
| 686 | + if ( false !== strpos( $tag, $match ) ) { | |
| 442 | 687 | return true; |
| 443 | 688 | } |
| 444 | 689 | } |
| 445 | - // no match with whitelist | |
| 690 | + // No match with allowlist. | |
| 446 | 691 | return false; |
| 447 | 692 | } else { |
| 448 | - foreach($this->domove as $match) { | |
| 693 | + foreach ( $this->domove as $match ) { | |
| 449 | 694 | if ( false !== strpos( $tag, $match ) ) { |
| 450 | - // Matched something | |
| 695 | + // Matched something. | |
| 451 | 696 | return false; |
| 452 | 697 | } |
| 453 | 698 | } |
| 454 | 699 | |
| 455 | - if ( $this->movetolast($tag) ) { | |
| 700 | + if ( $this->movetolast( $tag ) ) { | |
| 456 | 701 | return false; |
| 457 | 702 | } |
| 458 | 703 | |
| 459 | - foreach( $this->dontmove as $match ) { | |
| 704 | + foreach ( $this->dontmove as $match ) { | |
| 460 | 705 | if ( false !== strpos( $tag, $match ) ) { |
| 461 | - // Matched something | |
| 706 | + // Matched something. | |
| 462 | 707 | return false; |
| 463 | 708 | } |
| 464 | 709 | } |
| 465 | 710 | |
| 466 | - // If we're here it's safe to merge | |
| 711 | + // If we're here it's safe to merge. | |
| 467 | 712 | return true; |
| 468 | 713 | } |
| 469 | 714 | } |
| 470 | 715 | |
| 471 | - // Checks agains the blacklist | |
| 472 | - private function ismovable($tag) | |
| 716 | + /** | |
| 717 | + * Checks agains the blocklist. | |
| 718 | + * | |
| 719 | + * @param string $tag tag to check for blocklist (exclusions). | |
| 720 | + */ | |
| 721 | + private function ismovable( $tag ) | |
| 473 | 722 | { |
| 474 | - if ( true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) { | |
| 723 | + if ( empty( $tag ) || true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) { | |
| 475 | 724 | return false; |
| 476 | 725 | } |
| 477 | 726 | |
| 478 | 727 | foreach ( $this->domove as $match ) { |
| 479 | 728 | if ( false !== strpos( $tag, $match ) ) { |
| 480 | - // Matched something | |
| 729 | + // Matched something. | |
| 481 | 730 | return true; |
| 482 | 731 | } |
| 483 | 732 | } |
| 484 | 733 | |
| 485 | - if ( $this->movetolast($tag) ) { | |
| 734 | + if ( $this->movetolast( $tag ) ) { | |
| 486 | 735 | return true; |
| 487 | 736 | } |
| 488 | 737 | |
| 489 | 738 | foreach ( $this->dontmove as $match ) { |
| 490 | 739 | if ( false !== strpos( $tag, $match ) ) { |
| 491 | - // Matched something | |
| 740 | + // Matched something. | |
| 492 | 741 | return false; |
| 493 | 742 | } |
| 494 | 743 | } |
| 495 | 744 | |
| 496 | - // If we're here it's safe to move | |
| 745 | + // If we're here it's safe to move. | |
| 497 | 746 | return true; |
| 498 | 747 | } |
| 499 | 748 | |
| 500 | - private function movetolast($tag) | |
| 749 | + private function movetolast( $tag ) | |
| 501 | 750 | { |
| 751 | + if ( empty( $tag ) ) { | |
| 752 | + return false; | |
| 753 | + } | |
| 754 | + | |
| 502 | 755 | foreach ( $this->domovelast as $match ) { |
| 503 | 756 | if ( false !== strpos( $tag, $match ) ) { |
| 504 | - // Matched, return true | |
| 757 | + // Matched, return true. | |
| 505 | 758 | return true; |
| 506 | 759 | } |
| 507 | 760 | } |
| 508 | 761 | |
| 509 | - // Should be in 'first' | |
| 762 | + // Should be in 'first'. | |
| 510 | 763 | return false; |
| 511 | 764 | } |
| 512 | 765 | |
| 513 | 766 | /** |
| @@ -513,24 +766,24 @@ | ||
| 513 | 766 | /** |
| 514 | 767 | * Determines wheter a <script> $tag can be excluded from minification (as already minified) based on: |
| 515 | 768 | * - inject_min_late being active |
| 516 | 769 | * - filename ending in `min.js` |
| 517 | - * - filename matching `js/jquery/jquery.js` (wordpress core jquery, is minified) | |
| 770 | + * - filename matching `js/jquery/jquery.js` (WordPress core jquery, is minified) | |
| 518 | 771 | * - filename matching one passed in the consider minified filter |
| 519 | 772 | * |
| 520 | - * @param string $jsPath | |
| 773 | + * @param string $js_path Path to JS file. | |
| 521 | 774 | * @return bool |
| 522 | 775 | */ |
| 523 | - private function can_inject_late($jsPath) { | |
| 776 | + private function can_inject_late( $js_path ) { | |
| 524 | 777 | $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false ); |
| 525 | 778 | if ( true !== $this->inject_min_late ) { |
| 526 | - // late-inject turned off | |
| 779 | + // late-inject turned off. | |
| 527 | 780 | return false; |
| 528 | - } else if ( ( false === strpos( $jsPath, 'min.js' ) ) && ( false === strpos( $jsPath, 'wp-includes/js/jquery/jquery.js' ) ) && ( str_replace( $consider_minified_array, '', $jsPath ) === $jsPath ) ) { | |
| 529 | - // file not minified based on filename & filter | |
| 781 | + } elseif ( ( false === strpos( $js_path, 'min.js' ) ) && ( false === strpos( $js_path, 'wp-includes/js/jquery/jquery.js' ) ) && ( str_replace( $consider_minified_array, '', $js_path ) === $js_path ) ) { | |
| 782 | + // file not minified based on filename & filter. | |
| 530 | 783 | return false; |
| 531 | 784 | } else { |
| 532 | - // phew, all is safe, we can late-inject | |
| 785 | + // phew, all is safe, we can late-inject. | |
| 533 | 786 | return true; |
| 534 | 787 | } |
| 535 | 788 | } |
| 536 | 789 | |
| @@ -547,9 +800,9 @@ | ||
| 547 | 800 | /** |
| 548 | 801 | * Minifies a single local js file and returns its (cached) url. |
| 549 | 802 | * |
| 550 | 803 | * @param string $filepath Filepath. |
| 551 | - * @param bool $cache_miss Optional. Force a cache miss. Default false. | |
| 804 | + * @param bool $cache_miss Optional. Force a cache miss. Default false. | |
| 552 | 805 | * |
| 553 | 806 | * @return bool|string Url pointing to the minified js file or false. |
| 554 | 807 | */ |
| 555 | 808 | public function minify_single( $filepath, $cache_miss = false ) |
| @@ -566,8 +819,17 @@ | ||
| 566 | 819 | |
| 567 | 820 | // If not in cache already, minify... |
| 568 | 821 | if ( ! $cache->check() || $cache_miss ) { |
| 569 | 822 | $contents = trim( JSMin::minify( $contents ) ); |
| 823 | + | |
| 824 | + // Check if minified cache content is empty. | |
| 825 | + if ( empty( $contents ) ) { | |
| 826 | + return false; | |
| 827 | + } | |
| 828 | + | |
| 829 | + // Filter contents of excluded minified CSS. | |
| 830 | + $contents = apply_filters( 'autoptimize_filter_js_single_after_minify', $contents ); | |
| 831 | + | |
| 570 | 832 | // Store in cache. |
| 571 | 833 | $cache->cache( $contents, 'text/javascript' ); |
| 572 | 834 | } |
| 573 | 835 | |
