@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | return false; |
69 | 69 | } |
70 | 70 | while (!feof($fh)) { |
71 | - $ret[] = $this->parseHandle($fh); |
|
71 | + $ret[ ] = $this->parseHandle($fh); |
|
72 | 72 | } |
73 | 73 | fclose($fh); |
74 | 74 | return $ret; |
@@ -106,8 +106,8 @@ discard block |
||
106 | 106 | } elseif (strncmp('--', $line, 2) === 0) { |
107 | 107 | // Multiline declaration |
108 | 108 | $state = trim($line, '- '); |
109 | - if (!isset($ret[$state])) { |
|
110 | - $ret[$state] = ''; |
|
109 | + if (!isset($ret[ $state ])) { |
|
110 | + $ret[ $state ] = ''; |
|
111 | 111 | } |
112 | 112 | continue; |
113 | 113 | } elseif (!$state) { |
@@ -118,15 +118,15 @@ discard block |
||
118 | 118 | $line = trim($line); |
119 | 119 | } else { |
120 | 120 | // Use default declaration |
121 | - $state = $this->default; |
|
121 | + $state = $this->default; |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 | if ($single) { |
125 | - $ret[$state] = $line; |
|
125 | + $ret[ $state ] = $line; |
|
126 | 126 | $single = false; |
127 | 127 | $state = false; |
128 | 128 | } else { |
129 | - $ret[$state] .= "$line\n"; |
|
129 | + $ret[ $state ] .= "$line\n"; |
|
130 | 130 | } |
131 | 131 | } while (!feof($fh)); |
132 | 132 | return $ret; |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | public function render($config) |
16 | 16 | { |
17 | 17 | $ret = ''; |
18 | - $this->config =& $config; |
|
18 | + $this->config = & $config; |
|
19 | 19 | |
20 | 20 | $this->def = $config->getHTMLDefinition(); |
21 | 21 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $list = array(); |
78 | 78 | foreach ($def->info_tag_transform as $old => $new) { |
79 | 79 | $new = $this->getClass($new, 'TagTransform_'); |
80 | - $list[] = "<$old> with $new"; |
|
80 | + $list[ ] = "<$old> with $new"; |
|
81 | 81 | } |
82 | 82 | $ret .= $this->element('td', $this->listify($list)); |
83 | 83 | $ret .= $this->end('tr'); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | $elements = $def->elements; |
196 | 196 | } |
197 | 197 | if ($def->type == 'chameleon') { |
198 | - $attr['rowspan'] = 2; |
|
198 | + $attr[ 'rowspan' ] = 2; |
|
199 | 199 | } elseif ($def->type == 'empty') { |
200 | 200 | $elements = array(); |
201 | 201 | } elseif ($def->type == 'table') { |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | |
218 | 218 | $ret .= $this->element( |
219 | 219 | 'td', |
220 | - '<em>Block</em>: ' . |
|
220 | + '<em>Block</em>: '. |
|
221 | 221 | $this->escape($this->listifyTagLookup($def->block->elements)), |
222 | 222 | null, |
223 | 223 | 0 |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | $ret .= $this->start('tr'); |
227 | 227 | $ret .= $this->element( |
228 | 228 | 'td', |
229 | - '<em>Inline</em>: ' . |
|
229 | + '<em>Inline</em>: '. |
|
230 | 230 | $this->escape($this->listifyTagLookup($def->inline->elements)), |
231 | 231 | null, |
232 | 232 | 0 |
@@ -236,14 +236,14 @@ discard block |
||
236 | 236 | |
237 | 237 | $ret .= $this->element( |
238 | 238 | 'td', |
239 | - '<em>' . ucfirst($def->type) . '</em>: ' . |
|
239 | + '<em>'.ucfirst($def->type).'</em>: '. |
|
240 | 240 | $def->dtd_regex |
241 | 241 | ); |
242 | 242 | |
243 | 243 | } else { |
244 | 244 | $ret .= $this->element( |
245 | 245 | 'td', |
246 | - '<em>' . ucfirst($def->type) . '</em>: ' . |
|
246 | + '<em>'.ucfirst($def->type).'</em>: '. |
|
247 | 247 | $this->escape($this->listifyTagLookup($elements)), |
248 | 248 | null, |
249 | 249 | 0 |
@@ -263,10 +263,10 @@ discard block |
||
263 | 263 | ksort($array); |
264 | 264 | $list = array(); |
265 | 265 | foreach ($array as $name => $discard) { |
266 | - if ($name !== '#PCDATA' && !isset($this->def->info[$name])) { |
|
266 | + if ($name !== '#PCDATA' && !isset($this->def->info[ $name ])) { |
|
267 | 267 | continue; |
268 | 268 | } |
269 | - $list[] = $name; |
|
269 | + $list[ ] = $name; |
|
270 | 270 | } |
271 | 271 | return $this->listify($list); |
272 | 272 | } |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | ksort($array); |
283 | 283 | $list = array(); |
284 | 284 | foreach ($array as $obj) { |
285 | - $list[] = $this->getClass($obj, 'AttrTransform_'); |
|
285 | + $list[ ] = $this->getClass($obj, 'AttrTransform_'); |
|
286 | 286 | } |
287 | 287 | return $this->listify($list); |
288 | 288 | } |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | if ($obj === false) { |
301 | 301 | continue; |
302 | 302 | } |
303 | - $list[] = "$name = <i>" . $this->getClass($obj, 'AttrDef_') . '</i>'; |
|
303 | + $list[ ] = "$name = <i>".$this->getClass($obj, 'AttrDef_').'</i>'; |
|
304 | 304 | } |
305 | 305 | return $this->listify($list); |
306 | 306 | } |
@@ -79,25 +79,25 @@ discard block |
||
79 | 79 | protected function nonSpecialEntityCallback($matches) |
80 | 80 | { |
81 | 81 | // replaces all but big five |
82 | - $entity = $matches[0]; |
|
83 | - $is_num = (@$matches[0][1] === '#'); |
|
82 | + $entity = $matches[ 0 ]; |
|
83 | + $is_num = (@$matches[ 0 ][ 1 ] === '#'); |
|
84 | 84 | if ($is_num) { |
85 | - $is_hex = (@$entity[2] === 'x'); |
|
86 | - $code = $is_hex ? hexdec($matches[1]) : (int) $matches[2]; |
|
85 | + $is_hex = (@$entity[ 2 ] === 'x'); |
|
86 | + $code = $is_hex ? hexdec($matches[ 1 ]) : (int) $matches[ 2 ]; |
|
87 | 87 | // abort for special characters |
88 | - if (isset($this->_special_dec2str[$code])) { |
|
88 | + if (isset($this->_special_dec2str[ $code ])) { |
|
89 | 89 | return $entity; |
90 | 90 | } |
91 | 91 | return HTMLPurifier_Encoder::unichr($code); |
92 | 92 | } else { |
93 | - if (isset($this->_special_ent2dec[$matches[3]])) { |
|
93 | + if (isset($this->_special_ent2dec[ $matches[ 3 ] ])) { |
|
94 | 94 | return $entity; |
95 | 95 | } |
96 | 96 | if (!$this->_entity_lookup) { |
97 | 97 | $this->_entity_lookup = HTMLPurifier_EntityLookup::instance(); |
98 | 98 | } |
99 | - if (isset($this->_entity_lookup->table[$matches[3]])) { |
|
100 | - return $this->_entity_lookup->table[$matches[3]]; |
|
99 | + if (isset($this->_entity_lookup->table[ $matches[ 3 ] ])) { |
|
100 | + return $this->_entity_lookup->table[ $matches[ 3 ] ]; |
|
101 | 101 | } else { |
102 | 102 | return $entity; |
103 | 103 | } |
@@ -134,18 +134,16 @@ discard block |
||
134 | 134 | */ |
135 | 135 | protected function specialEntityCallback($matches) |
136 | 136 | { |
137 | - $entity = $matches[0]; |
|
138 | - $is_num = (@$matches[0][1] === '#'); |
|
137 | + $entity = $matches[ 0 ]; |
|
138 | + $is_num = (@$matches[ 0 ][ 1 ] === '#'); |
|
139 | 139 | if ($is_num) { |
140 | - $is_hex = (@$entity[2] === 'x'); |
|
141 | - $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2]; |
|
142 | - return isset($this->_special_dec2str[$int]) ? |
|
143 | - $this->_special_dec2str[$int] : |
|
144 | - $entity; |
|
140 | + $is_hex = (@$entity[ 2 ] === 'x'); |
|
141 | + $int = $is_hex ? hexdec($matches[ 1 ]) : (int) $matches[ 2 ]; |
|
142 | + return isset($this->_special_dec2str[ $int ]) ? |
|
143 | + $this->_special_dec2str[ $int ] : $entity; |
|
145 | 144 | } else { |
146 | - return isset($this->_special_ent2dec[$matches[3]]) ? |
|
147 | - $this->_special_ent2dec[$matches[3]] : |
|
148 | - $entity; |
|
145 | + return isset($this->_special_ent2dec[ $matches[ 3 ] ]) ? |
|
146 | + $this->_special_ent2dec[ $matches[ 3 ] ] : $entity; |
|
149 | 147 | } |
150 | 148 | } |
151 | 149 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $factory = HTMLPurifier_LanguageFactory::instance(); |
79 | 79 | $factory->loadLanguage($this->code); |
80 | 80 | foreach ($factory->keys as $key) { |
81 | - $this->$key = $factory->cache[$this->code][$key]; |
|
81 | + $this->$key = $factory->cache[ $this->code ][ $key ]; |
|
82 | 82 | } |
83 | 83 | $this->_loaded = true; |
84 | 84 | } |
@@ -93,10 +93,10 @@ discard block |
||
93 | 93 | if (!$this->_loaded) { |
94 | 94 | $this->load(); |
95 | 95 | } |
96 | - if (!isset($this->messages[$key])) { |
|
96 | + if (!isset($this->messages[ $key ])) { |
|
97 | 97 | return "[$key]"; |
98 | 98 | } |
99 | - return $this->messages[$key]; |
|
99 | + return $this->messages[ $key ]; |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -109,10 +109,10 @@ discard block |
||
109 | 109 | if (!$this->_loaded) { |
110 | 110 | $this->load(); |
111 | 111 | } |
112 | - if (!isset($this->errorNames[$int])) { |
|
112 | + if (!isset($this->errorNames[ $int ])) { |
|
113 | 113 | return "[Error: $int]"; |
114 | 114 | } |
115 | - return $this->errorNames[$int]; |
|
115 | + return $this->errorNames[ $int ]; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | } else { |
133 | 133 | $ret .= $sep_last; |
134 | 134 | } |
135 | - $ret .= $array[$i]; |
|
135 | + $ret .= $array[ $i ]; |
|
136 | 136 | } |
137 | 137 | return $ret; |
138 | 138 | } |
@@ -150,10 +150,10 @@ discard block |
||
150 | 150 | if (!$this->_loaded) { |
151 | 151 | $this->load(); |
152 | 152 | } |
153 | - if (!isset($this->messages[$key])) { |
|
153 | + if (!isset($this->messages[ $key ])) { |
|
154 | 154 | return "[$key]"; |
155 | 155 | } |
156 | - $raw = $this->messages[$key]; |
|
156 | + $raw = $this->messages[ $key ]; |
|
157 | 157 | $subst = array(); |
158 | 158 | $generator = false; |
159 | 159 | foreach ($args as $i => $value) { |
@@ -164,38 +164,38 @@ discard block |
||
164 | 164 | $generator = $this->context->get('Generator'); |
165 | 165 | } |
166 | 166 | if (isset($value->name)) { |
167 | - $subst['$'.$i.'.Name'] = $value->name; |
|
167 | + $subst[ '$'.$i.'.Name' ] = $value->name; |
|
168 | 168 | } |
169 | 169 | if (isset($value->data)) { |
170 | - $subst['$'.$i.'.Data'] = $value->data; |
|
170 | + $subst[ '$'.$i.'.Data' ] = $value->data; |
|
171 | 171 | } |
172 | - $subst['$'.$i.'.Compact'] = |
|
173 | - $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value); |
|
172 | + $subst[ '$'.$i.'.Compact' ] = |
|
173 | + $subst[ '$'.$i.'.Serialized' ] = $generator->generateFromToken($value); |
|
174 | 174 | // a more complex algorithm for compact representation |
175 | 175 | // could be introduced for all types of tokens. This |
176 | 176 | // may need to be factored out into a dedicated class |
177 | 177 | if (!empty($value->attr)) { |
178 | 178 | $stripped_token = clone $value; |
179 | 179 | $stripped_token->attr = array(); |
180 | - $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token); |
|
180 | + $subst[ '$'.$i.'.Compact' ] = $generator->generateFromToken($stripped_token); |
|
181 | 181 | } |
182 | - $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown'; |
|
182 | + $subst[ '$'.$i.'.Line' ] = $value->line ? $value->line : 'unknown'; |
|
183 | 183 | } |
184 | 184 | continue; |
185 | 185 | } elseif (is_array($value)) { |
186 | 186 | $keys = array_keys($value); |
187 | 187 | if (array_keys($keys) === $keys) { |
188 | 188 | // list |
189 | - $subst['$'.$i] = $this->listify($value); |
|
189 | + $subst[ '$'.$i ] = $this->listify($value); |
|
190 | 190 | } else { |
191 | 191 | // associative array |
192 | 192 | // no $i implementation yet, sorry |
193 | - $subst['$'.$i.'.Keys'] = $this->listify($keys); |
|
194 | - $subst['$'.$i.'.Values'] = $this->listify(array_values($value)); |
|
193 | + $subst[ '$'.$i.'.Keys' ] = $this->listify($keys); |
|
194 | + $subst[ '$'.$i.'.Values' ] = $this->listify(array_values($value)); |
|
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 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | } |
31 | 31 | |
32 | 32 | // skip tokens that are armored |
33 | - if (!empty($token->armor['ValidateAttributes'])) { |
|
33 | + if (!empty($token->armor[ 'ValidateAttributes' ])) { |
|
34 | 34 | continue; |
35 | 35 | } |
36 | 36 |
@@ -103,9 +103,9 @@ |
||
103 | 103 | $parent_def = $definition->info_parent_def; |
104 | 104 | $stack = array( |
105 | 105 | array($top_node, |
106 | - $parent_def->descendants_are_inline, |
|
107 | - $parent_def->excludes, // exclusions |
|
108 | - 0) |
|
106 | + $parent_def->descendants_are_inline, |
|
107 | + $parent_def->excludes, // exclusions |
|
108 | + 0) |
|
109 | 109 | ); |
110 | 110 | |
111 | 111 | while (!empty($stack)) { |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $context->register('IsInline', $is_inline); |
62 | 62 | |
63 | 63 | // setup error collector |
64 | - $e =& $context->get('ErrorCollector', true); |
|
64 | + $e = & $context->get('ErrorCollector', true); |
|
65 | 65 | |
66 | 66 | //####################################################################// |
67 | 67 | // Loop initialization |
@@ -112,13 +112,13 @@ discard block |
||
112 | 112 | list($node, $is_inline, $excludes, $ix) = array_pop($stack); |
113 | 113 | // recursive call |
114 | 114 | $go = false; |
115 | - $def = empty($stack) ? $definition->info_parent_def : $definition->info[$node->name]; |
|
116 | - while (isset($node->children[$ix])) { |
|
117 | - $child = $node->children[$ix++]; |
|
115 | + $def = empty($stack) ? $definition->info_parent_def : $definition->info[ $node->name ]; |
|
116 | + while (isset($node->children[ $ix ])) { |
|
117 | + $child = $node->children[ $ix++ ]; |
|
118 | 118 | if ($child instanceof HTMLPurifier_Node_Element) { |
119 | 119 | $go = true; |
120 | - $stack[] = array($node, $is_inline, $excludes, $ix); |
|
121 | - $stack[] = array($child, |
|
120 | + $stack[ ] = array($node, $is_inline, $excludes, $ix); |
|
121 | + $stack[ ] = array($child, |
|
122 | 122 | // ToDo: I don't think it matters if it's def or |
123 | 123 | // child_def, but double check this... |
124 | 124 | $is_inline || $def->descendants_are_inline, |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | if ($go) continue; |
132 | 132 | list($token, $d) = $node->toTokenPair(); |
133 | 133 | // base case |
134 | - if ($excludes_enabled && isset($excludes[$node->name])) { |
|
134 | + if ($excludes_enabled && isset($excludes[ $node->name ])) { |
|
135 | 135 | $node->dead = true; |
136 | 136 | if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded'); |
137 | 137 | } else { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | // strategies handle it |
141 | 141 | $children = array(); |
142 | 142 | foreach ($node->children as $child) { |
143 | - if (!$child->dead) $children[] = $child; |
|
143 | + if (!$child->dead) $children[ ] = $child; |
|
144 | 144 | } |
145 | 145 | $result = $def->child->validateChildren($children, $config, $context); |
146 | 146 | if ($result === true) { |
@@ -128,19 +128,25 @@ discard block |
||
128 | 128 | break; |
129 | 129 | } |
130 | 130 | }; |
131 | - if ($go) continue; |
|
131 | + if ($go) { |
|
132 | + continue; |
|
133 | + } |
|
132 | 134 | list($token, $d) = $node->toTokenPair(); |
133 | 135 | // base case |
134 | 136 | if ($excludes_enabled && isset($excludes[$node->name])) { |
135 | 137 | $node->dead = true; |
136 | - if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded'); |
|
138 | + if ($e) { |
|
139 | + $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded'); |
|
140 | + } |
|
137 | 141 | } else { |
138 | 142 | // XXX I suppose it would be slightly more efficient to |
139 | 143 | // avoid the allocation here and have children |
140 | 144 | // strategies handle it |
141 | 145 | $children = array(); |
142 | 146 | foreach ($node->children as $child) { |
143 | - if (!$child->dead) $children[] = $child; |
|
147 | + if (!$child->dead) { |
|
148 | + $children[] = $child; |
|
149 | + } |
|
144 | 150 | } |
145 | 151 | $result = $def->child->validateChildren($children, $config, $context); |
146 | 152 | if ($result === true) { |
@@ -148,7 +154,9 @@ discard block |
||
148 | 154 | $node->children = $children; |
149 | 155 | } elseif ($result === false) { |
150 | 156 | $node->dead = true; |
151 | - if ($e) $e->send(E_ERROR, 'Strategy_FixNesting: Node removed'); |
|
157 | + if ($e) { |
|
158 | + $e->send(E_ERROR, 'Strategy_FixNesting: Node removed'); |
|
159 | + } |
|
152 | 160 | } else { |
153 | 161 | $node->children = $result; |
154 | 162 | if ($e) { |
@@ -37,9 +37,9 @@ discard block |
||
37 | 37 | |
38 | 38 | // remove script contents compatibility |
39 | 39 | if ($remove_script_contents === true) { |
40 | - $hidden_elements['script'] = true; |
|
41 | - } elseif ($remove_script_contents === false && isset($hidden_elements['script'])) { |
|
42 | - unset($hidden_elements['script']); |
|
40 | + $hidden_elements[ 'script' ] = true; |
|
41 | + } elseif ($remove_script_contents === false && isset($hidden_elements[ 'script' ])) { |
|
42 | + unset($hidden_elements[ 'script' ]); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | $attr_validator = new HTMLPurifier_AttrValidator(); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | $e = false; |
57 | 57 | if ($config->get('Core.CollectErrors')) { |
58 | - $e =& $context->get('ErrorCollector'); |
|
58 | + $e = & $context->get('ErrorCollector'); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | foreach ($tokens as $token) { |
@@ -68,28 +68,28 @@ discard block |
||
68 | 68 | // DEFINITION CALL |
69 | 69 | |
70 | 70 | // before any processing, try to transform the element |
71 | - if (isset($definition->info_tag_transform[$token->name])) { |
|
71 | + if (isset($definition->info_tag_transform[ $token->name ])) { |
|
72 | 72 | $original_name = $token->name; |
73 | 73 | // there is a transformation for this tag |
74 | 74 | // DEFINITION CALL |
75 | 75 | $token = $definition-> |
76 | - info_tag_transform[$token->name]->transform($token, $config, $context); |
|
76 | + info_tag_transform[ $token->name ]->transform($token, $config, $context); |
|
77 | 77 | if ($e) { |
78 | 78 | $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name); |
79 | 79 | } |
80 | 80 | } |
81 | 81 | |
82 | - if (isset($definition->info[$token->name])) { |
|
82 | + if (isset($definition->info[ $token->name ])) { |
|
83 | 83 | // mostly everything's good, but |
84 | 84 | // we need to make sure required attributes are in order |
85 | 85 | if (($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) && |
86 | - $definition->info[$token->name]->required_attr && |
|
86 | + $definition->info[ $token->name ]->required_attr && |
|
87 | 87 | ($token->name != 'img' || $remove_invalid_img) // ensure config option still works |
88 | 88 | ) { |
89 | 89 | $attr_validator->validateToken($token, $config, $context); |
90 | 90 | $ok = true; |
91 | - foreach ($definition->info[$token->name]->required_attr as $name) { |
|
92 | - if (!isset($token->attr[$name])) { |
|
91 | + foreach ($definition->info[ $token->name ]->required_attr as $name) { |
|
92 | + if (!isset($token->attr[ $name ])) { |
|
93 | 93 | $ok = false; |
94 | 94 | break; |
95 | 95 | } |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | } |
105 | 105 | continue; |
106 | 106 | } |
107 | - $token->armor['ValidateAttributes'] = true; |
|
107 | + $token->armor[ 'ValidateAttributes' ] = true; |
|
108 | 108 | } |
109 | 109 | |
110 | - if (isset($hidden_elements[$token->name]) && $token instanceof HTMLPurifier_Token_Start) { |
|
110 | + if (isset($hidden_elements[ $token->name ]) && $token instanceof HTMLPurifier_Token_Start) { |
|
111 | 111 | $textify_comments = $token->name; |
112 | 112 | } elseif ($token->name === $textify_comments && $token instanceof HTMLPurifier_Token_End) { |
113 | 113 | $textify_comments = false; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | } else { |
125 | 125 | // check if we need to destroy all of the tag's children |
126 | 126 | // CAN BE GENERICIZED |
127 | - if (isset($hidden_elements[$token->name])) { |
|
127 | + if (isset($hidden_elements[ $token->name ])) { |
|
128 | 128 | if ($token instanceof HTMLPurifier_Token_Start) { |
129 | 129 | $remove_until = $token->name; |
130 | 130 | } elseif ($token instanceof HTMLPurifier_Token_Empty) { |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $found_double_hyphen = true; |
163 | 163 | $token->data = str_replace('--', '-', $token->data); |
164 | 164 | } |
165 | - if ($trusted || !empty($comment_lookup[trim($token->data)]) || |
|
165 | + if ($trusted || !empty($comment_lookup[ trim($token->data) ]) || |
|
166 | 166 | ($comment_regexp !== null && preg_match($comment_regexp, trim($token->data)))) { |
167 | 167 | // OK good |
168 | 168 | if ($e) { |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | } else { |
194 | 194 | continue; |
195 | 195 | } |
196 | - $result[] = $token; |
|
196 | + $result[ ] = $token; |
|
197 | 197 | } |
198 | 198 | if ($remove_until && $e) { |
199 | 199 | // we removed tokens until the end, throw error |
@@ -7,10 +7,10 @@ |
||
7 | 7 | { |
8 | 8 | public function __construct() |
9 | 9 | { |
10 | - $this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements(); |
|
11 | - $this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed(); |
|
12 | - $this->strategies[] = new HTMLPurifier_Strategy_FixNesting(); |
|
13 | - $this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes(); |
|
10 | + $this->strategies[ ] = new HTMLPurifier_Strategy_RemoveForeignElements(); |
|
11 | + $this->strategies[ ] = new HTMLPurifier_Strategy_MakeWellFormed(); |
|
12 | + $this->strategies[ ] = new HTMLPurifier_Strategy_FixNesting(); |
|
13 | + $this->strategies[ ] = new HTMLPurifier_Strategy_ValidateAttributes(); |
|
14 | 14 | } |
15 | 15 | } |
16 | 16 |
@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | */ |
37 | 37 | public function prependCSS(&$attr, $css) |
38 | 38 | { |
39 | - $attr['style'] = isset($attr['style']) ? $attr['style'] : ''; |
|
40 | - $attr['style'] = $css . $attr['style']; |
|
39 | + $attr[ 'style' ] = isset($attr[ 'style' ]) ? $attr[ 'style' ] : ''; |
|
40 | + $attr[ 'style' ] = $css.$attr[ 'style' ]; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -48,11 +48,11 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function confiscateAttr(&$attr, $key) |
50 | 50 | { |
51 | - if (!isset($attr[$key])) { |
|
51 | + if (!isset($attr[ $key ])) { |
|
52 | 52 | return null; |
53 | 53 | } |
54 | - $value = $attr[$key]; |
|
55 | - unset($attr[$key]); |
|
54 | + $value = $attr[ $key ]; |
|
55 | + unset($attr[ $key ]); |
|
56 | 56 | return $value; |
57 | 57 | } |
58 | 58 | } |