Completed
Push — master ( 471c26...e80620 )
by frank
01:49
created
classes/autoptimizeCriticalCSSEnqueue.php 2 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -221,6 +221,11 @@
 block discarded – undo
221 221
         return $page_type;
222 222
     }
223 223
 
224
+    /**
225
+     * @param string $path
226
+     * @param false|string $target
227
+     * @param boolean $create
228
+     */
224 229
     public function ao_ccss_define_job( $path, $target, $type, $hash, $file, $jid, $jrstat, $jvstat, $create ) {
225 230
         // Define a job entry to be created or updated
226 231
         // Define commom job properties.
Please login to merge, or discard this patch.
Spacing   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Critical CSS job enqueue logic.
4 4
  */
5 5
 
6
-if ( ! defined( 'ABSPATH' ) ) {
6
+if (!defined('ABSPATH')) {
7 7
     exit;
8 8
 }
9 9
 
@@ -12,27 +12,27 @@  discard block
 block discarded – undo
12 12
     {
13 13
         // fetch all options at once and populate them individually explicitely as globals.
14 14
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
15
-        foreach ( $all_options as $_option => $_value ) {
15
+        foreach ($all_options as $_option => $_value) {
16 16
             global ${$_option};
17 17
             ${$_option} = $_value;
18 18
         }
19 19
     }
20 20
 
21
-    public static function ao_ccss_enqueue( $hash ) {
21
+    public static function ao_ccss_enqueue($hash) {
22 22
         $self = new self();
23 23
         // Get key status.
24
-        $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( false );
24
+        $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(false);
25 25
 
26 26
         // Queue is available to anyone...
27 27
         $enqueue = true;
28 28
 
29 29
         // ... which are not the ones below.
30
-        if ( is_user_logged_in() || is_feed() || is_404() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status'] || false === apply_filters( 'autoptimize_filter_ccss_enqueue_should_enqueue', true ) ) {
30
+        if (is_user_logged_in() || is_feed() || is_404() || (defined('DOING_AJAX') && DOING_AJAX) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status'] || false === apply_filters('autoptimize_filter_ccss_enqueue_should_enqueue', true)) {
31 31
             $enqueue = false;
32
-            autoptimizeCriticalCSSCore::ao_ccss_log( "Job queuing is not available for WordPress's logged in users, feeds, error pages, ajax calls, to criticalcss.com itself or when a valid API key is not found", 3 );
32
+            autoptimizeCriticalCSSCore::ao_ccss_log("Job queuing is not available for WordPress's logged in users, feeds, error pages, ajax calls, to criticalcss.com itself or when a valid API key is not found", 3);
33 33
         }
34 34
 
35
-        if ( $enqueue ) {
35
+        if ($enqueue) {
36 36
             // Continue if queue is available
37 37
             // Attach required arrays/ vars.
38 38
             global $ao_ccss_rules;
@@ -42,17 +42,17 @@  discard block
 block discarded – undo
42 42
 
43 43
             // Get request path and page type, and initialize the queue update flag.
44 44
             $req_orig        = $_SERVER['REQUEST_URI'];
45
-            $req_path        = strtok( $req_orig, '?' );
45
+            $req_path        = strtok($req_orig, '?');
46 46
 
47 47
             // Check if we have a lang param. we need to keep as WPML can switch languages based on that
48 48
             // and that includes RTL -> LTR so diff. structure, so rules would be RTL vs LTR
49 49
             // but this needs changes in the structur of the rule object so off by default for now
50 50
             // as now this will simply result in conditional rules being overwritten.
51
-            if ( apply_filters( 'autoptimize_filter_ccss_coreenqueue_honor_lang', false ) && strpos( $req_orig, 'lang=' ) !== false ) {
52
-                $req_params = strtok( '?' );
53
-                parse_str( $req_params, $req_params_arr );
54
-                if ( array_key_exists( 'lang', $req_params_arr ) && !empty( $req_params_arr['lang'] ) ) {
55
-                    $req_path .= '?lang=' . $req_params_arr['lang'];
51
+            if (apply_filters('autoptimize_filter_ccss_coreenqueue_honor_lang', false) && strpos($req_orig, 'lang=') !== false) {
52
+                $req_params = strtok('?');
53
+                parse_str($req_params, $req_params_arr);
54
+                if (array_key_exists('lang', $req_params_arr) && !empty($req_params_arr['lang'])) {
55
+                    $req_path .= '?lang='.$req_params_arr['lang'];
56 56
                 }
57 57
             }
58 58
 
@@ -63,21 +63,21 @@  discard block
 block discarded – undo
63 63
             $queue_update    = false;
64 64
 
65 65
             // Match for paths in rules.
66
-            foreach ( $ao_ccss_rules['paths'] as $path => $props ) {
66
+            foreach ($ao_ccss_rules['paths'] as $path => $props) {
67 67
 
68 68
                 // Prepare rule target and log.
69
-                $target_rule = 'paths|' . $path;
70
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Qualifying path <' . $req_path . '> for job submission by rule <' . $target_rule . '>', 3 );
69
+                $target_rule = 'paths|'.$path;
70
+                autoptimizeCriticalCSSCore::ao_ccss_log('Qualifying path <'.$req_path.'> for job submission by rule <'.$target_rule.'>', 3);
71 71
 
72 72
                 // Path match
73 73
                 // -> exact match needed for AUTO rules
74 74
                 // -> partial match OK for MANUAL rules (which have empty hash and a file with CCSS).
75
-                if ( $path === $req_path || ( false == $props['hash'] && false != $props['file'] && preg_match( '|' . $path . '|', $req_path ) ) ) {
75
+                if ($path === $req_path || (false == $props['hash'] && false != $props['file'] && preg_match('|'.$path.'|', $req_path))) {
76 76
 
77 77
                     // There's a path match in the rule, so job QUALIFIES with a path rule match.
78 78
                     $job_qualify     = true;
79 79
                     $rule_properties = $props;
80
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Path <' . $req_path . '> QUALIFIED for job submission by rule <' . $target_rule . '>', 3 );
80
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Path <'.$req_path.'> QUALIFIED for job submission by rule <'.$target_rule.'>', 3);
81 81
 
82 82
                     // Stop processing other path rules.
83 83
                     break;
@@ -85,19 +85,19 @@  discard block
 block discarded – undo
85 85
             }
86 86
 
87 87
             // Match for types in rules if no path rule matches and if we're not enforcing paths.
88
-            if ( ! $job_qualify && ( ! $ao_ccss_forcepath || ! in_array( $req_type, apply_filters( 'autoptimize_filter_ccss_coreenqueue_forcepathfortype', array( 'is_page' ) ) ) || ! apply_filters( 'autoptimize_filter_ccss_coreenqueue_ignorealltypes', false ) ) ) {
89
-                foreach ( $ao_ccss_rules['types'] as $type => $props ) {
88
+            if (!$job_qualify && (!$ao_ccss_forcepath || !in_array($req_type, apply_filters('autoptimize_filter_ccss_coreenqueue_forcepathfortype', array('is_page'))) || !apply_filters('autoptimize_filter_ccss_coreenqueue_ignorealltypes', false))) {
89
+                foreach ($ao_ccss_rules['types'] as $type => $props) {
90 90
 
91 91
                     // Prepare rule target and log.
92
-                    $target_rule = 'types|' . $type;
93
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Qualifying page type <' . $req_type . '> on path <' . $req_path . '> for job submission by rule <' . $target_rule . '>', 3 );
92
+                    $target_rule = 'types|'.$type;
93
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Qualifying page type <'.$req_type.'> on path <'.$req_path.'> for job submission by rule <'.$target_rule.'>', 3);
94 94
 
95
-                    if ( $req_type == $type ) {
95
+                    if ($req_type == $type) {
96 96
                         // Type match.
97 97
                         // There's a type match in the rule, so job QUALIFIES with a type rule match.
98 98
                         $job_qualify     = true;
99 99
                         $rule_properties = $props;
100
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Page type <' . $req_type . '> on path <' . $req_path . '> QUALIFIED for job submission by rule <' . $target_rule . '>', 3 );
100
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Page type <'.$req_type.'> on path <'.$req_path.'> QUALIFIED for job submission by rule <'.$target_rule.'>', 3);
101 101
 
102 102
                         // Stop processing other type rules.
103 103
                         break;
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
                 }
106 106
             }
107 107
 
108
-            if ( $job_qualify && ( ( false == $rule_properties['hash'] && false != $rule_properties['file'] ) || strpos( $req_type, 'template_' ) !== false ) ) {
108
+            if ($job_qualify && ((false == $rule_properties['hash'] && false != $rule_properties['file']) || strpos($req_type, 'template_') !== false)) {
109 109
                 // If job qualifies but rule hash is false and file isn't false (MANUAL rule) or if template, job does not qualify despite what previous evaluations says.
110 110
                 $job_qualify = false;
111
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission DISQUALIFIED by MANUAL rule <' . $target_rule . '> with hash <' . $rule_properties['hash'] . '> and file <' . $rule_properties['file'] . '>', 3 );
112
-            } elseif ( ! $job_qualify && empty( $rule_properties ) ) {
111
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission DISQUALIFIED by MANUAL rule <'.$target_rule.'> with hash <'.$rule_properties['hash'].'> and file <'.$rule_properties['file'].'>', 3);
112
+            } elseif (!$job_qualify && empty($rule_properties)) {
113 113
                 // But if job does not qualify and rule properties are set, job qualifies as there is no matching rule for it yet
114 114
                 // Fill-in the new target rule.
115 115
                 $job_qualify = true;
@@ -117,28 +117,28 @@  discard block
 block discarded – undo
117 117
                 // Should we switch to path-base AUTO-rules? Conditions:
118 118
                 // 1. forcepath option has to be enabled (off by default)
119 119
                 // 2. request type should be (by default, but filterable) one of is_page (removed for now: woo_is_product or woo_is_product_category).
120
-                if ( ( $ao_ccss_forcepath && in_array( $req_type, apply_filters( 'autoptimize_filter_ccss_coreenqueue_forcepathfortype', array( 'is_page' ) ) ) ) || apply_filters( 'autoptimize_filter_ccss_coreenqueue_ignorealltypes', false ) ) {
121
-                    if ( '/' !== $req_path ) {
122
-                        $target_rule = 'paths|' . $req_path;
120
+                if (($ao_ccss_forcepath && in_array($req_type, apply_filters('autoptimize_filter_ccss_coreenqueue_forcepathfortype', array('is_page')))) || apply_filters('autoptimize_filter_ccss_coreenqueue_ignorealltypes', false)) {
121
+                    if ('/' !== $req_path) {
122
+                        $target_rule = 'paths|'.$req_path;
123 123
                     } else {
124 124
                         // Exception; we don't want a path-based rule for "/" as that messes things up, hard-switch this to a type-based is_front_page rule.
125
-                        $target_rule = 'types|' . 'is_front_page';
125
+                        $target_rule = 'types|'.'is_front_page';
126 126
                     }
127 127
                 } else {
128
-                    $target_rule = 'types|' . $req_type;
128
+                    $target_rule = 'types|'.$req_type;
129 129
                 }
130
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission QUALIFIED by MISSING rule for page type <' . $req_type . '> on path <' . $req_path . '>, new rule target is <' . $target_rule . '>', 3 );
130
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission QUALIFIED by MISSING rule for page type <'.$req_type.'> on path <'.$req_path.'>, new rule target is <'.$target_rule.'>', 3);
131 131
             } else {
132 132
                 // Or just log a job qualified by a matching rule.
133
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission QUALIFIED by AUTO rule <' . $target_rule . '> with hash <' . $rule_properties['hash'] . '> and file <' . $rule_properties['file'] . '>', 3 );
133
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission QUALIFIED by AUTO rule <'.$target_rule.'> with hash <'.$rule_properties['hash'].'> and file <'.$rule_properties['file'].'>', 3);
134 134
             }
135 135
 
136 136
             // Submit job.
137
-            if ( $job_qualify ) {
138
-                if ( ! array_key_exists( $req_path, $ao_ccss_queue ) ) {
137
+            if ($job_qualify) {
138
+                if (!array_key_exists($req_path, $ao_ccss_queue)) {
139 139
                     // This is a NEW job
140 140
                     // Merge job into the queue.
141
-                    $ao_ccss_queue[ $req_path ] = $self->ao_ccss_define_job(
141
+                    $ao_ccss_queue[$req_path] = $self->ao_ccss_define_job(
142 142
                         $req_path,
143 143
                         $target_rule,
144 144
                         $req_type,
@@ -154,30 +154,30 @@  discard block
 block discarded – undo
154 154
                 } else {
155 155
                     // This is an existing job
156 156
                     // The job is still NEW, most likely this is extra CSS file for the same page that needs a hash.
157
-                    if ( 'NEW' == $ao_ccss_queue[ $req_path ]['jqstat'] ) {
157
+                    if ('NEW' == $ao_ccss_queue[$req_path]['jqstat']) {
158 158
                         // Add hash if it's not already in the job.
159
-                        if ( ! in_array( $hash, $ao_ccss_queue[ $req_path ]['hashes'] ) ) {
159
+                        if (!in_array($hash, $ao_ccss_queue[$req_path]['hashes'])) {
160 160
                             // Push new hash to its array and update flag.
161
-                            $queue_update = array_push( $ao_ccss_queue[ $req_path ]['hashes'], $hash );
161
+                            $queue_update = array_push($ao_ccss_queue[$req_path]['hashes'], $hash);
162 162
 
163 163
                             // Log job update.
164
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Hashes UPDATED on local job id <' . $ao_ccss_queue[ $req_path ]['ljid'] . '>, job status NEW, target rule <' . $ao_ccss_queue[ $req_path ]['rtarget'] . '>, hash added: ' . $hash, 3 );
164
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Hashes UPDATED on local job id <'.$ao_ccss_queue[$req_path]['ljid'].'>, job status NEW, target rule <'.$ao_ccss_queue[$req_path]['rtarget'].'>, hash added: '.$hash, 3);
165 165
 
166 166
                             // Return from here as the hash array is already updated.
167 167
                             return true;
168 168
                         }
169
-                    } elseif ( 'NEW' != $ao_ccss_queue[ $req_path ]['jqstat'] && 'JOB_QUEUED' != $ao_ccss_queue[ $req_path ]['jqstat'] && 'JOB_ONGOING' != $ao_ccss_queue[ $req_path ]['jqstat'] ) {
169
+                    } elseif ('NEW' != $ao_ccss_queue[$req_path]['jqstat'] && 'JOB_QUEUED' != $ao_ccss_queue[$req_path]['jqstat'] && 'JOB_ONGOING' != $ao_ccss_queue[$req_path]['jqstat']) {
170 170
                         // Allow requeuing jobs that are not NEW, JOB_QUEUED or JOB_ONGOING
171 171
                         // Merge new job keeping some previous job values.
172
-                        $ao_ccss_queue[ $req_path ] = $self->ao_ccss_define_job(
172
+                        $ao_ccss_queue[$req_path] = $self->ao_ccss_define_job(
173 173
                             $req_path,
174 174
                             $target_rule,
175 175
                             $req_type,
176 176
                             $hash,
177
-                            $ao_ccss_queue[ $req_path ]['file'],
178
-                            $ao_ccss_queue[ $req_path ]['jid'],
179
-                            $ao_ccss_queue[ $req_path ]['jrstat'],
180
-                            $ao_ccss_queue[ $req_path ]['jvstat'],
177
+                            $ao_ccss_queue[$req_path]['file'],
178
+                            $ao_ccss_queue[$req_path]['jid'],
179
+                            $ao_ccss_queue[$req_path]['jrstat'],
180
+                            $ao_ccss_queue[$req_path]['jvstat'],
181 181
                             false
182 182
                         );
183 183
                         // Set update flag.
@@ -185,14 +185,14 @@  discard block
 block discarded – undo
185 185
                     }
186 186
                 }
187 187
 
188
-                if ( $queue_update ) {
188
+                if ($queue_update) {
189 189
                     // Persist the job to the queue and return.
190
-                    $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
191
-                    update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
190
+                    $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
191
+                    update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
192 192
                     return true;
193 193
                 } else {
194 194
                     // Or just return false if no job was added.
195
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'A job for path <' . $req_path . '> already exist with NEW or PENDING status, skipping job creation', 3 );
195
+                    autoptimizeCriticalCSSCore::ao_ccss_log('A job for path <'.$req_path.'> already exist with NEW or PENDING status, skipping job creation', 3);
196 196
                     return false;
197 197
                 }
198 198
             }
@@ -209,33 +209,33 @@  discard block
 block discarded – undo
209 209
         $page_type = false;
210 210
 
211 211
         // Iterates over the array to match a type.
212
-        foreach ( $ao_ccss_types as $type ) {
213
-            if ( is_404() ) {
212
+        foreach ($ao_ccss_types as $type) {
213
+            if (is_404()) {
214 214
                 $page_type = 'is_404';
215 215
                 break;
216
-            } elseif ( is_front_page() ) {
216
+            } elseif (is_front_page()) {
217 217
                 // identify frontpage immediately to avoid it also matching a CPT or template.
218 218
                 $page_type = 'is_front_page';
219 219
                 break;
220
-            } elseif ( strpos( $type, 'custom_post_' ) !== false && ( ! $ao_ccss_forcepath || ! is_page() ) ) {
220
+            } elseif (strpos($type, 'custom_post_') !== false && (!$ao_ccss_forcepath || !is_page())) {
221 221
                 // Match custom post types and not page or page not forced to path-based.
222
-                if ( get_post_type( get_the_ID() ) === substr( $type, 12 ) ) {
222
+                if (get_post_type(get_the_ID()) === substr($type, 12)) {
223 223
                     $page_type = $type;
224 224
                     break;
225 225
                 }
226
-            } elseif ( strpos( $type, 'template_' ) !== false && ( ! $ao_ccss_forcepath || ! is_page() ) ) {
226
+            } elseif (strpos($type, 'template_') !== false && (!$ao_ccss_forcepath || !is_page())) {
227 227
                 // Match templates if not page or if page is not forced to path-based.
228
-                if ( is_page_template( substr( $type, 9 ) ) ) {
228
+                if (is_page_template(substr($type, 9))) {
229 229
                     $page_type = $type;
230 230
                     break;
231 231
                 }
232 232
             } else {
233 233
                 // Match all other existing types
234 234
                 // but remove prefix to be able to check if the function exists & returns true.
235
-                $_type = str_replace( array( 'woo_', 'bp_', 'bbp_', 'edd_' ), '', $type );
236
-                if ( function_exists( $_type ) && call_user_func( $_type ) ) {
235
+                $_type = str_replace(array('woo_', 'bp_', 'bbp_', 'edd_'), '', $type);
236
+                if (function_exists($_type) && call_user_func($_type)) {
237 237
                     // Make sure we only return for one page, not for the "paged pages" (/page/2 ..).
238
-                    if ( ! is_page() || ! is_paged() ) {
238
+                    if (!is_page() || !is_paged()) {
239 239
                         $page_type = $type;
240 240
                         break;
241 241
                     }
@@ -247,44 +247,44 @@  discard block
 block discarded – undo
247 247
         return $page_type;
248 248
     }
249 249
 
250
-    public function ao_ccss_define_job( $path, $target, $type, $hash, $file, $jid, $jrstat, $jvstat, $create ) {
250
+    public function ao_ccss_define_job($path, $target, $type, $hash, $file, $jid, $jrstat, $jvstat, $create) {
251 251
         // Define a job entry to be created or updated
252 252
         // Define commom job properties.
253 253
         $path            = array();
254 254
         $path['ljid']    = $this->ao_ccss_job_id();
255 255
         $path['rtarget'] = $target;
256 256
         $path['ptype']   = $type;
257
-        $path['hashes']  = array( $hash );
257
+        $path['hashes']  = array($hash);
258 258
         $path['hash']    = $hash;
259 259
         $path['file']    = $file;
260 260
         $path['jid']     = $jid;
261 261
         $path['jqstat']  = 'NEW';
262 262
         $path['jrstat']  = $jrstat;
263 263
         $path['jvstat']  = $jvstat;
264
-        $path['jctime']  = microtime( true );
264
+        $path['jctime']  = microtime(true);
265 265
         $path['jftime']  = null;
266 266
 
267 267
         // Set operation requested.
268
-        if ( $create ) {
268
+        if ($create) {
269 269
             $operation = 'CREATED';
270 270
         } else {
271 271
             $operation = 'UPDATED';
272 272
         }
273 273
 
274 274
         // Log job creation.
275
-        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job ' . $operation . ' with local job id <' . $path['ljid'] . '> for target rule <' . $target . '>', 3 );
275
+        autoptimizeCriticalCSSCore::ao_ccss_log('Job '.$operation.' with local job id <'.$path['ljid'].'> for target rule <'.$target.'>', 3);
276 276
 
277 277
         return $path;
278 278
     }
279 279
 
280
-    public function ao_ccss_job_id( $length = 6 ) {
280
+    public function ao_ccss_job_id($length = 6) {
281 281
         // Generate random strings for the local job ID
282 282
         // Based on https://stackoverflow.com/a/4356295 .
283 283
         $characters        = '0123456789abcdefghijklmnopqrstuvwxyz';
284
-        $characters_length = strlen( $characters );
284
+        $characters_length = strlen($characters);
285 285
         $random_string     = 'j-';
286
-        for ( $i = 0; $i < $length; $i++ ) {
287
-            $random_string .= $characters[ rand( 0, $characters_length - 1 ) ];
286
+        for ($i = 0; $i < $length; $i++) {
287
+            $random_string .= $characters[rand(0, $characters_length - 1)];
288 288
         }
289 289
         return $random_string;
290 290
     }
@@ -292,17 +292,17 @@  discard block
 block discarded – undo
292 292
     public function ao_ccss_ua() {
293 293
         // Check for criticalcss.com user agent.
294 294
         $agent = '';
295
-        if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
295
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
296 296
             $agent = $_SERVER['HTTP_USER_AGENT'];
297 297
         }
298 298
 
299 299
         // Check for UA and return TRUE when criticalcss.com is the detected UA, false when not.
300
-        $rtn = strpos( $agent, AO_CCSS_URL );
301
-        if ( 0 === $rtn ) {
300
+        $rtn = strpos($agent, AO_CCSS_URL);
301
+        if (0 === $rtn) {
302 302
             $rtn = true;
303 303
         } else {
304 304
             $rtn = false;
305 305
         }
306
-        return ( $rtn );
306
+        return ($rtn);
307 307
     }
308 308
 }
Please login to merge, or discard this patch.
classes/autoptimizeScripts.php 2 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -676,6 +676,9 @@  discard block
 block discarded – undo
676 676
         return true;
677 677
     }
678 678
 
679
+    /**
680
+     * @param string $tag
681
+     */
679 682
     private function movetolast( $tag )
680 683
     {
681 684
         if ( empty( $tag ) ) {
@@ -733,7 +736,7 @@  discard block
 block discarded – undo
733 736
      * @param string $filepath Filepath.
734 737
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
735 738
      *
736
-     * @return bool|string Url pointing to the minified js file or false.
739
+     * @return false|string Url pointing to the minified js file or false.
737 740
      */
738 741
     public function minify_single( $filepath, $cache_miss = false )
739 742
     {
Please login to merge, or discard this patch.
Spacing   +182 added lines, -182 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Class for JS optimization.
4 4
  */
5 5
 
6
-if ( ! defined( 'ABSPATH' ) ) {
6
+if (!defined('ABSPATH')) {
7 7
     exit;
8 8
 }
9 9
 
@@ -206,133 +206,133 @@  discard block
 block discarded – undo
206 206
      *
207 207
      * @param array $options all options.
208 208
      */
209
-    public function read( $options )
209
+    public function read($options)
210 210
     {
211
-        $noptimize_js = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content );
212
-        if ( $noptimize_js ) {
211
+        $noptimize_js = apply_filters('autoptimize_filter_js_noptimize', false, $this->content);
212
+        if ($noptimize_js) {
213 213
             return false;
214 214
         }
215 215
 
216 216
         // only optimize known good JS?
217
-        $allowlist_js = apply_filters( 'autoptimize_filter_js_allowlist', '', $this->content );
218
-        $allowlist_js = apply_filters( 'autoptimize_filter_js_whitelist', $allowlist_js, $this->content ); // fixme: to be removed in next version.
219
-        if ( ! empty( $allowlist_js ) ) {
220
-            $this->allowlist = array_filter( array_map( 'trim', explode( ',', $allowlist_js ) ) );
217
+        $allowlist_js = apply_filters('autoptimize_filter_js_allowlist', '', $this->content);
218
+        $allowlist_js = apply_filters('autoptimize_filter_js_whitelist', $allowlist_js, $this->content); // fixme: to be removed in next version.
219
+        if (!empty($allowlist_js)) {
220
+            $this->allowlist = array_filter(array_map('trim', explode(',', $allowlist_js)));
221 221
         }
222 222
 
223 223
         // is there JS we should simply remove?
224
-        $removable_js = apply_filters( 'autoptimize_filter_js_removables', '', $this->content );
225
-        if ( ! empty( $removable_js ) ) {
226
-            $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $removable_js ) ) );
224
+        $removable_js = apply_filters('autoptimize_filter_js_removables', '', $this->content);
225
+        if (!empty($removable_js)) {
226
+            $this->jsremovables = array_filter(array_map('trim', explode(',', $removable_js)));
227 227
         }
228 228
 
229 229
         // only header?
230
-        if ( apply_filters( 'autoptimize_filter_js_justhead', $options['justhead'] ) ) {
231
-            $content             = explode( '</head>', $this->content, 2 );
232
-            $this->content       = $content[0] . '</head>';
230
+        if (apply_filters('autoptimize_filter_js_justhead', $options['justhead'])) {
231
+            $content             = explode('</head>', $this->content, 2);
232
+            $this->content       = $content[0].'</head>';
233 233
             $this->restofcontent = $content[1];
234 234
         }
235 235
 
236 236
         // Determine whether we're doing JS-files aggregation or not.
237
-        if ( ! $options['aggregate'] ) {
237
+        if (!$options['aggregate']) {
238 238
             $this->aggregate = false;
239 239
         }
240 240
         // Returning true for "dontaggregate" turns off aggregation.
241
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_js_dontaggregate', false ) ) {
241
+        if ($this->aggregate && apply_filters('autoptimize_filter_js_dontaggregate', false)) {
242 242
             $this->aggregate = false;
243 243
         }
244 244
         
245 245
         // Defer when not aggregating.
246
-        if ( false === $this->aggregate && apply_filters( 'autoptimize_js_filter_defer_not_aggregate', $options['defer_not_aggregate'] ) ) {
246
+        if (false === $this->aggregate && apply_filters('autoptimize_js_filter_defer_not_aggregate', $options['defer_not_aggregate'])) {
247 247
             $this->defer_not_aggregate = true;
248 248
         }
249 249
 
250 250
         // include inline?
251
-        if ( apply_filters( 'autoptimize_js_include_inline', $options['include_inline'] ) ) {
251
+        if (apply_filters('autoptimize_js_include_inline', $options['include_inline'])) {
252 252
             $this->include_inline = true;
253 253
         }
254 254
 
255 255
         // filter to "late inject minified JS", default to true for now (it is faster).
256
-        $this->inject_min_late = apply_filters( 'autoptimize_filter_js_inject_min_late', true );
256
+        $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true);
257 257
 
258 258
         // filters to override hardcoded do(nt)move(last) array contents (array in, array out!).
259
-        $this->dontmove   = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove );
260
-        $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast );
261
-        $this->domove     = apply_filters( 'autoptimize_filter_js_domove', $this->domove );
259
+        $this->dontmove   = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove);
260
+        $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast);
261
+        $this->domove     = apply_filters('autoptimize_filter_js_domove', $this->domove);
262 262
 
263 263
         // Determine whether excluded files should be minified if not yet so.
264
-        if ( ! $options['minify_excluded'] && $options['aggregate'] ) {
264
+        if (!$options['minify_excluded'] && $options['aggregate']) {
265 265
             $this->minify_excluded = false;
266 266
         }
267
-        $this->minify_excluded = apply_filters( 'autoptimize_filter_js_minify_excluded', $this->minify_excluded, '' );
267
+        $this->minify_excluded = apply_filters('autoptimize_filter_js_minify_excluded', $this->minify_excluded, '');
268 268
 
269 269
         // get extra exclusions settings or filter.
270 270
         $exclude_js = $options['js_exclude'];
271
-        $exclude_js = apply_filters( 'autoptimize_filter_js_exclude', $exclude_js, $this->content );
272
-
273
-        if ( '' !== $exclude_js ) {
274
-            if ( is_array( $exclude_js ) ) {
275
-                $remove_keys = array_keys( $exclude_js, 'remove' );
276
-                if ( false !== $remove_keys ) {
277
-                    foreach ( $remove_keys as $remove_key ) {
278
-                        unset( $exclude_js[ $remove_key ] );
271
+        $exclude_js = apply_filters('autoptimize_filter_js_exclude', $exclude_js, $this->content);
272
+
273
+        if ('' !== $exclude_js) {
274
+            if (is_array($exclude_js)) {
275
+                $remove_keys = array_keys($exclude_js, 'remove');
276
+                if (false !== $remove_keys) {
277
+                    foreach ($remove_keys as $remove_key) {
278
+                        unset($exclude_js[$remove_key]);
279 279
                         $this->jsremovables[] = $remove_key;
280 280
                     }
281 281
                 }
282
-                $excl_js_arr = array_keys( $exclude_js );
282
+                $excl_js_arr = array_keys($exclude_js);
283 283
             } else {
284
-                $excl_js_arr = array_filter( array_map( 'trim', explode( ',', $exclude_js ) ) );
284
+                $excl_js_arr = array_filter(array_map('trim', explode(',', $exclude_js)));
285 285
             }
286
-            $this->dontmove = array_merge( $excl_js_arr, $this->dontmove );
286
+            $this->dontmove = array_merge($excl_js_arr, $this->dontmove);
287 287
         }
288 288
 
289 289
         // Should we add try-catch?
290
-        if ( $options['trycatch'] ) {
290
+        if ($options['trycatch']) {
291 291
             $this->trycatch = true;
292 292
         }
293 293
 
294 294
         // force js in head?
295
-        if ( $options['forcehead'] ) {
295
+        if ($options['forcehead']) {
296 296
             $this->forcehead = true;
297 297
         } else {
298 298
             $this->forcehead = false;
299 299
         }
300 300
 
301
-        $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead );
301
+        $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead);
302 302
 
303 303
         // get cdn url.
304 304
         $this->cdn_url = $options['cdn_url'];
305 305
 
306 306
         // noptimize me.
307
-        $this->content = $this->hide_noptimize( $this->content );
307
+        $this->content = $this->hide_noptimize($this->content);
308 308
 
309 309
         // Save IE hacks.
310
-        $this->content = $this->hide_iehacks( $this->content );
310
+        $this->content = $this->hide_iehacks($this->content);
311 311
 
312 312
         // comments.
313
-        $this->content = $this->hide_comments( $this->content );
313
+        $this->content = $this->hide_comments($this->content);
314 314
 
315 315
         // Get script files.
316
-        if ( preg_match_all( '#<script.*</script>#Usmi', $this->content, $matches ) ) {
317
-            foreach ( $matches[0] as $tag ) {
316
+        if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) {
317
+            foreach ($matches[0] as $tag) {
318 318
                 // only consider script aggregation for types allowlisted in should_aggregate-function.
319
-                $should_aggregate = $this->should_aggregate( $tag );
320
-                if ( ! $should_aggregate ) {
319
+                $should_aggregate = $this->should_aggregate($tag);
320
+                if (!$should_aggregate) {
321 321
                     $tag = '';
322 322
                     continue;
323 323
                 }
324 324
 
325
-                if ( preg_match( '#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source ) ) {
325
+                if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) {
326 326
                     // non-inline script.
327
-                    if ( $this->isremovable( $tag, $this->jsremovables ) ) {
328
-                        $this->content = str_replace( $tag, '', $this->content );
327
+                    if ($this->isremovable($tag, $this->jsremovables)) {
328
+                        $this->content = str_replace($tag, '', $this->content);
329 329
                         continue;
330 330
                     }
331 331
 
332 332
                     $orig_tag = null;
333
-                    $url      = current( explode( '?', $source[2], 2 ) );
334
-                    $path     = $this->getpath( $url );
335
-                    if ( false !== $path && preg_match( '#\.js$#', $path ) && $this->ismergeable( $tag ) ) {
333
+                    $url      = current(explode('?', $source[2], 2));
334
+                    $path     = $this->getpath($url);
335
+                    if (false !== $path && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) {
336 336
                         // ok to optimize, add to array.
337 337
                         $this->scripts[] = $path;
338 338
                     } else {
@@ -340,35 +340,35 @@  discard block
 block discarded – undo
340 340
                         $new_tag  = $tag;
341 341
 
342 342
                         // non-mergeable script (excluded or dynamic or external).
343
-                        if ( is_array( $exclude_js ) ) {
343
+                        if (is_array($exclude_js)) {
344 344
                             // should we add flags?
345
-                            foreach ( $exclude_js as $excl_tag => $excl_flags ) {
346
-                                if ( false !== strpos( $orig_tag, $excl_tag ) && in_array( $excl_flags, array( 'async', 'defer' ) ) ) {
347
-                                    $new_tag = str_replace( '<script ', '<script ' . $excl_flags . ' ', $new_tag );
345
+                            foreach ($exclude_js as $excl_tag => $excl_flags) {
346
+                                if (false !== strpos($orig_tag, $excl_tag) && in_array($excl_flags, array('async', 'defer'))) {
347
+                                    $new_tag = str_replace('<script ', '<script '.$excl_flags.' ', $new_tag);
348 348
                                 }
349 349
                             }
350 350
                         }
351 351
                         
352 352
                         // not aggregating but deferring?
353
-                        if ( $this->defer_not_aggregate && false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path && strpos( $new_tag, ' defer' ) === false ) {
354
-                            $new_tag = str_replace( '<script ', '<script defer ', $new_tag );
353
+                        if ($this->defer_not_aggregate && false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path && strpos($new_tag, ' defer') === false) {
354
+                            $new_tag = str_replace('<script ', '<script defer ', $new_tag);
355 355
                             // and remove async as async+defer=async while we explicitly want defer.
356
-                            if ( strpos( $new_tag, ' async' ) !== false && apply_filters( 'autoptimize_filter_js_defer_remove_async', true ) ) {
357
-                                $new_tag = str_replace( array( ' async', ' async="async"', " async='async'" ), '', $new_tag );
356
+                            if (strpos($new_tag, ' async') !== false && apply_filters('autoptimize_filter_js_defer_remove_async', true)) {
357
+                                $new_tag = str_replace(array(' async', ' async="async"', " async='async'"), '', $new_tag);
358 358
                             }
359 359
                         }
360 360
 
361 361
                         // Should we minify the non-aggregated script?
362 362
                         // -> if aggregate is on and exclude minify is on
363 363
                         // -> if aggregate is off and the file is not in dontmove.
364
-                        if ( $path && $this->minify_excluded ) {
365
-                            $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
366
-                            if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) {
367
-                                $minified_url = $this->minify_single( $path );
368
-                                if ( ! empty( $minified_url ) ) {
364
+                        if ($path && $this->minify_excluded) {
365
+                            $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
366
+                            if ((false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path) || (true === $this->aggregate && (false === $consider_minified_array || str_replace($consider_minified_array, '', $path) === $path))) {
367
+                                $minified_url = $this->minify_single($path);
368
+                                if (!empty($minified_url)) {
369 369
                                     // Replace original URL with minified URL from cache.
370
-                                    $new_tag = str_replace( $url, $minified_url, $new_tag );
371
-                                } elseif ( apply_filters( 'autoptimize_filter_ccsjs_remove_empty_minified_url', false ) ) {
370
+                                    $new_tag = str_replace($url, $minified_url, $new_tag);
371
+                                } elseif (apply_filters('autoptimize_filter_ccsjs_remove_empty_minified_url', false)) {
372 372
                                     // Remove the original script tag, because cache content is empty but only if filter
373 373
                                     // is trued because $minified_url is also false if original JS is minified already.
374 374
                                     $new_tag = '';
@@ -376,17 +376,17 @@  discard block
 block discarded – undo
376 376
                             }
377 377
                         }
378 378
 
379
-                        if ( $this->ismovable( $new_tag ) ) {
379
+                        if ($this->ismovable($new_tag)) {
380 380
                             // can be moved, flags and all.
381
-                            if ( $this->movetolast( $new_tag ) ) {
381
+                            if ($this->movetolast($new_tag)) {
382 382
                                 $this->move['last'][] = $new_tag;
383 383
                             } else {
384 384
                                 $this->move['first'][] = $new_tag;
385 385
                             }
386 386
                         } else {
387 387
                             // cannot be moved, so if flag was added re-inject altered tag immediately.
388
-                            if ( ( '' !== $new_tag && $orig_tag !== $new_tag ) || ( '' === $new_tag && apply_filters( 'autoptimize_filter_js_remove_empty_files', false ) ) ) {
389
-                                $this->content = str_replace( $orig_tag, $new_tag, $this->content );
388
+                            if (('' !== $new_tag && $orig_tag !== $new_tag) || ('' === $new_tag && apply_filters('autoptimize_filter_js_remove_empty_files', false))) {
389
+                                $this->content = str_replace($orig_tag, $new_tag, $this->content);
390 390
                                 $orig_tag      = '';
391 391
                             }
392 392
                             // and forget about the $tag (not to be touched any more).
@@ -395,23 +395,23 @@  discard block
 block discarded – undo
395 395
                     }
396 396
                 } else {
397 397
                     // Inline script.
398
-                    if ( $this->isremovable( $tag, $this->jsremovables ) ) {
399
-                        $this->content = str_replace( $tag, '', $this->content );
398
+                    if ($this->isremovable($tag, $this->jsremovables)) {
399
+                        $this->content = str_replace($tag, '', $this->content);
400 400
                         continue;
401 401
                     }
402 402
 
403 403
                     // unhide comments, as javascript may be wrapped in comment-tags for old times' sake.
404
-                    $tag = $this->restore_comments( $tag );
405
-                    if ( $this->ismergeable( $tag ) && $this->include_inline ) {
406
-                        preg_match( '#<script.*>(.*)</script>#Usmi', $tag, $code );
407
-                        $code            = preg_replace( '#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1] );
408
-                        $code            = preg_replace( '/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code );
409
-                        $this->scripts[] = 'INLINE;' . $code;
404
+                    $tag = $this->restore_comments($tag);
405
+                    if ($this->ismergeable($tag) && $this->include_inline) {
406
+                        preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code);
407
+                        $code            = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]);
408
+                        $code            = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code);
409
+                        $this->scripts[] = 'INLINE;'.$code;
410 410
                     } else {
411 411
                         // Can we move this?
412
-                        $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag );
413
-                        if ( $this->ismovable( $tag ) || '' !== $autoptimize_js_moveable ) {
414
-                            if ( $this->movetolast( $tag ) || 'last' === $autoptimize_js_moveable ) {
412
+                        $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag);
413
+                        if ($this->ismovable($tag) || '' !== $autoptimize_js_moveable) {
414
+                            if ($this->movetolast($tag) || 'last' === $autoptimize_js_moveable) {
415 415
                                 $this->move['last'][] = $tag;
416 416
                             } else {
417 417
                                 $this->move['first'][] = $tag;
@@ -422,11 +422,11 @@  discard block
 block discarded – undo
422 422
                         }
423 423
                     }
424 424
                     // Re-hide comments to be able to do the removal based on tag from $this->content.
425
-                    $tag = $this->hide_comments( $tag );
425
+                    $tag = $this->hide_comments($tag);
426 426
                 }
427 427
 
428 428
                 // Remove the original script tag.
429
-                $this->content = str_replace( $tag, '', $this->content );
429
+                $this->content = str_replace($tag, '', $this->content);
430 430
             }
431 431
 
432 432
             return true;
@@ -451,30 +451,30 @@  discard block
 block discarded – undo
451 451
      * @param string $tag Script node & child(ren).
452 452
      * @return bool
453 453
      */
454
-    public function should_aggregate( $tag )
454
+    public function should_aggregate($tag)
455 455
     {
456
-        if ( empty( $tag ) ) {
456
+        if (empty($tag)) {
457 457
             return false;
458 458
         }
459 459
 
460 460
         // We're only interested in the type attribute of the <script> tag itself, not any possible
461 461
         // inline code that might just contain the 'type=' string...
462 462
         $tag_parts = array();
463
-        preg_match( '#<(script[^>]*)>#i', $tag, $tag_parts );
463
+        preg_match('#<(script[^>]*)>#i', $tag, $tag_parts);
464 464
         $tag_without_contents = null;
465
-        if ( ! empty( $tag_parts[1] ) ) {
465
+        if (!empty($tag_parts[1])) {
466 466
             $tag_without_contents = $tag_parts[1];
467 467
         }
468 468
 
469
-        $has_type = ( strpos( $tag_without_contents, 'type' ) !== false );
469
+        $has_type = (strpos($tag_without_contents, 'type') !== false);
470 470
 
471 471
         $type_valid = false;
472
-        if ( $has_type ) {
473
-            $type_valid = (bool) preg_match( '/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents );
472
+        if ($has_type) {
473
+            $type_valid = (bool) preg_match('/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents);
474 474
         }
475 475
 
476 476
         $should_aggregate = false;
477
-        if ( ! $has_type || $type_valid ) {
477
+        if (!$has_type || $type_valid) {
478 478
             $should_aggregate = true;
479 479
         }
480 480
 
@@ -486,75 +486,75 @@  discard block
 block discarded – undo
486 486
      */
487 487
     public function minify()
488 488
     {
489
-        foreach ( $this->scripts as $script ) {
490
-            if ( empty( $script ) ) {
489
+        foreach ($this->scripts as $script) {
490
+            if (empty($script)) {
491 491
                 continue;
492 492
             }
493 493
 
494 494
             // TODO/FIXME: some duplicate code here, can be reduced/simplified.
495
-            if ( preg_match( '#^INLINE;#', $script ) ) {
495
+            if (preg_match('#^INLINE;#', $script)) {
496 496
                 // Inline script.
497
-                $script = preg_replace( '#^INLINE;#', '', $script );
498
-                $script = rtrim( $script, ";\n\t\r" ) . ';';
497
+                $script = preg_replace('#^INLINE;#', '', $script);
498
+                $script = rtrim($script, ";\n\t\r").';';
499 499
                 // Add try-catch?
500
-                if ( $this->trycatch ) {
501
-                    $script = 'try{' . $script . '}catch(e){}';
500
+                if ($this->trycatch) {
501
+                    $script = 'try{'.$script.'}catch(e){}';
502 502
                 }
503
-                $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' );
504
-                if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscript ) ) {
503
+                $tmpscript = apply_filters('autoptimize_js_individual_script', $script, '');
504
+                if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) {
505 505
                     $script                = $tmpscript;
506 506
                     $this->alreadyminified = true;
507 507
                 }
508
-                $this->jscode .= "\n" . $script;
508
+                $this->jscode .= "\n".$script;
509 509
             } else {
510 510
                 // External script.
511
-                if ( false !== $script && file_exists( $script ) && is_readable( $script ) ) {
512
-                    $scriptsrc = file_get_contents( $script );
513
-                    $scriptsrc = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc );
514
-                    $scriptsrc = rtrim( $scriptsrc, ";\n\t\r" ) . ';';
511
+                if (false !== $script && file_exists($script) && is_readable($script)) {
512
+                    $scriptsrc = file_get_contents($script);
513
+                    $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc);
514
+                    $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';';
515 515
                     // Add try-catch?
516
-                    if ( $this->trycatch ) {
517
-                        $scriptsrc = 'try{' . $scriptsrc . '}catch(e){}';
516
+                    if ($this->trycatch) {
517
+                        $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}';
518 518
                     }
519
-                    $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script );
520
-                    if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscriptsrc ) ) {
519
+                    $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script);
520
+                    if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) {
521 521
                         $scriptsrc             = $tmpscriptsrc;
522 522
                         $this->alreadyminified = true;
523
-                    } elseif ( $this->can_inject_late( $script ) ) {
524
-                        $scriptsrc = self::build_injectlater_marker( $script, md5( $scriptsrc ) );
523
+                    } elseif ($this->can_inject_late($script)) {
524
+                        $scriptsrc = self::build_injectlater_marker($script, md5($scriptsrc));
525 525
                     }
526
-                    $this->jscode .= "\n" . $scriptsrc;
526
+                    $this->jscode .= "\n".$scriptsrc;
527 527
                 }
528 528
             }
529 529
         }
530 530
 
531 531
         // Check for already-minified code.
532
-        $this->md5hash = md5( $this->jscode );
533
-        $ccheck        = new autoptimizeCache( $this->md5hash, 'js' );
534
-        if ( $ccheck->check() ) {
532
+        $this->md5hash = md5($this->jscode);
533
+        $ccheck        = new autoptimizeCache($this->md5hash, 'js');
534
+        if ($ccheck->check()) {
535 535
             $this->jscode = $ccheck->retrieve();
536 536
             return true;
537 537
         }
538
-        unset( $ccheck );
538
+        unset($ccheck);
539 539
 
540 540
         // $this->jscode has all the uncompressed code now.
541
-        if ( true !== $this->alreadyminified ) {
542
-            if ( apply_filters( 'autoptimize_js_do_minify', true ) ) {
543
-                $tmp_jscode = trim( JSMin::minify( $this->jscode ) );
544
-                if ( ! empty( $tmp_jscode ) ) {
541
+        if (true !== $this->alreadyminified) {
542
+            if (apply_filters('autoptimize_js_do_minify', true)) {
543
+                $tmp_jscode = trim(JSMin::minify($this->jscode));
544
+                if (!empty($tmp_jscode)) {
545 545
                     $this->jscode = $tmp_jscode;
546
-                    unset( $tmp_jscode );
546
+                    unset($tmp_jscode);
547 547
                 }
548
-                $this->jscode = $this->inject_minified( $this->jscode );
549
-                $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
548
+                $this->jscode = $this->inject_minified($this->jscode);
549
+                $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
550 550
                 return true;
551 551
             } else {
552
-                $this->jscode = $this->inject_minified( $this->jscode );
552
+                $this->jscode = $this->inject_minified($this->jscode);
553 553
                 return false;
554 554
             }
555 555
         }
556 556
 
557
-        $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
557
+        $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
558 558
         return true;
559 559
     }
560 560
 
@@ -563,13 +563,13 @@  discard block
 block discarded – undo
563 563
      */
564 564
     public function cache()
565 565
     {
566
-        $cache = new autoptimizeCache( $this->md5hash, 'js' );
567
-        if ( ! $cache->check() ) {
566
+        $cache = new autoptimizeCache($this->md5hash, 'js');
567
+        if (!$cache->check()) {
568 568
             // Cache our code.
569
-            $cache->cache( $this->jscode, 'text/javascript' );
569
+            $cache->cache($this->jscode, 'text/javascript');
570 570
         }
571
-        $this->url = AUTOPTIMIZE_CACHE_URL . $cache->getname();
572
-        $this->url = $this->url_replace_cdn( $this->url );
571
+        $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
572
+        $this->url = $this->url_replace_cdn($this->url);
573 573
     }
574 574
 
575 575
     /**
@@ -578,47 +578,47 @@  discard block
 block discarded – undo
578 578
     public function getcontent()
579 579
     {
580 580
         // Restore the full content.
581
-        if ( ! empty( $this->restofcontent ) ) {
581
+        if (!empty($this->restofcontent)) {
582 582
             $this->content      .= $this->restofcontent;
583 583
             $this->restofcontent = '';
584 584
         }
585 585
 
586 586
         // Add the scripts taking forcehead/ deferred (default) into account.
587
-        if ( $this->forcehead ) {
588
-            $replace_tag = array( '</head>', 'before' );
587
+        if ($this->forcehead) {
588
+            $replace_tag = array('</head>', 'before');
589 589
             $defer       = '';
590 590
         } else {
591
-            $replace_tag = array( '</body>', 'before' );
591
+            $replace_tag = array('</body>', 'before');
592 592
             $defer       = 'defer ';
593 593
         }
594 594
 
595
-        $defer   = apply_filters( 'autoptimize_filter_js_defer', $defer );
595
+        $defer   = apply_filters('autoptimize_filter_js_defer', $defer);
596 596
         $type_js = '';
597
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
597
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
598 598
             $type_js = 'type="text/javascript" ';
599 599
         }
600 600
 
601
-        $bodyreplacementpayload = '<script ' . $type_js . $defer . 'src="' . $this->url . '"></script>';
602
-        $bodyreplacementpayload = apply_filters( 'autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload );
601
+        $bodyreplacementpayload = '<script '.$type_js.$defer.'src="'.$this->url.'"></script>';
602
+        $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload);
603 603
 
604
-        $bodyreplacement  = implode( '', $this->move['first'] );
604
+        $bodyreplacement  = implode('', $this->move['first']);
605 605
         $bodyreplacement .= $bodyreplacementpayload;
606
-        $bodyreplacement .= implode( '', $this->move['last'] );
606
+        $bodyreplacement .= implode('', $this->move['last']);
607 607
 
608
-        $replace_tag = apply_filters( 'autoptimize_filter_js_replacetag', $replace_tag );
608
+        $replace_tag = apply_filters('autoptimize_filter_js_replacetag', $replace_tag);
609 609
 
610
-        if ( strlen( $this->jscode ) > 0 ) {
611
-            $this->inject_in_html( $bodyreplacement, $replace_tag );
610
+        if (strlen($this->jscode) > 0) {
611
+            $this->inject_in_html($bodyreplacement, $replace_tag);
612 612
         }
613 613
 
614 614
         // Restore comments.
615
-        $this->content = $this->restore_comments( $this->content );
615
+        $this->content = $this->restore_comments($this->content);
616 616
 
617 617
         // Restore IE hacks.
618
-        $this->content = $this->restore_iehacks( $this->content );
618
+        $this->content = $this->restore_iehacks($this->content);
619 619
 
620 620
         // Restore noptimize.
621
-        $this->content = $this->restore_noptimize( $this->content );
621
+        $this->content = $this->restore_noptimize($this->content);
622 622
 
623 623
         // Return the modified HTML.
624 624
         return $this->content;
@@ -629,34 +629,34 @@  discard block
 block discarded – undo
629 629
      *
630 630
      * @param string $tag JS tag.
631 631
      */
632
-    private function ismergeable( $tag )
632
+    private function ismergeable($tag)
633 633
     {
634
-        if ( empty( $tag ) || ! $this->aggregate ) {
634
+        if (empty($tag) || !$this->aggregate) {
635 635
             return false;
636 636
         }
637 637
 
638
-        if ( ! empty( $this->allowlist ) ) {
639
-            foreach ( $this->allowlist as $match ) {
640
-                if ( false !== strpos( $tag, $match ) ) {
638
+        if (!empty($this->allowlist)) {
639
+            foreach ($this->allowlist as $match) {
640
+                if (false !== strpos($tag, $match)) {
641 641
                     return true;
642 642
                 }
643 643
             }
644 644
             // No match with allowlist.
645 645
             return false;
646 646
         } else {
647
-            foreach ( $this->domove as $match ) {
648
-                if ( false !== strpos( $tag, $match ) ) {
647
+            foreach ($this->domove as $match) {
648
+                if (false !== strpos($tag, $match)) {
649 649
                     // Matched something.
650 650
                     return false;
651 651
                 }
652 652
             }
653 653
 
654
-            if ( $this->movetolast( $tag ) ) {
654
+            if ($this->movetolast($tag)) {
655 655
                 return false;
656 656
             }
657 657
 
658
-            foreach ( $this->dontmove as $match ) {
659
-                if ( false !== strpos( $tag, $match ) ) {
658
+            foreach ($this->dontmove as $match) {
659
+                if (false !== strpos($tag, $match)) {
660 660
                     // Matched something.
661 661
                     return false;
662 662
                 }
@@ -672,25 +672,25 @@  discard block
 block discarded – undo
672 672
      *
673 673
      * @param string $tag tag to check for blocklist (exclusions).
674 674
      */
675
-    private function ismovable( $tag )
675
+    private function ismovable($tag)
676 676
     {
677
-        if ( empty( $tag ) || true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) {
677
+        if (empty($tag) || true !== $this->include_inline || apply_filters('autoptimize_filter_js_unmovable', true)) {
678 678
             return false;
679 679
         }
680 680
 
681
-        foreach ( $this->domove as $match ) {
682
-            if ( false !== strpos( $tag, $match ) ) {
681
+        foreach ($this->domove as $match) {
682
+            if (false !== strpos($tag, $match)) {
683 683
                 // Matched something.
684 684
                 return true;
685 685
             }
686 686
         }
687 687
 
688
-        if ( $this->movetolast( $tag ) ) {
688
+        if ($this->movetolast($tag)) {
689 689
             return true;
690 690
         }
691 691
 
692
-        foreach ( $this->dontmove as $match ) {
693
-            if ( false !== strpos( $tag, $match ) ) {
692
+        foreach ($this->dontmove as $match) {
693
+            if (false !== strpos($tag, $match)) {
694 694
                 // Matched something.
695 695
                 return false;
696 696
             }
@@ -700,14 +700,14 @@  discard block
 block discarded – undo
700 700
         return true;
701 701
     }
702 702
 
703
-    private function movetolast( $tag )
703
+    private function movetolast($tag)
704 704
     {
705
-        if ( empty( $tag ) ) {
705
+        if (empty($tag)) {
706 706
             return false;
707 707
         }
708 708
 
709
-        foreach ( $this->domovelast as $match ) {
710
-            if ( false !== strpos( $tag, $match ) ) {
709
+        foreach ($this->domovelast as $match) {
710
+            if (false !== strpos($tag, $match)) {
711 711
                 // Matched, return true.
712 712
                 return true;
713 713
             }
@@ -727,12 +727,12 @@  discard block
 block discarded – undo
727 727
      * @param string $js_path Path to JS file.
728 728
      * @return bool
729 729
      */
730
-    private function can_inject_late( $js_path ) {
731
-        $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
732
-        if ( true !== $this->inject_min_late ) {
730
+    private function can_inject_late($js_path) {
731
+        $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
732
+        if (true !== $this->inject_min_late) {
733 733
             // late-inject turned off.
734 734
             return false;
735
-        } elseif ( ( false === strpos( $js_path, 'min.js' ) ) && ( false === strpos( $js_path, 'wp-includes/js/jquery/jquery.js' ) ) && ( str_replace( $consider_minified_array, '', $js_path ) === $js_path ) ) {
735
+        } elseif ((false === strpos($js_path, 'min.js')) && (false === strpos($js_path, 'wp-includes/js/jquery/jquery.js')) && (str_replace($consider_minified_array, '', $js_path) === $js_path)) {
736 736
             // file not minified based on filename & filter.
737 737
             return false;
738 738
         } else {
@@ -759,35 +759,35 @@  discard block
 block discarded – undo
759 759
      *
760 760
      * @return bool|string Url pointing to the minified js file or false.
761 761
      */
762
-    public function minify_single( $filepath, $cache_miss = false )
762
+    public function minify_single($filepath, $cache_miss = false)
763 763
     {
764
-        $contents = $this->prepare_minify_single( $filepath );
764
+        $contents = $this->prepare_minify_single($filepath);
765 765
 
766
-        if ( empty( $contents ) ) {
766
+        if (empty($contents)) {
767 767
             return false;
768 768
         }
769 769
 
770 770
         // Check cache.
771
-        $hash  = 'single_' . md5( $contents );
772
-        $cache = new autoptimizeCache( $hash, 'js' );
771
+        $hash  = 'single_'.md5($contents);
772
+        $cache = new autoptimizeCache($hash, 'js');
773 773
 
774 774
         // If not in cache already, minify...
775
-        if ( ! $cache->check() || $cache_miss ) {
776
-            $contents = trim( JSMin::minify( $contents ) );
775
+        if (!$cache->check() || $cache_miss) {
776
+            $contents = trim(JSMin::minify($contents));
777 777
 
778 778
             // Check if minified cache content is empty.
779
-            if ( empty( $contents ) ) {
779
+            if (empty($contents)) {
780 780
                 return false;
781 781
             }
782 782
 
783 783
             // Filter contents of excluded minified CSS.
784
-            $contents = apply_filters( 'autoptimize_filter_js_single_after_minify', $contents );
784
+            $contents = apply_filters('autoptimize_filter_js_single_after_minify', $contents);
785 785
 
786 786
             // Store in cache.
787
-            $cache->cache( $contents, 'text/javascript' );
787
+            $cache->cache($contents, 'text/javascript');
788 788
         }
789 789
 
790
-        $url = $this->build_minify_single_url( $cache );
790
+        $url = $this->build_minify_single_url($cache);
791 791
 
792 792
         return $url;
793 793
     }
Please login to merge, or discard this patch.
classes/autoptimizeStyles.php 2 patches
Doc Comments   +22 added lines, -2 removed lines patch added patch discarded remove patch
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
      * be inlined into a data: URI. Defaults to 4096, passed through
440 440
      * `autoptimize_filter_css_datauri_maxsize` filter.
441 441
      *
442
-     * @return mixed
442
+     * @return integer|null
443 443
      */
444 444
     private function get_datauri_maxsize()
445 445
     {
@@ -460,6 +460,9 @@  discard block
 block discarded – undo
460 460
         return $max_size;
461 461
     }
462 462
 
463
+    /**
464
+     * @param false|string $url
465
+     */
463 466
     private function check_datauri_exclude_list( $url )
464 467
     {
465 468
         static $exclude_list = null;
@@ -485,6 +488,9 @@  discard block
 block discarded – undo
485 488
         return $matched;
486 489
     }
487 490
 
491
+    /**
492
+     * @param false|string $path
493
+     */
488 494
     private function build_or_get_datauri_image( $path )
489 495
     {
490 496
         /**
@@ -914,6 +920,11 @@  discard block
 block discarded – undo
914 920
         return true;
915 921
     }
916 922
 
923
+    /**
924
+     * @param string $code
925
+     *
926
+     * @return string
927
+     */
917 928
     public function run_minifier_on( $code )
918 929
     {
919 930
         if ( ! $this->alreadyminified ) {
@@ -1135,6 +1146,9 @@  discard block
 block discarded – undo
1135 1146
         return $code;
1136 1147
     }
1137 1148
 
1149
+    /**
1150
+     * @param string $tag
1151
+     */
1138 1152
     private function ismovable( $tag )
1139 1153
     {
1140 1154
         if ( ! $this->aggregate ) {
@@ -1164,6 +1178,9 @@  discard block
 block discarded – undo
1164 1178
         }
1165 1179
     }
1166 1180
 
1181
+    /**
1182
+     * @param string $css
1183
+     */
1167 1184
     private function can_inject_late( $css_path, $css )
1168 1185
     {
1169 1186
         $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $css_path );
@@ -1195,7 +1212,7 @@  discard block
 block discarded – undo
1195 1212
      * @param string $filepath Filepath.
1196 1213
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
1197 1214
      *
1198
-     * @return bool|string Url pointing to the minified css file or false.
1215
+     * @return false|string Url pointing to the minified css file or false.
1199 1216
      */
1200 1217
     public function minify_single( $filepath, $cache_miss = false )
1201 1218
     {
@@ -1256,6 +1273,9 @@  discard block
 block discarded – undo
1256 1273
         $this->options = $options;
1257 1274
     }
1258 1275
 
1276
+    /**
1277
+     * @param string $name
1278
+     */
1259 1279
     public function setOption( $name, $value )
1260 1280
     {
1261 1281
         $this->options[ $name ] = $value;
Please login to merge, or discard this patch.
Spacing   +349 added lines, -349 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Class for CSS optimization.
4 4
  */
5 5
 
6
-if ( ! defined( 'ABSPATH' ) ) {
6
+if (!defined('ABSPATH')) {
7 7
     exit;
8 8
 }
9 9
 
@@ -161,54 +161,54 @@  discard block
 block discarded – undo
161 161
      *
162 162
      * @param array $options all options.
163 163
      */
164
-    public function read( $options )
164
+    public function read($options)
165 165
     {
166
-        $noptimize_css = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );
167
-        if ( $noptimize_css ) {
166
+        $noptimize_css = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
167
+        if ($noptimize_css) {
168 168
             return false;
169 169
         }
170 170
 
171
-        $allowlist_css = apply_filters( 'autoptimize_filter_css_allowlist', '', $this->content );
172
-        $allowlist_css = apply_filters( 'autoptimize_filter_css_whitelist', $allowlist_css, $this->content ); // fixme: to be removed in next version.
173
-        if ( ! empty( $allowlist_css ) ) {
174
-            $this->allowlist = array_filter( array_map( 'trim', explode( ',', $allowlist_css ) ) );
171
+        $allowlist_css = apply_filters('autoptimize_filter_css_allowlist', '', $this->content);
172
+        $allowlist_css = apply_filters('autoptimize_filter_css_whitelist', $allowlist_css, $this->content); // fixme: to be removed in next version.
173
+        if (!empty($allowlist_css)) {
174
+            $this->allowlist = array_filter(array_map('trim', explode(',', $allowlist_css)));
175 175
         }
176 176
 
177
-        $removable_css = apply_filters( 'autoptimize_filter_css_removables', '' );
178
-        if ( ! empty( $removable_css ) ) {
179
-            $this->cssremovables = array_filter( array_map( 'trim', explode( ',', $removable_css ) ) );
177
+        $removable_css = apply_filters('autoptimize_filter_css_removables', '');
178
+        if (!empty($removable_css)) {
179
+            $this->cssremovables = array_filter(array_map('trim', explode(',', $removable_css)));
180 180
         }
181 181
 
182
-        $this->cssinlinesize = apply_filters( 'autoptimize_filter_css_inlinesize', 256 );
182
+        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
183 183
 
184 184
         // filter to "late inject minified CSS", default to true for now (it is faster).
185
-        $this->inject_min_late = apply_filters( 'autoptimize_filter_css_inject_min_late', true );
185
+        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
186 186
 
187 187
         // Remove everything that's not the header.
188
-        if ( apply_filters( 'autoptimize_filter_css_justhead', $options['justhead'] ) ) {
189
-            $content             = explode( '</head>', $this->content, 2 );
190
-            $this->content       = $content[0] . '</head>';
188
+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead'])) {
189
+            $content             = explode('</head>', $this->content, 2);
190
+            $this->content       = $content[0].'</head>';
191 191
             $this->restofcontent = $content[1];
192 192
         }
193 193
 
194 194
         // Determine whether we're doing CSS-files aggregation or not.
195
-        if ( isset( $options['aggregate'] ) && ! $options['aggregate'] ) {
195
+        if (isset($options['aggregate']) && !$options['aggregate']) {
196 196
             $this->aggregate = false;
197 197
         }
198 198
         // Returning true for "dontaggregate" turns off aggregation.
199
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_css_dontaggregate', false ) ) {
199
+        if ($this->aggregate && apply_filters('autoptimize_filter_css_dontaggregate', false)) {
200 200
             $this->aggregate = false;
201 201
         }
202 202
 
203 203
         // include inline?
204
-        if ( apply_filters( 'autoptimize_css_include_inline', $options['include_inline'] ) ) {
204
+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline'])) {
205 205
             $this->include_inline = true;
206 206
         }
207 207
 
208 208
         // List of CSS strings which are excluded from autoptimization.
209
-        $exclude_css = apply_filters( 'autoptimize_filter_css_exclude', $options['css_exclude'], $this->content );
210
-        if ( '' !== $exclude_css ) {
211
-            $this->dontmove = array_filter( array_map( 'trim', explode( ',', $exclude_css ) ) );
209
+        $exclude_css = apply_filters('autoptimize_filter_css_exclude', $options['css_exclude'], $this->content);
210
+        if ('' !== $exclude_css) {
211
+            $this->dontmove = array_filter(array_map('trim', explode(',', $exclude_css)));
212 212
         } else {
213 213
             $this->dontmove = array();
214 214
         }
@@ -219,16 +219,16 @@  discard block
 block discarded – undo
219 219
         // Should we defer css?
220 220
         // value: true / false.
221 221
         $this->defer = $options['defer'];
222
-        $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content );
222
+        $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
223 223
 
224 224
         // Should we inline while deferring?
225 225
         // value: inlined CSS.
226
-        $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->sanitize_css( $options['defer_inline'] ), $this->content );
226
+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->sanitize_css($options['defer_inline']), $this->content);
227 227
 
228 228
         // Should we inline?
229 229
         // value: true / false.
230 230
         $this->inline = $options['inline'];
231
-        $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content );
231
+        $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
232 232
 
233 233
         // Store cdn url.
234 234
         $this->cdn_url = $options['cdn_url'];
@@ -237,16 +237,16 @@  discard block
 block discarded – undo
237 237
         $this->datauris = $options['datauris'];
238 238
 
239 239
         // Determine whether excluded files should be minified if not yet so.
240
-        if ( ! $options['minify_excluded'] && $options['aggregate'] ) {
240
+        if (!$options['minify_excluded'] && $options['aggregate']) {
241 241
             $this->minify_excluded = false;
242 242
         }
243
-        $this->minify_excluded = apply_filters( 'autoptimize_filter_css_minify_excluded', $this->minify_excluded, '' );
243
+        $this->minify_excluded = apply_filters('autoptimize_filter_css_minify_excluded', $this->minify_excluded, '');
244 244
 
245 245
         // should we force all media-attributes to all?
246
-        $this->media_force_all = apply_filters( 'autoptimize_filter_css_tagmedia_forceall', false );
246
+        $this->media_force_all = apply_filters('autoptimize_filter_css_tagmedia_forceall', false);
247 247
 
248 248
         // noptimize me.
249
-        $this->content = $this->hide_noptimize( $this->content );
249
+        $this->content = $this->hide_noptimize($this->content);
250 250
 
251 251
         // Exclude (no)script, as those may contain CSS which should be left as is.
252 252
         $this->content = $this->replace_contents_with_marker_if_exists(
@@ -257,25 +257,25 @@  discard block
 block discarded – undo
257 257
         );
258 258
 
259 259
         // Save IE hacks.
260
-        $this->content = $this->hide_iehacks( $this->content );
260
+        $this->content = $this->hide_iehacks($this->content);
261 261
 
262 262
         // Hide HTML comments.
263
-        $this->content = $this->hide_comments( $this->content );
263
+        $this->content = $this->hide_comments($this->content);
264 264
 
265 265
         // Get <style> and <link>.
266
-        if ( preg_match_all( '#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches ) ) {
266
+        if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
267 267
 
268
-            foreach ( $matches[0] as $tag ) {
269
-                if ( $this->isremovable( $tag, $this->cssremovables ) ) {
270
-                    $this->content = str_replace( $tag, '', $this->content );
271
-                } elseif ( $this->ismovable( $tag ) ) {
268
+            foreach ($matches[0] as $tag) {
269
+                if ($this->isremovable($tag, $this->cssremovables)) {
270
+                    $this->content = str_replace($tag, '', $this->content);
271
+                } elseif ($this->ismovable($tag)) {
272 272
                     // Get the media.
273
-                    if ( false !== strpos( $tag, 'media=' ) ) {
274
-                        preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias );
275
-                        $medias = explode( ',', $medias[1] );
273
+                    if (false !== strpos($tag, 'media=')) {
274
+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
275
+                        $medias = explode(',', $medias[1]);
276 276
                         $media  = array();
277
-                        foreach ( $medias as $elem ) {
278
-                            if ( empty( $elem ) ) {
277
+                        foreach ($medias as $elem) {
278
+                            if (empty($elem)) {
279 279
                                 $elem = 'all';
280 280
                             }
281 281
 
@@ -283,68 +283,68 @@  discard block
 block discarded – undo
283 283
                         }
284 284
                     } else {
285 285
                         // No media specified - applies to all.
286
-                        $media = array( 'all' );
286
+                        $media = array('all');
287 287
                     }
288 288
 
289 289
                     // forcing media attribute to all to merge all in one file.
290
-                    if ( $this->media_force_all ) {
291
-                        $media = array( 'all' );
290
+                    if ($this->media_force_all) {
291
+                        $media = array('all');
292 292
                     }
293 293
 
294
-                    $media = apply_filters( 'autoptimize_filter_css_tagmedia', $media, $tag );
294
+                    $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
295 295
 
296
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
296
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
297 297
                         // <link>.
298
-                        $url  = current( explode( '?', $source[2], 2 ) );
299
-                        $path = $this->getpath( $url );
298
+                        $url  = current(explode('?', $source[2], 2));
299
+                        $path = $this->getpath($url);
300 300
 
301
-                        if ( false !== $path && preg_match( '#\.css$#', $path ) ) {
301
+                        if (false !== $path && preg_match('#\.css$#', $path)) {
302 302
                             // Good link.
303
-                            $this->css[] = array( $media, $path );
303
+                            $this->css[] = array($media, $path);
304 304
                         } else {
305 305
                             // Link is dynamic (.php etc).
306
-                            $new_tag = $this->optionally_defer_excluded( $tag, 'none' );
307
-                            if ( '' !== $new_tag && $new_tag !== $tag ) {
308
-                                $this->content = str_replace( $tag, $new_tag, $this->content );
306
+                            $new_tag = $this->optionally_defer_excluded($tag, 'none');
307
+                            if ('' !== $new_tag && $new_tag !== $tag) {
308
+                                $this->content = str_replace($tag, $new_tag, $this->content);
309 309
                             }
310 310
                             $tag = '';
311 311
                         }
312 312
                     } else {
313 313
                         // Inline css in style tags can be wrapped in comment tags, so restore comments.
314
-                        $tag = $this->restore_comments( $tag );
315
-                        preg_match( '#<style.*>(.*)</style>#Usmi', $tag, $code );
314
+                        $tag = $this->restore_comments($tag);
315
+                        preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
316 316
 
317 317
                         // And re-hide them to be able to to the removal based on tag.
318
-                        $tag = $this->hide_comments( $tag );
318
+                        $tag = $this->hide_comments($tag);
319 319
 
320
-                        if ( $this->include_inline ) {
321
-                            $code        = preg_replace( '#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1] );
322
-                            $this->css[] = array( $media, 'INLINE;' . $code );
320
+                        if ($this->include_inline) {
321
+                            $code        = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
322
+                            $this->css[] = array($media, 'INLINE;'.$code);
323 323
                         } else {
324 324
                             $tag = '';
325 325
                         }
326 326
                     }
327 327
 
328 328
                     // Remove the original style tag.
329
-                    $this->content = str_replace( $tag, '', $this->content );
329
+                    $this->content = str_replace($tag, '', $this->content);
330 330
                 } else {
331
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
332
-                        $exploded_url = explode( '?', $source[2], 2 );
331
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
332
+                        $exploded_url = explode('?', $source[2], 2);
333 333
                         $url          = $exploded_url[0];
334
-                        $path         = $this->getpath( $url );
334
+                        $path         = $this->getpath($url);
335 335
                         $new_tag      = $tag;
336 336
 
337 337
                         // Excluded CSS, minify that file:
338 338
                         // -> if aggregate is on and exclude minify is on
339 339
                         // -> if aggregate is off and the file is not in dontmove.
340
-                        if ( $path && $this->minify_excluded ) {
341
-                            $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false );
342
-                            if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) {
343
-                                $minified_url = $this->minify_single( $path );
344
-                                if ( ! empty( $minified_url ) ) {
340
+                        if ($path && $this->minify_excluded) {
341
+                            $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false);
342
+                            if ((false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path) || (true === $this->aggregate && (false === $consider_minified_array || str_replace($consider_minified_array, '', $path) === $path))) {
343
+                                $minified_url = $this->minify_single($path);
344
+                                if (!empty($minified_url)) {
345 345
                                     // Replace orig URL with cached minified URL.
346
-                                    $new_tag = str_replace( $url, $minified_url, $tag );
347
-                                } elseif ( apply_filters( 'autoptimize_filter_ccsjs_remove_empty_minified_url', false ) ) {
346
+                                    $new_tag = str_replace($url, $minified_url, $tag);
347
+                                } elseif (apply_filters('autoptimize_filter_ccsjs_remove_empty_minified_url', false)) {
348 348
                                     // Remove the original style tag, because cache content is empty but only if
349 349
                                     // filter is true-ed because $minified_url is also false if file is minified already.
350 350
                                     $new_tag = '';
@@ -352,14 +352,14 @@  discard block
 block discarded – undo
352 352
                             }
353 353
                         }
354 354
 
355
-                        if ( '' !== $new_tag ) {
355
+                        if ('' !== $new_tag) {
356 356
                             // Optionally defer (preload) non-aggregated CSS.
357
-                            $new_tag = $this->optionally_defer_excluded( $new_tag, $url );
357
+                            $new_tag = $this->optionally_defer_excluded($new_tag, $url);
358 358
                         }
359 359
 
360 360
                         // And replace!
361
-                        if ( ( '' !== $new_tag && $new_tag !== $tag ) || ( '' === $new_tag && apply_filters( 'autoptimize_filter_css_remove_empty_files', false ) ) ) {
362
-                            $this->content = str_replace( $tag, $new_tag, $this->content );
361
+                        if (('' !== $new_tag && $new_tag !== $tag) || ('' === $new_tag && apply_filters('autoptimize_filter_css_remove_empty_files', false))) {
362
+                            $this->content = str_replace($tag, $new_tag, $this->content);
363 363
                         }
364 364
                     }
365 365
                 }
@@ -380,30 +380,30 @@  discard block
 block discarded – undo
380 380
      *
381 381
      * @return string $new_tag
382 382
      */
383
-    private function optionally_defer_excluded( $tag, $url = '' )
383
+    private function optionally_defer_excluded($tag, $url = '')
384 384
     {
385 385
         // Defer single CSS if "inline & defer" is ON and there is inline CSS.
386
-        if ( ! empty( $tag ) && false === strpos( $tag, ' onload=' ) && $this->defer && ! empty( $this->defer_inline ) && apply_filters( 'autoptimize_filter_css_defer_excluded', true, $tag ) ) {
386
+        if (!empty($tag) && false === strpos($tag, ' onload=') && $this->defer && !empty($this->defer_inline) && apply_filters('autoptimize_filter_css_defer_excluded', true, $tag)) {
387 387
             // get media attribute and based on that create onload JS attribute value.
388
-            if ( false === strpos( $tag, 'media=' ) ) {
389
-                $tag = str_replace( '<link', "<link media='all'", $tag );
388
+            if (false === strpos($tag, 'media=')) {
389
+                $tag = str_replace('<link', "<link media='all'", $tag);
390 390
             }
391 391
 
392
-            preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $_medias );
392
+            preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $_medias);
393 393
             $_media          = $_medias[1];
394
-            $_preload_onload = autoptimizeConfig::get_ao_css_preload_onload( $_media );
394
+            $_preload_onload = autoptimizeConfig::get_ao_css_preload_onload($_media);
395 395
 
396
-            if ( 'print' !== $_media ) {
396
+            if ('print' !== $_media) {
397 397
                 // If not media=print, adapt original <link> element for CSS to be preloaded and add <noscript>-version for fallback.
398
-                $new_tag = '<noscript>' . autoptimizeUtils::remove_id_from_node( $tag ) . '</noscript>' . str_replace(
398
+                $new_tag = '<noscript>'.autoptimizeUtils::remove_id_from_node($tag).'</noscript>'.str_replace(
399 399
                     $_medias[0],
400
-                    "media='print' onload=\"" . $_preload_onload . '"',
400
+                    "media='print' onload=\"".$_preload_onload.'"',
401 401
                     $tag
402 402
                 );
403 403
 
404 404
                 // Optionally (but default false) preload the (excluded) CSS-file.
405
-                if ( apply_filters( 'autoptimize_fitler_css_preload_and_print', false ) && 'none' !== $url ) {
406
-                    $new_tag = '<link rel="preload" as="stylesheet" href="' . $url . '"/>' . $new_tag;
405
+                if (apply_filters('autoptimize_fitler_css_preload_and_print', false) && 'none' !== $url) {
406
+                    $new_tag = '<link rel="preload" as="stylesheet" href="'.$url.'"/>'.$new_tag;
407 407
                 }
408 408
             } else {
409 409
                 $new_tag = $tag;
@@ -423,22 +423,22 @@  discard block
 block discarded – undo
423 423
      * @param string $path image path.
424 424
      * @return boolean
425 425
      */
426
-    private function is_datauri_candidate( $path )
426
+    private function is_datauri_candidate($path)
427 427
     {
428 428
         // Call only once since it's called from a loop.
429 429
         static $max_size = null;
430
-        if ( null === $max_size ) {
430
+        if (null === $max_size) {
431 431
             $max_size = $this->get_datauri_maxsize();
432 432
         }
433 433
 
434
-        if ( $path && preg_match( '#\.(jpe?g|png|gif|webp|bmp)$#i', $path ) &&
435
-            file_exists( $path ) && is_readable( $path ) && filesize( $path ) <= $max_size ) {
434
+        if ($path && preg_match('#\.(jpe?g|png|gif|webp|bmp)$#i', $path) &&
435
+            file_exists($path) && is_readable($path) && filesize($path) <= $max_size) {
436 436
 
437 437
             // Seems we have a candidate.
438 438
             $is_candidate = true;
439 439
         } else {
440 440
             // Filter allows overriding default decision (which checks for local file existence).
441
-            $is_candidate = apply_filters( 'autoptimize_filter_css_is_datauri_candidate', false, $path );
441
+            $is_candidate = apply_filters('autoptimize_filter_css_is_datauri_candidate', false, $path);
442 442
         }
443 443
 
444 444
         return $is_candidate;
@@ -463,29 +463,29 @@  discard block
 block discarded – undo
463 463
          * of thing you're probably better of building assets completely
464 464
          * outside of WordPress anyway.
465 465
          */
466
-        if ( null === $max_size ) {
467
-            $max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', 4096 );
466
+        if (null === $max_size) {
467
+            $max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', 4096);
468 468
         }
469 469
 
470 470
         return $max_size;
471 471
     }
472 472
 
473
-    private function check_datauri_exclude_list( $url )
473
+    private function check_datauri_exclude_list($url)
474 474
     {
475 475
         static $exclude_list = null;
476 476
         $no_datauris         = array();
477 477
 
478 478
         // Again, skip doing certain stuff repeatedly when loop-called.
479
-        if ( null === $exclude_list ) {
480
-            $exclude_list = apply_filters( 'autoptimize_filter_css_datauri_exclude', '' );
481
-            $no_datauris  = array_filter( array_map( 'trim', explode( ',', $exclude_list ) ) );
479
+        if (null === $exclude_list) {
480
+            $exclude_list = apply_filters('autoptimize_filter_css_datauri_exclude', '');
481
+            $no_datauris  = array_filter(array_map('trim', explode(',', $exclude_list)));
482 482
         }
483 483
 
484 484
         $matched = false;
485 485
 
486
-        if ( ! empty( $exclude_list ) ) {
487
-            foreach ( $no_datauris as $no_datauri ) {
488
-                if ( false !== strpos( $url, $no_datauri ) ) {
486
+        if (!empty($exclude_list)) {
487
+            foreach ($no_datauris as $no_datauri) {
488
+                if (false !== strpos($url, $no_datauri)) {
489 489
                     $matched = true;
490 490
                     break;
491 491
                 }
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
         return $matched;
496 496
     }
497 497
 
498
-    private function build_or_get_datauri_image( $path )
498
+    private function build_or_get_datauri_image($path)
499 499
     {
500 500
         /**
501 501
          * TODO/FIXME: document the required return array format, or better yet,
@@ -504,27 +504,27 @@  discard block
 block discarded – undo
504 504
          */
505 505
 
506 506
         // Allows short-circuiting datauri generation for an image.
507
-        $result = apply_filters( 'autoptimize_filter_css_datauri_image', array(), $path );
508
-        if ( ! empty( $result ) ) {
509
-            if ( is_array( $result ) && isset( $result['full'] ) && isset( $result['base64data'] ) ) {
507
+        $result = apply_filters('autoptimize_filter_css_datauri_image', array(), $path);
508
+        if (!empty($result)) {
509
+            if (is_array($result) && isset($result['full']) && isset($result['base64data'])) {
510 510
                 return $result;
511 511
             }
512 512
         }
513 513
 
514
-        $hash  = md5( $path );
515
-        $check = new autoptimizeCache( $hash, 'img' );
516
-        if ( $check->check() ) {
514
+        $hash  = md5($path);
515
+        $check = new autoptimizeCache($hash, 'img');
516
+        if ($check->check()) {
517 517
             // we have the base64 image in cache.
518 518
             $head_and_data = $check->retrieve();
519
-            $_base64data   = explode( ';base64,', $head_and_data );
519
+            $_base64data   = explode(';base64,', $head_and_data);
520 520
             $base64data    = $_base64data[1];
521
-            unset( $_base64data );
521
+            unset($_base64data);
522 522
         } else {
523 523
             // It's an image and we don't have it in cache, get the type by extension.
524
-            $exploded_path = explode( '.', $path );
525
-            $type          = end( $exploded_path );
524
+            $exploded_path = explode('.', $path);
525
+            $type          = end($exploded_path);
526 526
 
527
-            switch ( $type ) {
527
+            switch ($type) {
528 528
                 case 'jpg':
529 529
                 case 'jpeg':
530 530
                     $dataurihead = 'data:image/jpeg;base64,';
@@ -546,13 +546,13 @@  discard block
 block discarded – undo
546 546
             }
547 547
 
548 548
             // Encode the data.
549
-            $base64data    = base64_encode( file_get_contents( $path ) );
550
-            $head_and_data = $dataurihead . $base64data;
549
+            $base64data    = base64_encode(file_get_contents($path));
550
+            $head_and_data = $dataurihead.$base64data;
551 551
 
552 552
             // Save in cache.
553
-            $check->cache( $head_and_data, 'text/plain' );
553
+            $check->cache($head_and_data, 'text/plain');
554 554
         }
555
-        unset( $check );
555
+        unset($check);
556 556
 
557 557
         return array(
558 558
             'full'       => $head_and_data,
@@ -569,13 +569,13 @@  discard block
 block discarded – undo
569 569
      *
570 570
      * @return string
571 571
      */
572
-    protected static function replace_longest_matches_first( $string, $replacements = array() )
572
+    protected static function replace_longest_matches_first($string, $replacements = array())
573 573
     {
574
-        if ( ! empty( $replacements ) ) {
574
+        if (!empty($replacements)) {
575 575
             // Sort the replacements array by key length in desc order (so that the longest strings are replaced first).
576
-            $keys = array_map( 'strlen', array_keys( $replacements ) );
577
-            array_multisort( $keys, SORT_DESC, $replacements );
578
-            $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string );
576
+            $keys = array_map('strlen', array_keys($replacements));
577
+            array_multisort($keys, SORT_DESC, $replacements);
578
+            $string = str_replace(array_keys($replacements), array_values($replacements), $string);
579 579
         }
580 580
 
581 581
         return $string;
@@ -591,15 +591,15 @@  discard block
 block discarded – undo
591 591
      *
592 592
      * @return string
593 593
      */
594
-    public function replace_urls( $code = '' )
594
+    public function replace_urls($code = '')
595 595
     {
596 596
         $replacements = array();
597 597
 
598
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
599
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
600
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
598
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
599
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
600
+            foreach ($url_src_matches[1] as $count => $original_url) {
601 601
                 // Removes quotes and other cruft.
602
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
602
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
603 603
 
604 604
                 /**
605 605
                  * TODO/FIXME: Add a way for other code / callable to be called here
@@ -617,17 +617,17 @@  discard block
 block discarded – undo
617 617
                  */
618 618
 
619 619
                 // Do CDN replacement if needed.
620
-                if ( ! empty( $this->cdn_url ) ) {
621
-                    $replacement_url = $this->url_replace_cdn( $url );
620
+                if (!empty($this->cdn_url)) {
621
+                    $replacement_url = $this->url_replace_cdn($url);
622 622
                     // Prepare replacements array.
623
-                    $replacements[ $url_src_matches[1][ $count ] ] = str_replace(
624
-                        $original_url, $replacement_url, $url_src_matches[1][ $count ]
623
+                    $replacements[$url_src_matches[1][$count]] = str_replace(
624
+                        $original_url, $replacement_url, $url_src_matches[1][$count]
625 625
                     );
626 626
                 }
627 627
             }
628 628
         }
629 629
 
630
-        $code = self::replace_longest_matches_first( $code, $replacements );
630
+        $code = self::replace_longest_matches_first($code, $replacements);
631 631
 
632 632
         return $code;
633 633
     }
@@ -640,26 +640,26 @@  discard block
 block discarded – undo
640 640
      * @param string $code HTML being processed to hide fonts.
641 641
      * @return string
642 642
      */
643
-    public function hide_fontface_and_maybe_cdn( $code )
643
+    public function hide_fontface_and_maybe_cdn($code)
644 644
     {
645 645
         // Proceed only if @font-face declarations exist within $code.
646
-        preg_match_all( self::FONT_FACE_REGEX, $code, $fontfaces );
647
-        if ( isset( $fontfaces[0] ) ) {
646
+        preg_match_all(self::FONT_FACE_REGEX, $code, $fontfaces);
647
+        if (isset($fontfaces[0])) {
648 648
             // Check if we need to cdn fonts or not.
649
-            $do_font_cdn = apply_filters( 'autoptimize_filter_css_fonts_cdn', false );
649
+            $do_font_cdn = apply_filters('autoptimize_filter_css_fonts_cdn', false);
650 650
 
651
-            foreach ( $fontfaces[0] as $full_match ) {
651
+            foreach ($fontfaces[0] as $full_match) {
652 652
                 // Keep original match so we can search/replace it.
653 653
                 $match_search = $full_match;
654 654
 
655 655
                 // Do font cdn if needed.
656
-                if ( $do_font_cdn ) {
657
-                    $full_match = $this->replace_urls( $full_match );
656
+                if ($do_font_cdn) {
657
+                    $full_match = $this->replace_urls($full_match);
658 658
                 }
659 659
 
660 660
                 // Replace declaration with its base64 encoded string.
661
-                $replacement = self::build_marker( 'FONTFACE', $full_match );
662
-                $code        = str_replace( $match_search, $replacement, $code );
661
+                $replacement = self::build_marker('FONTFACE', $full_match);
662
+                $code        = str_replace($match_search, $replacement, $code);
663 663
             }
664 664
         }
665 665
 
@@ -673,9 +673,9 @@  discard block
 block discarded – undo
673 673
      * @param string $code HTML being processed to unhide fonts.
674 674
      * @return string
675 675
      */
676
-    public function restore_fontface( $code )
676
+    public function restore_fontface($code)
677 677
     {
678
-        return $this->restore_marked_content( 'FONTFACE', $code );
678
+        return $this->restore_marked_content('FONTFACE', $code);
679 679
     }
680 680
 
681 681
     /**
@@ -684,10 +684,10 @@  discard block
 block discarded – undo
684 684
      * @param string $code HTML being processed rewrite assets.
685 685
      * @return string
686 686
      */
687
-    public function rewrite_assets( $code )
687
+    public function rewrite_assets($code)
688 688
     {
689 689
         // Handle @font-face rules by hiding and processing them separately.
690
-        $code = $this->hide_fontface_and_maybe_cdn( $code );
690
+        $code = $this->hide_fontface_and_maybe_cdn($code);
691 691
 
692 692
         /**
693 693
          * TODO/FIXME:
@@ -704,35 +704,35 @@  discard block
 block discarded – undo
704 704
         $imgreplace      = array();
705 705
 
706 706
         // Matches and captures anything specified within the literal `url()` and excludes those containing data: URIs.
707
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
708
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
709
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
707
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
708
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
709
+            foreach ($url_src_matches[1] as $count => $original_url) {
710 710
                 // Removes quotes and other cruft.
711
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
711
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
712 712
 
713 713
                 // If datauri inlining is turned on, do it.
714 714
                 $inlined = false;
715
-                if ( $this->datauris ) {
715
+                if ($this->datauris) {
716 716
                     $iurl = $url;
717
-                    if ( false !== strpos( $iurl, '?' ) ) {
718
-                        $iurl = strtok( $iurl, '?' );
717
+                    if (false !== strpos($iurl, '?')) {
718
+                        $iurl = strtok($iurl, '?');
719 719
                     }
720 720
 
721
-                    $ipath = $this->getpath( $iurl );
721
+                    $ipath = $this->getpath($iurl);
722 722
 
723
-                    $excluded = $this->check_datauri_exclude_list( $ipath );
724
-                    if ( ! $excluded ) {
725
-                        $is_datauri_candidate = $this->is_datauri_candidate( $ipath );
726
-                        if ( $is_datauri_candidate ) {
727
-                            $datauri    = $this->build_or_get_datauri_image( $ipath );
723
+                    $excluded = $this->check_datauri_exclude_list($ipath);
724
+                    if (!$excluded) {
725
+                        $is_datauri_candidate = $this->is_datauri_candidate($ipath);
726
+                        if ($is_datauri_candidate) {
727
+                            $datauri    = $this->build_or_get_datauri_image($ipath);
728 728
                             $base64data = $datauri['base64data'];
729 729
                             // Add it to the list for replacement.
730
-                            $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
730
+                            $imgreplace[$url_src_matches[1][$count]] = str_replace(
731 731
                                 $original_url,
732 732
                                 $datauri['full'],
733
-                                $url_src_matches[1][ $count ]
733
+                                $url_src_matches[1][$count]
734 734
                             );
735
-                            $inlined                                     = true;
735
+                            $inlined = true;
736 736
                         }
737 737
                     }
738 738
                 }
@@ -743,20 +743,20 @@  discard block
 block discarded – undo
743 743
                  * inlining isn't turned on, or if a resource is skipped from
744 744
                  * being inlined for whatever reason above.
745 745
                  */
746
-                if ( ! $inlined && ( ! empty( $this->cdn_url ) || has_filter( 'autoptimize_filter_base_replace_cdn' ) ) ) {
746
+                if (!$inlined && (!empty($this->cdn_url) || has_filter('autoptimize_filter_base_replace_cdn'))) {
747 747
                     // Just do the "simple" CDN replacement.
748
-                    $replacement_url                             = $this->url_replace_cdn( $url );
749
-                    $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
750
-                        $original_url, $replacement_url, $url_src_matches[1][ $count ]
748
+                    $replacement_url                             = $this->url_replace_cdn($url);
749
+                    $imgreplace[$url_src_matches[1][$count]] = str_replace(
750
+                        $original_url, $replacement_url, $url_src_matches[1][$count]
751 751
                     );
752 752
                 }
753 753
             }
754 754
         }
755 755
 
756
-        $code = self::replace_longest_matches_first( $code, $imgreplace );
756
+        $code = self::replace_longest_matches_first($code, $imgreplace);
757 757
 
758 758
         // Replace back font-face markers with actual font-face declarations.
759
-        $code = $this->restore_fontface( $code );
759
+        $code = $this->restore_fontface($code);
760 760
 
761 761
         return $code;
762 762
     }
@@ -766,29 +766,29 @@  discard block
 block discarded – undo
766 766
      */
767 767
     public function minify()
768 768
     {
769
-        foreach ( $this->css as $group ) {
770
-            list( $media, $css ) = $group;
771
-            if ( preg_match( '#^INLINE;#', $css ) ) {
769
+        foreach ($this->css as $group) {
770
+            list($media, $css) = $group;
771
+            if (preg_match('#^INLINE;#', $css)) {
772 772
                 // <style>.
773
-                $css      = preg_replace( '#^INLINE;#', '', $css );
774
-                $css      = self::fixurls( ABSPATH . 'index.php', $css ); // ABSPATH already contains a trailing slash.
775
-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, '' );
776
-                if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
773
+                $css      = preg_replace('#^INLINE;#', '', $css);
774
+                $css      = self::fixurls(ABSPATH.'index.php', $css); // ABSPATH already contains a trailing slash.
775
+                $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, '');
776
+                if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
777 777
                     $css                   = $tmpstyle;
778 778
                     $this->alreadyminified = true;
779 779
                 }
780 780
             } else {
781 781
                 // <link>
782
-                if ( false !== $css && file_exists( $css ) && is_readable( $css ) ) {
782
+                if (false !== $css && file_exists($css) && is_readable($css)) {
783 783
                     $css_path = $css;
784
-                    $css      = self::fixurls( $css_path, file_get_contents( $css_path ) );
785
-                    $css      = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $css );
786
-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $css_path );
787
-                    if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
784
+                    $css      = self::fixurls($css_path, file_get_contents($css_path));
785
+                    $css      = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
786
+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $css_path);
787
+                    if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
788 788
                         $css                   = $tmpstyle;
789 789
                         $this->alreadyminified = true;
790
-                    } elseif ( $this->can_inject_late( $css_path, $css ) ) {
791
-                        $css = self::build_injectlater_marker( $css_path, md5( $css ) );
790
+                    } elseif ($this->can_inject_late($css_path, $css)) {
791
+                        $css = self::build_injectlater_marker($css_path, md5($css));
792 792
                     }
793 793
                 } else {
794 794
                     // Couldn't read CSS. Maybe getpath isn't working?
@@ -796,12 +796,12 @@  discard block
 block discarded – undo
796 796
                 }
797 797
             }
798 798
 
799
-            foreach ( $media as $elem ) {
800
-                if ( ! empty( $css ) ) {
801
-                    if ( ! isset( $this->csscode[ $elem ] ) ) {
802
-                        $this->csscode[ $elem ] = '';
799
+            foreach ($media as $elem) {
800
+                if (!empty($css)) {
801
+                    if (!isset($this->csscode[$elem])) {
802
+                        $this->csscode[$elem] = '';
803 803
                     }
804
-                    $this->csscode[ $elem ] .= "\n/*FILESTART*/" . $css;
804
+                    $this->csscode[$elem] .= "\n/*FILESTART*/".$css;
805 805
                 }
806 806
             }
807 807
         }
@@ -809,133 +809,133 @@  discard block
 block discarded – undo
809 809
         // Check for duplicate code.
810 810
         $md5list = array();
811 811
         $tmpcss  = $this->csscode;
812
-        foreach ( $tmpcss as $media => $code ) {
813
-            $md5sum    = md5( $code );
812
+        foreach ($tmpcss as $media => $code) {
813
+            $md5sum    = md5($code);
814 814
             $medianame = $media;
815
-            foreach ( $md5list as $med => $sum ) {
815
+            foreach ($md5list as $med => $sum) {
816 816
                 // If same code.
817
-                if ( $sum === $md5sum ) {
817
+                if ($sum === $md5sum) {
818 818
                     // Add the merged code.
819
-                    $medianame                   = $med . ', ' . $media;
820
-                    $this->csscode[ $medianame ] = $code;
821
-                    $md5list[ $medianame ]       = $md5list[ $med ];
822
-                    unset( $this->csscode[ $med ], $this->csscode[ $media ], $md5list[ $med ] );
819
+                    $medianame                   = $med.', '.$media;
820
+                    $this->csscode[$medianame] = $code;
821
+                    $md5list[$medianame]       = $md5list[$med];
822
+                    unset($this->csscode[$med], $this->csscode[$media], $md5list[$med]);
823 823
                 }
824 824
             }
825
-            $md5list[ $medianame ] = $md5sum;
825
+            $md5list[$medianame] = $md5sum;
826 826
         }
827
-        unset( $tmpcss );
827
+        unset($tmpcss);
828 828
 
829 829
         // Manage @imports, while is for recursive import management.
830
-        foreach ( $this->csscode as &$thiscss ) {
830
+        foreach ($this->csscode as &$thiscss) {
831 831
             // Flag to trigger import reconstitution and var to hold external imports.
832 832
             $fiximports       = false;
833 833
             $external_imports = '';
834 834
 
835 835
             // remove comments to avoid importing commented-out imports.
836
-            $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
837
-            while ( preg_match_all( '#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches ) ) {
838
-                foreach ( $matches[0] as $import ) {
839
-                    if ( $this->isremovable( $import, $this->cssremovables ) ) {
840
-                        $thiscss   = str_replace( $import, '', $thiscss );
836
+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
837
+            while (preg_match_all('#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches)) {
838
+                foreach ($matches[0] as $import) {
839
+                    if ($this->isremovable($import, $this->cssremovables)) {
840
+                        $thiscss   = str_replace($import, '', $thiscss);
841 841
                         $import_ok = true;
842 842
                     } else {
843
-                        $url       = trim( preg_replace( '#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim( $import ) ), " \t\n\r\0\x0B\"'" );
844
-                        $path      = $this->getpath( $url );
843
+                        $url       = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
844
+                        $path      = $this->getpath($url);
845 845
                         $import_ok = false;
846
-                        if ( file_exists( $path ) && is_readable( $path ) ) {
847
-                            $code     = addcslashes( self::fixurls( $path, file_get_contents( $path ) ), '\\' );
848
-                            $code     = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $code );
849
-                            $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, '' );
850
-                            if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
846
+                        if (file_exists($path) && is_readable($path)) {
847
+                            $code     = addcslashes(self::fixurls($path, file_get_contents($path)), '\\');
848
+                            $code     = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
849
+                            $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, '');
850
+                            if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
851 851
                                 $code                  = $tmpstyle;
852 852
                                 $this->alreadyminified = true;
853
-                            } elseif ( $this->can_inject_late( $path, $code ) ) {
854
-                                $code = self::build_injectlater_marker( $path, md5( $code ) );
853
+                            } elseif ($this->can_inject_late($path, $code)) {
854
+                                $code = self::build_injectlater_marker($path, md5($code));
855 855
                             }
856 856
 
857
-                            if ( ! empty( $code ) ) {
858
-                                $tmp_thiscss = preg_replace( '#(/\*FILESTART\*/.*)' . preg_quote( $import, '#' ) . '#Us', '/*FILESTART2*/' . $code . '$1', $thiscss );
859
-                                if ( ! empty( $tmp_thiscss ) ) {
857
+                            if (!empty($code)) {
858
+                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
859
+                                if (!empty($tmp_thiscss)) {
860 860
                                     $thiscss   = $tmp_thiscss;
861 861
                                     $import_ok = true;
862
-                                    unset( $tmp_thiscss );
862
+                                    unset($tmp_thiscss);
863 863
                                 }
864 864
                             }
865
-                            unset( $code );
865
+                            unset($code);
866 866
                         }
867 867
                     }
868
-                    if ( ! $import_ok ) {
868
+                    if (!$import_ok) {
869 869
                         // External imports and general fall-back.
870 870
                         $external_imports .= $import;
871 871
 
872
-                        $thiscss    = str_replace( $import, '', $thiscss );
872
+                        $thiscss    = str_replace($import, '', $thiscss);
873 873
                         $fiximports = true;
874 874
                     }
875 875
                 }
876
-                $thiscss = preg_replace( '#/\*FILESTART\*/#', '', $thiscss );
877
-                $thiscss = preg_replace( '#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss );
876
+                $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
877
+                $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
878 878
 
879 879
                 // and update $thiscss_nocomments before going into next iteration in while loop.
880
-                $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
880
+                $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
881 881
             }
882
-            unset( $thiscss_nocomments );
882
+            unset($thiscss_nocomments);
883 883
 
884 884
             // Add external imports to top of aggregated CSS.
885
-            if ( $fiximports ) {
886
-                $thiscss = $external_imports . $thiscss;
885
+            if ($fiximports) {
886
+                $thiscss = $external_imports.$thiscss;
887 887
             }
888 888
         }
889
-        unset( $thiscss );
889
+        unset($thiscss);
890 890
 
891 891
         // $this->csscode has all the uncompressed code now.
892
-        foreach ( $this->csscode as &$code ) {
892
+        foreach ($this->csscode as &$code) {
893 893
             // Check for already-minified code.
894
-            $hash = md5( $code );
895
-            do_action( 'autoptimize_action_css_hash', $hash );
896
-            $ccheck = new autoptimizeCache( $hash, 'css' );
897
-            if ( $ccheck->check() ) {
894
+            $hash = md5($code);
895
+            do_action('autoptimize_action_css_hash', $hash);
896
+            $ccheck = new autoptimizeCache($hash, 'css');
897
+            if ($ccheck->check()) {
898 898
                 $code                          = $ccheck->retrieve();
899
-                $this->hashmap[ md5( $code ) ] = $hash;
899
+                $this->hashmap[md5($code)] = $hash;
900 900
                 continue;
901 901
             }
902
-            unset( $ccheck );
902
+            unset($ccheck);
903 903
 
904 904
             // Rewrite and/or inline referenced assets.
905
-            $code = $this->rewrite_assets( $code );
905
+            $code = $this->rewrite_assets($code);
906 906
 
907 907
             // Minify.
908
-            $code = $this->run_minifier_on( $code );
908
+            $code = $this->run_minifier_on($code);
909 909
 
910 910
             // Bring back INJECTLATER stuff.
911
-            $code = $this->inject_minified( $code );
911
+            $code = $this->inject_minified($code);
912 912
 
913 913
             // Filter results.
914
-            $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code );
915
-            if ( ! empty( $tmp_code ) ) {
914
+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
915
+            if (!empty($tmp_code)) {
916 916
                 $code = $tmp_code;
917
-                unset( $tmp_code );
917
+                unset($tmp_code);
918 918
             }
919 919
 
920
-            $this->hashmap[ md5( $code ) ] = $hash;
920
+            $this->hashmap[md5($code)] = $hash;
921 921
         }
922 922
 
923
-        unset( $code );
923
+        unset($code);
924 924
         return true;
925 925
     }
926 926
 
927
-    public function run_minifier_on( $code )
927
+    public function run_minifier_on($code)
928 928
     {
929
-        if ( ! $this->alreadyminified ) {
930
-            $do_minify = apply_filters( 'autoptimize_css_do_minify', true );
929
+        if (!$this->alreadyminified) {
930
+            $do_minify = apply_filters('autoptimize_css_do_minify', true);
931 931
 
932
-            if ( $do_minify ) {
932
+            if ($do_minify) {
933 933
                 $cssmin   = new autoptimizeCSSmin();
934
-                $tmp_code = trim( $cssmin->run( $code ) );
934
+                $tmp_code = trim($cssmin->run($code));
935 935
 
936
-                if ( ! empty( $tmp_code ) ) {
936
+                if (!empty($tmp_code)) {
937 937
                     $code = $tmp_code;
938
-                    unset( $tmp_code );
938
+                    unset($tmp_code);
939 939
                 }
940 940
             }
941 941
         }
@@ -949,18 +949,18 @@  discard block
 block discarded – undo
949 949
     public function cache()
950 950
     {
951 951
         // CSS cache.
952
-        foreach ( $this->csscode as $media => $code ) {
953
-            if ( empty( $code ) ) {
952
+        foreach ($this->csscode as $media => $code) {
953
+            if (empty($code)) {
954 954
                 continue;
955 955
             }
956 956
 
957
-            $md5   = $this->hashmap[ md5( $code ) ];
958
-            $cache = new autoptimizeCache( $md5, 'css' );
959
-            if ( ! $cache->check() ) {
957
+            $md5   = $this->hashmap[md5($code)];
958
+            $cache = new autoptimizeCache($md5, 'css');
959
+            if (!$cache->check()) {
960 960
                 // Cache our code.
961
-                $cache->cache( $code, 'text/css' );
961
+                $cache->cache($code, 'text/css');
962 962
             }
963
-            $this->url[ $media ] = AUTOPTIMIZE_CACHE_URL . $cache->getname();
963
+            $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();
964 964
         }
965 965
     }
966 966
 
@@ -970,95 +970,95 @@  discard block
 block discarded – undo
970 970
     public function getcontent()
971 971
     {
972 972
         // Restore the full content (only applies when "autoptimize_filter_css_justhead" filter is true).
973
-        if ( ! empty( $this->restofcontent ) ) {
973
+        if (!empty($this->restofcontent)) {
974 974
             $this->content      .= $this->restofcontent;
975 975
             $this->restofcontent = '';
976 976
         }
977 977
 
978 978
         // type is not added by default.
979 979
         $type_css = '';
980
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
980
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
981 981
             $type_css = 'type="text/css" ';
982 982
         }
983 983
 
984 984
         // Inject the new stylesheets.
985
-        $replace_tag = array( '<title', 'before' );
986
-        $replace_tag = apply_filters( 'autoptimize_filter_css_replacetag', $replace_tag, $this->content );
985
+        $replace_tag = array('<title', 'before');
986
+        $replace_tag = apply_filters('autoptimize_filter_css_replacetag', $replace_tag, $this->content);
987 987
 
988
-        if ( $this->inline ) {
989
-            foreach ( $this->csscode as $media => $code ) {
990
-                $this->inject_in_html( apply_filters( 'autoptimize_filter_css_bodyreplacementpayload', '<style ' . $type_css . 'media="' . $media . '">' . $code . '</style>' ), $replace_tag );
988
+        if ($this->inline) {
989
+            foreach ($this->csscode as $media => $code) {
990
+                $this->inject_in_html(apply_filters('autoptimize_filter_css_bodyreplacementpayload', '<style '.$type_css.'media="'.$media.'">'.$code.'</style>'), $replace_tag);
991 991
             }
992 992
         } else {
993
-            if ( $this->defer ) {
993
+            if ($this->defer) {
994 994
                 $preload_css_block  = '';
995 995
                 $inlined_ccss_block = '';
996 996
                 $noscript_css_block = '<noscript id="aonoscrcss">';
997 997
 
998 998
                 $defer_inline_code = $this->defer_inline;
999
-                if ( ! empty( $defer_inline_code ) ) {
1000
-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
1001
-                        $icss_hash  = md5( $defer_inline_code );
1002
-                        $icss_cache = new autoptimizeCache( $icss_hash, 'css' );
1003
-                        if ( $icss_cache->check() ) {
999
+                if (!empty($defer_inline_code)) {
1000
+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
1001
+                        $icss_hash  = md5($defer_inline_code);
1002
+                        $icss_cache = new autoptimizeCache($icss_hash, 'css');
1003
+                        if ($icss_cache->check()) {
1004 1004
                             // we have the optimized inline CSS in cache.
1005 1005
                             $defer_inline_code = $icss_cache->retrieve();
1006 1006
                         } else {
1007 1007
                             $cssmin   = new autoptimizeCSSmin();
1008
-                            $tmp_code = trim( $cssmin->run( $defer_inline_code ) );
1008
+                            $tmp_code = trim($cssmin->run($defer_inline_code));
1009 1009
 
1010
-                            if ( ! empty( $tmp_code ) ) {
1010
+                            if (!empty($tmp_code)) {
1011 1011
                                 $defer_inline_code = $tmp_code;
1012
-                                $icss_cache->cache( $defer_inline_code, 'text/css' );
1013
-                                unset( $tmp_code );
1012
+                                $icss_cache->cache($defer_inline_code, 'text/css');
1013
+                                unset($tmp_code);
1014 1014
                             }
1015 1015
                         }
1016 1016
                     }
1017 1017
                     // inlined critical css set here, but injected when full CSS is injected
1018 1018
                     // to avoid CSS containing SVG with <title tag receiving the full CSS link.
1019
-                    $inlined_ccss_block = '<style ' . $type_css . 'id="aoatfcss" media="all">' . $defer_inline_code . '</style>';
1019
+                    $inlined_ccss_block = '<style '.$type_css.'id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
1020 1020
                 }
1021 1021
             }
1022 1022
 
1023
-            foreach ( $this->url as $media => $url ) {
1024
-                $url = $this->url_replace_cdn( $url );
1023
+            foreach ($this->url as $media => $url) {
1024
+                $url = $this->url_replace_cdn($url);
1025 1025
 
1026 1026
                 // Add the stylesheet either deferred (import at bottom) or normal links in head.
1027
-                if ( $this->defer && 'print' !== $media ) {
1028
-                    $preload_onload = autoptimizeConfig::get_ao_css_preload_onload( $media );
1027
+                if ($this->defer && 'print' !== $media) {
1028
+                    $preload_onload = autoptimizeConfig::get_ao_css_preload_onload($media);
1029 1029
 
1030
-                    $preload_css_block .= '<link rel="stylesheet" media="print" href="' . $url . '" onload="' . $preload_onload . '" />';
1031
-                    if ( apply_filters( 'autoptimize_fitler_css_preload_and_print', false ) ) {
1032
-                        $preload_css_block = '<link rel="preload" as="stylesheet" href="' . $url . '"/>' . $preload_css_block;
1030
+                    $preload_css_block .= '<link rel="stylesheet" media="print" href="'.$url.'" onload="'.$preload_onload.'" />';
1031
+                    if (apply_filters('autoptimize_fitler_css_preload_and_print', false)) {
1032
+                        $preload_css_block = '<link rel="preload" as="stylesheet" href="'.$url.'"/>'.$preload_css_block;
1033 1033
                     }
1034
-                    $noscript_css_block .= '<link ' . $type_css . 'media="' . $media . '" href="' . $url . '" rel="stylesheet" />';
1034
+                    $noscript_css_block .= '<link '.$type_css.'media="'.$media.'" href="'.$url.'" rel="stylesheet" />';
1035 1035
                 } else {
1036
-                    if ( strlen( $this->csscode[ $media ] ) > $this->cssinlinesize ) {
1037
-                        $this->inject_in_html( apply_filters( 'autoptimize_filter_css_bodyreplacementpayload', '<link ' . $type_css . 'media="' . $media . '" href="' . $url . '" rel="stylesheet" />' ), $replace_tag );
1038
-                    } elseif ( strlen( $this->csscode[ $media ] ) > 0 ) {
1039
-                        $this->inject_in_html( apply_filters( 'autoptimize_filter_css_bodyreplacementpayload', '<style ' . $type_css . 'media="' . $media . '">' . $this->csscode[ $media ] . '</style>' ), $replace_tag );
1036
+                    if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
1037
+                        $this->inject_in_html(apply_filters('autoptimize_filter_css_bodyreplacementpayload', '<link '.$type_css.'media="'.$media.'" href="'.$url.'" rel="stylesheet" />'), $replace_tag);
1038
+                    } elseif (strlen($this->csscode[$media]) > 0) {
1039
+                        $this->inject_in_html(apply_filters('autoptimize_filter_css_bodyreplacementpayload', '<style '.$type_css.'media="'.$media.'">'.$this->csscode[$media].'</style>'), $replace_tag);
1040 1040
                     }
1041 1041
                 }
1042 1042
             }
1043 1043
 
1044
-            if ( $this->defer ) {
1044
+            if ($this->defer) {
1045 1045
                 $noscript_css_block .= '</noscript>';
1046 1046
                 // Inject inline critical CSS, the preloaded full CSS and the noscript-CSS.
1047
-                $this->inject_in_html( apply_filters( 'autoptimize_filter_css_bodyreplacementpayload', $inlined_ccss_block . $preload_css_block . $noscript_css_block ), $replace_tag );
1047
+                $this->inject_in_html(apply_filters('autoptimize_filter_css_bodyreplacementpayload', $inlined_ccss_block.$preload_css_block.$noscript_css_block), $replace_tag);
1048 1048
             }
1049 1049
         }
1050 1050
 
1051 1051
         // restore comments.
1052
-        $this->content = $this->restore_comments( $this->content );
1052
+        $this->content = $this->restore_comments($this->content);
1053 1053
 
1054 1054
         // restore IE hacks.
1055
-        $this->content = $this->restore_iehacks( $this->content );
1055
+        $this->content = $this->restore_iehacks($this->content);
1056 1056
 
1057 1057
         // restore (no)script.
1058
-        $this->content = $this->restore_marked_content( 'SCRIPT', $this->content );
1058
+        $this->content = $this->restore_marked_content('SCRIPT', $this->content);
1059 1059
 
1060 1060
         // Restore noptimize.
1061
-        $this->content = $this->restore_noptimize( $this->content );
1061
+        $this->content = $this->restore_noptimize($this->content);
1062 1062
 
1063 1063
         // Return the modified stylesheet.
1064 1064
         return $this->content;
@@ -1070,44 +1070,44 @@  discard block
 block discarded – undo
1070 1070
      * @param string $file filename of optimized CSS-file.
1071 1071
      * @param string $code CSS-code in which to fix URL's.
1072 1072
      */
1073
-    static function fixurls( $file, $code )
1073
+    static function fixurls($file, $code)
1074 1074
     {
1075 1075
         // Switch all imports to the url() syntax.
1076
-        $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code );
1076
+        $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code);
1077 1077
 
1078
-        if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
1079
-            $file = str_replace( WP_ROOT_DIR, '/', $file );
1078
+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
1079
+            $file = str_replace(WP_ROOT_DIR, '/', $file);
1080 1080
             /**
1081 1081
              * Rollback as per https://github.com/futtta/autoptimize/issues/94
1082 1082
              * $file = str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', $file );
1083 1083
              */
1084
-            $dir = dirname( $file ); // Like /themes/expound/css.
1084
+            $dir = dirname($file); // Like /themes/expound/css.
1085 1085
 
1086 1086
             /**
1087 1087
              * $dir should not contain backslashes, since it's used to replace
1088 1088
              * urls, but it can contain them when running on Windows because
1089 1089
              * fixurls() is sometimes called with `ABSPATH . 'index.php'`
1090 1090
              */
1091
-            $dir = str_replace( '\\', '/', $dir );
1092
-            unset( $file ); // not used below at all.
1091
+            $dir = str_replace('\\', '/', $dir);
1092
+            unset($file); // not used below at all.
1093 1093
 
1094 1094
             $replace = array();
1095
-            foreach ( $matches[1] as $k => $url ) {
1095
+            foreach ($matches[1] as $k => $url) {
1096 1096
                 // Remove quotes.
1097
-                $url      = trim( $url, " \t\n\r\0\x0B\"'" );
1098
-                $no_q_url = trim( $url, "\"'" );
1099
-                if ( $url !== $no_q_url ) {
1097
+                $url      = trim($url, " \t\n\r\0\x0B\"'");
1098
+                $no_q_url = trim($url, "\"'");
1099
+                if ($url !== $no_q_url) {
1100 1100
                     $removed_quotes = true;
1101 1101
                 } else {
1102 1102
                     $removed_quotes = false;
1103 1103
                 }
1104 1104
 
1105
-                if ( '' === $no_q_url ) {
1105
+                if ('' === $no_q_url) {
1106 1106
                     continue;
1107 1107
                 }
1108 1108
 
1109 1109
                 $url = $no_q_url;
1110
-                if ( '/' === $url[0] || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {
1110
+                if ('/' === $url[0] || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
1111 1111
                     // URL is protocol-relative, host-relative or something we don't touch.
1112 1112
                     continue;
1113 1113
                 } else { // Relative URL.
@@ -1116,49 +1116,49 @@  discard block
 block discarded – undo
1116 1116
                      * rollback as per https://github.com/futtta/autoptimize/issues/94
1117 1117
                      * $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_CONTENT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
1118 1118
                      */
1119
-                    $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
1120
-                    $newurl = apply_filters( 'autoptimize_filter_css_fixurl_newurl', $newurl );
1119
+                    $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
1120
+                    $newurl = apply_filters('autoptimize_filter_css_fixurl_newurl', $newurl);
1121 1121
 
1122 1122
                     /**
1123 1123
                      * Hash the url + whatever was behind potentially for replacement
1124 1124
                      * We must do this, or different css classes referencing the same bg image (but
1125 1125
                      * different parts of it, say, in sprites and such) loose their stuff...
1126 1126
                      */
1127
-                    $hash = md5( $url . $matches[2][ $k ] );
1128
-                    $code = str_replace( $matches[0][ $k ], $hash, $code );
1127
+                    $hash = md5($url.$matches[2][$k]);
1128
+                    $code = str_replace($matches[0][$k], $hash, $code);
1129 1129
 
1130
-                    if ( $removed_quotes ) {
1131
-                        $replace[ $hash ] = "url('" . $newurl . "')" . $matches[2][ $k ];
1130
+                    if ($removed_quotes) {
1131
+                        $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
1132 1132
                     } else {
1133
-                        $replace[ $hash ] = 'url(' . $newurl . ')' . $matches[2][ $k ];
1133
+                        $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
1134 1134
                     }
1135 1135
                 }
1136 1136
             }
1137 1137
 
1138
-            $code = self::replace_longest_matches_first( $code, $replace );
1138
+            $code = self::replace_longest_matches_first($code, $replace);
1139 1139
         }
1140 1140
 
1141 1141
         return $code;
1142 1142
     }
1143 1143
 
1144
-    private function ismovable( $tag )
1144
+    private function ismovable($tag)
1145 1145
     {
1146
-        if ( ! $this->aggregate ) {
1146
+        if (!$this->aggregate) {
1147 1147
             return false;
1148 1148
         }
1149 1149
 
1150
-        if ( ! empty( $this->allowlist ) ) {
1151
-            foreach ( $this->allowlist as $match ) {
1152
-                if ( false !== strpos( $tag, $match ) ) {
1150
+        if (!empty($this->allowlist)) {
1151
+            foreach ($this->allowlist as $match) {
1152
+                if (false !== strpos($tag, $match)) {
1153 1153
                     return true;
1154 1154
                 }
1155 1155
             }
1156 1156
             // no match with allowlist.
1157 1157
             return false;
1158 1158
         } else {
1159
-            if ( is_array( $this->dontmove ) && ! empty( $this->dontmove ) ) {
1160
-                foreach ( $this->dontmove as $match ) {
1161
-                    if ( false !== strpos( $tag, $match ) ) {
1159
+            if (is_array($this->dontmove) && !empty($this->dontmove)) {
1160
+                foreach ($this->dontmove as $match) {
1161
+                    if (false !== strpos($tag, $match)) {
1162 1162
                         // Matched something.
1163 1163
                         return false;
1164 1164
                     }
@@ -1170,22 +1170,22 @@  discard block
 block discarded – undo
1170 1170
         }
1171 1171
     }
1172 1172
 
1173
-    private function can_inject_late( $css_path, $css )
1173
+    private function can_inject_late($css_path, $css)
1174 1174
     {
1175
-        $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $css_path );
1176
-        if ( true !== $this->inject_min_late ) {
1175
+        $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $css_path);
1176
+        if (true !== $this->inject_min_late) {
1177 1177
             // late-inject turned off.
1178 1178
             return false;
1179
-        } elseif ( ( false === strpos( $css_path, 'min.css' ) ) && ( str_replace( $consider_minified_array, '', $css_path ) === $css_path ) ) {
1179
+        } elseif ((false === strpos($css_path, 'min.css')) && (str_replace($consider_minified_array, '', $css_path) === $css_path)) {
1180 1180
             // file not minified based on filename & filter.
1181 1181
             return false;
1182
-        } elseif ( false !== strpos( $css, '@import' ) ) {
1182
+        } elseif (false !== strpos($css, '@import')) {
1183 1183
             // can't late-inject files with imports as those need to be aggregated.
1184 1184
             return false;
1185
-        } elseif ( ( false !== strpos( $css, '@font-face' ) ) && ( apply_filters( 'autoptimize_filter_css_fonts_cdn', false ) === true ) && ( ! empty( $this->cdn_url ) ) ) {
1185
+        } elseif ((false !== strpos($css, '@font-face')) && (apply_filters('autoptimize_filter_css_fonts_cdn', false) === true) && (!empty($this->cdn_url))) {
1186 1186
             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed.
1187 1187
             return false;
1188
-        } elseif ( ( ( true == $this->datauris ) || ( ! empty( $this->cdn_url ) ) ) && preg_match( '#background[^;}]*url\(#Ui', $css ) ) {
1188
+        } elseif (((true == $this->datauris) || (!empty($this->cdn_url))) && preg_match('#background[^;}]*url\(#Ui', $css)) {
1189 1189
             // don't late-inject CSS with images if CDN is set OR if image inlining is on.
1190 1190
             return false;
1191 1191
         } else {
@@ -1203,44 +1203,44 @@  discard block
 block discarded – undo
1203 1203
      *
1204 1204
      * @return bool|string Url pointing to the minified css file or false.
1205 1205
      */
1206
-    public function minify_single( $filepath, $cache_miss = false )
1206
+    public function minify_single($filepath, $cache_miss = false)
1207 1207
     {
1208
-        $contents = $this->prepare_minify_single( $filepath );
1208
+        $contents = $this->prepare_minify_single($filepath);
1209 1209
 
1210
-        if ( empty( $contents ) ) {
1210
+        if (empty($contents)) {
1211 1211
             return false;
1212 1212
         }
1213 1213
 
1214 1214
         // Check cache.
1215
-        $hash  = 'single_' . md5( $contents );
1216
-        $cache = new autoptimizeCache( $hash, 'css' );
1217
-        do_action( 'autoptimize_action_css_hash', $hash );
1215
+        $hash  = 'single_'.md5($contents);
1216
+        $cache = new autoptimizeCache($hash, 'css');
1217
+        do_action('autoptimize_action_css_hash', $hash);
1218 1218
 
1219 1219
         // If not in cache already, minify...
1220
-        if ( ! $cache->check() || $cache_miss ) {
1220
+        if (!$cache->check() || $cache_miss) {
1221 1221
             // Fixurls...
1222
-            $contents = self::fixurls( $filepath, $contents );
1222
+            $contents = self::fixurls($filepath, $contents);
1223 1223
             // CDN-replace any referenced assets if needed...
1224
-            $contents = $this->hide_fontface_and_maybe_cdn( $contents );
1225
-            $contents = $this->replace_urls( $contents );
1226
-            $contents = $this->restore_fontface( $contents );
1224
+            $contents = $this->hide_fontface_and_maybe_cdn($contents);
1225
+            $contents = $this->replace_urls($contents);
1226
+            $contents = $this->restore_fontface($contents);
1227 1227
             // Now minify...
1228 1228
             $cssmin   = new autoptimizeCSSmin();
1229
-            $contents = trim( $cssmin->run( $contents ) );
1229
+            $contents = trim($cssmin->run($contents));
1230 1230
 
1231 1231
             // Check if minified cache content is empty.
1232
-            if ( empty( $contents ) ) {
1232
+            if (empty($contents)) {
1233 1233
                 return false;
1234 1234
             }
1235 1235
 
1236 1236
             // Filter contents of excluded minified CSS.
1237
-            $contents = apply_filters( 'autoptimize_filter_css_single_after_minify', $contents );
1237
+            $contents = apply_filters('autoptimize_filter_css_single_after_minify', $contents);
1238 1238
 
1239 1239
             // Store in cache.
1240
-            $cache->cache( $contents, 'text/css' );
1240
+            $cache->cache($contents, 'text/css');
1241 1241
         }
1242 1242
 
1243
-        $url = $this->build_minify_single_url( $cache );
1243
+        $url = $this->build_minify_single_url($cache);
1244 1244
 
1245 1245
         return $url;
1246 1246
     }
@@ -1260,20 +1260,20 @@  discard block
 block discarded – undo
1260 1260
         return $this->options;
1261 1261
     }
1262 1262
 
1263
-    public function replaceOptions( $options )
1263
+    public function replaceOptions($options)
1264 1264
     {
1265 1265
         $this->options = $options;
1266 1266
     }
1267 1267
 
1268
-    public function setOption( $name, $value )
1268
+    public function setOption($name, $value)
1269 1269
     {
1270
-        $this->options[ $name ] = $value;
1270
+        $this->options[$name] = $value;
1271 1271
         $this->$name            = $value;
1272 1272
     }
1273 1273
 
1274
-    public function getOption( $name )
1274
+    public function getOption($name)
1275 1275
     {
1276
-        return $this->options[ $name ];
1276
+        return $this->options[$name];
1277 1277
     }
1278 1278
 
1279 1279
     /**
@@ -1287,11 +1287,11 @@  discard block
 block discarded – undo
1287 1287
      * @param string $css the to be sanitized CSS
1288 1288
      * @return string sanitized CSS.
1289 1289
      */
1290
-    public static function sanitize_css( $css )
1290
+    public static function sanitize_css($css)
1291 1291
     {
1292
-        $css = strip_tags( $css );
1293
-        if ( strpos( $css, '<' ) !== false ) {
1294
-            $css = preg_replace( '#<(\/?\w+)#', '\00003C$1', $css );
1292
+        $css = strip_tags($css);
1293
+        if (strpos($css, '<') !== false) {
1294
+            $css = preg_replace('#<(\/?\w+)#', '\00003C$1', $css);
1295 1295
         }
1296 1296
         return $css;
1297 1297
     }
Please login to merge, or discard this patch.
classes/critcss-inc/admin_settings_impexp.js.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,15 +9,15 @@  discard block
 block discarded – undo
9 9
     console.log('Exporting...');
10 10
     var data = {
11 11
         'action': 'ao_ccss_export',
12
-        'ao_ccss_export_nonce': '<?php echo wp_create_nonce( 'ao_ccss_export_nonce' ); ?>',
12
+        'ao_ccss_export_nonce': '<?php echo wp_create_nonce('ao_ccss_export_nonce'); ?>',
13 13
     };
14 14
 
15 15
     jQuery.post(ajaxurl, data, function(response) {
16 16
         response_array=JSON.parse(response);
17 17
         if (response_array['code'] == 200) {
18 18
             <?php
19
-            if ( is_multisite() ) {
20
-                $blog_id = '/' . get_current_blog_id() . '/';
19
+            if (is_multisite()) {
20
+                $blog_id = '/'.get_current_blog_id().'/';
21 21
             } else {
22 22
                 $blog_id = '/';
23 23
             }
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
             autoOpen: true,
33 33
             height: 210,
34 34
             width: 700,
35
-            title: "<?php _e( 'Export settings result', 'autoptimize' ); ?>",
35
+            title: "<?php _e('Export settings result', 'autoptimize'); ?>",
36 36
             modal: true,
37 37
             buttons: {
38 38
                 OK: function() {
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     var settings_file = file[0].files[0];
51 51
     fd.append('file', settings_file);
52 52
     fd.append('action', 'ao_ccss_import');
53
-    fd.append('ao_ccss_import_nonce', '<?php echo wp_create_nonce( 'ao_ccss_import_nonce' ); ?>');
53
+    fd.append('ao_ccss_import_nonce', '<?php echo wp_create_nonce('ao_ccss_import_nonce'); ?>');
54 54
 
55 55
     jQuery.ajax({
56 56
         url: ajaxurl,
Please login to merge, or discard this patch.
classes/critcss-inc/admin_settings_debug.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 $ao_options = $wpdb->get_results('
11 11
   SELECT option_name  AS name,
12 12
          option_value AS value
13
-  FROM ' . $wpdb->options . '
13
+  FROM ' . $wpdb->options.'
14 14
   WHERE option_name LIKE "autoptimize_%%"
15 15
   ORDER BY name
16 16
 ', ARRAY_A);
@@ -19,27 +19,27 @@  discard block
 block discarded – undo
19 19
 $ao_trans = $wpdb->get_results('
20 20
   SELECT option_name  AS name,
21 21
          option_value AS value
22
-  FROM ' . $wpdb->options . '
22
+  FROM ' . $wpdb->options.'
23 23
   WHERE option_name LIKE "_transient_autoptimize_%%"
24 24
      OR option_name LIKE "_transient_timeout_autoptimize_%%"
25 25
 ', ARRAY_A);
26 26
 
27 27
 // Render debug panel if there's something to show.
28
-if ( $ao_options || $ao_trans ) {
28
+if ($ao_options || $ao_trans) {
29 29
 ?>
30 30
 <!-- BEGIN: Settings Debug -->
31 31
 <ul>
32 32
     <li class="itemDetail">
33
-        <h2 class="itemTitle"><?php _e( 'Debug Information', 'autoptimize' ); ?></h2>
33
+        <h2 class="itemTitle"><?php _e('Debug Information', 'autoptimize'); ?></h2>
34 34
 
35 35
         <?php
36 36
         // Render options.
37
-        if ( $ao_options ) {
37
+        if ($ao_options) {
38 38
         ?>
39
-            <h4><?php _e( 'Options', 'autoptimize' ); ?>:</h4>
39
+            <h4><?php _e('Options', 'autoptimize'); ?>:</h4>
40 40
             <table class="form-table debug">
41 41
             <?php
42
-            foreach ( $ao_options as $option ) {
42
+            foreach ($ao_options as $option) {
43 43
             ?>
44 44
                 <tr>
45 45
                     <th scope="row">
@@ -47,10 +47,10 @@  discard block
 block discarded – undo
47 47
                     </th>
48 48
                     <td>
49 49
                         <?php
50
-                        if ( 'autoptimize_ccss_queue' == $option['name'] || 'autoptimize_ccss_rules' == $option['name'] ) {
51
-                            $value = print_r( json_decode( $option['value'], true ), true );
52
-                            if ( $value ) {
53
-                                echo "Raw JSON:\n<pre>" . $option['value'] . "</pre>\n\nDecoded JSON:\n<pre>" . $value . '</pre>';
50
+                        if ('autoptimize_ccss_queue' == $option['name'] || 'autoptimize_ccss_rules' == $option['name']) {
51
+                            $value = print_r(json_decode($option['value'], true), true);
52
+                            if ($value) {
53
+                                echo "Raw JSON:\n<pre>".$option['value']."</pre>\n\nDecoded JSON:\n<pre>".$value.'</pre>';
54 54
                             } else {
55 55
                                 echo 'Empty';
56 56
                             }
@@ -69,11 +69,11 @@  discard block
 block discarded – undo
69 69
         }
70 70
         // Render WP-Cron intervals and scheduled events.
71 71
         ?>
72
-        <h4><?php _e( 'WP-Cron Intervals', 'autoptimize' ); ?>:</h4>
73
-        <pre><?php print_r( wp_get_schedules() ); ?></pre>
72
+        <h4><?php _e('WP-Cron Intervals', 'autoptimize'); ?>:</h4>
73
+        <pre><?php print_r(wp_get_schedules()); ?></pre>
74 74
         <hr />
75
-        <h4><?php _e( 'WP-Cron Scheduled Events', 'autoptimize' ); ?>:</h4>
76
-        <pre><?php print_r( _get_cron_array() ); ?></pre>
75
+        <h4><?php _e('WP-Cron Scheduled Events', 'autoptimize'); ?>:</h4>
76
+        <pre><?php print_r(_get_cron_array()); ?></pre>
77 77
     </li>
78 78
 </ul>
79 79
 <!-- END: Settings Debug -->
Please login to merge, or discard this patch.
classes/critcss-inc/admin_settings_queue.js.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
                                 "empty" :
21 21
                                 aoCssQueue;
22 22
         <?php
23
-        if ( $ao_ccss_debug ) {
23
+        if ($ao_ccss_debug) {
24 24
             echo "console.log( 'Queue Object:', aoCssQueueLog );\n";
25 25
         }
26 26
         ?>
@@ -62,34 +62,34 @@  discard block
 block discarded – undo
62 62
             // Status: NEW (N, sort order 1)
63 63
             status      = '<span class="hidden">1</span>N';
64 64
             statusClass = 'new';
65
-            title       = '<?php _e( 'New', 'autoptimize' ); ?> (' + ljid + ')';
66
-            buttons     = '<?php _e( 'None', 'autoptimize' ); ?>';
65
+            title       = '<?php _e('New', 'autoptimize'); ?> (' + ljid + ')';
66
+            buttons     = '<?php _e('None', 'autoptimize'); ?>';
67 67
         } else if (keys.jqstat === 'JOB_QUEUED' || keys.jqstat === 'JOB_ONGOING') {
68 68
             // Status: PENDING (P, sort order 2)
69 69
             status      = '<span class="hidden">2</span>P';
70 70
             statusClass = 'pending';
71
-            title       = '<?php _e( 'PENDING', 'autoptimize' ); ?> (' + ljid + ')';
72
-            buttons     = '<?php _e( 'None', 'autoptimize' ); ?>';
71
+            title       = '<?php _e('PENDING', 'autoptimize'); ?> (' + ljid + ')';
72
+            buttons     = '<?php _e('None', 'autoptimize'); ?>';
73 73
         } else if (keys.jqstat === 'JOB_DONE' && keys.jrstat === 'GOOD' && (keys.jvstat === 'WARN' || keys.jvstat === 'BAD')) {
74 74
             // Status: REVIEW (R, sort order 5)
75 75
             status      = '<span class="hidden">5</span>R';
76 76
             statusClass = 'review';
77
-            title       = "<?php _e( 'REVIEW', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
78
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span>';
77
+            title       = "<?php _e('REVIEW', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
78
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span>';
79 79
             dbtn        = true;
80 80
         } else if (keys.jqstat === 'JOB_DONE') {
81 81
             // Status: DONE (D, sort order 6)
82 82
             status      = '<span class="hidden">6</span>D';
83 83
             statusClass = 'done';
84
-            title       = '<?php _e( 'DONE', 'autoptimize' ); ?> (' + ljid + ')';
85
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span>';
84
+            title       = '<?php _e('DONE', 'autoptimize'); ?> (' + ljid + ')';
85
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span>';
86 86
             dbtn        = true;
87 87
         } else if (keys.jqstat === 'JOB_FAILED' || keys.jqstat === 'STATUS_JOB_BAD' || keys.jqstat === 'INVALID_JWT_TOKEN' || keys.jqstat === 'NO_CSS' || keys.jqstat === 'NO_RESPONSE') {
88 88
         // Status: ERROR (E, sort order 4)
89 89
             status      = '<span class="hidden">4</span>E';
90 90
             statusClass = 'error';
91
-            title       = "<?php _e( 'ERROR', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
92
-            buttons     = '<span class="button-secondary" id="' + ljid + '_retry" title="<?php _e( 'Retry Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-update"></span></span><span class="button-secondary to-right" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e( 'Get Help', 'autoptimize' ); ?>"><span class="dashicons dashicons-sos"></span></span>';
91
+            title       = "<?php _e('ERROR', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
92
+            buttons     = '<span class="button-secondary" id="' + ljid + '_retry" title="<?php _e('Retry Job', 'autoptimize'); ?>"><span class="dashicons dashicons-update"></span></span><span class="button-secondary to-right" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e('Get Help', 'autoptimize'); ?>"><span class="dashicons dashicons-sos"></span></span>';
93 93
             rbtn        = true;
94 94
             dbtn        = true;
95 95
             hbtn        = true;
@@ -97,21 +97,21 @@  discard block
 block discarded – undo
97 97
             // Status: UNKNOWN (U, sort order 5)
98 98
             status      = '<span class="hidden">5</span>U';
99 99
             statusClass = 'unknown';
100
-            title       = "<?php _e( 'UNKNOWN', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
101
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e( 'Get Help', 'autoptimize' ); ?>"><span class="dashicons dashicons-sos"></span></span>';
100
+            title       = "<?php _e('UNKNOWN', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
101
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e('Get Help', 'autoptimize'); ?>"><span class="dashicons dashicons-sos"></span></span>';
102 102
             dbtn        = true;
103 103
             hbtn        = true;
104 104
         }
105 105
 
106 106
         // Prepare job finish time
107 107
         if (keys.jftime === null) {
108
-            ftime = '<?php _e( 'N/A', 'autoptimize' ); ?>';
108
+            ftime = '<?php _e('N/A', 'autoptimize'); ?>';
109 109
         } else {
110 110
             ftime = EpochToDate(keys.jftime);
111 111
         }
112 112
 
113 113
         // Append job entry
114
-        jQuery("#queue").append("<tr id='" + ljid + "' class='job " + statusClass + "'><td class='status'><span class='badge " + statusClass + "' title='<?php _e( 'Job status is ', 'autoptimize' ); ?>" + title + "'>" + status + "</span></td><td>" + target.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + path + "</td><td>" + type.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + ctime + "</td><td>" + ftime + "</td><td class='btn'>" + buttons + "</td></tr>");
114
+        jQuery("#queue").append("<tr id='" + ljid + "' class='job " + statusClass + "'><td class='status'><span class='badge " + statusClass + "' title='<?php _e('Job status is ', 'autoptimize'); ?>" + title + "'>" + status + "</span></td><td>" + target.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + path + "</td><td>" + type.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + ctime + "</td><td>" + ftime + "</td><td class='btn'>" + buttons + "</td></tr>");
115 115
 
116 116
         // Attach button actions
117 117
         if (rbtn) {
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
         height: 180,
135 135
         modal: true,
136 136
         buttons: {
137
-            "<?php _e( 'Delete', 'autoptimize' ); ?>": function() {
137
+            "<?php _e('Delete', 'autoptimize'); ?>": function() {
138 138
                 delete queue[jpath];
139 139
                 updateQueue(queue);
140 140
                 jQuery(this).dialog('close' );
141 141
             },
142
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
142
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
143 143
                 jQuery(this).dialog('close' );
144 144
             }
145 145
         }
@@ -152,12 +152,12 @@  discard block
 block discarded – undo
152 152
         height:235,
153 153
         modal: true,
154 154
         buttons: {
155
-            "<?php _e( 'Delete all jobs?', 'autoptimize' ); ?>": function() {
155
+            "<?php _e('Delete all jobs?', 'autoptimize'); ?>": function() {
156 156
                 queue=[];
157 157
                 updateQueue(queue);
158 158
                 jQuery( this ).dialog( "close" );
159 159
             },
160
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
160
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
161 161
                 jQuery( this ).dialog( "close" );
162 162
             }
163 163
         }
@@ -172,9 +172,9 @@  discard block
 block discarded – undo
172 172
         height: 180,
173 173
         modal: true,
174 174
         buttons: {
175
-            "<?php _e( 'Retry', 'autoptimize' ); ?>": function() {
175
+            "<?php _e('Retry', 'autoptimize'); ?>": function() {
176 176
                 <?php
177
-                if ( $ao_ccss_debug ) {
177
+                if ($ao_ccss_debug) {
178 178
                     echo "console.log( 'SHOULD retry job:', jid[0], jpath );\n";
179 179
                 }
180 180
                 ?>
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
                 updateQueue(queue);
188 188
                 jQuery(this).dialog('close' );
189 189
             },
190
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
190
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
191 191
                 jQuery(this).dialog('close' );
192 192
             }
193 193
         }
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
     jQuery('#unSavedWarning').show();
202 202
     document.getElementById('ao_title_and_button').scrollIntoView();  
203 203
     <?php
204
-    if ( $ao_ccss_debug ) {
204
+    if ($ao_ccss_debug) {
205 205
         echo "console.log('Updated Queue Object:', queue);\n";
206 206
     }
207 207
     ?>
Please login to merge, or discard this patch.
classes/critcss-inc/admin_settings_rules.js.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Outputs JS code for the rules panel.
4 4
  */
5 5
 
6
-if ( $ao_ccss_debug ) {
6
+if ($ao_ccss_debug) {
7 7
     echo "console.log('[WARN] Autoptimize CriticalCSS Power-Up is in DEBUG MODE!');\n";
8 8
     echo "console.log('[WARN] Avoid using debug mode on production/live environments unless for ad-hoc troubleshooting purposes and make sure to disable it after!');\n";
9 9
 }
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
     jQuery(document).ready(function() {
24 24
         critCssArray=JSON.parse(document.getElementById("critCssOrigin").value);
25 25
         <?php
26
-        if ( $ao_ccss_debug ) {
26
+        if ($ao_ccss_debug) {
27 27
             echo "console.log('Rules Object:', critCssArray);\n";
28 28
         }
29 29
         ?>
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
     jQuery("#rules-list").empty();
40 40
     jQuery.each(critCssArray,function(k,v) {
41 41
         if (k=="paths") {
42
-            kstring="<?php _e( 'Path Based Rules', 'autoptimize' ); ?>";
42
+            kstring="<?php _e('Path Based Rules', 'autoptimize'); ?>";
43 43
         } else {
44
-            kstring="<?php _e( 'Conditional Tags, Custom Post Types and Page Templates Rules', 'autoptimize' ); ?>";
44
+            kstring="<?php _e('Conditional Tags, Custom Post Types and Page Templates Rules', 'autoptimize'); ?>";
45 45
         }
46 46
         if (!(jQuery.isEmptyObject(v))) {
47 47
             jQuery("#rules-list").append("<tr><td colspan='5'><h4>" + kstring + "</h4></td></tr>");
48
-            jQuery("#rules-list").append("<tr class='header "+k+"Rule'><th><?php _e( 'Type', 'autoptimize' ); ?></th><th><?php _e( 'Target', 'autoptimize' ); ?></th><th><?php _e( 'Critical CSS File', 'autoptimize' ); ?></th><th colspan='2'><?php _e( 'Actions', 'autoptimize' ); ?></th></tr>");
48
+            jQuery("#rules-list").append("<tr class='header "+k+"Rule'><th><?php _e('Type', 'autoptimize'); ?></th><th><?php _e('Target', 'autoptimize'); ?></th><th><?php _e('Critical CSS File', 'autoptimize'); ?></th><th colspan='2'><?php _e('Actions', 'autoptimize'); ?></th></tr>");
49 49
         }
50 50
         nodeNumber=0;
51 51
         jQuery.each(v,function(i,nv){
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
             file=nv.file;
56 56
             filest=nv.file;
57 57
             if (file == 0) {
58
-                file='<?php _e( 'To be fetched from criticalcss.com in the next queue run...', 'autoptimize' ); ?>';
58
+                file='<?php _e('To be fetched from criticalcss.com in the next queue run...', 'autoptimize'); ?>';
59 59
             }
60 60
             if (nv.hash === 0 && filest != 0) {
61
-                type='<?php _e( 'MANUAL', 'autoptimize' ); ?>';
61
+                type='<?php _e('MANUAL', 'autoptimize'); ?>';
62 62
                 typeClass = 'manual';
63 63
             } else {
64
-                type='<?php _e( 'AUTO', 'autoptimize' ); ?>';
64
+                type='<?php _e('AUTO', 'autoptimize'); ?>';
65 65
                 typeClass = 'auto';
66 66
             }
67 67
             if (file && typeof file == 'string') {
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
             } else {
78 78
                 target = i.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'');
79 79
             }
80
-            jQuery("#rules-list").append("<tr class='rule "+k+"Rule'><td class='type'><span class='badge " + typeClass + "'>" + type + "</span>" + rmark + "</td><td class='target'>" + target + "</td><td class='file'>" + file + "</td><td class='btn edit'><span class=\"button-secondary\" id=\"" + nodeId + "_edit\"><?php _e( 'Edit', 'autoptimize' ); ?></span></td><td class='btn delete'><span class=\"button-secondary\" id=\"" + nodeId + "_remove\"><?php _e( 'Remove', 'autoptimize' ); ?></span></td></tr>");
80
+            jQuery("#rules-list").append("<tr class='rule "+k+"Rule'><td class='type'><span class='badge " + typeClass + "'>" + type + "</span>" + rmark + "</td><td class='target'>" + target + "</td><td class='file'>" + file + "</td><td class='btn edit'><span class=\"button-secondary\" id=\"" + nodeId + "_edit\"><?php _e('Edit', 'autoptimize'); ?></span></td><td class='btn delete'><span class=\"button-secondary\" id=\"" + nodeId + "_remove\"><?php _e('Remove', 'autoptimize'); ?></span></td></tr>");
81 81
             jQuery("#" + nodeId + "_edit").click(function(){addEditRow(this.id);});
82 82
             jQuery("#" + nodeId + "_remove").click(function(){confirmRemove(this.id);});
83 83
         })
@@ -90,12 +90,12 @@  discard block
 block discarded – undo
90 90
         height:235,
91 91
         modal: true,
92 92
         buttons: {
93
-            "<?php _e( 'Delete', 'autoptimize' ); ?>": function() {
93
+            "<?php _e('Delete', 'autoptimize'); ?>": function() {
94 94
                 removeRow(idToRemove);
95 95
                 updateAfterChange();
96 96
                 jQuery( this ).dialog( "close" );
97 97
             },
98
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
98
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
99 99
                 jQuery( this ).dialog( "close" );
100 100
             }
101 101
         }
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
         height:235,
109 109
         modal: true,
110 110
         buttons: {
111
-            "<?php _e( 'Delete All', 'autoptimize' ); ?>": function() {
111
+            "<?php _e('Delete All', 'autoptimize'); ?>": function() {
112 112
                 critCssArray={'paths':[],'types':[]};
113 113
                 drawTable(critCssArray);
114 114
                 updateAfterChange();
115 115
                 removeAllCcssFilesOnServer();
116 116
                 jQuery( this ).dialog( "close" );
117 117
             },
118
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
118
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
119 119
                 jQuery( this ).dialog( "close" );
120 120
             }
121 121
         }
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
     var data = {
134 134
         'action': 'rm_critcss',
135
-        'critcss_rm_nonce': '<?php echo wp_create_nonce( 'rm_critcss_nonce' ); ?>',
135
+        'critcss_rm_nonce': '<?php echo wp_create_nonce('rm_critcss_nonce'); ?>',
136 136
         'cachebustingtimestamp': new Date().getTime(),
137 137
         'critcssfile': crit_file
138 138
     };
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 function removeAllCcssFilesOnServer() {
154 154
     var data = {
155 155
         'action': 'rm_critcss_all',
156
-        'critcss_rm_all_nonce': '<?php echo wp_create_nonce( 'rm_critcss_all_nonce' ); ?>',
156
+        'critcss_rm_all_nonce': '<?php echo wp_create_nonce('rm_critcss_all_nonce'); ?>',
157 157
         'cachebustingtimestamp': new Date().getTime()
158 158
     };
159 159
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 function addEditRow(idToEdit) {
174 174
     resetForm();
175 175
     if (idToEdit) {
176
-        dialogTitle="<?php _e( 'Edit Critical CSS Rule', 'autoptimize' ); ?>";
176
+        dialogTitle="<?php _e('Edit Critical CSS Rule', 'autoptimize'); ?>";
177 177
 
178 178
         splits=idToEdit.split(/_/);
179 179
         crit_type=splits[0];
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
         jQuery("#critcss_addedit_id").val(idToEdit);
185 185
         jQuery("#critcss_addedit_type").val(crit_type);
186 186
         jQuery("#critcss_addedit_file").val(crit_file);
187
-        jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'Loading critical CSS...', 'autoptimize' ); ?>");
187
+        jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('Loading critical CSS...', 'autoptimize'); ?>");
188 188
         jQuery("#critcss_addedit_type").attr("disabled",true);
189 189
 
190 190
         if (crit_type==="paths") {
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 
200 200
         var data = {
201 201
             'action': 'fetch_critcss',
202
-            'critcss_fetch_nonce': '<?php echo wp_create_nonce( 'fetch_critcss_nonce' ); ?>',
202
+            'critcss_fetch_nonce': '<?php echo wp_create_nonce('fetch_critcss_nonce'); ?>',
203 203
             'cachebustingtimestamp': new Date().getTime(),
204 204
             'critcssfile': crit_file
205 205
         };
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
             }
214 214
         });
215 215
     } else {
216
-        dialogTitle="<?php _e( 'Add Critical CSS Rule', 'autotimize' ); ?>";
216
+        dialogTitle="<?php _e('Add Critical CSS Rule', 'autotimize'); ?>";
217 217
 
218 218
         // default: paths, hide content type field
219 219
         jQuery("#critcss_addedit_type").val("paths");
@@ -224,11 +224,11 @@  discard block
 block discarded – undo
224 224
             if(this.value==="types") {
225 225
                 jQuery("#critcss_addedit_pagetype_wrapper").show();
226 226
                 jQuery("#critcss_addedit_path_wrapper").hide();
227
-                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For type based rules, paste your specific and minified critical CSS here and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\".', 'autoptimize' ); ?>");
227
+                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For type based rules, paste your specific and minified critical CSS here and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\".', 'autoptimize'); ?>");
228 228
             } else {
229 229
                 jQuery("#critcss_addedit_path_wrapper").show();
230 230
                 jQuery("#critcss_addedit_pagetype_wrapper").hide();
231
-                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize' ); ?>");
231
+                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize'); ?>");
232 232
             }
233 233
         });
234 234
     }
@@ -240,21 +240,21 @@  discard block
 block discarded – undo
240 240
         title: dialogTitle,
241 241
         modal: true,
242 242
         buttons: {
243
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
243
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
244 244
                 rpath = jQuery("#critcss_addedit_path").val();
245 245
                 rtype = jQuery("#critcss_addedit_pagetype option:selected").val();
246 246
                 rccss = jQuery("#critcss_addedit_css").val();
247 247
                 console.log('rpath: ' + rpath, 'rtype: ' + rtype, 'rccss: ' + rccss);
248 248
                 if (rpath === '' && rtype === '') {
249
-                    alert('<?php _e( "RULE VALIDATION ERROR!\\n\\nBased on your rule type, you SHOULD set a path or conditional tag.", 'autoptimize' ); ?>');
249
+                    alert('<?php _e("RULE VALIDATION ERROR!\\n\\nBased on your rule type, you SHOULD set a path or conditional tag.", 'autoptimize'); ?>');
250 250
                 } else if (rtype !== '' && rccss == '') {
251
-                    alert('<?php _e( "RULE VALIDATION ERROR!\\n\\nType based rules REQUIRES a minified critical CSS.", 'autoptimize' ); ?>');
251
+                    alert('<?php _e("RULE VALIDATION ERROR!\\n\\nType based rules REQUIRES a minified critical CSS.", 'autoptimize'); ?>');
252 252
                 } else {
253 253
                     saveEditCritCss();
254 254
                     jQuery(this).dialog('close');
255 255
                 }
256 256
             },
257
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
257
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
258 258
                 resetForm();
259 259
                 jQuery(this).dialog("close");
260 260
             }
@@ -268,15 +268,15 @@  discard block
 block discarded – undo
268 268
         autoOpen: true,
269 269
         height: 505,
270 270
         width: 700,
271
-        title: "<?php _e( 'Default Critical CSS', 'autoptimize' ); ?>",
271
+        title: "<?php _e('Default Critical CSS', 'autoptimize'); ?>",
272 272
         modal: true,
273 273
         buttons: {
274
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
274
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
275 275
                 document.getElementById("autoptimize_css_defer_inline").value=document.getElementById("dummyDefault").value;
276 276
                 jQuery("#unSavedWarning").show();
277 277
                 jQuery("#default_critcss_wrapper").dialog( "close" );
278 278
             },
279
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
279
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
280 280
                 jQuery("#default_critcss_wrapper").dialog( "close" );
281 281
             }
282 282
         }
@@ -289,15 +289,15 @@  discard block
 block discarded – undo
289 289
         autoOpen: true,
290 290
         height: 505,
291 291
         width: 700,
292
-        title: "<?php _e( 'Additional Critical CSS', 'autoptimize' ); ?>",
292
+        title: "<?php _e('Additional Critical CSS', 'autoptimize'); ?>",
293 293
         modal: true,
294 294
         buttons: {
295
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
295
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
296 296
                 document.getElementById("autoptimize_ccss_additional").value=document.getElementById("dummyAdditional").value;
297 297
                 jQuery("#unSavedWarning").show();
298 298
                 jQuery("#additional_critcss_wrapper").dialog( "close" );
299 299
             },
300
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
300
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
301 301
                 jQuery("#additional_critcss_wrapper").dialog( "close" );
302 302
             }
303 303
         }
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
     critCssArray[critcsstype][critcsstarget].file=critcssfile;
334 334
 
335 335
     <?php
336
-    if ( $ao_ccss_debug ) {
336
+    if ($ao_ccss_debug) {
337 337
         echo "console.log('[RULE PROPERTIES] Type:', critcsstype, ', Target:', critcsstarget, ', Hash:', 0, ', File:',  critcssfile);";
338 338
     }
339 339
     ?>
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 
343 343
     var data = {
344 344
         'action': 'save_critcss',
345
-        'critcss_save_nonce': '<?php echo wp_create_nonce( 'save_critcss_nonce' ); ?>',
345
+        'critcss_save_nonce': '<?php echo wp_create_nonce('save_critcss_nonce'); ?>',
346 346
         'critcssfile': critcssfile,
347 347
         'critcsscontents': critcsscontents
348 348
     };
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
 }
368 368
 
369 369
 function resetForm() {
370
-    jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize' ); ?>");
370
+    jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize'); ?>");
371 371
     jQuery("#critcss_addedit_type").attr("disabled",false);
372 372
     jQuery("#critcss_addedit_path_wrapper").show();
373 373
     jQuery("#critcss_addedit_id").val("");
Please login to merge, or discard this patch.
classes/critcss-inc/admin_settings_queue.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -11,21 +11,21 @@  discard block
 block discarded – undo
11 11
     global $ao_ccss_queue;
12 12
 
13 13
     // Prepare the queue object.
14
-    if ( empty( $ao_ccss_queue ) ) {
14
+    if (empty($ao_ccss_queue)) {
15 15
         $ao_ccss_queue = '';
16 16
     } else {
17
-        $ao_ccss_queue = json_encode( $ao_ccss_queue );
17
+        $ao_ccss_queue = json_encode($ao_ccss_queue);
18 18
     }
19 19
 ?>
20 20
 
21 21
     <ul id="queue-panel">
22 22
         <li class="itemDetail">
23
-            <h2 class="itemTitle fleft"><?php _e( 'Job Queue', 'autoptimize' ); ?></h2>
23
+            <h2 class="itemTitle fleft"><?php _e('Job Queue', 'autoptimize'); ?></h2>
24 24
             <button type="button" class="toggle-btn">
25 25
                 <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
26 26
             </button>
27 27
             <?php
28
-            if ( autoptimizeCriticalCSSSettings::ao_ccss_has_autorules() ) {
28
+            if (autoptimizeCriticalCSSSettings::ao_ccss_has_autorules()) {
29 29
                 $_queue_visibility = 'hidden';
30 30
             } else {
31 31
                 $_queue_visibility = 'visible';
@@ -34,54 +34,54 @@  discard block
 block discarded – undo
34 34
             <div class="collapsible <?php echo $_queue_visibility; ?>">
35 35
                 <!-- BEGIN Queue dialogs -->
36 36
                 <!-- Retry dialog -->
37
-                <div id="queue-confirm-retry" title="<?php _e( 'Retry Job', 'autoptimize' ); ?>" class="hidden">
38
-                    <p><?php _e( 'Are you sure you want to retry this job?', 'autoptimize' ); ?></p>
37
+                <div id="queue-confirm-retry" title="<?php _e('Retry Job', 'autoptimize'); ?>" class="hidden">
38
+                    <p><?php _e('Are you sure you want to retry this job?', 'autoptimize'); ?></p>
39 39
                 </div>
40 40
 
41 41
                 <!-- Remove dialog -->
42
-                <div id="queue-confirm-rm" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>" class="hidden">
43
-                    <p><?php _e( 'Are you sure you want to delete this job?', 'autoptimize' ); ?></p>
42
+                <div id="queue-confirm-rm" title="<?php _e('Delete Job', 'autoptimize'); ?>" class="hidden">
43
+                    <p><?php _e('Are you sure you want to delete this job?', 'autoptimize'); ?></p>
44 44
                 </div>
45 45
 
46 46
                 <!-- Remove all dialog -->
47
-                <div id="queue-confirm-rm-all" title="<?php _e( 'Delete all jobs', 'autoptimize' ); ?>" class="hidden">
48
-                    <p><?php _e( 'This will delete all jobs, are you sure?', 'autoptimize' ); ?></p>
47
+                <div id="queue-confirm-rm-all" title="<?php _e('Delete all jobs', 'autoptimize'); ?>" class="hidden">
48
+                    <p><?php _e('This will delete all jobs, are you sure?', 'autoptimize'); ?></p>
49 49
                 </div>
50 50
                 <!-- END Queue dialogs -->
51 51
 
52 52
                 <!-- BEGIN Queue UI -->
53 53
                 <div class="howto">
54 54
                     <div class="title-wrap">
55
-                        <h4 class="title"><?php _e( 'How To Use Autoptimize CriticalCSS Power-Up Queue', 'autoptimize' ); ?></h4>
56
-                        <p class="subtitle"><?php _e( 'Click the side arrow to toggle instructions', 'autoptimize' ); ?></p>
55
+                        <h4 class="title"><?php _e('How To Use Autoptimize CriticalCSS Power-Up Queue', 'autoptimize'); ?></h4>
56
+                        <p class="subtitle"><?php _e('Click the side arrow to toggle instructions', 'autoptimize'); ?></p>
57 57
                     </div>
58 58
                     <button type="button" class="toggle-btn">
59 59
                         <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
60 60
                     </button>
61 61
                     <div class="howto-wrap hidden">
62
-                        <p><?php _e( 'TL;DR:<br /><strong>Queue runs every 10 minutes.</strong> Job statuses are <span class="badge new">N</span> for NEW, <span class="badge pending">P</span> for PENDING, <span class="badge error">E</span> for ERROR and <span class="badge unknown">U</span> for UNKOWN.', 'autoptimize' ); ?></p>
62
+                        <p><?php _e('TL;DR:<br /><strong>Queue runs every 10 minutes.</strong> Job statuses are <span class="badge new">N</span> for NEW, <span class="badge pending">P</span> for PENDING, <span class="badge error">E</span> for ERROR and <span class="badge unknown">U</span> for UNKOWN.', 'autoptimize'); ?></p>
63 63
                         <ol>
64
-                            <li><?php _e( 'The queue operates <strong>automatically, asynchronously and on regular intervals of 10 minutes.</strong> To view updated queue status, refresh this page.', 'autoptimize' ); ?></li>
65
-                            <li><?php _e( 'When the conditions to create a job are met (i.e. user not logged in, no matching <span class="badge manual">MANUAL</span> rule or CSS files has changed for an <span class="badge auto">AUTO</span> rule), a <span class="badge new">N</span> job is created in the queue.', 'autoptimize' ); ?></li>
66
-                            <li><?php _e( "Autoptimize CriticalCSS Power-Up constantly query the queue for <span class='badge new'>N</span> jobs. When it finds one, gears spins and jobs becomes <span class='badge pending'>P</span> while they are running and <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> doesn't return a result.", 'autoptimize' ); ?></li>
67
-                            <li><?php _e( 'As soon as <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> returns a valid critical CSS file, the job is then finished and removed from the queue.', 'autoptimize' ); ?></li>
68
-                            <li><?php _e( 'When things go wrong, a job is marked as <span class="badge error">E</span>. You can retry faulty jobs, delete them or get in touch with <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize' ); ?></li>
69
-                            <li><?php _e( 'Sometimes an unknown condition can happen. In this case, the job status becomes <span class="badge unknown">U</span> and you may want to ask <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for help or just delete it.', 'autoptimize' ); ?></li>
70
-                            <li><?php _e( 'To get more information about jobs statuses, specially the ones with <span class="badge error">E</span> and <span class="badge unknown">U</span> status, hover your mouse in the status badge of that job. This information might be crucial when contacting <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize' ); ?></li>
71
-                            <li><?php _e( '<strong>A word about WordPress cron:</strong> Autoptimize CriticalCSS Power-Up watch the queue by using WordPress Cron (or WP-Cron for short.) It <a href="https://www.smashingmagazine.com/2013/10/schedule-events-using-wordpress-cron/#limitations-of-wordpress-cron-and-solutions-to-fix-em" target="_blank">could be faulty</a> on very light or very heavy loads. If your site receives just a few or thousands visits a day, it might be a good idea to <a href="https://developer.wordpress.org/plugins/cron/hooking-wp-cron-into-the-system-task-scheduler/" target="_blank">turn WP-Cron off and use your system task scheduler</a> to fire it instead.', 'autoptimize' ); ?></li>
64
+                            <li><?php _e('The queue operates <strong>automatically, asynchronously and on regular intervals of 10 minutes.</strong> To view updated queue status, refresh this page.', 'autoptimize'); ?></li>
65
+                            <li><?php _e('When the conditions to create a job are met (i.e. user not logged in, no matching <span class="badge manual">MANUAL</span> rule or CSS files has changed for an <span class="badge auto">AUTO</span> rule), a <span class="badge new">N</span> job is created in the queue.', 'autoptimize'); ?></li>
66
+                            <li><?php _e("Autoptimize CriticalCSS Power-Up constantly query the queue for <span class='badge new'>N</span> jobs. When it finds one, gears spins and jobs becomes <span class='badge pending'>P</span> while they are running and <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> doesn't return a result.", 'autoptimize'); ?></li>
67
+                            <li><?php _e('As soon as <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> returns a valid critical CSS file, the job is then finished and removed from the queue.', 'autoptimize'); ?></li>
68
+                            <li><?php _e('When things go wrong, a job is marked as <span class="badge error">E</span>. You can retry faulty jobs, delete them or get in touch with <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize'); ?></li>
69
+                            <li><?php _e('Sometimes an unknown condition can happen. In this case, the job status becomes <span class="badge unknown">U</span> and you may want to ask <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for help or just delete it.', 'autoptimize'); ?></li>
70
+                            <li><?php _e('To get more information about jobs statuses, specially the ones with <span class="badge error">E</span> and <span class="badge unknown">U</span> status, hover your mouse in the status badge of that job. This information might be crucial when contacting <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize'); ?></li>
71
+                            <li><?php _e('<strong>A word about WordPress cron:</strong> Autoptimize CriticalCSS Power-Up watch the queue by using WordPress Cron (or WP-Cron for short.) It <a href="https://www.smashingmagazine.com/2013/10/schedule-events-using-wordpress-cron/#limitations-of-wordpress-cron-and-solutions-to-fix-em" target="_blank">could be faulty</a> on very light or very heavy loads. If your site receives just a few or thousands visits a day, it might be a good idea to <a href="https://developer.wordpress.org/plugins/cron/hooking-wp-cron-into-the-system-task-scheduler/" target="_blank">turn WP-Cron off and use your system task scheduler</a> to fire it instead.', 'autoptimize'); ?></li>
72 72
                         </ol>
73 73
                     </div>
74 74
                 </div>
75 75
                 <table id="queue-tbl" class="queue tablesorter" cellspacing="0">
76 76
                     <thead>
77
-                        <tr><th class="status"><?php _e( 'Status', 'autoptimize' ); ?></th><th><?php _e( 'Target Rule', 'autoptimize' ); ?></th><th><?php _e( 'Page Path', 'autoptimize' ); ?></th><th><?php _e( 'Page Type', 'autoptimize' ); ?></th><th><?php _e( 'Creation Date', 'autoptimize' ); ?></th><th><?php _e( 'Finish Date', 'autoptimize' ); ?></th><th class="btn"><?php _e( 'Actions', 'autoptimize' ); ?></th></tr>
77
+                        <tr><th class="status"><?php _e('Status', 'autoptimize'); ?></th><th><?php _e('Target Rule', 'autoptimize'); ?></th><th><?php _e('Page Path', 'autoptimize'); ?></th><th><?php _e('Page Type', 'autoptimize'); ?></th><th><?php _e('Creation Date', 'autoptimize'); ?></th><th><?php _e('Finish Date', 'autoptimize'); ?></th><th class="btn"><?php _e('Actions', 'autoptimize'); ?></th></tr>
78 78
                     </thead>
79 79
                     <tbody id="queue"></tbody>
80 80
                 </table>
81
-                <input class="hidden" type="text" id="ao-ccss-queue" name="autoptimize_ccss_queue" value='<?php echo( $ao_ccss_queue ); ?>'>
81
+                <input class="hidden" type="text" id="ao-ccss-queue" name="autoptimize_ccss_queue" value='<?php echo($ao_ccss_queue); ?>'>
82 82
                 <div class="submit jobs-btn">
83 83
                     <div class="alignright">
84
-                        <span id="removeAllJobs" class="button-secondary" style="color:red;"><?php _e( 'Remove all jobs', 'autoptimize' ); ?></span>
84
+                        <span id="removeAllJobs" class="button-secondary" style="color:red;"><?php _e('Remove all jobs', 'autoptimize'); ?></span>
85 85
                     </div>
86 86
                 </div>
87 87
             </div>
Please login to merge, or discard this patch.
classes/critcss-inc/admin_settings_explain.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -12,29 +12,29 @@
 block discarded – undo
12 12
         .ao_settings_div {background: white;border: 1px solid #ccc;padding: 1px 15px;margin: 15px 10px 10px 0;}
13 13
         .ao_settings_div .form-table th {font-weight: normal;}
14 14
     </style>
15
-    <script>document.title = "Autoptimize: <?php _e( 'Critical CSS', 'autoptimize' ); ?> " + document.title;</script>
15
+    <script>document.title = "Autoptimize: <?php _e('Critical CSS', 'autoptimize'); ?> " + document.title;</script>
16 16
     <ul id="explain-panel">
17 17
         <div class="ao_settings_div">
18 18
             <?php
19 19
             $ccss_explanation = '';
20 20
 
21 21
             // get the HTML with the explanation of what critical CSS is.
22
-            if ( apply_filters( 'autoptimize_settingsscreen_remotehttp', true ) ) {
23
-                $ccss_explanation = get_transient( 'ao_ccss_explain' );
24
-                if ( empty( $ccss_explanation ) ) {
25
-                    $ccss_expl_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_ccss_explain_i18n.html?ao_ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
26
-                    if ( ! is_wp_error( $ccss_expl_resp ) ) {
27
-                        if ( '200' == wp_remote_retrieve_response_code( $ccss_expl_resp ) ) {
28
-                            $ccss_explanation = wp_kses_post( wp_remote_retrieve_body( $ccss_expl_resp ) );
29
-                            set_transient( 'ao_ccss_explain', $ccss_explanation, WEEK_IN_SECONDS );
22
+            if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
23
+                $ccss_explanation = get_transient('ao_ccss_explain');
24
+                if (empty($ccss_explanation)) {
25
+                    $ccss_expl_resp = wp_remote_get('https://misc.optimizingmatters.com/autoptimize_ccss_explain_i18n.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION);
26
+                    if (!is_wp_error($ccss_expl_resp)) {
27
+                        if ('200' == wp_remote_retrieve_response_code($ccss_expl_resp)) {
28
+                            $ccss_explanation = wp_kses_post(wp_remote_retrieve_body($ccss_expl_resp));
29
+                            set_transient('ao_ccss_explain', $ccss_explanation, WEEK_IN_SECONDS);
30 30
                         }
31 31
                     }
32 32
                 }
33 33
             }
34 34
 
35 35
             // placeholder text in case HTML is empty.
36
-            if ( empty( $ccss_explanation ) ) {
37
-                $ccss_explanation = __( '<h2>Fix render-blocking CSS!</h2><p>Significantly improve your first-paint times by making CSS non-render-blocking.</p><p>The next step is to sign up at <a href="https://criticalcss.com/?aff=1" target="_blank">https://criticalcss.com</a> (this is a premium service, priced 2 GBP/month for membership and 5 GBP/month per domain) <strong>and get the API key, which you can copy from <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">the API-keys page</a></strong> and paste below.</p><p>If you have any questions or need support, head on over to <a href="https://wordpress.org/support/plugin/autoptimize" target="_blank">our support forum</a> and we\'ll help you get up and running in no time!</p>', 'autoptimize' );
36
+            if (empty($ccss_explanation)) {
37
+                $ccss_explanation = __('<h2>Fix render-blocking CSS!</h2><p>Significantly improve your first-paint times by making CSS non-render-blocking.</p><p>The next step is to sign up at <a href="https://criticalcss.com/?aff=1" target="_blank">https://criticalcss.com</a> (this is a premium service, priced 2 GBP/month for membership and 5 GBP/month per domain) <strong>and get the API key, which you can copy from <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">the API-keys page</a></strong> and paste below.</p><p>If you have any questions or need support, head on over to <a href="https://wordpress.org/support/plugin/autoptimize" target="_blank">our support forum</a> and we\'ll help you get up and running in no time!</p>', 'autoptimize');
38 38
             } else {
39 39
                 // we were able to fetch the explenation, so add the JS to show correct language.
40 40
                 $ccss_explanation .= "<script>jQuery('.ao_i18n').hide();d=document;lang=d.getElementsByTagName('html')[0].getAttribute('lang').substring(0,2);if(d.getElementById(lang)!= null){jQuery('#'+lang).show();}else{jQuery('#default').show();}</script>";
Please login to merge, or discard this patch.