@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Critical CSS Options page. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -17,34 +17,34 @@ discard block |
||
17 | 17 | |
18 | 18 | public function __construct() |
19 | 19 | { |
20 | - $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http ); |
|
20 | + $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http); |
|
21 | 21 | $this->run(); |
22 | 22 | } |
23 | 23 | |
24 | 24 | protected function enabled() |
25 | 25 | { |
26 | - return apply_filters( 'autoptimize_filter_show_criticalcss_tabs', true ); |
|
26 | + return apply_filters('autoptimize_filter_show_criticalcss_tabs', true); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | public function run() |
30 | 30 | { |
31 | - if ( $this->enabled() ) { |
|
32 | - add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_critcss_tabs' ), 10, 1 ); |
|
33 | - add_action( 'admin_enqueue_scripts', array( $this, 'admin_assets' ) ); |
|
31 | + if ($this->enabled()) { |
|
32 | + add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_critcss_tabs'), 10, 1); |
|
33 | + add_action('admin_enqueue_scripts', array($this, 'admin_assets')); |
|
34 | 34 | |
35 | - if ( $this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) { |
|
36 | - add_action( 'network_admin_menu', array( $this, 'add_critcss_admin_menu' ) ); |
|
35 | + if ($this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) { |
|
36 | + add_action('network_admin_menu', array($this, 'add_critcss_admin_menu')); |
|
37 | 37 | } else { |
38 | - add_action( 'admin_menu', array( $this, 'add_critcss_admin_menu' ) ); |
|
38 | + add_action('admin_menu', array($this, 'add_critcss_admin_menu')); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | $criticalcss_ajax = new autoptimizeCriticalCSSSettingsAjax(); |
42 | 42 | } |
43 | 43 | } |
44 | 44 | |
45 | - public function add_critcss_tabs( $in ) |
|
45 | + public function add_critcss_tabs($in) |
|
46 | 46 | { |
47 | - $in = array_merge( $in, array( 'ao_critcss' => '⚡ ' . __( 'Critical CSS', 'autoptimize' ) ) ); |
|
47 | + $in = array_merge($in, array('ao_critcss' => '⚡ '.__('Critical CSS', 'autoptimize'))); |
|
48 | 48 | |
49 | 49 | return $in; |
50 | 50 | } |
@@ -52,66 +52,66 @@ discard block |
||
52 | 52 | public function add_critcss_admin_menu() |
53 | 53 | { |
54 | 54 | // Register settings. |
55 | - register_setting( 'ao_ccss_options_group', 'autoptimize_css_defer_inline' ); |
|
56 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rules' ); |
|
57 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_additional' ); |
|
58 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_queue' ); |
|
59 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_viewport' ); |
|
60 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_finclude' ); |
|
61 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rlimit' ); |
|
62 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_noptimize' ); |
|
63 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_debug' ); |
|
64 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_key' ); |
|
65 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_keyst' ); |
|
66 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_loggedin' ); |
|
67 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_forcepath' ); |
|
68 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_deferjquery' ); |
|
69 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_domain' ); |
|
70 | - register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_unloadccss' ); |
|
55 | + register_setting('ao_ccss_options_group', 'autoptimize_css_defer_inline'); |
|
56 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_rules'); |
|
57 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_additional'); |
|
58 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_queue'); |
|
59 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_viewport'); |
|
60 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_finclude'); |
|
61 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_rlimit'); |
|
62 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_noptimize'); |
|
63 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_debug'); |
|
64 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_key'); |
|
65 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_keyst'); |
|
66 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_loggedin'); |
|
67 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_forcepath'); |
|
68 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_deferjquery'); |
|
69 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_domain'); |
|
70 | + register_setting('ao_ccss_options_group', 'autoptimize_ccss_unloadccss'); |
|
71 | 71 | |
72 | 72 | // And add submenu-page. |
73 | - add_submenu_page( null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array( $this, 'ao_criticalcsssettings_page' ) ); |
|
73 | + add_submenu_page(null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array($this, 'ao_criticalcsssettings_page')); |
|
74 | 74 | } |
75 | 75 | |
76 | - public function admin_assets( $hook ) { |
|
76 | + public function admin_assets($hook) { |
|
77 | 77 | // Return if plugin is not hooked. |
78 | - if ( 'settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook ) { |
|
78 | + if ('settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook) { |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | |
82 | 82 | // Stylesheets to add. |
83 | - wp_enqueue_style( 'wp-jquery-ui-dialog' ); |
|
84 | - wp_enqueue_style( 'ao-tablesorter', plugins_url( 'critcss-inc/css/ao-tablesorter/style.css', __FILE__ ) ); |
|
85 | - wp_enqueue_style( 'ao-ccss-admin-css', plugins_url( 'critcss-inc/css/admin_styles.css', __FILE__ ) ); |
|
83 | + wp_enqueue_style('wp-jquery-ui-dialog'); |
|
84 | + wp_enqueue_style('ao-tablesorter', plugins_url('critcss-inc/css/ao-tablesorter/style.css', __FILE__)); |
|
85 | + wp_enqueue_style('ao-ccss-admin-css', plugins_url('critcss-inc/css/admin_styles.css', __FILE__)); |
|
86 | 86 | |
87 | 87 | // Scripts to add. |
88 | - wp_enqueue_script( 'jquery-ui-dialog', array( 'jquery' ) ); |
|
89 | - wp_enqueue_script( 'md5', plugins_url( 'critcss-inc/js/md5.min.js', __FILE__ ), null, null, true ); |
|
90 | - wp_enqueue_script( 'tablesorter', plugins_url( 'critcss-inc/js/jquery.tablesorter.min.js', __FILE__ ), array( 'jquery' ), null, true ); |
|
91 | - wp_enqueue_script( 'ao-ccss-admin-license', plugins_url( 'critcss-inc/js/admin_settings.js', __FILE__ ), array( 'jquery' ), null, true ); |
|
88 | + wp_enqueue_script('jquery-ui-dialog', array('jquery')); |
|
89 | + wp_enqueue_script('md5', plugins_url('critcss-inc/js/md5.min.js', __FILE__), null, null, true); |
|
90 | + wp_enqueue_script('tablesorter', plugins_url('critcss-inc/js/jquery.tablesorter.min.js', __FILE__), array('jquery'), null, true); |
|
91 | + wp_enqueue_script('ao-ccss-admin-license', plugins_url('critcss-inc/js/admin_settings.js', __FILE__), array('jquery'), null, true); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | public function ao_criticalcsssettings_page() |
95 | 95 | { |
96 | 96 | // these are not OO yet, simply require for now. |
97 | - require_once( 'critcss-inc/admin_settings_rules.php' ); |
|
98 | - require_once( 'critcss-inc/admin_settings_queue.php' ); |
|
99 | - require_once( 'critcss-inc/admin_settings_key.php' ); |
|
100 | - require_once( 'critcss-inc/admin_settings_adv.php' ); |
|
101 | - require_once( 'critcss-inc/admin_settings_explain.php' ); |
|
97 | + require_once('critcss-inc/admin_settings_rules.php'); |
|
98 | + require_once('critcss-inc/admin_settings_queue.php'); |
|
99 | + require_once('critcss-inc/admin_settings_key.php'); |
|
100 | + require_once('critcss-inc/admin_settings_adv.php'); |
|
101 | + require_once('critcss-inc/admin_settings_explain.php'); |
|
102 | 102 | |
103 | 103 | // fetch all options at once and populate them individually explicitely as globals. |
104 | 104 | $all_options = autoptimizeCriticalCSSBase::fetch_options(); |
105 | - foreach ( $all_options as $_option => $_value ) { |
|
105 | + foreach ($all_options as $_option => $_value) { |
|
106 | 106 | global ${$_option}; |
107 | 107 | ${$_option} = $_value; |
108 | 108 | } |
109 | 109 | ?> |
110 | - <script>document.title = "Autoptimize: <?php _e( 'Critical CSS', 'autoptimize' ); ?> " + document.title;</script> |
|
110 | + <script>document.title = "Autoptimize: <?php _e('Critical CSS', 'autoptimize'); ?> " + document.title;</script> |
|
111 | 111 | <div class="wrap"> |
112 | 112 | <div id="autoptimize_main"> |
113 | 113 | <div id="ao_title_and_button"> |
114 | - <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1> |
|
114 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
115 | 115 | </div> |
116 | 116 | |
117 | 117 | <?php |
@@ -119,14 +119,14 @@ discard block |
||
119 | 119 | echo autoptimizeConfig::ao_admin_tabs(); |
120 | 120 | |
121 | 121 | // Make sure dir to write ao_ccss exists and is writable. |
122 | - if ( ! is_dir( AO_CCSS_DIR ) ) { |
|
123 | - $mkdirresp = @mkdir( AO_CCSS_DIR, 0775, true ); // @codingStandardsIgnoreLine |
|
124 | - $fileresp = file_put_contents( AO_CCSS_DIR . 'index.html', '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' ); |
|
125 | - if ( ( ! $mkdirresp ) || ( ! $fileresp ) ) { |
|
122 | + if (!is_dir(AO_CCSS_DIR)) { |
|
123 | + $mkdirresp = @mkdir(AO_CCSS_DIR, 0775, true); // @codingStandardsIgnoreLine |
|
124 | + $fileresp = file_put_contents(AO_CCSS_DIR.'index.html', '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
125 | + if ((!$mkdirresp) || (!$fileresp)) { |
|
126 | 126 | ?> |
127 | 127 | <div class="notice-error notice"><p> |
128 | 128 | <?php |
129 | - _e( 'Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize' ); |
|
129 | + _e('Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize'); |
|
130 | 130 | ?> |
131 | 131 | </p></div> |
132 | 132 | <?php |
@@ -134,11 +134,11 @@ discard block |
||
134 | 134 | } |
135 | 135 | |
136 | 136 | // Check for Autoptimize. |
137 | - if ( ! empty( $ao_ccss_key ) && ! $ao_css_defer ) { |
|
137 | + if (!empty($ao_ccss_key) && !$ao_css_defer) { |
|
138 | 138 | ?> |
139 | 139 | <div class="notice-error notice"><p> |
140 | 140 | <?php |
141 | - _e( "Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to use this power-up.", 'autoptimize' ); |
|
141 | + _e("Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to use this power-up.", 'autoptimize'); |
|
142 | 142 | ?> |
143 | 143 | </p></div> |
144 | 144 | <?php |
@@ -146,11 +146,11 @@ discard block |
||
146 | 146 | } |
147 | 147 | |
148 | 148 | // check if WordPress cron is disabled and warn if so. |
149 | - if ( ! empty( $ao_ccss_key ) && defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON && PAnD::is_admin_notice_active( 'i-know-about-disable-cron-forever' ) ) { |
|
149 | + if (!empty($ao_ccss_key) && defined('DISABLE_WP_CRON') && DISABLE_WP_CRON && PAnD::is_admin_notice_active('i-know-about-disable-cron-forever')) { |
|
150 | 150 | ?> |
151 | 151 | <div data-dismissible="i-know-about-disable-cron-forever" class="notice-warning notice is-dismissible"><p> |
152 | 152 | <?php |
153 | - _e( 'WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' ); |
|
153 | + _e('WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize'); |
|
154 | 154 | ?> |
155 | 155 | </p></div> |
156 | 156 | <?php |
@@ -158,24 +158,24 @@ discard block |
||
158 | 158 | |
159 | 159 | // warn if it looks as though the queue processing job looks isn't running |
160 | 160 | // but store result in transient as to not to have to go through 2 arrays each and every time. |
161 | - $_warn_cron = get_transient( 'ao_ccss_cronwarning' ); |
|
162 | - if ( ! empty( $ao_ccss_key ) && false === $_warn_cron ) { |
|
161 | + $_warn_cron = get_transient('ao_ccss_cronwarning'); |
|
162 | + if (!empty($ao_ccss_key) && false === $_warn_cron) { |
|
163 | 163 | $_jobs_all_new = true; |
164 | - $_oldest_job_timestamp = microtime( true ); // now. |
|
164 | + $_oldest_job_timestamp = microtime(true); // now. |
|
165 | 165 | $_jobs_too_old = true; |
166 | 166 | |
167 | 167 | // go over queue array. |
168 | - if ( empty( $ao_ccss_queue ) ) { |
|
168 | + if (empty($ao_ccss_queue)) { |
|
169 | 169 | // no jobs, then no warning. |
170 | 170 | $_jobs_all_new = false; |
171 | 171 | } else { |
172 | - foreach ( $ao_ccss_queue as $job ) { |
|
173 | - if ( $job['jctime'] < $_oldest_job_timestamp ) { |
|
172 | + foreach ($ao_ccss_queue as $job) { |
|
173 | + if ($job['jctime'] < $_oldest_job_timestamp) { |
|
174 | 174 | // we need to catch the oldest job's timestamp. |
175 | 175 | $_oldest_job_timestamp = $job['jctime']; |
176 | 176 | } |
177 | 177 | |
178 | - if ( 'NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid'] ) { |
|
178 | + if ('NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid']) { |
|
179 | 179 | // we have a non-"NEW" job which is not our pending firstrun job either, break the loop. |
180 | 180 | $_jobs_all_new = false; |
181 | 181 | break; |
@@ -184,11 +184,11 @@ discard block |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | // is the oldest job too old (4h)? |
187 | - if ( $_oldest_job_timestamp > microtime( true ) - 60 * 60 * 4 ) { |
|
187 | + if ($_oldest_job_timestamp > microtime(true) - 60*60*4) { |
|
188 | 188 | $_jobs_too_old = false; |
189 | 189 | } |
190 | 190 | |
191 | - if ( $_jobs_all_new && ! $this->ao_ccss_has_autorules() && $_jobs_too_old ) { |
|
191 | + if ($_jobs_all_new && !$this->ao_ccss_has_autorules() && $_jobs_too_old) { |
|
192 | 192 | $_warn_cron = 'on'; |
193 | 193 | $_transient_multiplier = 1; // store for 1 hour. |
194 | 194 | } else { |
@@ -196,33 +196,33 @@ discard block |
||
196 | 196 | $_transient_multiplier = 4; // store for 4 hours. |
197 | 197 | } |
198 | 198 | // and set transient. |
199 | - set_transient( 'ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier * HOUR_IN_SECONDS ); |
|
199 | + set_transient('ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier*HOUR_IN_SECONDS); |
|
200 | 200 | } |
201 | 201 | |
202 | - if ( ! empty( $ao_ccss_key ) && 'on' == $_warn_cron && PAnD::is_admin_notice_active( 'i-know-about-cron-1' ) ) { |
|
202 | + if (!empty($ao_ccss_key) && 'on' == $_warn_cron && PAnD::is_admin_notice_active('i-know-about-cron-1')) { |
|
203 | 203 | ?> |
204 | 204 | <div data-dismissible="i-know-about-cron-1" class="notice-warning notice is-dismissible"><p> |
205 | 205 | <?php |
206 | - _e( 'It looks like there might be a problem with WordPress cron (task scheduling). Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' ); |
|
206 | + _e('It looks like there might be a problem with WordPress cron (task scheduling). Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize'); |
|
207 | 207 | ?> |
208 | 208 | </p></div> |
209 | 209 | <?php |
210 | - } elseif ( ! empty( $ao_ccss_key ) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && ! $this->ao_ccss_has_autorules() ) { |
|
210 | + } elseif (!empty($ao_ccss_key) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && !$this->ao_ccss_has_autorules()) { |
|
211 | 211 | ?> |
212 | 212 | <div class="notice-success notice"><p> |
213 | 213 | <?php |
214 | - _e( 'Great, Autoptimize will now automatically start creating new critical CSS rules, you should see those appearing below in the next couple of hours.', 'autoptimize' ); |
|
214 | + _e('Great, Autoptimize will now automatically start creating new critical CSS rules, you should see those appearing below in the next couple of hours.', 'autoptimize'); |
|
215 | 215 | ?> |
216 | 216 | </p></div> |
217 | 217 | <?php |
218 | 218 | } |
219 | 219 | |
220 | 220 | // warn if service is down. |
221 | - if ( ! empty( $ao_ccss_key ) && ! empty( $ao_ccss_servicestatus ) && is_array( $ao_ccss_servicestatus ) && 'down' === $ao_ccss_servicestatus['critcss']['status'] ) { |
|
221 | + if (!empty($ao_ccss_key) && !empty($ao_ccss_servicestatus) && is_array($ao_ccss_servicestatus) && 'down' === $ao_ccss_servicestatus['critcss']['status']) { |
|
222 | 222 | ?> |
223 | 223 | <div class="notice-warning notice"><p> |
224 | 224 | <?php |
225 | - _e( 'The critical CSS service has been reported to be down. Although no new rules will be created for now, this does not prevent existing rules from being applied.', 'autoptimize' ); |
|
225 | + _e('The critical CSS service has been reported to be down. Although no new rules will be created for now, this does not prevent existing rules from being applied.', 'autoptimize'); |
|
226 | 226 | ?> |
227 | 227 | </p></div> |
228 | 228 | <?php |
@@ -232,24 +232,24 @@ discard block |
||
232 | 232 | ?> |
233 | 233 | <form id="settings" method="post" action="options.php"> |
234 | 234 | <?php |
235 | - settings_fields( 'ao_ccss_options_group' ); |
|
235 | + settings_fields('ao_ccss_options_group'); |
|
236 | 236 | |
237 | 237 | // Get API key status. |
238 | - $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( true ); |
|
238 | + $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(true); |
|
239 | 239 | |
240 | - if ( $this->is_multisite_network_admin() ) { |
|
240 | + if ($this->is_multisite_network_admin()) { |
|
241 | 241 | ?> |
242 | 242 | <ul id="key-panel"> |
243 | 243 | <li class="itemDetail"> |
244 | 244 | <?php |
245 | 245 | // translators: the placesholder is for a line of code in wp-config.php. |
246 | - echo sprintf( __( '<p>Critical CSS settings cannot be set at network level as critical CSS is specific to each sub-site.</p><p>You can however provide the critical CSS API key for use by all sites by adding this your wp-config.php as %s</p>', 'autoptimize' ), '<br/><code>define(\'AUTOPTIMIZE_CRITICALCSS_API_KEY\', \'eyJhbGmorestringsherexHa7MkOQFtDFkZgLmBLe-LpcHx4\');</code>' ); |
|
246 | + echo sprintf(__('<p>Critical CSS settings cannot be set at network level as critical CSS is specific to each sub-site.</p><p>You can however provide the critical CSS API key for use by all sites by adding this your wp-config.php as %s</p>', 'autoptimize'), '<br/><code>define(\'AUTOPTIMIZE_CRITICALCSS_API_KEY\', \'eyJhbGmorestringsherexHa7MkOQFtDFkZgLmBLe-LpcHx4\');</code>'); |
|
247 | 247 | ?> |
248 | 248 | </li> |
249 | 249 | </ul> |
250 | 250 | <?php |
251 | 251 | } else { |
252 | - if ( 'valid' == $key['status'] ) { |
|
252 | + if ('valid' == $key['status']) { |
|
253 | 253 | // If key status is valid, render other panels. |
254 | 254 | // Render rules section. |
255 | 255 | ao_ccss_render_rules(); |
@@ -266,23 +266,23 @@ discard block |
||
266 | 266 | $viewport = autoptimizeCriticalCSSCore::ao_ccss_viewport(); |
267 | 267 | |
268 | 268 | // Add hidden fields. |
269 | - echo "<input class='hidden' name='autoptimize_ccss_rules' value='" . $ao_ccss_rules_raw . "'>"; |
|
270 | - echo "<input class='hidden' name='autoptimize_ccss_queue' value='" . $ao_ccss_queue_raw . "'>"; |
|
271 | - echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="' . $viewport['w'] . '">'; |
|
272 | - echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="' . $viewport['h'] . '">'; |
|
273 | - echo '<input class="hidden" name="autoptimize_ccss_finclude" value="' . $ao_ccss_finclude . '">'; |
|
274 | - echo '<input class="hidden" name="autoptimize_ccss_rlimit" value="' . $ao_ccss_rlimit . '">'; |
|
275 | - echo '<input class="hidden" name="autoptimize_ccss_debug" value="' . $ao_ccss_debug . '">'; |
|
276 | - echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="' . $ao_ccss_noptimize . '">'; |
|
277 | - echo '<input class="hidden" name="autoptimize_css_defer_inline" value="' . esc_attr( $ao_css_defer_inline ) . '">'; |
|
278 | - echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="' . $ao_ccss_loggedin . '">'; |
|
279 | - echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="' . $ao_ccss_forcepath . '">'; |
|
269 | + echo "<input class='hidden' name='autoptimize_ccss_rules' value='".$ao_ccss_rules_raw."'>"; |
|
270 | + echo "<input class='hidden' name='autoptimize_ccss_queue' value='".$ao_ccss_queue_raw."'>"; |
|
271 | + echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="'.$viewport['w'].'">'; |
|
272 | + echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="'.$viewport['h'].'">'; |
|
273 | + echo '<input class="hidden" name="autoptimize_ccss_finclude" value="'.$ao_ccss_finclude.'">'; |
|
274 | + echo '<input class="hidden" name="autoptimize_ccss_rlimit" value="'.$ao_ccss_rlimit.'">'; |
|
275 | + echo '<input class="hidden" name="autoptimize_ccss_debug" value="'.$ao_ccss_debug.'">'; |
|
276 | + echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="'.$ao_ccss_noptimize.'">'; |
|
277 | + echo '<input class="hidden" name="autoptimize_css_defer_inline" value="'.esc_attr($ao_css_defer_inline).'">'; |
|
278 | + echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="'.$ao_ccss_loggedin.'">'; |
|
279 | + echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="'.$ao_ccss_forcepath.'">'; |
|
280 | 280 | } |
281 | 281 | // Render key panel unconditionally. |
282 | - ao_ccss_render_key( $ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color'] ); |
|
282 | + ao_ccss_render_key($ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color']); |
|
283 | 283 | ?> |
284 | 284 | <p class="submit left"> |
285 | - <input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /> |
|
285 | + <input type="submit" class="button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /> |
|
286 | 286 | </p> |
287 | 287 | <?php |
288 | 288 | } |
@@ -300,31 +300,31 @@ discard block |
||
300 | 300 | }); |
301 | 301 | } |
302 | 302 | </script> |
303 | - <form id="importSettingsForm"<?php if ( $this->is_multisite_network_admin() ) { echo ' class="hidden"'; } ?>> |
|
304 | - <span id="exportSettings" class="button-secondary"><?php _e( 'Export Settings', 'autoptimize' ); ?></span> |
|
305 | - <input class="button-secondary" id="importSettings" type="button" value="<?php _e( 'Import Settings', 'autoptimize' ); ?>" onclick="upload();return false;" /> |
|
303 | + <form id="importSettingsForm"<?php if ($this->is_multisite_network_admin()) { echo ' class="hidden"'; } ?>> |
|
304 | + <span id="exportSettings" class="button-secondary"><?php _e('Export Settings', 'autoptimize'); ?></span> |
|
305 | + <input class="button-secondary" id="importSettings" type="button" value="<?php _e('Import Settings', 'autoptimize'); ?>" onclick="upload();return false;" /> |
|
306 | 306 | <input class="button-secondary" id="settingsfile" name="settingsfile" type="file" /> |
307 | 307 | </form> |
308 | 308 | <div id="importdialog"></div> |
309 | 309 | </div><!-- /#autoptimize_main --> |
310 | 310 | </div><!-- /#wrap --> |
311 | 311 | <?php |
312 | - if ( ! $this->is_multisite_network_admin() ) { |
|
312 | + if (!$this->is_multisite_network_admin()) { |
|
313 | 313 | // Include debug panel if debug mode is enable. |
314 | - if ( $ao_ccss_debug ) { |
|
314 | + if ($ao_ccss_debug) { |
|
315 | 315 | ?> |
316 | 316 | <div id="debug"> |
317 | 317 | <?php |
318 | 318 | // Include debug panel. |
319 | - include( 'critcss-inc/admin_settings_debug.php' ); |
|
319 | + include('critcss-inc/admin_settings_debug.php'); |
|
320 | 320 | ?> |
321 | 321 | </div><!-- /#debug --> |
322 | 322 | <?php |
323 | 323 | } |
324 | 324 | echo '<script>'; |
325 | - include( 'critcss-inc/admin_settings_rules.js.php' ); |
|
326 | - include( 'critcss-inc/admin_settings_queue.js.php' ); |
|
327 | - include( 'critcss-inc/admin_settings_impexp.js.php' ); |
|
325 | + include('critcss-inc/admin_settings_rules.js.php'); |
|
326 | + include('critcss-inc/admin_settings_queue.js.php'); |
|
327 | + include('critcss-inc/admin_settings_impexp.js.php'); |
|
328 | 328 | echo '</script>'; |
329 | 329 | } |
330 | 330 | } |
@@ -332,19 +332,19 @@ discard block |
||
332 | 332 | public static function ao_ccss_has_autorules() { |
333 | 333 | static $_has_auto_rules = null; |
334 | 334 | |
335 | - if ( null === $_has_auto_rules ) { |
|
335 | + if (null === $_has_auto_rules) { |
|
336 | 336 | global $ao_ccss_rules; |
337 | 337 | $_has_auto_rules = false; |
338 | - if ( ! empty( $ao_ccss_rules ) ) { |
|
339 | - foreach ( array( 'types', 'paths' ) as $_typat ) { |
|
340 | - foreach ( $ao_ccss_rules[ $_typat ] as $rule ) { |
|
341 | - if ( ! empty( $rule['hash'] ) ) { |
|
338 | + if (!empty($ao_ccss_rules)) { |
|
339 | + foreach (array('types', 'paths') as $_typat) { |
|
340 | + foreach ($ao_ccss_rules[$_typat] as $rule) { |
|
341 | + if (!empty($rule['hash'])) { |
|
342 | 342 | // we have at least one AUTO job, so all is fine. |
343 | 343 | $_has_auto_rules = true; |
344 | 344 | break; |
345 | 345 | } |
346 | 346 | } |
347 | - if ( $_has_auto_rules ) { |
|
347 | + if ($_has_auto_rules) { |
|
348 | 348 | break; |
349 | 349 | } |
350 | 350 | } |
@@ -357,8 +357,8 @@ discard block |
||
357 | 357 | public function is_multisite_network_admin() { |
358 | 358 | static $_multisite_network_admin = null; |
359 | 359 | |
360 | - if ( null === $_multisite_network_admin ) { |
|
361 | - if ( is_multisite() && is_network_admin() ) { |
|
360 | + if (null === $_multisite_network_admin) { |
|
361 | + if (is_multisite() && is_network_admin()) { |
|
362 | 362 | $_multisite_network_admin = true; |
363 | 363 | } else { |
364 | 364 | $_multisite_network_admin = false; |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Critical CSS base file (initializes all ccss files). |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -19,35 +19,35 @@ discard block |
||
19 | 19 | public function __construct() |
20 | 20 | { |
21 | 21 | // define constant, but only once. |
22 | - if ( ! defined( 'AO_CCSS_DIR' ) ) { |
|
22 | + if (!defined('AO_CCSS_DIR')) { |
|
23 | 23 | // Define a constant with the directory to store critical CSS in. |
24 | - if ( is_multisite() ) { |
|
24 | + if (is_multisite()) { |
|
25 | 25 | $blog_id = get_current_blog_id(); |
26 | - define( 'AO_CCSS_DIR', WP_CONTENT_DIR . '/uploads/ao_ccss/' . $blog_id . '/' ); |
|
26 | + define('AO_CCSS_DIR', WP_CONTENT_DIR.'/uploads/ao_ccss/'.$blog_id.'/'); |
|
27 | 27 | } else { |
28 | - define( 'AO_CCSS_DIR', WP_CONTENT_DIR . '/uploads/ao_ccss/' ); |
|
28 | + define('AO_CCSS_DIR', WP_CONTENT_DIR.'/uploads/ao_ccss/'); |
|
29 | 29 | } |
30 | 30 | } |
31 | - if ( ! defined( 'AO_CCSS_VER' ) ) { |
|
31 | + if (!defined('AO_CCSS_VER')) { |
|
32 | 32 | // Define plugin version. |
33 | - define( 'AO_CCSS_VER', 'AO_' . AUTOPTIMIZE_PLUGIN_VERSION ); |
|
33 | + define('AO_CCSS_VER', 'AO_'.AUTOPTIMIZE_PLUGIN_VERSION); |
|
34 | 34 | |
35 | 35 | // Define constants for criticalcss.com base path and API endpoints. |
36 | 36 | // fixme: AO_CCSS_URL should be read from the autoptimize availability json stored as option. |
37 | - define( 'AO_CCSS_URL', 'https://criticalcss.com' ); |
|
38 | - define( 'AO_CCSS_API', AO_CCSS_URL . '/api/premium/' ); |
|
39 | - define( 'AO_CCSS_SLEEP', 10 ); |
|
37 | + define('AO_CCSS_URL', 'https://criticalcss.com'); |
|
38 | + define('AO_CCSS_API', AO_CCSS_URL.'/api/premium/'); |
|
39 | + define('AO_CCSS_SLEEP', 10); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | // Define support files locations, in case they are not already defined. |
43 | - if ( ! defined( 'AO_CCSS_LOCK' ) ) { |
|
44 | - define( 'AO_CCSS_LOCK', AO_CCSS_DIR . 'queue.lock' ); |
|
43 | + if (!defined('AO_CCSS_LOCK')) { |
|
44 | + define('AO_CCSS_LOCK', AO_CCSS_DIR.'queue.lock'); |
|
45 | 45 | } |
46 | - if ( ! defined( 'AO_CCSS_LOG' ) ) { |
|
47 | - define( 'AO_CCSS_LOG', AO_CCSS_DIR . 'queuelog.html' ); |
|
46 | + if (!defined('AO_CCSS_LOG')) { |
|
47 | + define('AO_CCSS_LOG', AO_CCSS_DIR.'queuelog.html'); |
|
48 | 48 | } |
49 | - if ( ! defined( 'AO_CCSS_DEBUG' ) ) { |
|
50 | - define( 'AO_CCSS_DEBUG', AO_CCSS_DIR . 'queue.json' ); |
|
49 | + if (!defined('AO_CCSS_DEBUG')) { |
|
50 | + define('AO_CCSS_DEBUG', AO_CCSS_DIR.'queue.json'); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | $this->filepath = __FILE__; |
@@ -60,19 +60,19 @@ discard block |
||
60 | 60 | { |
61 | 61 | // get all options. |
62 | 62 | $all_options = $this->fetch_options(); |
63 | - foreach ( $all_options as $option => $value ) { |
|
63 | + foreach ($all_options as $option => $value) { |
|
64 | 64 | ${$option} = $value; |
65 | 65 | } |
66 | 66 | |
67 | 67 | // make sure the 10 minutes cron schedule is added. |
68 | - add_filter( 'cron_schedules', array( $this, 'ao_ccss_interval' ) ); |
|
68 | + add_filter('cron_schedules', array($this, 'ao_ccss_interval')); |
|
69 | 69 | |
70 | 70 | // check if we need to upgrade. |
71 | 71 | $this->check_upgrade(); |
72 | 72 | |
73 | 73 | // make sure ao_ccss_queue is scheduled OK if an API key is set. |
74 | - if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_queue' ) ) { |
|
75 | - wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' ); |
|
74 | + if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_queue')) { |
|
75 | + wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue'); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
@@ -80,12 +80,12 @@ discard block |
||
80 | 80 | // Required libs, core is always needed. |
81 | 81 | $criticalcss_core = new autoptimizeCriticalCSSCore(); |
82 | 82 | |
83 | - if ( defined( 'DOING_CRON' ) || is_admin() ) { |
|
83 | + if (defined('DOING_CRON') || is_admin()) { |
|
84 | 84 | // TODO: also include if overridden somehow to force queue processing to be executed? |
85 | 85 | $criticalcss_cron = new autoptimizeCriticalCSSCron(); |
86 | 86 | } |
87 | 87 | |
88 | - if ( is_admin() ) { |
|
88 | + if (is_admin()) { |
|
89 | 89 | $criticalcss_settings = new autoptimizeCriticalCSSSettings(); |
90 | 90 | } else { |
91 | 91 | // enqueuing only done when not wp-admin. |
@@ -96,51 +96,51 @@ discard block |
||
96 | 96 | public static function fetch_options() { |
97 | 97 | static $autoptimize_ccss_options = null; |
98 | 98 | |
99 | - if ( null === $autoptimize_ccss_options ) { |
|
99 | + if (null === $autoptimize_ccss_options) { |
|
100 | 100 | // not cached yet, fetching from WordPress options. |
101 | - $autoptimize_ccss_options['ao_css_defer'] = autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer' ); |
|
102 | - $autoptimize_ccss_options['ao_css_defer_inline'] = autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' ); |
|
103 | - $autoptimize_ccss_options['ao_ccss_rules_raw'] = get_option( 'autoptimize_ccss_rules', false ); |
|
104 | - $autoptimize_ccss_options['ao_ccss_additional'] = get_option( 'autoptimize_ccss_additional' ); |
|
105 | - $autoptimize_ccss_options['ao_ccss_queue_raw'] = get_option( 'autoptimize_ccss_queue', false ); |
|
106 | - $autoptimize_ccss_options['ao_ccss_viewport'] = get_option( 'autoptimize_ccss_viewport', false ); |
|
107 | - $autoptimize_ccss_options['ao_ccss_finclude'] = get_option( 'autoptimize_ccss_finclude', false ); |
|
108 | - $autoptimize_ccss_options['ao_ccss_rlimit'] = get_option( 'autoptimize_ccss_rlimit', '5' ); |
|
109 | - $autoptimize_ccss_options['ao_ccss_noptimize'] = get_option( 'autoptimize_ccss_noptimize', false ); |
|
110 | - $autoptimize_ccss_options['ao_ccss_debug'] = get_option( 'autoptimize_ccss_debug', false ); |
|
111 | - $autoptimize_ccss_options['ao_ccss_key'] = get_option( 'autoptimize_ccss_key' ); |
|
112 | - $autoptimize_ccss_options['ao_ccss_keyst'] = get_option( 'autoptimize_ccss_keyst' ); |
|
113 | - $autoptimize_ccss_options['ao_ccss_loggedin'] = get_option( 'autoptimize_ccss_loggedin', '1' ); |
|
114 | - $autoptimize_ccss_options['ao_ccss_forcepath'] = get_option( 'autoptimize_ccss_forcepath', '1' ); |
|
115 | - $autoptimize_ccss_options['ao_ccss_servicestatus'] = get_option( 'autoptimize_service_availablity' ); |
|
116 | - $autoptimize_ccss_options['ao_ccss_deferjquery'] = get_option( 'autoptimize_ccss_deferjquery', false ); |
|
117 | - $autoptimize_ccss_options['ao_ccss_domain'] = get_option( 'autoptimize_ccss_domain' ); |
|
118 | - $autoptimize_ccss_options['ao_ccss_unloadccss'] = get_option( 'autoptimize_ccss_unloadccss', false ); |
|
119 | - |
|
120 | - if ( strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'http' ) === false && strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'uggc' ) === 0 ) { |
|
121 | - $autoptimize_ccss_options['ao_ccss_domain'] = str_rot13( $autoptimize_ccss_options['ao_ccss_domain'] ); |
|
122 | - } elseif ( strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'http' ) !== false ) { |
|
101 | + $autoptimize_ccss_options['ao_css_defer'] = autoptimizeOptionWrapper::get_option('autoptimize_css_defer'); |
|
102 | + $autoptimize_ccss_options['ao_css_defer_inline'] = autoptimizeOptionWrapper::get_option('autoptimize_css_defer_inline'); |
|
103 | + $autoptimize_ccss_options['ao_ccss_rules_raw'] = get_option('autoptimize_ccss_rules', false); |
|
104 | + $autoptimize_ccss_options['ao_ccss_additional'] = get_option('autoptimize_ccss_additional'); |
|
105 | + $autoptimize_ccss_options['ao_ccss_queue_raw'] = get_option('autoptimize_ccss_queue', false); |
|
106 | + $autoptimize_ccss_options['ao_ccss_viewport'] = get_option('autoptimize_ccss_viewport', false); |
|
107 | + $autoptimize_ccss_options['ao_ccss_finclude'] = get_option('autoptimize_ccss_finclude', false); |
|
108 | + $autoptimize_ccss_options['ao_ccss_rlimit'] = get_option('autoptimize_ccss_rlimit', '5'); |
|
109 | + $autoptimize_ccss_options['ao_ccss_noptimize'] = get_option('autoptimize_ccss_noptimize', false); |
|
110 | + $autoptimize_ccss_options['ao_ccss_debug'] = get_option('autoptimize_ccss_debug', false); |
|
111 | + $autoptimize_ccss_options['ao_ccss_key'] = get_option('autoptimize_ccss_key'); |
|
112 | + $autoptimize_ccss_options['ao_ccss_keyst'] = get_option('autoptimize_ccss_keyst'); |
|
113 | + $autoptimize_ccss_options['ao_ccss_loggedin'] = get_option('autoptimize_ccss_loggedin', '1'); |
|
114 | + $autoptimize_ccss_options['ao_ccss_forcepath'] = get_option('autoptimize_ccss_forcepath', '1'); |
|
115 | + $autoptimize_ccss_options['ao_ccss_servicestatus'] = get_option('autoptimize_service_availablity'); |
|
116 | + $autoptimize_ccss_options['ao_ccss_deferjquery'] = get_option('autoptimize_ccss_deferjquery', false); |
|
117 | + $autoptimize_ccss_options['ao_ccss_domain'] = get_option('autoptimize_ccss_domain'); |
|
118 | + $autoptimize_ccss_options['ao_ccss_unloadccss'] = get_option('autoptimize_ccss_unloadccss', false); |
|
119 | + |
|
120 | + if (strpos($autoptimize_ccss_options['ao_ccss_domain'], 'http') === false && strpos($autoptimize_ccss_options['ao_ccss_domain'], 'uggc') === 0) { |
|
121 | + $autoptimize_ccss_options['ao_ccss_domain'] = str_rot13($autoptimize_ccss_options['ao_ccss_domain']); |
|
122 | + } elseif (strpos($autoptimize_ccss_options['ao_ccss_domain'], 'http') !== false) { |
|
123 | 123 | // not rot13'ed yet, do so now (goal; avoid migration plugins change the bound domain). |
124 | - update_option( 'autoptimize_ccss_domain', str_rot13( $autoptimize_ccss_options['ao_ccss_domain'] ) ); |
|
124 | + update_option('autoptimize_ccss_domain', str_rot13($autoptimize_ccss_options['ao_ccss_domain'])); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | // Setup the rules array. |
128 | - if ( empty( $autoptimize_ccss_options['ao_ccss_rules_raw'] ) ) { |
|
128 | + if (empty($autoptimize_ccss_options['ao_ccss_rules_raw'])) { |
|
129 | 129 | $autoptimize_ccss_options['ao_ccss_rules']['paths'] = array(); |
130 | 130 | $autoptimize_ccss_options['ao_ccss_rules']['types'] = array(); |
131 | 131 | } else { |
132 | - $autoptimize_ccss_options['ao_ccss_rules'] = json_decode( $autoptimize_ccss_options['ao_ccss_rules_raw'], true ); |
|
132 | + $autoptimize_ccss_options['ao_ccss_rules'] = json_decode($autoptimize_ccss_options['ao_ccss_rules_raw'], true); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | // Setup the queue array. |
136 | - if ( empty( $autoptimize_ccss_options['ao_ccss_queue_raw'] ) ) { |
|
136 | + if (empty($autoptimize_ccss_options['ao_ccss_queue_raw'])) { |
|
137 | 137 | $autoptimize_ccss_options['ao_ccss_queue'] = array(); |
138 | 138 | } else { |
139 | - $autoptimize_ccss_options['ao_ccss_queue'] = json_decode( $autoptimize_ccss_options['ao_ccss_queue_raw'], true ); |
|
139 | + $autoptimize_ccss_options['ao_ccss_queue'] = json_decode($autoptimize_ccss_options['ao_ccss_queue_raw'], true); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | // Override API key if constant is defined. |
143 | - if ( defined( 'AUTOPTIMIZE_CRITICALCSS_API_KEY' ) ) { |
|
143 | + if (defined('AUTOPTIMIZE_CRITICALCSS_API_KEY')) { |
|
144 | 144 | $autoptimize_ccss_options['ao_ccss_key'] = AUTOPTIMIZE_CRITICALCSS_API_KEY; |
145 | 145 | } |
146 | 146 | } |
@@ -152,49 +152,49 @@ discard block |
||
152 | 152 | global $ao_ccss_key; |
153 | 153 | |
154 | 154 | // Create the cache directory if it doesn't exist already. |
155 | - if ( ! file_exists( AO_CCSS_DIR ) ) { |
|
156 | - mkdir( AO_CCSS_DIR, 0755, true ); |
|
155 | + if (!file_exists(AO_CCSS_DIR)) { |
|
156 | + mkdir(AO_CCSS_DIR, 0755, true); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | // Create a scheduled event for the queue. |
160 | - if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_queue' ) ) { |
|
161 | - wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' ); |
|
160 | + if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_queue')) { |
|
161 | + wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue'); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | // Create a scheduled event for log maintenance. |
165 | - if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_maintenance' ) ) { |
|
166 | - wp_schedule_event( time(), 'twicedaily', 'ao_ccss_maintenance' ); |
|
165 | + if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_maintenance')) { |
|
166 | + wp_schedule_event(time(), 'twicedaily', 'ao_ccss_maintenance'); |
|
167 | 167 | } |
168 | 168 | } |
169 | 169 | |
170 | 170 | public function check_upgrade() { |
171 | - $db_version = get_option( 'autoptimize_ccss_version', '' ); |
|
172 | - if ( AO_CCSS_VER !== $db_version ) { |
|
171 | + $db_version = get_option('autoptimize_ccss_version', ''); |
|
172 | + if (AO_CCSS_VER !== $db_version) { |
|
173 | 173 | // check schedules & re-schedule if needed. |
174 | 174 | $this->on_upgrade(); |
175 | 175 | // and update db_version. |
176 | - update_option( 'autoptimize_ccss_version', AO_CCSS_VER ); |
|
176 | + update_option('autoptimize_ccss_version', AO_CCSS_VER); |
|
177 | 177 | } |
178 | 178 | } |
179 | 179 | |
180 | - public function ao_ccss_interval( $schedules ) { |
|
180 | + public function ao_ccss_interval($schedules) { |
|
181 | 181 | // Let interval be configurable. |
182 | - if ( ! defined( 'AO_CCSS_DEBUG_INTERVAL' ) ) { |
|
182 | + if (!defined('AO_CCSS_DEBUG_INTERVAL')) { |
|
183 | 183 | $intsec = 600; |
184 | 184 | } else { |
185 | 185 | $intsec = AO_CCSS_DEBUG_INTERVAL; |
186 | - if ( $intsec >= 120 ) { |
|
187 | - $inttxt = $intsec / 60 . ' minutes'; |
|
186 | + if ($intsec >= 120) { |
|
187 | + $inttxt = $intsec/60.' minutes'; |
|
188 | 188 | } else { |
189 | - $inttxt = $intsec . ' second(s)'; |
|
189 | + $inttxt = $intsec.' second(s)'; |
|
190 | 190 | } |
191 | - autoptimizeCriticalCSSCore::ao_ccss_log( 'Using custom WP-Cron interval of ' . $inttxt, 3 ); |
|
191 | + autoptimizeCriticalCSSCore::ao_ccss_log('Using custom WP-Cron interval of '.$inttxt, 3); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | // Attach interval to schedule. |
195 | 195 | $schedules['ao_ccss'] = array( |
196 | 196 | 'interval' => $intsec, |
197 | - 'display' => __( 'Autoptimize CriticalCSS' ), |
|
197 | + 'display' => __('Autoptimize CriticalCSS'), |
|
198 | 198 | ); |
199 | 199 | return $schedules; |
200 | 200 | } |
@@ -17,66 +17,66 @@ discard block |
||
17 | 17 | */ |
18 | 18 | |
19 | 19 | |
20 | -if ( ! defined( 'ABSPATH' ) ) { |
|
20 | +if (!defined('ABSPATH')) { |
|
21 | 21 | exit; |
22 | 22 | } |
23 | 23 | |
24 | -define( 'AUTOPTIMIZE_PLUGIN_VERSION', '2.7.6' ); |
|
24 | +define('AUTOPTIMIZE_PLUGIN_VERSION', '2.7.6'); |
|
25 | 25 | |
26 | 26 | // plugin_dir_path() returns the trailing slash! |
27 | -define( 'AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); |
|
28 | -define( 'AUTOPTIMIZE_PLUGIN_FILE', __FILE__ ); |
|
27 | +define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__)); |
|
28 | +define('AUTOPTIMIZE_PLUGIN_FILE', __FILE__); |
|
29 | 29 | |
30 | 30 | // Bail early if attempting to run on non-supported php versions. |
31 | -if ( version_compare( PHP_VERSION, '5.6', '<' ) ) { |
|
31 | +if (version_compare(PHP_VERSION, '5.6', '<')) { |
|
32 | 32 | function autoptimize_incompatible_admin_notice() { |
33 | - echo '<div class="error"><p>' . __( 'Autoptimize requires PHP 5.6 (or higher) to function properly. Please upgrade PHP. The Plugin has been auto-deactivated.', 'autoptimize' ) . '</p></div>'; |
|
34 | - if ( isset( $_GET['activate'] ) ) { |
|
35 | - unset( $_GET['activate'] ); |
|
33 | + echo '<div class="error"><p>'.__('Autoptimize requires PHP 5.6 (or higher) to function properly. Please upgrade PHP. The Plugin has been auto-deactivated.', 'autoptimize').'</p></div>'; |
|
34 | + if (isset($_GET['activate'])) { |
|
35 | + unset($_GET['activate']); |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 | function autoptimize_deactivate_self() { |
39 | - deactivate_plugins( plugin_basename( AUTOPTIMIZE_PLUGIN_FILE ) ); |
|
39 | + deactivate_plugins(plugin_basename(AUTOPTIMIZE_PLUGIN_FILE)); |
|
40 | 40 | } |
41 | - add_action( 'admin_notices', 'autoptimize_incompatible_admin_notice' ); |
|
42 | - add_action( 'admin_init', 'autoptimize_deactivate_self' ); |
|
41 | + add_action('admin_notices', 'autoptimize_incompatible_admin_notice'); |
|
42 | + add_action('admin_init', 'autoptimize_deactivate_self'); |
|
43 | 43 | return; |
44 | 44 | } |
45 | 45 | |
46 | -function autoptimize_autoload( $class_name ) { |
|
47 | - if ( in_array( $class_name, array( 'Minify_HTML', 'JSMin' ) ) ) { |
|
48 | - $file = strtolower( $class_name ); |
|
49 | - $file = str_replace( '_', '-', $file ); |
|
50 | - $path = dirname( __FILE__ ) . '/classes/external/php/'; |
|
51 | - $filepath = $path . $file . '.php'; |
|
52 | - } elseif ( false !== strpos( $class_name, 'Autoptimize\\tubalmartin\\CssMin' ) ) { |
|
53 | - $file = str_replace( 'Autoptimize\\tubalmartin\\CssMin\\', '', $class_name ); |
|
54 | - $path = dirname( __FILE__ ) . '/classes/external/php/yui-php-cssmin-bundled/'; |
|
55 | - $filepath = $path . $file . '.php'; |
|
56 | - } elseif ( 'autoptimize' === substr( $class_name, 0, 11 ) ) { |
|
46 | +function autoptimize_autoload($class_name) { |
|
47 | + if (in_array($class_name, array('Minify_HTML', 'JSMin'))) { |
|
48 | + $file = strtolower($class_name); |
|
49 | + $file = str_replace('_', '-', $file); |
|
50 | + $path = dirname(__FILE__).'/classes/external/php/'; |
|
51 | + $filepath = $path.$file.'.php'; |
|
52 | + } elseif (false !== strpos($class_name, 'Autoptimize\\tubalmartin\\CssMin')) { |
|
53 | + $file = str_replace('Autoptimize\\tubalmartin\\CssMin\\', '', $class_name); |
|
54 | + $path = dirname(__FILE__).'/classes/external/php/yui-php-cssmin-bundled/'; |
|
55 | + $filepath = $path.$file.'.php'; |
|
56 | + } elseif ('autoptimize' === substr($class_name, 0, 11)) { |
|
57 | 57 | // One of our "old" classes. |
58 | 58 | $file = $class_name; |
59 | - $path = dirname( __FILE__ ) . '/classes/'; |
|
60 | - $filepath = $path . $file . '.php'; |
|
61 | - } elseif ( 'PAnD' === $class_name ) { |
|
59 | + $path = dirname(__FILE__).'/classes/'; |
|
60 | + $filepath = $path.$file.'.php'; |
|
61 | + } elseif ('PAnD' === $class_name) { |
|
62 | 62 | $file = 'persist-admin-notices-dismissal'; |
63 | - $path = dirname( __FILE__ ) . '/classes/external/php/persist-admin-notices-dismissal/'; |
|
64 | - $filepath = $path . $file . '.php'; |
|
63 | + $path = dirname(__FILE__).'/classes/external/php/persist-admin-notices-dismissal/'; |
|
64 | + $filepath = $path.$file.'.php'; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | // If we didn't match one of our rules, bail! |
68 | - if ( ! isset( $filepath ) ) { |
|
68 | + if (!isset($filepath)) { |
|
69 | 69 | return; |
70 | 70 | } |
71 | 71 | |
72 | 72 | require $filepath; |
73 | 73 | } |
74 | 74 | |
75 | -spl_autoload_register( 'autoptimize_autoload' ); |
|
75 | +spl_autoload_register('autoptimize_autoload'); |
|
76 | 76 | |
77 | 77 | // Load WP CLI command(s) on demand. |
78 | -if ( defined( 'WP_CLI' ) && WP_CLI ) { |
|
79 | - require AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php'; |
|
78 | +if (defined('WP_CLI') && WP_CLI) { |
|
79 | + require AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCLI.php'; |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -87,8 +87,8 @@ discard block |
||
87 | 87 | function autoptimize() { |
88 | 88 | static $plugin = null; |
89 | 89 | |
90 | - if ( null === $plugin ) { |
|
91 | - $plugin = new autoptimizeMain( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE ); |
|
90 | + if (null === $plugin) { |
|
91 | + $plugin = new autoptimizeMain(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | return $plugin; |