futtta /
autoptimize
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Class for CSS optimization. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -48,53 +48,53 @@ discard block |
||
| 48 | 48 | // public $cdn_url; // Used all over the place implicitly, so will have to be either public or protected :/ . |
| 49 | 49 | |
| 50 | 50 | // Reads the page and collects style tags. |
| 51 | - public function read( $options ) |
|
| 51 | + public function read($options) |
|
| 52 | 52 | { |
| 53 | - $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
|
| 54 | - if ( $noptimizeCSS ) { |
|
| 53 | + $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content); |
|
| 54 | + if ($noptimizeCSS) { |
|
| 55 | 55 | return false; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content ); |
|
| 59 | - if ( ! empty( $whitelistCSS ) ) { |
|
| 60 | - $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelistCSS ) ) ); |
|
| 58 | + $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content); |
|
| 59 | + if (!empty($whitelistCSS)) { |
|
| 60 | + $this->whitelist = array_filter(array_map('trim', explode(',', $whitelistCSS))); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables', '' ); |
|
| 64 | - if ( ! empty( $removableCSS ) ) { |
|
| 65 | - $this->cssremovables = array_filter( array_map( 'trim', explode( ',', $removableCSS ) ) ); |
|
| 63 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', ''); |
|
| 64 | + if (!empty($removableCSS)) { |
|
| 65 | + $this->cssremovables = array_filter(array_map('trim', explode(',', $removableCSS))); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - $this->cssinlinesize = apply_filters( 'autoptimize_filter_css_inlinesize', 256 ); |
|
| 68 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256); |
|
| 69 | 69 | |
| 70 | 70 | // filter to "late inject minified CSS", default to true for now (it is faster). |
| 71 | - $this->inject_min_late = apply_filters( 'autoptimize_filter_css_inject_min_late', true ); |
|
| 71 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true); |
|
| 72 | 72 | |
| 73 | 73 | // Remove everything that's not the header. |
| 74 | - if ( apply_filters( 'autoptimize_filter_css_justhead', $options['justhead'] ) ) { |
|
| 75 | - $content = explode( '</head>', $this->content, 2 ); |
|
| 76 | - $this->content = $content[0] . '</head>'; |
|
| 74 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead'])) { |
|
| 75 | + $content = explode('</head>', $this->content, 2); |
|
| 76 | + $this->content = $content[0].'</head>'; |
|
| 77 | 77 | $this->restofcontent = $content[1]; |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | // Determine whether we're doing CSS-files aggregation or not. |
| 81 | - if ( isset( $options['aggregate'] ) && ! $options['aggregate'] ) { |
|
| 81 | + if (isset($options['aggregate']) && !$options['aggregate']) { |
|
| 82 | 82 | $this->aggregate = false; |
| 83 | 83 | } |
| 84 | 84 | // Returning true for "dontaggregate" turns off aggregation. |
| 85 | - if ( $this->aggregate && apply_filters( 'autoptimize_filter_css_dontaggregate', false ) ) { |
|
| 85 | + if ($this->aggregate && apply_filters('autoptimize_filter_css_dontaggregate', false)) { |
|
| 86 | 86 | $this->aggregate = false; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | // include inline? |
| 90 | - if ( apply_filters( 'autoptimize_css_include_inline', $options['include_inline'] ) ) { |
|
| 90 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline'])) { |
|
| 91 | 91 | $this->include_inline = true; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // List of CSS strings which are excluded from autoptimization. |
| 95 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $options['css_exclude'], $this->content ); |
|
| 96 | - if ( '' !== $excludeCSS ) { |
|
| 97 | - $this->dontmove = array_filter( array_map( 'trim', explode( ',', $excludeCSS ) ) ); |
|
| 95 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $options['css_exclude'], $this->content); |
|
| 96 | + if ('' !== $excludeCSS) { |
|
| 97 | + $this->dontmove = array_filter(array_map('trim', explode(',', $excludeCSS))); |
|
| 98 | 98 | } else { |
| 99 | 99 | $this->dontmove = array(); |
| 100 | 100 | } |
@@ -105,16 +105,16 @@ discard block |
||
| 105 | 105 | // Should we defer css? |
| 106 | 106 | // value: true / false. |
| 107 | 107 | $this->defer = $options['defer']; |
| 108 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content ); |
|
| 108 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content); |
|
| 109 | 109 | |
| 110 | 110 | // Should we inline while deferring? |
| 111 | 111 | // value: inlined CSS. |
| 112 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content ); |
|
| 112 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content); |
|
| 113 | 113 | |
| 114 | 114 | // Should we inline? |
| 115 | 115 | // value: true / false. |
| 116 | 116 | $this->inline = $options['inline']; |
| 117 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content ); |
|
| 117 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content); |
|
| 118 | 118 | |
| 119 | 119 | // Store cdn url. |
| 120 | 120 | $this->cdn_url = $options['cdn_url']; |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $this->datauris = $options['datauris']; |
| 124 | 124 | |
| 125 | 125 | // noptimize me. |
| 126 | - $this->content = $this->hide_noptimize( $this->content ); |
|
| 126 | + $this->content = $this->hide_noptimize($this->content); |
|
| 127 | 127 | |
| 128 | 128 | // Exclude (no)script, as those may contain CSS which should be left as is. |
| 129 | 129 | $this->content = $this->replace_contents_with_marker_if_exists( |
@@ -134,26 +134,26 @@ discard block |
||
| 134 | 134 | ); |
| 135 | 135 | |
| 136 | 136 | // Save IE hacks. |
| 137 | - $this->content = $this->hide_iehacks( $this->content ); |
|
| 137 | + $this->content = $this->hide_iehacks($this->content); |
|
| 138 | 138 | |
| 139 | 139 | // Hide HTML comments. |
| 140 | - $this->content = $this->hide_comments( $this->content ); |
|
| 140 | + $this->content = $this->hide_comments($this->content); |
|
| 141 | 141 | |
| 142 | 142 | // Get <style> and <link>. |
| 143 | - if ( preg_match_all( '#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches ) ) { |
|
| 143 | + if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) { |
|
| 144 | 144 | |
| 145 | - foreach ( $matches[0] as $tag ) { |
|
| 146 | - if ( $this->isremovable( $tag, $this->cssremovables ) ) { |
|
| 147 | - $this->content = str_replace( $tag, '', $this->content ); |
|
| 148 | - } elseif ( $this->ismovable( $tag ) ) { |
|
| 145 | + foreach ($matches[0] as $tag) { |
|
| 146 | + if ($this->isremovable($tag, $this->cssremovables)) { |
|
| 147 | + $this->content = str_replace($tag, '', $this->content); |
|
| 148 | + } elseif ($this->ismovable($tag)) { |
|
| 149 | 149 | // Get the media. |
| 150 | - if ( false !== strpos( $tag, 'media=' ) ) { |
|
| 151 | - preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias ); |
|
| 152 | - $medias = explode( ',', $medias[1] ); |
|
| 150 | + if (false !== strpos($tag, 'media=')) { |
|
| 151 | + preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias); |
|
| 152 | + $medias = explode(',', $medias[1]); |
|
| 153 | 153 | $media = array(); |
| 154 | - foreach ( $medias as $elem ) { |
|
| 154 | + foreach ($medias as $elem) { |
|
| 155 | 155 | /* $media[] = current(explode(' ',trim($elem),2)); */ |
| 156 | - if ( empty( $elem ) ) { |
|
| 156 | + if (empty($elem)) { |
|
| 157 | 157 | $elem = 'all'; |
| 158 | 158 | } |
| 159 | 159 | |
@@ -161,59 +161,59 @@ discard block |
||
| 161 | 161 | } |
| 162 | 162 | } else { |
| 163 | 163 | // No media specified - applies to all. |
| 164 | - $media = array( 'all' ); |
|
| 164 | + $media = array('all'); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - $media = apply_filters( 'autoptimize_filter_css_tagmedia', $media, $tag ); |
|
| 167 | + $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag); |
|
| 168 | 168 | |
| 169 | - if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) { |
|
| 169 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) { |
|
| 170 | 170 | // <link>. |
| 171 | - $url = current( explode( '?', $source[2], 2 ) ); |
|
| 172 | - $path = $this->getpath( $url ); |
|
| 171 | + $url = current(explode('?', $source[2], 2)); |
|
| 172 | + $path = $this->getpath($url); |
|
| 173 | 173 | |
| 174 | - if ( false !== $path && preg_match( '#\.css$#', $path ) ) { |
|
| 174 | + if (false !== $path && preg_match('#\.css$#', $path)) { |
|
| 175 | 175 | // Good link. |
| 176 | - $this->css[] = array( $media, $path ); |
|
| 176 | + $this->css[] = array($media, $path); |
|
| 177 | 177 | } else { |
| 178 | 178 | // Link is dynamic (.php etc). |
| 179 | 179 | $tag = ''; |
| 180 | 180 | } |
| 181 | 181 | } else { |
| 182 | 182 | // Inline css in style tags can be wrapped in comment tags, so restore comments. |
| 183 | - $tag = $this->restore_comments( $tag ); |
|
| 184 | - preg_match( '#<style.*>(.*)</style>#Usmi', $tag, $code ); |
|
| 183 | + $tag = $this->restore_comments($tag); |
|
| 184 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code); |
|
| 185 | 185 | |
| 186 | 186 | // And re-hide them to be able to to the removal based on tag. |
| 187 | - $tag = $this->hide_comments( $tag ); |
|
| 187 | + $tag = $this->hide_comments($tag); |
|
| 188 | 188 | |
| 189 | - if ( $this->include_inline ) { |
|
| 190 | - $code = preg_replace( '#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1] ); |
|
| 191 | - $this->css[] = array( $media, 'INLINE;' . $code ); |
|
| 189 | + if ($this->include_inline) { |
|
| 190 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]); |
|
| 191 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 192 | 192 | } else { |
| 193 | 193 | $tag = ''; |
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | // Remove the original style tag. |
| 198 | - $this->content = str_replace( $tag, '', $this->content ); |
|
| 198 | + $this->content = str_replace($tag, '', $this->content); |
|
| 199 | 199 | } else { |
| 200 | 200 | // Excluded CSS, minify if getpath and filter says so... |
| 201 | - if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) { |
|
| 202 | - $exploded_url = explode( '?', $source[2], 2 ); |
|
| 201 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) { |
|
| 202 | + $exploded_url = explode('?', $source[2], 2); |
|
| 203 | 203 | $url = $exploded_url[0]; |
| 204 | - $path = $this->getpath( $url ); |
|
| 204 | + $path = $this->getpath($url); |
|
| 205 | 205 | |
| 206 | - if ( $path && apply_filters( 'autoptimize_filter_css_minify_excluded', true, $url ) ) { |
|
| 207 | - $minified_url = $this->minify_single( $path ); |
|
| 208 | - if ( ! empty( $minified_url ) ) { |
|
| 206 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded', true, $url)) { |
|
| 207 | + $minified_url = $this->minify_single($path); |
|
| 208 | + if (!empty($minified_url)) { |
|
| 209 | 209 | // Replace orig URL with cached minified URL. |
| 210 | - $new_tag = str_replace( $url, $minified_url, $tag ); |
|
| 210 | + $new_tag = str_replace($url, $minified_url, $tag); |
|
| 211 | 211 | } else { |
| 212 | 212 | $new_tag = $tag; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | // Defer single CSS if "inline & defer" is ON and there is inline CSS. |
| 216 | - if ( $this->defer && ! empty( $this->defer_inline ) ) { |
|
| 216 | + if ($this->defer && !empty($this->defer_inline)) { |
|
| 217 | 217 | // Get/ set (via filter) the JS to be triggers onload of the preloaded CSS. |
| 218 | 218 | $_preload_onload = apply_filters( |
| 219 | 219 | 'autoptimize_filter_css_preload_onload', |
@@ -221,18 +221,18 @@ discard block |
||
| 221 | 221 | $url |
| 222 | 222 | ); |
| 223 | 223 | // Adapt original <link> element for CSS to be preloaded and add <noscript>-version for fallback. |
| 224 | - $new_tag = '<noscript>' . $new_tag . '</noscript>' . str_replace( |
|
| 224 | + $new_tag = '<noscript>'.$new_tag.'</noscript>'.str_replace( |
|
| 225 | 225 | array( |
| 226 | 226 | "rel='stylesheet'", |
| 227 | 227 | 'rel="stylesheet"', |
| 228 | 228 | ), |
| 229 | - "rel='preload' as='style' onload=\"" . $_preload_onload . "\"", |
|
| 229 | + "rel='preload' as='style' onload=\"".$_preload_onload."\"", |
|
| 230 | 230 | $new_tag |
| 231 | 231 | ); |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | // And replace! |
| 235 | - $this->content = str_replace( $tag, $new_tag, $this->content ); |
|
| 235 | + $this->content = str_replace($tag, $new_tag, $this->content); |
|
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | } |
@@ -251,22 +251,22 @@ discard block |
||
| 251 | 251 | * @param string $path |
| 252 | 252 | * @return boolean |
| 253 | 253 | */ |
| 254 | - private function is_datauri_candidate( $path ) |
|
| 254 | + private function is_datauri_candidate($path) |
|
| 255 | 255 | { |
| 256 | 256 | // Call only once since it's called from a loop. |
| 257 | 257 | static $max_size = null; |
| 258 | - if ( null === $max_size ) { |
|
| 258 | + if (null === $max_size) { |
|
| 259 | 259 | $max_size = $this->get_datauri_maxsize(); |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | - if ( $path && preg_match( '#\.(jpe?g|png|gif|webp|bmp)$#i', $path ) && |
|
| 263 | - file_exists( $path ) && is_readable( $path ) && filesize( $path ) <= $max_size ) { |
|
| 262 | + if ($path && preg_match('#\.(jpe?g|png|gif|webp|bmp)$#i', $path) && |
|
| 263 | + file_exists($path) && is_readable($path) && filesize($path) <= $max_size) { |
|
| 264 | 264 | |
| 265 | 265 | // Seems we have a candidate. |
| 266 | 266 | $is_candidate = true; |
| 267 | 267 | } else { |
| 268 | 268 | // Filter allows overriding default decision (which checks for local file existence). |
| 269 | - $is_candidate = apply_filters( 'autoptimize_filter_css_is_datauri_candidate', false, $path ); |
|
| 269 | + $is_candidate = apply_filters('autoptimize_filter_css_is_datauri_candidate', false, $path); |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | return $is_candidate; |
@@ -291,29 +291,29 @@ discard block |
||
| 291 | 291 | * of thing you're probably better of building assets completely |
| 292 | 292 | * outside of WordPress anyway. |
| 293 | 293 | */ |
| 294 | - if ( null === $max_size ) { |
|
| 295 | - $max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', 4096 ); |
|
| 294 | + if (null === $max_size) { |
|
| 295 | + $max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', 4096); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | return $max_size; |
| 299 | 299 | } |
| 300 | 300 | |
| 301 | - private function check_datauri_exclude_list( $url ) |
|
| 301 | + private function check_datauri_exclude_list($url) |
|
| 302 | 302 | { |
| 303 | 303 | static $exclude_list = null; |
| 304 | 304 | $no_datauris = array(); |
| 305 | 305 | |
| 306 | 306 | // Again, skip doing certain stuff repeatedly when loop-called. |
| 307 | - if ( null === $exclude_list ) { |
|
| 308 | - $exclude_list = apply_filters( 'autoptimize_filter_css_datauri_exclude', '' ); |
|
| 309 | - $no_datauris = array_filter( array_map( 'trim', explode( ',', $exclude_list ) ) ); |
|
| 307 | + if (null === $exclude_list) { |
|
| 308 | + $exclude_list = apply_filters('autoptimize_filter_css_datauri_exclude', ''); |
|
| 309 | + $no_datauris = array_filter(array_map('trim', explode(',', $exclude_list))); |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | $matched = false; |
| 313 | 313 | |
| 314 | - if ( ! empty( $exclude_list ) ) { |
|
| 315 | - foreach ( $no_datauris as $no_datauri ) { |
|
| 316 | - if ( false !== strpos( $url, $no_datauri ) ) { |
|
| 314 | + if (!empty($exclude_list)) { |
|
| 315 | + foreach ($no_datauris as $no_datauri) { |
|
| 316 | + if (false !== strpos($url, $no_datauri)) { |
|
| 317 | 317 | $matched = true; |
| 318 | 318 | break; |
| 319 | 319 | } |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | return $matched; |
| 324 | 324 | } |
| 325 | 325 | |
| 326 | - private function build_or_get_datauri_image( $path ) |
|
| 326 | + private function build_or_get_datauri_image($path) |
|
| 327 | 327 | { |
| 328 | 328 | /** |
| 329 | 329 | * TODO/FIXME: document the required return array format, or better yet, |
@@ -332,27 +332,27 @@ discard block |
||
| 332 | 332 | */ |
| 333 | 333 | |
| 334 | 334 | // Allows short-circuiting datauri generation for an image. |
| 335 | - $result = apply_filters( 'autoptimize_filter_css_datauri_image', array(), $path ); |
|
| 336 | - if ( ! empty( $result ) ) { |
|
| 337 | - if ( is_array( $result ) && isset( $result['full'] ) && isset( $result['base64data'] ) ) { |
|
| 335 | + $result = apply_filters('autoptimize_filter_css_datauri_image', array(), $path); |
|
| 336 | + if (!empty($result)) { |
|
| 337 | + if (is_array($result) && isset($result['full']) && isset($result['base64data'])) { |
|
| 338 | 338 | return $result; |
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | - $hash = md5( $path ); |
|
| 343 | - $check = new autoptimizeCache( $hash, 'img' ); |
|
| 344 | - if ( $check->check() ) { |
|
| 342 | + $hash = md5($path); |
|
| 343 | + $check = new autoptimizeCache($hash, 'img'); |
|
| 344 | + if ($check->check()) { |
|
| 345 | 345 | // we have the base64 image in cache. |
| 346 | 346 | $headAndData = $check->retrieve(); |
| 347 | - $_base64data = explode( ';base64,', $headAndData ); |
|
| 347 | + $_base64data = explode(';base64,', $headAndData); |
|
| 348 | 348 | $base64data = $_base64data[1]; |
| 349 | - unset( $_base64data ); |
|
| 349 | + unset($_base64data); |
|
| 350 | 350 | } else { |
| 351 | 351 | // It's an image and we don't have it in cache, get the type by extension. |
| 352 | - $exploded_path = explode( '.', $path ); |
|
| 353 | - $type = end( $exploded_path ); |
|
| 352 | + $exploded_path = explode('.', $path); |
|
| 353 | + $type = end($exploded_path); |
|
| 354 | 354 | |
| 355 | - switch ( $type ) { |
|
| 355 | + switch ($type) { |
|
| 356 | 356 | case 'jpg': |
| 357 | 357 | case 'jpeg': |
| 358 | 358 | $dataurihead = 'data:image/jpeg;base64,'; |
@@ -374,15 +374,15 @@ discard block |
||
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | // Encode the data. |
| 377 | - $base64data = base64_encode( file_get_contents( $path ) ); |
|
| 378 | - $headAndData = $dataurihead . $base64data; |
|
| 377 | + $base64data = base64_encode(file_get_contents($path)); |
|
| 378 | + $headAndData = $dataurihead.$base64data; |
|
| 379 | 379 | |
| 380 | 380 | // Save in cache. |
| 381 | - $check->cache( $headAndData, 'text/plain' ); |
|
| 381 | + $check->cache($headAndData, 'text/plain'); |
|
| 382 | 382 | } |
| 383 | - unset( $check ); |
|
| 383 | + unset($check); |
|
| 384 | 384 | |
| 385 | - return array( 'full' => $headAndData, 'base64data' => $base64data ); |
|
| 385 | + return array('full' => $headAndData, 'base64data' => $base64data); |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
@@ -394,13 +394,13 @@ discard block |
||
| 394 | 394 | * |
| 395 | 395 | * @return string |
| 396 | 396 | */ |
| 397 | - protected static function replace_longest_matches_first( $string, $replacements = array() ) |
|
| 397 | + protected static function replace_longest_matches_first($string, $replacements = array()) |
|
| 398 | 398 | { |
| 399 | - if ( ! empty( $replacements ) ) { |
|
| 399 | + if (!empty($replacements)) { |
|
| 400 | 400 | // Sort the replacements array by key length in desc order (so that the longest strings are replaced first). |
| 401 | - $keys = array_map( 'strlen', array_keys( $replacements ) ); |
|
| 402 | - array_multisort( $keys, SORT_DESC, $replacements ); |
|
| 403 | - $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string ); |
|
| 401 | + $keys = array_map('strlen', array_keys($replacements)); |
|
| 402 | + array_multisort($keys, SORT_DESC, $replacements); |
|
| 403 | + $string = str_replace(array_keys($replacements), array_values($replacements), $string); |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | return $string; |
@@ -416,15 +416,15 @@ discard block |
||
| 416 | 416 | * |
| 417 | 417 | * @return string |
| 418 | 418 | */ |
| 419 | - public function replace_urls( $code = '' ) |
|
| 419 | + public function replace_urls($code = '') |
|
| 420 | 420 | { |
| 421 | 421 | $replacements = array(); |
| 422 | 422 | |
| 423 | - preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches ); |
|
| 424 | - if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) { |
|
| 425 | - foreach ( $url_src_matches[1] as $count => $original_url ) { |
|
| 423 | + preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches); |
|
| 424 | + if (is_array($url_src_matches) && !empty($url_src_matches)) { |
|
| 425 | + foreach ($url_src_matches[1] as $count => $original_url) { |
|
| 426 | 426 | // Removes quotes and other cruft. |
| 427 | - $url = trim( $original_url, " \t\n\r\0\x0B\"'" ); |
|
| 427 | + $url = trim($original_url, " \t\n\r\0\x0B\"'"); |
|
| 428 | 428 | |
| 429 | 429 | /** |
| 430 | 430 | * TODO/FIXME: Add a way for other code / callable to be called here |
@@ -442,17 +442,17 @@ discard block |
||
| 442 | 442 | */ |
| 443 | 443 | |
| 444 | 444 | // Do CDN replacement if needed. |
| 445 | - if ( ! empty( $this->cdn_url ) ) { |
|
| 446 | - $replacement_url = $this->url_replace_cdn( $url ); |
|
| 445 | + if (!empty($this->cdn_url)) { |
|
| 446 | + $replacement_url = $this->url_replace_cdn($url); |
|
| 447 | 447 | // Prepare replacements array. |
| 448 | - $replacements[ $url_src_matches[1][ $count ] ] = str_replace( |
|
| 448 | + $replacements[$url_src_matches[1][$count]] = str_replace( |
|
| 449 | 449 | $original_url, $replacement_url, $url_src_matches[1][$count] |
| 450 | 450 | ); |
| 451 | 451 | } |
| 452 | 452 | } |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - $code = self::replace_longest_matches_first( $code, $replacements ); |
|
| 455 | + $code = self::replace_longest_matches_first($code, $replacements); |
|
| 456 | 456 | |
| 457 | 457 | return $code; |
| 458 | 458 | } |
@@ -465,26 +465,26 @@ discard block |
||
| 465 | 465 | * @param string $code |
| 466 | 466 | * @return string |
| 467 | 467 | */ |
| 468 | - public function hide_fontface_and_maybe_cdn( $code ) |
|
| 468 | + public function hide_fontface_and_maybe_cdn($code) |
|
| 469 | 469 | { |
| 470 | 470 | // Proceed only if @font-face declarations exist within $code. |
| 471 | - preg_match_all( self::FONT_FACE_REGEX, $code, $fontfaces ); |
|
| 472 | - if ( isset( $fontfaces[0] ) ) { |
|
| 471 | + preg_match_all(self::FONT_FACE_REGEX, $code, $fontfaces); |
|
| 472 | + if (isset($fontfaces[0])) { |
|
| 473 | 473 | // Check if we need to cdn fonts or not. |
| 474 | - $do_font_cdn = apply_filters( 'autoptimize_filter_css_fonts_cdn', false ); |
|
| 474 | + $do_font_cdn = apply_filters('autoptimize_filter_css_fonts_cdn', false); |
|
| 475 | 475 | |
| 476 | - foreach ( $fontfaces[0] as $full_match ) { |
|
| 476 | + foreach ($fontfaces[0] as $full_match) { |
|
| 477 | 477 | // Keep original match so we can search/replace it. |
| 478 | 478 | $match_search = $full_match; |
| 479 | 479 | |
| 480 | 480 | // Do font cdn if needed. |
| 481 | - if ( $do_font_cdn ) { |
|
| 482 | - $full_match = $this->replace_urls( $full_match ); |
|
| 481 | + if ($do_font_cdn) { |
|
| 482 | + $full_match = $this->replace_urls($full_match); |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | // Replace declaration with its base64 encoded string. |
| 486 | - $replacement = self::build_marker( 'FONTFACE', $full_match ); |
|
| 487 | - $code = str_replace( $match_search, $replacement, $code ); |
|
| 486 | + $replacement = self::build_marker('FONTFACE', $full_match); |
|
| 487 | + $code = str_replace($match_search, $replacement, $code); |
|
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | 490 | |
@@ -498,16 +498,16 @@ discard block |
||
| 498 | 498 | * @param string $code |
| 499 | 499 | * @return string |
| 500 | 500 | */ |
| 501 | - public function restore_fontface( $code ) |
|
| 501 | + public function restore_fontface($code) |
|
| 502 | 502 | { |
| 503 | - return $this->restore_marked_content( 'FONTFACE', $code ); |
|
| 503 | + return $this->restore_marked_content('FONTFACE', $code); |
|
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | // Re-write (and/or inline) referenced assets. |
| 507 | - public function rewrite_assets( $code ) |
|
| 507 | + public function rewrite_assets($code) |
|
| 508 | 508 | { |
| 509 | 509 | // Handle @font-face rules by hiding and processing them separately. |
| 510 | - $code = $this->hide_fontface_and_maybe_cdn( $code ); |
|
| 510 | + $code = $this->hide_fontface_and_maybe_cdn($code); |
|
| 511 | 511 | |
| 512 | 512 | /** |
| 513 | 513 | * TODO/FIXME: |
@@ -523,30 +523,30 @@ discard block |
||
| 523 | 523 | $url_src_matches = array(); |
| 524 | 524 | $imgreplace = array(); |
| 525 | 525 | // Matches and captures anything specified within the literal `url()` and excludes those containing data: URIs. |
| 526 | - preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches ); |
|
| 527 | - if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) { |
|
| 528 | - foreach ( $url_src_matches[1] as $count => $original_url ) { |
|
| 526 | + preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches); |
|
| 527 | + if (is_array($url_src_matches) && !empty($url_src_matches)) { |
|
| 528 | + foreach ($url_src_matches[1] as $count => $original_url) { |
|
| 529 | 529 | // Removes quotes and other cruft. |
| 530 | - $url = trim( $original_url, " \t\n\r\0\x0B\"'" ); |
|
| 530 | + $url = trim($original_url, " \t\n\r\0\x0B\"'"); |
|
| 531 | 531 | |
| 532 | 532 | // If datauri inlining is turned on, do it. |
| 533 | 533 | $inlined = false; |
| 534 | - if ( $this->datauris ) { |
|
| 534 | + if ($this->datauris) { |
|
| 535 | 535 | $iurl = $url; |
| 536 | - if ( false !== strpos( $iurl, '?' ) ) { |
|
| 537 | - $iurl = strtok( $iurl, '?' ); |
|
| 536 | + if (false !== strpos($iurl, '?')) { |
|
| 537 | + $iurl = strtok($iurl, '?'); |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | - $ipath = $this->getpath( $iurl ); |
|
| 540 | + $ipath = $this->getpath($iurl); |
|
| 541 | 541 | |
| 542 | - $excluded = $this->check_datauri_exclude_list( $ipath ); |
|
| 543 | - if ( ! $excluded ) { |
|
| 544 | - $is_datauri_candidate = $this->is_datauri_candidate( $ipath ); |
|
| 545 | - if ( $is_datauri_candidate ) { |
|
| 546 | - $datauri = $this->build_or_get_datauri_image( $ipath ); |
|
| 542 | + $excluded = $this->check_datauri_exclude_list($ipath); |
|
| 543 | + if (!$excluded) { |
|
| 544 | + $is_datauri_candidate = $this->is_datauri_candidate($ipath); |
|
| 545 | + if ($is_datauri_candidate) { |
|
| 546 | + $datauri = $this->build_or_get_datauri_image($ipath); |
|
| 547 | 547 | $base64data = $datauri['base64data']; |
| 548 | 548 | // Add it to the list for replacement. |
| 549 | - $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace( |
|
| 549 | + $imgreplace[$url_src_matches[1][$count]] = str_replace( |
|
| 550 | 550 | $original_url, |
| 551 | 551 | $datauri['full'], |
| 552 | 552 | $url_src_matches[1][$count] |
@@ -562,20 +562,20 @@ discard block |
||
| 562 | 562 | * inlining isn't turned on, or if a resource is skipped from |
| 563 | 563 | * being inlined for whatever reason above. |
| 564 | 564 | */ |
| 565 | - if ( ! $inlined && ( ! empty( $this->cdn_url ) || has_filter( 'autoptimize_filter_base_replace_cdn' ) ) ) { |
|
| 565 | + if (!$inlined && (!empty($this->cdn_url) || has_filter('autoptimize_filter_base_replace_cdn'))) { |
|
| 566 | 566 | // Just do the "simple" CDN replacement. |
| 567 | - $replacement_url = $this->url_replace_cdn( $url ); |
|
| 568 | - $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace( |
|
| 567 | + $replacement_url = $this->url_replace_cdn($url); |
|
| 568 | + $imgreplace[$url_src_matches[1][$count]] = str_replace( |
|
| 569 | 569 | $original_url, $replacement_url, $url_src_matches[1][$count] |
| 570 | 570 | ); |
| 571 | 571 | } |
| 572 | 572 | } |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | - $code = self::replace_longest_matches_first( $code, $imgreplace ); |
|
| 575 | + $code = self::replace_longest_matches_first($code, $imgreplace); |
|
| 576 | 576 | |
| 577 | 577 | // Replace back font-face markers with actual font-face declarations. |
| 578 | - $code = $this->restore_fontface( $code ); |
|
| 578 | + $code = $this->restore_fontface($code); |
|
| 579 | 579 | |
| 580 | 580 | return $code; |
| 581 | 581 | } |
@@ -583,29 +583,29 @@ discard block |
||
| 583 | 583 | // Joins and optimizes CSS. |
| 584 | 584 | public function minify() |
| 585 | 585 | { |
| 586 | - foreach ( $this->css as $group ) { |
|
| 587 | - list( $media, $css ) = $group; |
|
| 588 | - if ( preg_match( '#^INLINE;#', $css ) ) { |
|
| 586 | + foreach ($this->css as $group) { |
|
| 587 | + list($media, $css) = $group; |
|
| 588 | + if (preg_match('#^INLINE;#', $css)) { |
|
| 589 | 589 | // <style>. |
| 590 | - $css = preg_replace( '#^INLINE;#', '', $css ); |
|
| 591 | - $css = self::fixurls( ABSPATH . 'index.php', $css ); // ABSPATH already contains a trailing slash. |
|
| 592 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, '' ); |
|
| 593 | - if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) { |
|
| 590 | + $css = preg_replace('#^INLINE;#', '', $css); |
|
| 591 | + $css = self::fixurls(ABSPATH.'index.php', $css); // ABSPATH already contains a trailing slash. |
|
| 592 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, ''); |
|
| 593 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) { |
|
| 594 | 594 | $css = $tmpstyle; |
| 595 | 595 | $this->alreadyminified = true; |
| 596 | 596 | } |
| 597 | 597 | } else { |
| 598 | 598 | // <link> |
| 599 | - if ( false !== $css && file_exists( $css ) && is_readable( $css ) ) { |
|
| 599 | + if (false !== $css && file_exists($css) && is_readable($css)) { |
|
| 600 | 600 | $cssPath = $css; |
| 601 | - $css = self::fixurls( $cssPath, file_get_contents( $cssPath ) ); |
|
| 602 | - $css = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $css ); |
|
| 603 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath ); |
|
| 604 | - if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) { |
|
| 601 | + $css = self::fixurls($cssPath, file_get_contents($cssPath)); |
|
| 602 | + $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css); |
|
| 603 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath); |
|
| 604 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) { |
|
| 605 | 605 | $css = $tmpstyle; |
| 606 | 606 | $this->alreadyminified = true; |
| 607 | - } elseif ( $this->can_inject_late( $cssPath, $css ) ) { |
|
| 608 | - $css = self::build_injectlater_marker( $cssPath, md5( $css ) ); |
|
| 607 | + } elseif ($this->can_inject_late($cssPath, $css)) { |
|
| 608 | + $css = self::build_injectlater_marker($cssPath, md5($css)); |
|
| 609 | 609 | } |
| 610 | 610 | } else { |
| 611 | 611 | // Couldn't read CSS. Maybe getpath isn't working? |
@@ -613,12 +613,12 @@ discard block |
||
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | - foreach ( $media as $elem ) { |
|
| 617 | - if ( ! empty( $css ) ) { |
|
| 618 | - if ( ! isset( $this->csscode[$elem] ) ) { |
|
| 616 | + foreach ($media as $elem) { |
|
| 617 | + if (!empty($css)) { |
|
| 618 | + if (!isset($this->csscode[$elem])) { |
|
| 619 | 619 | $this->csscode[$elem] = ''; |
| 620 | 620 | } |
| 621 | - $this->csscode[$elem] .= "\n/*FILESTART*/" . $css; |
|
| 621 | + $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
|
| 622 | 622 | } |
| 623 | 623 | } |
| 624 | 624 | } |
@@ -626,133 +626,133 @@ discard block |
||
| 626 | 626 | // Check for duplicate code. |
| 627 | 627 | $md5list = array(); |
| 628 | 628 | $tmpcss = $this->csscode; |
| 629 | - foreach ( $tmpcss as $media => $code ) { |
|
| 630 | - $md5sum = md5( $code ); |
|
| 629 | + foreach ($tmpcss as $media => $code) { |
|
| 630 | + $md5sum = md5($code); |
|
| 631 | 631 | $medianame = $media; |
| 632 | - foreach ( $md5list as $med => $sum ) { |
|
| 632 | + foreach ($md5list as $med => $sum) { |
|
| 633 | 633 | // If same code. |
| 634 | - if ( $sum === $md5sum ) { |
|
| 634 | + if ($sum === $md5sum) { |
|
| 635 | 635 | // Add the merged code. |
| 636 | - $medianame = $med . ', ' . $media; |
|
| 636 | + $medianame = $med.', '.$media; |
|
| 637 | 637 | $this->csscode[$medianame] = $code; |
| 638 | 638 | $md5list[$medianame] = $md5list[$med]; |
| 639 | - unset( $this->csscode[$med], $this->csscode[$media], $md5list[$med] ); |
|
| 639 | + unset($this->csscode[$med], $this->csscode[$media], $md5list[$med]); |
|
| 640 | 640 | } |
| 641 | 641 | } |
| 642 | 642 | $md5list[$medianame] = $md5sum; |
| 643 | 643 | } |
| 644 | - unset( $tmpcss ); |
|
| 644 | + unset($tmpcss); |
|
| 645 | 645 | |
| 646 | 646 | // Manage @imports, while is for recursive import management. |
| 647 | - foreach ( $this->csscode as &$thiscss ) { |
|
| 647 | + foreach ($this->csscode as &$thiscss) { |
|
| 648 | 648 | // Flag to trigger import reconstitution and var to hold external imports. |
| 649 | 649 | $fiximports = false; |
| 650 | 650 | $external_imports = ''; |
| 651 | 651 | |
| 652 | 652 | // remove comments to avoid importing commented-out imports. |
| 653 | - $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss ); |
|
| 654 | - while ( preg_match_all( '#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches ) ) { |
|
| 655 | - foreach ( $matches[0] as $import ) { |
|
| 656 | - if ( $this->isremovable( $import, $this->cssremovables ) ) { |
|
| 657 | - $thiscss = str_replace( $import, '', $thiscss ); |
|
| 653 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss); |
|
| 654 | + while (preg_match_all('#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches)) { |
|
| 655 | + foreach ($matches[0] as $import) { |
|
| 656 | + if ($this->isremovable($import, $this->cssremovables)) { |
|
| 657 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 658 | 658 | $import_ok = true; |
| 659 | 659 | } else { |
| 660 | - $url = trim( preg_replace( '#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim( $import ) ), " \t\n\r\0\x0B\"'" ); |
|
| 661 | - $path = $this->getpath( $url ); |
|
| 660 | + $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'"); |
|
| 661 | + $path = $this->getpath($url); |
|
| 662 | 662 | $import_ok = false; |
| 663 | - if ( file_exists( $path ) && is_readable( $path ) ) { |
|
| 664 | - $code = addcslashes( self::fixurls( $path, file_get_contents( $path ) ), "\\" ); |
|
| 665 | - $code = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $code ); |
|
| 666 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, '' ); |
|
| 667 | - if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) { |
|
| 663 | + if (file_exists($path) && is_readable($path)) { |
|
| 664 | + $code = addcslashes(self::fixurls($path, file_get_contents($path)), "\\"); |
|
| 665 | + $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code); |
|
| 666 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, ''); |
|
| 667 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) { |
|
| 668 | 668 | $code = $tmpstyle; |
| 669 | 669 | $this->alreadyminified = true; |
| 670 | - } elseif ( $this->can_inject_late( $path, $code ) ) { |
|
| 671 | - $code = self::build_injectlater_marker( $path, md5( $code ) ); |
|
| 670 | + } elseif ($this->can_inject_late($path, $code)) { |
|
| 671 | + $code = self::build_injectlater_marker($path, md5($code)); |
|
| 672 | 672 | } |
| 673 | 673 | |
| 674 | - if ( ! empty( $code ) ) { |
|
| 675 | - $tmp_thiscss = preg_replace( '#(/\*FILESTART\*/.*)' . preg_quote( $import, '#' ) . '#Us', '/*FILESTART2*/' . $code . '$1', $thiscss ); |
|
| 676 | - if ( ! empty( $tmp_thiscss ) ) { |
|
| 674 | + if (!empty($code)) { |
|
| 675 | + $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss); |
|
| 676 | + if (!empty($tmp_thiscss)) { |
|
| 677 | 677 | $thiscss = $tmp_thiscss; |
| 678 | 678 | $import_ok = true; |
| 679 | - unset( $tmp_thiscss ); |
|
| 679 | + unset($tmp_thiscss); |
|
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | - unset( $code ); |
|
| 682 | + unset($code); |
|
| 683 | 683 | } |
| 684 | 684 | } |
| 685 | - if ( ! $import_ok ) { |
|
| 685 | + if (!$import_ok) { |
|
| 686 | 686 | // External imports and general fall-back. |
| 687 | 687 | $external_imports .= $import; |
| 688 | 688 | |
| 689 | - $thiscss = str_replace( $import, '', $thiscss ); |
|
| 689 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 690 | 690 | $fiximports = true; |
| 691 | 691 | } |
| 692 | 692 | } |
| 693 | - $thiscss = preg_replace( '#/\*FILESTART\*/#', '', $thiscss ); |
|
| 694 | - $thiscss = preg_replace( '#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss ); |
|
| 693 | + $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss); |
|
| 694 | + $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss); |
|
| 695 | 695 | |
| 696 | 696 | // and update $thiscss_nocomments before going into next iteration in while loop. |
| 697 | - $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss ); |
|
| 697 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss); |
|
| 698 | 698 | } |
| 699 | - unset( $thiscss_nocomments ); |
|
| 699 | + unset($thiscss_nocomments); |
|
| 700 | 700 | |
| 701 | 701 | // Add external imports to top of aggregated CSS. |
| 702 | - if ( $fiximports ) { |
|
| 703 | - $thiscss = $external_imports . $thiscss; |
|
| 702 | + if ($fiximports) { |
|
| 703 | + $thiscss = $external_imports.$thiscss; |
|
| 704 | 704 | } |
| 705 | 705 | } |
| 706 | - unset( $thiscss ); |
|
| 706 | + unset($thiscss); |
|
| 707 | 707 | |
| 708 | 708 | // $this->csscode has all the uncompressed code now. |
| 709 | - foreach ( $this->csscode as &$code ) { |
|
| 709 | + foreach ($this->csscode as &$code) { |
|
| 710 | 710 | // Check for already-minified code. |
| 711 | - $hash = md5( $code ); |
|
| 712 | - do_action( 'autoptimize_action_css_hash', $hash ); |
|
| 713 | - $ccheck = new autoptimizeCache( $hash, 'css' ); |
|
| 714 | - if ( $ccheck->check() ) { |
|
| 711 | + $hash = md5($code); |
|
| 712 | + do_action('autoptimize_action_css_hash', $hash); |
|
| 713 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 714 | + if ($ccheck->check()) { |
|
| 715 | 715 | $code = $ccheck->retrieve(); |
| 716 | - $this->hashmap[md5( $code )] = $hash; |
|
| 716 | + $this->hashmap[md5($code)] = $hash; |
|
| 717 | 717 | continue; |
| 718 | 718 | } |
| 719 | - unset( $ccheck ); |
|
| 719 | + unset($ccheck); |
|
| 720 | 720 | |
| 721 | 721 | // Rewrite and/or inline referenced assets. |
| 722 | - $code = $this->rewrite_assets( $code ); |
|
| 722 | + $code = $this->rewrite_assets($code); |
|
| 723 | 723 | |
| 724 | 724 | // Minify. |
| 725 | - $code = $this->run_minifier_on( $code ); |
|
| 725 | + $code = $this->run_minifier_on($code); |
|
| 726 | 726 | |
| 727 | 727 | // Bring back INJECTLATER stuff. |
| 728 | - $code = $this->inject_minified( $code ); |
|
| 728 | + $code = $this->inject_minified($code); |
|
| 729 | 729 | |
| 730 | 730 | // Filter results. |
| 731 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code ); |
|
| 732 | - if ( ! empty( $tmp_code ) ) { |
|
| 731 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code); |
|
| 732 | + if (!empty($tmp_code)) { |
|
| 733 | 733 | $code = $tmp_code; |
| 734 | - unset( $tmp_code ); |
|
| 734 | + unset($tmp_code); |
|
| 735 | 735 | } |
| 736 | 736 | |
| 737 | - $this->hashmap[md5( $code )] = $hash; |
|
| 737 | + $this->hashmap[md5($code)] = $hash; |
|
| 738 | 738 | } |
| 739 | 739 | |
| 740 | - unset( $code ); |
|
| 740 | + unset($code); |
|
| 741 | 741 | return true; |
| 742 | 742 | } |
| 743 | 743 | |
| 744 | - public function run_minifier_on( $code ) |
|
| 744 | + public function run_minifier_on($code) |
|
| 745 | 745 | { |
| 746 | - if ( ! $this->alreadyminified ) { |
|
| 747 | - $do_minify = apply_filters( 'autoptimize_css_do_minify', true ); |
|
| 746 | + if (!$this->alreadyminified) { |
|
| 747 | + $do_minify = apply_filters('autoptimize_css_do_minify', true); |
|
| 748 | 748 | |
| 749 | - if ( $do_minify ) { |
|
| 749 | + if ($do_minify) { |
|
| 750 | 750 | $cssmin = new autoptimizeCSSmin(); |
| 751 | - $tmp_code = trim( $cssmin->run( $code ) ); |
|
| 751 | + $tmp_code = trim($cssmin->run($code)); |
|
| 752 | 752 | |
| 753 | - if ( ! empty( $tmp_code ) ) { |
|
| 753 | + if (!empty($tmp_code)) { |
|
| 754 | 754 | $code = $tmp_code; |
| 755 | - unset( $tmp_code ); |
|
| 755 | + unset($tmp_code); |
|
| 756 | 756 | } |
| 757 | 757 | } |
| 758 | 758 | } |
@@ -764,14 +764,14 @@ discard block |
||
| 764 | 764 | public function cache() |
| 765 | 765 | { |
| 766 | 766 | // CSS cache. |
| 767 | - foreach ( $this->csscode as $media => $code ) { |
|
| 768 | - $md5 = $this->hashmap[md5( $code )]; |
|
| 769 | - $cache = new autoptimizeCache( $md5, 'css' ); |
|
| 770 | - if ( ! $cache->check() ) { |
|
| 767 | + foreach ($this->csscode as $media => $code) { |
|
| 768 | + $md5 = $this->hashmap[md5($code)]; |
|
| 769 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 770 | + if (!$cache->check()) { |
|
| 771 | 771 | // Cache our code. |
| 772 | - $cache->cache( $code, 'text/css' ); |
|
| 772 | + $cache->cache($code, 'text/css'); |
|
| 773 | 773 | } |
| 774 | - $this->url[$media] = AUTOPTIMIZE_CACHE_URL . $cache->getname(); |
|
| 774 | + $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
|
| 775 | 775 | } |
| 776 | 776 | } |
| 777 | 777 | |
@@ -779,88 +779,88 @@ discard block |
||
| 779 | 779 | public function getcontent() |
| 780 | 780 | { |
| 781 | 781 | // restore comments. |
| 782 | - $this->content = $this->restore_comments( $this->content ); |
|
| 782 | + $this->content = $this->restore_comments($this->content); |
|
| 783 | 783 | |
| 784 | 784 | // restore IE hacks. |
| 785 | - $this->content = $this->restore_iehacks( $this->content ); |
|
| 785 | + $this->content = $this->restore_iehacks($this->content); |
|
| 786 | 786 | |
| 787 | 787 | // restore (no)script. |
| 788 | - $this->content = $this->restore_marked_content( 'SCRIPT', $this->content ); |
|
| 788 | + $this->content = $this->restore_marked_content('SCRIPT', $this->content); |
|
| 789 | 789 | |
| 790 | 790 | // Restore noptimize. |
| 791 | - $this->content = $this->restore_noptimize( $this->content ); |
|
| 791 | + $this->content = $this->restore_noptimize($this->content); |
|
| 792 | 792 | |
| 793 | 793 | // Restore the full content. |
| 794 | - if ( ! empty( $this->restofcontent ) ) { |
|
| 794 | + if (!empty($this->restofcontent)) { |
|
| 795 | 795 | $this->content .= $this->restofcontent; |
| 796 | 796 | $this->restofcontent = ''; |
| 797 | 797 | } |
| 798 | 798 | |
| 799 | 799 | // Inject the new stylesheets. |
| 800 | - $replaceTag = array( '<title', 'before' ); |
|
| 801 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content ); |
|
| 800 | + $replaceTag = array('<title', 'before'); |
|
| 801 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content); |
|
| 802 | 802 | |
| 803 | - if ( $this->inline ) { |
|
| 804 | - foreach ( $this->csscode as $media => $code ) { |
|
| 805 | - $this->inject_in_html( '<style type="text/css" media="' . $media . '">' . $code . '</style>', $replaceTag ); |
|
| 803 | + if ($this->inline) { |
|
| 804 | + foreach ($this->csscode as $media => $code) { |
|
| 805 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag); |
|
| 806 | 806 | } |
| 807 | 807 | } else { |
| 808 | - if ( $this->defer ) { |
|
| 808 | + if ($this->defer) { |
|
| 809 | 809 | $preloadCssBlock = ''; |
| 810 | 810 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 811 | 811 | |
| 812 | 812 | $defer_inline_code = $this->defer_inline; |
| 813 | - if ( ! empty( $defer_inline_code ) ) { |
|
| 814 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) { |
|
| 815 | - $iCssHash = md5( $defer_inline_code ); |
|
| 816 | - $iCssCache = new autoptimizeCache( $iCssHash, 'css' ); |
|
| 817 | - if ( $iCssCache->check() ) { |
|
| 813 | + if (!empty($defer_inline_code)) { |
|
| 814 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) { |
|
| 815 | + $iCssHash = md5($defer_inline_code); |
|
| 816 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 817 | + if ($iCssCache->check()) { |
|
| 818 | 818 | // we have the optimized inline CSS in cache. |
| 819 | 819 | $defer_inline_code = $iCssCache->retrieve(); |
| 820 | 820 | } else { |
| 821 | 821 | $cssmin = new autoptimizeCSSmin(); |
| 822 | - $tmp_code = trim( $cssmin->run( $defer_inline_code ) ); |
|
| 822 | + $tmp_code = trim($cssmin->run($defer_inline_code)); |
|
| 823 | 823 | |
| 824 | - if ( ! empty( $tmp_code ) ) { |
|
| 824 | + if (!empty($tmp_code)) { |
|
| 825 | 825 | $defer_inline_code = $tmp_code; |
| 826 | - $iCssCache->cache( $defer_inline_code, 'text/css' ); |
|
| 827 | - unset( $tmp_code ); |
|
| 826 | + $iCssCache->cache($defer_inline_code, 'text/css'); |
|
| 827 | + unset($tmp_code); |
|
| 828 | 828 | } |
| 829 | 829 | } |
| 830 | 830 | } |
| 831 | - $code_out = '<style type="text/css" id="aoatfcss" media="all">' . $defer_inline_code . '</style>'; |
|
| 832 | - $this->inject_in_html( $code_out, $replaceTag ); |
|
| 831 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 832 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 833 | 833 | } |
| 834 | 834 | } |
| 835 | 835 | |
| 836 | - foreach ( $this->url as $media => $url ) { |
|
| 837 | - $url = $this->url_replace_cdn( $url ); |
|
| 836 | + foreach ($this->url as $media => $url) { |
|
| 837 | + $url = $this->url_replace_cdn($url); |
|
| 838 | 838 | |
| 839 | 839 | // Add the stylesheet either deferred (import at bottom) or normal links in head. |
| 840 | - if ( $this->defer ) { |
|
| 840 | + if ($this->defer) { |
|
| 841 | 841 | $preloadOnLoad = autoptimizeConfig::get_ao_css_preload_onload(); |
| 842 | 842 | |
| 843 | - $preloadCssBlock .= '<link rel="preload" as="style" media="' . $media . '" href="' . $url . '" onload="' . $preloadOnLoad . '" />'; |
|
| 844 | - $noScriptCssBlock .= '<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />'; |
|
| 843 | + $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="'.$preloadOnLoad.'" />'; |
|
| 844 | + $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />'; |
|
| 845 | 845 | } else { |
| 846 | 846 | // $this->inject_in_html('<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag); |
| 847 | - if ( strlen( $this->csscode[$media] ) > $this->cssinlinesize ) { |
|
| 848 | - $this->inject_in_html( '<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag ); |
|
| 849 | - } elseif ( strlen( $this->csscode[$media] ) > 0 ) { |
|
| 850 | - $this->inject_in_html( '<style type="text/css" media="' . $media . '">' . $this->csscode[$media] . '</style>', $replaceTag ); |
|
| 847 | + if (strlen($this->csscode[$media]) > $this->cssinlinesize) { |
|
| 848 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag); |
|
| 849 | + } elseif (strlen($this->csscode[$media]) > 0) { |
|
| 850 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag); |
|
| 851 | 851 | } |
| 852 | 852 | } |
| 853 | 853 | } |
| 854 | 854 | |
| 855 | - if ( $this->defer ) { |
|
| 855 | + if ($this->defer) { |
|
| 856 | 856 | $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill(); |
| 857 | 857 | $noScriptCssBlock .= '</noscript>'; |
| 858 | - $this->inject_in_html( $preloadCssBlock . $noScriptCssBlock, $replaceTag ); |
|
| 858 | + $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag); |
|
| 859 | 859 | |
| 860 | 860 | // Adds preload polyfill at end of body tag. |
| 861 | 861 | $this->inject_in_html( |
| 862 | - apply_filters( 'autoptimize_css_preload_polyfill', $preload_polyfill ), |
|
| 863 | - array( '</body>', 'before' ) |
|
| 862 | + apply_filters('autoptimize_css_preload_polyfill', $preload_polyfill), |
|
| 863 | + array('</body>', 'before') |
|
| 864 | 864 | ); |
| 865 | 865 | } |
| 866 | 866 | } |
@@ -869,44 +869,44 @@ discard block |
||
| 869 | 869 | return $this->content; |
| 870 | 870 | } |
| 871 | 871 | |
| 872 | - static function fixurls( $file, $code ) |
|
| 872 | + static function fixurls($file, $code) |
|
| 873 | 873 | { |
| 874 | 874 | // Switch all imports to the url() syntax. |
| 875 | - $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code ); |
|
| 875 | + $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code); |
|
| 876 | 876 | |
| 877 | - if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) { |
|
| 878 | - $file = str_replace( WP_ROOT_DIR, '/', $file ); |
|
| 877 | + if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) { |
|
| 878 | + $file = str_replace(WP_ROOT_DIR, '/', $file); |
|
| 879 | 879 | /** |
| 880 | 880 | * rollback as per https://github.com/futtta/autoptimize/issues/94 |
| 881 | 881 | * $file = str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', $file ); |
| 882 | 882 | */ |
| 883 | - $dir = dirname( $file ); // Like /themes/expound/css. |
|
| 883 | + $dir = dirname($file); // Like /themes/expound/css. |
|
| 884 | 884 | |
| 885 | 885 | /** |
| 886 | 886 | * $dir should not contain backslashes, since it's used to replace |
| 887 | 887 | * urls, but it can contain them when running on Windows because |
| 888 | 888 | * fixurls() is sometimes called with `ABSPATH . 'index.php'` |
| 889 | 889 | */ |
| 890 | - $dir = str_replace( '\\', '/', $dir ); |
|
| 891 | - unset( $file ); // not used below at all. |
|
| 890 | + $dir = str_replace('\\', '/', $dir); |
|
| 891 | + unset($file); // not used below at all. |
|
| 892 | 892 | |
| 893 | 893 | $replace = array(); |
| 894 | - foreach ( $matches[1] as $k => $url ) { |
|
| 894 | + foreach ($matches[1] as $k => $url) { |
|
| 895 | 895 | // Remove quotes. |
| 896 | - $url = trim( $url, " \t\n\r\0\x0B\"'" ); |
|
| 897 | - $noQurl = trim( $url, "\"'" ); |
|
| 898 | - if ( $url !== $noQurl ) { |
|
| 896 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 897 | + $noQurl = trim($url, "\"'"); |
|
| 898 | + if ($url !== $noQurl) { |
|
| 899 | 899 | $removedQuotes = true; |
| 900 | 900 | } else { |
| 901 | 901 | $removedQuotes = false; |
| 902 | 902 | } |
| 903 | 903 | |
| 904 | - if ( '' === $noQurl ) { |
|
| 904 | + if ('' === $noQurl) { |
|
| 905 | 905 | continue; |
| 906 | 906 | } |
| 907 | 907 | |
| 908 | 908 | $url = $noQurl; |
| 909 | - if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) { |
|
| 909 | + if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) { |
|
| 910 | 910 | // URL is protocol-relative, host-relative or something we don't touch. |
| 911 | 911 | continue; |
| 912 | 912 | } else { |
@@ -915,49 +915,49 @@ discard block |
||
| 915 | 915 | * rollback as per https://github.com/futtta/autoptimize/issues/94 |
| 916 | 916 | * $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_CONTENT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) ); |
| 917 | 917 | */ |
| 918 | - $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) ); |
|
| 919 | - $newurl = apply_filters( 'autoptimize_filter_css_fixurl_newurl', $newurl ); |
|
| 918 | + $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url))); |
|
| 919 | + $newurl = apply_filters('autoptimize_filter_css_fixurl_newurl', $newurl); |
|
| 920 | 920 | |
| 921 | 921 | /** |
| 922 | 922 | * Hash the url + whatever was behind potentially for replacement |
| 923 | 923 | * We must do this, or different css classes referencing the same bg image (but |
| 924 | 924 | * different parts of it, say, in sprites and such) loose their stuff... |
| 925 | 925 | */ |
| 926 | - $hash = md5( $url . $matches[2][$k] ); |
|
| 927 | - $code = str_replace( $matches[0][$k], $hash, $code ); |
|
| 926 | + $hash = md5($url.$matches[2][$k]); |
|
| 927 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 928 | 928 | |
| 929 | - if ( $removedQuotes ) { |
|
| 930 | - $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k]; |
|
| 929 | + if ($removedQuotes) { |
|
| 930 | + $replace[$hash] = "url('".$newurl."')".$matches[2][$k]; |
|
| 931 | 931 | } else { |
| 932 | - $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k]; |
|
| 932 | + $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k]; |
|
| 933 | 933 | } |
| 934 | 934 | } |
| 935 | 935 | } |
| 936 | 936 | |
| 937 | - $code = self::replace_longest_matches_first( $code, $replace ); |
|
| 937 | + $code = self::replace_longest_matches_first($code, $replace); |
|
| 938 | 938 | } |
| 939 | 939 | |
| 940 | 940 | return $code; |
| 941 | 941 | } |
| 942 | 942 | |
| 943 | - private function ismovable( $tag ) |
|
| 943 | + private function ismovable($tag) |
|
| 944 | 944 | { |
| 945 | - if ( ! $this->aggregate ) { |
|
| 945 | + if (!$this->aggregate) { |
|
| 946 | 946 | return false; |
| 947 | 947 | } |
| 948 | 948 | |
| 949 | - if ( ! empty( $this->whitelist ) ) { |
|
| 950 | - foreach ( $this->whitelist as $match ) { |
|
| 951 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 949 | + if (!empty($this->whitelist)) { |
|
| 950 | + foreach ($this->whitelist as $match) { |
|
| 951 | + if (false !== strpos($tag, $match)) { |
|
| 952 | 952 | return true; |
| 953 | 953 | } |
| 954 | 954 | } |
| 955 | 955 | // no match with whitelist. |
| 956 | 956 | return false; |
| 957 | 957 | } else { |
| 958 | - if ( is_array( $this->dontmove ) && ! empty( $this->dontmove ) ) { |
|
| 959 | - foreach ( $this->dontmove as $match ) { |
|
| 960 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 958 | + if (is_array($this->dontmove) && !empty($this->dontmove)) { |
|
| 959 | + foreach ($this->dontmove as $match) { |
|
| 960 | + if (false !== strpos($tag, $match)) { |
|
| 961 | 961 | // Matched something. |
| 962 | 962 | return false; |
| 963 | 963 | } |
@@ -969,22 +969,22 @@ discard block |
||
| 969 | 969 | } |
| 970 | 970 | } |
| 971 | 971 | |
| 972 | - private function can_inject_late( $cssPath, $css ) |
|
| 972 | + private function can_inject_late($cssPath, $css) |
|
| 973 | 973 | { |
| 974 | - $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $cssPath ); |
|
| 975 | - if ( true !== $this->inject_min_late ) { |
|
| 974 | + $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath); |
|
| 975 | + if (true !== $this->inject_min_late) { |
|
| 976 | 976 | // late-inject turned off. |
| 977 | 977 | return false; |
| 978 | - } elseif ( ( false === strpos( $cssPath, 'min.css' ) ) && ( str_replace( $consider_minified_array, '', $cssPath ) === $cssPath ) ) { |
|
| 978 | + } elseif ((false === strpos($cssPath, 'min.css')) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) { |
|
| 979 | 979 | // file not minified based on filename & filter. |
| 980 | 980 | return false; |
| 981 | - } elseif ( false !== strpos( $css, '@import' ) ) { |
|
| 981 | + } elseif (false !== strpos($css, '@import')) { |
|
| 982 | 982 | // can't late-inject files with imports as those need to be aggregated. |
| 983 | 983 | return false; |
| 984 | - } elseif ( ( false !== strpos( $css, '@font-face' ) ) && ( apply_filters( 'autoptimize_filter_css_fonts_cdn', false ) === true ) && ( ! empty( $this->cdn_url ) ) ) { |
|
| 984 | + } elseif ((false !== strpos($css, '@font-face')) && (apply_filters('autoptimize_filter_css_fonts_cdn', false) === true) && (!empty($this->cdn_url))) { |
|
| 985 | 985 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed. |
| 986 | 986 | return false; |
| 987 | - } elseif ( ( ( $this->datauris == true ) || ( ! empty( $this->cdn_url ) ) ) && preg_match( '#background[^;}]*url\(#Ui', $css ) ) { |
|
| 987 | + } elseif ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match('#background[^;}]*url\(#Ui', $css)) { |
|
| 988 | 988 | // don't late-inject CSS with images if CDN is set OR if image inlining is on. |
| 989 | 989 | return false; |
| 990 | 990 | } else { |
@@ -1002,32 +1002,32 @@ discard block |
||
| 1002 | 1002 | * |
| 1003 | 1003 | * @return bool|string Url pointing to the minified css file or false. |
| 1004 | 1004 | */ |
| 1005 | - public function minify_single( $filepath, $cache_miss = false ) |
|
| 1005 | + public function minify_single($filepath, $cache_miss = false) |
|
| 1006 | 1006 | { |
| 1007 | - $contents = $this->prepare_minify_single( $filepath ); |
|
| 1007 | + $contents = $this->prepare_minify_single($filepath); |
|
| 1008 | 1008 | |
| 1009 | - if ( empty( $contents ) ) { |
|
| 1009 | + if (empty($contents)) { |
|
| 1010 | 1010 | return false; |
| 1011 | 1011 | } |
| 1012 | 1012 | |
| 1013 | 1013 | // Check cache. |
| 1014 | - $hash = 'single_' . md5( $contents ); |
|
| 1015 | - $cache = new autoptimizeCache( $hash, 'css' ); |
|
| 1014 | + $hash = 'single_'.md5($contents); |
|
| 1015 | + $cache = new autoptimizeCache($hash, 'css'); |
|
| 1016 | 1016 | |
| 1017 | 1017 | // If not in cache already, minify... |
| 1018 | - if ( ! $cache->check() || $cache_miss ) { |
|
| 1018 | + if (!$cache->check() || $cache_miss) { |
|
| 1019 | 1019 | // Fixurls... |
| 1020 | - $contents = self::fixurls( $filepath, $contents ); |
|
| 1020 | + $contents = self::fixurls($filepath, $contents); |
|
| 1021 | 1021 | // CDN-replace any referenced assets if needed... |
| 1022 | - $contents = $this->replace_urls( $contents ); |
|
| 1022 | + $contents = $this->replace_urls($contents); |
|
| 1023 | 1023 | // Now minify... |
| 1024 | 1024 | $cssmin = new autoptimizeCSSmin(); |
| 1025 | - $contents = trim( $cssmin->run( $contents ) ); |
|
| 1025 | + $contents = trim($cssmin->run($contents)); |
|
| 1026 | 1026 | // Store in cache. |
| 1027 | - $cache->cache( $contents, 'text/css' ); |
|
| 1027 | + $cache->cache($contents, 'text/css'); |
|
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | - $url = $this->build_minify_single_url( $cache ); |
|
| 1030 | + $url = $this->build_minify_single_url($cache); |
|
| 1031 | 1031 | |
| 1032 | 1032 | return $url; |
| 1033 | 1033 | } |
@@ -1047,18 +1047,18 @@ discard block |
||
| 1047 | 1047 | return $this->options; |
| 1048 | 1048 | } |
| 1049 | 1049 | |
| 1050 | - public function replaceOptions( $options ) |
|
| 1050 | + public function replaceOptions($options) |
|
| 1051 | 1051 | { |
| 1052 | 1052 | $this->options = $options; |
| 1053 | 1053 | } |
| 1054 | 1054 | |
| 1055 | - public function setOption( $name, $value ) |
|
| 1055 | + public function setOption($name, $value) |
|
| 1056 | 1056 | { |
| 1057 | 1057 | $this->options[$name] = $value; |
| 1058 | 1058 | $this->$name = $value; |
| 1059 | 1059 | } |
| 1060 | 1060 | |
| 1061 | - public function getOption( $name ) |
|
| 1061 | + public function getOption($name) |
|
| 1062 | 1062 | { |
| 1063 | 1063 | return $this->options[$name]; |
| 1064 | 1064 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | +if (!defined('ABSPATH')) { |
|
| 4 | 4 | exit; |
| 5 | 5 | } |
| 6 | 6 | |
@@ -13,18 +13,18 @@ discard block |
||
| 13 | 13 | ); |
| 14 | 14 | |
| 15 | 15 | 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' |
|
| 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 | 20 | ,'logHuman' |
| 21 | 21 | ); |
| 22 | 22 | private $domove = array( |
| 23 | - 'gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go' |
|
| 23 | + 'gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go' |
|
| 24 | 24 | ); |
| 25 | 25 | 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' |
|
| 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' |
|
| 28 | 28 | ); |
| 29 | 29 | |
| 30 | 30 | private $aggregate = true; |
@@ -43,84 +43,84 @@ discard block |
||
| 43 | 43 | // Reads the page and collects script tags |
| 44 | 44 | public function read($options) |
| 45 | 45 | { |
| 46 | - $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); |
|
| 47 | - if ( $noptimizeJS ) { |
|
| 46 | + $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content); |
|
| 47 | + if ($noptimizeJS) { |
|
| 48 | 48 | return false; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // only optimize known good JS? |
| 52 | - $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content ); |
|
| 53 | - if ( ! empty( $whitelistJS ) ) { |
|
| 54 | - $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelistJS ) ) ); |
|
| 52 | + $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', '', $this->content); |
|
| 53 | + if (!empty($whitelistJS)) { |
|
| 54 | + $this->whitelist = array_filter(array_map('trim', explode(',', $whitelistJS))); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // is there JS we should simply remove |
| 58 | - $removableJS = apply_filters( 'autoptimize_filter_js_removables', '', $this->content ); |
|
| 58 | + $removableJS = apply_filters('autoptimize_filter_js_removables', '', $this->content); |
|
| 59 | 59 | if (!empty($removableJS)) { |
| 60 | - $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $removableJS ) ) ); |
|
| 60 | + $this->jsremovables = array_filter(array_map('trim', explode(',', $removableJS))); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | // only header? |
| 64 | - if ( apply_filters( 'autoptimize_filter_js_justhead', $options['justhead'] ) ) { |
|
| 65 | - $content = explode( '</head>', $this->content, 2 ); |
|
| 66 | - $this->content = $content[0] . '</head>'; |
|
| 64 | + if (apply_filters('autoptimize_filter_js_justhead', $options['justhead'])) { |
|
| 65 | + $content = explode('</head>', $this->content, 2); |
|
| 66 | + $this->content = $content[0].'</head>'; |
|
| 67 | 67 | $this->restofcontent = $content[1]; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | // Determine whether we're doing JS-files aggregation or not. |
| 71 | - if ( ! $options['aggregate'] ) { |
|
| 71 | + if (!$options['aggregate']) { |
|
| 72 | 72 | $this->aggregate = false; |
| 73 | 73 | } |
| 74 | 74 | // Returning true for "dontaggregate" turns off aggregation. |
| 75 | - if ( $this->aggregate && apply_filters( 'autoptimize_filter_js_dontaggregate', false ) ) { |
|
| 75 | + if ($this->aggregate && apply_filters('autoptimize_filter_js_dontaggregate', false)) { |
|
| 76 | 76 | $this->aggregate = false; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | // include inline? |
| 80 | - if ( apply_filters( 'autoptimize_js_include_inline', $options['include_inline'] ) ) { |
|
| 80 | + if (apply_filters('autoptimize_js_include_inline', $options['include_inline'])) { |
|
| 81 | 81 | $this->include_inline = true; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | // filter to "late inject minified JS", default to true for now (it is faster) |
| 85 | - $this->inject_min_late = apply_filters( 'autoptimize_filter_js_inject_min_late', true ); |
|
| 85 | + $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true); |
|
| 86 | 86 | |
| 87 | 87 | // filters to override hardcoded do(nt)move(last) array contents (array in, array out!) |
| 88 | - $this->dontmove = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove ); |
|
| 89 | - $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast ); |
|
| 90 | - $this->domove = apply_filters( 'autoptimize_filter_js_domove', $this->domove ); |
|
| 88 | + $this->dontmove = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove); |
|
| 89 | + $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast); |
|
| 90 | + $this->domove = apply_filters('autoptimize_filter_js_domove', $this->domove); |
|
| 91 | 91 | |
| 92 | 92 | // get extra exclusions settings or filter |
| 93 | 93 | $excludeJS = $options['js_exclude']; |
| 94 | - $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS, $this->content ); |
|
| 94 | + $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS, $this->content); |
|
| 95 | 95 | |
| 96 | - if ( '' !== $excludeJS ) { |
|
| 97 | - if ( is_array( $excludeJS ) ) { |
|
| 98 | - if ( ( $removeKeys = array_keys( $excludeJS, 'remove' ) ) !== false ) { |
|
| 99 | - foreach ( $removeKeys as $removeKey ) { |
|
| 100 | - unset( $excludeJS[$removeKey] ); |
|
| 96 | + if ('' !== $excludeJS) { |
|
| 97 | + if (is_array($excludeJS)) { |
|
| 98 | + if (($removeKeys = array_keys($excludeJS, 'remove')) !== false) { |
|
| 99 | + foreach ($removeKeys as $removeKey) { |
|
| 100 | + unset($excludeJS[$removeKey]); |
|
| 101 | 101 | $this->jsremovables[] = $removeKey; |
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | - $exclJSArr = array_keys( $excludeJS ); |
|
| 104 | + $exclJSArr = array_keys($excludeJS); |
|
| 105 | 105 | } else { |
| 106 | - $exclJSArr = array_filter( array_map( 'trim', explode( ',', $excludeJS ) ) ); |
|
| 106 | + $exclJSArr = array_filter(array_map('trim', explode(',', $excludeJS))); |
|
| 107 | 107 | } |
| 108 | - $this->dontmove = array_merge( $exclJSArr, $this->dontmove ); |
|
| 108 | + $this->dontmove = array_merge($exclJSArr, $this->dontmove); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | // Should we add try-catch? |
| 112 | - if ( $options['trycatch'] ) { |
|
| 112 | + if ($options['trycatch']) { |
|
| 113 | 113 | $this->trycatch = true; |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | // force js in head? |
| 117 | - if ( $options['forcehead'] ) { |
|
| 117 | + if ($options['forcehead']) { |
|
| 118 | 118 | $this->forcehead = true; |
| 119 | 119 | } else { |
| 120 | 120 | $this->forcehead = false; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead ); |
|
| 123 | + $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead); |
|
| 124 | 124 | |
| 125 | 125 | // get cdn url |
| 126 | 126 | $this->cdn_url = $options['cdn_url']; |
@@ -135,26 +135,26 @@ discard block |
||
| 135 | 135 | $this->content = $this->hide_comments($this->content); |
| 136 | 136 | |
| 137 | 137 | // Get script files |
| 138 | - if ( preg_match_all( '#<script.*</script>#Usmi', $this->content, $matches ) ) { |
|
| 139 | - foreach( $matches[0] as $tag ) { |
|
| 138 | + if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) { |
|
| 139 | + foreach ($matches[0] as $tag) { |
|
| 140 | 140 | // only consider script aggregation for types whitelisted in should_aggregate-function |
| 141 | 141 | $should_aggregate = $this->should_aggregate($tag); |
| 142 | - if ( ! $should_aggregate ) { |
|
| 142 | + if (!$should_aggregate) { |
|
| 143 | 143 | $tag = ''; |
| 144 | 144 | continue; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - if ( preg_match( '#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source ) ) { |
|
| 147 | + if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) { |
|
| 148 | 148 | // non-inline script |
| 149 | - if ( $this->isremovable($tag, $this->jsremovables) ) { |
|
| 150 | - $this->content = str_replace( $tag, '', $this->content ); |
|
| 149 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 150 | + $this->content = str_replace($tag, '', $this->content); |
|
| 151 | 151 | continue; |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | $origTag = null; |
| 155 | - $url = current( explode( '?', $source[2], 2 ) ); |
|
| 155 | + $url = current(explode('?', $source[2], 2)); |
|
| 156 | 156 | $path = $this->getpath($url); |
| 157 | - if ( false !== $path && preg_match( '#\.js$#', $path ) && $this->ismergeable($tag) ) { |
|
| 157 | + if (false !== $path && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) { |
|
| 158 | 158 | // ok to optimize, add to array |
| 159 | 159 | $this->scripts[] = $path; |
| 160 | 160 | } else { |
@@ -162,35 +162,35 @@ discard block |
||
| 162 | 162 | $newTag = $tag; |
| 163 | 163 | |
| 164 | 164 | // non-mergeable script (excluded or dynamic or external) |
| 165 | - if ( is_array( $excludeJS ) ) { |
|
| 165 | + if (is_array($excludeJS)) { |
|
| 166 | 166 | // should we add flags? |
| 167 | - foreach ( $excludeJS as $exclTag => $exclFlags) { |
|
| 168 | - if ( false !== strpos( $origTag, $exclTag ) && in_array( $exclFlags, array( 'async', 'defer' ) ) ) { |
|
| 169 | - $newTag = str_replace( '<script ', '<script ' . $exclFlags . ' ', $newTag ); |
|
| 167 | + foreach ($excludeJS as $exclTag => $exclFlags) { |
|
| 168 | + if (false !== strpos($origTag, $exclTag) && in_array($exclFlags, array('async', 'defer'))) { |
|
| 169 | + $newTag = str_replace('<script ', '<script '.$exclFlags.' ', $newTag); |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | // Should we minify the non-aggregated script? |
| 175 | - if ( $path && apply_filters( 'autoptimize_filter_js_minify_excluded', true, $url ) ) { |
|
| 176 | - $minified_url = $this->minify_single( $path ); |
|
| 175 | + if ($path && apply_filters('autoptimize_filter_js_minify_excluded', true, $url)) { |
|
| 176 | + $minified_url = $this->minify_single($path); |
|
| 177 | 177 | // replace orig URL with minified URL from cache if so |
| 178 | - if ( ! empty( $minified_url ) ) { |
|
| 179 | - $newTag = str_replace( $url, $minified_url, $newTag ); |
|
| 178 | + if (!empty($minified_url)) { |
|
| 179 | + $newTag = str_replace($url, $minified_url, $newTag); |
|
| 180 | 180 | } |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - if ( $this->ismovable($newTag) ) { |
|
| 183 | + if ($this->ismovable($newTag)) { |
|
| 184 | 184 | // can be moved, flags and all |
| 185 | - if ( $this->movetolast($newTag) ) { |
|
| 185 | + if ($this->movetolast($newTag)) { |
|
| 186 | 186 | $this->move['last'][] = $newTag; |
| 187 | 187 | } else { |
| 188 | 188 | $this->move['first'][] = $newTag; |
| 189 | 189 | } |
| 190 | 190 | } else { |
| 191 | 191 | // cannot be moved, so if flag was added re-inject altered tag immediately |
| 192 | - if ( $origTag !== $newTag ) { |
|
| 193 | - $this->content = str_replace( $origTag, $newTag, $this->content ); |
|
| 192 | + if ($origTag !== $newTag) { |
|
| 193 | + $this->content = str_replace($origTag, $newTag, $this->content); |
|
| 194 | 194 | $origTag = ''; |
| 195 | 195 | } |
| 196 | 196 | // and forget about the $tag (not to be touched any more) |
@@ -199,23 +199,23 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | } else { |
| 201 | 201 | // Inline script |
| 202 | - if ( $this->isremovable($tag, $this->jsremovables) ) { |
|
| 203 | - $this->content = str_replace( $tag, '', $this->content ); |
|
| 202 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 203 | + $this->content = str_replace($tag, '', $this->content); |
|
| 204 | 204 | continue; |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | // unhide comments, as javascript may be wrapped in comment-tags for old times' sake |
| 208 | 208 | $tag = $this->restore_comments($tag); |
| 209 | - if ( $this->ismergeable($tag) && $this->include_inline ) { |
|
| 210 | - preg_match( '#<script.*>(.*)</script>#Usmi', $tag , $code ); |
|
| 211 | - $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1] ); |
|
| 212 | - $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code ); |
|
| 213 | - $this->scripts[] = 'INLINE;' . $code; |
|
| 209 | + if ($this->ismergeable($tag) && $this->include_inline) { |
|
| 210 | + preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code); |
|
| 211 | + $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]); |
|
| 212 | + $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code); |
|
| 213 | + $this->scripts[] = 'INLINE;'.$code; |
|
| 214 | 214 | } else { |
| 215 | 215 | // Can we move this? |
| 216 | - $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag ); |
|
| 217 | - if ( $this->ismovable($tag) || '' !== $autoptimize_js_moveable ) { |
|
| 218 | - if ( $this->movetolast($tag) || 'last' === $autoptimize_js_moveable ) { |
|
| 216 | + $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag); |
|
| 217 | + if ($this->ismovable($tag) || '' !== $autoptimize_js_moveable) { |
|
| 218 | + if ($this->movetolast($tag) || 'last' === $autoptimize_js_moveable) { |
|
| 219 | 219 | $this->move['last'][] = $tag; |
| 220 | 220 | } else { |
| 221 | 221 | $this->move['first'][] = $tag; |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | //Remove the original script tag |
| 233 | - $this->content = str_replace( $tag, '', $this->content ); |
|
| 233 | + $this->content = str_replace($tag, '', $this->content); |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | return true; |
@@ -260,21 +260,21 @@ discard block |
||
| 260 | 260 | // We're only interested in the type attribute of the <script> tag itself, not any possible |
| 261 | 261 | // inline code that might just contain the 'type=' string... |
| 262 | 262 | $tag_parts = array(); |
| 263 | - preg_match( '#<(script[^>]*)>#i', $tag, $tag_parts); |
|
| 263 | + preg_match('#<(script[^>]*)>#i', $tag, $tag_parts); |
|
| 264 | 264 | $tag_without_contents = null; |
| 265 | - if ( ! empty( $tag_parts[1] ) ) { |
|
| 265 | + if (!empty($tag_parts[1])) { |
|
| 266 | 266 | $tag_without_contents = $tag_parts[1]; |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | - $has_type = ( strpos( $tag_without_contents, 'type' ) !== false ); |
|
| 269 | + $has_type = (strpos($tag_without_contents, 'type') !== false); |
|
| 270 | 270 | |
| 271 | 271 | $type_valid = false; |
| 272 | - if ( $has_type ) { |
|
| 273 | - $type_valid = (bool) preg_match( '/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents ); |
|
| 272 | + if ($has_type) { |
|
| 273 | + $type_valid = (bool) preg_match('/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents); |
|
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | $should_aggregate = false; |
| 277 | - if ( ! $has_type || $type_valid ) { |
|
| 277 | + if (!$has_type || $type_valid) { |
|
| 278 | 278 | $should_aggregate = true; |
| 279 | 279 | } |
| 280 | 280 | |
@@ -284,40 +284,40 @@ discard block |
||
| 284 | 284 | //Joins and optimizes JS |
| 285 | 285 | public function minify() |
| 286 | 286 | { |
| 287 | - foreach ( $this->scripts as $script ) { |
|
| 287 | + foreach ($this->scripts as $script) { |
|
| 288 | 288 | // TODO/FIXME: some duplicate code here, can be reduced/simplified |
| 289 | - if ( preg_match( '#^INLINE;#', $script ) ) { |
|
| 289 | + if (preg_match('#^INLINE;#', $script)) { |
|
| 290 | 290 | // Inline script |
| 291 | - $script = preg_replace( '#^INLINE;#', '', $script ); |
|
| 292 | - $script = rtrim( $script, ";\n\t\r" ) . ';'; |
|
| 291 | + $script = preg_replace('#^INLINE;#', '', $script); |
|
| 292 | + $script = rtrim($script, ";\n\t\r").';'; |
|
| 293 | 293 | // Add try-catch? |
| 294 | - if ( $this->trycatch ) { |
|
| 295 | - $script = 'try{' . $script . '}catch(e){}'; |
|
| 294 | + if ($this->trycatch) { |
|
| 295 | + $script = 'try{'.$script.'}catch(e){}'; |
|
| 296 | 296 | } |
| 297 | - $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' ); |
|
| 298 | - if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscript ) ) { |
|
| 297 | + $tmpscript = apply_filters('autoptimize_js_individual_script', $script, ''); |
|
| 298 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) { |
|
| 299 | 299 | $script = $tmpscript; |
| 300 | 300 | $this->alreadyminified = true; |
| 301 | 301 | } |
| 302 | - $this->jscode .= "\n" . $script; |
|
| 302 | + $this->jscode .= "\n".$script; |
|
| 303 | 303 | } else { |
| 304 | 304 | // External script |
| 305 | - if ( false !== $script && file_exists( $script ) && is_readable( $script ) ) { |
|
| 306 | - $scriptsrc = file_get_contents( $script ); |
|
| 307 | - $scriptsrc = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc ); |
|
| 308 | - $scriptsrc = rtrim( $scriptsrc, ";\n\t\r" ) . ';'; |
|
| 305 | + if (false !== $script && file_exists($script) && is_readable($script)) { |
|
| 306 | + $scriptsrc = file_get_contents($script); |
|
| 307 | + $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc); |
|
| 308 | + $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';'; |
|
| 309 | 309 | // Add try-catch? |
| 310 | - if ( $this->trycatch ) { |
|
| 311 | - $scriptsrc = 'try{' . $scriptsrc . '}catch(e){}'; |
|
| 310 | + if ($this->trycatch) { |
|
| 311 | + $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}'; |
|
| 312 | 312 | } |
| 313 | - $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script ); |
|
| 314 | - if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscriptsrc ) ) { |
|
| 313 | + $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script); |
|
| 314 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) { |
|
| 315 | 315 | $scriptsrc = $tmpscriptsrc; |
| 316 | 316 | $this->alreadyminified = true; |
| 317 | - } else if ( $this->can_inject_late($script) ) { |
|
| 317 | + } else if ($this->can_inject_late($script)) { |
|
| 318 | 318 | $scriptsrc = self::build_injectlater_marker($script, md5($scriptsrc)); |
| 319 | 319 | } |
| 320 | - $this->jscode .= "\n" . $scriptsrc; |
|
| 320 | + $this->jscode .= "\n".$scriptsrc; |
|
| 321 | 321 | }/*else{ |
| 322 | 322 | //Couldn't read JS. Maybe getpath isn't working? |
| 323 | 323 | }*/ |
@@ -325,32 +325,32 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | // Check for already-minified code |
| 328 | - $this->md5hash = md5( $this->jscode ); |
|
| 328 | + $this->md5hash = md5($this->jscode); |
|
| 329 | 329 | $ccheck = new autoptimizeCache($this->md5hash, 'js'); |
| 330 | - if ( $ccheck->check() ) { |
|
| 330 | + if ($ccheck->check()) { |
|
| 331 | 331 | $this->jscode = $ccheck->retrieve(); |
| 332 | 332 | return true; |
| 333 | 333 | } |
| 334 | - unset( $ccheck ); |
|
| 334 | + unset($ccheck); |
|
| 335 | 335 | |
| 336 | 336 | // $this->jscode has all the uncompressed code now. |
| 337 | - if ( true !== $this->alreadyminified ) { |
|
| 338 | - if ( apply_filters( 'autoptimize_js_do_minify', true ) ) { |
|
| 339 | - $tmp_jscode = trim( JSMin::minify( $this->jscode ) ); |
|
| 340 | - if ( ! empty( $tmp_jscode ) ) { |
|
| 337 | + if (true !== $this->alreadyminified) { |
|
| 338 | + if (apply_filters('autoptimize_js_do_minify', true)) { |
|
| 339 | + $tmp_jscode = trim(JSMin::minify($this->jscode)); |
|
| 340 | + if (!empty($tmp_jscode)) { |
|
| 341 | 341 | $this->jscode = $tmp_jscode; |
| 342 | - unset( $tmp_jscode ); |
|
| 342 | + unset($tmp_jscode); |
|
| 343 | 343 | } |
| 344 | - $this->jscode = $this->inject_minified( $this->jscode ); |
|
| 345 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 344 | + $this->jscode = $this->inject_minified($this->jscode); |
|
| 345 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 346 | 346 | return true; |
| 347 | 347 | } else { |
| 348 | - $this->jscode = $this->inject_minified( $this->jscode ); |
|
| 348 | + $this->jscode = $this->inject_minified($this->jscode); |
|
| 349 | 349 | return false; |
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | 352 | |
| 353 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 353 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 354 | 354 | return true; |
| 355 | 355 | } |
| 356 | 356 | |
@@ -358,11 +358,11 @@ discard block |
||
| 358 | 358 | public function cache() |
| 359 | 359 | { |
| 360 | 360 | $cache = new autoptimizeCache($this->md5hash, 'js'); |
| 361 | - if ( ! $cache->check() ) { |
|
| 361 | + if (!$cache->check()) { |
|
| 362 | 362 | // Cache our code |
| 363 | 363 | $cache->cache($this->jscode, 'text/javascript'); |
| 364 | 364 | } |
| 365 | - $this->url = AUTOPTIMIZE_CACHE_URL . $cache->getname(); |
|
| 365 | + $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
|
| 366 | 366 | $this->url = $this->url_replace_cdn($this->url); |
| 367 | 367 | } |
| 368 | 368 | |
@@ -370,43 +370,43 @@ discard block |
||
| 370 | 370 | public function getcontent() |
| 371 | 371 | { |
| 372 | 372 | // Restore the full content |
| 373 | - if ( ! empty( $this->restofcontent ) ) { |
|
| 373 | + if (!empty($this->restofcontent)) { |
|
| 374 | 374 | $this->content .= $this->restofcontent; |
| 375 | 375 | $this->restofcontent = ''; |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | // Add the scripts taking forcehead/ deferred (default) into account |
| 379 | - if ( $this->forcehead ) { |
|
| 380 | - $replaceTag = array( '</head>', 'before' ); |
|
| 379 | + if ($this->forcehead) { |
|
| 380 | + $replaceTag = array('</head>', 'before'); |
|
| 381 | 381 | $defer = ''; |
| 382 | 382 | } else { |
| 383 | - $replaceTag = array( '</body>', 'before' ); |
|
| 383 | + $replaceTag = array('</body>', 'before'); |
|
| 384 | 384 | $defer = 'defer '; |
| 385 | 385 | } |
| 386 | 386 | |
| 387 | - $defer = apply_filters( 'autoptimize_filter_js_defer', $defer ); |
|
| 387 | + $defer = apply_filters('autoptimize_filter_js_defer', $defer); |
|
| 388 | 388 | |
| 389 | - $bodyreplacementpayload = '<script type="text/javascript" ' . $defer . 'src="' . $this->url . '"></script>'; |
|
| 390 | - $bodyreplacementpayload = apply_filters( 'autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload ); |
|
| 389 | + $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>'; |
|
| 390 | + $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload); |
|
| 391 | 391 | |
| 392 | - $bodyreplacement = implode( '', $this->move['first'] ); |
|
| 392 | + $bodyreplacement = implode('', $this->move['first']); |
|
| 393 | 393 | $bodyreplacement .= $bodyreplacementpayload; |
| 394 | - $bodyreplacement .= implode( '', $this->move['last'] ); |
|
| 394 | + $bodyreplacement .= implode('', $this->move['last']); |
|
| 395 | 395 | |
| 396 | - $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag ); |
|
| 396 | + $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag); |
|
| 397 | 397 | |
| 398 | - if ( strlen( $this->jscode ) > 0 ) { |
|
| 399 | - $this->inject_in_html( $bodyreplacement, $replaceTag ); |
|
| 398 | + if (strlen($this->jscode) > 0) { |
|
| 399 | + $this->inject_in_html($bodyreplacement, $replaceTag); |
|
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | // Restore comments. |
| 403 | - $this->content = $this->restore_comments( $this->content ); |
|
| 403 | + $this->content = $this->restore_comments($this->content); |
|
| 404 | 404 | |
| 405 | 405 | // Restore IE hacks. |
| 406 | - $this->content = $this->restore_iehacks( $this->content ); |
|
| 406 | + $this->content = $this->restore_iehacks($this->content); |
|
| 407 | 407 | |
| 408 | 408 | // Restore noptimize. |
| 409 | - $this->content = $this->restore_noptimize( $this->content ); |
|
| 409 | + $this->content = $this->restore_noptimize($this->content); |
|
| 410 | 410 | |
| 411 | 411 | // Return the modified HTML. |
| 412 | 412 | return $this->content; |
@@ -415,32 +415,32 @@ discard block |
||
| 415 | 415 | // Checks against the white- and blacklists |
| 416 | 416 | private function ismergeable($tag) |
| 417 | 417 | { |
| 418 | - if ( ! $this->aggregate ) { |
|
| 418 | + if (!$this->aggregate) { |
|
| 419 | 419 | return false; |
| 420 | 420 | } |
| 421 | 421 | |
| 422 | - if ( ! empty( $this->whitelist ) ) { |
|
| 423 | - foreach ( $this->whitelist as $match ) { |
|
| 424 | - if (false !== strpos( $tag, $match ) ) { |
|
| 422 | + if (!empty($this->whitelist)) { |
|
| 423 | + foreach ($this->whitelist as $match) { |
|
| 424 | + if (false !== strpos($tag, $match)) { |
|
| 425 | 425 | return true; |
| 426 | 426 | } |
| 427 | 427 | } |
| 428 | 428 | // no match with whitelist |
| 429 | 429 | return false; |
| 430 | 430 | } else { |
| 431 | - foreach($this->domove as $match) { |
|
| 432 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 431 | + foreach ($this->domove as $match) { |
|
| 432 | + if (false !== strpos($tag, $match)) { |
|
| 433 | 433 | // Matched something |
| 434 | 434 | return false; |
| 435 | 435 | } |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | - if ( $this->movetolast($tag) ) { |
|
| 438 | + if ($this->movetolast($tag)) { |
|
| 439 | 439 | return false; |
| 440 | 440 | } |
| 441 | 441 | |
| 442 | - foreach( $this->dontmove as $match ) { |
|
| 443 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 442 | + foreach ($this->dontmove as $match) { |
|
| 443 | + if (false !== strpos($tag, $match)) { |
|
| 444 | 444 | // Matched something |
| 445 | 445 | return false; |
| 446 | 446 | } |
@@ -454,23 +454,23 @@ discard block |
||
| 454 | 454 | // Checks agains the blacklist |
| 455 | 455 | private function ismovable($tag) |
| 456 | 456 | { |
| 457 | - if ( true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) { |
|
| 457 | + if (true !== $this->include_inline || apply_filters('autoptimize_filter_js_unmovable', true)) { |
|
| 458 | 458 | return false; |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - foreach ( $this->domove as $match ) { |
|
| 462 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 461 | + foreach ($this->domove as $match) { |
|
| 462 | + if (false !== strpos($tag, $match)) { |
|
| 463 | 463 | // Matched something |
| 464 | 464 | return true; |
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | |
| 468 | - if ( $this->movetolast($tag) ) { |
|
| 468 | + if ($this->movetolast($tag)) { |
|
| 469 | 469 | return true; |
| 470 | 470 | } |
| 471 | 471 | |
| 472 | - foreach ( $this->dontmove as $match ) { |
|
| 473 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 472 | + foreach ($this->dontmove as $match) { |
|
| 473 | + if (false !== strpos($tag, $match)) { |
|
| 474 | 474 | // Matched something |
| 475 | 475 | return false; |
| 476 | 476 | } |
@@ -482,8 +482,8 @@ discard block |
||
| 482 | 482 | |
| 483 | 483 | private function movetolast($tag) |
| 484 | 484 | { |
| 485 | - foreach ( $this->domovelast as $match ) { |
|
| 486 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 485 | + foreach ($this->domovelast as $match) { |
|
| 486 | + if (false !== strpos($tag, $match)) { |
|
| 487 | 487 | // Matched, return true |
| 488 | 488 | return true; |
| 489 | 489 | } |
@@ -504,11 +504,11 @@ discard block |
||
| 504 | 504 | * @return bool |
| 505 | 505 | */ |
| 506 | 506 | private function can_inject_late($jsPath) { |
| 507 | - $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false ); |
|
| 508 | - if ( true !== $this->inject_min_late ) { |
|
| 507 | + $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false); |
|
| 508 | + if (true !== $this->inject_min_late) { |
|
| 509 | 509 | // late-inject turned off |
| 510 | 510 | return false; |
| 511 | - } else if ( ( false === strpos( $jsPath, 'min.js' ) ) && ( false === strpos( $jsPath, 'wp-includes/js/jquery/jquery.js' ) ) && ( str_replace( $consider_minified_array, '', $jsPath ) === $jsPath ) ) { |
|
| 511 | + } else if ((false === strpos($jsPath, 'min.js')) && (false === strpos($jsPath, 'wp-includes/js/jquery/jquery.js')) && (str_replace($consider_minified_array, '', $jsPath) === $jsPath)) { |
|
| 512 | 512 | // file not minified based on filename & filter |
| 513 | 513 | return false; |
| 514 | 514 | } else { |
@@ -535,26 +535,26 @@ discard block |
||
| 535 | 535 | * |
| 536 | 536 | * @return bool|string Url pointing to the minified js file or false. |
| 537 | 537 | */ |
| 538 | - public function minify_single( $filepath, $cache_miss = false ) |
|
| 538 | + public function minify_single($filepath, $cache_miss = false) |
|
| 539 | 539 | { |
| 540 | - $contents = $this->prepare_minify_single( $filepath ); |
|
| 540 | + $contents = $this->prepare_minify_single($filepath); |
|
| 541 | 541 | |
| 542 | - if ( empty( $contents ) ) { |
|
| 542 | + if (empty($contents)) { |
|
| 543 | 543 | return false; |
| 544 | 544 | } |
| 545 | 545 | |
| 546 | 546 | // Check cache. |
| 547 | - $hash = 'single_' . md5( $contents ); |
|
| 548 | - $cache = new autoptimizeCache( $hash, 'js' ); |
|
| 547 | + $hash = 'single_'.md5($contents); |
|
| 548 | + $cache = new autoptimizeCache($hash, 'js'); |
|
| 549 | 549 | |
| 550 | 550 | // If not in cache already, minify... |
| 551 | - if ( ! $cache->check() || $cache_miss ) { |
|
| 552 | - $contents = trim( JSMin::minify( $contents ) ); |
|
| 551 | + if (!$cache->check() || $cache_miss) { |
|
| 552 | + $contents = trim(JSMin::minify($contents)); |
|
| 553 | 553 | // Store in cache. |
| 554 | - $cache->cache( $contents, 'text/javascript' ); |
|
| 554 | + $cache->cache($contents, 'text/javascript'); |
|
| 555 | 555 | } |
| 556 | 556 | |
| 557 | - $url = $this->build_minify_single_url( $cache ); |
|
| 557 | + $url = $this->build_minify_single_url($cache); |
|
| 558 | 558 | |
| 559 | 559 | return $url; |
| 560 | 560 | } |
