{$item->category} {$item->title}
+
+
{$lang->installed} {$lang->install} @@ -90,6 +100,14 @@
{$item->category} {$item->title}
{cut_str($item->package_description,200)}
+
, so // any later token processing scripts must convert improperly // classified EmptyTags from StartTags. - $is_self_closing = (strrpos($segment,'/') === $strlen_segment-1); + $is_self_closing = (strrpos($segment, '/') === $strlen_segment - 1); if ($is_self_closing) { $strlen_segment--; $segment = substr($segment, 0, $strlen_segment); @@ -269,14 +289,16 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer $attribute_string = trim( substr( - $segment, $position_first_space + $segment, + $position_first_space ) ); if ($attribute_string) { $attr = $this->parseAttributeString( - $attribute_string - , $config, $context - ); + $attribute_string, + $config, + $context + ); } else { $attr = array(); } @@ -296,15 +318,19 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer continue; } else { // inside tag, but there's no ending > sign - if ($e) $e->send(E_WARNING, 'Lexer: Missing gt'); + if ($e) { + $e->send(E_WARNING, 'Lexer: Missing gt'); + } $token = new - HTMLPurifier_Token_Text( - '<' . - $this->parseData( - substr($html, $cursor) - ) - ); - if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col); + HTMLPurifier_Token_Text( + '<' . + $this->parseData( + substr($html, $cursor) + ) + ); + if ($maintain_line_numbers) { + $token->rawPosition($current_line, $current_col); + } // no cursor scroll? Hmm... $array[] = $token; break; @@ -319,8 +345,14 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer /** * PHP 5.0.x compatible substr_count that implements offset and length + * @param string $haystack + * @param string $needle + * @param int $offset + * @param int $length + * @return int */ - protected function substrCount($haystack, $needle, $offset, $length) { + protected function substrCount($haystack, $needle, $offset, $length) + { static $oldVersion; if ($oldVersion === null) { $oldVersion = version_compare(PHP_VERSION, '5.1', '<'); @@ -336,13 +368,18 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer /** * Takes the inside of an HTML tag and makes an assoc array of attributes. * - * @param $string Inside of tag excluding name. - * @returns Assoc array of attributes. + * @param string $string Inside of tag excluding name. + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return array Assoc array of attributes. */ - public function parseAttributeString($string, $config, $context) { - $string = (string) $string; // quick typecast + public function parseAttributeString($string, $config, $context) + { + $string = (string)$string; // quick typecast - if ($string == '') return array(); // no attributes + if ($string == '') { + return array(); + } // no attributes $e = false; if ($config->get('Core.CollectErrors')) { @@ -361,46 +398,55 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer list($key, $quoted_value) = explode('=', $string); $quoted_value = trim($quoted_value); if (!$key) { - if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key'); + if ($e) { + $e->send(E_ERROR, 'Lexer: Missing attribute key'); + } return array(); } - if (!$quoted_value) return array($key => ''); + if (!$quoted_value) { + return array($key => ''); + } $first_char = @$quoted_value[0]; - $last_char = @$quoted_value[strlen($quoted_value)-1]; + $last_char = @$quoted_value[strlen($quoted_value) - 1]; $same_quote = ($first_char == $last_char); $open_quote = ($first_char == '"' || $first_char == "'"); - if ( $same_quote && $open_quote) { + if ($same_quote && $open_quote) { // well behaved $value = substr($quoted_value, 1, strlen($quoted_value) - 2); } else { // not well behaved if ($open_quote) { - if ($e) $e->send(E_ERROR, 'Lexer: Missing end quote'); + if ($e) { + $e->send(E_ERROR, 'Lexer: Missing end quote'); + } $value = substr($quoted_value, 1); } else { $value = $quoted_value; } } - if ($value === false) $value = ''; + if ($value === false) { + $value = ''; + } return array($key => $this->parseData($value)); } // setup loop environment - $array = array(); // return assoc array of attributes + $array = array(); // return assoc array of attributes $cursor = 0; // current position in string (moves forward) - $size = strlen($string); // size of the string (stays the same) + $size = strlen($string); // size of the string (stays the same) // if we have unquoted attributes, the parser expects a terminating // space, so let's guarantee that there's always a terminating space. $string .= ' '; - while(true) { - - if ($cursor >= $size) { - break; + $old_cursor = -1; + while ($cursor < $size) { + if ($old_cursor >= $cursor) { + throw new Exception("Infinite loop detected"); } + $old_cursor = $cursor; $cursor += ($value = strspn($string, $this->_whitespace, $cursor)); // grab the key @@ -415,8 +461,10 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer $key = substr($string, $key_begin, $key_end - $key_begin); if (!$key) { - if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key'); - $cursor += strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop + if ($e) { + $e->send(E_ERROR, 'Lexer: Missing attribute key'); + } + $cursor += 1 + strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop continue; // empty key } @@ -467,24 +515,25 @@ class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer } $value = substr($string, $value_begin, $value_end - $value_begin); - if ($value === false) $value = ''; + if ($value === false) { + $value = ''; + } $array[$key] = $this->parseData($value); $cursor++; - } else { // boolattr if ($key !== '') { $array[$key] = $key; } else { // purely theoretical - if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key'); + if ($e) { + $e->send(E_ERROR, 'Lexer: Missing attribute key'); + } } - } } return $array; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php b/classes/security/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php index faf00b829..ff4fa218f 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php @@ -3,16 +3,23 @@ /** * Experimental HTML5-based parser using Jeroen van der Meer's PH5P library. * Occupies space in the HTML5 pseudo-namespace, which may cause conflicts. - * + * * @note * Recent changes to PHP's DOM extension have resulted in some fatal * error conditions with the original version of PH5P. Pending changes, - * this lexer will punt to DirectLex if DOM throughs an exception. + * this lexer will punt to DirectLex if DOM throws an exception. */ -class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex { - - public function tokenizeHTML($html, $config, $context) { +class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex +{ + /** + * @param string $html + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return HTMLPurifier_Token[] + */ + public function tokenizeHTML($html, $config, $context) + { $new_html = $this->normalize($html, $config, $context); $new_html = $this->wrapHTML($new_html, $config, $context); try { @@ -27,40 +34,41 @@ class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex { $tokens = array(); $this->tokenizeDOM( $doc->getElementsByTagName('html')->item(0)-> // - getElementsByTagName('body')->item(0)-> // - getElementsByTagName('div')->item(0) //
- , $tokens);
+ getElementsByTagName('body')->item(0) //
+ ,
+ $tokens
+ );
return $tokens;
}
-
}
/*
-Copyright 2007 Jeroen van der Meer
'; printTokens($tokens, $t); printTokens($this->stack); + //echo '
'; printZipper($zipper, $token);//printTokens($this->stack); //flush(); // quick-check: if it's not a tag, no need to process if (empty($token->is_tag)) { if ($token instanceof HTMLPurifier_Token_Text) { foreach ($this->injectors as $i => $injector) { - if (isset($token->skip[$i])) continue; - if ($token->rewind !== null && $token->rewind !== $i) continue; - $injector->handleText($token); - $this->processToken($token, $i); + if (isset($token->skip[$i])) { + continue; + } + if ($token->rewind !== null && $token->rewind !== $i) { + continue; + } + // XXX fuckup + $r = $token; + $injector->handleText($r); + $token = $this->processToken($r, $i); $reprocess = true; break; } @@ -207,12 +237,22 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy $ok = false; if ($type === 'empty' && $token instanceof HTMLPurifier_Token_Start) { // claims to be a start tag but is empty - $token = new HTMLPurifier_Token_Empty($token->name, $token->attr, $token->line, $token->col, $token->armor); + $token = new HTMLPurifier_Token_Empty( + $token->name, + $token->attr, + $token->line, + $token->col, + $token->armor + ); $ok = true; } elseif ($type && $type !== 'empty' && $token instanceof HTMLPurifier_Token_Empty) { // claims to be empty but really is a start tag - $this->swap(new HTMLPurifier_Token_End($token->name)); - $this->insertBefore(new HTMLPurifier_Token_Start($token->name, $token->attr, $token->line, $token->col, $token->armor)); + // NB: this assignment is required + $old_token = $token; + $token = new HTMLPurifier_Token_End($token->name); + $token = $this->insertBefore( + new HTMLPurifier_Token_Start($old_token->name, $old_token->attr, $old_token->line, $old_token->col, $old_token->armor) + ); // punt (since we had to modify the input stream in a non-trivial way) $reprocess = true; continue; @@ -241,31 +281,32 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy $parent = array_pop($this->stack); $this->stack[] = $parent; + $parent_def = null; + $parent_elements = null; + $autoclose = false; if (isset($definition->info[$parent->name])) { - $elements = $definition->info[$parent->name]->child->getAllowedElements($config); - $autoclose = !isset($elements[$token->name]); - } else { - $autoclose = false; + $parent_def = $definition->info[$parent->name]; + $parent_elements = $parent_def->child->getAllowedElements($config); + $autoclose = !isset($parent_elements[$token->name]); } if ($autoclose && $definition->info[$token->name]->wrap) { - // Check if an element can be wrapped by another - // element to make it valid in a context (for + // Check if an element can be wrapped by another + // element to make it valid in a context (for // example,
diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html
index 82e0a0073..97dddf058 100644
--- a/layouts/xe_official/layout.html
+++ b/layouts/xe_official/layout.html
@@ -53,6 +53,6 @@ body{background:url({$layout_info->background_image}) repeat-x left top;}
diff --git a/layouts/xedition/demo/welcome_main.html b/layouts/xedition/demo/welcome_main.html
index 08ea671c4..c4156d6cc 100644
--- a/layouts/xedition/demo/welcome_main.html
+++ b/layouts/xedition/demo/welcome_main.html
@@ -3,7 +3,7 @@
'; printTokens($tokens, $t); printTokens($this->stack); + //echo '
'; printZipper($zipper, $token);//printTokens($this->stack); //flush(); // quick-check: if it's not a tag, no need to process if (empty($token->is_tag)) { if ($token instanceof HTMLPurifier_Token_Text) { foreach ($this->injectors as $i => $injector) { - if (isset($token->skip[$i])) continue; - if ($token->rewind !== null && $token->rewind !== $i) continue; - $injector->handleText($token); - $this->processToken($token, $i); + if (isset($token->skip[$i])) { + continue; + } + if ($token->rewind !== null && $token->rewind !== $i) { + continue; + } + // XXX fuckup + $r = $token; + $injector->handleText($r); + $token = $this->processToken($r, $i); $reprocess = true; break; } @@ -207,12 +237,22 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy $ok = false; if ($type === 'empty' && $token instanceof HTMLPurifier_Token_Start) { // claims to be a start tag but is empty - $token = new HTMLPurifier_Token_Empty($token->name, $token->attr, $token->line, $token->col, $token->armor); + $token = new HTMLPurifier_Token_Empty( + $token->name, + $token->attr, + $token->line, + $token->col, + $token->armor + ); $ok = true; } elseif ($type && $type !== 'empty' && $token instanceof HTMLPurifier_Token_Empty) { // claims to be empty but really is a start tag - $this->swap(new HTMLPurifier_Token_End($token->name)); - $this->insertBefore(new HTMLPurifier_Token_Start($token->name, $token->attr, $token->line, $token->col, $token->armor)); + // NB: this assignment is required + $old_token = $token; + $token = new HTMLPurifier_Token_End($token->name); + $token = $this->insertBefore( + new HTMLPurifier_Token_Start($old_token->name, $old_token->attr, $old_token->line, $old_token->col, $old_token->armor) + ); // punt (since we had to modify the input stream in a non-trivial way) $reprocess = true; continue; @@ -241,31 +281,32 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy $parent = array_pop($this->stack); $this->stack[] = $parent; + $parent_def = null; + $parent_elements = null; + $autoclose = false; if (isset($definition->info[$parent->name])) { - $elements = $definition->info[$parent->name]->child->getAllowedElements($config); - $autoclose = !isset($elements[$token->name]); - } else { - $autoclose = false; + $parent_def = $definition->info[$parent->name]; + $parent_elements = $parent_def->child->getAllowedElements($config); + $autoclose = !isset($parent_elements[$token->name]); } if ($autoclose && $definition->info[$token->name]->wrap) { - // Check if an element can be wrapped by another - // element to make it valid in a context (for + // Check if an element can be wrapped by another + // element to make it valid in a context (for // example,
- in between)
$wrapname = $definition->info[$token->name]->wrap;
$wrapdef = $definition->info[$wrapname];
$elements = $wrapdef->child->getAllowedElements($config);
- $parent_elements = $definition->info[$parent->name]->child->getAllowedElements($config);
if (isset($elements[$token->name]) && isset($parent_elements[$wrapname])) {
$newtoken = new HTMLPurifier_Token_Start($wrapname);
- $this->insertBefore($newtoken);
+ $token = $this->insertBefore($newtoken);
$reprocess = true;
continue;
}
}
$carryover = false;
- if ($autoclose && $definition->info[$parent->name]->formatting) {
+ if ($autoclose && $parent_def->formatting) {
$carryover = true;
}
@@ -295,15 +336,6 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
// errors need to be updated
$new_token = new HTMLPurifier_Token_End($parent->name);
$new_token->start = $parent;
- if ($carryover) {
- $element = clone $parent;
- // [TagClosedAuto]
- $element->armor['MakeWellFormed_TagClosedError'] = true;
- $element->carryover = true;
- $this->processToken(array($new_token, $token, $element));
- } else {
- $this->insertBefore($new_token);
- }
// [TagClosedSuppress]
if ($e && !isset($parent->armor['MakeWellFormed_TagClosedError'])) {
if (!$carryover) {
@@ -312,8 +344,17 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
$e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag carryover', $parent);
}
}
+ if ($carryover) {
+ $element = clone $parent;
+ // [TagClosedAuto]
+ $element->armor['MakeWellFormed_TagClosedError'] = true;
+ $element->carryover = true;
+ $token = $this->processToken(array($new_token, $token, $element));
+ } else {
+ $token = $this->insertBefore($new_token);
+ }
} else {
- $this->remove();
+ $token = $this->remove();
}
$reprocess = true;
continue;
@@ -325,20 +366,26 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
if ($ok) {
foreach ($this->injectors as $i => $injector) {
- if (isset($token->skip[$i])) continue;
- if ($token->rewind !== null && $token->rewind !== $i) continue;
- $injector->handleElement($token);
- $this->processToken($token, $i);
+ if (isset($token->skip[$i])) {
+ continue;
+ }
+ if ($token->rewind !== null && $token->rewind !== $i) {
+ continue;
+ }
+ $r = $token;
+ $injector->handleElement($r);
+ $token = $this->processToken($r, $i);
$reprocess = true;
break;
}
if (!$reprocess) {
// ah, nothing interesting happened; do normal processing
- $this->swap($token);
if ($token instanceof HTMLPurifier_Token_Start) {
$this->stack[] = $token;
} elseif ($token instanceof HTMLPurifier_Token_End) {
- throw new HTMLPurifier_Exception('Improper handling of end tag in start code; possible error in MakeWellFormed');
+ throw new HTMLPurifier_Exception(
+ 'Improper handling of end tag in start code; possible error in MakeWellFormed'
+ );
}
}
continue;
@@ -352,13 +399,15 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
// make sure that we have something open
if (empty($this->stack)) {
if ($escape_invalid_tags) {
- if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
- $this->swap(new HTMLPurifier_Token_Text(
- $generator->generateFromToken($token)
- ));
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag to text');
+ }
+ $token = new HTMLPurifier_Token_Text($generator->generateFromToken($token));
} else {
- $this->remove();
- if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_MakeWellFormed: Unnecessary end tag removed');
+ }
+ $token = $this->remove();
}
$reprocess = true;
continue;
@@ -372,10 +421,15 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
if ($current_parent->name == $token->name) {
$token->start = $current_parent;
foreach ($this->injectors as $i => $injector) {
- if (isset($token->skip[$i])) continue;
- if ($token->rewind !== null && $token->rewind !== $i) continue;
- $injector->handleEnd($token);
- $this->processToken($token, $i);
+ if (isset($token->skip[$i])) {
+ continue;
+ }
+ if ($token->rewind !== null && $token->rewind !== $i) {
+ continue;
+ }
+ $r = $token;
+ $injector->handleEnd($r);
+ $token = $this->processToken($r, $i);
$this->stack[] = $current_parent;
$reprocess = true;
break;
@@ -403,13 +457,15 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
// we didn't find the tag, so remove
if ($skipped_tags === false) {
if ($escape_invalid_tags) {
- $this->swap(new HTMLPurifier_Token_Text(
- $generator->generateFromToken($token)
- ));
- if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag to text');
+ }
+ $token = new HTMLPurifier_Token_Text($generator->generateFromToken($token));
} else {
- $this->remove();
- if ($e) $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_MakeWellFormed: Stray end tag removed');
+ }
+ $token = $this->remove();
}
$reprocess = true;
continue;
@@ -442,18 +498,17 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
$replace[] = $element;
}
}
- $this->processToken($replace);
+ $token = $this->processToken($replace);
$reprocess = true;
continue;
}
- $context->destroy('CurrentNesting');
- $context->destroy('InputTokens');
- $context->destroy('InputIndex');
$context->destroy('CurrentToken');
+ $context->destroy('CurrentNesting');
+ $context->destroy('InputZipper');
- unset($this->injectors, $this->stack, $this->tokens, $this->t);
- return $tokens;
+ unset($this->injectors, $this->stack, $this->tokens);
+ return $zipper->toArray($token);
}
/**
@@ -472,25 +527,38 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
* If $token is an integer, that number of tokens (with the first token
* being the current one) will be deleted.
*
- * @param $token Token substitution value
- * @param $injector Injector that performed the substitution; default is if
+ * @param HTMLPurifier_Token|array|int|bool $token Token substitution value
+ * @param HTMLPurifier_Injector|int $injector Injector that performed the substitution; default is if
* this is not an injector related operation.
+ * @throws HTMLPurifier_Exception
*/
- protected function processToken($token, $injector = -1) {
-
+ protected function processToken($token, $injector = -1)
+ {
// normalize forms of token
- if (is_object($token)) $token = array(1, $token);
- if (is_int($token)) $token = array($token);
- if ($token === false) $token = array(1);
- if (!is_array($token)) throw new HTMLPurifier_Exception('Invalid token type from injector');
- if (!is_int($token[0])) array_unshift($token, 1);
- if ($token[0] === 0) throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
+ if (is_object($token)) {
+ $token = array(1, $token);
+ }
+ if (is_int($token)) {
+ $token = array($token);
+ }
+ if ($token === false) {
+ $token = array(1);
+ }
+ if (!is_array($token)) {
+ throw new HTMLPurifier_Exception('Invalid token type from injector');
+ }
+ if (!is_int($token[0])) {
+ array_unshift($token, 1);
+ }
+ if ($token[0] === 0) {
+ throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
+ }
// $token is now an array with the following form:
// array(number nodes to delete, new node 1, new node 2, ...)
$delete = array_shift($token);
- $old = array_splice($this->tokens, $this->t, $delete, $token);
+ list($old, $r) = $this->zipper->splice($this->token, $delete, $token);
if ($injector > -1) {
// determine appropriate skips
@@ -501,32 +569,32 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
}
}
+ return $r;
+
}
/**
* Inserts a token before the current token. Cursor now points to
* this token. You must reprocess after this.
+ * @param HTMLPurifier_Token $token
*/
- private function insertBefore($token) {
- array_splice($this->tokens, $this->t, 0, array($token));
+ private function insertBefore($token)
+ {
+ // NB not $this->zipper->insertBefore(), due to positioning
+ // differences
+ $splice = $this->zipper->splice($this->token, 0, array($token));
+
+ return $splice[1];
}
/**
* Removes current token. Cursor now points to new token occupying previously
* occupied space. You must reprocess after this.
*/
- private function remove() {
- array_splice($this->tokens, $this->t, 1);
+ private function remove()
+ {
+ return $this->zipper->delete();
}
-
- /**
- * Swap current token with new token. Cursor points to new token (no
- * change). You must reprocess after this.
- */
- private function swap($token) {
- $this->tokens[$this->t] = $token;
- }
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/classes/security/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
index bccaf14d3..1a8149ecc 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php
@@ -11,13 +11,20 @@
class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
{
- public function execute($tokens, $config, $context) {
+ /**
+ * @param HTMLPurifier_Token[] $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return array|HTMLPurifier_Token[]
+ */
+ public function execute($tokens, $config, $context)
+ {
$definition = $config->getHTMLDefinition();
$generator = new HTMLPurifier_Generator($config, $context);
$result = array();
$escape_invalid_tags = $config->get('Core.EscapeInvalidTags');
- $remove_invalid_img = $config->get('Core.RemoveInvalidImg');
+ $remove_invalid_img = $config->get('Core.RemoveInvalidImg');
// currently only used to determine if comments should be kept
$trusted = $config->get('HTML.Trusted');
@@ -26,7 +33,7 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
$check_comments = $comment_lookup !== array() || $comment_regexp !== null;
$remove_script_contents = $config->get('Core.RemoveScriptContents');
- $hidden_elements = $config->get('Core.HiddenElements');
+ $hidden_elements = $config->get('Core.HiddenElements');
// remove script contents compatibility
if ($remove_script_contents === true) {
@@ -51,34 +58,31 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
$e =& $context->get('ErrorCollector');
}
- foreach($tokens as $token) {
+ foreach ($tokens as $token) {
if ($remove_until) {
if (empty($token->is_tag) || $token->name !== $remove_until) {
continue;
}
}
- if (!empty( $token->is_tag )) {
+ if (!empty($token->is_tag)) {
// DEFINITION CALL
// before any processing, try to transform the element
- if (
- isset($definition->info_tag_transform[$token->name])
- ) {
+ if (isset($definition->info_tag_transform[$token->name])) {
$original_name = $token->name;
// there is a transformation for this tag
// DEFINITION CALL
$token = $definition->
- info_tag_transform[$token->name]->
- transform($token, $config, $context);
- if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
+ info_tag_transform[$token->name]->transform($token, $config, $context);
+ if ($e) {
+ $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Tag transform', $original_name);
+ }
}
if (isset($definition->info[$token->name])) {
-
// mostly everything's good, but
// we need to make sure required attributes are in order
- if (
- ($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
+ if (($token instanceof HTMLPurifier_Token_Start || $token instanceof HTMLPurifier_Token_Empty) &&
$definition->info[$token->name]->required_attr &&
($token->name != 'img' || $remove_invalid_img) // ensure config option still works
) {
@@ -91,7 +95,13 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
}
}
if (!$ok) {
- if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Missing required attribute', $name);
+ if ($e) {
+ $e->send(
+ E_ERROR,
+ 'Strategy_RemoveForeignElements: Missing required attribute',
+ $name
+ );
+ }
continue;
}
$token->armor['ValidateAttributes'] = true;
@@ -105,7 +115,9 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
} elseif ($escape_invalid_tags) {
// invalid tag, generate HTML representation and insert in
- if ($e) $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
+ if ($e) {
+ $e->send(E_WARNING, 'Strategy_RemoveForeignElements: Foreign element to text');
+ }
$token = new HTMLPurifier_Token_Text(
$generator->generateFromToken($token)
);
@@ -120,9 +132,13 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
} else {
$remove_until = false;
}
- if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
+ if ($e) {
+ $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign meta element removed');
+ }
} else {
- if ($e) $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
+ if ($e) {
+ $e->send(E_ERROR, 'Strategy_RemoveForeignElements: Foreign element removed');
+ }
}
continue;
}
@@ -146,11 +162,15 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
$found_double_hyphen = true;
$token->data = str_replace('--', '-', $token->data);
}
- if ($trusted || !empty($comment_lookup[trim($token->data)]) || ($comment_regexp !== NULL && preg_match($comment_regexp, trim($token->data)))) {
+ if ($trusted || !empty($comment_lookup[trim($token->data)]) ||
+ ($comment_regexp !== null && preg_match($comment_regexp, trim($token->data)))) {
// OK good
if ($e) {
if ($trailing_hyphen) {
- $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed');
+ $e->send(
+ E_NOTICE,
+ 'Strategy_RemoveForeignElements: Trailing hyphen in comment removed'
+ );
}
if ($found_double_hyphen) {
$e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Hyphens in comment collapsed');
@@ -164,7 +184,9 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
}
} else {
// strip comments
- if ($e) $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+ if ($e) {
+ $e->send(E_NOTICE, 'Strategy_RemoveForeignElements: Comment removed');
+ }
continue;
}
} elseif ($token instanceof HTMLPurifier_Token_Text) {
@@ -177,12 +199,9 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
// we removed tokens until the end, throw error
$e->send(E_ERROR, 'Strategy_RemoveForeignElements: Token removed to end', $remove_until);
}
-
$context->destroy('CurrentToken');
-
return $result;
}
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php b/classes/security/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
index c3328a9d4..fbb3d27c8 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php
@@ -7,8 +7,14 @@
class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
{
- public function execute($tokens, $config, $context) {
-
+ /**
+ * @param HTMLPurifier_Token[] $tokens
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token[]
+ */
+ public function execute($tokens, $config, $context)
+ {
// setup validator
$validator = new HTMLPurifier_AttrValidator();
@@ -19,21 +25,21 @@ class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
// only process tokens that have attributes,
// namely start and empty tags
- if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) continue;
+ if (!$token instanceof HTMLPurifier_Token_Start && !$token instanceof HTMLPurifier_Token_Empty) {
+ continue;
+ }
// skip tokens that are armored
- if (!empty($token->armor['ValidateAttributes'])) continue;
+ if (!empty($token->armor['ValidateAttributes'])) {
+ continue;
+ }
// note that we have no facilities here for removing tokens
$validator->validateToken($token, $config, $context);
-
- $tokens[$key] = $token; // for PHP 4
}
$context->destroy('CurrentToken');
-
return $tokens;
}
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/StringHash.php b/classes/security/htmlpurifier/library/HTMLPurifier/StringHash.php
index 62085c5c2..c07370197 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/StringHash.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/StringHash.php
@@ -10,28 +10,36 @@
*/
class HTMLPurifier_StringHash extends ArrayObject
{
+ /**
+ * @type array
+ */
protected $accessed = array();
/**
* Retrieves a value, and logs the access.
+ * @param mixed $index
+ * @return mixed
*/
- public function offsetGet($index) {
+ public function offsetGet($index)
+ {
$this->accessed[$index] = true;
return parent::offsetGet($index);
}
/**
* Returns a lookup array of all array indexes that have been accessed.
- * @return Array in form array($index => true).
+ * @return array in form array($index => true).
*/
- public function getAccessed() {
+ public function getAccessed()
+ {
return $this->accessed;
}
/**
* Resets the access array.
*/
- public function resetAccessed() {
+ public function resetAccessed()
+ {
$this->accessed = array();
}
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/StringHashParser.php b/classes/security/htmlpurifier/library/HTMLPurifier/StringHashParser.php
index f3e70c712..7c73f8083 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/StringHashParser.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/StringHashParser.php
@@ -28,15 +28,25 @@
class HTMLPurifier_StringHashParser
{
+ /**
+ * @type string
+ */
public $default = 'ID';
/**
* Parses a file that contains a single string-hash.
+ * @param string $file
+ * @return array
*/
- public function parseFile($file) {
- if (!file_exists($file)) return false;
+ public function parseFile($file)
+ {
+ if (!file_exists($file)) {
+ return false;
+ }
$fh = fopen($file, 'r');
- if (!$fh) return false;
+ if (!$fh) {
+ return false;
+ }
$ret = $this->parseHandle($fh);
fclose($fh);
return $ret;
@@ -44,12 +54,19 @@ class HTMLPurifier_StringHashParser
/**
* Parses a file that contains multiple string-hashes delimited by '----'
+ * @param string $file
+ * @return array
*/
- public function parseMultiFile($file) {
- if (!file_exists($file)) return false;
+ public function parseMultiFile($file)
+ {
+ if (!file_exists($file)) {
+ return false;
+ }
$ret = array();
$fh = fopen($file, 'r');
- if (!$fh) return false;
+ if (!$fh) {
+ return false;
+ }
while (!feof($fh)) {
$ret[] = $this->parseHandle($fh);
}
@@ -62,26 +79,36 @@ class HTMLPurifier_StringHashParser
* @note While it's possible to simulate in-memory parsing by using
* custom stream wrappers, if such a use-case arises we should
* factor out the file handle into its own class.
- * @param $fh File handle with pointer at start of valid string-hash
+ * @param resource $fh File handle with pointer at start of valid string-hash
* block.
+ * @return array
*/
- protected function parseHandle($fh) {
+ protected function parseHandle($fh)
+ {
$state = false;
$single = false;
$ret = array();
do {
$line = fgets($fh);
- if ($line === false) break;
+ if ($line === false) {
+ break;
+ }
$line = rtrim($line, "\n\r");
- if (!$state && $line === '') continue;
- if ($line === '----') break;
+ if (!$state && $line === '') {
+ continue;
+ }
+ if ($line === '----') {
+ break;
+ }
if (strncmp('--#', $line, 3) === 0) {
// Comment
continue;
} elseif (strncmp('--', $line, 2) === 0) {
// Multiline declaration
$state = trim($line, '- ');
- if (!isset($ret[$state])) $ret[$state] = '';
+ if (!isset($ret[$state])) {
+ $ret[$state] = '';
+ }
continue;
} elseif (!$state) {
$single = true;
@@ -104,7 +131,6 @@ class HTMLPurifier_StringHashParser
} while (!feof($fh));
return $ret;
}
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform.php b/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform.php
index 210a44721..7b8d83343 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform.php
@@ -8,14 +8,15 @@ abstract class HTMLPurifier_TagTransform
/**
* Tag name to transform the tag to.
+ * @type string
*/
public $transform_to;
/**
* Transforms the obsolete tag into the valid tag.
- * @param $tag Tag to be transformed.
- * @param $config Mandatory HTMLPurifier_Config object
- * @param $context Mandatory HTMLPurifier_Context object
+ * @param HTMLPurifier_Token_Tag $tag Tag to be transformed.
+ * @param HTMLPurifier_Config $config Mandatory HTMLPurifier_Config object
+ * @param HTMLPurifier_Context $context Mandatory HTMLPurifier_Context object
*/
abstract public function transform($tag, $config, $context);
@@ -23,14 +24,14 @@ abstract class HTMLPurifier_TagTransform
* Prepends CSS properties to the style attribute, creating the
* attribute if it doesn't exist.
* @warning Copied over from AttrTransform, be sure to keep in sync
- * @param $attr Attribute array to process (passed by reference)
- * @param $css CSS to prepend
+ * @param array $attr Attribute array to process (passed by reference)
+ * @param string $css CSS to prepend
*/
- protected function prependCSS(&$attr, $css) {
+ protected function prependCSS(&$attr, $css)
+ {
$attr['style'] = isset($attr['style']) ? $attr['style'] : '';
$attr['style'] = $css . $attr['style'];
}
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php b/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
index 9db2db795..7853d90bc 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php
@@ -17,9 +17,14 @@
*/
class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
{
-
+ /**
+ * @type string
+ */
public $transform_to = 'span';
+ /**
+ * @type array
+ */
protected $_size_lookup = array(
'0' => 'xx-small',
'1' => 'xx-small',
@@ -37,8 +42,14 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
'+4' => '300%'
);
- public function transform($tag, $config, $context) {
-
+ /**
+ * @param HTMLPurifier_Token_Tag $tag
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_Token_End|string
+ */
+ public function transform($tag, $config, $context)
+ {
if ($tag instanceof HTMLPurifier_Token_End) {
$new_tag = clone $tag;
$new_tag->name = $this->transform_to;
@@ -65,17 +76,23 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
// normalize large numbers
if ($attr['size'] !== '') {
if ($attr['size']{0} == '+' || $attr['size']{0} == '-') {
- $size = (int) $attr['size'];
- if ($size < -2) $attr['size'] = '-2';
- if ($size > 4) $attr['size'] = '+4';
+ $size = (int)$attr['size'];
+ if ($size < -2) {
+ $attr['size'] = '-2';
+ }
+ if ($size > 4) {
+ $attr['size'] = '+4';
+ }
} else {
- $size = (int) $attr['size'];
- if ($size > 7) $attr['size'] = '7';
+ $size = (int)$attr['size'];
+ if ($size > 7) {
+ $attr['size'] = '7';
+ }
}
}
if (isset($this->_size_lookup[$attr['size']])) {
$prepend_style .= 'font-size:' .
- $this->_size_lookup[$attr['size']] . ';';
+ $this->_size_lookup[$attr['size']] . ';';
}
unset($attr['size']);
}
@@ -91,7 +108,6 @@ class HTMLPurifier_TagTransform_Font extends HTMLPurifier_TagTransform
$new_tag->attr = $attr;
return $new_tag;
-
}
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php b/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
index 0e36130f2..71bf10b91 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php
@@ -7,19 +7,29 @@
*/
class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
{
-
+ /**
+ * @type string
+ */
protected $style;
/**
- * @param $transform_to Tag name to transform to.
- * @param $style CSS style to add to the tag
+ * @param string $transform_to Tag name to transform to.
+ * @param string $style CSS style to add to the tag
*/
- public function __construct($transform_to, $style = null) {
+ public function __construct($transform_to, $style = null)
+ {
$this->transform_to = $transform_to;
$this->style = $style;
}
- public function transform($tag, $config, $context) {
+ /**
+ * @param HTMLPurifier_Token_Tag $tag
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return string
+ */
+ public function transform($tag, $config, $context)
+ {
$new_tag = clone $tag;
$new_tag->name = $this->transform_to;
if (!is_null($this->style) &&
@@ -29,7 +39,6 @@ class HTMLPurifier_TagTransform_Simple extends HTMLPurifier_TagTransform
}
return $new_tag;
}
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Token.php b/classes/security/htmlpurifier/library/HTMLPurifier/Token.php
index 7900e6cb1..85b85e072 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Token.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Token.php
@@ -3,55 +3,98 @@
/**
* Abstract base token class that all others inherit from.
*/
-class HTMLPurifier_Token {
- public $line; /**< Line number node was on in source document. Null if unknown. */
- public $col; /**< Column of line node was on in source document. Null if unknown. */
+abstract class HTMLPurifier_Token
+{
+ /**
+ * Line number node was on in source document. Null if unknown.
+ * @type int
+ */
+ public $line;
+
+ /**
+ * Column of line node was on in source document. Null if unknown.
+ * @type int
+ */
+ public $col;
/**
* Lookup array of processing that this token is exempt from.
* Currently, valid values are "ValidateAttributes" and
* "MakeWellFormed_TagClosedError"
+ * @type array
*/
public $armor = array();
/**
* Used during MakeWellFormed.
+ * @type
*/
public $skip;
+
+ /**
+ * @type
+ */
public $rewind;
+
+ /**
+ * @type
+ */
public $carryover;
- public function __get($n) {
- if ($n === 'type') {
- trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
- switch (get_class($this)) {
- case 'HTMLPurifier_Token_Start': return 'start';
- case 'HTMLPurifier_Token_Empty': return 'empty';
- case 'HTMLPurifier_Token_End': return 'end';
- case 'HTMLPurifier_Token_Text': return 'text';
- case 'HTMLPurifier_Token_Comment': return 'comment';
- default: return null;
+ /**
+ * @param string $n
+ * @return null|string
+ */
+ public function __get($n)
+ {
+ if ($n === 'type') {
+ trigger_error('Deprecated type property called; use instanceof', E_USER_NOTICE);
+ switch (get_class($this)) {
+ case 'HTMLPurifier_Token_Start':
+ return 'start';
+ case 'HTMLPurifier_Token_Empty':
+ return 'empty';
+ case 'HTMLPurifier_Token_End':
+ return 'end';
+ case 'HTMLPurifier_Token_Text':
+ return 'text';
+ case 'HTMLPurifier_Token_Comment':
+ return 'comment';
+ default:
+ return null;
+ }
}
- }
}
/**
* Sets the position of the token in the source document.
+ * @param int $l
+ * @param int $c
*/
- public function position($l = null, $c = null) {
+ public function position($l = null, $c = null)
+ {
$this->line = $l;
- $this->col = $c;
+ $this->col = $c;
}
/**
* Convenience function for DirectLex settings line/col position.
+ * @param int $l
+ * @param int $c
*/
- public function rawPosition($l, $c) {
- if ($c === -1) $l++;
+ public function rawPosition($l, $c)
+ {
+ if ($c === -1) {
+ $l++;
+ }
$this->line = $l;
- $this->col = $c;
+ $this->col = $c;
}
+ /**
+ * Converts a token into its corresponding node.
+ */
+ abstract public function toNode();
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Comment.php b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Comment.php
index dc6bdcabb..23453c705 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Comment.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Comment.php
@@ -5,17 +5,33 @@
*/
class HTMLPurifier_Token_Comment extends HTMLPurifier_Token
{
- public $data; /**< Character data within comment. */
+ /**
+ * Character data within comment.
+ * @type string
+ */
+ public $data;
+
+ /**
+ * @type bool
+ */
public $is_whitespace = true;
+
/**
* Transparent constructor.
*
- * @param $data String comment data.
+ * @param string $data String comment data.
+ * @param int $line
+ * @param int $col
*/
- public function __construct($data, $line = null, $col = null) {
+ public function __construct($data, $line = null, $col = null)
+ {
$this->data = $data;
$this->line = $line;
- $this->col = $col;
+ $this->col = $col;
+ }
+
+ public function toNode() {
+ return new HTMLPurifier_Node_Comment($this->data, $this->line, $this->col);
}
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Empty.php b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Empty.php
index 2a82b47ad..78a95f555 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Empty.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Empty.php
@@ -5,7 +5,11 @@
*/
class HTMLPurifier_Token_Empty extends HTMLPurifier_Token_Tag
{
-
+ public function toNode() {
+ $n = parent::toNode();
+ $n->empty = true;
+ return $n;
+ }
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Token/End.php b/classes/security/htmlpurifier/library/HTMLPurifier/Token/End.php
index 353e79daf..59b38fdc5 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Token/End.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Token/End.php
@@ -10,10 +10,15 @@
class HTMLPurifier_Token_End extends HTMLPurifier_Token_Tag
{
/**
- * Token that started this node. Added by MakeWellFormed. Please
- * do not edit this!
+ * Token that started this node.
+ * Added by MakeWellFormed. Please do not edit this!
+ * @type HTMLPurifier_Token
*/
public $start;
+
+ public function toNode() {
+ throw new Exception("HTMLPurifier_Token_End->toNode not supported!");
+ }
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Start.php b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Start.php
index e0e14fc62..019f317ad 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Start.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Start.php
@@ -5,7 +5,6 @@
*/
class HTMLPurifier_Token_Start extends HTMLPurifier_Token_Tag
{
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Tag.php b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Tag.php
index f4d8f640e..d643fa64e 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Tag.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Tag.php
@@ -3,13 +3,14 @@
/**
* Abstract class of a tag token (start, end or empty), and its behavior.
*/
-class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
+abstract class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
{
/**
* Static bool marker that indicates the class is a tag.
*
* This allows us to check objects with !empty($obj->is_tag)
* without having to use a function call is_a().
+ * @type bool
*/
public $is_tag = true;
@@ -19,21 +20,27 @@ class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
* @note Strictly speaking, XML tags are case sensitive, so we shouldn't
* be lower-casing them, but these tokens cater to HTML tags, which are
* insensitive.
+ * @type string
*/
public $name;
/**
* Associative array of the tag's attributes.
+ * @type array
*/
public $attr = array();
/**
* Non-overloaded constructor, which lower-cases passed tag name.
*
- * @param $name String name.
- * @param $attr Associative array of attributes.
+ * @param string $name String name.
+ * @param array $attr Associative array of attributes.
+ * @param int $line
+ * @param int $col
+ * @param array $armor
*/
- public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array()) {
+ public function __construct($name, $attr = array(), $line = null, $col = null, $armor = array())
+ {
$this->name = ctype_lower($name) ? $name : strtolower($name);
foreach ($attr as $key => $value) {
// normalization only necessary when key is not lowercase
@@ -49,9 +56,13 @@ class HTMLPurifier_Token_Tag extends HTMLPurifier_Token
}
$this->attr = $attr;
$this->line = $line;
- $this->col = $col;
+ $this->col = $col;
$this->armor = $armor;
}
+
+ public function toNode() {
+ return new HTMLPurifier_Node_Element($this->name, $this->attr, $this->line, $this->col, $this->armor);
+ }
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Text.php b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Text.php
index 82efd823d..f26a1c211 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/Token/Text.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/Token/Text.php
@@ -12,22 +12,42 @@
class HTMLPurifier_Token_Text extends HTMLPurifier_Token
{
- public $name = '#PCDATA'; /**< PCDATA tag name compatible with DTD. */
- public $data; /**< Parsed character data of text. */
- public $is_whitespace; /**< Bool indicating if node is whitespace. */
+ /**
+ * @type string
+ */
+ public $name = '#PCDATA';
+ /**< PCDATA tag name compatible with DTD. */
+
+ /**
+ * @type string
+ */
+ public $data;
+ /**< Parsed character data of text. */
+
+ /**
+ * @type bool
+ */
+ public $is_whitespace;
+
+ /**< Bool indicating if node is whitespace. */
/**
* Constructor, accepts data and determines if it is whitespace.
- *
- * @param $data String parsed character data.
+ * @param string $data String parsed character data.
+ * @param int $line
+ * @param int $col
*/
- public function __construct($data, $line = null, $col = null) {
+ public function __construct($data, $line = null, $col = null)
+ {
$this->data = $data;
$this->is_whitespace = ctype_space($data);
$this->line = $line;
- $this->col = $col;
+ $this->col = $col;
}
+ public function toNode() {
+ return new HTMLPurifier_Node_Text($this->data, $this->is_whitespace, $this->line, $this->col);
+ }
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/TokenFactory.php b/classes/security/htmlpurifier/library/HTMLPurifier/TokenFactory.php
index 7cf48fb41..dea2446b9 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/TokenFactory.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/TokenFactory.php
@@ -13,32 +13,53 @@
*/
class HTMLPurifier_TokenFactory
{
+ // p stands for prototype
/**
- * Prototypes that will be cloned.
- * @private
+ * @type HTMLPurifier_Token_Start
*/
- // p stands for prototype
- private $p_start, $p_end, $p_empty, $p_text, $p_comment;
+ private $p_start;
+
+ /**
+ * @type HTMLPurifier_Token_End
+ */
+ private $p_end;
+
+ /**
+ * @type HTMLPurifier_Token_Empty
+ */
+ private $p_empty;
+
+ /**
+ * @type HTMLPurifier_Token_Text
+ */
+ private $p_text;
+
+ /**
+ * @type HTMLPurifier_Token_Comment
+ */
+ private $p_comment;
/**
* Generates blank prototypes for cloning.
*/
- public function __construct() {
- $this->p_start = new HTMLPurifier_Token_Start('', array());
- $this->p_end = new HTMLPurifier_Token_End('');
- $this->p_empty = new HTMLPurifier_Token_Empty('', array());
- $this->p_text = new HTMLPurifier_Token_Text('');
- $this->p_comment= new HTMLPurifier_Token_Comment('');
+ public function __construct()
+ {
+ $this->p_start = new HTMLPurifier_Token_Start('', array());
+ $this->p_end = new HTMLPurifier_Token_End('');
+ $this->p_empty = new HTMLPurifier_Token_Empty('', array());
+ $this->p_text = new HTMLPurifier_Token_Text('');
+ $this->p_comment = new HTMLPurifier_Token_Comment('');
}
/**
* Creates a HTMLPurifier_Token_Start.
- * @param $name Tag name
- * @param $attr Associative array of attributes
- * @return Generated HTMLPurifier_Token_Start
+ * @param string $name Tag name
+ * @param array $attr Associative array of attributes
+ * @return HTMLPurifier_Token_Start Generated HTMLPurifier_Token_Start
*/
- public function createStart($name, $attr = array()) {
+ public function createStart($name, $attr = array())
+ {
$p = clone $this->p_start;
$p->__construct($name, $attr);
return $p;
@@ -46,10 +67,11 @@ class HTMLPurifier_TokenFactory
/**
* Creates a HTMLPurifier_Token_End.
- * @param $name Tag name
- * @return Generated HTMLPurifier_Token_End
+ * @param string $name Tag name
+ * @return HTMLPurifier_Token_End Generated HTMLPurifier_Token_End
*/
- public function createEnd($name) {
+ public function createEnd($name)
+ {
$p = clone $this->p_end;
$p->__construct($name);
return $p;
@@ -57,11 +79,12 @@ class HTMLPurifier_TokenFactory
/**
* Creates a HTMLPurifier_Token_Empty.
- * @param $name Tag name
- * @param $attr Associative array of attributes
- * @return Generated HTMLPurifier_Token_Empty
+ * @param string $name Tag name
+ * @param array $attr Associative array of attributes
+ * @return HTMLPurifier_Token_Empty Generated HTMLPurifier_Token_Empty
*/
- public function createEmpty($name, $attr = array()) {
+ public function createEmpty($name, $attr = array())
+ {
$p = clone $this->p_empty;
$p->__construct($name, $attr);
return $p;
@@ -69,10 +92,11 @@ class HTMLPurifier_TokenFactory
/**
* Creates a HTMLPurifier_Token_Text.
- * @param $data Data of text token
- * @return Generated HTMLPurifier_Token_Text
+ * @param string $data Data of text token
+ * @return HTMLPurifier_Token_Text Generated HTMLPurifier_Token_Text
*/
- public function createText($data) {
+ public function createText($data)
+ {
$p = clone $this->p_text;
$p->__construct($data);
return $p;
@@ -80,15 +104,15 @@ class HTMLPurifier_TokenFactory
/**
* Creates a HTMLPurifier_Token_Comment.
- * @param $data Data of comment token
- * @return Generated HTMLPurifier_Token_Comment
+ * @param string $data Data of comment token
+ * @return HTMLPurifier_Token_Comment Generated HTMLPurifier_Token_Comment
*/
- public function createComment($data) {
+ public function createComment($data)
+ {
$p = clone $this->p_comment;
$p->__construct($data);
return $p;
}
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URI.php b/classes/security/htmlpurifier/library/HTMLPurifier/URI.php
index f158ef5e3..a5e7ae298 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URI.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URI.php
@@ -10,17 +10,57 @@
*/
class HTMLPurifier_URI
{
-
- public $scheme, $userinfo, $host, $port, $path, $query, $fragment;
+ /**
+ * @type string
+ */
+ public $scheme;
/**
+ * @type string
+ */
+ public $userinfo;
+
+ /**
+ * @type string
+ */
+ public $host;
+
+ /**
+ * @type int
+ */
+ public $port;
+
+ /**
+ * @type string
+ */
+ public $path;
+
+ /**
+ * @type string
+ */
+ public $query;
+
+ /**
+ * @type string
+ */
+ public $fragment;
+
+ /**
+ * @param string $scheme
+ * @param string $userinfo
+ * @param string $host
+ * @param int $port
+ * @param string $path
+ * @param string $query
+ * @param string $fragment
* @note Automatically normalizes scheme and port
*/
- public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment) {
+ public function __construct($scheme, $userinfo, $host, $port, $path, $query, $fragment)
+ {
$this->scheme = is_null($scheme) || ctype_lower($scheme) ? $scheme : strtolower($scheme);
$this->userinfo = $userinfo;
$this->host = $host;
- $this->port = is_null($port) ? $port : (int) $port;
+ $this->port = is_null($port) ? $port : (int)$port;
$this->path = $path;
$this->query = $query;
$this->fragment = $fragment;
@@ -28,15 +68,18 @@ class HTMLPurifier_URI
/**
* Retrieves a scheme object corresponding to the URI's scheme/default
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return Scheme object appropriate for validating this URI
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return HTMLPurifier_URIScheme Scheme object appropriate for validating this URI
*/
- public function getSchemeObj($config, $context) {
+ public function getSchemeObj($config, $context)
+ {
$registry = HTMLPurifier_URISchemeRegistry::instance();
if ($this->scheme !== null) {
$scheme_obj = $registry->getScheme($this->scheme, $config, $context);
- if (!$scheme_obj) return false; // invalid scheme, clean it out
+ if (!$scheme_obj) {
+ return false;
+ } // invalid scheme, clean it out
} else {
// no scheme: retrieve the default one
$def = $config->getDefinition('URI');
@@ -56,12 +99,12 @@ class HTMLPurifier_URI
/**
* Generic validation method applicable for all schemes. May modify
* this URI in order to get it into a compliant form.
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
- * @return True if validation/filtering succeeds, false if failure
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool True if validation/filtering succeeds, false if failure
*/
- public function validate($config, $context) {
-
+ public function validate($config, $context)
+ {
// ABNF definitions from RFC 3986
$chars_sub_delims = '!$&\'()*+,;=';
$chars_gen_delims = ':/?#[]@';
@@ -71,7 +114,9 @@ class HTMLPurifier_URI
if (!is_null($this->host)) {
$host_def = new HTMLPurifier_AttrDef_URI_Host();
$this->host = $host_def->validate($this->host, $config, $context);
- if ($this->host === false) $this->host = null;
+ if ($this->host === false) {
+ $this->host = null;
+ }
}
// validate scheme
@@ -97,11 +142,12 @@ class HTMLPurifier_URI
// validate port
if (!is_null($this->port)) {
- if ($this->port < 1 || $this->port > 65535) $this->port = null;
+ if ($this->port < 1 || $this->port > 65535) {
+ $this->port = null;
+ }
}
// validate path
- $path_parts = array();
$segments_encoder = new HTMLPurifier_PercentEncoder($chars_pchar . '/');
if (!is_null($this->host)) { // this catches $this->host === ''
// path-abempty (hier and relative)
@@ -161,16 +207,15 @@ class HTMLPurifier_URI
if (!is_null($this->fragment)) {
$this->fragment = $qf_encoder->encode($this->fragment);
}
-
return true;
-
}
/**
* Convert URI back to string
- * @return String URI appropriate for output
+ * @return string URI appropriate for output
*/
- public function toString() {
+ public function toString()
+ {
// reconstruct authority
$authority = null;
// there is a rendering difference between a null authority
@@ -178,9 +223,13 @@ class HTMLPurifier_URI
// (http:///foo-bar).
if (!is_null($this->host)) {
$authority = '';
- if(!is_null($this->userinfo)) $authority .= $this->userinfo . '@';
+ if (!is_null($this->userinfo)) {
+ $authority .= $this->userinfo . '@';
+ }
$authority .= $this->host;
- if(!is_null($this->port)) $authority .= ':' . $this->port;
+ if (!is_null($this->port)) {
+ $authority .= ':' . $this->port;
+ }
}
// Reconstruct the result
@@ -190,11 +239,19 @@ class HTMLPurifier_URI
// differently than http:///foo), so unfortunately we have to
// defer to the schemes to do the right thing.
$result = '';
- if (!is_null($this->scheme)) $result .= $this->scheme . ':';
- if (!is_null($authority)) $result .= '//' . $authority;
+ if (!is_null($this->scheme)) {
+ $result .= $this->scheme . ':';
+ }
+ if (!is_null($authority)) {
+ $result .= '//' . $authority;
+ }
$result .= $this->path;
- if (!is_null($this->query)) $result .= '?' . $this->query;
- if (!is_null($this->fragment)) $result .= '#' . $this->fragment;
+ if (!is_null($this->query)) {
+ $result .= '?' . $this->query;
+ }
+ if (!is_null($this->fragment)) {
+ $result .= '#' . $this->fragment;
+ }
return $result;
}
@@ -207,11 +264,19 @@ class HTMLPurifier_URI
* Note that this does not do any scheme checking, so it is mostly
* only appropriate for metadata that doesn't care about protocol
* security. isBenign is probably what you actually want.
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
*/
- public function isLocal($config, $context) {
- if ($this->host === null) return true;
+ public function isLocal($config, $context)
+ {
+ if ($this->host === null) {
+ return true;
+ }
$uri_def = $config->getDefinition('URI');
- if ($uri_def->host === $this->host) return true;
+ if ($uri_def->host === $this->host) {
+ return true;
+ }
return false;
}
@@ -221,12 +286,20 @@ class HTMLPurifier_URI
*
* - It is a local URL (isLocal), and
* - It has a equal or better level of security
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
*/
- public function isBenign($config, $context) {
- if (!$this->isLocal($config, $context)) return false;
+ public function isBenign($config, $context)
+ {
+ if (!$this->isLocal($config, $context)) {
+ return false;
+ }
$scheme_obj = $this->getSchemeObj($config, $context);
- if (!$scheme_obj) return false; // conservative approach
+ if (!$scheme_obj) {
+ return false;
+ } // conservative approach
$current_scheme_obj = $config->getDefinition('URI')->getDefaultScheme($config, $context);
if ($current_scheme_obj->secure) {
@@ -236,7 +309,6 @@ class HTMLPurifier_URI
}
return true;
}
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIDefinition.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIDefinition.php
index 40e57bb7d..e0bd8bcca 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIDefinition.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIDefinition.php
@@ -23,20 +23,24 @@ class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
*/
public $defaultScheme;
- public function __construct() {
+ public function __construct()
+ {
$this->registerFilter(new HTMLPurifier_URIFilter_DisableExternal());
$this->registerFilter(new HTMLPurifier_URIFilter_DisableExternalResources());
+ $this->registerFilter(new HTMLPurifier_URIFilter_DisableResources());
$this->registerFilter(new HTMLPurifier_URIFilter_HostBlacklist());
$this->registerFilter(new HTMLPurifier_URIFilter_SafeIframe());
$this->registerFilter(new HTMLPurifier_URIFilter_MakeAbsolute());
$this->registerFilter(new HTMLPurifier_URIFilter_Munge());
}
- public function registerFilter($filter) {
+ public function registerFilter($filter)
+ {
$this->registeredFilters[$filter->name] = $filter;
}
- public function addFilter($filter, $config) {
+ public function addFilter($filter, $config)
+ {
$r = $filter->prepare($config);
if ($r === false) return; // null is ok, for backwards compat
if ($filter->post) {
@@ -46,12 +50,14 @@ class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
}
}
- protected function doSetup($config) {
+ protected function doSetup($config)
+ {
$this->setupMemberVariables($config);
$this->setupFilters($config);
}
- protected function setupFilters($config) {
+ protected function setupFilters($config)
+ {
foreach ($this->registeredFilters as $name => $filter) {
if ($filter->always_load) {
$this->addFilter($filter, $config);
@@ -65,7 +71,8 @@ class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
unset($this->registeredFilters);
}
- protected function setupMemberVariables($config) {
+ protected function setupMemberVariables($config)
+ {
$this->host = $config->get('URI.Host');
$base_uri = $config->get('URI.Base');
if (!is_null($base_uri)) {
@@ -77,11 +84,13 @@ class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
if (is_null($this->defaultScheme)) $this->defaultScheme = $config->get('URI.DefaultScheme');
}
- public function getDefaultScheme($config, $context) {
+ public function getDefaultScheme($config, $context)
+ {
return HTMLPurifier_URISchemeRegistry::instance()->getScheme($this->defaultScheme, $config, $context);
}
- public function filter(&$uri, $config, $context) {
+ public function filter(&$uri, $config, $context)
+ {
foreach ($this->filters as $name => $f) {
$result = $f->filter($uri, $config, $context);
if (!$result) return false;
@@ -89,7 +98,8 @@ class HTMLPurifier_URIDefinition extends HTMLPurifier_Definition
return true;
}
- public function postFilter(&$uri, $config, $context) {
+ public function postFilter(&$uri, $config, $context)
+ {
foreach ($this->postFilters as $name => $f) {
$result = $f->filter($uri, $config, $context);
if (!$result) return false;
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter.php
index 6a1b0b08e..09724e9f4 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter.php
@@ -29,39 +29,46 @@ abstract class HTMLPurifier_URIFilter
{
/**
- * Unique identifier of filter
+ * Unique identifier of filter.
+ * @type string
*/
public $name;
/**
* True if this filter should be run after scheme validation.
+ * @type bool
*/
public $post = false;
/**
- * True if this filter should always be loaded (this permits
- * a filter to be named Foo without the corresponding %URI.Foo
- * directive existing.)
+ * True if this filter should always be loaded.
+ * This permits a filter to be named Foo without the corresponding
+ * %URI.Foo directive existing.
+ * @type bool
*/
public $always_load = false;
/**
* Performs initialization for the filter. If the filter returns
* false, this means that it shouldn't be considered active.
+ * @param HTMLPurifier_Config $config
+ * @return bool
*/
- public function prepare($config) {return true;}
+ public function prepare($config)
+ {
+ return true;
+ }
/**
* Filter a URI object
- * @param $uri Reference to URI object variable
- * @param $config Instance of HTMLPurifier_Config
- * @param $context Instance of HTMLPurifier_Context
+ * @param HTMLPurifier_URI $uri Reference to URI object variable
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
* @return bool Whether or not to continue processing: false indicates
* URL is no good, true indicates continue processing. Note that
* all changes are committed directly on the URI object
*/
abstract public function filter(&$uri, $config, $context);
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
index d8a39a501..ced1b1376 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php
@@ -2,19 +2,50 @@
class HTMLPurifier_URIFilter_DisableExternal extends HTMLPurifier_URIFilter
{
+ /**
+ * @type string
+ */
public $name = 'DisableExternal';
+
+ /**
+ * @type array
+ */
protected $ourHostParts = false;
- public function prepare($config) {
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return void
+ */
+ public function prepare($config)
+ {
$our_host = $config->getDefinition('URI')->host;
- if ($our_host !== null) $this->ourHostParts = array_reverse(explode('.', $our_host));
+ if ($our_host !== null) {
+ $this->ourHostParts = array_reverse(explode('.', $our_host));
+ }
}
- public function filter(&$uri, $config, $context) {
- if (is_null($uri->host)) return true;
- if ($this->ourHostParts === false) return false;
+
+ /**
+ * @param HTMLPurifier_URI $uri Reference
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ if (is_null($uri->host)) {
+ return true;
+ }
+ if ($this->ourHostParts === false) {
+ return false;
+ }
$host_parts = array_reverse(explode('.', $uri->host));
foreach ($this->ourHostParts as $i => $x) {
- if (!isset($host_parts[$i])) return false;
- if ($host_parts[$i] != $this->ourHostParts[$i]) return false;
+ if (!isset($host_parts[$i])) {
+ return false;
+ }
+ if ($host_parts[$i] != $this->ourHostParts[$i]) {
+ return false;
+ }
}
return true;
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
index 881abc43c..c6562169e 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php
@@ -2,9 +2,22 @@
class HTMLPurifier_URIFilter_DisableExternalResources extends HTMLPurifier_URIFilter_DisableExternal
{
+ /**
+ * @type string
+ */
public $name = 'DisableExternalResources';
- public function filter(&$uri, $config, $context) {
- if (!$context->get('EmbeddedURI', true)) return true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ if (!$context->get('EmbeddedURI', true)) {
+ return true;
+ }
return parent::filter($uri, $config, $context);
}
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
index 67538c7bb..d5c412c44 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php
@@ -2,8 +2,19 @@
class HTMLPurifier_URIFilter_DisableResources extends HTMLPurifier_URIFilter
{
+ /**
+ * @type string
+ */
public $name = 'DisableResources';
- public function filter(&$uri, $config, $context) {
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
return !$context->get('EmbeddedURI', true);
}
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
index 55fde3bf4..a6645c17e 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
@@ -6,14 +6,35 @@
// points are involved), but I'm not 100% sure
class HTMLPurifier_URIFilter_HostBlacklist extends HTMLPurifier_URIFilter
{
+ /**
+ * @type string
+ */
public $name = 'HostBlacklist';
+
+ /**
+ * @type array
+ */
protected $blacklist = array();
- public function prepare($config) {
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
$this->blacklist = $config->get('URI.HostBlacklist');
return true;
}
- public function filter(&$uri, $config, $context) {
- foreach($this->blacklist as $blacklisted_host_fragment) {
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ foreach ($this->blacklist as $blacklisted_host_fragment) {
if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
return false;
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
index f46ab2630..c507bbff8 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php
@@ -4,14 +4,35 @@
class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
{
+ /**
+ * @type string
+ */
public $name = 'MakeAbsolute';
+
+ /**
+ * @type
+ */
protected $base;
+
+ /**
+ * @type array
+ */
protected $basePathStack = array();
- public function prepare($config) {
+
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
$def = $config->getDefinition('URI');
$this->base = $def->base;
if (is_null($this->base)) {
- trigger_error('URI.MakeAbsolute is being ignored due to lack of value for URI.Base configuration', E_USER_WARNING);
+ trigger_error(
+ 'URI.MakeAbsolute is being ignored due to lack of ' .
+ 'value for URI.Base configuration',
+ E_USER_WARNING
+ );
return false;
}
$this->base->fragment = null; // fragment is invalid for base URI
@@ -21,19 +42,29 @@ class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
$this->basePathStack = $stack;
return true;
}
- public function filter(&$uri, $config, $context) {
- if (is_null($this->base)) return true; // abort early
- if (
- $uri->path === '' && is_null($uri->scheme) &&
- is_null($uri->host) && is_null($uri->query) && is_null($uri->fragment)
- ) {
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ if (is_null($this->base)) {
+ return true;
+ } // abort early
+ if ($uri->path === '' && is_null($uri->scheme) &&
+ is_null($uri->host) && is_null($uri->query) && is_null($uri->fragment)) {
// reference to current document
$uri = clone $this->base;
return true;
}
if (!is_null($uri->scheme)) {
// absolute URI already: don't change
- if (!is_null($uri->host)) return true;
+ if (!is_null($uri->host)) {
+ return true;
+ }
$scheme_obj = $uri->getSchemeObj($config, $context);
if (!$scheme_obj) {
// scheme not recognized
@@ -66,22 +97,33 @@ class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
}
// re-combine
$uri->scheme = $this->base->scheme;
- if (is_null($uri->userinfo)) $uri->userinfo = $this->base->userinfo;
- if (is_null($uri->host)) $uri->host = $this->base->host;
- if (is_null($uri->port)) $uri->port = $this->base->port;
+ if (is_null($uri->userinfo)) {
+ $uri->userinfo = $this->base->userinfo;
+ }
+ if (is_null($uri->host)) {
+ $uri->host = $this->base->host;
+ }
+ if (is_null($uri->port)) {
+ $uri->port = $this->base->port;
+ }
return true;
}
/**
* Resolve dots and double-dots in a path stack
+ * @param array $stack
+ * @return array
*/
- private function _collapseStack($stack) {
+ private function _collapseStack($stack)
+ {
$result = array();
$is_folder = false;
for ($i = 0; isset($stack[$i]); $i++) {
$is_folder = false;
// absorb an internally duplicated slash
- if ($stack[$i] == '' && $i && isset($stack[$i+1])) continue;
+ if ($stack[$i] == '' && $i && isset($stack[$i + 1])) {
+ continue;
+ }
if ($stack[$i] == '..') {
if (!empty($result)) {
$segment = array_pop($result);
@@ -106,7 +148,9 @@ class HTMLPurifier_URIFilter_MakeAbsolute extends HTMLPurifier_URIFilter
}
$result[] = $stack[$i];
}
- if ($is_folder) $result[] = '';
+ if ($is_folder) {
+ $result[] = '';
+ }
return $result;
}
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
index de695df14..6e03315a1 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
@@ -2,26 +2,79 @@
class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
{
+ /**
+ * @type string
+ */
public $name = 'Munge';
- public $post = true;
- private $target, $parser, $doEmbed, $secretKey;
+ /**
+ * @type bool
+ */
+ public $post = true;
+
+ /**
+ * @type string
+ */
+ private $target;
+
+ /**
+ * @type HTMLPurifier_URIParser
+ */
+ private $parser;
+
+ /**
+ * @type bool
+ */
+ private $doEmbed;
+
+ /**
+ * @type string
+ */
+ private $secretKey;
+
+ /**
+ * @type array
+ */
protected $replace = array();
- public function prepare($config) {
- $this->target = $config->get('URI.' . $this->name);
- $this->parser = new HTMLPurifier_URIParser();
- $this->doEmbed = $config->get('URI.MungeResources');
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
+ $this->target = $config->get('URI.' . $this->name);
+ $this->parser = new HTMLPurifier_URIParser();
+ $this->doEmbed = $config->get('URI.MungeResources');
$this->secretKey = $config->get('URI.MungeSecretKey');
+ if ($this->secretKey && !function_exists('hash_hmac')) {
+ throw new Exception("Cannot use %URI.MungeSecretKey without hash_hmac support.");
+ }
return true;
}
- public function filter(&$uri, $config, $context) {
- if ($context->get('EmbeddedURI', true) && !$this->doEmbed) return true;
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
+ if ($context->get('EmbeddedURI', true) && !$this->doEmbed) {
+ return true;
+ }
$scheme_obj = $uri->getSchemeObj($config, $context);
- if (!$scheme_obj) return true; // ignore unknown schemes, maybe another postfilter did it
- if (!$scheme_obj->browsable) return true; // ignore non-browseable schemes, since we can't munge those in a reasonable way
- if ($uri->isBenign($config, $context)) return true; // don't redirect if a benign URL
+ if (!$scheme_obj) {
+ return true;
+ } // ignore unknown schemes, maybe another postfilter did it
+ if (!$scheme_obj->browsable) {
+ return true;
+ } // ignore non-browseable schemes, since we can't munge those in a reasonable way
+ if ($uri->isBenign($config, $context)) {
+ return true;
+ } // don't redirect if a benign URL
$this->makeReplace($uri, $config, $context);
$this->replace = array_map('rawurlencode', $this->replace);
@@ -30,12 +83,20 @@ class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
$new_uri = $this->parser->parse($new_uri);
// don't redirect if the target host is the same as the
// starting host
- if ($uri->host === $new_uri->host) return true;
+ if ($uri->host === $new_uri->host) {
+ return true;
+ }
$uri = $new_uri; // overwrite
return true;
}
- protected function makeReplace($uri, $config, $context) {
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ */
+ protected function makeReplace($uri, $config, $context)
+ {
$string = $uri->toString();
// always available
$this->replace['%s'] = $string;
@@ -45,9 +106,10 @@ class HTMLPurifier_URIFilter_Munge extends HTMLPurifier_URIFilter
$this->replace['%m'] = $context->get('CurrentAttr', true);
$this->replace['%p'] = $context->get('CurrentCSSProperty', true);
// not always available
- if ($this->secretKey) $this->replace['%t'] = sha1($this->secretKey . ':' . $string);
+ if ($this->secretKey) {
+ $this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey);
+ }
}
-
}
// vim: et sw=4 sts=4
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
index 284bb13de..f609c47a3 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php
@@ -8,25 +8,58 @@
*/
class HTMLPurifier_URIFilter_SafeIframe extends HTMLPurifier_URIFilter
{
+ /**
+ * @type string
+ */
public $name = 'SafeIframe';
+
+ /**
+ * @type bool
+ */
public $always_load = true;
- protected $regexp = NULL;
- // XXX: The not so good bit about how this is all setup now is we
+
+ /**
+ * @type string
+ */
+ protected $regexp = null;
+
+ // XXX: The not so good bit about how this is all set up now is we
// can't check HTML.SafeIframe in the 'prepare' step: we have to
// defer till the actual filtering.
- public function prepare($config) {
+ /**
+ * @param HTMLPurifier_Config $config
+ * @return bool
+ */
+ public function prepare($config)
+ {
$this->regexp = $config->get('URI.SafeIframeRegexp');
return true;
}
- public function filter(&$uri, $config, $context) {
+
+ /**
+ * @param HTMLPurifier_URI $uri
+ * @param HTMLPurifier_Config $config
+ * @param HTMLPurifier_Context $context
+ * @return bool
+ */
+ public function filter(&$uri, $config, $context)
+ {
// check if filter not applicable
- if (!$config->get('HTML.SafeIframe')) return true;
+ if (!$config->get('HTML.SafeIframe')) {
+ return true;
+ }
// check if the filter should actually trigger
- if (!$context->get('EmbeddedURI', true)) return true;
+ if (!$context->get('EmbeddedURI', true)) {
+ return true;
+ }
$token = $context->get('CurrentToken', true);
- if (!($token && $token->name == 'iframe')) return true;
+ if (!($token && $token->name == 'iframe')) {
+ return true;
+ }
// check if we actually have some whitelists enabled
- if ($this->regexp === null) return false;
+ if ($this->regexp === null) {
+ return false;
+ }
// actually check the whitelists
return preg_match($this->regexp, $uri->toString());
}
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIParser.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIParser.php
index 7179e4ab8..0e7381a07 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIParser.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIParser.php
@@ -12,7 +12,8 @@ class HTMLPurifier_URIParser
*/
protected $percentEncoder;
- public function __construct() {
+ public function __construct()
+ {
$this->percentEncoder = new HTMLPurifier_PercentEncoder();
}
@@ -22,15 +23,15 @@ class HTMLPurifier_URIParser
* @return HTMLPurifier_URI representation of URI. This representation has
* not been validated yet and may not conform to RFC.
*/
- public function parse($uri) {
-
+ public function parse($uri)
+ {
$uri = $this->percentEncoder->normalize($uri);
// Regexp is as per Appendix B.
// Note that ["<>] are an addition to the RFC's recommended
// characters, because they represent external delimeters.
$r_URI = '!'.
- '(([^:/?#"<>]+):)?'. // 2. Scheme
+ '(([a-zA-Z0-9\.\+\-]+):)?'. // 2. Scheme
'(//([^/?#"<>]*))?'. // 4. Authority
'([^?#"<>]*)'. // 5. Path
'(\?([^#"<>]*))?'. // 7. Query
diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme.php
index 7be958143..fe9e82cf2 100644
--- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme.php
+++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme.php
@@ -7,27 +7,31 @@ abstract class HTMLPurifier_URIScheme
{
/**
- * Scheme's default port (integer). If an explicit port number is
+ * Scheme's default port (integer). If an explicit port number is
* specified that coincides with the default port, it will be
* elided.
+ * @type int
*/
public $default_port = null;
/**
- * Whether or not URIs of this schem are locatable by a browser
+ * Whether or not URIs of this scheme are locatable by a browser
* http and ftp are accessible, while mailto and news are not.
+ * @type bool
*/
public $browsable = false;
/**
* Whether or not data transmitted over this scheme is encrypted.
* https is secure, http is not.
+ * @type bool
*/
public $secure = false;
/**
* Whether or not the URI always uses
, resolves edge cases * with making relative URIs absolute + * @type bool */ public $hierarchical = false; @@ -35,28 +39,32 @@ abstract class HTMLPurifier_URIScheme * Whether or not the URI may omit a hostname when the scheme is * explicitly specified, ala file:///path/to/file. As of writing, * 'file' is the only scheme that browsers support his properly. + * @type bool */ public $may_omit_host = false; /** * Validates the components of a URI for a specific scheme. - * @param $uri Reference to a HTMLPurifier_URI object - * @param $config HTMLPurifier_Config object - * @param $context HTMLPurifier_Context object - * @return Bool success or failure + * @param HTMLPurifier_URI $uri Reference to a HTMLPurifier_URI object + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool success or failure */ - public abstract function doValidate(&$uri, $config, $context); + abstract public function doValidate(&$uri, $config, $context); /** * Public interface for validating components of a URI. Performs a * bunch of default actions. Don't overload this method. - * @param $uri Reference to a HTMLPurifier_URI object - * @param $config HTMLPurifier_Config object - * @param $context HTMLPurifier_Context object - * @return Bool success or failure + * @param HTMLPurifier_URI $uri Reference to a HTMLPurifier_URI object + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool success or failure */ - public function validate(&$uri, $config, $context) { - if ($this->default_port == $uri->port) $uri->port = null; + public function validate(&$uri, $config, $context) + { + if ($this->default_port == $uri->port) { + $uri->port = null; + } // kludge: browsers do funny things when the scheme but not the // authority is set if (!$this->may_omit_host && @@ -65,7 +73,7 @@ abstract class HTMLPurifier_URIScheme // if the scheme is not present, a *blank* host is in error, // since this translates into '///path' which most browsers // interpret as being 'http://path'. - (is_null($uri->scheme) && $uri->host === '') + (is_null($uri->scheme) && $uri->host === '') ) { do { if (is_null($uri->scheme)) { @@ -89,7 +97,6 @@ abstract class HTMLPurifier_URIScheme } return $this->doValidate($uri, $config, $context); } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/data.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/data.php index a6a9bdcdd..7093a1127 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/data.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/data.php @@ -3,21 +3,38 @@ /** * Implements data: URI for base64 encoded images supported by GD. */ -class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme { - +class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme +{ + /** + * @type bool + */ public $browsable = true; + + /** + * @type array + */ public $allowed_types = array( // you better write validation code for other types if you // decide to allow them 'image/jpeg' => true, 'image/gif' => true, 'image/png' => true, - ); + ); // this is actually irrelevant since we only write out the path // component + /** + * @type bool + */ public $may_omit_host = true; - public function doValidate(&$uri, $config, $context) { + /** + * @param HTMLPurifier_URI $uri + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool + */ + public function doValidate(&$uri, $config, $context) + { $result = explode(',', $uri->path, 2); $is_base64 = false; $charset = null; @@ -26,7 +43,7 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme { list($metadata, $data) = $result; // do some legwork on the metadata $metas = explode(';', $metadata); - while(!empty($metas)) { + while (!empty($metas)) { $cur = array_shift($metas); if ($cur == 'base64') { $is_base64 = true; @@ -35,10 +52,14 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme { if (substr($cur, 0, 8) == 'charset=') { // doesn't match if there are arbitrary spaces, but // whatever dude - if ($charset !== null) continue; // garbage + if ($charset !== null) { + continue; + } // garbage $charset = substr($cur, 8); // not used } else { - if ($content_type !== null) continue; // garbage + if ($content_type !== null) { + continue; + } // garbage $content_type = $cur; } } @@ -64,11 +85,15 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme { file_put_contents($file, $raw_data, LOCK_EX); if (function_exists('exif_imagetype')) { $image_code = exif_imagetype($file); + unlink($file); } elseif (function_exists('getimagesize')) { set_error_handler(array($this, 'muteErrorHandler')); $info = getimagesize($file); restore_error_handler(); - if ($info == false) return false; + unlink($file); + if ($info == false) { + return false; + } $image_code = $info[2]; } else { trigger_error("could not find exif_imagetype or getimagesize functions", E_USER_ERROR); @@ -77,7 +102,9 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme { if ($real_content_type != $content_type) { // we're nice guys; if the content type is something else we // support, change it over - if (empty($this->allowed_types[$real_content_type])) return false; + if (empty($this->allowed_types[$real_content_type])) { + return false; + } $content_type = $real_content_type; } // ok, it's kosher, rewrite what we need @@ -90,7 +117,11 @@ class HTMLPurifier_URIScheme_data extends HTMLPurifier_URIScheme { return true; } - public function muteErrorHandler($errno, $errstr) {} - + /** + * @param int $errno + * @param string $errstr + */ + public function muteErrorHandler($errno, $errstr) + { + } } - diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/file.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/file.php index d74a3f198..215be4ba8 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/file.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/file.php @@ -3,30 +3,42 @@ /** * Validates file as defined by RFC 1630 and RFC 1738. */ -class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme { - - // Generally file:// URLs are not accessible from most - // machines, so placing them as an img src is incorrect. +class HTMLPurifier_URIScheme_file extends HTMLPurifier_URIScheme +{ + /** + * Generally file:// URLs are not accessible from most + * machines, so placing them as an img src is incorrect. + * @type bool + */ public $browsable = false; - // Basically the *only* URI scheme for which this is true, since - // accessing files on the local machine is very common. In fact, - // browsers on some operating systems don't understand the - // authority, though I hear it is used on Windows to refer to - // network shares. + /** + * Basically the *only* URI scheme for which this is true, since + * accessing files on the local machine is very common. In fact, + * browsers on some operating systems don't understand the + * authority, though I hear it is used on Windows to refer to + * network shares. + * @type bool + */ public $may_omit_host = true; - public function doValidate(&$uri, $config, $context) { + /** + * @param HTMLPurifier_URI $uri + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool + */ + public function doValidate(&$uri, $config, $context) + { // Authentication method is not supported $uri->userinfo = null; // file:// makes no provisions for accessing the resource - $uri->port = null; + $uri->port = null; // While it seems to work on Firefox, the querystring has // no possible effect and is thus stripped. - $uri->query = null; + $uri->query = null; return true; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php index 0fb2abf64..1eb43ee5c 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php @@ -3,14 +3,32 @@ /** * Validates ftp (File Transfer Protocol) URIs as defined by generic RFC 1738. */ -class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme { - +class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme +{ + /** + * @type int + */ public $default_port = 21; + + /** + * @type bool + */ public $browsable = true; // usually + + /** + * @type bool + */ public $hierarchical = true; - public function doValidate(&$uri, $config, $context) { - $uri->query = null; + /** + * @param HTMLPurifier_URI $uri + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool + */ + public function doValidate(&$uri, $config, $context) + { + $uri->query = null; // typecode check $semicolon_pos = strrpos($uri->path, ';'); // reverse @@ -33,10 +51,8 @@ class HTMLPurifier_URIScheme_ftp extends HTMLPurifier_URIScheme { $uri->path = str_replace(';', '%3B', $uri->path); $uri->path .= $type_ret; } - return true; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/http.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/http.php index 959b8daff..ce69ec438 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/http.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/http.php @@ -3,17 +3,34 @@ /** * Validates http (HyperText Transfer Protocol) as defined by RFC 2616 */ -class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme { - +class HTMLPurifier_URIScheme_http extends HTMLPurifier_URIScheme +{ + /** + * @type int + */ public $default_port = 80; + + /** + * @type bool + */ public $browsable = true; + + /** + * @type bool + */ public $hierarchical = true; - public function doValidate(&$uri, $config, $context) { + /** + * @param HTMLPurifier_URI $uri + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool + */ + public function doValidate(&$uri, $config, $context) + { $uri->userinfo = null; return true; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/https.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/https.php index 159c2874e..0e96882db 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/https.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/https.php @@ -3,11 +3,16 @@ /** * Validates https (Secure HTTP) according to http scheme. */ -class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http { - +class HTMLPurifier_URIScheme_https extends HTMLPurifier_URIScheme_http +{ + /** + * @type int + */ public $default_port = 443; + /** + * @type bool + */ public $secure = true; - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php index 9db4cb23f..c3a6b602a 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php @@ -9,19 +9,32 @@ * @todo Filter allowed query parameters */ -class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme { - +class HTMLPurifier_URIScheme_mailto extends HTMLPurifier_URIScheme +{ + /** + * @type bool + */ public $browsable = false; + + /** + * @type bool + */ public $may_omit_host = true; - public function doValidate(&$uri, $config, $context) { + /** + * @param HTMLPurifier_URI $uri + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool + */ + public function doValidate(&$uri, $config, $context) + { $uri->userinfo = null; $uri->host = null; $uri->port = null; // we need to validate path against RFC 2368's addr-spec return true; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/news.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/news.php index 84a6748d8..7490927d6 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/news.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/news.php @@ -3,20 +3,33 @@ /** * Validates news (Usenet) as defined by generic RFC 1738 */ -class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme { - +class HTMLPurifier_URIScheme_news extends HTMLPurifier_URIScheme +{ + /** + * @type bool + */ public $browsable = false; + + /** + * @type bool + */ public $may_omit_host = true; - public function doValidate(&$uri, $config, $context) { + /** + * @param HTMLPurifier_URI $uri + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool + */ + public function doValidate(&$uri, $config, $context) + { $uri->userinfo = null; - $uri->host = null; - $uri->port = null; - $uri->query = null; + $uri->host = null; + $uri->port = null; + $uri->query = null; // typecode check needed on path return true; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php index 4ccea0dfc..f211d715e 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php @@ -3,17 +3,30 @@ /** * Validates nntp (Network News Transfer Protocol) as defined by generic RFC 1738 */ -class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme { - +class HTMLPurifier_URIScheme_nntp extends HTMLPurifier_URIScheme +{ + /** + * @type int + */ public $default_port = 119; + + /** + * @type bool + */ public $browsable = false; - public function doValidate(&$uri, $config, $context) { + /** + * @param HTMLPurifier_URI $uri + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return bool + */ + public function doValidate(&$uri, $config, $context) + { $uri->userinfo = null; - $uri->query = null; + $uri->query = null; return true; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php b/classes/security/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php index 576bf7b6d..4ac8a0b76 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php @@ -8,12 +8,14 @@ class HTMLPurifier_URISchemeRegistry /** * Retrieve sole instance of the registry. - * @param $prototype Optional prototype to overload sole instance with, + * @param HTMLPurifier_URISchemeRegistry $prototype Optional prototype to overload sole instance with, * or bool true to reset to default registry. + * @return HTMLPurifier_URISchemeRegistry * @note Pass a registry object $prototype with a compatible interface and * the function will copy it and return it all further times. */ - public static function instance($prototype = null) { + public static function instance($prototype = null) + { static $instance = null; if ($prototype !== null) { $instance = $prototype; @@ -25,17 +27,22 @@ class HTMLPurifier_URISchemeRegistry /** * Cache of retrieved schemes. + * @type HTMLPurifier_URIScheme[] */ protected $schemes = array(); /** * Retrieves a scheme validator object - * @param $scheme String scheme name like http or mailto - * @param $config HTMLPurifier_Config object - * @param $config HTMLPurifier_Context object + * @param string $scheme String scheme name like http or mailto + * @param HTMLPurifier_Config $config + * @param HTMLPurifier_Context $context + * @return HTMLPurifier_URIScheme */ - public function getScheme($scheme, $config, $context) { - if (!$config) $config = HTMLPurifier_Config::createDefault(); + public function getScheme($scheme, $config, $context) + { + if (!$config) { + $config = HTMLPurifier_Config::createDefault(); + } // important, otherwise attacker could include arbitrary file $allowed_schemes = $config->get('URI.AllowedSchemes'); @@ -45,24 +52,30 @@ class HTMLPurifier_URISchemeRegistry return; } - if (isset($this->schemes[$scheme])) return $this->schemes[$scheme]; - if (!isset($allowed_schemes[$scheme])) return; + if (isset($this->schemes[$scheme])) { + return $this->schemes[$scheme]; + } + if (!isset($allowed_schemes[$scheme])) { + return; + } $class = 'HTMLPurifier_URIScheme_' . $scheme; - if (!class_exists($class)) return; + if (!class_exists($class)) { + return; + } $this->schemes[$scheme] = new $class(); return $this->schemes[$scheme]; } /** * Registers a custom scheme to the cache, bypassing reflection. - * @param $scheme Scheme name - * @param $scheme_obj HTMLPurifier_URIScheme object + * @param string $scheme Scheme name + * @param HTMLPurifier_URIScheme $scheme_obj */ - public function register($scheme, $scheme_obj) { + public function register($scheme, $scheme_obj) + { $this->schemes[$scheme] = $scheme_obj; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/UnitConverter.php b/classes/security/htmlpurifier/library/HTMLPurifier/UnitConverter.php index 545d42622..166f3bf30 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/UnitConverter.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/UnitConverter.php @@ -37,20 +37,24 @@ class HTMLPurifier_UnitConverter /** * Minimum bcmath precision for output. + * @type int */ protected $outputPrecision; /** * Bcmath precision for internal calculations. + * @type int */ protected $internalPrecision; /** - * Whether or not BCMath is available + * Whether or not BCMath is available. + * @type bool */ private $bcmath; - public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false) { + public function __construct($output_precision = 4, $internal_precision = 10, $force_no_bcmath = false) + { $this->outputPrecision = $output_precision; $this->internalPrecision = $internal_precision; $this->bcmath = !$force_no_bcmath && function_exists('bcmul'); @@ -63,6 +67,7 @@ class HTMLPurifier_UnitConverter * it before passing it here! * @param string $to_unit * Unit to convert to. + * @return HTMLPurifier_Length|bool * @note * About precision: This conversion function pays very special * attention to the incoming precision of values and attempts @@ -74,11 +79,13 @@ class HTMLPurifier_UnitConverter * and this causes some decimals to be excluded, those * decimals will be added on. */ - public function convert($length, $to_unit) { + public function convert($length, $to_unit) + { + if (!$length->isValid()) { + return false; + } - if (!$length->isValid()) return false; - - $n = $length->getN(); + $n = $length->getN(); $unit = $length->getUnit(); if ($n === '0' || $unit === false) { @@ -87,21 +94,29 @@ class HTMLPurifier_UnitConverter $state = $dest_state = false; foreach (self::$units as $k => $x) { - if (isset($x[$unit])) $state = $k; - if (isset($x[$to_unit])) $dest_state = $k; + if (isset($x[$unit])) { + $state = $k; + } + if (isset($x[$to_unit])) { + $dest_state = $k; + } + } + if (!$state || !$dest_state) { + return false; } - if (!$state || !$dest_state) return false; // Some calculations about the initial precision of the number; // this will be useful when we need to do final rounding. $sigfigs = $this->getSigFigs($n); - if ($sigfigs < $this->outputPrecision) $sigfigs = $this->outputPrecision; + if ($sigfigs < $this->outputPrecision) { + $sigfigs = $this->outputPrecision; + } // BCMath's internal precision deals only with decimals. Use // our default if the initial number has no decimals, or increase // it by how ever many decimals, thus, the number of guard digits // will always be greater than or equal to internalPrecision. - $log = (int) floor(log(abs($n), 10)); + $log = (int)floor(log(abs($n), 10)); $cp = ($log < 0) ? $this->internalPrecision - $log : $this->internalPrecision; // internal precision for ($i = 0; $i < 2; $i++) { @@ -152,14 +167,18 @@ class HTMLPurifier_UnitConverter } // Post-condition: $unit == $to_unit - if ($unit !== $to_unit) return false; + if ($unit !== $to_unit) { + return false; + } // Useful for debugging: //echo " n"; //echo "$n\nsigfigs = $sigfigs\nnew_log = $new_log\nlog = $log\nrp = $rp\n\n"; $n = $this->round($n, $sigfigs); - if (strpos($n, '.') !== false) $n = rtrim($n, '0'); + if (strpos($n, '.') !== false) { + $n = rtrim($n, '0'); + } $n = rtrim($n, '.'); return new HTMLPurifier_Length($n, $unit); @@ -170,53 +189,84 @@ class HTMLPurifier_UnitConverter * @param string $n Decimal number * @return int number of sigfigs */ - public function getSigFigs($n) { + public function getSigFigs($n) + { $n = ltrim($n, '0+-'); $dp = strpos($n, '.'); // decimal position if ($dp === false) { $sigfigs = strlen(rtrim($n, '0')); } else { $sigfigs = strlen(ltrim($n, '0.')); // eliminate extra decimal character - if ($dp !== 0) $sigfigs--; + if ($dp !== 0) { + $sigfigs--; + } } return $sigfigs; } /** * Adds two numbers, using arbitrary precision when available. + * @param string $s1 + * @param string $s2 + * @param int $scale + * @return string */ - private function add($s1, $s2, $scale) { - if ($this->bcmath) return bcadd($s1, $s2, $scale); - else return $this->scale($s1 + $s2, $scale); + private function add($s1, $s2, $scale) + { + if ($this->bcmath) { + return bcadd($s1, $s2, $scale); + } else { + return $this->scale((float)$s1 + (float)$s2, $scale); + } } /** * Multiples two numbers, using arbitrary precision when available. + * @param string $s1 + * @param string $s2 + * @param int $scale + * @return string */ - private function mul($s1, $s2, $scale) { - if ($this->bcmath) return bcmul($s1, $s2, $scale); - else return $this->scale($s1 * $s2, $scale); + private function mul($s1, $s2, $scale) + { + if ($this->bcmath) { + return bcmul($s1, $s2, $scale); + } else { + return $this->scale((float)$s1 * (float)$s2, $scale); + } } /** * Divides two numbers, using arbitrary precision when available. + * @param string $s1 + * @param string $s2 + * @param int $scale + * @return string */ - private function div($s1, $s2, $scale) { - if ($this->bcmath) return bcdiv($s1, $s2, $scale); - else return $this->scale($s1 / $s2, $scale); + private function div($s1, $s2, $scale) + { + if ($this->bcmath) { + return bcdiv($s1, $s2, $scale); + } else { + return $this->scale((float)$s1 / (float)$s2, $scale); + } } /** * Rounds a number according to the number of sigfigs it should have, * using arbitrary precision when available. + * @param float $n + * @param int $sigfigs + * @return string */ - private function round($n, $sigfigs) { - $new_log = (int) floor(log(abs($n), 10)); // Number of digits left of decimal - 1 + private function round($n, $sigfigs) + { + $new_log = (int)floor(log(abs($n), 10)); // Number of digits left of decimal - 1 $rp = $sigfigs - $new_log - 1; // Number of decimal places needed $neg = $n < 0 ? '-' : ''; // Negative sign if ($this->bcmath) { if ($rp >= 0) { - $n = bcadd($n, $neg . '0.' . str_repeat('0', $rp) . '5', $rp + 1); + $n = bcadd($n, $neg . '0.' . str_repeat('0', $rp) . '5', $rp + 1); $n = bcdiv($n, '1', $rp); } else { // This algorithm partially depends on the standardized @@ -232,23 +282,26 @@ class HTMLPurifier_UnitConverter /** * Scales a float to $scale digits right of decimal point, like BCMath. + * @param float $r + * @param int $scale + * @return string */ - private function scale($r, $scale) { + private function scale($r, $scale) + { if ($scale < 0) { // The f sprintf type doesn't support negative numbers, so we // need to cludge things manually. First get the string. - $r = sprintf('%.0f', (float) $r); + $r = sprintf('%.0f', (float)$r); // Due to floating point precision loss, $r will more than likely // look something like 4652999999999.9234. We grab one more digit // than we need to precise from $r and then use that to round // appropriately. - $precise = (string) round(substr($r, 0, strlen($r) + $scale), -1); + $precise = (string)round(substr($r, 0, strlen($r) + $scale), -1); // Now we return it, truncating the zero that was rounded off. return substr($precise, 0, -1) . str_repeat('0', -$scale + 1); } - return sprintf('%.' . $scale . 'f', (float) $r); + return sprintf('%.' . $scale . 'f', (float)$r); } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/VarParser.php b/classes/security/htmlpurifier/library/HTMLPurifier/VarParser.php index 68e72ae86..50cba6910 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/VarParser.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/VarParser.php @@ -7,58 +7,59 @@ class HTMLPurifier_VarParser { - const STRING = 1; - const ISTRING = 2; - const TEXT = 3; - const ITEXT = 4; - const INT = 5; - const FLOAT = 6; - const BOOL = 7; - const LOOKUP = 8; - const ALIST = 9; - const HASH = 10; - const MIXED = 11; + const STRING = 1; + const ISTRING = 2; + const TEXT = 3; + const ITEXT = 4; + const INT = 5; + const FLOAT = 6; + const BOOL = 7; + const LOOKUP = 8; + const ALIST = 9; + const HASH = 10; + const MIXED = 11; /** * Lookup table of allowed types. Mainly for backwards compatibility, but * also convenient for transforming string type names to the integer constants. */ - static public $types = array( - 'string' => self::STRING, - 'istring' => self::ISTRING, - 'text' => self::TEXT, - 'itext' => self::ITEXT, - 'int' => self::INT, - 'float' => self::FLOAT, - 'bool' => self::BOOL, - 'lookup' => self::LOOKUP, - 'list' => self::ALIST, - 'hash' => self::HASH, - 'mixed' => self::MIXED + public static $types = array( + 'string' => self::STRING, + 'istring' => self::ISTRING, + 'text' => self::TEXT, + 'itext' => self::ITEXT, + 'int' => self::INT, + 'float' => self::FLOAT, + 'bool' => self::BOOL, + 'lookup' => self::LOOKUP, + 'list' => self::ALIST, + 'hash' => self::HASH, + 'mixed' => self::MIXED ); /** * Lookup table of types that are string, and can have aliases or * allowed value lists. */ - static public $stringTypes = array( - self::STRING => true, - self::ISTRING => true, - self::TEXT => true, - self::ITEXT => true, + public static $stringTypes = array( + self::STRING => true, + self::ISTRING => true, + self::TEXT => true, + self::ITEXT => true, ); /** - * Validate a variable according to type. Throws - * HTMLPurifier_VarParserException if invalid. + * Validate a variable according to type. * It may return NULL as a valid type if $allow_null is true. * - * @param $var Variable to validate - * @param $type Type of variable, see HTMLPurifier_VarParser->types - * @param $allow_null Whether or not to permit null as a value - * @return Validated and type-coerced variable + * @param mixed $var Variable to validate + * @param int $type Type of variable, see HTMLPurifier_VarParser->types + * @param bool $allow_null Whether or not to permit null as a value + * @return string Validated and type-coerced variable + * @throws HTMLPurifier_VarParserException */ - final public function parse($var, $type, $allow_null = false) { + final public function parse($var, $type, $allow_null = false) + { if (is_string($type)) { if (!isset(HTMLPurifier_VarParser::$types[$type])) { throw new HTMLPurifier_VarParserException("Invalid type '$type'"); @@ -67,7 +68,9 @@ class HTMLPurifier_VarParser } } $var = $this->parseImplementation($var, $type, $allow_null); - if ($allow_null && $var === null) return null; + if ($allow_null && $var === null) { + return null; + } // These are basic checks, to make sure nothing horribly wrong // happened in our implementations. switch ($type) { @@ -75,27 +78,45 @@ class HTMLPurifier_VarParser case (self::ISTRING): case (self::TEXT): case (self::ITEXT): - if (!is_string($var)) break; - if ($type == self::ISTRING || $type == self::ITEXT) $var = strtolower($var); + if (!is_string($var)) { + break; + } + if ($type == self::ISTRING || $type == self::ITEXT) { + $var = strtolower($var); + } return $var; case (self::INT): - if (!is_int($var)) break; + if (!is_int($var)) { + break; + } return $var; case (self::FLOAT): - if (!is_float($var)) break; + if (!is_float($var)) { + break; + } return $var; case (self::BOOL): - if (!is_bool($var)) break; + if (!is_bool($var)) { + break; + } return $var; case (self::LOOKUP): case (self::ALIST): case (self::HASH): - if (!is_array($var)) break; + if (!is_array($var)) { + break; + } if ($type === self::LOOKUP) { - foreach ($var as $k) if ($k !== true) $this->error('Lookup table contains value other than true'); + foreach ($var as $k) { + if ($k !== true) { + $this->error('Lookup table contains value other than true'); + } + } } elseif ($type === self::ALIST) { $keys = array_keys($var); - if (array_keys($keys) !== $keys) $this->error('Indices for list are not uniform'); + if (array_keys($keys) !== $keys) { + $this->error('Indices for list are not uniform'); + } } return $var; case (self::MIXED): @@ -107,17 +128,24 @@ class HTMLPurifier_VarParser } /** - * Actually implements the parsing. Base implementation is to not + * Actually implements the parsing. Base implementation does not * do anything to $var. Subclasses should overload this! + * @param mixed $var + * @param int $type + * @param bool $allow_null + * @return string */ - protected function parseImplementation($var, $type, $allow_null) { + protected function parseImplementation($var, $type, $allow_null) + { return $var; } /** * Throws an exception. + * @throws HTMLPurifier_VarParserException */ - protected function error($msg) { + protected function error($msg) + { throw new HTMLPurifier_VarParserException($msg); } @@ -126,29 +154,45 @@ class HTMLPurifier_VarParser * @note This should not ever be called. It would be called if we * extend the allowed values of HTMLPurifier_VarParser without * updating subclasses. + * @param string $class + * @param int $type + * @throws HTMLPurifier_Exception */ - protected function errorInconsistent($class, $type) { - throw new HTMLPurifier_Exception("Inconsistency in $class: ".HTMLPurifier_VarParser::getTypeName($type)." not implemented"); + protected function errorInconsistent($class, $type) + { + throw new HTMLPurifier_Exception( + "Inconsistency in $class: " . HTMLPurifier_VarParser::getTypeName($type) . + " not implemented" + ); } /** * Generic error for if a type didn't work. + * @param mixed $var + * @param int $type */ - protected function errorGeneric($var, $type) { + protected function errorGeneric($var, $type) + { $vtype = gettype($var); - $this->error("Expected type ".HTMLPurifier_VarParser::getTypeName($type).", got $vtype"); + $this->error("Expected type " . HTMLPurifier_VarParser::getTypeName($type) . ", got $vtype"); } - static public function getTypeName($type) { + /** + * @param int $type + * @return string + */ + public static function getTypeName($type) + { static $lookup; if (!$lookup) { // Lazy load the alternative lookup table $lookup = array_flip(HTMLPurifier_VarParser::$types); } - if (!isset($lookup[$type])) return 'unknown'; + if (!isset($lookup[$type])) { + return 'unknown'; + } return $lookup[$type]; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php b/classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php index 21b87675a..b15016c5b 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php @@ -7,28 +7,41 @@ */ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser { - - protected function parseImplementation($var, $type, $allow_null) { - if ($allow_null && $var === null) return null; + /** + * @param mixed $var + * @param int $type + * @param bool $allow_null + * @return array|bool|float|int|mixed|null|string + * @throws HTMLPurifier_VarParserException + */ + protected function parseImplementation($var, $type, $allow_null) + { + if ($allow_null && $var === null) { + return null; + } switch ($type) { // Note: if code "breaks" from the switch, it triggers a generic // exception to be thrown. Specific errors can be specifically // done here. - case self::MIXED : - case self::ISTRING : - case self::STRING : - case self::TEXT : - case self::ITEXT : + case self::MIXED: + case self::ISTRING: + case self::STRING: + case self::TEXT: + case self::ITEXT: return $var; - case self::INT : - if (is_string($var) && ctype_digit($var)) $var = (int) $var; + case self::INT: + if (is_string($var) && ctype_digit($var)) { + $var = (int)$var; + } return $var; - case self::FLOAT : - if ((is_string($var) && is_numeric($var)) || is_int($var)) $var = (float) $var; + case self::FLOAT: + if ((is_string($var) && is_numeric($var)) || is_int($var)) { + $var = (float)$var; + } return $var; - case self::BOOL : + case self::BOOL: if (is_int($var) && ($var === 0 || $var === 1)) { - $var = (bool) $var; + $var = (bool)$var; } elseif (is_string($var)) { if ($var == 'on' || $var == 'true' || $var == '1') { $var = true; @@ -39,45 +52,56 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser } } return $var; - case self::ALIST : - case self::HASH : - case self::LOOKUP : + case self::ALIST: + case self::HASH: + case self::LOOKUP: if (is_string($var)) { // special case: technically, this is an array with // a single empty string item, but having an empty // array is more intuitive - if ($var == '') return array(); + if ($var == '') { + return array(); + } if (strpos($var, "\n") === false && strpos($var, "\r") === false) { // simplistic string to array method that only works // for simple lists of tag names or alphanumeric characters - $var = explode(',',$var); + $var = explode(',', $var); } else { $var = preg_split('/(,|[\n\r]+)/', $var); } // remove spaces - foreach ($var as $i => $j) $var[$i] = trim($j); + foreach ($var as $i => $j) { + $var[$i] = trim($j); + } if ($type === self::HASH) { // key:value,key2:value2 $nvar = array(); foreach ($var as $keypair) { $c = explode(':', $keypair, 2); - if (!isset($c[1])) continue; + if (!isset($c[1])) { + continue; + } $nvar[trim($c[0])] = trim($c[1]); } $var = $nvar; } } - if (!is_array($var)) break; + if (!is_array($var)) { + break; + } $keys = array_keys($var); if ($keys === array_keys($keys)) { - if ($type == self::ALIST) return $var; - elseif ($type == self::LOOKUP) { + if ($type == self::ALIST) { + return $var; + } elseif ($type == self::LOOKUP) { $new = array(); foreach ($var as $key) { $new[$key] = true; } return $new; - } else break; + } else { + break; + } } if ($type === self::ALIST) { trigger_error("Array list did not have consecutive integer indexes", E_USER_WARNING); @@ -86,7 +110,11 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser if ($type === self::LOOKUP) { foreach ($var as $key => $value) { if ($value !== true) { - trigger_error("Lookup array has non-true value at key '$key'; maybe your input array was not indexed numerically", E_USER_WARNING); + trigger_error( + "Lookup array has non-true value at key '$key'; " . + "maybe your input array was not indexed numerically", + E_USER_WARNING + ); } $var[$key] = true; } @@ -97,7 +125,6 @@ class HTMLPurifier_VarParser_Flexible extends HTMLPurifier_VarParser } $this->errorGeneric($var, $type); } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Native.php b/classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Native.php index b02a6de54..f11c318ef 100644 --- a/classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Native.php +++ b/classes/security/htmlpurifier/library/HTMLPurifier/VarParser/Native.php @@ -8,11 +8,24 @@ class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser { - protected function parseImplementation($var, $type, $allow_null) { + /** + * @param mixed $var + * @param int $type + * @param bool $allow_null + * @return null|string + */ + protected function parseImplementation($var, $type, $allow_null) + { return $this->evalExpression($var); } - protected function evalExpression($expr) { + /** + * @param string $expr + * @return mixed + * @throws HTMLPurifier_VarParserException + */ + protected function evalExpression($expr) + { $var = null; $result = eval("\$var = $expr;"); if ($result === false) { @@ -20,7 +33,6 @@ class HTMLPurifier_VarParser_Native extends HTMLPurifier_VarParser } return $var; } - } // vim: et sw=4 sts=4 diff --git a/classes/security/htmlpurifier/library/HTMLPurifier/Zipper.php b/classes/security/htmlpurifier/library/HTMLPurifier/Zipper.php new file mode 100644 index 000000000..6e21ea070 --- /dev/null +++ b/classes/security/htmlpurifier/library/HTMLPurifier/Zipper.php @@ -0,0 +1,157 @@ +front = $front; + $this->back = $back; + } + + /** + * Creates a zipper from an array, with a hole in the + * 0-index position. + * @param Array to zipper-ify. + * @return Tuple of zipper and element of first position. + */ + static public function fromArray($array) { + $z = new self(array(), array_reverse($array)); + $t = $z->delete(); // delete the "dummy hole" + return array($z, $t); + } + + /** + * Convert zipper back into a normal array, optionally filling in + * the hole with a value. (Usually you should supply a $t, unless you + * are at the end of the array.) + */ + public function toArray($t = NULL) { + $a = $this->front; + if ($t !== NULL) $a[] = $t; + for ($i = count($this->back)-1; $i >= 0; $i--) { + $a[] = $this->back[$i]; + } + return $a; + } + + /** + * Move hole to the next element. + * @param $t Element to fill hole with + * @return Original contents of new hole. + */ + public function next($t) { + if ($t !== NULL) array_push($this->front, $t); + return empty($this->back) ? NULL : array_pop($this->back); + } + + /** + * Iterated hole advancement. + * @param $t Element to fill hole with + * @param $i How many forward to advance hole + * @return Original contents of new hole, i away + */ + public function advance($t, $n) { + for ($i = 0; $i < $n; $i++) { + $t = $this->next($t); + } + return $t; + } + + /** + * Move hole to the previous element + * @param $t Element to fill hole with + * @return Original contents of new hole. + */ + public function prev($t) { + if ($t !== NULL) array_push($this->back, $t); + return empty($this->front) ? NULL : array_pop($this->front); + } + + /** + * Delete contents of current hole, shifting hole to + * next element. + * @return Original contents of new hole. + */ + public function delete() { + return empty($this->back) ? NULL : array_pop($this->back); + } + + /** + * Returns true if we are at the end of the list. + * @return bool + */ + public function done() { + return empty($this->back); + } + + /** + * Insert element before hole. + * @param Element to insert + */ + public function insertBefore($t) { + if ($t !== NULL) array_push($this->front, $t); + } + + /** + * Insert element after hole. + * @param Element to insert + */ + public function insertAfter($t) { + if ($t !== NULL) array_push($this->back, $t); + } + + /** + * Splice in multiple elements at hole. Functional specification + * in terms of array_splice: + * + * $arr1 = $arr; + * $old1 = array_splice($arr1, $i, $delete, $replacement); + * + * list($z, $t) = HTMLPurifier_Zipper::fromArray($arr); + * $t = $z->advance($t, $i); + * list($old2, $t) = $z->splice($t, $delete, $replacement); + * $arr2 = $z->toArray($t); + * + * assert($old1 === $old2); + * assert($arr1 === $arr2); + * + * NB: the absolute index location after this operation is + * *unchanged!* + * + * @param Current contents of hole. + */ + public function splice($t, $delete, $replacement) { + // delete + $old = array(); + $r = $t; + for ($i = $delete; $i > 0; $i--) { + $old[] = $r; + $r = $this->delete(); + } + // insert + for ($i = count($replacement)-1; $i >= 0; $i--) { + $this->insertAfter($r); + $r = $replacement[$i]; + } + return array($old, $r); + } +} diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index d6831a6fb..de3bedbe5 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -461,7 +461,8 @@ class TemplateHandler */ private function _parseInline($buff) { - if(preg_match_all('/<([a-zA-Z]+\d?)(?>(?!<[a-z]+\d?[\s>]).)*?(?:[ \|]cond| loop)="/s', $buff, $match) === false) + preg_match_all('/<([a-zA-Z]+\d?)(?>(?!<[a-z]+\d?[\s>]).)*?(?:[ \|]cond| loop)="/s', $buff, $match); + if(empty($match)) { return $buff; } diff --git a/config/config.inc.php b/config/config.inc.php index 940f088b9..df3193a58 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -52,6 +52,25 @@ define('_XE_PATH_', str_replace('config/config.inc.php', '', str_replace('\\', ' // Set can use other method instead cookie to store session id(for file upload) ini_set('session.use_only_cookies', 0); +// Set default charset as UTF-8 +$charset = 'UTF-8'; +ini_set('default_charset', $charset); + +if (function_exists('iconv_set_encoding') && version_compare(PHP_VERSION, '5.6', '<')) +{ + iconv_set_encoding('internal_encoding', $charset); +} + +if (function_exists('mb_internal_encoding')) +{ + mb_internal_encoding($charset); +} + +if (function_exists('mb_regex_encoding')) +{ + mb_regex_encoding($charset); +} + if(file_exists(_XE_PATH_ . 'config/package.inc.php')) { @@ -72,12 +91,12 @@ else /** * Location site */ - define('_XE_LOCATION_SITE_', 'http://www.xpressengine.com/'); + define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/'); /** * Download server */ - define('_XE_DOWNLOAD_SERVER_', 'http://download.xpressengine.com/'); + define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/'); } /* diff --git a/config/package.inc.php b/config/package.inc.php index 46eb98584..46b31a6b4 100644 --- a/config/package.inc.php +++ b/config/package.inc.php @@ -3,5 +3,5 @@ define('_XE_PACKAGE_', 'XE'); define('_XE_LOCATION_', 'ko'); -define('_XE_LOCATION_SITE_', 'http://www.xpressengine.com/'); -define('_XE_DOWNLOAD_SERVER_', 'http://download.xpressengine.com/'); +define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/'); +define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/'); diff --git a/layouts/default/layout.html b/layouts/default/layout.html index dfcc79ca4..4adf5a76c 100644 --- a/layouts/default/layout.html +++ b/layouts/default/layout.html @@ -104,6 +104,6 @@
- needs a
Beautiful iconpack
XEIcon
사이트 제목 바꾸기
한개의 폰트, 680개의 아이콘
-웹 콘텐츠의 목적에 맞는 아이콘을 다양한 구성에서 찾아볼 수 있습니다.
라이브러리에서 필요한 아이콘을 찾아보세요!
웹 콘텐츠의 목적에 맞는 아이콘을 다양한 구성에서 찾아볼 수 있습니다.
라이브러리에서 필요한 아이콘을 찾아보세요!
메뉴 구조 구성하기
@@ -38,7 +38,7 @@
레이아웃 꾸미기
오픈소스
-XEIcon은 OFL 라이선스를 따르는 오픈소스입니다.
모든 사용자에게 무료로 제공됩니다. 라이선스를 확인해 보세요!
XEIcon은 OFL 라이선스를 따르는 오픈소스입니다.
모든 사용자에게 무료로 제공됩니다. 라이선스를 확인해 보세요!
최신버전 다운로드
가장 최신 버전 구성을 압축파일로
다운로드 받아볼 수 있습니다.
Git 저장소 복제
@@ -60,7 +60,7 @@CDN by jsDelivr
한줄의 코드만 작성하면 다운로드 없이 XEIcon을 사용할 수 있습니다.
- check out + check outInstall with Bower
diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html index 2081af09b..d9c2092b4 100644 --- a/layouts/xedition/layout.html +++ b/layouts/xedition/layout.html @@ -4,6 +4,9 @@
-
+
-
+
-
+
diff --git a/libs/PEAR.1.9.5/HTTP/Request.php b/libs/PEAR.1.9.5/HTTP/Request.php
index b877c3ca8..7fb0645d0 100644
--- a/libs/PEAR.1.9.5/HTTP/Request.php
+++ b/libs/PEAR.1.9.5/HTTP/Request.php
@@ -27,7 +27,7 @@ class HTTP_Request extends HTTP_Request2
public function getResponseHeader() {
if($this->response)
{
- return $this->response->getHeader();
+ return $this->response->getHeader();
}
}
diff --git a/libs/ftp.class.php b/libs/ftp.class.php
index 1494a96c2..9b91602cf 100644
--- a/libs/ftp.class.php
+++ b/libs/ftp.class.php
@@ -53,7 +53,7 @@
var $ftp_resp;
/* Constractor */
- function ftp()
+ function __construct()
{
$this->debug = false;
$this->umask = 0022;
diff --git a/libs/tar.class.php b/libs/tar.class.php
index 7536e17f4..54285b55e 100644
--- a/libs/tar.class.php
+++ b/libs/tar.class.php
@@ -76,7 +76,7 @@ class tar {
// Class Constructor -- Does nothing...
- function tar() {
+ function __construct() {
return true;
}
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index 018fedb5e..7ce073955 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -61,5 +61,3 @@
{$lang->msg_php_warning_title}
{$lang->msg_php_warning_notice}
{$lang->msg_php_warning_now_version} : {phpversion()}
-{$lang->msg_php_warning_latest_version_check}
+{$lang->msg_php_warning_latest_version_check}
- {$lang->msg_php_warning_notice_explain}
안전하지 않은 PHP 버전 경고
이 서버는 안전하지 않은 PHP 버전을 사용하고 있으며, PHP를 최신 안정 버전으로의 업그레이드를 권장합니다.
이 서버의 PHP 버전 : {phpversion()}
- +- 매우 심각한 PHP 보안 문제 및 공격에 노출될 수 있습니다. diff --git a/modules/autoinstall/tpl/list.html b/modules/autoinstall/tpl/list.html index b34fc9423..3004245cd 100644 --- a/modules/autoinstall/tpl/list.html +++ b/modules/autoinstall/tpl/list.html @@ -45,6 +45,16 @@
-
최신버전 다운로드
diff --git a/modules/install/tpl/check_env.html b/modules/install/tpl/check_env.html index 3178ba1bd..cfae17bcd 100644 --- a/modules/install/tpl/check_env.html +++ b/modules/install/tpl/check_env.html @@ -10,7 +10,7 @@ {$lang->disable}{sprintf($lang->install_checklist_desc[$key], __XE_MIN_PHP_VERSION__)}
- {sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} [{$lang->more}] + {sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} [{$lang->more}]
GET STARTED
XEIcon 사용과 설치 방법은 매우 간단합니다. 자세한 사용방법을 XEIcon 공식사이트에서 확인해보세요!
+XEIcon 사용과 설치 방법은 매우 간단합니다. 자세한 사용방법을 XEIcon 공식사이트에서 확인해보세요!
- {sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} [{$lang->more}] + {sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} [{$lang->more}]
diff --git a/modules/integration_search/skins/misol_town/css/blue.css b/modules/integration_search/skins/misol_town/css/blue.css index 739587f8b..ea2ea0fe9 100644 --- a/modules/integration_search/skins/misol_town/css/blue.css +++ b/modules/integration_search/skins/misol_town/css/blue.css @@ -7,8 +7,8 @@ font-family: "맑은 고딕", "Apple SD Gothic Neo","나눔고딕",NanumGothic,'Nanum Gothic',"돋움",Dotum,"굴림",Gulim,Helvetica,sans-serif; font-size: 14px; background-color: #fff; - margin: 5px 0px; - padding: 0px; + margin: 0px; + padding: 5px 0px 10px; } .misolSearch section.misolSearchSection { @@ -27,6 +27,10 @@ #misolSearchForm{ display:inline-block; } +.misolSearch .searchBox input { + -webkit-appearance: none; + border-radius: 0; +} .misolSearch .searchBox input[type="submit"]{vertical-align:top;background:#616161;border:1px solid #e0e0e0;color:#fff;height:32px;padding:0 15px;margin:0;} .misolSearch .searchBox input[type="submit"]:hover, .misolSearch .searchBox input[type='submit']:focus {background:#153888;} .misolSearch .searchBox input.keyword[type='text'] { diff --git a/modules/integration_search/skins/misol_town/css/blue.min.css b/modules/integration_search/skins/misol_town/css/blue.min.css index 0b42faab3..4b24ee5b5 100644 --- a/modules/integration_search/skins/misol_town/css/blue.min.css +++ b/modules/integration_search/skins/misol_town/css/blue.min.css @@ -1 +1,2 @@ -@charset "UTF-8";.misolSearch{font-family:"맑은 고딕","Apple SD Gothic Neo","나눔고딕",NanumGothic,'Nanum Gothic',"돋움",Dotum,"굴림",Gulim,Helvetica,sans-serif;font-size:14px;background-color:#fff;margin:5px 0;padding:0}.misolSearch section.misolSearchSection{font-size:14px;background-color:#fff;box-shadow:0 0 2px rgba(0,0,0,.25);margin:10px;padding:0 5px}.misolSearch .searchBox{padding:15px 0;text-align:center}#misolSearchForm{display:inline-block}.misolSearch .searchBox input[type=submit]{vertical-align:top;background:#616161;border:1px solid #e0e0e0;color:#fff;height:32px;padding:0 15px;margin:0}.misolSearch .searchBox input[type=submit]:hover,.misolSearch .searchBox input[type=submit]:focus{background:#153888}.misolSearch .searchBox input.keyword[type=text]{width:450px;line-height:18px;font-size:14px;margin:0;padding:8px 8px 6px;position:relative;display:inline-block;outline:0;border:none;border-bottom:1px solid #e0e0e0}.misolSearch .searchBox input.keyword[type=text]:focus,.misolSearch .searchBox input.keyword[type=text]:hover{border-bottom:1px solid #153888}.misolSearch address{font-style:normal}.misolSearch .misolSearch_list .cont_a{color:#222;display:block;letter-spacing:-1px;line-height:18px;margin:0 -5px;overflow:hidden;padding:.667em 10px .733em;text-overflow:ellipsis;white-space:nowrap;text-decoration:none}.misolSearch .misolSearch_list .cont_a:hover{color:#153888}.misolSearch .cont_a{color:#222;display:block;letter-spacing:-1px;overflow:hidden;padding:.467em 0;text-overflow:ellipsis;white-space:nowrap;text-decoration:none}.misolSearch .cont_a dt{font-weight:700}.misolSearch .content_basic{position:relative;display:block;width:100%;vertical-align:middle;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.misolSearch .content_basic section.item{width:100%}.misolSearch .content_basic section.item address,.misolSearch .content_basic section.item h1,.misolSearch .content_basic section.item p{padding:0;margin:3px 0;color:#212121;font-size:14px;position:relative;box-sizing:border-box;width:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.misolSearch .content_image{display:block;position:absolute;left:0;width:80px}.misolSearch .content_image img{width:80px;height:80px}.misolSearch span.left_img{height:80px}.misolSearch .content_basic section.item .left_img{margin-left:85px}.misolSearch ol.misolSearchTabA,.misolSearch ul.misolSearchTabA,.misolSearch ul.misolSearch_list{list-style:none;padding:0 0 6px;margin:0}.misolSearch .misolSearch_list li{position:relative;border-top:1px solid #e0e0e0;overflow:hidden;padding:0}.misolSearch .misolSearch_list li:first-child,.misolSearch.misolSearch_list li.first-child{border-top:0 none}.misolSearch .misolSearch_list li i{margin-right:3px;font-size:.9em}.misolSearch .misolSearchSection .noResult{display:inline-block;margin:10px}.misolSearch .misolTop{border-bottom:1px solid #e0e0e0;height:45px;line-height:20px;margin:0 5px;position:relative}.misolSearch div.misolTop h1{color:#000;font-weight:400;letter-spacing:-1px;line-height:45px;font-size:16.38px}.misolSearch div.misolTop .misol_top_a{color:#000;font-weight:400;display:block;margin:0 -10px;padding:0 10px;text-decoration:none}.misolSearch div.misolTop .misol_more{position:absolute;right:5px;top:15px;height:12.5px;width:9px}.misolSearch div.misolTab{overflow:hidden;width:100%;height:52px;white-space:nowrap;border-bottom:1px solid #e0e0e0;box-sizing:border-box}.misolSearch ol.misolSearchTabA,.misolSearch ul.misolSearchTabA{display:block;overflow-x:auto;-webkit-overflow-scrolling:touch;padding:6px 0 100px;text-decoration:none}.misolSearch div.misolTabCenter{text-align:center;border-bottom:none}.misolSearch ol.misolSearchTabA{display:inline-block}.misolSearch ol.misolSearchTabA>li,.misolSearch ul.misolSearchTabA>li{display:inline-block;height:40px;line-height:18px;position:relative}.misolSearch ol.misolSearchTabA>li a,.misolSearch ul.misolSearchTabA>li a{display:inline-block;color:#000;font-weight:400;letter-spacing:-1px;line-height:40px;text-decoration:none}.misolSearch ol.misolSearchTabA>li a:hover,.misolSearch ol.misolSearchTabA>li.active a,.misolSearch ul.misolSearchTabA>li a:hover,.misolSearch ul.misolSearchTabA>li.active a{color:#153888;font-weight:700}.misolSearch ol.misolSearchTabA>li a span,.misolSearch ul.misolSearchTabA>li a span{border-left:1px solid #e0e0e0;padding:0 15px}.misolSearch ol.misolSearchTabA>li:first-child a span,.misolSearch ul.misolSearchTabA>li:first-child a span{border-left:0 none}.misolSearch section ol.misolSearchTabA>li:first-child a span,.misolSearch section ul.misolSearchTabA>li:first-child a span{padding-left:10px}.misolSearch .pagination{font-size:16px;line-height:16px}.misolSearch .prevEnd:before{font-family:xeicon;content:"\e60b"}.misolSearch .nextEnd:after{font-family:xeicon;content:"\e60d"}.misolSearch ol.misolMobile{display:none}@media screen and (max-width:750px){.misolSearch ol.misolMobile{display:inline-block}.misolSearch ol.misolPC{display:none}.misolSearch .searchBox input.keyword[type=text]{width:200px}} \ No newline at end of file +@charset "UTF-8"; +.misolSearch{font-family:"맑은 고딕","Apple SD Gothic Neo","나눔고딕",NanumGothic,'Nanum Gothic',"돋움",Dotum,"굴림",Gulim,Helvetica,sans-serif;font-size:14px;background-color:#fff;margin:0;padding:5px 0 10px}.misolSearch section.misolSearchSection{font-size:14px;background-color:#fff;box-shadow:0 0 2px rgba(0,0,0,.25);margin:10px;padding:0 5px}.misolSearch .searchBox{padding:15px 0;text-align:center}#misolSearchForm{display:inline-block}.misolSearch .searchBox input{-webkit-appearance:none;border-radius:0}.misolSearch .searchBox input[type=submit]{vertical-align:top;background:#616161;border:1px solid #e0e0e0;color:#fff;height:32px;padding:0 15px;margin:0}.misolSearch .searchBox input[type=submit]:hover,.misolSearch .searchBox input[type=submit]:focus{background:#153888}.misolSearch .searchBox input.keyword[type=text]{width:450px;line-height:18px;font-size:14px;margin:0;padding:8px 8px 6px;position:relative;display:inline-block;outline:0;border:none;border-bottom:1px solid #e0e0e0}.misolSearch .searchBox input.keyword[type=text]:focus,.misolSearch .searchBox input.keyword[type=text]:hover{border-bottom:1px solid #153888}.misolSearch address{font-style:normal}.misolSearch .misolSearch_list .cont_a{color:#222;display:block;letter-spacing:-1px;line-height:18px;margin:0 -5px;overflow:hidden;padding:.667em 10px .733em;text-overflow:ellipsis;white-space:nowrap;text-decoration:none}.misolSearch .misolSearch_list .cont_a:hover{color:#153888}.misolSearch .cont_a{color:#222;display:block;letter-spacing:-1px;overflow:hidden;padding:.467em 0;text-overflow:ellipsis;white-space:nowrap;text-decoration:none}.misolSearch .cont_a dt{font-weight:700}.misolSearch .content_basic{position:relative;display:block;width:100%;vertical-align:middle;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.misolSearch .content_basic section.item{width:100%}.misolSearch .content_basic section.item address,.misolSearch .content_basic section.item h1,.misolSearch .content_basic section.item p{padding:0;margin:3px 0;color:#212121;font-size:14px;position:relative;box-sizing:border-box;width:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.misolSearch .content_image{display:block;position:absolute;left:0;width:80px}.misolSearch .content_image img{width:80px;height:80px}.misolSearch span.left_img{height:80px}.misolSearch .content_basic section.item .left_img{margin-left:85px}.misolSearch ol.misolSearchTabA,.misolSearch ul.misolSearchTabA,.misolSearch ul.misolSearch_list{list-style:none;padding:0 0 6px;margin:0}.misolSearch .misolSearch_list li{position:relative;border-top:1px solid #e0e0e0;overflow:hidden;padding:0}.misolSearch .misolSearch_list li:first-child,.misolSearch.misolSearch_list li.first-child{border-top:0 none}.misolSearch .misolSearch_list li i{margin-right:3px;font-size:.9em}.misolSearch .misolSearchSection .noResult{display:inline-block;margin:10px}.misolSearch .misolTop{border-bottom:1px solid #e0e0e0;height:45px;line-height:20px;margin:0 5px;position:relative}.misolSearch div.misolTop h1{color:#000;font-weight:400;letter-spacing:-1px;line-height:45px;font-size:16.38px}.misolSearch div.misolTop .misol_top_a{color:#000;font-weight:400;display:block;margin:0 -10px;padding:0 10px;text-decoration:none}.misolSearch div.misolTop .misol_more{position:absolute;right:5px;top:15px;height:12.5px;width:9px}.misolSearch div.misolTab{overflow:hidden;width:100%;height:52px;white-space:nowrap;border-bottom:1px solid #e0e0e0;box-sizing:border-box}.misolSearch ol.misolSearchTabA,.misolSearch ul.misolSearchTabA{display:block;overflow-x:auto;-webkit-overflow-scrolling:touch;padding:6px 0 100px;text-decoration:none}.misolSearch div.misolTabCenter{text-align:center;border-bottom:none}.misolSearch ol.misolSearchTabA{display:inline-block}.misolSearch ol.misolSearchTabA>li,.misolSearch ul.misolSearchTabA>li{display:inline-block;height:40px;line-height:18px;position:relative}.misolSearch ol.misolSearchTabA>li a,.misolSearch ul.misolSearchTabA>li a{display:inline-block;color:#000;font-weight:400;letter-spacing:-1px;line-height:40px;text-decoration:none}.misolSearch ol.misolSearchTabA>li a:hover,.misolSearch ol.misolSearchTabA>li.active a,.misolSearch ul.misolSearchTabA>li a:hover,.misolSearch ul.misolSearchTabA>li.active a{color:#153888;font-weight:700}.misolSearch ol.misolSearchTabA>li a span,.misolSearch ul.misolSearchTabA>li a span{border-left:1px solid #e0e0e0;padding:0 15px}.misolSearch ol.misolSearchTabA>li:first-child a span,.misolSearch ul.misolSearchTabA>li:first-child a span{border-left:0 none}.misolSearch section ol.misolSearchTabA>li:first-child a span,.misolSearch section ul.misolSearchTabA>li:first-child a span{padding-left:10px}.misolSearch .pagination{font-size:16px;line-height:16px}.misolSearch .prevEnd:before{font-family:xeicon;content:"\e60b"}.misolSearch .nextEnd:after{font-family:xeicon;content:"\e60d"}.misolSearch ol.misolMobile{display:none}@media screen and (max-width:750px){.misolSearch ol.misolMobile{display:inline-block}.misolSearch ol.misolPC{display:none}.misolSearch .searchBox input.keyword[type=text]{width:200px}} \ No newline at end of file diff --git a/modules/integration_search/skins/misol_town/css/crimson.css b/modules/integration_search/skins/misol_town/css/crimson.css index 2968f6ff5..f90111590 100644 --- a/modules/integration_search/skins/misol_town/css/crimson.css +++ b/modules/integration_search/skins/misol_town/css/crimson.css @@ -7,8 +7,8 @@ font-family: "맑은 고딕", "Apple SD Gothic Neo","나눔고딕",NanumGothic,'Nanum Gothic',"돋움",Dotum,"굴림",Gulim,Helvetica,sans-serif; font-size: 14px; background-color: #fff; - margin: 5px 0px; - padding: 0px; + margin: 0px; + padding: 5px 0px 10px; } .misolSearch section.misolSearchSection { @@ -27,6 +27,10 @@ #misolSearchForm{ display:inline-block; } +.misolSearch .searchBox input { + -webkit-appearance: none; + border-radius: 0; +} .misolSearch .searchBox input[type="submit"]{vertical-align:top;background:#616161;border:1px solid #e0e0e0;color:#fff;height:32px;padding:0 15px;margin:0;} .misolSearch .searchBox input[type="submit"]:hover, .misolSearch .searchBox input[type='submit']:focus {background:#872434;} .misolSearch .searchBox input.keyword[type='text'] { diff --git a/modules/integration_search/skins/misol_town/css/crimson.min.css b/modules/integration_search/skins/misol_town/css/crimson.min.css index 9f5d08267..08571bc4a 100644 --- a/modules/integration_search/skins/misol_town/css/crimson.min.css +++ b/modules/integration_search/skins/misol_town/css/crimson.min.css @@ -1 +1,2 @@ -@charset "UTF-8";.misolSearch{font-family:"맑은 고딕","Apple SD Gothic Neo","나눔고딕",NanumGothic,'Nanum Gothic',"돋움",Dotum,"굴림",Gulim,Helvetica,sans-serif;font-size:14px;background-color:#fff;margin:5px 0;padding:0}.misolSearch section.misolSearchSection{font-size:14px;background-color:#fff;box-shadow:0 0 2px rgba(0,0,0,.25);margin:10px;padding:0 5px}.misolSearch .searchBox{padding:15px 0;text-align:center}#misolSearchForm{display:inline-block}.misolSearch .searchBox input[type=submit]{vertical-align:top;background:#616161;border:1px solid #e0e0e0;color:#fff;height:32px;padding:0 15px;margin:0}.misolSearch .searchBox input[type=submit]:hover,.misolSearch .searchBox input[type=submit]:focus{background:#872434}.misolSearch .searchBox input.keyword[type=text]{width:450px;line-height:18px;font-size:14px;margin:0;padding:8px 8px 6px;position:relative;display:inline-block;outline:0;border:none;border-bottom:1px solid #e0e0e0}.misolSearch .searchBox input.keyword[type=text]:focus,.misolSearch .searchBox input.keyword[type=text]:hover{border-bottom:1px solid #872434}.misolSearch address{font-style:normal}.misolSearch .misolSearch_list .cont_a{color:#222;display:block;letter-spacing:-1px;line-height:18px;margin:0 -5px;overflow:hidden;padding:.667em 10px .733em;text-overflow:ellipsis;white-space:nowrap;text-decoration:none}.misolSearch .misolSearch_list .cont_a:hover{color:#872434}.misolSearch .cont_a{color:#222;display:block;letter-spacing:-1px;overflow:hidden;padding:.467em 0;text-overflow:ellipsis;white-space:nowrap;text-decoration:none}.misolSearch .cont_a dt{font-weight:700}.misolSearch .content_basic{position:relative;display:block;width:100%;vertical-align:middle;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.misolSearch .content_basic section.item{width:100%}.misolSearch .content_basic section.item address,.misolSearch .content_basic section.item h1,.misolSearch .content_basic section.item p{padding:0;margin:3px 0;color:#212121;font-size:14px;position:relative;box-sizing:border-box;width:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.misolSearch .content_image{display:block;position:absolute;left:0;width:80px}.misolSearch .content_image img{width:80px;height:80px}.misolSearch span.left_img{height:80px}.misolSearch .content_basic section.item .left_img{margin-left:85px}.misolSearch ol.misolSearchTabA,.misolSearch ul.misolSearchTabA,.misolSearch ul.misolSearch_list{list-style:none;padding:0 0 6px;margin:0}.misolSearch .misolSearch_list li{position:relative;border-top:1px solid #e0e0e0;overflow:hidden;padding:0}.misolSearch .misolSearch_list li:first-child,.misolSearch.misolSearch_list li.first-child{border-top:0 none}.misolSearch .misolSearch_list li i{margin-right:3px;font-size:.9em}.misolSearch .misolSearchSection .noResult{display:inline-block;margin:10px}.misolSearch .misolTop{border-bottom:1px solid #e0e0e0;height:45px;line-height:20px;margin:0 5px;position:relative}.misolSearch div.misolTop h1{color:#000;font-weight:400;letter-spacing:-1px;line-height:45px;font-size:16.38px}.misolSearch div.misolTop .misol_top_a{color:#000;font-weight:400;display:block;margin:0 -10px;padding:0 10px;text-decoration:none}.misolSearch div.misolTop .misol_more{position:absolute;right:5px;top:15px;height:12.5px;width:9px}.misolSearch div.misolTab{overflow:hidden;width:100%;height:52px;white-space:nowrap;border-bottom:1px solid #e0e0e0;box-sizing:border-box}.misolSearch ol.misolSearchTabA,.misolSearch ul.misolSearchTabA{display:block;overflow-x:auto;-webkit-overflow-scrolling:touch;padding:6px 0 100px;text-decoration:none}.misolSearch div.misolTabCenter{text-align:center;border-bottom:none}.misolSearch ol.misolSearchTabA{display:inline-block}.misolSearch ol.misolSearchTabA>li,.misolSearch ul.misolSearchTabA>li{display:inline-block;height:40px;line-height:18px;position:relative}.misolSearch ol.misolSearchTabA>li a,.misolSearch ul.misolSearchTabA>li a{display:inline-block;color:#000;font-weight:400;letter-spacing:-1px;line-height:40px;text-decoration:none}.misolSearch ol.misolSearchTabA>li a:hover,.misolSearch ol.misolSearchTabA>li.active a,.misolSearch ul.misolSearchTabA>li a:hover,.misolSearch ul.misolSearchTabA>li.active a{color:#872434;font-weight:700}.misolSearch ol.misolSearchTabA>li a span,.misolSearch ul.misolSearchTabA>li a span{border-left:1px solid #e0e0e0;padding:0 15px}.misolSearch ol.misolSearchTabA>li:first-child a span,.misolSearch ul.misolSearchTabA>li:first-child a span{border-left:0 none}.misolSearch section ol.misolSearchTabA>li:first-child a span,.misolSearch section ul.misolSearchTabA>li:first-child a span{padding-left:10px}.misolSearch .pagination{font-size:16px;line-height:16px}.misolSearch .prevEnd:before{font-family:xeicon;content:"\e60b"}.misolSearch .nextEnd:after{font-family:xeicon;content:"\e60d"}.misolSearch ol.misolMobile{display:none}@media screen and (max-width:750px){.misolSearch ol.misolMobile{display:inline-block}.misolSearch ol.misolPC{display:none}.misolSearch .searchBox input.keyword[type=text]{width:200px}} \ No newline at end of file +@charset "UTF-8"; +.misolSearch{font-family:"맑은 고딕","Apple SD Gothic Neo","나눔고딕",NanumGothic,'Nanum Gothic',"돋움",Dotum,"굴림",Gulim,Helvetica,sans-serif;font-size:14px;background-color:#fff;margin:0;padding:5px 0 10px}.misolSearch section.misolSearchSection{font-size:14px;background-color:#fff;box-shadow:0 0 2px rgba(0,0,0,.25);margin:10px;padding:0 5px}.misolSearch .searchBox{padding:15px 0;text-align:center}#misolSearchForm{display:inline-block}.misolSearch .searchBox input{-webkit-appearance:none;border-radius:0}.misolSearch .searchBox input[type=submit]{vertical-align:top;background:#616161;border:1px solid #e0e0e0;color:#fff;height:32px;padding:0 15px;margin:0}.misolSearch .searchBox input[type=submit]:hover,.misolSearch .searchBox input[type=submit]:focus{background:#872434}.misolSearch .searchBox input.keyword[type=text]{width:450px;line-height:18px;font-size:14px;margin:0;padding:8px 8px 6px;position:relative;display:inline-block;outline:0;border:none;border-bottom:1px solid #e0e0e0}.misolSearch .searchBox input.keyword[type=text]:focus,.misolSearch .searchBox input.keyword[type=text]:hover{border-bottom:1px solid #872434}.misolSearch address{font-style:normal}.misolSearch .misolSearch_list .cont_a{color:#222;display:block;letter-spacing:-1px;line-height:18px;margin:0 -5px;overflow:hidden;padding:.667em 10px .733em;text-overflow:ellipsis;white-space:nowrap;text-decoration:none}.misolSearch .misolSearch_list .cont_a:hover{color:#872434}.misolSearch .cont_a{color:#222;display:block;letter-spacing:-1px;overflow:hidden;padding:.467em 0;text-overflow:ellipsis;white-space:nowrap;text-decoration:none}.misolSearch .cont_a dt{font-weight:700}.misolSearch .content_basic{position:relative;display:block;width:100%;vertical-align:middle;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.misolSearch .content_basic section.item{width:100%}.misolSearch .content_basic section.item address,.misolSearch .content_basic section.item h1,.misolSearch .content_basic section.item p{padding:0;margin:3px 0;color:#212121;font-size:14px;position:relative;box-sizing:border-box;width:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.misolSearch .content_image{display:block;position:absolute;left:0;width:80px}.misolSearch .content_image img{width:80px;height:80px}.misolSearch span.left_img{height:80px}.misolSearch .content_basic section.item .left_img{margin-left:85px}.misolSearch ol.misolSearchTabA,.misolSearch ul.misolSearchTabA,.misolSearch ul.misolSearch_list{list-style:none;padding:0 0 6px;margin:0}.misolSearch .misolSearch_list li{position:relative;border-top:1px solid #e0e0e0;overflow:hidden;padding:0}.misolSearch .misolSearch_list li:first-child,.misolSearch.misolSearch_list li.first-child{border-top:0 none}.misolSearch .misolSearch_list li i{margin-right:3px;font-size:.9em}.misolSearch .misolSearchSection .noResult{display:inline-block;margin:10px}.misolSearch .misolTop{border-bottom:1px solid #e0e0e0;height:45px;line-height:20px;margin:0 5px;position:relative}.misolSearch div.misolTop h1{color:#000;font-weight:400;letter-spacing:-1px;line-height:45px;font-size:16.38px}.misolSearch div.misolTop .misol_top_a{color:#000;font-weight:400;display:block;margin:0 -10px;padding:0 10px;text-decoration:none}.misolSearch div.misolTop .misol_more{position:absolute;right:5px;top:15px;height:12.5px;width:9px}.misolSearch div.misolTab{overflow:hidden;width:100%;height:52px;white-space:nowrap;border-bottom:1px solid #e0e0e0;box-sizing:border-box}.misolSearch ol.misolSearchTabA,.misolSearch ul.misolSearchTabA{display:block;overflow-x:auto;-webkit-overflow-scrolling:touch;padding:6px 0 100px;text-decoration:none}.misolSearch div.misolTabCenter{text-align:center;border-bottom:none}.misolSearch ol.misolSearchTabA{display:inline-block}.misolSearch ol.misolSearchTabA>li,.misolSearch ul.misolSearchTabA>li{display:inline-block;height:40px;line-height:18px;position:relative}.misolSearch ol.misolSearchTabA>li a,.misolSearch ul.misolSearchTabA>li a{display:inline-block;color:#000;font-weight:400;letter-spacing:-1px;line-height:40px;text-decoration:none}.misolSearch ol.misolSearchTabA>li a:hover,.misolSearch ol.misolSearchTabA>li.active a,.misolSearch ul.misolSearchTabA>li a:hover,.misolSearch ul.misolSearchTabA>li.active a{color:#872434;font-weight:700}.misolSearch ol.misolSearchTabA>li a span,.misolSearch ul.misolSearchTabA>li a span{border-left:1px solid #e0e0e0;padding:0 15px}.misolSearch ol.misolSearchTabA>li:first-child a span,.misolSearch ul.misolSearchTabA>li:first-child a span{border-left:0 none}.misolSearch section ol.misolSearchTabA>li:first-child a span,.misolSearch section ul.misolSearchTabA>li:first-child a span{padding-left:10px}.misolSearch .pagination{font-size:16px;line-height:16px}.misolSearch .prevEnd:before{font-family:xeicon;content:"\e60b"}.misolSearch .nextEnd:after{font-family:xeicon;content:"\e60d"}.misolSearch ol.misolMobile{display:none}@media screen and (max-width:750px){.misolSearch ol.misolMobile{display:inline-block}.misolSearch ol.misolPC{display:none}.misolSearch .searchBox input.keyword[type=text]{width:200px}} \ No newline at end of file diff --git a/modules/integration_search/skins/misol_town/header.html b/modules/integration_search/skins/misol_town/header.html index 00f3238c0..7c97390c5 100644 --- a/modules/integration_search/skins/misol_town/header.html +++ b/modules/integration_search/skins/misol_town/header.html @@ -2,10 +2,11 @@ - +{$lang->add_group_image_mark}: {$lang->link_file_box}
- - diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 2d39c5305..0991f6adc 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -129,5 +129,3 @@ }); })(jQuery); - - diff --git a/modules/member/tpl/login_config.html b/modules/member/tpl/login_config.html index 7daba7170..4a7d811d4 100644 --- a/modules/member/tpl/login_config.html +++ b/modules/member/tpl/login_config.html @@ -62,5 +62,3 @@ jQuery(function($){ }).change(); }); - - diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html index 606073ab2..13daae119 100644 --- a/modules/member/tpl/member_list.html +++ b/modules/member/tpl/member_list.html @@ -204,5 +204,3 @@ jQuery(function($){ }); }); - - diff --git a/modules/member/tpl/signup_config.html b/modules/member/tpl/signup_config.html index 8f0a56e84..f678e8cb3 100644 --- a/modules/member/tpl/signup_config.html +++ b/modules/member/tpl/signup_config.html @@ -217,5 +217,3 @@ #userDefine{max-width:60%;margin-left:-30%} } - - diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index 30c8b8e0c..2487620d6 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -352,8 +352,6 @@ - - @@ -611,7 +609,7 @@ - - - diff --git a/modules/module/tpl/adminFileBox.html b/modules/module/tpl/adminFileBox.html index ff209ea07..7173737a2 100644 --- a/modules/module/tpl/adminFileBox.html +++ b/modules/module/tpl/adminFileBox.html @@ -116,5 +116,3 @@
',
- ''
+ '
'
),
// issue #1813 https://github.com/xpressengine/xe-core/issues/1813
array(
diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php
index dc85cbfd1..5399fbc98 100644
--- a/widgets/content/content.class.php
+++ b/widgets/content/content.class.php
@@ -779,7 +779,7 @@ class contentItem extends Object
var $contents_link = null;
var $domain = null;
- function contentItem($browser_title='')
+ function __construct($browser_title='')
{
$this->browser_title = $browser_title;
}
diff --git a/widgets/mcontent/mcontent.class.php b/widgets/mcontent/mcontent.class.php
index 4c536cd51..3dab97f75 100644
--- a/widgets/mcontent/mcontent.class.php
+++ b/widgets/mcontent/mcontent.class.php
@@ -671,7 +671,7 @@ class mcontentItem extends Object
var $contents_link = null;
var $domain = null;
- function mcontentItem($browser_title='')
+ function __construct($browser_title='')
{
$this->browser_title = $browser_title;
}