@@ -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 | /** |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public function preFilter($html, $config, $context) |
18 | 18 | { |
19 | - $pre_regex = '#<object[^>]+>.+?' . |
|
19 | + $pre_regex = '#<object[^>]+>.+?'. |
|
20 | 20 | '(?:http:)?//www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s'; |
21 | 21 | $pre_replace = '<span class="youtube-embed">\1</span>'; |
22 | 22 | return preg_replace($pre_regex, $pre_replace, $html); |
@@ -50,14 +50,14 @@ discard block |
||
50 | 50 | protected function postFilterCallback($matches) |
51 | 51 | { |
52 | 52 | $url = $this->armorUrl($matches[1]); |
53 | - return '<object width="425" height="350" type="application/x-shockwave-flash" ' . |
|
54 | - 'data="//www.youtube.com/' . $url . '">' . |
|
55 | - '<param name="movie" value="//www.youtube.com/' . $url . '"></param>' . |
|
56 | - '<!--[if IE]>' . |
|
57 | - '<embed src="//www.youtube.com/' . $url . '"' . |
|
58 | - 'type="application/x-shockwave-flash"' . |
|
59 | - 'wmode="transparent" width="425" height="350" />' . |
|
60 | - '<![endif]-->' . |
|
53 | + return '<object width="425" height="350" type="application/x-shockwave-flash" '. |
|
54 | + 'data="//www.youtube.com/'.$url.'">'. |
|
55 | + '<param name="movie" value="//www.youtube.com/'.$url.'"></param>'. |
|
56 | + '<!--[if IE]>'. |
|
57 | + '<embed src="//www.youtube.com/'.$url.'"'. |
|
58 | + 'type="application/x-shockwave-flash"'. |
|
59 | + 'wmode="transparent" width="425" height="350" />'. |
|
60 | + '<![endif]-->'. |
|
61 | 61 | '</object>'; |
62 | 62 | } |
63 | 63 | } |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | if ($x === ' ') { |
228 | 228 | $delim = ' '; |
229 | 229 | } else { |
230 | - $delim = ' ' . $x . ' '; |
|
230 | + $delim = ' '.$x.' '; |
|
231 | 231 | } |
232 | 232 | } else { |
233 | 233 | // simple selector |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | if ($nx === null) { |
269 | 269 | $nx = ''; |
270 | 270 | } |
271 | - $nx .= $sdelim . $y; |
|
271 | + $nx .= $sdelim.$y; |
|
272 | 272 | } |
273 | 273 | } |
274 | 274 | } |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | if ($nsel === null) { |
277 | 277 | $nsel = $nx; |
278 | 278 | } else { |
279 | - $nsel .= $delim . $nx; |
|
279 | + $nsel .= $delim.$nx; |
|
280 | 280 | } |
281 | 281 | } else { |
282 | 282 | // delimiters to the left of invalid |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $this->context = $context; |
34 | 34 | $this->obj = $obj; |
35 | 35 | $this->member = $member; |
36 | - $this->contents =& $obj->$member; |
|
36 | + $this->contents = & $obj->$member; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | */ |
124 | 124 | protected function error($msg) |
125 | 125 | { |
126 | - throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg); |
|
126 | + throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member).' in '.$this->context.' '.$msg); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 |
@@ -36,10 +36,10 @@ discard block |
||
36 | 36 | public function buildDir($interchange, $dir = null) |
37 | 37 | { |
38 | 38 | if (!$dir) { |
39 | - $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema'; |
|
39 | + $dir = HTMLPURIFIER_PREFIX.'/HTMLPurifier/ConfigSchema/schema'; |
|
40 | 40 | } |
41 | - if (file_exists($dir . '/info.ini')) { |
|
42 | - $info = parse_ini_file($dir . '/info.ini'); |
|
41 | + if (file_exists($dir.'/info.ini')) { |
|
42 | + $info = parse_ini_file($dir.'/info.ini'); |
|
43 | 43 | $interchange->name = $info['name']; |
44 | 44 | } |
45 | 45 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | sort($files); |
57 | 57 | foreach ($files as $file) { |
58 | - $this->buildFile($interchange, $dir . '/' . $file); |
|
58 | + $this->buildFile($interchange, $dir.'/'.$file); |
|
59 | 59 | } |
60 | 60 | return $interchange; |
61 | 61 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $directive->typeAllowsNull |
131 | 131 | ); |
132 | 132 | } catch (HTMLPurifier_VarParserException $e) { |
133 | - throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'"); |
|
133 | + throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage()." in DEFAULT in directive hash '$id'"); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | */ |
180 | 180 | protected function evalArray($contents) |
181 | 181 | { |
182 | - return eval('return array(' . $contents . ');'); |
|
182 | + return eval('return array('.$contents.');'); |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | // This also tests validity of $d->type |
102 | 102 | $this->parser->parse($d->default, $d->type, $d->typeAllowsNull); |
103 | 103 | } catch (HTMLPurifier_VarParserException $e) { |
104 | - $this->error('default', 'had error: ' . $e->getMessage()); |
|
104 | + $this->error('default', 'had error: '.$e->getMessage()); |
|
105 | 105 | } |
106 | 106 | // END - handled by InterchangeBuilder |
107 | 107 | |
@@ -228,11 +228,11 @@ discard block |
||
228 | 228 | protected function error($target, $msg) |
229 | 229 | { |
230 | 230 | if ($target !== false) { |
231 | - $prefix = ucfirst($target) . ' in ' . $this->getFormattedContext(); |
|
231 | + $prefix = ucfirst($target).' in '.$this->getFormattedContext(); |
|
232 | 232 | } else { |
233 | 233 | $prefix = ucfirst($this->getFormattedContext()); |
234 | 234 | } |
235 | - throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg)); |
|
235 | + throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix.' '.$msg)); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function __construct($context) |
58 | 58 | { |
59 | - $this->locale =& $context->get('Locale'); |
|
59 | + $this->locale = & $context->get('Locale'); |
|
60 | 60 | $this->context = $context; |
61 | - $this->_current =& $this->_stacks[0]; |
|
62 | - $this->errors =& $this->_stacks[0]; |
|
61 | + $this->_current = & $this->_stacks[0]; |
|
62 | + $this->errors = & $this->_stacks[0]; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $token = $this->context->get('CurrentToken', true); |
80 | 80 | $line = $token ? $token->line : $this->context->get('CurrentLine', true); |
81 | - $col = $token ? $token->col : $this->context->get('CurrentCol', true); |
|
81 | + $col = $token ? $token->col : $this->context->get('CurrentCol', true); |
|
82 | 82 | $attr = $this->context->get('CurrentAttr', true); |
83 | 83 | |
84 | 84 | // perform special substitutions, also add custom parameters |
@@ -196,9 +196,9 @@ discard block |
||
196 | 196 | } |
197 | 197 | |
198 | 198 | if (empty($errors)) { |
199 | - return '<p>' . $this->locale->getMessage('ErrorCollector: No errors') . '</p>'; |
|
199 | + return '<p>'.$this->locale->getMessage('ErrorCollector: No errors').'</p>'; |
|
200 | 200 | } else { |
201 | - return '<ul><li>' . implode('</li><li>', $ret) . '</li></ul>'; |
|
201 | + return '<ul><li>'.implode('</li><li>', $ret).'</li></ul>'; |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | } else { |
222 | 222 | $string .= '<em class="location">End of Document: </em> '; |
223 | 223 | } |
224 | - $string .= '<strong class="description">' . $this->generator->escape($msg) . '</strong> '; |
|
224 | + $string .= '<strong class="description">'.$this->generator->escape($msg).'</strong> '; |
|
225 | 225 | $string .= '</div>'; |
226 | 226 | // Here, have a marker for the character on the column appropriate. |
227 | 227 | // Be sure to clip extremely long lines. |
@@ -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 | |
@@ -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 |
@@ -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 | } |