@@ -31,11 +31,11 @@ |
||
31 | 31 | // Note that ["<>] are an addition to the RFC's recommended |
32 | 32 | // characters, because they represent external delimeters. |
33 | 33 | $r_URI = '!'. |
34 | - '(([a-zA-Z0-9\.\+\-]+):)?'. // 2. Scheme |
|
35 | - '(//([^/?#"<>]*))?'. // 4. Authority |
|
36 | - '([^?#"<>]*)'. // 5. Path |
|
37 | - '(\?([^#"<>]*))?'. // 7. Query |
|
38 | - '(#([^"<>]*))?'. // 8. Fragment |
|
34 | + '(([a-zA-Z0-9\.\+\-]+):)?'.// 2. Scheme |
|
35 | + '(//([^/?#"<>]*))?'.// 4. Authority |
|
36 | + '([^?#"<>]*)'.// 5. Path |
|
37 | + '(\?([^#"<>]*))?'.// 7. Query |
|
38 | + '(#([^"<>]*))?'.// 8. Fragment |
|
39 | 39 | '!'; |
40 | 40 | |
41 | 41 | $matches = array(); |
@@ -113,7 +113,7 @@ |
||
113 | 113 | $uri->port = null; |
114 | 114 | $uri->fragment = null; |
115 | 115 | $uri->query = null; |
116 | - $uri->path = "$content_type;base64," . base64_encode($raw_data); |
|
116 | + $uri->path = "$content_type;base64,".base64_encode($raw_data); |
|
117 | 117 | return true; |
118 | 118 | } |
119 | 119 |
@@ -41,12 +41,12 @@ |
||
41 | 41 | list($key, $typecode) = explode('=', $type, 2); |
42 | 42 | if ($key !== 'type') { |
43 | 43 | // invalid key, tack it back on encoded |
44 | - $uri->path .= '%3B' . $type; |
|
44 | + $uri->path .= '%3B'.$type; |
|
45 | 45 | } elseif ($typecode === 'a' || $typecode === 'i' || $typecode === 'd') { |
46 | 46 | $type_ret = ";type=$typecode"; |
47 | 47 | } |
48 | 48 | } else { |
49 | - $uri->path .= '%3B' . $type; |
|
49 | + $uri->path .= '%3B'.$type; |
|
50 | 50 | } |
51 | 51 | $uri->path = str_replace(';', '%3B', $uri->path); |
52 | 52 | $uri->path .= $type_ret; |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | $mState = 0; |
274 | 274 | $mUcs4 = 0; |
275 | 275 | $mBytes = 1; |
276 | - $char =''; |
|
276 | + $char = ''; |
|
277 | 277 | } |
278 | 278 | } |
279 | 279 | } |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | public static function unichr($code) |
310 | 310 | { |
311 | 311 | if ($code > 1114111 or $code < 0 or |
312 | - ($code >= 55296 and $code <= 57343) ) { |
|
312 | + ($code >= 55296 and $code <= 57343)) { |
|
313 | 313 | // bits are set outside the "valid" range as defined |
314 | 314 | // by UNICODE 4.1.0 |
315 | 315 | return ''; |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | $z = (($code >> 12) & 15) | 224; |
331 | 331 | } else { |
332 | 332 | $z = (($code >> 12) & 63) | 128; |
333 | - $w = (($code >> 18) & 7) | 240; |
|
333 | + $w = (($code >> 18) & 7) | 240; |
|
334 | 334 | } |
335 | 335 | } |
336 | 336 | } |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | $str = self::unsafeIconv($encoding, 'utf-8//IGNORE', $str); |
385 | 385 | if ($str === false) { |
386 | 386 | // $encoding is not a valid encoding |
387 | - trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR); |
|
387 | + trigger_error('Invalid encoding '.$encoding, E_USER_ERROR); |
|
388 | 388 | return ''; |
389 | 389 | } |
390 | 390 | // If the string is bjorked by Shift_JIS or a similar encoding |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | trigger_error('Encoding not supported, please install iconv', E_USER_ERROR); |
402 | 402 | } else { |
403 | 403 | trigger_error( |
404 | - 'You have a buggy version of iconv, see https://bugs.php.net/bug.php?id=48147 ' . |
|
404 | + 'You have a buggy version of iconv, see https://bugs.php.net/bug.php?id=48147 '. |
|
405 | 405 | 'and http://sourceware.org/bugzilla/show_bug.cgi?id=13541', |
406 | 406 | E_USER_ERROR |
407 | 407 | ); |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | } |
443 | 443 | $str = strtr($str, array_flip($ascii_fix)); |
444 | 444 | // Normal stuff |
445 | - $str = self::iconv('utf-8', $encoding . '//IGNORE', $str); |
|
445 | + $str = self::iconv('utf-8', $encoding.'//IGNORE', $str); |
|
446 | 446 | return $str; |
447 | 447 | } elseif ($encoding === 'iso-8859-1') { |
448 | 448 | $str = utf8_decode($str); |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | $working += ($bytevalue & 0x3F); |
488 | 488 | $bytesleft--; |
489 | 489 | if ($bytesleft <= 0) { |
490 | - $result .= "&#" . $working . ";"; |
|
490 | + $result .= "&#".$working.";"; |
|
491 | 491 | } |
492 | 492 | } elseif ($bytevalue <= 0xDF) { //110x xxxx |
493 | 493 | $working = $bytevalue & 0x1F; |
@@ -533,14 +533,14 @@ discard block |
||
533 | 533 | static $code = null; |
534 | 534 | if ($code === null) { |
535 | 535 | // better not use iconv, otherwise infinite loop! |
536 | - $r = self::unsafeIconv('utf-8', 'ascii//IGNORE', "\xCE\xB1" . str_repeat('a', 9000)); |
|
536 | + $r = self::unsafeIconv('utf-8', 'ascii//IGNORE', "\xCE\xB1".str_repeat('a', 9000)); |
|
537 | 537 | if ($r === false) { |
538 | 538 | $code = self::ICONV_UNUSABLE; |
539 | 539 | } elseif (($c = strlen($r)) < 9000) { |
540 | 540 | $code = self::ICONV_TRUNCATES; |
541 | 541 | } elseif ($c > 9000) { |
542 | 542 | trigger_error( |
543 | - 'Your copy of iconv is extremely buggy. Please notify HTML Purifier maintainers: ' . |
|
543 | + 'Your copy of iconv is extremely buggy. Please notify HTML Purifier maintainers: '. |
|
544 | 544 | 'include your iconv version as per phpversion()', |
545 | 545 | E_USER_ERROR |
546 | 546 | ); |
@@ -31,17 +31,17 @@ discard block |
||
31 | 31 | return $var; |
32 | 32 | case self::INT: |
33 | 33 | if (is_string($var) && ctype_digit($var)) { |
34 | - $var = (int)$var; |
|
34 | + $var = (int) $var; |
|
35 | 35 | } |
36 | 36 | return $var; |
37 | 37 | case self::FLOAT: |
38 | 38 | if ((is_string($var) && is_numeric($var)) || is_int($var)) { |
39 | - $var = (float)$var; |
|
39 | + $var = (float) $var; |
|
40 | 40 | } |
41 | 41 | return $var; |
42 | 42 | case self::BOOL: |
43 | 43 | if (is_int($var) && ($var === 0 || $var === 1)) { |
44 | - $var = (bool)$var; |
|
44 | + $var = (bool) $var; |
|
45 | 45 | } elseif (is_string($var)) { |
46 | 46 | if ($var == 'on' || $var == 'true' || $var == '1') { |
47 | 47 | $var = true; |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | foreach ($var as $key => $value) { |
112 | 112 | if ($value !== true) { |
113 | 113 | trigger_error( |
114 | - "Lookup array has non-true value at key '$key'; " . |
|
114 | + "Lookup array has non-true value at key '$key'; ". |
|
115 | 115 | "maybe your input array was not indexed numerically", |
116 | 116 | E_USER_WARNING |
117 | 117 | ); |
@@ -195,7 +195,7 @@ |
||
195 | 195 | } |
196 | 196 | continue; |
197 | 197 | } |
198 | - $subst['$' . $i] = $value; |
|
198 | + $subst['$'.$i] = $value; |
|
199 | 199 | } |
200 | 200 | return strtr($raw, $subst); |
201 | 201 | } |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | if ($delete) { |
351 | 351 | if ($this->info[$tag]->attr[$attr]->required) { |
352 | 352 | trigger_error( |
353 | - "Required attribute '$attr' in element '$tag' " . |
|
353 | + "Required attribute '$attr' in element '$tag' ". |
|
354 | 354 | "was not allowed, which means '$tag' will not be allowed either", |
355 | 355 | E_USER_WARNING |
356 | 356 | ); |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | $attribute = htmlspecialchars($bits[1]); |
371 | 371 | if (!isset($this->info[$element])) { |
372 | 372 | trigger_error( |
373 | - "Cannot allow attribute '$attribute' if element " . |
|
373 | + "Cannot allow attribute '$attribute' if element ". |
|
374 | 374 | "'$element' is not allowed/supported $support" |
375 | 375 | ); |
376 | 376 | } else { |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | } elseif (isset($forbidden_attributes["$tag.$attr"])) { // this segment might get removed eventually |
415 | 415 | // $tag.$attr are not user supplied, so no worries! |
416 | 416 | trigger_error( |
417 | - "Error with $tag.$attr: tag.attr syntax not supported for " . |
|
417 | + "Error with $tag.$attr: tag.attr syntax not supported for ". |
|
418 | 418 | "HTML.ForbiddenAttributes; use tag@attr instead", |
419 | 419 | E_USER_WARNING |
420 | 420 | ); |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | |
62 | 62 | // handle color transform |
63 | 63 | if (isset($attr['color'])) { |
64 | - $prepend_style .= 'color:' . $attr['color'] . ';'; |
|
64 | + $prepend_style .= 'color:'.$attr['color'].';'; |
|
65 | 65 | unset($attr['color']); |
66 | 66 | } |
67 | 67 | |
68 | 68 | // handle face transform |
69 | 69 | if (isset($attr['face'])) { |
70 | - $prepend_style .= 'font-family:' . $attr['face'] . ';'; |
|
70 | + $prepend_style .= 'font-family:'.$attr['face'].';'; |
|
71 | 71 | unset($attr['face']); |
72 | 72 | } |
73 | 73 | |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | // normalize large numbers |
77 | 77 | if ($attr['size'] !== '') { |
78 | 78 | if ($attr['size']{0} == '+' || $attr['size']{0} == '-') { |
79 | - $size = (int)$attr['size']; |
|
79 | + $size = (int) $attr['size']; |
|
80 | 80 | if ($size < -2) { |
81 | 81 | $attr['size'] = '-2'; |
82 | 82 | } |
@@ -84,23 +84,22 @@ discard block |
||
84 | 84 | $attr['size'] = '+4'; |
85 | 85 | } |
86 | 86 | } else { |
87 | - $size = (int)$attr['size']; |
|
87 | + $size = (int) $attr['size']; |
|
88 | 88 | if ($size > 7) { |
89 | 89 | $attr['size'] = '7'; |
90 | 90 | } |
91 | 91 | } |
92 | 92 | } |
93 | 93 | if (isset($this->_size_lookup[$attr['size']])) { |
94 | - $prepend_style .= 'font-size:' . |
|
95 | - $this->_size_lookup[$attr['size']] . ';'; |
|
94 | + $prepend_style .= 'font-size:'. |
|
95 | + $this->_size_lookup[$attr['size']].';'; |
|
96 | 96 | } |
97 | 97 | unset($attr['size']); |
98 | 98 | } |
99 | 99 | |
100 | 100 | if ($prepend_style) { |
101 | 101 | $attr['style'] = isset($attr['style']) ? |
102 | - $prepend_style . $attr['style'] : |
|
103 | - $prepend_style; |
|
102 | + $prepend_style.$attr['style'] : $prepend_style; |
|
104 | 103 | } |
105 | 104 | |
106 | 105 | $new_tag = clone $tag; |
@@ -25,7 +25,7 @@ |
||
25 | 25 | $this->_loadRegex(); |
26 | 26 | } |
27 | 27 | |
28 | - if (preg_match('#^' . $this->ip4 . '$#s', $aIP)) { |
|
28 | + if (preg_match('#^'.$this->ip4.'$#s', $aIP)) { |
|
29 | 29 | return $aIP; |
30 | 30 | } |
31 | 31 | return false; |