futtta /
autoptimize
@@ -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 autoptimizeConfig { |
| 5 | 5 | private $config = null; |
@@ -7,25 +7,25 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | //Singleton: private construct |
| 9 | 9 | private function __construct() { |
| 10 | - if( is_admin() ) { |
|
| 10 | + if (is_admin()) { |
|
| 11 | 11 | //Add the admin page and settings |
| 12 | - add_action('admin_menu',array($this,'addmenu')); |
|
| 13 | - add_action('admin_init',array($this,'registersettings')); |
|
| 12 | + add_action('admin_menu', array($this, 'addmenu')); |
|
| 13 | + add_action('admin_init', array($this, 'registersettings')); |
|
| 14 | 14 | |
| 15 | 15 | //Set meta info |
| 16 | - if(function_exists('plugin_row_meta')) { |
|
| 16 | + if (function_exists('plugin_row_meta')) { |
|
| 17 | 17 | //2.8+ |
| 18 | - add_filter('plugin_row_meta',array($this,'setmeta'),10,2); |
|
| 19 | - } elseif(function_exists('post_class')) { |
|
| 18 | + add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2); |
|
| 19 | + } elseif (function_exists('post_class')) { |
|
| 20 | 20 | //2.7 |
| 21 | 21 | $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
| 22 | - add_filter('plugin_action_links_'.$plugin,array($this,'setmeta')); |
|
| 22 | + add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta')); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | //Clean cache? |
| 26 | - if(get_option('autoptimize_cache_clean')) { |
|
| 26 | + if (get_option('autoptimize_cache_clean')) { |
|
| 27 | 27 | autoptimizeCache::clearall(); |
| 28 | - update_option('autoptimize_cache_clean',0); |
|
| 28 | + update_option('autoptimize_cache_clean', 0); |
|
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | |
@@ -151,27 +151,27 @@ discard block |
||
| 151 | 151 | <div class="wrap"> |
| 152 | 152 | |
| 153 | 153 | <?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?> |
| 154 | -<div class="notice-error notice"><?php echo '<p>' . sprintf( __('<strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href=%s>serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0.','autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"') . '</p>'; ?></div> |
|
| 154 | +<div class="notice-error notice"><?php echo '<p>'.sprintf(__('<strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href=%s>serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0.', 'autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"').'</p>'; ?></div> |
|
| 155 | 155 | <?php } ?> |
| 156 | 156 | |
| 157 | 157 | <div id="autoptimize_main"> |
| 158 | 158 | <div id="ao_title_and_button"> |
| 159 | - <h1 id="ao_title"><?php _e('Autoptimize Settings','autoptimize'); ?> |
|
| 159 | + <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?> |
|
| 160 | 160 | <span id="ao_adv_button"> |
| 161 | 161 | <?php |
| 162 | - if (get_option('autoptimize_show_adv','0')=='1') { |
|
| 162 | + if (get_option('autoptimize_show_adv', '0') == '1') { |
|
| 163 | 163 | ?> |
| 164 | - <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings","autoptimize") ?></span></a> |
|
| 165 | - <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a> |
|
| 164 | + <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a> |
|
| 165 | + <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a> |
|
| 166 | 166 | <style>tr.ao_adv{display:table-row;} li.ao_adv{display:list-item;}</style> |
| 167 | 167 | <?php |
| 168 | - $hiddenClass=""; |
|
| 168 | + $hiddenClass = ""; |
|
| 169 | 169 | } else { |
| 170 | 170 | ?> |
| 171 | - <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings","autoptimize") ?></span></a> |
|
| 172 | - <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a> |
|
| 171 | + <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a> |
|
| 172 | + <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a> |
|
| 173 | 173 | <?php |
| 174 | - $hiddenClass="hidden "; |
|
| 174 | + $hiddenClass = "hidden "; |
|
| 175 | 175 | } |
| 176 | 176 | ?> |
| 177 | 177 | </span> |
@@ -186,164 +186,164 @@ discard block |
||
| 186 | 186 | <ul> |
| 187 | 187 | |
| 188 | 188 | <li class="itemDetail"> |
| 189 | -<h2 class="itemTitle"><?php _e('HTML Options','autoptimize'); ?></h2> |
|
| 189 | +<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2> |
|
| 190 | 190 | <table class="form-table"> |
| 191 | 191 | <tr valign="top"> |
| 192 | -<th scope="row"><?php _e('Optimize HTML Code?','autoptimize'); ?></th> |
|
| 193 | -<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html')?'checked="checked" ':''; ?>/></td> |
|
| 192 | +<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th> |
|
| 193 | +<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 194 | 194 | </tr> |
| 195 | -<tr class="<?php echo $hiddenClass;?>html_sub ao_adv" valign="top"> |
|
| 196 | -<th scope="row"><?php _e('Keep HTML comments?','autoptimize'); ?></th> |
|
| 197 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments')?'checked="checked" ':''; ?>/> |
|
| 198 | -<?php _e('Enable this if you want HTML comments to remain in the page.','autoptimize'); ?></label></td> |
|
| 195 | +<tr class="<?php echo $hiddenClass; ?>html_sub ao_adv" valign="top"> |
|
| 196 | +<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th> |
|
| 197 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/> |
|
| 198 | +<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td> |
|
| 199 | 199 | </tr> |
| 200 | 200 | </table> |
| 201 | 201 | </li> |
| 202 | 202 | |
| 203 | 203 | <li class="itemDetail"> |
| 204 | -<h2 class="itemTitle"><?php _e('JavaScript Options','autoptimize'); ?></h2> |
|
| 204 | +<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2> |
|
| 205 | 205 | <table class="form-table"> |
| 206 | 206 | <tr valign="top"> |
| 207 | -<th scope="row"><?php _e('Optimize JavaScript Code?','autoptimize'); ?></th> |
|
| 208 | -<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js')?'checked="checked" ':''; ?>/></td> |
|
| 207 | +<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th> |
|
| 208 | +<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 209 | 209 | </tr> |
| 210 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 211 | -<th scope="row"><?php _e('Force JavaScript in <head>?','autoptimize'); ?></th> |
|
| 212 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/> |
|
| 213 | -<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.','autoptimize'); ?></label></td> |
|
| 210 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 211 | +<th scope="row"><?php _e('Force JavaScript in <head>?', 'autoptimize'); ?></th> |
|
| 212 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/> |
|
| 213 | +<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td> |
|
| 214 | 214 | </tr> |
| 215 | 215 | <?php if (get_option('autoptimize_js_justhead')) { ?> |
| 216 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 217 | -<th scope="row"><?php _e('Look for scripts only in <head>?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th> |
|
| 218 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/> |
|
| 219 | -<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.','autoptimize'); ?></label></td> |
|
| 216 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 217 | +<th scope="row"><?php _e('Look for scripts only in <head>?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th> |
|
| 218 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
| 219 | +<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td> |
|
| 220 | 220 | </tr> |
| 221 | 221 | <?php } ?> |
| 222 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 223 | -<th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th> |
|
| 224 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/> |
|
| 225 | -<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.','autoptimize'); ?></label></td> |
|
| 222 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 223 | +<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th> |
|
| 224 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/> |
|
| 225 | +<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize'); ?></label></td> |
|
| 226 | 226 | </tr> |
| 227 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 228 | -<th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th> |
|
| 229 | -<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude',"seal.js, js/jquery/jquery.js"); ?>"/><br /> |
|
| 230 | -<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.','autoptimize'); ?></label></td> |
|
| 227 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 228 | +<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th> |
|
| 229 | +<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude', "seal.js, js/jquery/jquery.js"); ?>"/><br /> |
|
| 230 | +<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.', 'autoptimize'); ?></label></td> |
|
| 231 | 231 | </tr> |
| 232 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 233 | -<th scope="row"><?php _e('Add try-catch wrapping?','autoptimize'); ?></th> |
|
| 234 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch')?'checked="checked" ':''; ?>/> |
|
| 235 | -<?php _e('If your scripts break because of a JS-error, you might want to try this.','autoptimize'); ?></label></td> |
|
| 232 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 233 | +<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th> |
|
| 234 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/> |
|
| 235 | +<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td> |
|
| 236 | 236 | </tr> |
| 237 | 237 | </table> |
| 238 | 238 | </li> |
| 239 | 239 | |
| 240 | 240 | <li class="itemDetail"> |
| 241 | -<h2 class="itemTitle"><?php _e('CSS Options','autoptimize'); ?></h2> |
|
| 241 | +<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2> |
|
| 242 | 242 | <table class="form-table"> |
| 243 | 243 | <tr valign="top"> |
| 244 | -<th scope="row"><?php _e('Optimize CSS Code?','autoptimize'); ?></th> |
|
| 245 | -<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css')?'checked="checked" ':''; ?>/></td> |
|
| 244 | +<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th> |
|
| 245 | +<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 246 | 246 | </tr> |
| 247 | -<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top"> |
|
| 248 | -<th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th> |
|
| 249 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/> |
|
| 250 | -<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td> |
|
| 247 | +<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top"> |
|
| 248 | +<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th> |
|
| 249 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/> |
|
| 250 | +<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td> |
|
| 251 | 251 | </tr> |
| 252 | -<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top"> |
|
| 253 | -<th scope="row"><?php _e('Remove Google Fonts?','autoptimize'); ?></th> |
|
| 254 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont')?'checked="checked" ':''; ?>/> |
|
| 255 | -<?php _e('Check this if you don\'t need or want Google Fonts being loaded.','autoptimize'); ?></label></td> |
|
| 252 | +<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top"> |
|
| 253 | +<th scope="row"><?php _e('Remove Google Fonts?', 'autoptimize'); ?></th> |
|
| 254 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont') ? 'checked="checked" ' : ''; ?>/> |
|
| 255 | +<?php _e('Check this if you don\'t need or want Google Fonts being loaded.', 'autoptimize'); ?></label></td> |
|
| 256 | 256 | </tr> |
| 257 | 257 | <?php if (get_option('autoptimize_css_justhead')) { ?> |
| 258 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 259 | -<th scope="row"><?php _e('Look for styles only in <head>?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th> |
|
| 260 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/> |
|
| 261 | -<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td> |
|
| 258 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 259 | +<th scope="row"><?php _e('Look for styles only in <head>?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th> |
|
| 260 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
| 261 | +<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td> |
|
| 262 | 262 | </tr> |
| 263 | 263 | <?php } ?> |
| 264 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 265 | -<th scope="row"><?php _e('Also aggregate inline CSS?','autoptimize'); ?></th> |
|
| 266 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline','1')?'checked="checked" ':''; ?>/> |
|
| 267 | -<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.','autoptimize'); ?></label></td> |
|
| 264 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 265 | +<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th> |
|
| 266 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 267 | +<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td> |
|
| 268 | 268 | </tr> |
| 269 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 270 | -<th scope="row"><?php _e('Inline and Defer CSS?','autoptimize'); ?></th> |
|
| 271 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer')?'checked="checked" ':''; ?>/> |
|
| 272 | -<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!','autoptimize'); ?></label></td> |
|
| 269 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 270 | +<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th> |
|
| 271 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/> |
|
| 272 | +<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!', 'autoptimize'); ?></label></td> |
|
| 273 | 273 | </tr> |
| 274 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv" id="autoptimize_css_defer_inline"> |
|
| 274 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv" id="autoptimize_css_defer_inline"> |
|
| 275 | 275 | <th scope="row"></th> |
| 276 | -<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.','autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td> |
|
| 276 | +<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td> |
|
| 277 | 277 | </tr> |
| 278 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub"> |
|
| 279 | -<th scope="row"><?php _e('Inline all CSS?','autoptimize'); ?></th> |
|
| 280 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline')?'checked="checked" ':''; ?>/> |
|
| 281 | -<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.','autoptimize'); ?></label></td> |
|
| 278 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub"> |
|
| 279 | +<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th> |
|
| 280 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/> |
|
| 281 | +<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.', 'autoptimize'); ?></label></td> |
|
| 282 | 282 | </tr> |
| 283 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub"> |
|
| 284 | -<th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th> |
|
| 285 | -<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','admin-bar.min.css, dashicons.min.css'); ?>"/><br /> |
|
| 286 | -<?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td> |
|
| 283 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub"> |
|
| 284 | +<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th> |
|
| 285 | +<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude', 'admin-bar.min.css, dashicons.min.css'); ?>"/><br /> |
|
| 286 | +<?php _e('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize'); ?></label></td> |
|
| 287 | 287 | </tr> |
| 288 | 288 | </table> |
| 289 | 289 | </li> |
| 290 | 290 | |
| 291 | 291 | <li class="itemDetail"> |
| 292 | -<h2 class="itemTitle"><?php _e('CDN Options','autoptimize'); ?></h2> |
|
| 292 | +<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2> |
|
| 293 | 293 | <table class="form-table"> |
| 294 | 294 | <tr valign="top"> |
| 295 | -<th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th> |
|
| 296 | -<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url',''),array("http","https")); ?>" /><br /> |
|
| 297 | -<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>).','autoptimize'); ?></label></td> |
|
| 295 | +<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th> |
|
| 296 | +<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url', ''), array("http", "https")); ?>" /><br /> |
|
| 297 | +<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>).', 'autoptimize'); ?></label></td> |
|
| 298 | 298 | </tr> |
| 299 | 299 | </table> |
| 300 | 300 | </li> |
| 301 | 301 | |
| 302 | -<li class="<?php echo $hiddenClass;?>itemDetail ao_adv"> |
|
| 303 | -<h2 class="itemTitle"><?php _e('Cache Info','autoptimize'); ?></h2> |
|
| 302 | +<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv"> |
|
| 303 | +<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2> |
|
| 304 | 304 | <table class="form-table" > |
| 305 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 306 | -<th scope="row"><?php _e('Cache folder','autoptimize'); ?></th> |
|
| 305 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 306 | +<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th> |
|
| 307 | 307 | <td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td> |
| 308 | 308 | </tr> |
| 309 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 310 | -<th scope="row"><?php _e('Can we write?','autoptimize'); ?></th> |
|
| 311 | -<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes','autoptimize') : __('No','autoptimize')); ?></td> |
|
| 309 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 310 | +<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th> |
|
| 311 | +<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td> |
|
| 312 | 312 | </tr> |
| 313 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 314 | -<th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th> |
|
| 313 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 314 | +<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th> |
|
| 315 | 315 | <td><?php |
| 316 | - $AOstatArr=autoptimizeCache::stats(); |
|
| 317 | - $AOcacheSize=round($AOstatArr[1]/1024); |
|
| 318 | - printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]) ); |
|
| 316 | + $AOstatArr = autoptimizeCache::stats(); |
|
| 317 | + $AOcacheSize = round($AOstatArr[1]/1024); |
|
| 318 | + printf(__('%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2])); |
|
| 319 | 319 | ?></td> |
| 320 | 320 | </tr> |
| 321 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 322 | -<th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th> |
|
| 323 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/> |
|
| 324 | -<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.','autoptimize'); ?></label></td> |
|
| 321 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 322 | +<th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th> |
|
| 323 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 324 | +<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label></td> |
|
| 325 | 325 | </tr> |
| 326 | 326 | </table> |
| 327 | 327 | </li> |
| 328 | 328 | |
| 329 | -<li class="<?php echo $hiddenClass;?>itemDetail ao_adv"> |
|
| 330 | -<h2 class="itemTitle"><?php _e('Misc Options','autoptimize'); ?></h2> |
|
| 329 | +<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv"> |
|
| 330 | +<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2> |
|
| 331 | 331 | <table class="form-table"> |
| 332 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 333 | -<th scope="row"><?php _e('Also optimize for logged in users?','autoptimize'); ?></th> |
|
| 334 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged','1')?'checked="checked" ':''; ?>/> |
|
| 335 | -<?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.','autoptimize'); ?></label></td> |
|
| 332 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 333 | +<th scope="row"><?php _e('Also optimize for logged in users?', 'autoptimize'); ?></th> |
|
| 334 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 335 | +<?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label></td> |
|
| 336 | 336 | </tr> |
| 337 | 337 | </table> |
| 338 | 338 | </li> |
| 339 | 339 | |
| 340 | 340 | </ul> |
| 341 | 341 | |
| 342 | -<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>"> |
|
| 342 | +<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv', '0'); ?>"> |
|
| 343 | 343 | |
| 344 | 344 | <p class="submit"> |
| 345 | -<input type="submit" class="button-secondary" value="<?php _e('Save Changes','autoptimize') ?>" /> |
|
| 346 | -<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache','autoptimize') ?>" /> |
|
| 345 | +<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize') ?>" /> |
|
| 346 | +<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize') ?>" /> |
|
| 347 | 347 | </p> |
| 348 | 348 | |
| 349 | 349 | </form> |
@@ -352,31 +352,31 @@ discard block |
||
| 352 | 352 | <div class="autoptimize_banner hidden"> |
| 353 | 353 | <ul> |
| 354 | 354 | <?php |
| 355 | - if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) { |
|
| 356 | - $AO_banner=get_transient("autoptimize_banner"); |
|
| 355 | + if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) { |
|
| 356 | + $AO_banner = get_transient("autoptimize_banner"); |
|
| 357 | 357 | if (empty($AO_banner)) { |
| 358 | 358 | $banner_resp = wp_remote_get("http://misc.optimizingmatters.com/autoptimize_news.html"); |
| 359 | 359 | if (!is_wp_error($banner_resp)) { |
| 360 | - if (wp_remote_retrieve_response_code($banner_resp)=="200") { |
|
| 360 | + if (wp_remote_retrieve_response_code($banner_resp) == "200") { |
|
| 361 | 361 | $AO_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp)); |
| 362 | - set_transient("autoptimize_banner",$AO_banner,DAY_IN_SECONDS); |
|
| 362 | + set_transient("autoptimize_banner", $AO_banner, DAY_IN_SECONDS); |
|
| 363 | 363 | } |
| 364 | 364 | } |
| 365 | 365 | } |
| 366 | 366 | echo $AO_banner; |
| 367 | 367 | } |
| 368 | 368 | ?> |
| 369 | - <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.","autoptimize"); ?></li> |
|
| 370 | - <li><?php _e("Happy with Autoptimize?","autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!","autoptimize"); ?></a></li> |
|
| 369 | + <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.", "autoptimize"); ?></li> |
|
| 370 | + <li><?php _e("Happy with Autoptimize?", "autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!", "autoptimize"); ?></a></li> |
|
| 371 | 371 | </ul> |
| 372 | 372 | </div> |
| 373 | 373 | <div style="margin-left:10px;margin-top:-5px;"> |
| 374 | 374 | <h2> |
| 375 | - <?php _e("futtta about","autoptimize") ?> |
|
| 375 | + <?php _e("futtta about", "autoptimize") ?> |
|
| 376 | 376 | <select id="feed_dropdown" > |
| 377 | - <option value="1"><?php _e("Autoptimize","autoptimize") ?></option> |
|
| 378 | - <option value="2"><?php _e("WordPress","autoptimize") ?></option> |
|
| 379 | - <option value="3"><?php _e("Web Technology","autoptimize") ?></option> |
|
| 377 | + <option value="1"><?php _e("Autoptimize", "autoptimize") ?></option> |
|
| 378 | + <option value="2"><?php _e("WordPress", "autoptimize") ?></option> |
|
| 379 | + <option value="3"><?php _e("Web Technology", "autoptimize") ?></option> |
|
| 380 | 380 | </select> |
| 381 | 381 | </h2> |
| 382 | 382 | <div id="futtta_feed"> |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | </div> |
| 392 | 392 | </div> |
| 393 | 393 | </div> |
| 394 | - <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!","autoptimize"); ?>"></a></div> |
|
| 394 | + <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!", "autoptimize"); ?>"></a></div> |
|
| 395 | 395 | </div> |
| 396 | 396 | |
| 397 | 397 | <script type="text/javascript"> |
@@ -530,14 +530,14 @@ discard block |
||
| 530 | 530 | } |
| 531 | 531 | |
| 532 | 532 | public function addmenu() { |
| 533 | - $hook=add_options_page(__('Autoptimize Options','autoptimize'),'Autoptimize','manage_options','autoptimize',array($this,'show')); |
|
| 534 | - add_action( 'admin_print_scripts-'.$hook,array($this,'autoptimize_admin_scripts')); |
|
| 535 | - add_action( 'admin_print_styles-'.$hook,array($this,'autoptimize_admin_styles')); |
|
| 533 | + $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show')); |
|
| 534 | + add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts')); |
|
| 535 | + add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles')); |
|
| 536 | 536 | } |
| 537 | 537 | |
| 538 | 538 | public function autoptimize_admin_scripts() { |
| 539 | - wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'),null,true); |
|
| 540 | - wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'),null,true); |
|
| 539 | + wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true); |
|
| 540 | + wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true); |
|
| 541 | 541 | } |
| 542 | 542 | |
| 543 | 543 | public function autoptimize_admin_styles() { |
@@ -546,47 +546,47 @@ discard block |
||
| 546 | 546 | } |
| 547 | 547 | |
| 548 | 548 | public function registersettings() { |
| 549 | - register_setting('autoptimize','autoptimize_html'); |
|
| 550 | - register_setting('autoptimize','autoptimize_html_keepcomments'); |
|
| 551 | - register_setting('autoptimize','autoptimize_js'); |
|
| 552 | - register_setting('autoptimize','autoptimize_js_exclude'); |
|
| 553 | - register_setting('autoptimize','autoptimize_js_trycatch'); |
|
| 554 | - register_setting('autoptimize','autoptimize_js_justhead'); |
|
| 555 | - register_setting('autoptimize','autoptimize_js_forcehead'); |
|
| 556 | - register_setting('autoptimize','autoptimize_js_include_inline'); |
|
| 557 | - register_setting('autoptimize','autoptimize_css'); |
|
| 558 | - register_setting('autoptimize','autoptimize_css_exclude'); |
|
| 559 | - register_setting('autoptimize','autoptimize_css_justhead'); |
|
| 560 | - register_setting('autoptimize','autoptimize_css_datauris'); |
|
| 561 | - register_setting('autoptimize','autoptimize_css_defer'); |
|
| 562 | - register_setting('autoptimize','autoptimize_css_defer_inline'); |
|
| 563 | - register_setting('autoptimize','autoptimize_css_inline'); |
|
| 564 | - register_setting('autoptimize','autoptimize_css_include_inline'); |
|
| 565 | - register_setting('autoptimize','autoptimize_css_nogooglefont'); |
|
| 566 | - register_setting('autoptimize','autoptimize_cdn_url'); |
|
| 567 | - register_setting('autoptimize','autoptimize_cache_clean'); |
|
| 568 | - register_setting('autoptimize','autoptimize_cache_nogzip'); |
|
| 569 | - register_setting('autoptimize','autoptimize_show_adv'); |
|
| 570 | - register_setting('autoptimize','autoptimize_optimize_logged'); |
|
| 549 | + register_setting('autoptimize', 'autoptimize_html'); |
|
| 550 | + register_setting('autoptimize', 'autoptimize_html_keepcomments'); |
|
| 551 | + register_setting('autoptimize', 'autoptimize_js'); |
|
| 552 | + register_setting('autoptimize', 'autoptimize_js_exclude'); |
|
| 553 | + register_setting('autoptimize', 'autoptimize_js_trycatch'); |
|
| 554 | + register_setting('autoptimize', 'autoptimize_js_justhead'); |
|
| 555 | + register_setting('autoptimize', 'autoptimize_js_forcehead'); |
|
| 556 | + register_setting('autoptimize', 'autoptimize_js_include_inline'); |
|
| 557 | + register_setting('autoptimize', 'autoptimize_css'); |
|
| 558 | + register_setting('autoptimize', 'autoptimize_css_exclude'); |
|
| 559 | + register_setting('autoptimize', 'autoptimize_css_justhead'); |
|
| 560 | + register_setting('autoptimize', 'autoptimize_css_datauris'); |
|
| 561 | + register_setting('autoptimize', 'autoptimize_css_defer'); |
|
| 562 | + register_setting('autoptimize', 'autoptimize_css_defer_inline'); |
|
| 563 | + register_setting('autoptimize', 'autoptimize_css_inline'); |
|
| 564 | + register_setting('autoptimize', 'autoptimize_css_include_inline'); |
|
| 565 | + register_setting('autoptimize', 'autoptimize_css_nogooglefont'); |
|
| 566 | + register_setting('autoptimize', 'autoptimize_cdn_url'); |
|
| 567 | + register_setting('autoptimize', 'autoptimize_cache_clean'); |
|
| 568 | + register_setting('autoptimize', 'autoptimize_cache_nogzip'); |
|
| 569 | + register_setting('autoptimize', 'autoptimize_show_adv'); |
|
| 570 | + register_setting('autoptimize', 'autoptimize_optimize_logged'); |
|
| 571 | 571 | } |
| 572 | 572 | |
| 573 | - public function setmeta($links,$file=null) { |
|
| 573 | + public function setmeta($links, $file = null) { |
|
| 574 | 574 | //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/ |
| 575 | 575 | //Do it only once - saves time |
| 576 | 576 | static $plugin; |
| 577 | - if(empty($plugin)) |
|
| 577 | + if (empty($plugin)) |
|
| 578 | 578 | $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
| 579 | 579 | |
| 580 | - if($file===null) { |
|
| 580 | + if ($file === null) { |
|
| 581 | 581 | //2.7 |
| 582 | 582 | $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')); |
| 583 | - array_unshift($links,$settings_link); |
|
| 583 | + array_unshift($links, $settings_link); |
|
| 584 | 584 | } else { |
| 585 | 585 | //2.8 |
| 586 | 586 | //If it's us, add the link |
| 587 | - if($file === $plugin) { |
|
| 588 | - $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>',__('Settings'))); |
|
| 589 | - $links = array_merge($links,$newlink); |
|
| 587 | + if ($file === $plugin) { |
|
| 588 | + $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'))); |
|
| 589 | + $links = array_merge($links, $newlink); |
|
| 590 | 590 | } |
| 591 | 591 | } |
| 592 | 592 | |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | } |
| 595 | 595 | |
| 596 | 596 | public function get($key) { |
| 597 | - if(!is_array($this->config)) { |
|
| 597 | + if (!is_array($this->config)) { |
|
| 598 | 598 | //Default config |
| 599 | 599 | $config = array('autoptimize_html' => 0, |
| 600 | 600 | 'autoptimize_html_keepcomments' => 0, |
@@ -620,9 +620,9 @@ discard block |
||
| 620 | 620 | ); |
| 621 | 621 | |
| 622 | 622 | //Override with user settings |
| 623 | - foreach(array_keys($config) as $name) { |
|
| 623 | + foreach (array_keys($config) as $name) { |
|
| 624 | 624 | $conf = get_option($name); |
| 625 | - if($conf!==false) { |
|
| 625 | + if ($conf !== false) { |
|
| 626 | 626 | //It was set before! |
| 627 | 627 | $config[$name] = $conf; |
| 628 | 628 | } |
@@ -632,31 +632,31 @@ discard block |
||
| 632 | 632 | $this->config = $config; |
| 633 | 633 | } |
| 634 | 634 | |
| 635 | - if(isset($this->config[$key])) |
|
| 635 | + if (isset($this->config[$key])) |
|
| 636 | 636 | return $this->config[$key]; |
| 637 | 637 | |
| 638 | 638 | return false; |
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | private function getFutttaFeeds($url) { |
| 642 | - if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) { |
|
| 643 | - $rss = fetch_feed( $url ); |
|
| 642 | + if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) { |
|
| 643 | + $rss = fetch_feed($url); |
|
| 644 | 644 | $maxitems = 0; |
| 645 | 645 | |
| 646 | - if ( ! is_wp_error( $rss ) ) { |
|
| 647 | - $maxitems = $rss->get_item_quantity( 7 ); |
|
| 648 | - $rss_items = $rss->get_items( 0, $maxitems ); |
|
| 646 | + if (!is_wp_error($rss)) { |
|
| 647 | + $maxitems = $rss->get_item_quantity(7); |
|
| 648 | + $rss_items = $rss->get_items(0, $maxitems); |
|
| 649 | 649 | } |
| 650 | 650 | ?> |
| 651 | 651 | <ul> |
| 652 | - <?php if ( $maxitems == 0 ) : ?> |
|
| 653 | - <li><?php _e( 'No items', 'autoptimize' ); ?></li> |
|
| 652 | + <?php if ($maxitems == 0) : ?> |
|
| 653 | + <li><?php _e('No items', 'autoptimize'); ?></li> |
|
| 654 | 654 | <?php else : ?> |
| 655 | - <?php foreach ( $rss_items as $item ) : ?> |
|
| 655 | + <?php foreach ($rss_items as $item) : ?> |
|
| 656 | 656 | <li> |
| 657 | - <a href="<?php echo esc_url( $item->get_permalink() ); ?>" |
|
| 658 | - title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>"> |
|
| 659 | - <?php echo esc_html( $item->get_title() ); ?> |
|
| 657 | + <a href="<?php echo esc_url($item->get_permalink()); ?>" |
|
| 658 | + title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>"> |
|
| 659 | + <?php echo esc_html($item->get_title()); ?> |
|
| 660 | 660 | </a> |
| 661 | 661 | </li> |
| 662 | 662 | <?php endforeach; ?> |
@@ -667,20 +667,20 @@ discard block |
||
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | // based on http://wordpress.stackexchange.com/a/58826 |
| 670 | - static function ao_admin_tabs(){ |
|
| 671 | - $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs',array('autoptimize' => __('Main','autoptimize'))); |
|
| 672 | - $tabContent=""; |
|
| 673 | - if (count($tabs)>1) { |
|
| 674 | - if(isset($_GET['page'])){ |
|
| 670 | + static function ao_admin_tabs() { |
|
| 671 | + $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('Main', 'autoptimize'))); |
|
| 672 | + $tabContent = ""; |
|
| 673 | + if (count($tabs) > 1) { |
|
| 674 | + if (isset($_GET['page'])) { |
|
| 675 | 675 | $currentId = $_GET['page']; |
| 676 | 676 | } else { |
| 677 | 677 | $currentId = "autoptimize"; |
| 678 | 678 | } |
| 679 | 679 | $tabContent .= "<h2 class=\"nav-tab-wrapper\">"; |
| 680 | - foreach($tabs as $tabId => $tabName){ |
|
| 681 | - if($currentId == $tabId){ |
|
| 680 | + foreach ($tabs as $tabId => $tabName) { |
|
| 681 | + if ($currentId == $tabId) { |
|
| 682 | 682 | $class = " nav-tab-active"; |
| 683 | - } else{ |
|
| 683 | + } else { |
|
| 684 | 684 | $class = ""; |
| 685 | 685 | } |
| 686 | 686 | $tabContent .= '<a class="nav-tab'.$class.'" href="?page='.$tabId.'">'.$tabName.'</a>'; |
@@ -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 autoptimizeStyles extends autoptimizeBase {
|
| 5 | 5 | |
@@ -23,12 +23,12 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | //Reads the page and collects style tags |
| 25 | 25 | public function read($options) {
|
| 26 | - $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
|
| 26 | + $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
|
|
| 27 | 27 | if ($noptimizeCSS) return false; |
| 28 | 28 | |
| 29 | - $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '' ); |
|
| 29 | + $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '');
|
|
| 30 | 30 | if (!empty($whitelistCSS)) {
|
| 31 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));
|
|
| 31 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));
|
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | if ($options['nogooglefont'] == true) {
|
@@ -36,33 +36,33 @@ discard block |
||
| 36 | 36 | } else {
|
| 37 | 37 | $removableCSS = ""; |
| 38 | 38 | } |
| 39 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS); |
|
| 39 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);
|
|
| 40 | 40 | if (!empty($removableCSS)) {
|
| 41 | - $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
|
|
| 41 | + $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
|
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
|
|
| 44 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
|
|
| 45 | 45 | |
| 46 | 46 | // filter to "late inject minified CSS", default to true for now (it is faster) |
| 47 | - $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
|
|
| 47 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
|
|
| 48 | 48 | |
| 49 | 49 | // Remove everything that's not the header |
| 50 | - if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
|
|
| 51 | - $content = explode('</head>',$this->content,2);
|
|
| 50 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
|
|
| 51 | + $content = explode('</head>', $this->content, 2);
|
|
| 52 | 52 | $this->content = $content[0].'</head>'; |
| 53 | 53 | $this->restofcontent = $content[1]; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // include inline? |
| 57 | - if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
|
|
| 57 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
|
|
| 58 | 58 | $this->include_inline = true; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | // what CSS shouldn't be autoptimized |
| 62 | 62 | $excludeCSS = $options['css_exclude']; |
| 63 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS ); |
|
| 64 | - if ($excludeCSS!=="") {
|
|
| 65 | - $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
|
|
| 63 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS);
|
|
| 64 | + if ($excludeCSS !== "") {
|
|
| 65 | + $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
|
|
| 66 | 66 | } else {
|
| 67 | 67 | $this->dontmove = ""; |
| 68 | 68 | } |
@@ -70,17 +70,17 @@ discard block |
||
| 70 | 70 | // should we defer css? |
| 71 | 71 | // value: true/ false |
| 72 | 72 | $this->defer = $options['defer']; |
| 73 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer ); |
|
| 73 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer);
|
|
| 74 | 74 | |
| 75 | 75 | // should we inline while deferring? |
| 76 | 76 | // value: inlined CSS |
| 77 | 77 | $this->defer_inline = $options['defer_inline']; |
| 78 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline ); |
|
| 78 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline);
|
|
| 79 | 79 | |
| 80 | 80 | // should we inline? |
| 81 | 81 | // value: true/ false |
| 82 | 82 | $this->inline = $options['inline']; |
| 83 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline ); |
|
| 83 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline);
|
|
| 84 | 84 | |
| 85 | 85 | // get cdn url |
| 86 | 86 | $this->cdn_url = $options['cdn_url']; |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $this->content = $this->hide_noptimize($this->content); |
| 93 | 93 | |
| 94 | 94 | // exclude (no)script, as those may contain CSS which should be left as is |
| 95 | - if ( strpos( $this->content, '<script' ) !== false ) {
|
|
| 95 | + if (strpos($this->content, '<script') !== false) {
|
|
| 96 | 96 | $this->content = preg_replace_callback( |
| 97 | 97 | '#<(?:no)?script.*?<\/(?:no)?script>#is', |
| 98 | 98 | create_function( |
@@ -110,65 +110,65 @@ discard block |
||
| 110 | 110 | $this->content = $this->hide_comments($this->content); |
| 111 | 111 | |
| 112 | 112 | // Get <style> and <link> |
| 113 | - if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {
|
|
| 114 | - foreach($matches[0] as $tag) {
|
|
| 115 | - if ($this->isremovable($tag,$this->cssremovables)) {
|
|
| 116 | - $this->content = str_replace($tag,'',$this->content); |
|
| 113 | + if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
|
|
| 114 | + foreach ($matches[0] as $tag) {
|
|
| 115 | + if ($this->isremovable($tag, $this->cssremovables)) {
|
|
| 116 | + $this->content = str_replace($tag, '', $this->content); |
|
| 117 | 117 | } else if ($this->ismovable($tag)) {
|
| 118 | 118 | // Get the media |
| 119 | - if(strpos($tag,'media=')!==false) {
|
|
| 120 | - preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);
|
|
| 121 | - $medias = explode(',',$medias[1]);
|
|
| 119 | + if (strpos($tag, 'media=') !== false) {
|
|
| 120 | + preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
|
|
| 121 | + $medias = explode(',', $medias[1]);
|
|
| 122 | 122 | $media = array(); |
| 123 | - foreach($medias as $elem) {
|
|
| 124 | - if (empty($elem)) { $elem="all"; }
|
|
| 123 | + foreach ($medias as $elem) {
|
|
| 124 | + if (empty($elem)) { $elem = "all"; }
|
|
| 125 | 125 | $media[] = $elem; |
| 126 | 126 | } |
| 127 | 127 | } else {
|
| 128 | 128 | // No media specified - applies to all |
| 129 | 129 | $media = array('all');
|
| 130 | 130 | } |
| 131 | - $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag ); |
|
| 131 | + $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
|
|
| 132 | 132 | |
| 133 | - if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 133 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 134 | 134 | // <link> |
| 135 | - $explUrl = explode('?',$source[2],2);
|
|
| 135 | + $explUrl = explode('?', $source[2], 2);
|
|
| 136 | 136 | $url = $explUrl[0]; |
| 137 | 137 | $path = $this->getpath($url); |
| 138 | 138 | |
| 139 | - if($path!==false && preg_match('#\.css$#',$path)) {
|
|
| 139 | + if ($path !== false && preg_match('#\.css$#', $path)) {
|
|
| 140 | 140 | // Good link |
| 141 | - $this->css[] = array($media,$path); |
|
| 142 | - }else{
|
|
| 141 | + $this->css[] = array($media, $path); |
|
| 142 | + } else {
|
|
| 143 | 143 | // Link is dynamic (.php etc) |
| 144 | 144 | $tag = ''; |
| 145 | 145 | } |
| 146 | 146 | } else {
|
| 147 | 147 | // inline css in style tags can be wrapped in comment tags, so restore comments |
| 148 | 148 | $tag = $this->restore_comments($tag); |
| 149 | - preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
|
|
| 149 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
|
|
| 150 | 150 | |
| 151 | 151 | // and re-hide them to be able to to the removal based on tag |
| 152 | 152 | $tag = $this->hide_comments($tag); |
| 153 | 153 | |
| 154 | - if ( $this->include_inline ) {
|
|
| 155 | - $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
|
|
| 156 | - $this->css[] = array($media,'INLINE;'.$code); |
|
| 154 | + if ($this->include_inline) {
|
|
| 155 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
|
|
| 156 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 157 | 157 | } else {
|
| 158 | 158 | $tag = ''; |
| 159 | 159 | } |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | // Remove the original style tag |
| 163 | - $this->content = str_replace($tag,'',$this->content); |
|
| 163 | + $this->content = str_replace($tag, '', $this->content); |
|
| 164 | 164 | } else {
|
| 165 | 165 | // excluded CSS, minify if getpath |
| 166 | - if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 167 | - $explUrl = explode('?',$source[2],2);
|
|
| 166 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 167 | + $explUrl = explode('?', $source[2], 2);
|
|
| 168 | 168 | $url = $explUrl[0]; |
| 169 | 169 | $path = $this->getpath($url); |
| 170 | 170 | |
| 171 | - if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 171 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded', false)) {
|
|
| 172 | 172 | $_CachedMinifiedUrl = $this->minify_single($path); |
| 173 | 173 | |
| 174 | 174 | if (!empty($_CachedMinifiedUrl)) {
|
@@ -179,12 +179,12 @@ discard block |
||
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | // remove querystring from URL |
| 182 | - if ( !empty($explUrl[1]) ) {
|
|
| 183 | - $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 182 | + if (!empty($explUrl[1])) {
|
|
| 183 | + $newTag = str_replace("?".$explUrl[1], "", $newTag);
|
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | // and replace |
| 187 | - $this->content = str_replace($tag,$newTag,$this->content); |
|
| 187 | + $this->content = str_replace($tag, $newTag, $this->content); |
|
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | } |
@@ -197,29 +197,29 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | // Joins and optimizes CSS |
| 199 | 199 | public function minify() {
|
| 200 | - foreach($this->css as $group) {
|
|
| 201 | - list($media,$css) = $group; |
|
| 202 | - if(preg_match('#^INLINE;#',$css)) {
|
|
| 200 | + foreach ($this->css as $group) {
|
|
| 201 | + list($media, $css) = $group; |
|
| 202 | + if (preg_match('#^INLINE;#', $css)) {
|
|
| 203 | 203 | // <style> |
| 204 | - $css = preg_replace('#^INLINE;#','',$css);
|
|
| 205 | - $css = $this->fixurls(ABSPATH.'/index.php',$css); |
|
| 206 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" ); |
|
| 207 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
|
|
| 208 | - $css=$tmpstyle; |
|
| 209 | - $this->alreadyminified=true; |
|
| 204 | + $css = preg_replace('#^INLINE;#', '', $css);
|
|
| 205 | + $css = $this->fixurls(ABSPATH.'/index.php', $css); |
|
| 206 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
|
|
| 207 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 208 | + $css = $tmpstyle; |
|
| 209 | + $this->alreadyminified = true; |
|
| 210 | 210 | } |
| 211 | 211 | } else {
|
| 212 | 212 | //<link> |
| 213 | - if($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 213 | + if ($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 214 | 214 | $cssPath = $css; |
| 215 | - $css = $this->fixurls($cssPath,file_get_contents($cssPath)); |
|
| 216 | - $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);
|
|
| 217 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath ); |
|
| 215 | + $css = $this->fixurls($cssPath, file_get_contents($cssPath)); |
|
| 216 | + $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
|
|
| 217 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
|
|
| 218 | 218 | if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
| 219 | - $css=$tmpstyle; |
|
| 220 | - $this->alreadyminified=true; |
|
| 221 | - } else if ($this->can_inject_late($cssPath,$css)) {
|
|
| 222 | - $css="%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%"; |
|
| 219 | + $css = $tmpstyle; |
|
| 220 | + $this->alreadyminified = true; |
|
| 221 | + } else if ($this->can_inject_late($cssPath, $css)) {
|
|
| 222 | + $css = "%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%"; |
|
| 223 | 223 | } |
| 224 | 224 | } else {
|
| 225 | 225 | // Couldn't read CSS. Maybe getpath isn't working? |
@@ -227,8 +227,8 @@ discard block |
||
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | - foreach($media as $elem) {
|
|
| 231 | - if(!isset($this->csscode[$elem])) |
|
| 230 | + foreach ($media as $elem) {
|
|
| 231 | + if (!isset($this->csscode[$elem])) |
|
| 232 | 232 | $this->csscode[$elem] = ''; |
| 233 | 233 | $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
| 234 | 234 | } |
@@ -237,12 +237,12 @@ discard block |
||
| 237 | 237 | // Check for duplicate code |
| 238 | 238 | $md5list = array(); |
| 239 | 239 | $tmpcss = $this->csscode; |
| 240 | - foreach($tmpcss as $media => $code) {
|
|
| 240 | + foreach ($tmpcss as $media => $code) {
|
|
| 241 | 241 | $md5sum = md5($code); |
| 242 | 242 | $medianame = $media; |
| 243 | - foreach($md5list as $med => $sum) {
|
|
| 243 | + foreach ($md5list as $med => $sum) {
|
|
| 244 | 244 | // If same code |
| 245 | - if($sum === $md5sum) {
|
|
| 245 | + if ($sum === $md5sum) {
|
|
| 246 | 246 | //Add the merged code |
| 247 | 247 | $medianame = $med.', '.$media; |
| 248 | 248 | $this->csscode[$medianame] = $code; |
@@ -262,30 +262,30 @@ discard block |
||
| 262 | 262 | $external_imports = ""; |
| 263 | 263 | |
| 264 | 264 | // remove comments to avoid importing commented-out imports |
| 265 | - $thiscss_nocomments = preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 265 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 266 | 266 | |
| 267 | - while(preg_match_all('#@import.*(?:;|$)#Um',$thiscss_nocomments,$matches)) {
|
|
| 268 | - foreach($matches[0] as $import) {
|
|
| 269 | - if ($this->isremovable($import,$this->cssremovables)) {
|
|
| 270 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 267 | + while (preg_match_all('#@import.*(?:;|$)#Um', $thiscss_nocomments, $matches)) {
|
|
| 268 | + foreach ($matches[0] as $import) {
|
|
| 269 | + if ($this->isremovable($import, $this->cssremovables)) {
|
|
| 270 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 271 | 271 | $import_ok = true; |
| 272 | 272 | } else {
|
| 273 | - $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");
|
|
| 273 | + $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
|
|
| 274 | 274 | $path = $this->getpath($url); |
| 275 | 275 | $import_ok = false; |
| 276 | 276 | if (file_exists($path) && is_readable($path)) {
|
| 277 | - $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\"); |
|
| 278 | - $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);
|
|
| 279 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" ); |
|
| 280 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 281 | - $code=$tmpstyle; |
|
| 282 | - $this->alreadyminified=true; |
|
| 283 | - } else if ($this->can_inject_late($path,$code)) {
|
|
| 284 | - $code="%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%"; |
|
| 277 | + $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\"); |
|
| 278 | + $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
|
|
| 279 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");
|
|
| 280 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 281 | + $code = $tmpstyle; |
|
| 282 | + $this->alreadyminified = true; |
|
| 283 | + } else if ($this->can_inject_late($path, $code)) {
|
|
| 284 | + $code = "%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%"; |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | - if(!empty($code)) {
|
|
| 288 | - $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);
|
|
| 287 | + if (!empty($code)) {
|
|
| 288 | + $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
|
|
| 289 | 289 | if (!empty($tmp_thiscss)) {
|
| 290 | 290 | $thiscss = $tmp_thiscss; |
| 291 | 291 | $import_ok = true; |
@@ -299,31 +299,31 @@ discard block |
||
| 299 | 299 | if (!$import_ok) {
|
| 300 | 300 | // external imports and general fall-back |
| 301 | 301 | $external_imports .= $import; |
| 302 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 302 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 303 | 303 | $fiximports = true; |
| 304 | 304 | } |
| 305 | 305 | } |
| 306 | - $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);
|
|
| 307 | - $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);
|
|
| 306 | + $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
|
|
| 307 | + $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
|
|
| 308 | 308 | |
| 309 | 309 | // and update $thiscss_nocomments before going into next iteration in while loop |
| 310 | - $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 310 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 311 | 311 | } |
| 312 | 312 | unset($thiscss_nocomments); |
| 313 | 313 | |
| 314 | 314 | // add external imports to top of aggregated CSS |
| 315 | - if($fiximports) {
|
|
| 316 | - $thiscss=$external_imports.$thiscss; |
|
| 315 | + if ($fiximports) {
|
|
| 316 | + $thiscss = $external_imports.$thiscss; |
|
| 317 | 317 | } |
| 318 | 318 | } |
| 319 | 319 | unset($thiscss); |
| 320 | 320 | |
| 321 | 321 | // $this->csscode has all the uncompressed code now. |
| 322 | - foreach($this->csscode as &$code) {
|
|
| 322 | + foreach ($this->csscode as &$code) {
|
|
| 323 | 323 | // Check for already-minified code |
| 324 | 324 | $hash = md5($code); |
| 325 | - $ccheck = new autoptimizeCache($hash,'css'); |
|
| 326 | - if($ccheck->check()) {
|
|
| 325 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 326 | + if ($ccheck->check()) {
|
|
| 327 | 327 | $code = $ccheck->retrieve(); |
| 328 | 328 | $this->hashmap[md5($code)] = $hash; |
| 329 | 329 | continue; |
@@ -332,44 +332,44 @@ discard block |
||
| 332 | 332 | |
| 333 | 333 | // Do the imaging! |
| 334 | 334 | $imgreplace = array(); |
| 335 | - preg_match_all( self::ASSETS_REGEX, $code, $matches ); |
|
| 335 | + preg_match_all(self::ASSETS_REGEX, $code, $matches); |
|
| 336 | 336 | |
| 337 | - if ( ($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)) ) {
|
|
| 338 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 339 | - $iurl = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 337 | + if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 338 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 339 | + $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 340 | 340 | |
| 341 | 341 | // if querystring, remove it from url |
| 342 | - if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
|
|
| 342 | + if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
|
|
| 343 | 343 | |
| 344 | 344 | $ipath = $this->getpath($iurl); |
| 345 | 345 | |
| 346 | 346 | $datauri_max_size = 4096; |
| 347 | - $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size ); |
|
| 348 | - $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', ""); |
|
| 347 | + $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
|
|
| 348 | + $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
|
|
| 349 | 349 | if (!empty($datauri_exclude)) {
|
| 350 | - $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
|
|
| 350 | + $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
|
|
| 351 | 351 | foreach ($no_datauris as $no_datauri) {
|
| 352 | - if (strpos($iurl,$no_datauri)!==false) {
|
|
| 353 | - $ipath=false; |
|
| 352 | + if (strpos($iurl, $no_datauri) !== false) {
|
|
| 353 | + $ipath = false; |
|
| 354 | 354 | break; |
| 355 | 355 | } |
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | - if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 360 | - $ihash=md5($ipath); |
|
| 361 | - $icheck = new autoptimizeCache($ihash,'img'); |
|
| 362 | - if($icheck->check()) {
|
|
| 359 | + if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 360 | + $ihash = md5($ipath); |
|
| 361 | + $icheck = new autoptimizeCache($ihash, 'img'); |
|
| 362 | + if ($icheck->check()) {
|
|
| 363 | 363 | // we have the base64 image in cache |
| 364 | - $headAndData=$icheck->retrieve(); |
|
| 365 | - $_base64data=explode(";base64,",$headAndData);
|
|
| 366 | - $base64data=$_base64data[1]; |
|
| 364 | + $headAndData = $icheck->retrieve(); |
|
| 365 | + $_base64data = explode(";base64,", $headAndData);
|
|
| 366 | + $base64data = $_base64data[1]; |
|
| 367 | 367 | } else {
|
| 368 | 368 | // It's an image and we don't have it in cache, get the type |
| 369 | - $explA=explode('.',$ipath);
|
|
| 370 | - $type=end($explA); |
|
| 369 | + $explA = explode('.', $ipath);
|
|
| 370 | + $type = end($explA); |
|
| 371 | 371 | |
| 372 | - switch($type) {
|
|
| 372 | + switch ($type) {
|
|
| 373 | 373 | case 'jpeg': |
| 374 | 374 | $dataurihead = 'data:image/jpeg;base64,'; |
| 375 | 375 | break; |
@@ -391,42 +391,42 @@ discard block |
||
| 391 | 391 | |
| 392 | 392 | // Encode the data |
| 393 | 393 | $base64data = base64_encode(file_get_contents($ipath)); |
| 394 | - $headAndData=$dataurihead.$base64data; |
|
| 394 | + $headAndData = $dataurihead.$base64data; |
|
| 395 | 395 | |
| 396 | 396 | // Save in cache |
| 397 | - $icheck->cache($headAndData,"text/plain"); |
|
| 397 | + $icheck->cache($headAndData, "text/plain"); |
|
| 398 | 398 | } |
| 399 | 399 | unset($icheck); |
| 400 | 400 | |
| 401 | 401 | // Add it to the list for replacement |
| 402 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]); |
|
| 402 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]); |
|
| 403 | 403 | } else {
|
| 404 | 404 | // just cdn the URL if applicable |
| 405 | 405 | if (!empty($this->cdn_url)) {
|
| 406 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 406 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 407 | 407 | } |
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
| 411 | 411 | // change urls to cdn-url |
| 412 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 413 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 412 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 413 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 414 | 414 | } |
| 415 | 415 | } |
| 416 | 416 | |
| 417 | - if(!empty($imgreplace)) {
|
|
| 418 | - $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code); |
|
| 417 | + if (!empty($imgreplace)) {
|
|
| 418 | + $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code); |
|
| 419 | 419 | } |
| 420 | 420 | |
| 421 | 421 | // Minify |
| 422 | - if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
|
|
| 422 | + if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
|
|
| 423 | 423 | if (class_exists('Minify_CSS_Compressor')) {
|
| 424 | 424 | $tmp_code = trim(Minify_CSS_Compressor::process($code)); |
| 425 | - } else if(class_exists('CSSmin')) {
|
|
| 425 | + } else if (class_exists('CSSmin')) {
|
|
| 426 | 426 | $cssmin = new CSSmin(); |
| 427 | - if (method_exists($cssmin,"run")) {
|
|
| 427 | + if (method_exists($cssmin, "run")) {
|
|
| 428 | 428 | $tmp_code = trim($cssmin->run($code)); |
| 429 | - } elseif (@is_callable(array($cssmin,"minify"))) {
|
|
| 429 | + } elseif (@is_callable(array($cssmin, "minify"))) {
|
|
| 430 | 430 | $tmp_code = trim(CssMin::minify($code)); |
| 431 | 431 | } |
| 432 | 432 | } |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | |
| 439 | 439 | $code = $this->inject_minified($code); |
| 440 | 440 | |
| 441 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify',$code ); |
|
| 441 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
|
|
| 442 | 442 | if (!empty($tmp_code)) {
|
| 443 | 443 | $code = $tmp_code; |
| 444 | 444 | unset($tmp_code); |
@@ -453,13 +453,13 @@ discard block |
||
| 453 | 453 | //Caches the CSS in uncompressed, deflated and gzipped form. |
| 454 | 454 | public function cache() {
|
| 455 | 455 | // CSS cache |
| 456 | - foreach($this->csscode as $media => $code) {
|
|
| 456 | + foreach ($this->csscode as $media => $code) {
|
|
| 457 | 457 | $md5 = $this->hashmap[md5($code)]; |
| 458 | 458 | |
| 459 | - $cache = new autoptimizeCache($md5,'css'); |
|
| 460 | - if(!$cache->check()) {
|
|
| 459 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 460 | + if (!$cache->check()) {
|
|
| 461 | 461 | // Cache our code |
| 462 | - $cache->cache($code,'text/css'); |
|
| 462 | + $cache->cache($code, 'text/css'); |
|
| 463 | 463 | } |
| 464 | 464 | $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 465 | 465 | } |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | $this->content = $this->restore_comments($this->content); |
| 475 | 475 | |
| 476 | 476 | // restore (no)script |
| 477 | - if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) {
|
|
| 477 | + if (strpos($this->content, '%%SCRIPT%%') !== false) {
|
|
| 478 | 478 | $this->content = preg_replace_callback( |
| 479 | 479 | '#%%SCRIPT%%(.*?)%%SCRIPT%%#is', |
| 480 | 480 | create_function( |
@@ -489,74 +489,74 @@ discard block |
||
| 489 | 489 | $this->content = $this->restore_noptimize($this->content); |
| 490 | 490 | |
| 491 | 491 | //Restore the full content |
| 492 | - if(!empty($this->restofcontent)) {
|
|
| 492 | + if (!empty($this->restofcontent)) {
|
|
| 493 | 493 | $this->content .= $this->restofcontent; |
| 494 | 494 | $this->restofcontent = ''; |
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | // Inject the new stylesheets |
| 498 | - $replaceTag = array("<title","before");
|
|
| 499 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag ); |
|
| 498 | + $replaceTag = array("<title", "before");
|
|
| 499 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag);
|
|
| 500 | 500 | |
| 501 | 501 | if ($this->inline == true) {
|
| 502 | - foreach($this->csscode as $media => $code) {
|
|
| 503 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
|
|
| 502 | + foreach ($this->csscode as $media => $code) {
|
|
| 503 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
|
|
| 504 | 504 | } |
| 505 | 505 | } else {
|
| 506 | 506 | if ($this->defer == true) {
|
| 507 | 507 | $preloadCssBlock = ""; |
| 508 | 508 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 509 | - $defer_inline_code=$this->defer_inline; |
|
| 510 | - if(!empty($defer_inline_code)){
|
|
| 511 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify',true ) ) {
|
|
| 512 | - $iCssHash=md5($defer_inline_code); |
|
| 513 | - $iCssCache = new autoptimizeCache($iCssHash,'css'); |
|
| 514 | - if($iCssCache->check()) {
|
|
| 509 | + $defer_inline_code = $this->defer_inline; |
|
| 510 | + if (!empty($defer_inline_code)) {
|
|
| 511 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
|
|
| 512 | + $iCssHash = md5($defer_inline_code); |
|
| 513 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 514 | + if ($iCssCache->check()) {
|
|
| 515 | 515 | // we have the optimized inline CSS in cache |
| 516 | - $defer_inline_code=$iCssCache->retrieve(); |
|
| 516 | + $defer_inline_code = $iCssCache->retrieve(); |
|
| 517 | 517 | } else {
|
| 518 | 518 | if (class_exists('Minify_CSS_Compressor')) {
|
| 519 | 519 | $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code)); |
| 520 | - } else if(class_exists('CSSmin')) {
|
|
| 520 | + } else if (class_exists('CSSmin')) {
|
|
| 521 | 521 | $cssmin = new CSSmin(); |
| 522 | 522 | $tmp_code = trim($cssmin->run($defer_inline_code)); |
| 523 | 523 | } |
| 524 | 524 | if (!empty($tmp_code)) {
|
| 525 | 525 | $defer_inline_code = $tmp_code; |
| 526 | - $iCssCache->cache($defer_inline_code,"text/css"); |
|
| 526 | + $iCssCache->cache($defer_inline_code, "text/css"); |
|
| 527 | 527 | unset($tmp_code); |
| 528 | 528 | } |
| 529 | 529 | } |
| 530 | 530 | } |
| 531 | - $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 532 | - $this->inject_in_html($code_out,$replaceTag); |
|
| 531 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 532 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | - foreach($this->url as $media => $url) {
|
|
| 536 | + foreach ($this->url as $media => $url) {
|
|
| 537 | 537 | $url = $this->url_replace_cdn($url); |
| 538 | 538 | |
| 539 | 539 | //Add the stylesheet either deferred (import at bottom) or normal links in head |
| 540 | - if($this->defer == true) {
|
|
| 540 | + if ($this->defer == true) {
|
|
| 541 | 541 | $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="this.rel=\'stylesheet\'" />'; |
| 542 | 542 | $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />'; |
| 543 | 543 | } else {
|
| 544 | 544 | if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
|
| 545 | - $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
|
|
| 546 | - } else if (strlen($this->csscode[$media])>0) {
|
|
| 547 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
|
|
| 545 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
|
|
| 546 | + } else if (strlen($this->csscode[$media]) > 0) {
|
|
| 547 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
|
|
| 548 | 548 | } |
| 549 | 549 | } |
| 550 | 550 | } |
| 551 | 551 | |
| 552 | - if($this->defer == true) {
|
|
| 552 | + if ($this->defer == true) {
|
|
| 553 | 553 | $preloadPolyfill = '<script data-cfasync=\'false\'>/*! loadCSS. [c]2017 Filament Group, Inc. MIT License */ |
| 554 | 554 | !function(a){"use strict";var b=function(b,c,d){function e(a){return h.body?a():void setTimeout(function(){e(a)})}function f(){i.addEventListener&&i.removeEventListener("load",f),i.media=d||"all"}var g,h=a.document,i=h.createElement("link");if(c)g=c;else{var j=(h.body||h.getElementsByTagName("head")[0]).childNodes;g=j[j.length-1]}var k=h.styleSheets;i.rel="stylesheet",i.href=b,i.media="only x",e(function(){g.parentNode.insertBefore(i,c?g:g.nextSibling)});var l=function(a){for(var b=i.href,c=k.length;c--;)if(k[c].href===b)return a();setTimeout(function(){l(a)})};return i.addEventListener&&i.addEventListener("load",f),i.onloadcssdefined=l,l(f),i};"undefined"!=typeof exports?exports.loadCSS=b:a.loadCSS=b}("undefined"!=typeof global?global:this);
|
| 555 | 555 | /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */ |
| 556 | 556 | !function(a){if(a.loadCSS){var b=loadCSS.relpreload={};if(b.support=function(){try{return a.document.createElement("link").relList.supports("preload")}catch(b){return!1}},b.poly=function(){for(var b=a.document.getElementsByTagName("link"),c=0;c<b.length;c++){var d=b[c];"preload"===d.rel&&"style"===d.getAttribute("as")&&(a.loadCSS(d.href,d,d.getAttribute("media")),d.rel=null)}},!b.support()){b.poly();var c=a.setInterval(b.poly,300);a.addEventListener&&a.addEventListener("load",function(){b.poly(),a.clearInterval(c)}),a.attachEvent&&a.attachEvent("onload",function(){a.clearInterval(c)})}}}(this);</script>';
|
| 557 | 557 | $noScriptCssBlock .= "</noscript>"; |
| 558 | - $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag); |
|
| 559 | - $this->inject_in_html($preloadPolyfill,array('</body>','before'));
|
|
| 558 | + $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag); |
|
| 559 | + $this->inject_in_html($preloadPolyfill, array('</body>', 'before'));
|
|
| 560 | 560 | } |
| 561 | 561 | } |
| 562 | 562 | |
@@ -564,38 +564,38 @@ discard block |
||
| 564 | 564 | return $this->content; |
| 565 | 565 | } |
| 566 | 566 | |
| 567 | - static function fixurls($file,$code) {
|
|
| 568 | - $file = str_replace(WP_ROOT_DIR,'',$file); |
|
| 569 | - $file = str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',$file); |
|
| 567 | + static function fixurls($file, $code) {
|
|
| 568 | + $file = str_replace(WP_ROOT_DIR, '', $file); |
|
| 569 | + $file = str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', $file); |
|
| 570 | 570 | $dir = dirname($file); // Like /themes/expound/css |
| 571 | 571 | |
| 572 | 572 | // switch all imports to the url() syntax |
| 573 | - $code=preg_replace('#@import ("|\')(.+?)\.css.*("|\')#','@import url("${2}.css")',$code);
|
|
| 573 | + $code = preg_replace('#@import ("|\')(.+?)\.css.*("|\')#', '@import url("${2}.css")', $code);
|
|
| 574 | 574 | |
| 575 | - if( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
|
|
| 575 | + if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
|
|
| 576 | 576 | $replace = array(); |
| 577 | - foreach($matches[1] as $k => $url) {
|
|
| 577 | + foreach ($matches[1] as $k => $url) {
|
|
| 578 | 578 | // Remove quotes |
| 579 | - $url = trim($url," \t\n\r\0\x0B\"'"); |
|
| 580 | - $noQurl = trim($url,"\"'"); |
|
| 579 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 580 | + $noQurl = trim($url, "\"'"); |
|
| 581 | 581 | |
| 582 | 582 | if ($noQurl === '') { continue; }
|
| 583 | 583 | |
| 584 | - if ($url!==$noQurl) {
|
|
| 585 | - $removedQuotes=true; |
|
| 584 | + if ($url !== $noQurl) {
|
|
| 585 | + $removedQuotes = true; |
|
| 586 | 586 | } else {
|
| 587 | - $removedQuotes=false; |
|
| 587 | + $removedQuotes = false; |
|
| 588 | 588 | } |
| 589 | - $url=$noQurl; |
|
| 590 | - if(substr($url,0,1)=='/' || preg_match('#^(https?://|ftp://|data:)#i',$url)) {
|
|
| 589 | + $url = $noQurl; |
|
| 590 | + if (substr($url, 0, 1) == '/' || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
|
|
| 591 | 591 | //URL is absolute |
| 592 | 592 | continue; |
| 593 | 593 | } else {
|
| 594 | 594 | // relative URL |
| 595 | - $newurl = preg_replace('/https?:/','',str_replace(" ","%20",AUTOPTIMIZE_WP_CONTENT_URL.str_replace('//','/',$dir.'/'.$url)));
|
|
| 595 | + $newurl = preg_replace('/https?:/', '', str_replace(" ", "%20", AUTOPTIMIZE_WP_CONTENT_URL.str_replace('//', '/', $dir.'/'.$url)));
|
|
| 596 | 596 | |
| 597 | 597 | $hash = md5($url); |
| 598 | - $code = str_replace($matches[0][$k],$hash,$code); |
|
| 598 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 599 | 599 | |
| 600 | 600 | if (!empty($removedQuotes)) {
|
| 601 | 601 | $replace[$hash] = 'url(\''.$newurl.'\')'.$matches[2][$k]; |
@@ -605,17 +605,17 @@ discard block |
||
| 605 | 605 | } |
| 606 | 606 | } |
| 607 | 607 | //Do the replacing here to avoid breaking URLs |
| 608 | - $code = str_replace(array_keys($replace),array_values($replace),$code); |
|
| 608 | + $code = str_replace(array_keys($replace), array_values($replace), $code); |
|
| 609 | 609 | } |
| 610 | 610 | return $code; |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | private function ismovable($tag) {
|
| 614 | - if (apply_filters('autoptimize_filter_css_dontaggregate',false)) {
|
|
| 614 | + if (apply_filters('autoptimize_filter_css_dontaggregate', false)) {
|
|
| 615 | 615 | return false; |
| 616 | 616 | } else if (!empty($this->whitelist)) {
|
| 617 | 617 | foreach ($this->whitelist as $match) {
|
| 618 | - if(strpos($tag,$match)!==false) {
|
|
| 618 | + if (strpos($tag, $match) !== false) {
|
|
| 619 | 619 | return true; |
| 620 | 620 | } |
| 621 | 621 | } |
@@ -623,8 +623,8 @@ discard block |
||
| 623 | 623 | return false; |
| 624 | 624 | } else {
|
| 625 | 625 | if (is_array($this->dontmove)) {
|
| 626 | - foreach($this->dontmove as $match) {
|
|
| 627 | - if(strpos($tag,$match)!==false) {
|
|
| 626 | + foreach ($this->dontmove as $match) {
|
|
| 627 | + if (strpos($tag, $match) !== false) {
|
|
| 628 | 628 | //Matched something |
| 629 | 629 | return false; |
| 630 | 630 | } |
@@ -636,17 +636,17 @@ discard block |
||
| 636 | 636 | } |
| 637 | 637 | } |
| 638 | 638 | |
| 639 | - private function can_inject_late($cssPath,$css) {
|
|
| 640 | - if ((strpos($cssPath,"min.css")===false) || ($this->inject_min_late!==true)) {
|
|
| 639 | + private function can_inject_late($cssPath, $css) {
|
|
| 640 | + if ((strpos($cssPath, "min.css") === false) || ($this->inject_min_late !== true)) {
|
|
| 641 | 641 | // late-inject turned off or file not minified based on filename |
| 642 | 642 | return false; |
| 643 | - } else if (strpos($css,"@import")!==false) {
|
|
| 643 | + } else if (strpos($css, "@import") !== false) {
|
|
| 644 | 644 | // can't late-inject files with imports as those need to be aggregated |
| 645 | 645 | return false; |
| 646 | - } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
|
|
| 646 | + } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
|
|
| 647 | 647 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed |
| 648 | 648 | return false; |
| 649 | - } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
|
|
| 649 | + } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
|
|
| 650 | 650 | // don't late-inject CSS with images if CDN is set OR is image inlining is on |
| 651 | 651 | return false; |
| 652 | 652 | } else {
|
@@ -656,9 +656,9 @@ discard block |
||
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | private function maybe_cdn_urls($inUrl) {
|
| 659 | - $url = trim($inUrl," \t\n\r\0\x0B\"'"); |
|
| 659 | + $url = trim($inUrl, " \t\n\r\0\x0B\"'"); |
|
| 660 | 660 | // exclude fonts from CDN except if filter returns true |
| 661 | - if ( !preg_match('#\.(woff2?|eot|ttf|otf|svg)$#i',$url) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {
|
|
| 661 | + if (!preg_match('#\.(woff2?|eot|ttf|otf|svg)$#i', $url) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {
|
|
| 662 | 662 | $cdn_url = $this->url_replace_cdn($url); |
| 663 | 663 | } else {
|
| 664 | 664 | $cdn_url = $url; |
