@@ -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 |
@@ -77,8 +77,8 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | protected function element($tag, $contents, $attr = array(), $escape = true) |
| 79 | 79 | { |
| 80 | - return $this->start($tag, $attr) . |
|
| 81 | - ($escape ? $this->escape($contents) : $contents) . |
|
| 80 | + return $this->start($tag, $attr). |
|
| 81 | + ($escape ? $this->escape($contents) : $contents). |
|
| 82 | 82 | $this->end($tag); |
| 83 | 83 | } |
| 84 | 84 | |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | $value = $value ? 'On' : 'Off'; |
| 118 | 118 | } |
| 119 | 119 | return |
| 120 | - $this->start('tr') . "\n" . |
|
| 121 | - $this->element('th', $name) . "\n" . |
|
| 122 | - $this->element('td', $value) . "\n" . |
|
| 120 | + $this->start('tr')."\n". |
|
| 121 | + $this->element('th', $name)."\n". |
|
| 122 | + $this->element('td', $value)."\n". |
|
| 123 | 123 | $this->end('tr'); |
| 124 | 124 | } |
| 125 | 125 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | if ($five === null) { |
| 174 | 174 | $five = version_compare(PHP_VERSION, '5', '>='); |
| 175 | 175 | } |
| 176 | - $prefix = 'HTMLPurifier_' . $sec_prefix; |
|
| 176 | + $prefix = 'HTMLPurifier_'.$sec_prefix; |
|
| 177 | 177 | if (!$five) { |
| 178 | 178 | $prefix = strtolower($prefix); |
| 179 | 179 | } |
@@ -196,11 +196,11 @@ discard block |
||
| 196 | 196 | $class .= implode(', ', $values); |
| 197 | 197 | break; |
| 198 | 198 | case 'css_multiple': |
| 199 | - $class .= $this->getClass($obj->single, $sec_prefix) . ', '; |
|
| 199 | + $class .= $this->getClass($obj->single, $sec_prefix).', '; |
|
| 200 | 200 | $class .= $obj->max; |
| 201 | 201 | break; |
| 202 | 202 | case 'css_denyelementdecorator': |
| 203 | - $class .= $this->getClass($obj->def, $sec_prefix) . ', '; |
|
| 203 | + $class .= $this->getClass($obj->def, $sec_prefix).', '; |
|
| 204 | 204 | $class .= $obj->element; |
| 205 | 205 | break; |
| 206 | 206 | case 'css_importantdecorator': |
@@ -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. |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | public static function getCSS() |
| 73 | 73 | { |
| 74 | - return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css'); |
|
| 74 | + return file_get_contents(HTMLPURIFIER_PREFIX.'/HTMLPurifier/Printer/ConfigForm.css'); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | public static function getJavaScript() |
| 81 | 81 | { |
| 82 | - return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js'); |
|
| 82 | + return file_get_contents(HTMLPURIFIER_PREFIX.'/HTMLPurifier/Printer/ConfigForm.js'); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $all = array(); |
| 108 | 108 | foreach ($allowed as $key) { |
| 109 | 109 | list($ns, $directive) = $key; |
| 110 | - $all[$ns][$directive] = $config->get($ns . '.' . $directive); |
|
| 110 | + $all[$ns][$directive] = $config->get($ns.'.'.$directive); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | $ret = ''; |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | if (!$this->compress || (strlen($directive) < $this->compress)) { |
| 164 | 164 | $directive_disp = $directive; |
| 165 | 165 | } else { |
| 166 | - $directive_disp = substr($directive, 0, $this->compress - 2) . '...'; |
|
| 166 | + $directive_disp = substr($directive, 0, $this->compress - 2).'...'; |
|
| 167 | 167 | $attr['title'] = $directive; |
| 168 | 168 | } |
| 169 | 169 | |
@@ -251,14 +251,14 @@ discard block |
||
| 251 | 251 | 'type' => 'checkbox', |
| 252 | 252 | 'value' => '1', |
| 253 | 253 | 'class' => 'null-toggle', |
| 254 | - 'name' => "$name" . "[Null_$ns.$directive]", |
|
| 254 | + 'name' => "$name"."[Null_$ns.$directive]", |
|
| 255 | 255 | 'id' => "$name:Null_$ns.$directive", |
| 256 | 256 | 'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!! |
| 257 | 257 | ); |
| 258 | 258 | if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) { |
| 259 | 259 | // modify inline javascript slightly |
| 260 | 260 | $attr['onclick'] = |
| 261 | - "toggleWriteability('$name:Yes_$ns.$directive',checked);" . |
|
| 261 | + "toggleWriteability('$name:Yes_$ns.$directive',checked);". |
|
| 262 | 262 | "toggleWriteability('$name:No_$ns.$directive',checked)"; |
| 263 | 263 | } |
| 264 | 264 | if ($value === null) { |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | case HTMLPurifier_VarParser::HASH: |
| 328 | 328 | $nvalue = ''; |
| 329 | 329 | foreach ($value as $i => $v) { |
| 330 | - $nvalue .= "$i:$v" . PHP_EOL; |
|
| 330 | + $nvalue .= "$i:$v".PHP_EOL; |
|
| 331 | 331 | } |
| 332 | 332 | $value = $nvalue; |
| 333 | 333 | break; |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | $value = serialize($value); |
| 341 | 341 | } |
| 342 | 342 | $attr = array( |
| 343 | - 'name' => "$name" . "[$ns.$directive]", |
|
| 343 | + 'name' => "$name"."[$ns.$directive]", |
|
| 344 | 344 | 'id' => "$name:$ns.$directive" |
| 345 | 345 | ); |
| 346 | 346 | if ($value === null) { |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | |
| 408 | 408 | $attr = array( |
| 409 | 409 | 'type' => 'radio', |
| 410 | - 'name' => "$name" . "[$ns.$directive]", |
|
| 410 | + 'name' => "$name"."[$ns.$directive]", |
|
| 411 | 411 | 'id' => "$name:Yes_$ns.$directive", |
| 412 | 412 | 'value' => '1' |
| 413 | 413 | ); |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | |
| 427 | 427 | $attr = array( |
| 428 | 428 | 'type' => 'radio', |
| 429 | - 'name' => "$name" . "[$ns.$directive]", |
|
| 429 | + 'name' => "$name"."[$ns.$directive]", |
|
| 430 | 430 | 'id' => "$name:No_$ns.$directive", |
| 431 | 431 | 'value' => '0' |
| 432 | 432 | ); |