PluginProbe
Autoptimize / 3.1.16
Autoptimize v3.1.16
3.1.16 2.2.2 2.3.0 2.3.1 2.3.2 2.3.3 2.3.4 2.4.0 2.4.1 2.4.2 2.4.3 2.4.4 2.5.0 2.5.1 2.6.0 2.6.1 2.6.2 2.7.0 2.7.1 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.7.7 All 108 releases
← All changes | classes/autoptimizeConfig.php +600 -345 2.4.4 → 3.1.16 View file →
@@ -1,12 +1,34 @@
1 1 <?php
2 -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly.
2 +/**
3 + * Main configuration logic.
4 + */
3 5
6 +if ( ! defined( 'ABSPATH' ) ) {
7 + exit;
8 +}
9 +
4 10 class autoptimizeConfig
5 11 {
6 - private $config = null;
12 + /**
13 + * Options.
14 + *
15 + * @var array
16 + */
17 + private $config = null;
18 +
19 + /**
20 + * Singleton instance.
21 + *
22 + * @var self|null
23 + */
7 24 static private $instance = null;
8 25
26 + /**
27 + * Options.
28 + *
29 + * @var bool
30 + */
9 31 private $settings_screen_do_remote_http = true;
10 32
11 33 /**
12 34 * Singleton.
@@ -14,10 +36,15 @@
14 36 private function __construct()
15 37 {
16 38 if ( is_admin() ) {
17 39 // Add the admin page and settings.
40 + if ( autoptimizeOptionWrapper::is_ao_active_for_network() ) {
41 + add_action( 'network_admin_menu', array( $this, 'addmenu' ) );
42 + }
43 +
18 44 add_action( 'admin_menu', array( $this, 'addmenu' ) );
19 45 add_action( 'admin_init', array( $this, 'registersettings' ) );
46 + add_action( 'admin_init', array( 'PAnD', 'init' ) );
20 47
21 48 // Set meta info.
22 49 if ( function_exists( 'plugin_row_meta' ) ) {
23 50 // 2.8 and higher.
@@ -28,14 +55,18 @@
28 55 add_filter( 'plugin_action_links_' . $plugin, array( $this, 'setmeta' ) );
29 56 }
30 57
31 58 // Clean cache?
32 - if ( get_option( 'autoptimize_cache_clean' ) ) {
59 + if ( autoptimizeOptionWrapper::get_option( 'autoptimize_cache_clean' ) ) {
33 60 autoptimizeCache::clearall();
34 - update_option( 'autoptimize_cache_clean', 0 );
61 + autoptimizeOptionWrapper::update_option( 'autoptimize_cache_clean', 0 );
35 62 }
36 63
37 64 $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http );
65 +
66 + if ( $this->is_ao_meta_settings_active() ) {
67 + $meta_box = new autoptimizeMetabox();
68 + }
38 69 }
39 70
40 71 // Adds the Autoptimize Toolbar to the Admin bar.
41 72 // (we load outside the is_admin check so it's also displayed on the frontend toolbar).
@@ -42,8 +73,10 @@
42 73 $toolbar = new autoptimizeToolbar();
43 74 }
44 75
45 76 /**
77 + * Instantiates aoconfig.
78 + *
46 79 * @return autoptimizeConfig
47 80 */
48 81 static public function instance()
49 82 {
@@ -54,45 +87,28 @@
54 87
55 88 return self::$instance;
56 89 }
57 90
58 - public function show()
91 + public function show_network_message() {
92 + ?>
93 + <div class="wrap">
94 + <h1><?php esc_html_e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
95 + <?php echo $this->ao_admin_tabs(); ?>
96 + <p style="font-size:120%;"><?php echo apply_filters( 'autoptimize_filter_settingsscreen_multisite_network_message', esc_html__( 'Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize' ) ); ?></p>
97 + </div>
98 + <?php
99 + }
100 +
101 + public function show_config()
59 102 {
103 + // phpcs:disable Generic.WhiteSpace.ScopeIndent.IncorrectExact
104 + // phpcs:disable Generic.WhiteSpace.ScopeIndent.Incorrect
60 105 $conf = self::instance();
61 -?>
106 + ?>
62 107 <style>
63 108 /* title and button */
64 109 #ao_title_and_button:after {content:''; display:block; clear:both;}
65 -#ao_adv_button{float:right;}
66 -#ao_hide_adv:before, #ao_show_adv:before {
67 - display: inline-block;
68 - float: left;
69 - height: 20px;
70 - width: 35px;
71 - background: none;
72 - color: #b4b9be;
73 - font: normal 20px/26px dashicons;
74 - letter-spacing: -4px;
75 - text-align: left;
76 - speak: none;
77 - -webkit-font-smoothing: antialiased;
78 - -moz-osx-font-smoothing: grayscale;
79 -}
80 -#ao_hide_adv:before {
81 - content: "\f108 \f142";
82 -}
83 -#ao_show_adv:before {
84 - content: "\f108 \f140";
85 -}
86 110
87 -/* animate "show adv" button */
88 -#ao_show_adv { animation: watchmenow 3s linear 5s 10; }
89 -#ao_show_adv:hover { animation: none; }
90 -@keyframes watchmenow {
91 - 0% { box-shadow: unset; }
92 - 100% { box-shadow: 0px 0px 20px yellow; }
93 -}
94 -
95 111 /* form */
96 112 .itemDetail {
97 113 background: #fff;
98 114 border: 1px solid #ccc;
@@ -102,10 +118,13 @@
102 118 .itemTitle {
103 119 margin-top: 0;
104 120 }
105 121
106 -input[type=url]:invalid {color: red; border-color:red;} .form-table th{font-weight:normal;}
122 +.form-table th{font-weight:normal;}
123 +#autoptimize_main form input:invalid {box-shadow: 0 0 1px 1px red;}
107 124 #autoptimize_main .cb_label {display: block; padding-left: 25px; text-indent: -25px;}
125 +#autoptimize_main .form-table th {padding-top: 15px; padding-bottom: 15px;}
126 +#autoptimize_main .js_aggregate td, #autoptimize_main .js_aggregate th, #autoptimize_main .js_not_aggregate td, #autoptimize_main .js_not_aggregate th{padding-top:0px;}
108 127
109 128 /* rss block */
110 129 #futtta_feed ul{list-style:outside;}
111 130 #futtta_feed {font-size:medium; margin:0px 20px;}
@@ -163,11 +182,8 @@
163 182 #autoptimize_main {width:100%;}
164 183 #autoptimize_admin_feed {width:0%;display:none !important;}
165 184 }
166 185 @media (max-width: 782px) {
167 - #ao_hide_adv span, #ao_show_adv span {display: none;}
168 - #ao_hide_adv,#ao_show_adv {height: 34px;padding: 4px 12px 8px 8px;}
169 - #ao_hide_adv:before,#ao_show_adv:before {font-size: 25px;}
170 186 #autoptimize_main input[type="checkbox"] {margin-left: 10px;}
171 187 #autoptimize_main .cb_label {display: block; padding-left: 45px; text-indent: -45px;}
172 188 }
173 189 </style>
@@ -173,332 +189,381 @@
173 189 </style>
174 190
175 191 <div class="wrap">
176 192
177 -<?php if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) { ?>
178 -<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>. Support for PHP 5.5 and below will be removed in one of the next AO released, please ask your hoster to provide you with an upgrade path to 7.x.', 'autoptimize' ), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"' ) . '</p>'; ?></div>
179 -<?php } ?>
180 -
181 -<?php if ( defined( 'AUTOPTIMIZE_LEGACY_MINIFIERS' ) ) { ?>
182 - <div class="notice-error notice"><p>
183 - <?php _e( "You are using the (no longer supported) AUTOPTIMIZE_LEGACY_MINIFIERS constant. Ensure your site is working properly and remove the constant, it doesn't do anything any more.", 'autoptimize' ); ?>
184 - </p></div>
185 -<?php } ?>
186 -
187 193 <div id="autoptimize_main">
188 - <div id="ao_title_and_button">
189 - <h1 id="ao_title"><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?>
190 - <span id="ao_adv_button">
191 - <?php if ( get_option( 'autoptimize_show_adv', '0' ) == '1' ) { ?>
192 - <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
193 - <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
194 - <style>tr.ao_adv{display:table-row;} li.ao_adv{display:list-item;}</style>
195 - <?php $hiddenClass = ''; ?>
196 - <?php } else { ?>
197 - <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
198 - <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
199 - <?php $hiddenClass = 'hidden '; ?>
200 - <?php } ?>
201 - </span>
202 - </h1>
203 - </div>
204 -
194 + <h1 id="ao_title"><?php apply_filters( 'autoptimize_filter_settings_is_pro', false ) ? esc_html_e( 'Autoptimize Pro Settings', 'autoptimize' ) : esc_html_e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
205 195 <?php echo $this->ao_admin_tabs(); ?>
206 196
207 -<form method="post" action="options.php">
197 +<form method="post" action="<?php echo admin_url( 'options.php' ); ?>">
208 198 <?php settings_fields( 'autoptimize' ); ?>
209 199
210 200 <ul>
211 201
202 +<?php
203 +// Only show enable site configuration in network site option.
204 +if ( is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
205 +?>
206 + <li class="itemDetail multiSite">
207 + <h2 class="itemTitle"><?php esc_html_e( 'Multisite Options', 'autoptimize' ); ?></h2>
208 + <table class="form-table">
209 + <tr valign="top">
210 + <th scope="row"><?php esc_html_e( 'Enable site configuration?', 'autoptimize' ); ?></th>
211 + <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ? 'checked="checked" ' : ''; ?>/>
212 + <?php esc_html_e( 'Enable Autoptimize configuration per site.', 'autoptimize' ); ?></label></td>
213 + </tr>
214 + </table>
215 + </li>
216 +<?php } else { ?>
217 + <input type="hidden" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" value="on" />
218 +<?php } ?>
219 +
212 220 <li class="itemDetail">
213 -<h2 class="itemTitle"><?php _e('HTML Options','autoptimize'); ?></h2>
221 +<h2 class="itemTitle"><?php esc_html_e( 'JavaScript Options', 'autoptimize' ); ?></h2>
214 222 <table class="form-table">
215 223 <tr valign="top">
216 -<th scope="row"><?php _e('Optimize HTML Code?','autoptimize'); ?></th>
217 -<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html')?'checked="checked" ':''; ?>/></td>
224 +<th scope="row"><?php esc_html_e( 'Optimize JavaScript Code?', 'autoptimize' ); ?></th>
225 +<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo $conf->get( 'autoptimize_js' ) ? 'checked="checked" ' : ''; ?>/></td>
218 226 </tr>
219 -<tr class="<?php echo $hiddenClass;?>html_sub ao_adv" valign="top">
220 -<th scope="row"><?php _e('Keep HTML comments?','autoptimize'); ?></th>
221 -<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments')?'checked="checked" ':''; ?>/>
222 -<?php _e('Enable this if you want HTML comments to remain in the page.','autoptimize'); ?></label></td>
227 +<tr valign="top" class="js_sub js_aggregate_master">
228 +<th scope="row"><?php esc_html_e( 'Aggregate JS-files?', 'autoptimize' ); ?></th>
229 +<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get( 'autoptimize_js_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
230 +<?php esc_html_e( 'Aggregate all linked JS-files to have them loaded non-render blocking?', 'autoptimize' ); ?></label></td>
223 231 </tr>
224 -</table>
225 -</li>
226 -
227 -<li class="itemDetail">
228 -<h2 class="itemTitle"><?php _e('JavaScript Options','autoptimize'); ?></h2>
229 -<table class="form-table">
230 -<tr valign="top">
231 -<th scope="row"><?php _e('Optimize JavaScript Code?','autoptimize'); ?></th>
232 -<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js')?'checked="checked" ':''; ?>/></td>
232 +<tr valign="top" class="js_sub js_aggregate hidden">
233 +<th scope="row">&emsp;<?php esc_html_e( 'Also aggregate inline JS?', 'autoptimize' ); ?></th>
234 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo $conf->get( 'autoptimize_js_include_inline' ) ? 'checked="checked" ' : ''; ?>/>
235 +<?php esc_html_e( 'Let Autoptimize also extract JS from the HTML (discouraged as it can make Autoptimize\'s cache size grow quickly)', 'autoptimize' ); ?></label></td>
233 236 </tr>
234 -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
235 -<th scope="row"><?php _e( 'Aggregate JS-files?', 'autoptimize' ); ?></th>
236 -<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get( 'autoptimize_js_aggregate' ) ? 'checked="checked" ':''; ?>/>
237 -<?php _e( 'Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
237 +<tr valign="top" class="js_sub js_aggregate hidden">
238 +<th scope="row">&emsp;<?php esc_html_e( 'Force JavaScript in &lt;head&gt;?', 'autoptimize' ); ?></th>
239 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo $conf->get( 'autoptimize_js_forcehead' ) ? 'checked="checked" ' : ''; ?>/>
240 +<?php esc_html_e( 'Load JavaScript early (discouraged as it makes the JS render blocking)', 'autoptimize' ); ?></label></td>
238 241 </tr>
239 -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
240 -<th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th>
241 -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/>
242 -<?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>
242 +<tr valign="top" class="js_sub js_aggregate hidden">
243 +<th scope="row">&emsp;<?php esc_html_e( 'Add try-catch wrapping?', 'autoptimize' ); ?></th>
244 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo $conf->get( 'autoptimize_js_trycatch' ) ? 'checked="checked" ' : ''; ?>/>
245 +<?php esc_html_e( 'If your aggregated scripts break because of a JS-error, you might want to try this, but generally discouraged.', 'autoptimize' ); ?></label></td>
243 246 </tr>
244 -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
245 -<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?','autoptimize'); ?></th>
246 -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/>
247 -<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.','autoptimize'); ?></label></td>
247 +<tr valign="top" class="js_sub js_not_aggregate_master">
248 +<th scope="row"><?php esc_html_e( 'Do not aggregate but defer?', 'autoptimize' ); ?></th>
249 +<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_defer_not_aggregate" name="autoptimize_js_defer_not_aggregate" <?php echo $conf->get( 'autoptimize_js_defer_not_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
250 +<?php esc_html_e( 'Individual JS-files will be minified and deferred, making them non-render-blocking.', 'autoptimize' ); ?></label></td>
248 251 </tr>
249 -<?php if (get_option('autoptimize_js_justhead')) { ?>
250 -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
251 -<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th>
252 -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/>
253 -<?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>
252 +<tr valign="top" id="js_defer_inline" class="js_sub js_not_aggregate hidden">
253 +<th scope="row">&emsp;<?php esc_html_e( 'Also defer inline JS?', 'autoptimize' ); ?></th>
254 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_defer_inline" <?php echo $conf->get( 'autoptimize_js_defer_inline' ) ? 'checked="checked" ' : ''; ?>/>
255 +<?php esc_html_e( 'Also defer inline JS. Generally this will allow all JS to be deferred, so you should remove default exclusions, test and only exclude specific items if still needed.', 'autoptimize' ); ?></label></td>
254 256 </tr>
257 +<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ) { ?>
258 +<tr valign="top" class="js_sub js_aggregate">
259 +<th scope="row">
260 +<?php
261 + esc_html_e( 'Look for scripts only in &lt;head&gt;?', 'autoptimize' );
262 + echo ' <i>' . esc_html__( '(deprecated)', 'autoptimize' ) . '</i>';
263 +?>
264 +</th>
265 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo $conf->get( 'autoptimize_js_justhead' ) ? 'checked="checked" ' : ''; ?>/>
266 +<?php esc_html_e( 'Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize' ); ?></label></td>
267 +</tr>
255 268 <?php } ?>
256 -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
257 -<th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th>
258 -<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 />
259 -<?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 by Autoptimize.','autoptimize'); ?></label></td>
269 +<tr valign="top" class="js_sub">
270 +<th scope="row"><?php esc_html_e( 'Exclude scripts from Autoptimize:', 'autoptimize' ); ?></th>
271 +<td><label><input type="text" pattern="[^\*]*" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo esc_attr( autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude', '' ) ); ?>"/><br />
272 +<?php
273 +echo esc_html__( 'A comma-separated list of scripts you do not want optimized, for example \'whatever.js, my_var\' (without the quotes).', 'autoptimize' ) . ' ' . esc_html__( 'Important: when "aggregate JS-files" is on, excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' );
274 +?>
275 +</label></td>
260 276 </tr>
261 -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
262 -<th scope="row"><?php _e('Add try-catch wrapping?','autoptimize'); ?></th>
263 -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch')?'checked="checked" ':''; ?>/>
264 -<?php _e('If your scripts break because of a JS-error, you might want to try this.','autoptimize'); ?></label></td>
277 +<tr valign="top">
278 +<th scope="row"><?php esc_html_e( 'Remove Unused JavaScript?', 'autoptimize' ); ?></th>
279 +<td><?php esc_html_e( 'Autoptimize combines your theme & plugins\' JavaScript, but does not know what is used and what is not. If Google Pagespeed Insights detects unused JavaScript, consider using a plugin like "Plugin Organizer" or similar to manage what JavaScript is added where.', 'autoptimize' ); ?></td>
265 280 </tr>
266 281 </table>
267 282 </li>
268 283
269 284 <li class="itemDetail">
270 -<h2 class="itemTitle"><?php _e('CSS Options','autoptimize'); ?></h2>
285 +<h2 class="itemTitle"><?php esc_html_e( 'CSS Options', 'autoptimize' ); ?></h2>
271 286 <table class="form-table">
272 287 <tr valign="top">
273 -<th scope="row"><?php _e('Optimize CSS Code?','autoptimize'); ?></th>
274 -<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css')?'checked="checked" ':''; ?>/></td>
288 +<th scope="row"><?php esc_html_e( 'Optimize CSS Code?', 'autoptimize' ); ?></th>
289 +<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo $conf->get( 'autoptimize_css' ) ? 'checked="checked" ' : ''; ?>/></td>
275 290 </tr>
276 -<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top">
277 -<th scope="row"><?php _e( 'Aggregate CSS-files?', 'autoptimize' ); ?></th>
291 +<tr class="css_sub" valign="top">
292 +<th scope="row"><?php esc_html_e( 'Aggregate CSS-files?', 'autoptimize' ); ?></th>
278 293 <td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get( 'autoptimize_css_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
279 -<?php _e('Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
294 +<?php esc_html_e( 'Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
280 295 </tr>
281 -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv css_aggregate">
282 -<th scope="row"><?php _e('Also aggregate inline CSS?','autoptimize'); ?></th>
283 -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline','1')?'checked="checked" ':''; ?>/>
284 -<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.','autoptimize'); ?></label></td>
296 +<tr valign="top" class="css_sub css_aggregate">
297 +<th scope="row"><?php esc_html_e( 'Also aggregate inline CSS?', 'autoptimize' ); ?></th>
298 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo $conf->get( 'autoptimize_css_include_inline', '1' ) ? 'checked="checked" ' : ''; ?>/>
299 +<?php esc_html_e( 'Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize' ); ?></label></td>
285 300 </tr>
286 -<tr class="<?php echo $hiddenClass;?>css_sub ao_adv css_aggregate" valign="top">
287 -<th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th>
288 -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/>
289 -<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td>
301 +<tr class="css_sub css_aggregate" valign="top">
302 +<th scope="row"><?php esc_html_e( 'Generate data: URIs for images?', 'autoptimize' ); ?></th>
303 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo $conf->get( 'autoptimize_css_datauris' ) ? 'checked="checked" ' : ''; ?>/>
304 +<?php esc_html_e( 'Enable this to include small background images in the CSS itself instead of as separate downloads.', 'autoptimize' ); ?></label></td>
290 305 </tr>
291 -<?php if (get_option('autoptimize_css_justhead')) { ?>
292 -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv css_aggregate">
293 -<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th>
294 -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/>
295 -<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td>
306 +<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ) { ?>
307 +<tr valign="top" class="css_sub css_aggregate">
308 +<th scope="row">
309 +<?php
310 +esc_html_e( 'Look for styles only in &lt;head&gt;?', 'autoptimize' );
311 +echo ' <i>' . esc_html__( '(deprecated)', 'autoptimize' ) . '</i>';
312 +?>
313 +</th>
314 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo $conf->get( 'autoptimize_css_justhead' ) ? 'checked="checked" ' : ''; ?>/>
315 +<?php esc_html_e( 'Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize' ); ?></label></td>
296 316 </tr>
297 317 <?php } ?>
298 -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
299 -<th scope="row"><?php _e('Inline and Defer CSS?','autoptimize'); ?></th>
300 -<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" ':''; ?>/>
318 +<tr valign="top" class="css_sub">
319 +<th scope="row"><?php esc_html_e( 'Eliminate render-blocking CSS?', 'autoptimize' ); ?></th>
320 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo $conf->get( 'autoptimize_css_defer' ) ? 'checked="checked" ' : ''; ?>/>
301 321 <?php
302 -_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> for more info.', 'autoptimize' );
303 -if ( function_exists( 'is_plugin_active' ) && ! is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) {
304 - echo ' ';
305 - $critcss_install_url = network_admin_url() . 'plugin-install.php?s=autoptimize+criticalcss&tab=search&type=term';
306 - echo sprintf( __( 'This can be fully automated for different types of pages with the %s.', 'autoptimize' ), '<a href="'.$critcss_install_url.'">Autoptimize CriticalCSS Power-Up</a>' );
307 -}
322 +_e( 'Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize' );
323 +echo ' ';
324 +$critcss_settings_url = get_admin_url( null, 'options-general.php?page=ao_critcss' );
325 +// translators: links "autoptimize critical CSS" tab.
326 +echo sprintf( esc_html__( 'You can manually create rules for different types of pages or have this done fully automated on the %s tab.', 'autoptimize' ), '<a href="' . $critcss_settings_url . '">CriticalCSS</a>' );
308 327 ?>
309 328 </label></td>
310 329 </tr>
311 -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv" id="autoptimize_css_defer_inline">
330 +<tr valign="top" class="css_sub" id="autoptimize_css_defer_inline">
312 331 <th scope="row"></th>
313 -<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>
332 +<td><label><textarea rows="10" cols="10" style="width:100%;" spellcheck="false" placeholder="<?php esc_html_e( 'Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize' ); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeStyles::sanitize_css( autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' ) ); ?></textarea></label></td>
314 333 </tr>
315 -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub css_aggregate">
316 -<th scope="row"><?php _e('Inline all CSS?','autoptimize'); ?></th>
317 -<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" ':''; ?>/>
318 -<?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>
334 +<tr valign="top" class="css_sub css_aggregate">
335 +<th scope="row"><?php esc_html_e( 'Inline all CSS?', 'autoptimize' ); ?></th>
336 +<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo $conf->get( 'autoptimize_css_inline' ) ? 'checked="checked" ' : ''; ?>/>
337 +<?php esc_html_e( 'Inlining all CSS is an easy way to stop the CSS from being render-blocking, but is generally not recommended because the size of the HTML increases significantly. Additionally, it might push meta-tags down to a position where e.g. Facebook and Whatsapp will not find them anymore, breaking thumbnails when sharing.', 'autoptimize' ); ?></label></td>
319 338 </tr>
320 -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub css_aggregate">
321 -<th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th>
322 -<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css'); ?>"/><br />
323 -<?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td>
339 +<tr valign="top" class="css_sub">
340 +<th scope="row"><?php esc_html_e( 'Exclude CSS from Autoptimize:', 'autoptimize' ); ?></th>
341 +<td><label><input type="text" pattern="[^\*]*" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo esc_attr( $conf->get( 'autoptimize_css_exclude', '' ) ); ?>"/><br />
342 +<?php
343 +echo esc_html__( 'A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize' ) . ' ' . esc_html__( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' );
344 +?>
345 +</label></td>
324 346 </tr>
347 +<?php
348 + $_availabilities = autoptimizeOptionWrapper::get_option( 'autoptimize_service_availablity' );
349 + if ( empty( $_availabilities ) || ! is_array( $_availabilities ) || ! array_key_exists( 'rapidload', $_availabilities ) || ! array_key_exists( 'status', $_availabilities['rapidload'] ) ) {
350 + $rapidload_true = true;
351 + } else if ( $_availabilities['rapidload']['status'] === 'up' ) {
352 + $rapidload_true = true;
353 + } else if ( $_availabilities['rapidload']['status'] !== 'up' ) {
354 + $rapidload_true = false;
355 + } else {
356 + $rapidload_true = false;
357 + }
358 +?>
359 +<?php if ( $rapidload_true && false === autoptimizeUtils::is_plugin_active( 'unusedcss/unusedcss.php' ) ) { ?>
360 +<tr valign="top">
361 +<th scope="row"><?php esc_html_e( 'Remove Unused CSS?', 'autoptimize' ); ?></th>
362 +<?php
363 +$_rapidload_link = 'https://misc.optimizingmatters.com/partners/?from=csssettings&partner=rapidload';
364 +?>
365 +<td><?php
366 +// translators: a link to rapidload + strong tags
367 +echo sprintf( esc_html__( 'If Google Pagespeed Insights detects unused CSS, consider using %1$sthe premium Rapidload service%2$s to %3$sreduce your site\'s CSS size to up to 90&#37;%4$s, resulting in a slimmer, faster site!', 'autoptimize' ), '<a href="' . $_rapidload_link . '" target="_blank">', '</a>', '<strong>', '</strong>' ); ?></td>
368 +</tr>
369 +<?php } ?>
325 370 </table>
326 371 </li>
327 372
328 373 <li class="itemDetail">
329 -<h2 class="itemTitle"><?php _e('CDN Options','autoptimize'); ?></h2>
374 +<h2 class="itemTitle"><?php esc_html_e( 'HTML Options', 'autoptimize' ); ?></h2>
330 375 <table class="form-table">
331 376 <tr valign="top">
332 -<th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th>
333 -<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 />
334 -<?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>). This is not needed for Cloudflare.','autoptimize'); ?></label></td>
377 +<th scope="row"><?php esc_html_e( 'Optimize HTML Code?', 'autoptimize' ); ?></th>
378 +<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo $conf->get( 'autoptimize_html' ) ? 'checked="checked" ' : ''; ?>/></td>
335 379 </tr>
380 +<tr class="html_sub" valign="top">
381 +<th scope="row"><?php esc_html_e( 'Also minify inline JS/ CSS?', 'autoptimize' ); ?></th>
382 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_minify_inline" <?php echo $conf->get( 'autoptimize_html_minify_inline' ) ? 'checked="checked" ' : ''; ?>/>
383 +<?php esc_html_e( 'Enable this if you want inline JS or CSS to be minified as well.', 'autoptimize' ); ?></label></td>
384 +</tr>
385 +<tr class="html_sub" valign="top">
386 +<th scope="row"><?php esc_html_e( 'Keep HTML comments?', 'autoptimize' ); ?></th>
387 +<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo $conf->get( 'autoptimize_html_keepcomments' ) ? 'checked="checked" ' : ''; ?>/>
388 +<?php esc_html_e( 'Enable this if you want HTML comments to remain in the page.', 'autoptimize' ); ?></label></td>
389 +</tr>
336 390 </table>
337 391 </li>
338 392
339 -<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
340 -<h2 class="itemTitle"><?php _e('Cache Info','autoptimize'); ?></h2>
393 +<li class="itemDetail">
394 +<h2 class="itemTitle"><?php esc_html_e( 'CDN Options', 'autoptimize' ); ?></h2>
395 +<table class="form-table">
396 +<tr valign="top">
397 +<th scope="row"><?php esc_html_e( 'CDN Base URL', 'autoptimize' ); ?></th>
398 +<?php
399 +if ( true === autoptimizeImages::imgopt_active() && true === apply_filters( 'autoptimize_filter_cdn_set_by_imgopt', false ) ) {
400 + // cdn set by imgopt, not to be changealbe in the settings.
401 + $cdn_editable = 'disabled';
402 + $cdn_placeholder = 'placeholder="' . esc_html__( 'The CDN has automatically been set to make use of the image optimization CDN.', 'autoptimize' ) . ' "';
403 + $cdn_description = '';
404 +} else {
405 + $cdn_editable = '';
406 + $cdn_placeholder = 'placeholder="' . esc_html__( 'example: //cdn.yoursite.com/', 'autoptimize' ) . ' "';
407 + $cdn_description = esc_html__( 'Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative. This is not needed for Cloudflare.', 'autoptimize' );
408 +}
409 +?>
410 +<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%" <?php echo $cdn_placeholder . $cdn_editable; ?> value="<?php echo esc_url( autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url', '' ), array( 'http', 'https' ) ); ?>" /><br />
411 +<?php echo $cdn_description; ?>
412 +</label></td>
413 +</tr>
414 +</table>
415 +</li>
416 +
417 +<li class="itemDetail">
418 +<h2 class="itemTitle"><?php esc_html_e( 'Cache Info', 'autoptimize' ); ?></h2>
341 419 <table class="form-table" >
342 -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
343 -<th scope="row"><?php _e('Cache folder','autoptimize'); ?></th>
344 -<td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td>
420 +<tr valign="top" >
421 +<th scope="row"><?php esc_html_e( 'Cache folder', 'autoptimize' ); ?></th>
422 +<td><?php echo htmlentities( AUTOPTIMIZE_CACHE_DIR ); ?></td>
345 423 </tr>
346 -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
347 -<th scope="row"><?php _e('Can we write?','autoptimize'); ?></th>
348 -<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes','autoptimize') : __('No','autoptimize')); ?></td>
424 +<tr valign="top" >
425 +<th scope="row"><?php esc_html_e( 'Can we write?', 'autoptimize' ); ?></th>
426 +<td><?php echo ( autoptimizeCache::cacheavail() ? esc_html__( 'Yes', 'autoptimize' ) : esc_html__( 'No', 'autoptimize' ) ); ?></td>
349 427 </tr>
350 -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
351 -<th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th>
352 -<td><?php
353 - $AOstatArr = autoptimizeCache::stats();
354 - if ( ! empty( $AOstatArr ) && is_array( $AOstatArr ) ) {
355 - $AOcacheSize = size_format( $AOstatArr[1], 2 );
356 - $details = '';
357 - if ( $AOcacheSize > 0 ) {
358 - $details = ', ~' . $AOcacheSize . ' total';
428 +<tr valign="top" >
429 +<th scope="row"><?php esc_html_e( 'Cached styles and scripts', 'autoptimize' ); ?></th>
430 +<td>
431 + <?php
432 + $ao_stat_arr = autoptimizeCache::stats();
433 + if ( ! empty( $ao_stat_arr ) && is_array( $ao_stat_arr ) ) {
434 + $ao_cache_size = size_format( $ao_stat_arr[1], 2 );
435 + $details = '';
436 + if ( $ao_cache_size > 0 ) {
437 + $details = ', ~' . $ao_cache_size . ' total';
359 438 }
360 - printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize' ), $AOstatArr[0], $AOcacheSize, date( 'H:i e', $AOstatArr[2] ) );
439 + // translators: Kilobytes + timestamp shown.
440 + printf( esc_html__( '%1$s files, totaling %2$s (calculated at %3$s)', 'autoptimize' ), $ao_stat_arr[0], $ao_cache_size, wp_date( 'H:i', $ao_stat_arr[2] ) ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
361 441 }
362 -?></td>
442 + ?>
443 +</td>
363 444 </tr>
364 445 </table>
365 446 </li>
366 447
367 -<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
368 -<h2 class="itemTitle"><?php _e('Misc Options','autoptimize'); ?></h2>
448 +<li class="itemDetail">
449 +<h2 class="itemTitle"><?php esc_html_e( 'Misc Options', 'autoptimize' ); ?></h2>
369 450 <table class="form-table">
370 - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
371 - <th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th>
372 - <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/>
373 - <?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>
451 + <tr valign="top">
452 + <th scope="row"><?php esc_html_e( 'Save aggregated script/css as static files?', 'autoptimize' ); ?></th>
453 + <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo $conf->get( 'autoptimize_cache_nogzip' ) ? 'checked="checked" ' : ''; ?>/>
454 + <?php esc_html_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>
374 455 </tr>
375 - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
376 - <th scope="row"><?php _e('Also optimize for logged in users?','autoptimize'); ?></th>
377 - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged','1')?'checked="checked" ':''; ?>/>
378 - <?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>
456 + <?php
457 + $_min_excl_class = '';
458 + if ( ! $conf->get( 'autoptimize_css_aggregate' ) && ! $conf->get( 'autoptimize_js_aggregate' ) ) {
459 + $_min_excl_class = 'hidden';
460 + }
461 + ?>
462 + <tr valign="top" id="min_excl_row" class="<?php echo $_min_excl_class; ?>">
463 + <th scope="row"><?php esc_html_e( 'Minify excluded CSS and JS files?', 'autoptimize' ); ?></th>
464 + <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo $conf->get( 'autoptimize_minify_excluded' ) ? 'checked="checked" ' : ''; ?>/>
465 + <?php esc_html_e( 'When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize' ); ?></label></td>
379 466 </tr>
467 + <tr valign="top">
468 + <th scope="row"><?php esc_html_e( 'Enable 404 fallbacks?', 'autoptimize' ); ?></th>
469 + <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_fallback" <?php echo $conf->get( 'autoptimize_cache_fallback' ) ? 'checked="checked" ' : ''; ?>/>
470 + <?php
471 + // translators; just 2 opening and closing <code> tags.
472 + printf( esc_html__( 'Sometimes Autoptimized JS/ CSS is referenced in cached HTML but is already removed, resulting in broken sites. With this option on, Autoptimize will try to redirect those not-found files to "fallback"-versions, keeping the page/ site somewhat intact. In some cases, this will require extra web-server level configuration to ensure %1$swp-content/autoptimize_404_handler.php%2$s is set to handle 404\'s in %1$swp-content/cache/autoptimize%2$s.', 'autoptimize' ), '<code>', '</code>' );
473 + ?>
474 + </label></td>
475 + </tr>
476 + <tr valign="top">
477 + <th scope="row"><?php esc_html_e( 'Also optimize for logged in editors/ administrators?', 'autoptimize' ); ?></th>
478 + <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo $conf->get( 'autoptimize_optimize_logged' ) ? 'checked="checked" ' : ''; ?>/>
479 + <?php esc_html_e( 'By default Autoptimize is also active for logged-on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a page builder.', 'autoptimize' ); ?></label></td>
480 + </tr>
380 481 <?php
381 - if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
482 + if ( function_exists( 'is_checkout' ) || function_exists( 'is_cart' ) || function_exists( 'edd_is_checkout' ) || function_exists( 'wpsc_is_cart' ) || function_exists( 'wpsc_is_checkout' ) ) {
382 483 ?>
383 - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
384 - <th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th>
385 - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/>
386 - <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.','autoptimize'); ?></label>
484 + <tr valign="top" >
485 + <th scope="row"><?php esc_html_e( 'Also optimize shop cart/ checkout?', 'autoptimize' ); ?></th>
486 + <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo $conf->get( 'autoptimize_optimize_checkout' ) ? 'checked="checked" ' : ''; ?>/>
487 + <?php esc_html_e( 'By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize' ); ?></label>
387 488 </td>
388 489 </tr>
389 490 <?php } ?>
491 + <?php
492 + if ( true === apply_filters( 'autoptimize_filter_enable_meta_ao_settings', true ) ) {
493 + ?>
494 + <tr valign="top">
495 + <th scope="row"><?php esc_html_e( 'Enable configuration per post/ page?', 'autoptimize' ); ?></th>
496 + <td><label class="cb_label"><input type="checkbox" name="autoptimize_enable_meta_ao_settings" <?php echo $conf->get( 'autoptimize_enable_meta_ao_settings' ) ? 'checked="checked" ' : ''; ?>/>
497 + <?php esc_html_e( 'Add a "meta box" to the post/ page edit screen allowing different optimizations to be turned off on a per post/ page level?', 'autoptimize' ); ?></label></td>
498 + </tr>
499 + <?php } ?>
500 + <tr valign="top">
501 + <th scope="row"><?php esc_html_e( 'Disable extra compatibility logic?', 'autoptimize' ); ?></th>
502 + <td><label class="cb_label"><input type="checkbox" name="autoptimize_installed_before_compatibility" <?php echo $conf->get( 'autoptimize_installed_before_compatibility' ) ? 'checked="checked" ' : ''; ?>/>
503 + <?php esc_html_e( 'Autoptimize applies extra "compatibility logic" to prevent issues with JS optimization (for e.g. Gutenberg blocks, Revolution Slider, jQuery-heavy plugins, ...) but may sometimes be a bit too careful. If you have render-blocking JS issues, you can try disabling this logic here. Make sure to test your site thoroughly though!', 'autoptimize' ); ?></label></td>
504 + </tr>
390 505 </table>
391 506 </li>
392 507
393 508 </ul>
394 509
395 -<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>">
396 -
397 510 <p class="submit">
398 -<input type="submit" class="button-secondary" value="<?php _e('Save Changes','autoptimize') ?>" />
399 -<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache','autoptimize') ?>" />
511 +<input type="submit" class="button-secondary" value="<?php esc_html_e( 'Save Changes', 'autoptimize' ); ?>" />
512 +<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php esc_html_e( 'Save Changes and Empty Cache', 'autoptimize' ); ?>" />
400 513 </p>
401 514
402 515 </form>
403 516 </div>
404 -<div id="autoptimize_admin_feed" class="hidden">
517 +<div id="autoptimize_admin_feed">
518 + <?php if ( apply_filters( 'autoptimize_filter_show_partner_tabs', true ) ) { ?>
405 519 <div class="autoptimize_banner hidden">
406 - <ul>
520 + <ul>
407 521 <?php
408 522 if ( $this->settings_screen_do_remote_http ) {
409 - $AO_banner = get_transient( 'autoptimize_banner' );
410 - if ( empty( $AO_banner ) ) {
411 - $banner_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION );
523 + $ao_banner = get_transient( 'autoptimize_banner' );
524 + if ( empty( $ao_banner ) ) {
525 + $banner_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
412 526 if ( ! is_wp_error( $banner_resp ) ) {
413 527 if ( '200' == wp_remote_retrieve_response_code( $banner_resp ) ) {
414 - $AO_banner = wp_kses_post( wp_remote_retrieve_body( $banner_resp ) );
415 - set_transient('autoptimize_banner', $AO_banner, DAY_IN_SECONDS);
528 + $ao_banner = wp_kses_post( wp_remote_retrieve_body( $banner_resp ) );
529 + set_transient( 'autoptimize_banner', $ao_banner, WEEK_IN_SECONDS );
416 530 }
417 531 }
418 532 }
419 - echo $AO_banner;
533 + echo $ao_banner;
420 534 }
421 535 ?>
422 - <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.","autoptimize"); ?></li>
423 - <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>
536 + <li>
537 + <?php
538 + // translators: link to the AO FAQ.
539 + printf( esc_html__( 'Need help? %1$sCheck out the FAQ here%2$s.', 'autoptimize' ), '<a href=\'https://wordpress.org/plugins/autoptimize/faq/\'>', '</a>' );
540 + ?>
541 + </li>
542 + <li><?php esc_html_e( 'Happy with Autoptimize?', 'autoptimize' ); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php esc_html_e( 'Try my other plugins!', 'autoptimize' ); ?></a></li>
424 543 </ul>
425 544 </div>
545 + <?php } ?>
426 546 <div style="margin-left:10px;margin-top:-5px;">
427 547 <h2>
428 - <?php _e("futtta about","autoptimize") ?>
429 - <select id="feed_dropdown" >
430 - <option value="1"><?php _e("Autoptimize","autoptimize") ?></option>
431 - <option value="2"><?php _e("WordPress","autoptimize") ?></option>
432 - <option value="3"><?php _e("Web Technology","autoptimize") ?></option>
433 - </select>
548 + <?php esc_html_e( 'Autoptimize news', 'autoptimize' ); ?>
434 549 </h2>
435 550 <div id="futtta_feed">
436 551 <div id="autoptimizefeed">
437 - <?php $this->getFutttaFeeds("http://feeds.feedburner.com/futtta_autoptimize"); ?>
552 + <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_autoptimize' ); ?>
438 553 </div>
439 - <div id="wordpressfeed">
440 - <?php $this->getFutttaFeeds("http://feeds.feedburner.com/futtta_wordpress"); ?>
441 - </div>
442 - <div id="webtechfeed">
443 - <?php $this->getFutttaFeeds("http://feeds.feedburner.com/futtta_webtech"); ?>
444 - </div>
445 554 </div>
446 555 </div>
447 - <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>
556 + <?php if ( apply_filters( 'autoptimize_filter_show_partner_tabs', true ) ) { ?>
557 + <div style="float:right;margin:50px 15px;"><a href="https://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 esc_html_e( 'Do not donate for this plugin!', 'autoptimize' ); ?>"></a></div>
558 + <?php } ?>
448 559 </div>
449 -
450 560 <script type="text/javascript">
451 - var feed = new Array;
452 - feed[1]="autoptimizefeed";
453 - feed[2]="wordpressfeed";
454 - feed[3]="webtechfeed";
455 - cookiename="autoptimize_feed";
456 -
457 561 jQuery(document).ready(function() {
458 562 check_ini_state();
459 563
460 - jQuery('#autoptimize_admin_feed').fadeTo("slow",1).show();
461 564 jQuery('.autoptimize_banner').unslider({autoplay:true, delay:3500, infinite: false, arrows:{prev:'<a class="unslider-arrow prev"></a>', next:'<a class="unslider-arrow next"></a>'}}).fadeTo("slow",1).show();
462 565
463 - jQuery( "#feed_dropdown" ).change(function() {
464 - jQuery("#futtta_feed").fadeTo(0,0);
465 - jQuery("#futtta_feed").fadeTo("slow",1);
466 - });
467 -
468 - jQuery( "#ao_show_adv" ).click(function() {
469 - jQuery( "#ao_show_adv" ).hide();
470 - jQuery( "#ao_hide_adv" ).show();
471 - jQuery( ".ao_adv" ).removeClass("hidden");
472 - jQuery( ".ao_adv" ).show("slow");
473 - if (jQuery("#autoptimize_css").attr('checked')) {
474 - jQuery(".css_sub:visible").fadeTo("fast",1);
475 - if (!jQuery("#autoptimize_css_defer").attr('checked')) {
476 - jQuery("#autoptimize_css_defer_inline").hide();
477 - }
478 - }
479 - if (jQuery("#autoptimize_js").attr('checked')) {
480 - jQuery(".js_sub:visible").fadeTo("fast",1);
481 - }
482 - check_ini_state();
483 - jQuery( "input#autoptimize_show_adv" ).val("1");
484 - });
485 -
486 - jQuery( "#ao_hide_adv" ).click(function() {
487 - jQuery( "#ao_hide_adv" ).hide();
488 - jQuery( "#ao_show_adv" ).show();
489 - jQuery( ".ao_adv" ).hide("slow");
490 - jQuery( ".ao_adv" ).addClass("hidden");
491 - if (!jQuery("#autoptimize_css").attr('checked')) {
492 - jQuery(".css_sub:visible").fadeTo("fast",.33);
493 - }
494 - if (!jQuery("#autoptimize_js").attr('checked')) {
495 - jQuery(".js_sub:visible").fadeTo("fast",.33);
496 - }
497 - check_ini_state();
498 - jQuery( "input#autoptimize_show_adv" ).val("0");
499 - });
500 -
501 566 jQuery( "#autoptimize_html" ).change(function() {
502 567 if (this.checked) {
503 568 jQuery(".html_sub:visible").fadeTo("fast",1);
504 569 } else {
@@ -514,15 +579,40 @@
514 579 }
515 580 });
516 581
517 582 jQuery( "#autoptimize_js_aggregate" ).change(function() {
518 - if (this.checked && jQuery("#autoptimize_js").attr('checked')) {
519 - jQuery(".js_aggregate:visible").fadeTo("fast",1);
583 + if (this.checked && jQuery("#autoptimize_js").prop('checked')) {
584 + jQuery( "#autoptimize_js_defer_not_aggregate" ).prop( 'checked', false ); // uncheck "defer not aggregate"
585 + jQuery( ".js_aggregate_master:visible" ).fadeTo( 'slow', 1 ); // ungrey self
586 + jQuery( ".js_aggregate" ).show( 'slow' ); // show sub-items
587 + jQuery( ".js_not_aggregate_master:visible" ).fadeTo( 'slow', .33 ); // grey out "not aggregate"
588 + jQuery( ".js_not_aggregate" ).hide( 'slow' ); // hide not aggregate sub-items
589 + jQuery( "#min_excl_row" ).show(); // make sure "minify excluded" is visible
590 + check_exclusions( "js", "on" );
520 591 } else {
521 - jQuery(".js_aggregate:visible").fadeTo("fast",.33);
592 + jQuery( ".js_aggregate" ).hide( 'slow' ); // hide sub-itmes
593 + jQuery( ".js_not_aggregate_master:visible" ).fadeTo( 'slow', 1 ); // un-grey-out "not aggregate"
594 + if ( jQuery( "#autoptimize_css_aggregate" ).prop( 'checked' ) == false ) { // hide "minify excluded"
595 + jQuery( "#min_excl_row" ).hide();
596 + }
597 + check_exclusions( "js", "off" );
522 598 }
523 599 });
524 600
601 + jQuery( "#autoptimize_js_defer_not_aggregate" ).change(function() {
602 + if (this.checked && jQuery("#autoptimize_js").prop('checked')) {
603 + jQuery( "#autoptimize_js_aggregate" ).prop( 'checked', false ); // uncheck "aggregate JS"
604 + jQuery( ".js_not_aggregate_master:visible" ).fadeTo( 'slow', 1 ); // ungrey self
605 + jQuery( ".js_not_aggregate" ).show( 'slow'); // show sub-items
606 + jQuery( ".js_aggregate_master:visible" ).fadeTo( 'slow', .33 ); // grey out "aggregate"
607 + jQuery( ".js_aggregate" ).hide( 'slow' ); // hide aggregate sub-items
608 + check_exclusions( "js", "off" );
609 + } else {
610 + jQuery( ".js_not_aggregate" ).hide( 'slow' ); // hide sub-items
611 + jQuery( ".js_aggregate_master:visible" ).fadeTo( 'slow', 1 ); // un-grey-out "aggregate"
612 + }
613 + });
614 +
525 615 jQuery( "#autoptimize_css" ).change(function() {
526 616 if (this.checked) {
527 617 jQuery(".css_sub:visible").fadeTo("fast",1);
528 618 } else {
@@ -530,12 +620,18 @@
530 620 }
531 621 });
532 622
533 623 jQuery( "#autoptimize_css_aggregate" ).change(function() {
534 - if (this.checked && jQuery("#autoptimize_css").attr('checked')) {
624 + if (this.checked && jQuery("#autoptimize_css").prop('checked')) {
535 625 jQuery(".css_aggregate:visible").fadeTo("fast",1);
626 + jQuery( "#min_excl_row" ).show();
627 + check_exclusions( "css", "on" );
536 628 } else {
537 629 jQuery(".css_aggregate:visible").fadeTo("fast",.33);
630 + if ( jQuery( "#autoptimize_js_aggregate" ).prop('checked') == false ) {
631 + jQuery( "#min_excl_row" ).hide();
632 + }
633 + check_exclusions( "css", "off" );
538 634 }
539 635 });
540 636
541 637 jQuery( "#autoptimize_css_inline" ).change(function() {
@@ -553,12 +649,15 @@
553 649 jQuery("#autoptimize_css_defer_inline").hide("slow");
554 650 }
555 651 });
556 652
557 - jQuery("#feed_dropdown").change(function() { show_feed(jQuery("#feed_dropdown").val()) });
558 - feedid=jQuery.cookie(cookiename);
559 - if(typeof(feedid) !== "string") feedid=1;
560 - show_feed(feedid);
653 + jQuery( "#autoptimize_enable_site_config" ).change(function() {
654 + if (this.checked) {
655 + jQuery("li.itemDetail:not(.multiSite)").fadeTo("fast",.33);
656 + } else {
657 + jQuery("li.itemDetail:not(.multiSite)").fadeTo("fast",1);
658 + }
659 + });
561 660 })
562 661
563 662 // validate cdn_url.
564 663 var cdn_url=document.getElementById("cdn_url");
@@ -572,33 +671,56 @@
572 671 }});
573 672 }
574 673
575 674 function check_ini_state() {
576 - if (!jQuery("#autoptimize_css_defer").attr('checked')) {
675 + if (!jQuery("#autoptimize_css_defer").prop('checked')) {
577 676 jQuery("#autoptimize_css_defer_inline").hide();
578 677 }
579 - if (!jQuery("#autoptimize_html").attr('checked')) {
678 + if (!jQuery("#autoptimize_html").prop('checked')) {
580 679 jQuery(".html_sub:visible").fadeTo('fast',.33);
581 680 }
582 - if (!jQuery("#autoptimize_css").attr('checked')) {
681 + if (!jQuery("#autoptimize_css").prop('checked')) {
583 682 jQuery(".css_sub:visible").fadeTo('fast',.33);
584 683 }
585 - if (!jQuery("#autoptimize_css_aggregate").attr('checked')) {
684 + if (!jQuery("#autoptimize_css_aggregate").prop('checked')) {
586 685 jQuery(".css_aggregate:visible").fadeTo('fast',.33);
587 686 }
588 - if (!jQuery("#autoptimize_js").attr('checked')) {
687 + if (jQuery("#autoptimize_js_aggregate").prop('checked')) {
688 + jQuery( ".js_aggregate" ).show( 'fast' );
689 + jQuery( ".js_not_aggregate_master:visible" ).fadeTo( 'fast', .33 );
690 + }
691 + if (jQuery("#autoptimize_js_defer_not_aggregate").prop('checked')) {
692 + jQuery( ".js_not_aggregate" ).show( 'fast' );
693 + jQuery( ".js_aggregate_master:visible" ).fadeTo( 'fast', .33 );
694 + }
695 + if (jQuery("#autoptimize_enable_site_config").prop('checked')) {
696 + jQuery("li.itemDetail:not(.multiSite)").fadeTo('fast',.33);
697 + }
698 + if (!jQuery("#autoptimize_js").prop('checked')) {
589 699 jQuery(".js_sub:visible").fadeTo('fast',.33);
590 700 }
591 - if (!jQuery("#autoptimize_js_aggregate").attr('checked')) {
592 - jQuery(".js_aggregate:visible").fadeTo('fast',.33);
701 + }
702 +
703 + function check_exclusions( what, state ) {
704 + exclusion_node = 'input[name="autoptimize_' + what + '_exclude"]';
705 + current_exclusion = jQuery( exclusion_node ).val();
706 +
707 + if ( what == "js" ) {
708 + default_exclusion = ", wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.min.js";
709 + } else if ( what == "css") {
710 + default_exclusion = ", admin-bar.min.css, dashicons.min.css, wp-content/cache/, wp-content/uploads/";
593 711 }
594 - }
595 712
596 - function show_feed(id) {
597 - jQuery('#futtta_feed').children().hide();
598 - jQuery('#'+feed[id]).show();
599 - jQuery("#feed_dropdown").val(id);
600 - jQuery.cookie(cookiename,id,{ expires: 365 });
713 + default_in_current = current_exclusion.indexOf(default_exclusion);
714 +
715 + if ( state == "on" && default_in_current == -1 ) {
716 + jQuery( exclusion_node ).val( current_exclusion + default_exclusion );
717 + } else if ( state = "off" && current_exclusion == default_exclusion ) {
718 + jQuery( exclusion_node ).val( "" );
719 + } else if ( state = "off" && default_in_current != -1 ) {
720 + new_exclusion = current_exclusion.substring( 0, default_in_current) + current_exclusion.substring( default_in_current + default_exclusion.length, current_exclusion.length );
721 + jQuery( exclusion_node ).val( new_exclusion );
722 + }
601 723 }
602 724 </script>
603 725 </div>
604 726
@@ -606,9 +728,26 @@
606 728 }
607 729
608 730 public function addmenu()
609 731 {
610 - $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show' ) );
732 + $_my_name = apply_filters( 'autoptimize_filter_settings_is_pro', false ) ? esc_html__( 'Autoptimize Pro', 'autoptimize' ) : esc_html__( 'Autoptimize', 'autoptimize' );
733 +
734 + global $title;
735 + if ( empty( $title ) && true === autoptimizeUtils::is_ao_settings() ) {
736 + $title = $_my_name;
737 + }
738 +
739 + if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
740 + // multisite, network admin, ao network activated: add normal settings page at network level.
741 + $hook = add_submenu_page( 'settings.php', esc_html__( 'Autoptimize Options', 'autoptimize' ), $_my_name, 'manage_network_options', 'autoptimize', array( $this, 'show_config' ) );
742 + } elseif ( is_multisite() && ! is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) {
743 + // multisite, ao network activated, not network admin so site specific settings, but "autoptimize_enable_site_config" is off: show "sorry, ask network admin" message iso options.
744 + $hook = add_options_page( esc_html__( 'Autoptimize Options', 'autoptimize' ), $_my_name, 'manage_options', 'autoptimize', array( $this, 'show_network_message' ) );
745 + } else {
746 + // default: show normal options page if not multisite, if multisite but not network activated, if multisite and network activated and "autoptimize_enable_site_config" is on.
747 + $hook = add_options_page( esc_html__( 'Autoptimize Options', 'autoptimize' ), $_my_name, 'manage_options', 'autoptimize', array( $this, 'show_config' ) );
748 + }
749 +
611 750 add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) );
612 751 add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) );
613 752 }
614 753
@@ -613,23 +752,26 @@
613 752 }
614 753
615 754 public function autoptimize_admin_scripts()
616 755 {
617 - wp_enqueue_script( 'jqcookie', plugins_url( '/external/js/jquery.cookie.min.js', __FILE__ ), array( 'jquery' ), null, true );
618 - wp_enqueue_script( 'unslider', plugins_url( '/external/js/unslider-min.js', __FILE__ ), array( 'jquery' ), null, true );
756 + wp_enqueue_script( 'unslider', plugins_url( '/external/js/unslider.min.js', __FILE__ ), array( 'jquery' ), AUTOPTIMIZE_PLUGIN_VERSION, true );
619 757 }
620 758
621 759 public function autoptimize_admin_styles()
622 760 {
623 - wp_enqueue_style( 'unslider', plugins_url( '/external/js/unslider.css', __FILE__ ) );
624 - wp_enqueue_style( 'unslider-dots', plugins_url( '/external/js/unslider-dots.css', __FILE__ ) );
761 + wp_enqueue_style( 'unslider', plugins_url( '/external/js/unslider.css', __FILE__ ), null, AUTOPTIMIZE_PLUGIN_VERSION );
762 + wp_enqueue_style( 'unslider-dots', plugins_url( '/external/js/unslider-dots.css', __FILE__ ), null, AUTOPTIMIZE_PLUGIN_VERSION );
625 763 }
626 764
627 765 public function registersettings() {
628 766 register_setting( 'autoptimize', 'autoptimize_html' );
629 767 register_setting( 'autoptimize', 'autoptimize_html_keepcomments' );
768 + register_setting( 'autoptimize', 'autoptimize_html_minify_inline' );
769 + register_setting( 'autoptimize', 'autoptimize_enable_site_config' );
630 770 register_setting( 'autoptimize', 'autoptimize_js' );
631 771 register_setting( 'autoptimize', 'autoptimize_js_aggregate' );
772 + register_setting( 'autoptimize', 'autoptimize_js_defer_not_aggregate' );
773 + register_setting( 'autoptimize', 'autoptimize_js_defer_inline' );
632 774 register_setting( 'autoptimize', 'autoptimize_js_exclude' );
633 775 register_setting( 'autoptimize', 'autoptimize_js_trycatch' );
634 776 register_setting( 'autoptimize', 'autoptimize_js_justhead' );
635 777 register_setting( 'autoptimize', 'autoptimize_js_forcehead' );
@@ -645,14 +787,17 @@
645 787 register_setting( 'autoptimize', 'autoptimize_css_include_inline' );
646 788 register_setting( 'autoptimize', 'autoptimize_cdn_url' );
647 789 register_setting( 'autoptimize', 'autoptimize_cache_clean' );
648 790 register_setting( 'autoptimize', 'autoptimize_cache_nogzip' );
649 - register_setting( 'autoptimize', 'autoptimize_show_adv' );
650 791 register_setting( 'autoptimize', 'autoptimize_optimize_logged' );
651 792 register_setting( 'autoptimize', 'autoptimize_optimize_checkout' );
793 + register_setting( 'autoptimize', 'autoptimize_minify_excluded' );
794 + register_setting( 'autoptimize', 'autoptimize_cache_fallback' );
795 + register_setting( 'autoptimize', 'autoptimize_enable_meta_ao_settings' );
796 + register_setting( 'autoptimize', 'autoptimize_installed_before_compatibility' );
652 797 }
653 798
654 - public function setmeta($links, $file = null)
799 + public function setmeta( $links, $file = null )
655 800 {
656 801 // Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/.
657 802 // Do it only once - saves time.
658 803 static $plugin;
@@ -661,16 +806,16 @@
661 806 }
662 807
663 808 if ( null === $file ) {
664 809 // 2.7 and lower.
665 - $settings_link = sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) );
810 + $settings_link = sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', esc_html__( 'Settings' ) );
666 811 array_unshift( $links, $settings_link );
667 812 } else {
668 813 // 2.8 and higher.
669 814 // If it's us, add the link.
670 815 if ( $file === $plugin ) {
671 - $newlink = array( sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) ) );
672 - $links = array_merge( $links, $newlink );
816 + $newlink = array( sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', esc_html__( 'Settings' ) ) );
817 + $links = array_merge( $links, $newlink );
673 818 }
674 819 }
675 820
676 821 return $links;
@@ -676,36 +821,45 @@
676 821 return $links;
677 822 }
678 823
679 824 /**
825 + * Provides the default options.
826 + *
680 827 * @return array
681 828 */
682 829 public static function get_defaults()
683 830 {
684 831 static $config = array(
685 - 'autoptimize_html' => 0,
686 - 'autoptimize_html_keepcomments' => 0,
687 - 'autoptimize_js' => 0,
688 - 'autoptimize_js_aggregate' => 1,
689 - 'autoptimize_js_exclude' => 'seal.js, js/jquery/jquery.js',
690 - 'autoptimize_js_trycatch' => 0,
691 - 'autoptimize_js_justhead' => 0,
692 - 'autoptimize_js_include_inline' => 0,
693 - 'autoptimize_js_forcehead' => 0,
694 - 'autoptimize_css' => 0,
695 - 'autoptimize_css_aggregate' => 1,
696 - 'autoptimize_css_exclude' => 'admin-bar.min.css, dashicons.min.css, wp-content/cache/, wp-content/uploads/',
697 - 'autoptimize_css_justhead' => 0,
698 - 'autoptimize_css_include_inline' => 1,
699 - 'autoptimize_css_defer' => 0,
700 - 'autoptimize_css_defer_inline' => '',
701 - 'autoptimize_css_inline' => 0,
702 - 'autoptimize_css_datauris' => 0,
703 - 'autoptimize_cdn_url' => '',
704 - 'autoptimize_cache_nogzip' => 1,
705 - 'autoptimize_show_adv' => 0,
706 - 'autoptimize_optimize_logged' => 1,
707 - 'autoptimize_optimize_checkout' => 1
832 + 'autoptimize_html' => 1,
833 + 'autoptimize_html_keepcomments' => 0,
834 + 'autoptimize_html_minify_inline' => 0,
835 + 'autoptimize_enable_site_config' => 1,
836 + 'autoptimize_js' => 1,
837 + 'autoptimize_js_aggregate' => 0,
838 + 'autoptimize_js_defer_not_aggregate' => 1,
839 + 'autoptimize_js_defer_inline' => 1,
840 + 'autoptimize_js_exclude' => '',
841 + 'autoptimize_js_trycatch' => 0,
842 + 'autoptimize_js_justhead' => 0,
843 + 'autoptimize_js_include_inline' => 0,
844 + 'autoptimize_js_forcehead' => 0,
845 + 'autoptimize_css' => 1,
846 + 'autoptimize_css_aggregate' => 0,
847 + 'autoptimize_css_exclude' => '',
848 + 'autoptimize_css_justhead' => 0,
849 + 'autoptimize_css_include_inline' => 0,
850 + 'autoptimize_css_defer' => 0,
851 + 'autoptimize_css_defer_inline' => '',
852 + 'autoptimize_css_inline' => 0,
853 + 'autoptimize_css_datauris' => 0,
854 + 'autoptimize_cdn_url' => '',
855 + 'autoptimize_cache_nogzip' => 1,
856 + 'autoptimize_optimize_logged' => 1,
857 + 'autoptimize_optimize_checkout' => 0,
858 + 'autoptimize_minify_excluded' => 1,
859 + 'autoptimize_cache_fallback' => 1,
860 + 'autoptimize_enable_meta_ao_settings' => 1,
861 + 'autoptimize_installed_before_compatibility' => 0,
708 862 );
709 863
710 864 return $config;
711 865 }
@@ -722,10 +876,10 @@
722 876 'autoptimize_extra_checkbox_field_0' => '0',
723 877 'autoptimize_extra_radio_field_4' => '1',
724 878 'autoptimize_extra_text_field_2' => '',
725 879 'autoptimize_extra_text_field_3' => '',
726 - 'autoptimize_extra_checkbox_field_5' => '0',
727 - 'autoptimize_extra_select_field_6' => '2',
880 + 'autoptimize_extra_text_field_7' => '',
881 + 'autoptimize_extra_checkbox_field_8' => '0',
728 882 );
729 883
730 884 return $defaults;
731 885 }
@@ -730,30 +884,40 @@
730 884 return $defaults;
731 885 }
732 886
733 887 /**
734 - * Returns preload polyfill JS.
888 + * Returns default option values for autoptimizeExtra.
735 889 *
736 - * @return string
890 + * @return array
737 891 */
738 - public static function get_ao_css_preload_polyfill()
892 + public static function get_ao_imgopt_default_options()
739 893 {
740 - $preload_poly = apply_filters('autoptimize_css_preload_polyfill','<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>');
741 - return $preload_poly;
894 + $defaults = array(
895 + 'autoptimize_imgopt_checkbox_field_1' => '0', // imgopt off.
896 + 'autoptimize_imgopt_select_field_2' => '2', // quality glossy.
897 + 'autoptimize_imgopt_checkbox_field_3' => '0', // lazy load off.
898 + 'autoptimize_imgopt_checkbox_field_4' => '0', // avif off (might be removed).
899 + 'autoptimize_imgopt_text_field_5' => '', // lazy load exclusions empty.
900 + 'autoptimize_imgopt_text_field_6' => '', // optimization exclusions empty.
901 + 'autoptimize_imgopt_number_field_7' => '2', // lazy load from nth image (0 = lazyload all).
902 + );
903 + return $defaults;
742 904 }
743 905
744 906 /**
745 907 * Returns preload JS onload handler.
746 908 *
909 + * @param string $media media attribute value the JS to use.
910 + *
747 911 * @return string
748 912 */
749 - public static function get_ao_css_preload_onload()
913 + public static function get_ao_css_preload_onload( $media = 'all' )
750 914 {
751 - $preload_onload = apply_filters('autoptimize_filter_css_preload_onload',"this.onload=null;this.rel='stylesheet'");
915 + $preload_onload = apply_filters( 'autoptimize_filter_css_preload_onload', "this.onload=null;this.media='" . $media . "';" );
752 916 return $preload_onload;
753 917 }
754 918
755 - public function get($key)
919 + public function get( $key )
756 920 {
757 921 if ( ! is_array( $this->config ) ) {
758 922 // Default config.
759 923 $config = self::get_defaults();
@@ -759,9 +923,9 @@
759 923 $config = self::get_defaults();
760 924
761 925 // Override with user settings.
762 926 foreach ( array_keys( $config ) as $name ) {
763 - $conf = get_option( $name );
927 + $conf = autoptimizeOptionWrapper::get_option( $name );
764 928 if ( false !== $conf ) {
765 929 // It was set before!
766 930 $config[ $name ] = $conf;
767 931 }
@@ -777,26 +941,27 @@
777 941
778 942 return false;
779 943 }
780 944
781 - private function getFutttaFeeds($url) {
945 + private function get_futtta_feeds( $url ) {
782 946 if ( $this->settings_screen_do_remote_http ) {
783 - $rss = fetch_feed( $url );
947 + $rss = fetch_feed( $url );
784 948 $maxitems = 0;
785 949
786 950 if ( ! is_wp_error( $rss ) ) {
787 - $maxitems = $rss->get_item_quantity( 7 );
951 + $maxitems = $rss->get_item_quantity( 7 );
788 952 $rss_items = $rss->get_items( 0, $maxitems );
789 953 }
790 954 ?>
791 955 <ul>
792 - <?php if ( $maxitems == 0 ) : ?>
793 - <li><?php _e( 'No items', 'autoptimize' ); ?></li>
956 + <?php if ( 0 == $maxitems ) : ?>
957 + <li><?php esc_html_e( 'No items', 'autoptimize' ); ?></li>
794 958 <?php else : ?>
795 959 <?php foreach ( $rss_items as $item ) : ?>
796 960 <li>
797 961 <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
798 - title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>">
962 + <?php // translators: the variable contains a date. ?>
963 + title="<?php printf( esc_html__( 'Posted %s', 'autoptimize' ), $item->get_date( 'j F Y | g:i a' ) ); ?>">
799 964 <?php echo esc_html( $item->get_title() ); ?>
800 965 </a>
801 966 </li>
802 967 <?php endforeach; ?>
@@ -805,35 +970,35 @@
805 970 <?php
806 971 }
807 972 }
808 973
809 - // based on http://wordpress.stackexchange.com/a/58826
810 974 static function ao_admin_tabs()
811 975 {
812 - $tabs = apply_filters( 'autoptimize_filter_settingsscreen_tabs' ,array( 'autoptimize' => __( 'Main', 'autoptimize' ) ) );
813 - $tabContent = '';
814 - $tabs_count = count($tabs);
976 + // based on http://wordpress.stackexchange.com/a/58826 .
977 + $tabs = apply_filters( 'autoptimize_filter_settingsscreen_tabs', array( 'autoptimize' => esc_html__( 'JS, CSS &amp; HTML', 'autoptimize' ) ) );
978 + $tab_content = '';
979 + $tabs_count = count( $tabs );
815 980 if ( $tabs_count > 1 ) {
816 981 if ( isset( $_GET['page'] ) ) {
817 - $currentId = $_GET['page'];
982 + $current_id = $_GET['page'];
818 983 } else {
819 - $currentId = "autoptimize";
984 + $current_id = 'autoptimize';
820 985 }
821 - $tabContent .= '<h2 class="nav-tab-wrapper">';
822 - foreach ($tabs as $tabId => $tabName) {
823 - if ( $currentId == $tabId ) {
986 + $tab_content .= '<h2 class="nav-tab-wrapper">';
987 + foreach ( $tabs as $tab_id => $tab_name ) {
988 + if ( $current_id == $tab_id ) {
824 989 $class = ' nav-tab-active';
825 - } else{
990 + } else {
826 991 $class = '';
827 992 }
828 - $tabContent .= '<a class="nav-tab' . $class . '" href="?page=' . $tabId . '">' . $tabName . '</a>';
993 + $tab_content .= '<a class="nav-tab' . $class . '" href="?page=' . $tab_id . '">' . $tab_name . '</a>';
829 994 }
830 - $tabContent .= '</h2>';
995 + $tab_content .= '</h2>';
831 996 } else {
832 - $tabContent = '<hr/>';
997 + $tab_content = '<hr/>';
833 998 }
834 999
835 - return $tabContent;
1000 + return $tab_content;
836 1001 }
837 1002
838 1003 /**
839 1004 * Returns true if in admin (and not in admin-ajax.php!)
@@ -847,15 +1012,105 @@
847 1012
848 1013 /**
849 1014 * Returns true if doing ajax.
850 1015 *
851 - * @return type
1016 + * @return bool
852 1017 */
853 1018 protected static function doing_ajax()
854 1019 {
855 1020 if ( function_exists( 'wp_doing_ajax' ) ) {
856 1021 return wp_doing_ajax();
1022 + }
1023 + return ( defined( 'DOING_AJAX' ) && DOING_AJAX );
1024 + }
1025 +
1026 + /**
1027 + * Returns true menu or tab is to be shown.
1028 + *
1029 + * @return bool
1030 + */
1031 + public static function should_show_menu_tabs() {
1032 + if ( ! is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) || false === autoptimizeOptionWrapper::is_ao_active_for_network() ) {
1033 + return true;
857 1034 } else {
858 - return ( defined( 'DOING_AJAX' ) && DOING_AJAX );
1035 + return false;
859 1036 }
1037 + }
1038 +
1039 + /**
1040 + * Returns the post meta AO settings for reuse in different optimizers.
1041 + *
1042 + * @param string $optim What optimization we need meta setting for.
1043 + *
1044 + * @return bool
1045 + */
1046 + public static function get_post_meta_ao_settings( $optim ) {
1047 + if ( ! autoptimizeConfig::is_ao_meta_settings_active() ) {
1048 + // Per page/post settings not active, so always return true (as in; can be optimized).
1049 + if ( in_array( $optim, apply_filters( 'autoptimize_filter_meta_inactive_return_false_for', array( 'ao_post_preload' ) ) ) ) {
1050 + // but make sure to return false for text input.
1051 + return false;
1052 + }
1053 + return true;
1054 + }
1055 +
1056 + static $_meta_value = null;
1057 + if ( null === $_meta_value ) {
1058 + global $wp_query;
1059 + if ( isset( $wp_query ) ) {
1060 + $_meta_value = get_post_meta( get_the_ID(), 'ao_post_optimize', true );
1061 + } else {
1062 + $_meta_value = false;
1063 + }
1064 + }
1065 +
1066 + // If autoptimize_post_optimize !== 'on' (except for ao_post_preload, which can have other values) then always return false as all is off.
1067 + // fixme: need unit tests to ensure below logic is sane!
1068 + if ( empty( $_meta_value ) || ! is_array( $_meta_value ) ) {
1069 + // no metabox values so all optimizations are a go.
1070 + if ( in_array( $optim, apply_filters( 'autoptimize_filter_meta_optim_nonbool', array( 'ao_post_preload' ) ) ) ) {
1071 + // but make sure to return false for text input.
1072 + return false;
1073 + }
1074 + return true;
1075 + } else if ( array_key_exists( 'ao_post_optimize', $_meta_value ) && 'on' !== $_meta_value['ao_post_optimize'] ) {
1076 + // ao entirely off for this page.
1077 + return false;
1078 + } else if ( in_array( $optim, apply_filters( 'autoptimize_filter_meta_optim_with_filters', array() ) ) ) {
1079 + // if an $optim is registered as having a filter, apply filter and return that (default false).
1080 + return apply_filters( 'autoptimize_filter_meta_filtered_optim', false, $optim, $_meta_value );
1081 + } else if ( array_key_exists( $optim, $_meta_value ) && empty( $_meta_value[ $optim ] ) ) {
1082 + // sub-optimization off for this page.
1083 + return false;
1084 + } else if ( array_key_exists( $optim, $_meta_value ) && 'on' === $_meta_value[ $optim ] ) {
1085 + // sub-optimization is explictly on.
1086 + return true;
1087 + } else if ( array_key_exists( $optim, $_meta_value ) && in_array( $optim, array( 'ao_post_preload' ) ) && ! empty( $_meta_value[ $optim ] ) ) {
1088 + // a non-bool metabox optimization (currently only preload field), return value instead of bool.
1089 + return $_meta_value[ $optim ];
1090 + } else if ( in_array( $optim, array( 'ao_post_preload' ) ) && ( ! array_key_exists( $optim, $_meta_value ) || empty( $_meta_value[ $optim ] ) ) ) {
1091 + // a non-bool metabox optimization not found or empty, so returning false.
1092 + return false;
1093 + } else {
1094 + // when in doubt "go" for optimization, but this should never happen?
1095 + if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
1096 + error_log( 'AO meta box logic fallback; well, how did I get here? Maybe this helps: looking for ' . $optim . ' in ' . json_encode( $_meta_value ) );
1097 + }
1098 + return true;
1099 + }
1100 + }
1101 +
1102 + /**
1103 + * Are the post meta AO settings active (default: no)?
1104 + *
1105 + * @return bool
1106 + */
1107 + public static function is_ao_meta_settings_active() {
1108 + static $_meta_settings_active = null;
1109 +
1110 + if ( null === $_meta_settings_active ) {
1111 + $_meta_settings_active = apply_filters( 'autoptimize_filter_enable_meta_ao_settings', autoptimizeOptionWrapper::get_option( 'autoptimize_enable_meta_ao_settings', '1' ) );
1112 + }
1113 +
1114 + return $_meta_settings_active;
860 1115 }
861 1116 }