@@ -86,7 +86,7 @@ |
||
86 | 86 | $doctype = $this->aliases[$doctype]; |
87 | 87 | } |
88 | 88 | if (!isset($this->doctypes[$doctype])) { |
89 | - trigger_error('Doctype ' . htmlspecialchars($doctype) . ' does not exist', E_USER_ERROR); |
|
89 | + trigger_error('Doctype '.htmlspecialchars($doctype).' does not exist', E_USER_ERROR); |
|
90 | 90 | $anon = new HTMLPurifier_Doctype($doctype); |
91 | 91 | return $anon; |
92 | 92 | } |
@@ -101,7 +101,7 @@ |
||
101 | 101 | if (!$this->isValid()) { |
102 | 102 | return false; |
103 | 103 | } |
104 | - return $this->n . $this->unit; |
|
104 | + return $this->n.$this->unit; |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -62,7 +62,7 @@ |
||
62 | 62 | if ($filter->always_load) { |
63 | 63 | $this->addFilter($filter, $config); |
64 | 64 | } else { |
65 | - $conf = $config->get('URI.' . $name); |
|
65 | + $conf = $config->get('URI.'.$name); |
|
66 | 66 | if ($conf !== false && $conf !== null) { |
67 | 67 | $this->addFilter($filter, $config); |
68 | 68 | } |
@@ -42,7 +42,10 @@ discard block |
||
42 | 42 | public function addFilter($filter, $config) |
43 | 43 | { |
44 | 44 | $r = $filter->prepare($config); |
45 | - if ($r === false) return; // null is ok, for backwards compat |
|
45 | + if ($r === false) { |
|
46 | + return; |
|
47 | + } |
|
48 | + // null is ok, for backwards compat |
|
46 | 49 | if ($filter->post) { |
47 | 50 | $this->postFilters[$filter->name] = $filter; |
48 | 51 | } else { |
@@ -79,9 +82,13 @@ discard block |
||
79 | 82 | $parser = new HTMLPurifier_URIParser(); |
80 | 83 | $this->base = $parser->parse($base_uri); |
81 | 84 | $this->defaultScheme = $this->base->scheme; |
82 | - if (is_null($this->host)) $this->host = $this->base->host; |
|
85 | + if (is_null($this->host)) { |
|
86 | + $this->host = $this->base->host; |
|
87 | + } |
|
83 | 88 | } |
84 | - if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme'); |
|
89 | + if (is_null($this->defaultScheme)) { |
|
90 | + $this->defaultScheme = $config->get('URI.DefaultScheme'); |
|
91 | + } |
|
85 | 92 | } |
86 | 93 | |
87 | 94 | public function getDefaultScheme($config, $context) |
@@ -93,7 +100,9 @@ discard block |
||
93 | 100 | { |
94 | 101 | foreach ($this->filters as $name => $f) { |
95 | 102 | $result = $f->filter($uri, $config, $context); |
96 | - if (!$result) return false; |
|
103 | + if (!$result) { |
|
104 | + return false; |
|
105 | + } |
|
97 | 106 | } |
98 | 107 | return true; |
99 | 108 | } |
@@ -102,7 +111,9 @@ discard block |
||
102 | 111 | { |
103 | 112 | foreach ($this->postFilters as $name => $f) { |
104 | 113 | $result = $f->filter($uri, $config, $context); |
105 | - if (!$result) return false; |
|
114 | + if (!$result) { |
|
115 | + return false; |
|
116 | + } |
|
106 | 117 | } |
107 | 118 | return true; |
108 | 119 | } |
@@ -228,8 +228,7 @@ discard block |
||
228 | 228 | $this->info['width'] = |
229 | 229 | $this->info['height'] = |
230 | 230 | $max === null ? |
231 | - $trusted_wh : |
|
232 | - new HTMLPurifier_AttrDef_Switch( |
|
231 | + $trusted_wh : new HTMLPurifier_AttrDef_Switch( |
|
233 | 232 | 'img', |
234 | 233 | // For img tags: |
235 | 234 | new HTMLPurifier_AttrDef_CSS_Composite( |
@@ -442,7 +441,7 @@ discard block |
||
442 | 441 | protected function setupConfigStuff($config) |
443 | 442 | { |
444 | 443 | // setup allowed elements |
445 | - $support = "(for information on implementing this, see the " . |
|
444 | + $support = "(for information on implementing this, see the ". |
|
446 | 445 | "support forums) "; |
447 | 446 | $allowed_properties = $config->get('CSS.AllowedProperties'); |
448 | 447 | if ($allowed_properties !== null) { |
@@ -21,7 +21,7 @@ |
||
21 | 21 | public function setup($file = false) |
22 | 22 | { |
23 | 23 | if (!$file) { |
24 | - $file = HTMLPURIFIER_PREFIX . '/HTMLPurifier/EntityLookup/entities.ser'; |
|
24 | + $file = HTMLPURIFIER_PREFIX.'/HTMLPurifier/EntityLookup/entities.ser'; |
|
25 | 25 | } |
26 | 26 | $this->table = unserialize(file_get_contents($file)); |
27 | 27 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | public function prependCSS(&$attr, $css) |
38 | 38 | { |
39 | 39 | $attr['style'] = isset($attr['style']) ? $attr['style'] : ''; |
40 | - $attr['style'] = $css . $attr['style']; |
|
40 | + $attr['style'] = $css.$attr['style']; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | public function toArray($t = NULL) { |
48 | 48 | $a = $this->front; |
49 | 49 | if ($t !== NULL) $a[] = $t; |
50 | - for ($i = count($this->back)-1; $i >= 0; $i--) { |
|
50 | + for ($i = count($this->back) - 1; $i >= 0; $i--) { |
|
51 | 51 | $a[] = $this->back[$i]; |
52 | 52 | } |
53 | 53 | return $a; |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $r = $this->delete(); |
149 | 149 | } |
150 | 150 | // insert |
151 | - for ($i = count($replacement)-1; $i >= 0; $i--) { |
|
151 | + for ($i = count($replacement) - 1; $i >= 0; $i--) { |
|
152 | 152 | $this->insertAfter($r); |
153 | 153 | $r = $replacement[$i]; |
154 | 154 | } |
@@ -46,7 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function toArray($t = NULL) { |
48 | 48 | $a = $this->front; |
49 | - if ($t !== NULL) $a[] = $t; |
|
49 | + if ($t !== NULL) { |
|
50 | + $a[] = $t; |
|
51 | + } |
|
50 | 52 | for ($i = count($this->back)-1; $i >= 0; $i--) { |
51 | 53 | $a[] = $this->back[$i]; |
52 | 54 | } |
@@ -59,7 +61,9 @@ discard block |
||
59 | 61 | * @return Original contents of new hole. |
60 | 62 | */ |
61 | 63 | public function next($t) { |
62 | - if ($t !== NULL) array_push($this->front, $t); |
|
64 | + if ($t !== NULL) { |
|
65 | + array_push($this->front, $t); |
|
66 | + } |
|
63 | 67 | return empty($this->back) ? NULL : array_pop($this->back); |
64 | 68 | } |
65 | 69 | |
@@ -82,7 +86,9 @@ discard block |
||
82 | 86 | * @return Original contents of new hole. |
83 | 87 | */ |
84 | 88 | public function prev($t) { |
85 | - if ($t !== NULL) array_push($this->back, $t); |
|
89 | + if ($t !== NULL) { |
|
90 | + array_push($this->back, $t); |
|
91 | + } |
|
86 | 92 | return empty($this->front) ? NULL : array_pop($this->front); |
87 | 93 | } |
88 | 94 | |
@@ -108,7 +114,9 @@ discard block |
||
108 | 114 | * @param Element to insert |
109 | 115 | */ |
110 | 116 | public function insertBefore($t) { |
111 | - if ($t !== NULL) array_push($this->front, $t); |
|
117 | + if ($t !== NULL) { |
|
118 | + array_push($this->front, $t); |
|
119 | + } |
|
112 | 120 | } |
113 | 121 | |
114 | 122 | /** |
@@ -116,7 +124,9 @@ discard block |
||
116 | 124 | * @param Element to insert |
117 | 125 | */ |
118 | 126 | public function insertAfter($t) { |
119 | - if ($t !== NULL) array_push($this->back, $t); |
|
127 | + if ($t !== NULL) { |
|
128 | + array_push($this->back, $t); |
|
129 | + } |
|
120 | 130 | } |
121 | 131 | |
122 | 132 | /** |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | // number is really a positive integer (one or more digits) |
55 | 55 | // FIXME: ^^ not always, see start and value of list items |
56 | - $this->info['Number'] = new HTMLPurifier_AttrDef_Integer(false, false, true); |
|
56 | + $this->info['Number'] = new HTMLPurifier_AttrDef_Integer(false, false, true); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | private static function makeEnum($in) |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | if (!isset($this->info[$type])) { |
79 | - trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR); |
|
79 | + trigger_error('Cannot retrieve undefined attribute type '.$type, E_USER_ERROR); |
|
80 | 80 | return; |
81 | 81 | } |
82 | 82 | return $this->info[$type]->make($string); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | protected function errorInconsistent($class, $type) |
162 | 162 | { |
163 | 163 | throw new HTMLPurifier_Exception( |
164 | - "Inconsistency in $class: " . HTMLPurifier_VarParser::getTypeName($type) . |
|
164 | + "Inconsistency in $class: ".HTMLPurifier_VarParser::getTypeName($type). |
|
165 | 165 | " not implemented" |
166 | 166 | ); |
167 | 167 | } |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | protected function errorGeneric($var, $type) |
175 | 175 | { |
176 | 176 | $vtype = gettype($var); |
177 | - $this->error("Expected type " . HTMLPurifier_VarParser::getTypeName($type) . ", got $vtype"); |
|
177 | + $this->error("Expected type ".HTMLPurifier_VarParser::getTypeName($type).", got $vtype"); |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | /** |