futtta /
autoptimize
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php exit; |
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 4 | +if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
| 6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 6 | +if (!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 7 | 7 | $_SERVER['HTTP_USER_AGENT'] = ''; |
| 8 | 8 | |
| 9 | 9 | // Determine supported compression method |
@@ -27,27 +27,27 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 30 | +if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 31 | 31 | $encoding = 'none'; |
| 32 | 32 | |
| 33 | 33 | //Get data |
| 34 | 34 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 35 | 35 | |
| 36 | 36 | // first check if we have to send 304 |
| 37 | -$eTag=md5($contents); |
|
| 38 | -$modTime=filemtime(__FILE__.'.none'); |
|
| 37 | +$eTag = md5($contents); |
|
| 38 | +$modTime = filemtime(__FILE__.'.none'); |
|
| 39 | 39 | |
| 40 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); |
|
| 40 | +$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag)); |
|
| 41 | 41 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 42 | 42 | |
| 43 | -if (($modTimeMatch)||($eTagMatch)) { |
|
| 43 | +if (($modTimeMatch) || ($eTagMatch)) { |
|
| 44 | 44 | header('HTTP/1.1 304 Not Modified'); |
| 45 | 45 | header('Connection: close'); |
| 46 | 46 | } else { |
| 47 | 47 | // send all sorts of headers |
| 48 | - $expireTime=60*60*24*356; // 1y max according to RFC |
|
| 48 | + $expireTime = 60*60*24*356; // 1y max according to RFC |
|
| 49 | 49 | |
| 50 | - if(isset($encoding) && $encoding != 'none') |
|
| 50 | + if (isset($encoding) && $encoding != 'none') |
|
| 51 | 51 | { |
| 52 | 52 | header('Content-Encoding: '.$encoding); |
| 53 | 53 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | header('Content-type: %%CONTENT%%; charset=utf-8'); |
| 57 | 57 | header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
| 58 | 58 | header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years |
| 59 | - header('ETag: ' . $eTag); |
|
| 59 | + header('ETag: '.$eTag); |
|
| 60 | 60 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
| 61 | 61 | |
| 62 | 62 | // send output |
@@ -1,10 +1,12 @@ discard block |
||
| 1 | 1 | <?php exit; |
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 4 | +if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) { |
|
| 5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
| 6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 6 | +} |
|
| 7 | +if(!isset($_SERVER['HTTP_USER_AGENT'])) { |
|
| 7 | 8 | $_SERVER['HTTP_USER_AGENT'] = ''; |
| 9 | +} |
|
| 8 | 10 | |
| 9 | 11 | // Determine supported compression method |
| 10 | 12 | $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'); |
@@ -19,16 +21,19 @@ discard block |
||
| 19 | 21 | { |
| 20 | 22 | $version = floatval($matches[1]); |
| 21 | 23 | |
| 22 | - if ($version < 6) |
|
| 23 | - $encoding = 'none'; |
|
| 24 | + if ($version < 6) { |
|
| 25 | + $encoding = 'none'; |
|
| 26 | + } |
|
| 24 | 27 | |
| 25 | - if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
| 26 | - $encoding = 'none'; |
|
| 27 | -} |
|
| 28 | + if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) { |
|
| 29 | + $encoding = 'none'; |
|
| 30 | + } |
|
| 31 | + } |
|
| 28 | 32 | |
| 29 | 33 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 34 | +if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) { |
|
| 31 | 35 | $encoding = 'none'; |
| 36 | +} |
|
| 32 | 37 | |
| 33 | 38 | //Get data |
| 34 | 39 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php exit; |
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 4 | +if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
| 6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 6 | +if (!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 7 | 7 | $_SERVER['HTTP_USER_AGENT'] = ''; |
| 8 | 8 | |
| 9 | 9 | // Determine supported compression method |
@@ -27,16 +27,16 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 30 | +if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 31 | 31 | $encoding = 'none'; |
| 32 | 32 | |
| 33 | 33 | $iscompressed = file_exists(__FILE__.'.'.$encoding); |
| 34 | -if($encoding != 'none' && $iscompressed == false) |
|
| 34 | +if ($encoding != 'none' && $iscompressed == false) |
|
| 35 | 35 | { |
| 36 | 36 | $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
| 37 | 37 | $code = file_get_contents(__FILE__.'.none'); |
| 38 | - $contents = gzencode($code,9,$flag); |
|
| 39 | -}else{ |
|
| 38 | + $contents = gzencode($code, 9, $flag); |
|
| 39 | +} else { |
|
| 40 | 40 | //Get data |
| 41 | 41 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 42 | 42 | } |
@@ -44,18 +44,18 @@ discard block |
||
| 44 | 44 | // first check if we have to send 304 |
| 45 | 45 | // inspired by http://www.jonasjohn.de/snippets/php/caching.htm |
| 46 | 46 | |
| 47 | -$eTag=md5($contents); |
|
| 48 | -$modTime=filemtime(__FILE__.'.none'); |
|
| 47 | +$eTag = md5($contents); |
|
| 48 | +$modTime = filemtime(__FILE__.'.none'); |
|
| 49 | 49 | |
| 50 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); |
|
| 50 | +$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag)); |
|
| 51 | 51 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 52 | 52 | |
| 53 | -if (($modTimeMatch)||($eTagMatch)) { |
|
| 53 | +if (($modTimeMatch) || ($eTagMatch)) { |
|
| 54 | 54 | header('HTTP/1.1 304 Not Modified'); |
| 55 | 55 | header('Connection: close'); |
| 56 | 56 | } else { |
| 57 | 57 | // send all sorts of headers |
| 58 | - $expireTime=60*60*24*355; // 1y max according to RFC |
|
| 58 | + $expireTime = 60*60*24*355; // 1y max according to RFC |
|
| 59 | 59 | if ($encoding != 'none') { |
| 60 | 60 | header('Content-Encoding: '.$encoding); |
| 61 | 61 | } |
@@ -64,22 +64,22 @@ discard block |
||
| 64 | 64 | header('Content-type: %%CONTENT%%; charset=utf-8'); |
| 65 | 65 | header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
| 66 | 66 | header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
| 67 | - header('ETag: ' . $eTag); |
|
| 67 | + header('ETag: '.$eTag); |
|
| 68 | 68 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
| 69 | 69 | |
| 70 | 70 | // send output |
| 71 | 71 | echo $contents; |
| 72 | 72 | |
| 73 | 73 | //And write to filesystem cache if not done yet |
| 74 | - if($encoding != 'none' && $iscompressed == false) |
|
| 74 | + if ($encoding != 'none' && $iscompressed == false) |
|
| 75 | 75 | { |
| 76 | 76 | //Write the content we sent |
| 77 | - file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
| 77 | + file_put_contents(__FILE__.'.'.$encoding, $contents); |
|
| 78 | 78 | |
| 79 | 79 | //And write the new content |
| 80 | 80 | $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
| 81 | 81 | $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
| 82 | - $contents = gzencode($code,9,$flag); |
|
| 83 | - file_put_contents(__FILE__.'.'.$ext,$contents); |
|
| 82 | + $contents = gzencode($code, 9, $flag); |
|
| 83 | + file_put_contents(__FILE__.'.'.$ext, $contents); |
|
| 84 | 84 | } |
| 85 | 85 | } |
@@ -1,10 +1,12 @@ discard block |
||
| 1 | 1 | <?php exit; |
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 4 | +if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) { |
|
| 5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
| 6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 6 | +} |
|
| 7 | +if(!isset($_SERVER['HTTP_USER_AGENT'])) { |
|
| 7 | 8 | $_SERVER['HTTP_USER_AGENT'] = ''; |
| 9 | +} |
|
| 8 | 10 | |
| 9 | 11 | // Determine supported compression method |
| 10 | 12 | $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'); |
@@ -19,16 +21,19 @@ discard block |
||
| 19 | 21 | { |
| 20 | 22 | $version = floatval($matches[1]); |
| 21 | 23 | |
| 22 | - if ($version < 6) |
|
| 23 | - $encoding = 'none'; |
|
| 24 | + if ($version < 6) { |
|
| 25 | + $encoding = 'none'; |
|
| 26 | + } |
|
| 24 | 27 | |
| 25 | - if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
| 26 | - $encoding = 'none'; |
|
| 27 | -} |
|
| 28 | + if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) { |
|
| 29 | + $encoding = 'none'; |
|
| 30 | + } |
|
| 31 | + } |
|
| 28 | 32 | |
| 29 | 33 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 34 | +if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) { |
|
| 31 | 35 | $encoding = 'none'; |
| 36 | +} |
|
| 32 | 37 | |
| 33 | 38 | $iscompressed = file_exists(__FILE__.'.'.$encoding); |
| 34 | 39 | if($encoding != 'none' && $iscompressed == false) |
@@ -36,7 +41,7 @@ discard block |
||
| 36 | 41 | $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
| 37 | 42 | $code = file_get_contents(__FILE__.'.none'); |
| 38 | 43 | $contents = gzencode($code,9,$flag); |
| 39 | -}else{ |
|
| 44 | +} else{ |
|
| 40 | 45 | //Get data |
| 41 | 46 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 42 | 47 | } |
@@ -4,45 +4,45 @@ discard block |
||
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | $majorUp = false; |
| 7 | -$autoptimize_major_version=substr($autoptimize_db_version,0,3); |
|
| 7 | +$autoptimize_major_version = substr($autoptimize_db_version, 0, 3); |
|
| 8 | 8 | |
| 9 | -switch($autoptimize_major_version) { |
|
| 9 | +switch ($autoptimize_major_version) { |
|
| 10 | 10 | case "1.6": |
| 11 | 11 | // from back in the days when I did not yet consider multisite |
| 12 | 12 | // if user was on version 1.6.x, force advanced options to be shown by default |
| 13 | - update_option('autoptimize_show_adv','1'); |
|
| 13 | + update_option('autoptimize_show_adv', '1'); |
|
| 14 | 14 | |
| 15 | 15 | // and remove old options |
| 16 | - $to_delete_options=array("autoptimize_cdn_css","autoptimize_cdn_css_url","autoptimize_cdn_js","autoptimize_cdn_js_url","autoptimize_cdn_img","autoptimize_cdn_img_url","autoptimize_css_yui","autoptimize_js_yui"); |
|
| 16 | + $to_delete_options = array("autoptimize_cdn_css", "autoptimize_cdn_css_url", "autoptimize_cdn_js", "autoptimize_cdn_js_url", "autoptimize_cdn_img", "autoptimize_cdn_img_url", "autoptimize_css_yui", "autoptimize_js_yui"); |
|
| 17 | 17 | foreach ($to_delete_options as $del_opt) { |
| 18 | - delete_option( $del_opt ); |
|
| 18 | + delete_option($del_opt); |
|
| 19 | 19 | } |
| 20 | 20 | $majorUp = true; |
| 21 | 21 | case "1.7": |
| 22 | 22 | // force 3.8 dashicons in CSS exclude options when upgrading from 1.7 to 1.8 |
| 23 | - if ( !is_multisite() ) { |
|
| 23 | + if (!is_multisite()) { |
|
| 24 | 24 | $css_exclude = get_option('autoptimize_css_exclude'); |
| 25 | 25 | if (empty($css_exclude)) { |
| 26 | 26 | $css_exclude = "admin-bar.min.css, dashicons.min.css"; |
| 27 | - } else if (strpos($css_exclude,"dashicons.min.css")===false) { |
|
| 27 | + } else if (strpos($css_exclude, "dashicons.min.css") === false) { |
|
| 28 | 28 | $css_exclude .= ", dashicons.min.css"; |
| 29 | 29 | } |
| 30 | - update_option('autoptimize_css_exclude',$css_exclude); |
|
| 30 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 31 | 31 | } else { |
| 32 | 32 | global $wpdb; |
| 33 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 33 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 34 | 34 | $original_blog_id = get_current_blog_id(); |
| 35 | - foreach ( $blog_ids as $blog_id ) { |
|
| 36 | - switch_to_blog( $blog_id ); |
|
| 35 | + foreach ($blog_ids as $blog_id) { |
|
| 36 | + switch_to_blog($blog_id); |
|
| 37 | 37 | $css_exclude = get_option('autoptimize_css_exclude'); |
| 38 | 38 | if (empty($css_exclude)) { |
| 39 | 39 | $css_exclude = "admin-bar.min.css, dashicons.min.css"; |
| 40 | - } else if (strpos($css_exclude,"dashicons.min.css")===false) { |
|
| 40 | + } else if (strpos($css_exclude, "dashicons.min.css") === false) { |
|
| 41 | 41 | $css_exclude .= ", dashicons.min.css"; |
| 42 | 42 | } |
| 43 | - update_option('autoptimize_css_exclude',$css_exclude); |
|
| 43 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 44 | 44 | } |
| 45 | - switch_to_blog( $original_blog_id ); |
|
| 45 | + switch_to_blog($original_blog_id); |
|
| 46 | 46 | } |
| 47 | 47 | $majorUp = true; |
| 48 | 48 | case "1.9": |
@@ -50,24 +50,24 @@ discard block |
||
| 50 | 50 | * 2.0 will not aggregate inline CSS/JS by default, but we want users |
| 51 | 51 | * upgrading from 1.9 to keep their inline code aggregated by default. |
| 52 | 52 | */ |
| 53 | - if ( !is_multisite() ) { |
|
| 54 | - update_option('autoptimize_css_include_inline','on'); |
|
| 55 | - update_option('autoptimize_js_include_inline','on'); |
|
| 53 | + if (!is_multisite()) { |
|
| 54 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 55 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 56 | 56 | } else { |
| 57 | 57 | global $wpdb; |
| 58 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 58 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 59 | 59 | $original_blog_id = get_current_blog_id(); |
| 60 | - foreach ( $blog_ids as $blog_id ) { |
|
| 61 | - switch_to_blog( $blog_id ); |
|
| 62 | - update_option('autoptimize_css_include_inline','on'); |
|
| 63 | - update_option('autoptimize_js_include_inline','on'); |
|
| 60 | + foreach ($blog_ids as $blog_id) { |
|
| 61 | + switch_to_blog($blog_id); |
|
| 62 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 63 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 64 | 64 | } |
| 65 | - switch_to_blog( $original_blog_id ); |
|
| 65 | + switch_to_blog($original_blog_id); |
|
| 66 | 66 | } |
| 67 | 67 | $majorUp = true; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | -if ( $majorUp === true ) { |
|
| 70 | +if ($majorUp === true) { |
|
| 71 | 71 | // clear cache and notify user to check result if major upgrade |
| 72 | 72 | autoptimizeCache::clearall(); |
| 73 | 73 | add_action('admin_notices', 'autoptimize_update_config_notice'); |
@@ -3,52 +3,52 @@ |
||
| 3 | 3 | // hyper cache and gator cache hook into AO, so we don't need to :-) |
| 4 | 4 | |
| 5 | 5 | function autoptimize_flush_pagecache() { |
| 6 | - if(function_exists('wp_cache_clear_cache')) { |
|
| 6 | + if (function_exists('wp_cache_clear_cache')) { |
|
| 7 | 7 | if (is_multisite()) { |
| 8 | 8 | $blog_id = get_current_blog_id(); |
| 9 | 9 | wp_cache_clear_cache($blog_id); |
| 10 | 10 | } else { |
| 11 | 11 | wp_cache_clear_cache(); |
| 12 | 12 | } |
| 13 | - } else if ( has_action('cachify_flush_cache') ) { |
|
| 13 | + } else if (has_action('cachify_flush_cache')) { |
|
| 14 | 14 | do_action('cachify_flush_cache'); |
| 15 | - } else if ( function_exists('w3tc_pgcache_flush') ) { |
|
| 15 | + } else if (function_exists('w3tc_pgcache_flush')) { |
|
| 16 | 16 | w3tc_pgcache_flush(); |
| 17 | - } else if ( function_exists('wp_fast_cache_bulk_delete_all') ) { |
|
| 17 | + } else if (function_exists('wp_fast_cache_bulk_delete_all')) { |
|
| 18 | 18 | wp_fast_cache_bulk_delete_all(); // still to retest |
| 19 | 19 | } else if (class_exists("WpFastestCache")) { |
| 20 | 20 | $wpfc = new WpFastestCache(); |
| 21 | 21 | $wpfc -> deleteCache(); |
| 22 | - } else if ( class_exists("c_ws_plugin__qcache_purging_routines") ) { |
|
| 22 | + } else if (class_exists("c_ws_plugin__qcache_purging_routines")) { |
|
| 23 | 23 | c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache, still to retest |
| 24 | - } else if ( class_exists("zencache") ) { |
|
| 24 | + } else if (class_exists("zencache")) { |
|
| 25 | 25 | zencache::clear(); |
| 26 | - } else if ( class_exists("comet_cache") ) { |
|
| 26 | + } else if (class_exists("comet_cache")) { |
|
| 27 | 27 | comet_cache::clear(); |
| 28 | - } else if ( class_exists("WpeCommon") ) { |
|
| 29 | - if ( apply_filters('autoptimize_flush_wpengine_aggressive', false) ) { |
|
| 30 | - if ( method_exists( "WpeCommon", "purge_memcached" ) ) { |
|
| 28 | + } else if (class_exists("WpeCommon")) { |
|
| 29 | + if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) { |
|
| 30 | + if (method_exists("WpeCommon", "purge_memcached")) { |
|
| 31 | 31 | WpeCommon::purge_memcached(); |
| 32 | 32 | } |
| 33 | - if ( method_exists( "WpeCommon", "clear_maxcdn_cache" ) ) { |
|
| 33 | + if (method_exists("WpeCommon", "clear_maxcdn_cache")) { |
|
| 34 | 34 | WpeCommon::clear_maxcdn_cache(); |
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | - if ( method_exists( "WpeCommon", "purge_varnish_cache" ) ) { |
|
| 37 | + if (method_exists("WpeCommon", "purge_varnish_cache")) { |
|
| 38 | 38 | WpeCommon::purge_varnish_cache(); |
| 39 | 39 | } |
| 40 | - } else if ( function_exists('sg_cachepress_purge_cache') ) { |
|
| 40 | + } else if (function_exists('sg_cachepress_purge_cache')) { |
|
| 41 | 41 | sg_cachepress_purge_cache(); |
| 42 | - } else if(file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')){ |
|
| 42 | + } else if (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) { |
|
| 43 | 43 | // fallback for WP-Super-Cache |
| 44 | 44 | global $cache_path; |
| 45 | 45 | if (is_multisite()) { |
| 46 | 46 | $blog_id = get_current_blog_id(); |
| 47 | - prune_super_cache( get_supercache_dir( $blog_id ), true ); |
|
| 48 | - prune_super_cache( $cache_path . 'blogs/', true ); |
|
| 47 | + prune_super_cache(get_supercache_dir($blog_id), true); |
|
| 48 | + prune_super_cache($cache_path.'blogs/', true); |
|
| 49 | 49 | } else { |
| 50 | - prune_super_cache($cache_path.'supercache/',true); |
|
| 51 | - prune_super_cache($cache_path,true); |
|
| 50 | + prune_super_cache($cache_path.'supercache/', true); |
|
| 51 | + prune_super_cache($cache_path, true); |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /* |
| 5 | 5 | * cachechecker code |
@@ -13,39 +13,39 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | if (is_admin()) { |
| 16 | - add_action('plugins_loaded','ao_cachechecker_setup'); |
|
| 16 | + add_action('plugins_loaded', 'ao_cachechecker_setup'); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | function ao_cachechecker_setup() { |
| 20 | - $doCacheCheck = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true); |
|
| 21 | - $cacheCheckSchedule = wp_get_schedule( 'ao_cachechecker' ); |
|
| 22 | - $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency','daily'); |
|
| 23 | - if (!in_array($AOCCfreq,array('hourly','daily','monthly'))) { |
|
| 24 | - $AOCCfreq='daily'; |
|
| 20 | + $doCacheCheck = (bool) apply_filters('autoptimize_filter_cachecheck_do', true); |
|
| 21 | + $cacheCheckSchedule = wp_get_schedule('ao_cachechecker'); |
|
| 22 | + $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency', 'daily'); |
|
| 23 | + if (!in_array($AOCCfreq, array('hourly', 'daily', 'monthly'))) { |
|
| 24 | + $AOCCfreq = 'daily'; |
|
| 25 | 25 | } |
| 26 | - if ( $doCacheCheck && ( !$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq ) ) { |
|
| 26 | + if ($doCacheCheck && (!$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq)) { |
|
| 27 | 27 | wp_schedule_event(time(), $AOCCfreq, 'ao_cachechecker'); |
| 28 | - } else if ( $cacheCheckSchedule && !$doCacheCheck ) { |
|
| 29 | - wp_clear_scheduled_hook( 'ao_cachechecker' ); |
|
| 28 | + } else if ($cacheCheckSchedule && !$doCacheCheck) { |
|
| 29 | + wp_clear_scheduled_hook('ao_cachechecker'); |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | add_action('ao_cachechecker', 'ao_cachechecker_cronjob'); |
| 34 | 34 | function ao_cachechecker_cronjob() { |
| 35 | - $maxSize = (int) apply_filters( "autoptimize_filter_cachecheck_maxsize", 512000); |
|
| 36 | - $doCacheCheck = (bool) apply_filters( "autoptimize_filter_cachecheck_do", true); |
|
| 37 | - $statArr=autoptimizeCache::stats(); |
|
| 38 | - $cacheSize=round($statArr[1]/1024); |
|
| 39 | - if (($cacheSize>$maxSize) && ($doCacheCheck)) { |
|
| 40 | - update_option("autoptimize_cachesize_notice",true); |
|
| 41 | - if (apply_filters('autoptimize_filter_cachecheck_sendmail',true)) { |
|
| 42 | - $saniSiteUrl=esc_url(site_url()); |
|
| 43 | - $ao_mailto=apply_filters('autoptimize_filter_cachecheck_mailto',get_option('admin_email','')); |
|
| 44 | - $ao_mailsubject=__('Autoptimize cache size warning','autoptimize')." (".$saniSiteUrl.")"; |
|
| 45 | - $ao_mailbody=__('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")"; |
|
| 35 | + $maxSize = (int) apply_filters("autoptimize_filter_cachecheck_maxsize", 512000); |
|
| 36 | + $doCacheCheck = (bool) apply_filters("autoptimize_filter_cachecheck_do", true); |
|
| 37 | + $statArr = autoptimizeCache::stats(); |
|
| 38 | + $cacheSize = round($statArr[1]/1024); |
|
| 39 | + if (($cacheSize > $maxSize) && ($doCacheCheck)) { |
|
| 40 | + update_option("autoptimize_cachesize_notice", true); |
|
| 41 | + if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) { |
|
| 42 | + $saniSiteUrl = esc_url(site_url()); |
|
| 43 | + $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', '')); |
|
| 44 | + $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize')." (".$saniSiteUrl.")"; |
|
| 45 | + $ao_mailbody = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")"; |
|
| 46 | 46 | |
| 47 | 47 | if (!empty($ao_mailto)) { |
| 48 | - $ao_mailresult=wp_mail($ao_mailto,$ao_mailsubject,$ao_mailbody); |
|
| 48 | + $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody); |
|
| 49 | 49 | if (!$ao_mailresult) { |
| 50 | 50 | error_log("Autoptimize could not send cache size warning mail."); |
| 51 | 51 | } |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | add_action('admin_notices', 'autoptimize_cachechecker_notice'); |
| 58 | 58 | function autoptimize_cachechecker_notice() { |
| 59 | - if ((bool) get_option("autoptimize_cachesize_notice",false)) { |
|
| 59 | + if ((bool) get_option("autoptimize_cachesize_notice", false)) { |
|
| 60 | 60 | echo '<div class="notice notice-warning"><p>'; |
| 61 | - _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' ); |
|
| 61 | + _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize'); |
|
| 62 | 62 | echo '</p></div>'; |
| 63 | - update_option("autoptimize_cachesize_notice",false); |
|
| 63 | + update_option("autoptimize_cachesize_notice", false); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -1,5 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | /* |
| 5 | 8 | * cachechecker code |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | class autoptimizeCache { |
| 5 | 5 | private $filename; |
@@ -7,14 +7,14 @@ discard block |
||
| 7 | 7 | private $cachedir; |
| 8 | 8 | private $delayed; |
| 9 | 9 | |
| 10 | - public function __construct($md5,$ext='php') { |
|
| 10 | + public function __construct($md5, $ext = 'php') { |
|
| 11 | 11 | $this->cachedir = AUTOPTIMIZE_CACHE_DIR; |
| 12 | 12 | $this->delayed = AUTOPTIMIZE_CACHE_DELAY; |
| 13 | 13 | $this->nogzip = AUTOPTIMIZE_CACHE_NOGZIP; |
| 14 | - if($this->nogzip == false) { |
|
| 14 | + if ($this->nogzip == false) { |
|
| 15 | 15 | $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.php'; |
| 16 | 16 | } else { |
| 17 | - if (in_array($ext, array("js","css"))) { |
|
| 17 | + if (in_array($ext, array("js", "css"))) { |
|
| 18 | 18 | $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext; |
| 19 | 19 | } else { |
| 20 | 20 | $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext; |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | public function check() { |
| 26 | - if(!file_exists($this->cachedir.$this->filename)) { |
|
| 26 | + if (!file_exists($this->cachedir.$this->filename)) { |
|
| 27 | 27 | // No cached file, sorry |
| 28 | 28 | return false; |
| 29 | 29 | } |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function retrieve() { |
| 35 | - if($this->check()) { |
|
| 36 | - if($this->nogzip == false) { |
|
| 35 | + if ($this->check()) { |
|
| 36 | + if ($this->nogzip == false) { |
|
| 37 | 37 | return file_get_contents($this->cachedir.$this->filename.'.none'); |
| 38 | 38 | } else { |
| 39 | 39 | return file_get_contents($this->cachedir.$this->filename); |
@@ -42,48 +42,48 @@ discard block |
||
| 42 | 42 | return false; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - public function cache($code,$mime) { |
|
| 46 | - if($this->nogzip == false) { |
|
| 45 | + public function cache($code, $mime) { |
|
| 46 | + if ($this->nogzip == false) { |
|
| 47 | 47 | $file = ($this->delayed ? 'delayed.php' : 'default.php'); |
| 48 | 48 | $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'/config/'.$file); |
| 49 | - $phpcode = str_replace(array('%%CONTENT%%','exit;'),array($mime,''),$phpcode); |
|
| 50 | - file_put_contents($this->cachedir.$this->filename,$phpcode, LOCK_EX); |
|
| 51 | - file_put_contents($this->cachedir.$this->filename.'.none',$code, LOCK_EX); |
|
| 52 | - if(!$this->delayed) { |
|
| 49 | + $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode); |
|
| 50 | + file_put_contents($this->cachedir.$this->filename, $phpcode, LOCK_EX); |
|
| 51 | + file_put_contents($this->cachedir.$this->filename.'.none', $code, LOCK_EX); |
|
| 52 | + if (!$this->delayed) { |
|
| 53 | 53 | // Compress now! |
| 54 | - file_put_contents($this->cachedir.$this->filename.'.deflate',gzencode($code,9,FORCE_DEFLATE), LOCK_EX); |
|
| 55 | - file_put_contents($this->cachedir.$this->filename.'.gzip',gzencode($code,9,FORCE_GZIP), LOCK_EX); |
|
| 54 | + file_put_contents($this->cachedir.$this->filename.'.deflate', gzencode($code, 9, FORCE_DEFLATE), LOCK_EX); |
|
| 55 | + file_put_contents($this->cachedir.$this->filename.'.gzip', gzencode($code, 9, FORCE_GZIP), LOCK_EX); |
|
| 56 | 56 | } |
| 57 | 57 | } else { |
| 58 | 58 | // Write code to cache without doing anything else |
| 59 | - file_put_contents($this->cachedir.$this->filename,$code, LOCK_EX); |
|
| 59 | + file_put_contents($this->cachedir.$this->filename, $code, LOCK_EX); |
|
| 60 | 60 | if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) { |
| 61 | 61 | // Create an additional cached gzip file |
| 62 | - file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code,9,FORCE_GZIP), LOCK_EX); |
|
| 62 | + file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code, 9, FORCE_GZIP), LOCK_EX); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public function getname() { |
| 68 | - apply_filters('autoptimize_filter_cache_getname',AUTOPTIMIZE_CACHE_URL.$this->filename); |
|
| 68 | + apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename); |
|
| 69 | 69 | return $this->filename; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | static function clearall() { |
| 73 | - if(!autoptimizeCache::cacheavail()) { |
|
| 73 | + if (!autoptimizeCache::cacheavail()) { |
|
| 74 | 74 | return false; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | // scan the cachedirs |
| 78 | - foreach (array("","js","css") as $scandirName) { |
|
| 78 | + foreach (array("", "js", "css") as $scandirName) { |
|
| 79 | 79 | $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | // clear the cachedirs |
| 83 | 83 | foreach ($scan as $scandirName=>$scanneddir) { |
| 84 | - $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/"; |
|
| 85 | - foreach($scanneddir as $file) { |
|
| 86 | - if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) { |
|
| 84 | + $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/"; |
|
| 85 | + foreach ($scanneddir as $file) { |
|
| 86 | + if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) { |
|
| 87 | 87 | @unlink($thisAoCacheDir.$file); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -98,21 +98,21 @@ discard block |
||
| 98 | 98 | do_action("autoptimize_action_cachepurged"); |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | - add_action("shutdown","autoptimize_do_cachepurged_action",11); |
|
| 101 | + add_action("shutdown", "autoptimize_do_cachepurged_action", 11); |
|
| 102 | 102 | |
| 103 | 103 | // try to purge caching plugins cache-files? |
| 104 | 104 | include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizePageCacheFlush.php'); |
| 105 | - add_action("autoptimize_action_cachepurged","autoptimize_flush_pagecache",10,0); |
|
| 105 | + add_action("autoptimize_action_cachepurged", "autoptimize_flush_pagecache", 10, 0); |
|
| 106 | 106 | |
| 107 | 107 | return true; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - static function stats() { |
|
| 111 | - $AOstats=get_transient("autoptimize_stats"); |
|
| 110 | + static function stats() { |
|
| 111 | + $AOstats = get_transient("autoptimize_stats"); |
|
| 112 | 112 | |
| 113 | 113 | if (empty($AOstats)) { |
| 114 | 114 | // Cache not available :( |
| 115 | - if(!autoptimizeCache::cacheavail()) { |
|
| 115 | + if (!autoptimizeCache::cacheavail()) { |
|
| 116 | 116 | return 0; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -121,28 +121,28 @@ discard block |
||
| 121 | 121 | $size = 0; |
| 122 | 122 | |
| 123 | 123 | // scan the cachedirs |
| 124 | - foreach (array("","js","css") as $scandirName) { |
|
| 124 | + foreach (array("", "js", "css") as $scandirName) { |
|
| 125 | 125 | $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | foreach ($scan as $scandirName=>$scanneddir) { |
| 129 | - $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/"; |
|
| 130 | - foreach($scanneddir as $file) { |
|
| 131 | - if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) { |
|
| 132 | - if(is_file($thisAoCacheDir.$file)) { |
|
| 133 | - if(AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file,'.js') !== false || strpos($file,'.css') !== false || strpos($file,'.img') !== false || strpos($file,'.txt') !== false )) { |
|
| 129 | + $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/"; |
|
| 130 | + foreach ($scanneddir as $file) { |
|
| 131 | + if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) { |
|
| 132 | + if (is_file($thisAoCacheDir.$file)) { |
|
| 133 | + if (AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file, '.js') !== false || strpos($file, '.css') !== false || strpos($file, '.img') !== false || strpos($file, '.txt') !== false)) { |
|
| 134 | 134 | $count++; |
| 135 | - } elseif(!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file,'.none') !== false) { |
|
| 135 | + } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file, '.none') !== false) { |
|
| 136 | 136 | $count++; |
| 137 | 137 | } |
| 138 | - $size+=filesize($thisAoCacheDir.$file); |
|
| 138 | + $size += filesize($thisAoCacheDir.$file); |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | - $AOstats=array($count,$size,time()); |
|
| 144 | - if ($count>100) { |
|
| 145 | - set_transient("autoptimize_stats",$AOstats,HOUR_IN_SECONDS); |
|
| 143 | + $AOstats = array($count, $size, time()); |
|
| 144 | + if ($count > 100) { |
|
| 145 | + set_transient("autoptimize_stats", $AOstats, HOUR_IN_SECONDS); |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | // print the number of instances |
@@ -150,36 +150,36 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | static function cacheavail() { |
| 153 | - if(!defined('AUTOPTIMIZE_CACHE_DIR')) { |
|
| 153 | + if (!defined('AUTOPTIMIZE_CACHE_DIR')) { |
|
| 154 | 154 | // We didn't set a cache |
| 155 | 155 | return false; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - foreach (array("","js","css") as $checkDir) { |
|
| 159 | - if(!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) { |
|
| 158 | + foreach (array("", "js", "css") as $checkDir) { |
|
| 159 | + if (!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) { |
|
| 160 | 160 | return false; |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | /** write index.html here to avoid prying eyes */ |
| 165 | - $indexFile=AUTOPTIMIZE_CACHE_DIR.'/index.html'; |
|
| 166 | - if(!is_file($indexFile)) { |
|
| 167 | - @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
| 165 | + $indexFile = AUTOPTIMIZE_CACHE_DIR.'/index.html'; |
|
| 166 | + if (!is_file($indexFile)) { |
|
| 167 | + @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** write .htaccess here to overrule wp_super_cache */ |
| 171 | - $htAccess=AUTOPTIMIZE_CACHE_DIR.'/.htaccess'; |
|
| 172 | - if(!is_file($htAccess)) { |
|
| 171 | + $htAccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess'; |
|
| 172 | + if (!is_file($htAccess)) { |
|
| 173 | 173 | /** |
| 174 | 174 | * create wp-content/AO_htaccess_tmpl with |
| 175 | 175 | * whatever htaccess rules you might need |
| 176 | 176 | * if you want to override default AO htaccess |
| 177 | 177 | */ |
| 178 | - $htaccess_tmpl=WP_CONTENT_DIR."/AO_htaccess_tmpl"; |
|
| 178 | + $htaccess_tmpl = WP_CONTENT_DIR."/AO_htaccess_tmpl"; |
|
| 179 | 179 | if (is_file($htaccess_tmpl)) { |
| 180 | - $htAccessContent=file_get_contents($htaccess_tmpl); |
|
| 180 | + $htAccessContent = file_get_contents($htaccess_tmpl); |
|
| 181 | 181 | } else if (is_multisite() || AUTOPTIMIZE_CACHE_NOGZIP == false) { |
| 182 | - $htAccessContent='<IfModule mod_headers.c> |
|
| 182 | + $htAccessContent = '<IfModule mod_headers.c> |
|
| 183 | 183 | Header set Vary "Accept-Encoding" |
| 184 | 184 | Header set Cache-Control "max-age=10672000, must-revalidate" |
| 185 | 185 | </IfModule> |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | </Files> |
| 207 | 207 | </IfModule>'; |
| 208 | 208 | } else { |
| 209 | - $htAccessContent='<IfModule mod_headers.c> |
|
| 209 | + $htAccessContent = '<IfModule mod_headers.c> |
|
| 210 | 210 | Header set Vary "Accept-Encoding" |
| 211 | 211 | Header set Cache-Control "max-age=10672000, must-revalidate" |
| 212 | 212 | </IfModule> |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | </Files> |
| 234 | 234 | </IfModule>'; |
| 235 | 235 | } |
| 236 | - @file_put_contents($htAccess,$htAccessContent); |
|
| 236 | + @file_put_contents($htAccess, $htAccessContent); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | // All OK |
@@ -242,22 +242,22 @@ discard block |
||
| 242 | 242 | |
| 243 | 243 | static function checkCacheDir($dir) { |
| 244 | 244 | // Check and create if not exists |
| 245 | - if(!file_exists($dir)) { |
|
| 246 | - @mkdir($dir,0775,true); |
|
| 247 | - if(!file_exists($dir)) { |
|
| 245 | + if (!file_exists($dir)) { |
|
| 246 | + @mkdir($dir, 0775, true); |
|
| 247 | + if (!file_exists($dir)) { |
|
| 248 | 248 | return false; |
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | // check if we can now write |
| 253 | - if(!is_writable($dir)) { |
|
| 253 | + if (!is_writable($dir)) { |
|
| 254 | 254 | return false; |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | // and write index.html here to avoid prying eyes |
| 258 | - $indexFile=$dir.'/index.html'; |
|
| 259 | - if(!is_file($indexFile)) { |
|
| 260 | - @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
| 258 | + $indexFile = $dir.'/index.html'; |
|
| 259 | + if (!is_file($indexFile)) { |
|
| 260 | + @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | return true; |
@@ -1,5 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | class autoptimizeCache { |
| 5 | 8 | private $filename; |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | class autoptimizeHTML extends autoptimizeBase { |
| 5 | 5 | private $keepcomments = false; |
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | $this->keepcomments = (bool) $options['keepcomments']; |
| 11 | 11 | |
| 12 | 12 | // filter to force xhtml |
| 13 | - $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false ); |
|
| 13 | + $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false); |
|
| 14 | 14 | |
| 15 | 15 | // filter to add strings to be excluded from HTML minification |
| 16 | - $excludeHTML = apply_filters( 'autoptimize_filter_html_exclude','' ); |
|
| 17 | - if ($excludeHTML!=="") { |
|
| 18 | - $exclHTMLArr = array_filter(array_map('trim',explode(",",$excludeHTML))); |
|
| 19 | - $this->exclude = array_merge($exclHTMLArr,$this->exclude); |
|
| 16 | + $excludeHTML = apply_filters('autoptimize_filter_html_exclude', ''); |
|
| 17 | + if ($excludeHTML !== "") { |
|
| 18 | + $exclHTMLArr = array_filter(array_map('trim', explode(",", $excludeHTML))); |
|
| 19 | + $this->exclude = array_merge($exclHTMLArr, $this->exclude); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | // Nothing else for HTML |
@@ -25,16 +25,16 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | //Joins and optimizes CSS |
| 27 | 27 | public function minify() { |
| 28 | - $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content ); |
|
| 28 | + $noptimizeHTML = apply_filters('autoptimize_filter_html_noptimize', false, $this->content); |
|
| 29 | 29 | if ($noptimizeHTML) |
| 30 | 30 | return false; |
| 31 | 31 | |
| 32 | - if(class_exists('Minify_HTML')) { |
|
| 32 | + if (class_exists('Minify_HTML')) { |
|
| 33 | 33 | // wrap the to-be-excluded strings in noptimize tags |
| 34 | 34 | foreach ($this->exclude as $exclString) { |
| 35 | - if (strpos($this->content,$exclString)!==false) { |
|
| 36 | - $replString="<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 37 | - $this->content=str_replace($exclString,$replString,$this->content); |
|
| 35 | + if (strpos($this->content, $exclString) !== false) { |
|
| 36 | + $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 37 | + $this->content = str_replace($exclString, $replString, $this->content); |
|
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | $options['xhtml'] = true; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - if (@is_callable(array("Minify_HTML","minify"))) { |
|
| 51 | - $tmp_content = Minify_HTML::minify($this->content,$options); |
|
| 50 | + if (@is_callable(array("Minify_HTML", "minify"))) { |
|
| 51 | + $tmp_content = Minify_HTML::minify($this->content, $options); |
|
| 52 | 52 | if (!empty($tmp_content)) { |
| 53 | 53 | $this->content = $tmp_content; |
| 54 | 54 | unset($tmp_content); |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | // remove the noptimize-wrapper from around the excluded strings |
| 62 | 62 | foreach ($this->exclude as $exclString) { |
| 63 | - $replString="<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 64 | - if (strpos($this->content,$replString)!==false) { |
|
| 65 | - $this->content=str_replace($replString,$exclString,$this->content); |
|
| 63 | + $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 64 | + if (strpos($this->content, $replString) !== false) { |
|
| 65 | + $this->content = str_replace($replString, $exclString, $this->content); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
@@ -1,5 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | class autoptimizeHTML extends autoptimizeBase { |
| 5 | 8 | private $keepcomments = false; |
@@ -26,8 +29,9 @@ discard block |
||
| 26 | 29 | //Joins and optimizes CSS |
| 27 | 30 | public function minify() { |
| 28 | 31 | $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content ); |
| 29 | - if ($noptimizeHTML) |
|
| 30 | - return false; |
|
| 32 | + if ($noptimizeHTML) { |
|
| 33 | + return false; |
|
| 34 | + } |
|
| 31 | 35 | |
| 32 | 36 | if(class_exists('Minify_HTML')) { |
| 33 | 37 | // wrap the to-be-excluded strings in noptimize tags |
@@ -1,5 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | class autoptimizeScripts extends autoptimizeBase { |
| 5 | 8 | private $scripts = array(); |
@@ -22,7 +25,9 @@ discard block |
||
| 22 | 25 | //Reads the page and collects script tags |
| 23 | 26 | public function read($options) { |
| 24 | 27 | $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); |
| 25 | - if ($noptimizeJS) return false; |
|
| 28 | + if ($noptimizeJS) { |
|
| 29 | + return false; |
|
| 30 | + } |
|
| 26 | 31 | |
| 27 | 32 | // only optimize known good JS? |
| 28 | 33 | $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', "" ); |
@@ -65,8 +70,9 @@ discard block |
||
| 65 | 70 | } |
| 66 | 71 | |
| 67 | 72 | //Should we add try-catch? |
| 68 | - if($options['trycatch'] == true) |
|
| 69 | - $this->trycatch = true; |
|
| 73 | + if($options['trycatch'] == true) { |
|
| 74 | + $this->trycatch = true; |
|
| 75 | + } |
|
| 70 | 76 | |
| 71 | 77 | // force js in head? |
| 72 | 78 | if($options['forcehead'] == true) { |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | class autoptimizeScripts extends autoptimizeBase { |
| 5 | 5 | private $scripts = array(); |
| 6 | - private $dontmove = array('document.write','html5.js','show_ads.js','google_ad','blogcatalog.com/w','tweetmeme.com/i','mybloglog.com/','histats.com/js','ads.smowtion.com/ad.js','statcounter.com/counter/counter.js','widgets.amung.us','ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar','intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject','plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize'); |
|
| 7 | - private $domove = array('gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go'); |
|
| 8 | - private $domovelast = array('addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/','jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go'); |
|
| 6 | + private $dontmove = array('document.write', 'html5.js', 'show_ads.js', 'google_ad', 'blogcatalog.com/w', 'tweetmeme.com/i', 'mybloglog.com/', 'histats.com/js', 'ads.smowtion.com/ad.js', 'statcounter.com/counter/counter.js', 'widgets.amung.us', 'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar', 'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject', 'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize'); |
|
| 7 | + private $domove = array('gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go'); |
|
| 8 | + private $domovelast = array('addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/', 'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go'); |
|
| 9 | 9 | private $trycatch = false; |
| 10 | 10 | private $alreadyminified = false; |
| 11 | 11 | private $forcehead = true; |
@@ -21,70 +21,70 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | //Reads the page and collects script tags |
| 23 | 23 | public function read($options) { |
| 24 | - $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); |
|
| 24 | + $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content); |
|
| 25 | 25 | if ($noptimizeJS) return false; |
| 26 | 26 | |
| 27 | 27 | // only optimize known good JS? |
| 28 | - $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', "" ); |
|
| 28 | + $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', ""); |
|
| 29 | 29 | if (!empty($whitelistJS)) { |
| 30 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistJS))); |
|
| 30 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistJS))); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // is there JS we should simply remove |
| 34 | - $removableJS = apply_filters( 'autoptimize_filter_js_removables', ''); |
|
| 34 | + $removableJS = apply_filters('autoptimize_filter_js_removables', ''); |
|
| 35 | 35 | if (!empty($removableJS)) { |
| 36 | - $this->jsremovables = array_filter(array_map('trim',explode(",",$removableJS))); |
|
| 36 | + $this->jsremovables = array_filter(array_map('trim', explode(",", $removableJS))); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // only header? |
| 40 | - if( apply_filters('autoptimize_filter_js_justhead',$options['justhead']) == true ) { |
|
| 41 | - $content = explode('</head>',$this->content,2); |
|
| 40 | + if (apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true) { |
|
| 41 | + $content = explode('</head>', $this->content, 2); |
|
| 42 | 42 | $this->content = $content[0].'</head>'; |
| 43 | 43 | $this->restofcontent = $content[1]; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // include inline? |
| 47 | - if( apply_filters('autoptimize_js_include_inline',$options['include_inline']) == true ) { |
|
| 47 | + if (apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true) { |
|
| 48 | 48 | $this->include_inline = true; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // filter to "late inject minified JS", default to true for now (it is faster) |
| 52 | - $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late',true); |
|
| 52 | + $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true); |
|
| 53 | 53 | |
| 54 | 54 | // filters to override hardcoded do(nt)move(last) array contents (array in, array out!) |
| 55 | - $this->dontmove = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove ); |
|
| 56 | - $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast ); |
|
| 57 | - $this->domove = apply_filters( 'autoptimize_filter_js_domove', $this->domove ); |
|
| 55 | + $this->dontmove = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove); |
|
| 56 | + $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast); |
|
| 57 | + $this->domove = apply_filters('autoptimize_filter_js_domove', $this->domove); |
|
| 58 | 58 | |
| 59 | 59 | // get extra exclusions settings or filter |
| 60 | 60 | $excludeJS = $options['js_exclude']; |
| 61 | - $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS ); |
|
| 62 | - if ($excludeJS!=="") { |
|
| 61 | + $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS); |
|
| 62 | + if ($excludeJS !== "") { |
|
| 63 | 63 | if (is_array($excludeJS)) { |
| 64 | - if(($removeKeys = array_keys($excludeJS,"remove")) !== false) { |
|
| 64 | + if (($removeKeys = array_keys($excludeJS, "remove")) !== false) { |
|
| 65 | 65 | foreach ($removeKeys as $removeKey) { |
| 66 | 66 | unset($excludeJS[$removeKey]); |
| 67 | - $this->jsremovables[]=$removeKey; |
|
| 67 | + $this->jsremovables[] = $removeKey; |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | $exclJSArr = array_keys($excludeJS); |
| 71 | 71 | } else { |
| 72 | - $exclJSArr = array_filter(array_map('trim',explode(",",$excludeJS))); |
|
| 72 | + $exclJSArr = array_filter(array_map('trim', explode(",", $excludeJS))); |
|
| 73 | 73 | } |
| 74 | - $this->dontmove = array_merge($exclJSArr,$this->dontmove); |
|
| 74 | + $this->dontmove = array_merge($exclJSArr, $this->dontmove); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | //Should we add try-catch? |
| 78 | - if($options['trycatch'] == true) |
|
| 78 | + if ($options['trycatch'] == true) |
|
| 79 | 79 | $this->trycatch = true; |
| 80 | 80 | |
| 81 | 81 | // force js in head? |
| 82 | - if($options['forcehead'] == true) { |
|
| 82 | + if ($options['forcehead'] == true) { |
|
| 83 | 83 | $this->forcehead = true; |
| 84 | 84 | } else { |
| 85 | 85 | $this->forcehead = false; |
| 86 | 86 | } |
| 87 | - $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead ); |
|
| 87 | + $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead); |
|
| 88 | 88 | |
| 89 | 89 | // get cdn url |
| 90 | 90 | $this->cdn_url = $options['cdn_url']; |
@@ -99,24 +99,24 @@ discard block |
||
| 99 | 99 | $this->content = $this->hide_comments($this->content); |
| 100 | 100 | |
| 101 | 101 | // Get script files |
| 102 | - if (preg_match_all('#<script.*</script>#Usmi',$this->content,$matches)) { |
|
| 103 | - foreach($matches[0] as $tag) { |
|
| 102 | + if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) { |
|
| 103 | + foreach ($matches[0] as $tag) { |
|
| 104 | 104 | // only consider script aggregation for types whitelisted in should_aggregate-function |
| 105 | - if( !$this->should_aggregate($tag) ) { |
|
| 106 | - $tag=''; |
|
| 105 | + if (!$this->should_aggregate($tag)) { |
|
| 106 | + $tag = ''; |
|
| 107 | 107 | continue; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi',$tag,$source)) { |
|
| 110 | + if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) { |
|
| 111 | 111 | // non-inline script |
| 112 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 113 | - $this->content = str_replace($tag,'',$this->content); |
|
| 112 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 113 | + $this->content = str_replace($tag, '', $this->content); |
|
| 114 | 114 | continue; |
| 115 | 115 | } |
| 116 | - $explUrl = explode('?',$source[2],2); |
|
| 116 | + $explUrl = explode('?', $source[2], 2); |
|
| 117 | 117 | $url = $explUrl[0]; |
| 118 | 118 | $path = $this->getpath($url); |
| 119 | - if($path !== false && preg_match('#\.js$#',$path) && $this->ismergeable($tag)) { |
|
| 119 | + if ($path !== false && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) { |
|
| 120 | 120 | // ok to optimize, add to array |
| 121 | 121 | $this->scripts[] = $path; |
| 122 | 122 | } else { |
@@ -127,14 +127,14 @@ discard block |
||
| 127 | 127 | if (is_array($excludeJS)) { |
| 128 | 128 | // should we add flags? |
| 129 | 129 | foreach ($excludeJS as $exclTag => $exclFlags) { |
| 130 | - if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) { |
|
| 131 | - $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag); |
|
| 130 | + if (strpos($origTag, $exclTag) !== false && in_array($exclFlags, array("async", "defer"))) { |
|
| 131 | + $newTag = str_replace('<script ', '<script '.$exclFlags.' ', $newTag); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | // should we minify the non-aggregated script? |
| 137 | - if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) { |
|
| 137 | + if ($path && apply_filters('autoptimize_filter_js_minify_excluded', false)) { |
|
| 138 | 138 | $_CachedMinifiedUrl = $this->minify_single($path); |
| 139 | 139 | |
| 140 | 140 | // replace orig URL with minified URL from cache if so |
@@ -143,23 +143,23 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | // remove querystring from URL in newTag |
| 146 | - if ( !empty($explUrl[1]) ) { |
|
| 147 | - $newTag = str_replace("?".$explUrl[1],"",$newTag); |
|
| 146 | + if (!empty($explUrl[1])) { |
|
| 147 | + $newTag = str_replace("?".$explUrl[1], "", $newTag); |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // should we move the non-aggregated script? |
| 152 | - if( $this->ismovable($newTag) ) { |
|
| 152 | + if ($this->ismovable($newTag)) { |
|
| 153 | 153 | // can be moved, flags and all |
| 154 | - if( $this->movetolast($newTag) ) { |
|
| 154 | + if ($this->movetolast($newTag)) { |
|
| 155 | 155 | $this->move['last'][] = $newTag; |
| 156 | 156 | } else { |
| 157 | 157 | $this->move['first'][] = $newTag; |
| 158 | 158 | } |
| 159 | 159 | } else { |
| 160 | 160 | // cannot be moved, so if flag was added re-inject altered tag immediately |
| 161 | - if ( $origTag !== $newTag ) { |
|
| 162 | - $this->content = str_replace($origTag,$newTag,$this->content); |
|
| 161 | + if ($origTag !== $newTag) { |
|
| 162 | + $this->content = str_replace($origTag, $newTag, $this->content); |
|
| 163 | 163 | $origTag = ''; |
| 164 | 164 | } |
| 165 | 165 | // and forget about the $tag (not to be touched any more) |
@@ -168,23 +168,23 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | } else { |
| 170 | 170 | // Inline script |
| 171 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 172 | - $this->content = str_replace($tag,'',$this->content); |
|
| 171 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 172 | + $this->content = str_replace($tag, '', $this->content); |
|
| 173 | 173 | continue; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | // unhide comments, as javascript may be wrapped in comment-tags for old times' sake |
| 177 | 177 | $tag = $this->restore_comments($tag); |
| 178 | - if($this->ismergeable($tag) && ( $this->include_inline )) { |
|
| 179 | - preg_match('#<script.*>(.*)</script>#Usmi',$tag,$code); |
|
| 180 | - $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm','$1',$code[1]); |
|
| 181 | - $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/','',$code); |
|
| 178 | + if ($this->ismergeable($tag) && ($this->include_inline)) { |
|
| 179 | + preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code); |
|
| 180 | + $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]); |
|
| 181 | + $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code); |
|
| 182 | 182 | $this->scripts[] = 'INLINE;'.$code; |
| 183 | 183 | } else { |
| 184 | 184 | // Can we move this? |
| 185 | - $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag ); |
|
| 186 | - if( $this->ismovable($tag) || $autoptimize_js_moveable !== '' ) { |
|
| 187 | - if( $this->movetolast($tag) || $autoptimize_js_moveable === 'last' ) { |
|
| 185 | + $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag); |
|
| 186 | + if ($this->ismovable($tag) || $autoptimize_js_moveable !== '') { |
|
| 187 | + if ($this->movetolast($tag) || $autoptimize_js_moveable === 'last') { |
|
| 188 | 188 | $this->move['last'][] = $tag; |
| 189 | 189 | } else { |
| 190 | 190 | $this->move['first'][] = $tag; |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | //Remove the original script tag |
| 202 | - $this->content = str_replace($tag,'',$this->content); |
|
| 202 | + $this->content = str_replace($tag, '', $this->content); |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | return true; |
@@ -211,37 +211,37 @@ discard block |
||
| 211 | 211 | |
| 212 | 212 | //Joins and optimizes JS |
| 213 | 213 | public function minify() { |
| 214 | - foreach($this->scripts as $script) { |
|
| 215 | - if(preg_match('#^INLINE;#',$script)) { |
|
| 214 | + foreach ($this->scripts as $script) { |
|
| 215 | + if (preg_match('#^INLINE;#', $script)) { |
|
| 216 | 216 | //Inline script |
| 217 | - $script = preg_replace('#^INLINE;#','',$script); |
|
| 218 | - $script = rtrim( $script, ";\n\t\r" ) . ';'; |
|
| 217 | + $script = preg_replace('#^INLINE;#', '', $script); |
|
| 218 | + $script = rtrim($script, ";\n\t\r").';'; |
|
| 219 | 219 | //Add try-catch? |
| 220 | - if($this->trycatch) { |
|
| 220 | + if ($this->trycatch) { |
|
| 221 | 221 | $script = 'try{'.$script.'}catch(e){}'; |
| 222 | 222 | } |
| 223 | - $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, "" ); |
|
| 224 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscript) ) { |
|
| 225 | - $script=$tmpscript; |
|
| 226 | - $this->alreadyminified=true; |
|
| 223 | + $tmpscript = apply_filters('autoptimize_js_individual_script', $script, ""); |
|
| 224 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) { |
|
| 225 | + $script = $tmpscript; |
|
| 226 | + $this->alreadyminified = true; |
|
| 227 | 227 | } |
| 228 | - $this->jscode .= "\n" . $script; |
|
| 228 | + $this->jscode .= "\n".$script; |
|
| 229 | 229 | } else { |
| 230 | 230 | //External script |
| 231 | - if($script !== false && file_exists($script) && is_readable($script)) { |
|
| 231 | + if ($script !== false && file_exists($script) && is_readable($script)) { |
|
| 232 | 232 | $scriptsrc = file_get_contents($script); |
| 233 | - $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$scriptsrc); |
|
| 234 | - $scriptsrc = rtrim($scriptsrc,";\n\t\r").';'; |
|
| 233 | + $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc); |
|
| 234 | + $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';'; |
|
| 235 | 235 | //Add try-catch? |
| 236 | - if($this->trycatch) { |
|
| 236 | + if ($this->trycatch) { |
|
| 237 | 237 | $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}'; |
| 238 | 238 | } |
| 239 | - $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script ); |
|
| 240 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc) ) { |
|
| 241 | - $scriptsrc=$tmpscriptsrc; |
|
| 242 | - $this->alreadyminified=true; |
|
| 243 | - } else if ((( strpos($script,"min.js") !== false ) || ( strpos($script,"wp-includes/js/jquery/jquery.js") !== false )) && ( $this->inject_min_late === true )) { |
|
| 244 | - $scriptsrc="/*!%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%*/"; |
|
| 239 | + $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script); |
|
| 240 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) { |
|
| 241 | + $scriptsrc = $tmpscriptsrc; |
|
| 242 | + $this->alreadyminified = true; |
|
| 243 | + } else if (((strpos($script, "min.js") !== false) || (strpos($script, "wp-includes/js/jquery/jquery.js") !== false)) && ($this->inject_min_late === true)) { |
|
| 244 | + $scriptsrc = "/*!%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%*/"; |
|
| 245 | 245 | } |
| 246 | 246 | $this->jscode .= "\n".$scriptsrc; |
| 247 | 247 | }/*else{ |
@@ -252,24 +252,24 @@ discard block |
||
| 252 | 252 | |
| 253 | 253 | //Check for already-minified code |
| 254 | 254 | $this->md5hash = md5($this->jscode); |
| 255 | - $ccheck = new autoptimizeCache($this->md5hash,'js'); |
|
| 256 | - if($ccheck->check()) { |
|
| 255 | + $ccheck = new autoptimizeCache($this->md5hash, 'js'); |
|
| 256 | + if ($ccheck->check()) { |
|
| 257 | 257 | $this->jscode = $ccheck->retrieve(); |
| 258 | 258 | return true; |
| 259 | 259 | } |
| 260 | 260 | unset($ccheck); |
| 261 | 261 | |
| 262 | 262 | //$this->jscode has all the uncompressed code now. |
| 263 | - if ($this->alreadyminified!==true) { |
|
| 264 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 265 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 263 | + if ($this->alreadyminified !== true) { |
|
| 264 | + if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) { |
|
| 265 | + if (@is_callable(array("JSMin", "minify"))) { |
|
| 266 | 266 | $tmp_jscode = trim(JSMin::minify($this->jscode)); |
| 267 | 267 | if (!empty($tmp_jscode)) { |
| 268 | 268 | $this->jscode = $tmp_jscode; |
| 269 | 269 | unset($tmp_jscode); |
| 270 | 270 | } |
| 271 | 271 | $this->jscode = $this->inject_minified($this->jscode); |
| 272 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 272 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 273 | 273 | return true; |
| 274 | 274 | } else { |
| 275 | 275 | $this->jscode = $this->inject_minified($this->jscode); |
@@ -284,11 +284,11 @@ discard block |
||
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | //Caches the JS in uncompressed, deflated and gzipped form. |
| 287 | - public function cache() { |
|
| 288 | - $cache = new autoptimizeCache($this->md5hash,'js'); |
|
| 289 | - if(!$cache->check()) { |
|
| 287 | + public function cache() { |
|
| 288 | + $cache = new autoptimizeCache($this->md5hash, 'js'); |
|
| 289 | + if (!$cache->check()) { |
|
| 290 | 290 | //Cache our code |
| 291 | - $cache->cache($this->jscode,'text/javascript'); |
|
| 291 | + $cache->cache($this->jscode, 'text/javascript'); |
|
| 292 | 292 | } |
| 293 | 293 | $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 294 | 294 | $this->url = $this->url_replace_cdn($this->url); |
@@ -297,32 +297,32 @@ discard block |
||
| 297 | 297 | // Returns the content |
| 298 | 298 | public function getcontent() { |
| 299 | 299 | // Restore the full content |
| 300 | - if(!empty($this->restofcontent)) { |
|
| 300 | + if (!empty($this->restofcontent)) { |
|
| 301 | 301 | $this->content .= $this->restofcontent; |
| 302 | 302 | $this->restofcontent = ''; |
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | // Add the scripts taking forcehead/ deferred (default) into account |
| 306 | - if($this->forcehead == true) { |
|
| 307 | - $replaceTag=array("</head>","before"); |
|
| 308 | - $defer=""; |
|
| 306 | + if ($this->forcehead == true) { |
|
| 307 | + $replaceTag = array("</head>", "before"); |
|
| 308 | + $defer = ""; |
|
| 309 | 309 | } else { |
| 310 | - $replaceTag=array("</body>","before"); |
|
| 311 | - $defer="defer "; |
|
| 310 | + $replaceTag = array("</body>", "before"); |
|
| 311 | + $defer = "defer "; |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | - $defer = apply_filters( 'autoptimize_filter_js_defer', $defer ); |
|
| 314 | + $defer = apply_filters('autoptimize_filter_js_defer', $defer); |
|
| 315 | 315 | $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>'; |
| 316 | - $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload',$bodyreplacementpayload); |
|
| 316 | + $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload); |
|
| 317 | 317 | |
| 318 | - $bodyreplacement = implode('',$this->move['first']); |
|
| 318 | + $bodyreplacement = implode('', $this->move['first']); |
|
| 319 | 319 | $bodyreplacement .= $bodyreplacementpayload; |
| 320 | - $bodyreplacement .= implode('',$this->move['last']); |
|
| 320 | + $bodyreplacement .= implode('', $this->move['last']); |
|
| 321 | 321 | |
| 322 | - $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag ); |
|
| 322 | + $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag); |
|
| 323 | 323 | |
| 324 | - if (strlen($this->jscode)>0) { |
|
| 325 | - $this->inject_in_html($bodyreplacement,$replaceTag); |
|
| 324 | + if (strlen($this->jscode) > 0) { |
|
| 325 | + $this->inject_in_html($bodyreplacement, $replaceTag); |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | // restore comments |
@@ -340,19 +340,19 @@ discard block |
||
| 340 | 340 | |
| 341 | 341 | // Checks against the white- and blacklists |
| 342 | 342 | private function ismergeable($tag) { |
| 343 | - if (apply_filters('autoptimize_filter_js_dontaggregate',false)) { |
|
| 343 | + if (apply_filters('autoptimize_filter_js_dontaggregate', false)) { |
|
| 344 | 344 | return false; |
| 345 | 345 | } else if (!empty($this->whitelist)) { |
| 346 | 346 | foreach ($this->whitelist as $match) { |
| 347 | - if(strpos($tag,$match)!==false) { |
|
| 347 | + if (strpos($tag, $match) !== false) { |
|
| 348 | 348 | return true; |
| 349 | 349 | } |
| 350 | 350 | } |
| 351 | 351 | // no match with whitelist |
| 352 | 352 | return false; |
| 353 | 353 | } else { |
| 354 | - foreach($this->domove as $match) { |
|
| 355 | - if(strpos($tag,$match)!==false) { |
|
| 354 | + foreach ($this->domove as $match) { |
|
| 355 | + if (strpos($tag, $match) !== false) { |
|
| 356 | 356 | // Matched something |
| 357 | 357 | return false; |
| 358 | 358 | } |
@@ -362,8 +362,8 @@ discard block |
||
| 362 | 362 | return false; |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | - foreach($this->dontmove as $match) { |
|
| 366 | - if(strpos($tag,$match)!==false) { |
|
| 365 | + foreach ($this->dontmove as $match) { |
|
| 366 | + if (strpos($tag, $match) !== false) { |
|
| 367 | 367 | //Matched something |
| 368 | 368 | return false; |
| 369 | 369 | } |
@@ -376,12 +376,12 @@ discard block |
||
| 376 | 376 | |
| 377 | 377 | // Checks againstt the blacklist |
| 378 | 378 | private function ismovable($tag) { |
| 379 | - if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) { |
|
| 379 | + if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable', true)) { |
|
| 380 | 380 | return false; |
| 381 | 381 | } |
| 382 | 382 | |
| 383 | - foreach($this->domove as $match) { |
|
| 384 | - if(strpos($tag,$match)!==false) { |
|
| 383 | + foreach ($this->domove as $match) { |
|
| 384 | + if (strpos($tag, $match) !== false) { |
|
| 385 | 385 | // Matched something |
| 386 | 386 | return true; |
| 387 | 387 | } |
@@ -391,8 +391,8 @@ discard block |
||
| 391 | 391 | return true; |
| 392 | 392 | } |
| 393 | 393 | |
| 394 | - foreach($this->dontmove as $match) { |
|
| 395 | - if(strpos($tag,$match)!==false) { |
|
| 394 | + foreach ($this->dontmove as $match) { |
|
| 395 | + if (strpos($tag, $match) !== false) { |
|
| 396 | 396 | // Matched something |
| 397 | 397 | return false; |
| 398 | 398 | } |
@@ -403,8 +403,8 @@ discard block |
||
| 403 | 403 | } |
| 404 | 404 | |
| 405 | 405 | private function movetolast($tag) { |
| 406 | - foreach($this->domovelast as $match) { |
|
| 407 | - if(strpos($tag,$match)!==false) { |
|
| 406 | + foreach ($this->domovelast as $match) { |
|
| 407 | + if (strpos($tag, $match) !== false) { |
|
| 408 | 408 | // Matched, return true |
| 409 | 409 | return true; |
| 410 | 410 | } |
@@ -430,10 +430,10 @@ discard block |
||
| 430 | 430 | * original function by https://github.com/zytzagoo/ on his AO fork, thanks Tomas! |
| 431 | 431 | */ |
| 432 | 432 | public function should_aggregate($tag) { |
| 433 | - preg_match('#<(script[^>]*)>#i',$tag,$scripttag); |
|
| 434 | - if ( strpos($scripttag[1], 'type')===false ) { |
|
| 433 | + preg_match('#<(script[^>]*)>#i', $tag, $scripttag); |
|
| 434 | + if (strpos($scripttag[1], 'type') === false) { |
|
| 435 | 435 | return true; |
| 436 | - } else if ( preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1]) ) { |
|
| 436 | + } else if (preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1])) { |
|
| 437 | 437 | return true; |
| 438 | 438 | } else { |
| 439 | 439 | return false; |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected $inputLength = 0; |
| 69 | 69 | protected $lookAhead = null; |
| 70 | 70 | protected $output = ''; |
| 71 | - protected $lastByteOut = ''; |
|
| 71 | + protected $lastByteOut = ''; |
|
| 72 | 72 | protected $keptComment = ''; |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $mbIntEnc = null; |
| 107 | - if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
|
|
| 107 | + if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
|
|
| 108 | 108 | $mbIntEnc = mb_internal_encoding(); |
| 109 | 109 | mb_internal_encoding('8bit');
|
| 110 | 110 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | && ($this->b === $this->lastByteOut)) {
|
| 122 | 122 | // Don't delete this space. If we do, the addition/subtraction |
| 123 | 123 | // could be parsed as a post-increment |
| 124 | - } elseif (! $this->isAlphaNum($this->b)) {
|
|
| 124 | + } elseif (!$this->isAlphaNum($this->b)) {
|
|
| 125 | 125 | $command = self::ACTION_DELETE_A; |
| 126 | 126 | } |
| 127 | 127 | } elseif ($this->a === "\n") {
|
@@ -132,10 +132,10 @@ discard block |
||
| 132 | 132 | // otherwise mb_strpos will give WARNING |
| 133 | 133 | } elseif ($this->b === null |
| 134 | 134 | || (false === strpos('{[(+-!~', $this->b)
|
| 135 | - && ! $this->isAlphaNum($this->b))) {
|
|
| 135 | + && !$this->isAlphaNum($this->b))) {
|
|
| 136 | 136 | $command = self::ACTION_DELETE_A; |
| 137 | 137 | } |
| 138 | - } elseif (! $this->isAlphaNum($this->a)) {
|
|
| 138 | + } elseif (!$this->isAlphaNum($this->a)) {
|
|
| 139 | 139 | if ($this->b === ' ' |
| 140 | 140 | || ($this->b === "\n" |
| 141 | 141 | && (false === strpos('}])+-"\'', $this->a)))) {
|
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $this->a = $this->b; |
| 192 | 192 | if ($this->a === "'" || $this->a === '"') { // string literal
|
| 193 | 193 | $str = $this->a; // in case needed for exception |
| 194 | - for(;;) {
|
|
| 194 | + for (;;) {
|
|
| 195 | 195 | $this->output .= $this->a; |
| 196 | 196 | $this->lastByteOut = $this->a; |
| 197 | 197 | |
@@ -218,13 +218,13 @@ discard block |
||
| 218 | 218 | case self::ACTION_DELETE_A_B: // 3 |
| 219 | 219 | $this->b = $this->next(); |
| 220 | 220 | if ($this->b === '/' && $this->isRegexpLiteral()) {
|
| 221 | - $this->output .= $this->a . $this->b; |
|
| 221 | + $this->output .= $this->a.$this->b; |
|
| 222 | 222 | $pattern = '/'; // keep entire pattern in case we need to report it in the exception |
| 223 | - for(;;) {
|
|
| 223 | + for (;;) {
|
|
| 224 | 224 | $this->a = $this->get(); |
| 225 | 225 | $pattern .= $this->a; |
| 226 | 226 | if ($this->a === '[') {
|
| 227 | - for(;;) {
|
|
| 227 | + for (;;) {
|
|
| 228 | 228 | $this->output .= $this->a; |
| 229 | 229 | $this->a = $this->get(); |
| 230 | 230 | $pattern .= $this->a; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | if ($this->isEOF($this->a)) {
|
| 240 | 240 | throw new JSMin_UnterminatedRegExpException( |
| 241 | 241 | "JSMin: Unterminated set in RegExp at byte " |
| 242 | - . $this->inputIndex .": {$pattern}");
|
|
| 242 | + . $this->inputIndex.": {$pattern}");
|
|
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | // certainly wasn't keyword |
| 284 | 284 | continue; |
| 285 | 285 | } |
| 286 | - if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {
|
|
| 286 | + if (preg_match("~(^|[\\s\\S])".substr($keyword, 0, -1)."$~", $recentOutput, $m)) {
|
|
| 287 | 287 | if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
|
| 288 | 288 | return true; |
| 289 | 289 | } |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | {
|
| 393 | 393 | $this->get(); |
| 394 | 394 | $comment = ''; |
| 395 | - for(;;) {
|
|
| 395 | + for (;;) {
|
|
| 396 | 396 | $get = $this->get(); |
| 397 | 397 | if ($get === '*') {
|
| 398 | 398 | if ($this->peek() === '/') { // end of comment reached
|
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | // don't prepend a newline if two comments right after one another |
| 404 | 404 | $this->keptComment = "\n"; |
| 405 | 405 | } |
| 406 | - $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n"; |
|
| 406 | + $this->keptComment .= "/*!".substr($comment, 1)."*/\n"; |
|
| 407 | 407 | } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
|
| 408 | 408 | // IE conditional |
| 409 | 409 | $this->keptComment .= "/*{$comment}*/";
|
