@@ -42,6 +42,9 @@ discard block |
||
42 | 42 | return false; |
43 | 43 | } |
44 | 44 | |
45 | + /** |
|
46 | + * @param string $mime |
|
47 | + */ |
|
45 | 48 | public function cache($code,$mime) { |
46 | 49 | if($this->nogzip == false) { |
47 | 50 | $file = ($this->delayed ? 'delayed.php' : 'default.php'); |
@@ -240,6 +243,9 @@ discard block |
||
240 | 243 | return true; |
241 | 244 | } |
242 | 245 | |
246 | + /** |
|
247 | + * @param string $dir |
|
248 | + */ |
|
243 | 249 | static function checkCacheDir($dir) { |
244 | 250 | // Check and create if not exists |
245 | 251 | if(!file_exists($dir)) { |
@@ -625,6 +625,9 @@ |
||
625 | 625 | return false; |
626 | 626 | } |
627 | 627 | |
628 | + /** |
|
629 | + * @param string $url |
|
630 | + */ |
|
628 | 631 | private function getFutttaFeeds($url) { |
629 | 632 | if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) { |
630 | 633 | $rss = fetch_feed( $url ); |
@@ -345,8 +345,8 @@ discard block |
||
345 | 345 | </td> |
346 | 346 | </tr> |
347 | 347 | <?php |
348 | - if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) { |
|
349 | - ?> |
|
348 | + if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) { |
|
349 | + ?> |
|
350 | 350 | <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
351 | 351 | <th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th> |
352 | 352 | <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/> |
@@ -354,8 +354,8 @@ discard block |
||
354 | 354 | </td> |
355 | 355 | </tr> |
356 | 356 | <?php |
357 | - } |
|
358 | - ?> |
|
357 | + } |
|
358 | + ?> |
|
359 | 359 | </table> |
360 | 360 | </li> |
361 | 361 |
@@ -53,7 +53,7 @@ |
||
53 | 53 | * |
54 | 54 | * @param array $options (currently ignored) |
55 | 55 | * |
56 | - * @return null |
|
56 | + * @return string |
|
57 | 57 | */ |
58 | 58 | private function __construct($options) { |
59 | 59 | $this->_options = $options; |
@@ -273,12 +273,12 @@ discard block |
||
273 | 273 | return true; |
274 | 274 | } |
275 | 275 | |
276 | - // we have to check for a preceding keyword, and we don't need to pattern |
|
277 | - // match over the whole output. |
|
278 | - $recentOutput = substr($this->output, -10); |
|
276 | + // we have to check for a preceding keyword, and we don't need to pattern |
|
277 | + // match over the whole output. |
|
278 | + $recentOutput = substr($this->output, -10); |
|
279 | 279 | |
280 | - // check if return/typeof directly precede a pattern without a space |
|
281 | - foreach (array('return', 'typeof') as $keyword) { |
|
280 | + // check if return/typeof directly precede a pattern without a space |
|
281 | + foreach (array('return', 'typeof') as $keyword) { |
|
282 | 282 | if ($this->a !== substr($keyword, -1)) { |
283 | 283 | // certainly wasn't keyword |
284 | 284 | continue; |
@@ -290,13 +290,13 @@ discard block |
||
290 | 290 | } |
291 | 291 | } |
292 | 292 | |
293 | - // check all keywords |
|
294 | - if ($this->a === ' ' || $this->a === "\n") { |
|
295 | - if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) { |
|
296 | - if ($m[1] === '' || !$this->isAlphaNum($m[1])) { |
|
297 | - return true; |
|
298 | - } |
|
299 | - } |
|
293 | + // check all keywords |
|
294 | + if ($this->a === ' ' || $this->a === "\n") { |
|
295 | + if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) { |
|
296 | + if ($m[1] === '' || !$this->isAlphaNum($m[1])) { |
|
297 | + return true; |
|
298 | + } |
|
299 | + } |
|
300 | 300 | } |
301 | 301 | |
302 | 302 | return false; |
@@ -46,62 +46,62 @@ discard block |
||
46 | 46 | */ |
47 | 47 | |
48 | 48 | class JSMin { |
49 | - const ORD_LF = 10; |
|
50 | - const ORD_SPACE = 32; |
|
49 | + const ORD_LF = 10; |
|
50 | + const ORD_SPACE = 32; |
|
51 | 51 | |
52 | - protected $a = ''; |
|
53 | - protected $b = ''; |
|
54 | - protected $input = ''; |
|
55 | - protected $inputIndex = 0; |
|
56 | - protected $inputLength = 0; |
|
57 | - protected $lookAhead = null; |
|
58 | - protected $output = ''; |
|
52 | + protected $a = ''; |
|
53 | + protected $b = ''; |
|
54 | + protected $input = ''; |
|
55 | + protected $inputIndex = 0; |
|
56 | + protected $inputLength = 0; |
|
57 | + protected $lookAhead = null; |
|
58 | + protected $output = ''; |
|
59 | 59 | |
60 | - // -- Public Static Methods -------------------------------------------------- |
|
60 | + // -- Public Static Methods -------------------------------------------------- |
|
61 | 61 | |
62 | - public static function minify($js) { |
|
62 | + public static function minify($js) { |
|
63 | 63 | $jsmin = new JSMin($js); |
64 | 64 | return $jsmin->min(); |
65 | - } |
|
65 | + } |
|
66 | 66 | |
67 | - // -- Public Instance Methods ------------------------------------------------ |
|
67 | + // -- Public Instance Methods ------------------------------------------------ |
|
68 | 68 | |
69 | - public function __construct($input) { |
|
69 | + public function __construct($input) { |
|
70 | 70 | $this->input = str_replace("\r\n", "\n", $input); |
71 | 71 | $this->inputLength = strlen($this->input); |
72 | - } |
|
72 | + } |
|
73 | 73 | |
74 | - // -- Protected Instance Methods --------------------------------------------- |
|
74 | + // -- Protected Instance Methods --------------------------------------------- |
|
75 | 75 | |
76 | - protected function action($d) { |
|
76 | + protected function action($d) { |
|
77 | 77 | switch($d) { |
78 | - case 1: |
|
78 | + case 1: |
|
79 | 79 | $this->output .= $this->a; |
80 | 80 | |
81 | - case 2: |
|
81 | + case 2: |
|
82 | 82 | $this->a = $this->b; |
83 | 83 | |
84 | 84 | if ($this->a === "'" || $this->a === '"') { |
85 | - for (;;) { |
|
85 | + for (;;) { |
|
86 | 86 | $this->output .= $this->a; |
87 | 87 | $this->a = $this->get(); |
88 | 88 | |
89 | 89 | if ($this->a === $this->b) { |
90 | - break; |
|
90 | + break; |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | if (ord($this->a) <= self::ORD_LF) { |
94 | - throw new JSMinException('Unterminated string literal.'); |
|
94 | + throw new JSMinException('Unterminated string literal.'); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | if ($this->a === '\\') { |
98 | - $this->output .= $this->a; |
|
99 | - $this->a = $this->get(); |
|
98 | + $this->output .= $this->a; |
|
99 | + $this->a = $this->get(); |
|
100 | + } |
|
100 | 101 | } |
101 | - } |
|
102 | 102 | } |
103 | 103 | |
104 | - case 3: |
|
104 | + case 3: |
|
105 | 105 | $this->b = $this->next(); |
106 | 106 | |
107 | 107 | if ($this->b === '/' && ( |
@@ -109,70 +109,70 @@ discard block |
||
109 | 109 | $this->a === ':' || $this->a === '[' || $this->a === '!' || |
110 | 110 | $this->a === '&' || $this->a === '|' || $this->a === '?')) { |
111 | 111 | |
112 | - $this->output .= $this->a . $this->b; |
|
112 | + $this->output .= $this->a . $this->b; |
|
113 | 113 | |
114 | - for (;;) { |
|
114 | + for (;;) { |
|
115 | 115 | $this->a = $this->get(); |
116 | 116 | |
117 | 117 | if ($this->a === '/') { |
118 | - break; |
|
118 | + break; |
|
119 | 119 | } elseif ($this->a === '\\') { |
120 | - $this->output .= $this->a; |
|
121 | - $this->a = $this->get(); |
|
120 | + $this->output .= $this->a; |
|
121 | + $this->a = $this->get(); |
|
122 | 122 | } elseif (ord($this->a) <= self::ORD_LF) { |
123 | - throw new JSMinException('Unterminated regular expression '. |
|
124 | - 'literal.'); |
|
123 | + throw new JSMinException('Unterminated regular expression '. |
|
124 | + 'literal.'); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | $this->output .= $this->a; |
128 | - } |
|
128 | + } |
|
129 | 129 | |
130 | - $this->b = $this->next(); |
|
130 | + $this->b = $this->next(); |
|
131 | 131 | } |
132 | 132 | } |
133 | - } |
|
133 | + } |
|
134 | 134 | |
135 | - protected function get() { |
|
135 | + protected function get() { |
|
136 | 136 | $c = $this->lookAhead; |
137 | 137 | $this->lookAhead = null; |
138 | 138 | |
139 | 139 | if ($c === null) { |
140 | - if ($this->inputIndex < $this->inputLength) { |
|
140 | + if ($this->inputIndex < $this->inputLength) { |
|
141 | 141 | $c = $this->input[$this->inputIndex]; |
142 | 142 | $this->inputIndex += 1; |
143 | - } else { |
|
143 | + } else { |
|
144 | 144 | $c = null; |
145 | - } |
|
145 | + } |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | if ($c === "\r") { |
149 | - return "\n"; |
|
149 | + return "\n"; |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) { |
153 | - return $c; |
|
153 | + return $c; |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | return ' '; |
157 | - } |
|
157 | + } |
|
158 | 158 | |
159 | - protected function isAlphaNum($c) { |
|
159 | + protected function isAlphaNum($c) { |
|
160 | 160 | return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1; |
161 | - } |
|
161 | + } |
|
162 | 162 | |
163 | - protected function min() { |
|
163 | + protected function min() { |
|
164 | 164 | $this->a = "\n"; |
165 | 165 | $this->action(3); |
166 | 166 | |
167 | 167 | while ($this->a !== null) { |
168 | - switch ($this->a) { |
|
168 | + switch ($this->a) { |
|
169 | 169 | case ' ': |
170 | 170 | if ($this->isAlphaNum($this->b)) { |
171 | 171 | $this->action(1); |
172 | - } else { |
|
172 | + } else { |
|
173 | 173 | $this->action(2); |
174 | - } |
|
175 | - break; |
|
174 | + } |
|
175 | + break; |
|
176 | 176 | |
177 | 177 | case "\n": |
178 | 178 | switch ($this->b) { |
@@ -182,21 +182,21 @@ discard block |
||
182 | 182 | case '+': |
183 | 183 | case '-': |
184 | 184 | $this->action(1); |
185 | - break; |
|
185 | + break; |
|
186 | 186 | |
187 | 187 | case ' ': |
188 | 188 | $this->action(3); |
189 | - break; |
|
189 | + break; |
|
190 | 190 | |
191 | 191 | default: |
192 | 192 | if ($this->isAlphaNum($this->b)) { |
193 | 193 | $this->action(1); |
194 | - } |
|
195 | - else { |
|
194 | + } |
|
195 | + else { |
|
196 | 196 | $this->action(2); |
197 | - } |
|
198 | - } |
|
199 | - break; |
|
197 | + } |
|
198 | + } |
|
199 | + break; |
|
200 | 200 | |
201 | 201 | default: |
202 | 202 | switch ($this->b) { |
@@ -204,10 +204,10 @@ discard block |
||
204 | 204 | if ($this->isAlphaNum($this->a)) { |
205 | 205 | $this->action(1); |
206 | 206 | break; |
207 | - } |
|
207 | + } |
|
208 | 208 | |
209 | - $this->action(3); |
|
210 | - break; |
|
209 | + $this->action(3); |
|
210 | + break; |
|
211 | 211 | |
212 | 212 | case "\n": |
213 | 213 | switch ($this->a) { |
@@ -219,71 +219,71 @@ discard block |
||
219 | 219 | case '"': |
220 | 220 | case "'": |
221 | 221 | $this->action(1); |
222 | - break; |
|
222 | + break; |
|
223 | 223 | |
224 | 224 | default: |
225 | 225 | if ($this->isAlphaNum($this->a)) { |
226 | 226 | $this->action(1); |
227 | - } |
|
228 | - else { |
|
227 | + } |
|
228 | + else { |
|
229 | 229 | $this->action(3); |
230 | - } |
|
231 | - } |
|
232 | - break; |
|
230 | + } |
|
231 | + } |
|
232 | + break; |
|
233 | 233 | |
234 | 234 | default: |
235 | 235 | $this->action(1); |
236 | - break; |
|
237 | - } |
|
238 | - } |
|
236 | + break; |
|
237 | + } |
|
238 | + } |
|
239 | 239 | } |
240 | 240 | |
241 | 241 | return $this->output; |
242 | - } |
|
242 | + } |
|
243 | 243 | |
244 | - protected function next() { |
|
244 | + protected function next() { |
|
245 | 245 | $c = $this->get(); |
246 | 246 | |
247 | 247 | if ($c === '/') { |
248 | - switch($this->peek()) { |
|
248 | + switch($this->peek()) { |
|
249 | 249 | case '/': |
250 | 250 | for (;;) { |
251 | 251 | $c = $this->get(); |
252 | 252 | |
253 | 253 | if (ord($c) <= self::ORD_LF) { |
254 | - return $c; |
|
254 | + return $c; |
|
255 | + } |
|
255 | 256 | } |
256 | - } |
|
257 | 257 | |
258 | 258 | case '*': |
259 | 259 | $this->get(); |
260 | 260 | |
261 | - for (;;) { |
|
261 | + for (;;) { |
|
262 | 262 | switch($this->get()) { |
263 | - case '*': |
|
263 | + case '*': |
|
264 | 264 | if ($this->peek() === '/') { |
265 | - $this->get(); |
|
266 | - return ' '; |
|
265 | + $this->get(); |
|
266 | + return ' '; |
|
267 | 267 | } |
268 | 268 | break; |
269 | 269 | |
270 | - case null: |
|
270 | + case null: |
|
271 | 271 | throw new JSMinException('Unterminated comment.'); |
272 | 272 | } |
273 | - } |
|
273 | + } |
|
274 | 274 | |
275 | 275 | default: |
276 | 276 | return $c; |
277 | - } |
|
277 | + } |
|
278 | 278 | } |
279 | 279 | |
280 | 280 | return $c; |
281 | - } |
|
281 | + } |
|
282 | 282 | |
283 | - protected function peek() { |
|
283 | + protected function peek() { |
|
284 | 284 | $this->lookAhead = $this->get(); |
285 | 285 | return $this->lookAhead; |
286 | - } |
|
286 | + } |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | // -- Exceptions --------------------------------------------------------------- |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * |
34 | 34 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
35 | 35 | * unset, minify will sniff for an XHTML doctype. |
36 | - * |
|
36 | + * |
|
37 | 37 | * 'keepComments' : (optional boolean) should the HTML comments be kept |
38 | 38 | * in the HTML Code? |
39 | 39 | * |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * |
61 | 61 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
62 | 62 | * unset, minify will sniff for an XHTML doctype. |
63 | - * |
|
63 | + * |
|
64 | 64 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
65 | 65 | * unset, minify will sniff for an XHTML doctype. |
66 | 66 | * |
@@ -111,11 +111,11 @@ discard block |
||
111 | 111 | ,$this->_html); |
112 | 112 | |
113 | 113 | // remove HTML comments (not containing IE conditional comments). |
114 | - if ($this->_keepComments == false) { |
|
115 | - $this->_html = preg_replace_callback( |
|
116 | - '/<!--([\\s\\S]*?)-->/' |
|
117 | - ,array($this, '_commentCB') |
|
118 | - ,$this->_html); |
|
114 | + if ($this->_keepComments == false) { |
|
115 | + $this->_html = preg_replace_callback( |
|
116 | + '/<!--([\\s\\S]*?)-->/' |
|
117 | + ,array($this, '_commentCB') |
|
118 | + ,$this->_html); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | // replace PREs with placeholders |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | ,array($this, '_removeTextareaCB') |
130 | 130 | ,$this->_html); |
131 | 131 | |
132 | - // replace data: URIs with placeholders |
|
132 | + // replace data: URIs with placeholders |
|
133 | 133 | $this->_html = preg_replace_callback( |
134 | 134 | '/(=("|\')data:.*\\2)/Ui' |
135 | 135 | ,array($this, '_removeDataURICB') |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | protected $_placeholders = array(); |
184 | 184 | protected $_cssMinifier = null; |
185 | 185 | protected $_jsMinifier = null; |
186 | - protected $_keepComments = false; |
|
186 | + protected $_keepComments = false; |
|
187 | 187 | |
188 | 188 | protected function _outsideTagCB($m) |
189 | 189 | { |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | return $this->_reservePlace($m[1]); |
201 | 201 | } |
202 | 202 | |
203 | - protected function _removeDataURICB($m) |
|
203 | + protected function _removeDataURICB($m) |
|
204 | 204 | { |
205 | 205 | return $this->_reservePlace($m[1]); |
206 | 206 | } |
@@ -264,11 +264,11 @@ discard block |
||
264 | 264 | // Normalize all whitespace strings to single spaces. Easier to work with that way. |
265 | 265 | $css = preg_replace('/\s+/', ' ', $css); |
266 | 266 | |
267 | - // preserve flex, keeping percentage even if 0 |
|
268 | - $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i',array($this, 'replace_flex'),$css); |
|
267 | + // preserve flex, keeping percentage even if 0 |
|
268 | + $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i',array($this, 'replace_flex'),$css); |
|
269 | 269 | |
270 | - // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
|
271 | - $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css); |
|
270 | + // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
|
271 | + $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css); |
|
272 | 272 | |
273 | 273 | // Shorten & preserve calculations calc(...) since spaces are important |
274 | 274 | $css = preg_replace_callback('/calc(\(((?:[^\(\)]+|(?1))*)\))/i', array($this, 'replace_calc'), $css); |
@@ -344,8 +344,8 @@ discard block |
||
344 | 344 | // <percentage> data type: https://developer.mozilla.org/en-US/docs/Web/CSS/percentage |
345 | 345 | $css = preg_replace('/([^\\\\]\:|\s)0(?:em|ex|ch|rem|vw|vh|vm|vmin|cm|mm|in|px|pt|pc|%)/iS', '${1}0', $css); |
346 | 346 | |
347 | - // 0% step in a keyframe? restore the % unit |
|
348 | - $css = preg_replace_callback('/(@[a-z\-]*?keyframes[^\{]+\{)(.*?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css); |
|
347 | + // 0% step in a keyframe? restore the % unit |
|
348 | + $css = preg_replace_callback('/(@[a-z\-]*?keyframes[^\{]+\{)(.*?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css); |
|
349 | 349 | |
350 | 350 | // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0. |
351 | 351 | $css = preg_replace('/\:0(?: 0){1,3}(;|\}| \!)/', ':0$1', $css); |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
385 | 385 | $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
386 | 386 | |
387 | - // Replace multiple semi-colons in a row by a single one |
|
387 | + // Replace multiple semi-colons in a row by a single one |
|
388 | 388 | // See SF bug #1980989 |
389 | 389 | $css = preg_replace('/;;+/', ';', $css); |
390 | 390 | |
@@ -411,8 +411,8 @@ discard block |
||
411 | 411 | |
412 | 412 | // restore preserved comments and strings in reverse order |
413 | 413 | for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) { |
414 | - $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1); |
|
415 | - // $css.=$this->preserved_tokens[$i]; |
|
414 | + $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1); |
|
415 | + // $css.=$this->preserved_tokens[$i]; |
|
416 | 416 | } |
417 | 417 | |
418 | 418 | // Trim the final string (for any leading or trailing white spaces) |
@@ -469,9 +469,9 @@ discard block |
||
469 | 469 | |
470 | 470 | if ($found_terminator) { |
471 | 471 | $token = $this->str_slice($css, $start_index, $end_index); |
472 | - if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) { |
|
473 | - $token = preg_replace('/\s+/', '', $token); |
|
474 | - } |
|
472 | + if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) { |
|
473 | + $token = preg_replace('/\s+/', '', $token); |
|
474 | + } |
|
475 | 475 | $this->preserved_tokens[] = $token; |
476 | 476 | |
477 | 477 | $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)'; |
@@ -602,13 +602,13 @@ discard block |
||
602 | 602 | return 'flex:'.self::TOKEN . (count($this->preserved_tokens) - 1) . '___'; |
603 | 603 | } |
604 | 604 | |
605 | - private function preserve_old_IE_specific_matrix_definition($matches) |
|
606 | - { |
|
607 | - $this->preserved_tokens[] = $matches[1]; |
|
608 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
605 | + private function preserve_old_IE_specific_matrix_definition($matches) |
|
606 | + { |
|
607 | + $this->preserved_tokens[] = $matches[1]; |
|
608 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
609 | 609 | } |
610 | 610 | |
611 | - private function replace_keyframe_zero($matches) |
|
611 | + private function replace_keyframe_zero($matches) |
|
612 | 612 | { |
613 | 613 | return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3]; |
614 | 614 | } |
@@ -686,6 +686,11 @@ discard block |
||
686 | 686 | * --------------------------------------------------------------------------------------------- |
687 | 687 | */ |
688 | 688 | |
689 | + /** |
|
690 | + * @param double $v1 |
|
691 | + * @param double $v2 |
|
692 | + * @param integer $vh |
|
693 | + */ |
|
689 | 694 | private function hue_to_rgb($v1, $v2, $vh) |
690 | 695 | { |
691 | 696 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
@@ -700,6 +705,10 @@ discard block |
||
700 | 705 | return intval(floor(floatval($n) + 0.5), 10); |
701 | 706 | } |
702 | 707 | |
708 | + /** |
|
709 | + * @param integer $min |
|
710 | + * @param integer $max |
|
711 | + */ |
|
703 | 712 | private function clamp_number($n, $min, $max) |
704 | 713 | { |
705 | 714 | return min(max($n, $min), $max); |
@@ -728,7 +737,7 @@ discard block |
||
728 | 737 | * |
729 | 738 | * @param string $str |
730 | 739 | * @param int $start index |
731 | - * @param int|bool $end index (optional) |
|
740 | + * @param integer $end index (optional) |
|
732 | 741 | * @return string |
733 | 742 | */ |
734 | 743 | private function str_slice($str, $start = 0, $end = FALSE) |
@@ -75,18 +75,18 @@ |
||
75 | 75 | $wp_admin_bar->add_node( array( |
76 | 76 | 'id' => 'autoptimize-cache-info', |
77 | 77 | 'title' => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' . |
78 | - '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
79 | - '<div class="circle">'. |
|
80 | - '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'. |
|
81 | - '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'. |
|
82 | - '<div class="shadow"></div>'. |
|
83 | - '</div>'. |
|
84 | - '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'. |
|
85 | - '</div>' . |
|
86 | - '<table>' . |
|
87 | - '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
88 | - '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
89 | - '</table>', |
|
78 | + '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
79 | + '<div class="circle">'. |
|
80 | + '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'. |
|
81 | + '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'. |
|
82 | + '<div class="shadow"></div>'. |
|
83 | + '</div>'. |
|
84 | + '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'. |
|
85 | + '</div>' . |
|
86 | + '<table>' . |
|
87 | + '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
88 | + '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
89 | + '</table>', |
|
90 | 90 | 'parent' => 'autoptimize' |
91 | 91 | )); |
92 | 92 |
@@ -341,43 +341,43 @@ discard block |
||
341 | 341 | } |
342 | 342 | |
343 | 343 | protected function minify_single($pathIn) { |
344 | - // determine JS or CSS and set var (also mimetype), return false if neither |
|
345 | - if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
346 | - $codeType="js"; |
|
347 | - $codeMime="text/javascript"; |
|
348 | - } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
349 | - $codeType="css"; |
|
350 | - $codeMime="text/css"; |
|
351 | - } else { |
|
352 | - return false; |
|
353 | - } |
|
344 | + // determine JS or CSS and set var (also mimetype), return false if neither |
|
345 | + if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
346 | + $codeType="js"; |
|
347 | + $codeMime="text/javascript"; |
|
348 | + } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
349 | + $codeType="css"; |
|
350 | + $codeMime="text/css"; |
|
351 | + } else { |
|
352 | + return false; |
|
353 | + } |
|
354 | 354 | |
355 | - // if min.js or min.css return false |
|
356 | - if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
357 | - return false; |
|
358 | - } |
|
355 | + // if min.js or min.css return false |
|
356 | + if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
357 | + return false; |
|
358 | + } |
|
359 | 359 | |
360 | - // read file, return false if empty |
|
361 | - $_toMinify = file_get_contents($pathIn); |
|
362 | - if ( empty($_toMinify) ) return false; |
|
360 | + // read file, return false if empty |
|
361 | + $_toMinify = file_get_contents($pathIn); |
|
362 | + if ( empty($_toMinify) ) return false; |
|
363 | 363 | |
364 | - // check cache |
|
365 | - $_md5hash = "single_".md5($_toMinify); |
|
366 | - $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
367 | - if ($_cache->check() ) { |
|
368 | - $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
369 | - } else { |
|
370 | - // if not in cache first minify |
|
371 | - $_Minified = $_toMinify; |
|
372 | - if ($codeType === "js") { |
|
373 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
374 | - if (@is_callable(array("JSMin","minify"))) { |
|
375 | - $tmp_code = trim(JSMin::minify($_toMinify)); |
|
376 | - } |
|
377 | - } |
|
378 | - } else if ($codeType === "css") { |
|
364 | + // check cache |
|
365 | + $_md5hash = "single_".md5($_toMinify); |
|
366 | + $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
367 | + if ($_cache->check() ) { |
|
368 | + $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
369 | + } else { |
|
370 | + // if not in cache first minify |
|
371 | + $_Minified = $_toMinify; |
|
372 | + if ($codeType === "js") { |
|
373 | + if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
374 | + if (@is_callable(array("JSMin","minify"))) { |
|
375 | + $tmp_code = trim(JSMin::minify($_toMinify)); |
|
376 | + } |
|
377 | + } |
|
378 | + } else if ($codeType === "css") { |
|
379 | 379 | if (class_exists('Minify_CSS_Compressor')) { |
380 | - $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
|
380 | + $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
|
381 | 381 | } else if(class_exists('CSSmin')) { |
382 | 382 | $cssmin = new CSSmin(); |
383 | 383 | if (method_exists($cssmin,"run")) { |
@@ -386,31 +386,31 @@ discard block |
||
386 | 386 | $tmp_code = trim(CssMin::minify($_toMinify)); |
387 | 387 | } |
388 | 388 | } |
389 | - } |
|
390 | - if (!empty($tmp_code)) { |
|
391 | - $_Minified = $tmp_code; |
|
392 | - unset($tmp_code); |
|
393 | - } |
|
394 | - // and then cache |
|
395 | - $_cache->cache($_Minified,$codeMime); |
|
396 | - $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
397 | - } |
|
398 | - unset($_cache); |
|
389 | + } |
|
390 | + if (!empty($tmp_code)) { |
|
391 | + $_Minified = $tmp_code; |
|
392 | + unset($tmp_code); |
|
393 | + } |
|
394 | + // and then cache |
|
395 | + $_cache->cache($_Minified,$codeMime); |
|
396 | + $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
397 | + } |
|
398 | + unset($_cache); |
|
399 | 399 | |
400 | - // if CDN, then CDN |
|
401 | - $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl); |
|
400 | + // if CDN, then CDN |
|
401 | + $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl); |
|
402 | 402 | |
403 | - return $_CachedMinifiedUrl; |
|
404 | - } |
|
403 | + return $_CachedMinifiedUrl; |
|
404 | + } |
|
405 | 405 | |
406 | - protected function str_ends_in($haystack,$needle) { |
|
407 | - $needleLength = strlen($needle); |
|
408 | - $haystackLength = strlen($haystack); |
|
409 | - $lastPos=strrpos($haystack,$needle); |
|
410 | - if ($lastPos === $haystackLength - $needleLength) { |
|
411 | - return true; |
|
412 | - } else { |
|
413 | - return false; |
|
414 | - } |
|
415 | - } |
|
406 | + protected function str_ends_in($haystack,$needle) { |
|
407 | + $needleLength = strlen($needle); |
|
408 | + $haystackLength = strlen($haystack); |
|
409 | + $lastPos=strrpos($haystack,$needle); |
|
410 | + if ($lastPos === $haystackLength - $needleLength) { |
|
411 | + return true; |
|
412 | + } else { |
|
413 | + return false; |
|
414 | + } |
|
415 | + } |
|
416 | 416 | } |
@@ -139,6 +139,10 @@ discard block |
||
139 | 139 | } |
140 | 140 | |
141 | 141 | // hide everything between noptimize-comment tags |
142 | + |
|
143 | + /** |
|
144 | + * @param string $noptimize_in |
|
145 | + */ |
|
142 | 146 | protected function hide_noptimize($noptimize_in) { |
143 | 147 | if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { |
144 | 148 | $noptimize_out = preg_replace_callback( |
@@ -286,6 +290,9 @@ discard block |
||
286 | 290 | } |
287 | 291 | } |
288 | 292 | |
293 | + /** |
|
294 | + * @param string $tag |
|
295 | + */ |
|
289 | 296 | protected function isremovable($tag, $removables) { |
290 | 297 | foreach ($removables as $match) { |
291 | 298 | if (strpos($tag,$match)!==false) { |
@@ -296,6 +303,10 @@ discard block |
||
296 | 303 | } |
297 | 304 | |
298 | 305 | // inject already minified code in optimized JS/CSS |
306 | + |
|
307 | + /** |
|
308 | + * @return string |
|
309 | + */ |
|
299 | 310 | protected function inject_minified($in) { |
300 | 311 | if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) { |
301 | 312 | $out = preg_replace_callback( |
@@ -342,6 +353,9 @@ discard block |
||
342 | 353 | return $out; |
343 | 354 | } |
344 | 355 | |
356 | + /** |
|
357 | + * @param string $pathIn |
|
358 | + */ |
|
345 | 359 | protected function minify_single($pathIn) { |
346 | 360 | // determine JS or CSS and set var (also mimetype), return false if neither |
347 | 361 | if ( $this->str_ends_in($pathIn,".js") === true ) { |
@@ -405,6 +419,9 @@ discard block |
||
405 | 419 | return $_CachedMinifiedUrl; |
406 | 420 | } |
407 | 421 | |
422 | + /** |
|
423 | + * @param string $needle |
|
424 | + */ |
|
408 | 425 | protected function str_ends_in($haystack,$needle) { |
409 | 426 | $needleLength = strlen($needle); |
410 | 427 | $haystackLength = strlen($haystack); |