From bcd7bccc462e1d61f780192741031dba9199e97d Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sun, 13 Jan 2019 22:02:59 +0100 Subject: [PATCH] vendor: Update PHP Simple HTML DOM Parser to 1.8.1 https://sourceforge.net/projects/simplehtmldom/files/simplehtmldom/1.8.1/ Note: Some bridges may need fixes in their CSS queries if they don't follow the specification. --- lib/rssbridge.php | 1 + vendor/simplehtmldom/simple_html_dom.php | 2000 ++++++++++++++-------- 2 files changed, 1319 insertions(+), 682 deletions(-) diff --git a/lib/rssbridge.php b/lib/rssbridge.php index dbeab26f..bc8c8d04 100644 --- a/lib/rssbridge.php +++ b/lib/rssbridge.php @@ -65,6 +65,7 @@ require_once PATH_LIB . 'error.php'; require_once PATH_LIB . 'contents.php'; // Vendor +define('MAX_FILE_SIZE', 10000000); /* Allow larger files for simple_html_dom */ require_once PATH_LIB_VENDOR . 'simplehtmldom/simple_html_dom.php'; require_once PATH_LIB_VENDOR . 'php-urljoin/src/urljoin.php'; diff --git a/vendor/simplehtmldom/simple_html_dom.php b/vendor/simplehtmldom/simple_html_dom.php index 43a11722..c0001e3b 100644 --- a/vendor/simplehtmldom/simple_html_dom.php +++ b/vendor/simplehtmldom/simple_html_dom.php @@ -1,7 +1,7 @@ size is the "real" number of bytes the dom was created from. - * but for most purposes, it's a really good estimation. - * Paperg - Added the forceTagsClosed to the dom constructor. Forcing tags closed is great for malformed html, but it CAN lead to parsing errors. - * Allow the user to tell us how much they trust the html. - * Paperg add the text and plaintext to the selectors for the find syntax. plaintext implies text in the innertext of a node. text implies that the tag is a text node. - * This allows for us to find tags based on the text they contain. - * Create find_ancestor_tag to see if a tag is - at any level - inside of another specific tag. - * Paperg: added parse_charset so that we know about the character set of the source document. - * NOTE: If the user's system has a routine called get_last_retrieve_url_contents_content_type availalbe, we will assume it's returning the content-type header from the - * last transfer or curl_exec, and we will parse that and use it in preference to any other method of charset detection. * - * Found infinite loop in the case of broken html in restore_noise. Rewrote to protect from that. + * Paperg - Added tag_start for the starting index of tags - NOTE: This works + * but not accurately. This tag_start gets counted AFTER \r\n have been crushed + * out, and after the remove_noice calls so it will not reflect the REAL + * position of the tag in the source, it will almost always be smaller by some + * amount. We use this to determine how far into the file the tag in question + * is. This "percentage" will never be accurate as the $dom->size is the "real" + * number of bytes the dom was created from. But for most purposes, it's a + * really good estimation. + * + * Paperg - Added the forceTagsClosed to the dom constructor. Forcing tags + * closed is great for malformed html, but it CAN lead to parsing errors. + * + * Allow the user to tell us how much they trust the html. + * + * Paperg add the text and plaintext to the selectors for the find syntax. + * plaintext implies text in the innertext of a node. text implies that the + * tag is a text node. This allows for us to find tags based on the text they + * contain. + * + * Create find_ancestor_tag to see if a tag is - at any level - inside of + * another specific tag. + * + * Paperg: added parse_charset so that we know about the character set of + * the source document. NOTE: If the user's system has a routine called + * get_last_retrieve_url_contents_content_type availalbe, we will assume it's + * returning the content-type header from the last transfer or curl_exec, and + * we will parse that and use it in preference to any other method of charset + * detection. + * + * Found infinite loop in the case of broken html in restore_noise. Rewrote to + * protect from that. + * * PaperG (John Schlick) Added get_display_size for "IMG" tags. * * Licensed under The MIT License @@ -34,7 +52,7 @@ * @author S.C. Chen * @author John Schlick * @author Rus Carroll - * @version Rev. 1.7 (214) + * @version Rev. 1.8.1 (247) * @package PlaceLocalInclude * @subpackage simple_html_dom */ @@ -45,25 +63,33 @@ */ define('HDOM_TYPE_ELEMENT', 1); define('HDOM_TYPE_COMMENT', 2); -define('HDOM_TYPE_TEXT', 3); -define('HDOM_TYPE_ENDTAG', 4); -define('HDOM_TYPE_ROOT', 5); +define('HDOM_TYPE_TEXT', 3); +define('HDOM_TYPE_ENDTAG', 4); +define('HDOM_TYPE_ROOT', 5); define('HDOM_TYPE_UNKNOWN', 6); define('HDOM_QUOTE_DOUBLE', 0); define('HDOM_QUOTE_SINGLE', 1); -define('HDOM_QUOTE_NO', 3); -define('HDOM_INFO_BEGIN', 0); -define('HDOM_INFO_END', 1); -define('HDOM_INFO_QUOTE', 2); -define('HDOM_INFO_SPACE', 3); -define('HDOM_INFO_TEXT', 4); -define('HDOM_INFO_INNER', 5); -define('HDOM_INFO_OUTER', 6); -define('HDOM_INFO_ENDSPACE',7); -define('DEFAULT_TARGET_CHARSET', 'UTF-8'); -define('DEFAULT_BR_TEXT', "\r\n"); -define('DEFAULT_SPAN_TEXT', " "); -define('MAX_FILE_SIZE', 10000000); +define('HDOM_QUOTE_NO', 3); +define('HDOM_INFO_BEGIN', 0); +define('HDOM_INFO_END', 1); +define('HDOM_INFO_QUOTE', 2); +define('HDOM_INFO_SPACE', 3); +define('HDOM_INFO_TEXT', 4); +define('HDOM_INFO_INNER', 5); +define('HDOM_INFO_OUTER', 6); +define('HDOM_INFO_ENDSPACE', 7); + +/** The default target charset */ +defined('DEFAULT_TARGET_CHARSET') || define('DEFAULT_TARGET_CHARSET', 'UTF-8'); + +/** The default
text used instead of
tags when returning text */ +defined('DEFAULT_BR_TEXT') || define('DEFAULT_BR_TEXT', "\r\n"); + +/** The default text used instead of tags when returning text */ +defined('DEFAULT_SPAN_TEXT') || define('DEFAULT_SPAN_TEXT', ' '); + +/** The maximum file size the parser should load */ +defined('MAX_FILE_SIZE') || define('MAX_FILE_SIZE', 600000); /** Contents between curly braces "{" and "}" are interpreted as text */ define('HDOM_SMARTY_AS_TEXT', 1); @@ -72,50 +98,94 @@ define('HDOM_SMARTY_AS_TEXT', 1); // ----------------------------------------------------------------------------- // get html dom from file // $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1. -function file_get_html($url, $use_include_path = false, $context=null, $offset = 0, $maxLen=-1, $lowercase = true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT) +function file_get_html( + $url, + $use_include_path = false, + $context = null, + $offset = 0, + $maxLen = -1, + $lowercase = true, + $forceTagsClosed = true, + $target_charset = DEFAULT_TARGET_CHARSET, + $stripRN = true, + $defaultBRText = DEFAULT_BR_TEXT, + $defaultSpanText = DEFAULT_SPAN_TEXT) { // Ensure maximum length is greater than zero if($maxLen <= 0) { $maxLen = MAX_FILE_SIZE; } // We DO force the tags to be terminated. - $dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText); - // For sourceforge users: uncomment the next line and comment the retrieve_url_contents line 2 lines down if it is not already done. - $contents = file_get_contents($url, $use_include_path, $context, $offset, $maxLen); - // Paperg - use our own mechanism for getting the contents as we want to control the timeout. - //$contents = retrieve_url_contents($url); - if (empty($contents) || strlen($contents) > $maxLen) - { - return false; - } + $dom = new simple_html_dom( + null, + $lowercase, + $forceTagsClosed, + $target_charset, + $stripRN, + $defaultBRText, + $defaultSpanText); + + /** + * For sourceforge users: uncomment the next line and comment the + * retrieve_url_contents line 2 lines down if it is not already done. + */ + $contents = file_get_contents( + $url, + $use_include_path, + $context, + $offset, + $maxLen); + + // Paperg - use our own mechanism for getting the contents as we want to + // control the timeout. + // $contents = retrieve_url_contents($url); + if (empty($contents) || strlen($contents) > $maxLen) { return false; } + // The second parameter can force the selectors to all be lowercase. $dom->load($contents, $lowercase, $stripRN); return $dom; } // get html dom from string -function str_get_html($str, $lowercase=true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT) +function str_get_html( + $str, + $lowercase = true, + $forceTagsClosed = true, + $target_charset = DEFAULT_TARGET_CHARSET, + $stripRN = true, + $defaultBRText = DEFAULT_BR_TEXT, + $defaultSpanText = DEFAULT_SPAN_TEXT) { - $dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText); - if (empty($str) || strlen($str) > MAX_FILE_SIZE) - { + $dom = new simple_html_dom( + null, + $lowercase, + $forceTagsClosed, + $target_charset, + $stripRN, + $defaultBRText, + $defaultSpanText); + + if (empty($str) || strlen($str) > MAX_FILE_SIZE) { $dom->clear(); return false; } + $dom->load($str, $lowercase, $stripRN); return $dom; } // dump html dom tree -function dump_html_tree($node, $show_attr=true, $deep=0) +function dump_html_tree($node, $show_attr = true, $deep = 0) { $node->dump($node); } - /** * simple html dom node - * PaperG - added ability for "find" routine to lowercase the value of the selector. - * PaperG - added $tag_start to track the start position of the tag in the total byte index + * PaperG - added ability for "find" routine to lowercase the value of the + * selector. + * + * PaperG - added $tag_start to track the start position of the tag in the total + * byte index * * @package PlaceLocalInclude */ @@ -209,91 +279,80 @@ class simple_html_dom_node } // dump node's tree - function dump($show_attr=true, $deep=0) + function dump($show_attr = true, $deep = 0) { $lead = str_repeat(' ', $deep); - echo $lead.$this->tag; - if ($show_attr && count($this->attr)>0) - { + echo $lead . $this->tag; + + if ($show_attr && count($this->attr) > 0) { echo '('; - foreach ($this->attr as $k=>$v) - echo "[$k]=>\"".$this->$k.'", '; + foreach ($this->attr as $k => $v) { + echo "[$k]=>\"" . $this->$k . '", '; + } echo ')'; } + echo "\n"; - if ($this->nodes) - { - foreach ($this->nodes as $c) - { - $c->dump($show_attr, $deep+1); + if ($this->nodes) { + foreach ($this->nodes as $c) { + $c->dump($show_attr, $deep + 1); } } } // Debugging function to dump a single dom node with a bunch of information about it. - function dump_node($echo=true) + function dump_node($echo = true) { - $string = $this->tag; - if (count($this->attr)>0) - { + + if (count($this->attr) > 0) { $string .= '('; - foreach ($this->attr as $k=>$v) - { - $string .= "[$k]=>\"".$this->$k.'", '; + foreach ($this->attr as $k => $v) { + $string .= "[$k]=>\"" . $this->$k . '", '; } $string .= ')'; } - if (count($this->_)>0) - { + + if (count($this->_) > 0) { $string .= ' $_ ('; - foreach ($this->_ as $k=>$v) - { - if (is_array($v)) - { + foreach ($this->_ as $k => $v) { + if (is_array($v)) { $string .= "[$k]=>("; - foreach ($v as $k2=>$v2) - { - $string .= "[$k2]=>\"".$v2.'", '; + foreach ($v as $k2 => $v2) { + $string .= "[$k2]=>\"" . $v2 . '", '; } - $string .= ")"; + $string .= ')'; } else { - $string .= "[$k]=>\"".$v.'", '; + $string .= "[$k]=>\"" . $v . '", '; } } - $string .= ")"; + $string .= ')'; } - if (isset($this->text)) - { - $string .= " text: (" . $this->text . ")"; + if (isset($this->text)) { + $string .= ' text: (' . $this->text . ')'; } $string .= " HDOM_INNER_INFO: '"; - if (isset($node->_[HDOM_INFO_INNER])) - { + + if (isset($node->_[HDOM_INFO_INNER])) { $string .= $node->_[HDOM_INFO_INNER] . "'"; - } - else - { + } else { $string .= ' NULL '; } - $string .= " children: " . count($this->children); - $string .= " nodes: " . count($this->nodes); - $string .= " tag_start: " . $this->tag_start; + $string .= ' children: ' . count($this->children); + $string .= ' nodes: ' . count($this->nodes); + $string .= ' tag_start: ' . $this->tag_start; $string .= "\n"; - if ($echo) - { + if ($echo) { echo $string; return; - } - else - { + } else { return $string; } } @@ -305,12 +364,12 @@ class simple_html_dom_node * the current parent node. * @return object|null The parent node */ - function parent($parent=null) + function parent($parent = null) { // I am SURE that this doesn't work properly. - // It fails to unset the current node from it's current parents nodes or children list first. - if ($parent !== null) - { + // It fails to unset the current node from it's current parents nodes or + // children list first. + if ($parent !== null) { $this->parent = $parent; $this->parent->nodes[] = $this; $this->parent->children[] = $this; @@ -335,16 +394,16 @@ class simple_html_dom_node * @return object|array|null The child node at the specified index, all child * nodes or null if the index is invalid. */ - function children($idx=-1) + function children($idx = -1) { - if ($idx===-1) - { + if ($idx === -1) { return $this->children; } - if (isset($this->children[$idx])) - { + + if (isset($this->children[$idx])) { return $this->children[$idx]; } + return null; } @@ -359,8 +418,7 @@ class simple_html_dom_node */ function first_child() { - if (count($this->children)>0) - { + if (count($this->children) > 0) { return $this->children[0]; } return null; @@ -376,9 +434,8 @@ class simple_html_dom_node */ function last_child() { - if (($count=count($this->children))>0) - { - return $this->children[$count-1]; + if (($count = count($this->children)) > 0) { + return $this->children[$count - 1]; } return null; } @@ -391,21 +448,21 @@ class simple_html_dom_node */ function next_sibling() { - if ($this->parent===null) - { + if ($this->parent === null) { return null; } $idx = 0; $count = count($this->parent->children); - while ($idx<$count && $this!==$this->parent->children[$idx]) - { + + while ($idx < $count && $this !== $this->parent->children[$idx]) { ++$idx; } - if (++$idx>=$count) - { + + if (++$idx >= $count) { return null; } + return $this->parent->children[$idx]; } @@ -417,12 +474,17 @@ class simple_html_dom_node */ function prev_sibling() { - if ($this->parent===null) return null; + if ($this->parent === null) { return null; } + $idx = 0; $count = count($this->parent->children); - while ($idx<$count && $this!==$this->parent->children[$idx]) + + while ($idx < $count && $this !== $this->parent->children[$idx]) { ++$idx; - if (--$idx<0) return null; + } + + if (--$idx < 0) { return null; } + return $this->parent->children[$idx]; } @@ -444,16 +506,18 @@ class simple_html_dom_node // Start by including ourselves in the comparison. $returnDom = $this; - while (!is_null($returnDom)) - { - if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: " . $returnDom->tag); } + while (!is_null($returnDom)) { + if (is_object($debug_object)) { + $debug_object->debug_log(2, 'Current tag is: ' . $returnDom->tag); + } - if ($returnDom->tag == $tag) - { + if ($returnDom->tag == $tag) { break; } + $returnDom = $returnDom->parent; } + return $returnDom; } @@ -464,12 +528,20 @@ class simple_html_dom_node */ function innertext() { - if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER]; - if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); + if (isset($this->_[HDOM_INFO_INNER])) { + return $this->_[HDOM_INFO_INNER]; + } + + if (isset($this->_[HDOM_INFO_TEXT])) { + return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); + } $ret = ''; - foreach ($this->nodes as $n) + + foreach ($this->nodes as $n) { $ret .= $n->outertext(); + } + return $ret; } @@ -481,59 +553,61 @@ class simple_html_dom_node function outertext() { global $debug_object; - if (is_object($debug_object)) - { + + if (is_object($debug_object)) { $text = ''; - if ($this->tag == 'text') - { - if (!empty($this->text)) - { - $text = " with text: " . $this->text; + + if ($this->tag === 'text') { + if (!empty($this->text)) { + $text = ' with text: ' . $this->text; } } + $debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text); } - if ($this->tag==='root') return $this->innertext(); + if ($this->tag === 'root') return $this->innertext(); // trigger callback - if ($this->dom && $this->dom->callback!==null) - { + if ($this->dom && $this->dom->callback !== null) { call_user_func_array($this->dom->callback, array($this)); } - if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER]; - if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); + if (isset($this->_[HDOM_INFO_OUTER])) { + return $this->_[HDOM_INFO_OUTER]; + } + + if (isset($this->_[HDOM_INFO_TEXT])) { + return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); + } // render begin tag - if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) - { + if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) { $ret = $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]->makeup(); } else { - $ret = ""; + $ret = ''; } // render inner text - if (isset($this->_[HDOM_INFO_INNER])) - { - // If it's a br tag... don't return the HDOM_INNER_INFO that we may or may not have added. - if ($this->tag != "br") - { + if (isset($this->_[HDOM_INFO_INNER])) { + // If it's a br tag... don't return the HDOM_INNER_INFO that we + // may or may not have added. + if ($this->tag !== 'br') { $ret .= $this->_[HDOM_INFO_INNER]; } } else { - if ($this->nodes) - { - foreach ($this->nodes as $n) - { + if ($this->nodes) { + foreach ($this->nodes as $n) { $ret .= $this->convert_text($n->outertext()); } } } // render end tag - if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) - $ret .= 'tag.'>'; + if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0) { + $ret .= 'tag . '>'; + } + return $ret; } @@ -544,35 +618,39 @@ class simple_html_dom_node */ function text() { - if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER]; - switch ($this->nodetype) - { + if (isset($this->_[HDOM_INFO_INNER])) { + return $this->_[HDOM_INFO_INNER]; + } + + switch ($this->nodetype) { case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); case HDOM_TYPE_COMMENT: return ''; case HDOM_TYPE_UNKNOWN: return ''; } - if (strcasecmp($this->tag, 'script')===0) return ''; - if (strcasecmp($this->tag, 'style')===0) return ''; + + if (strcasecmp($this->tag, 'script') === 0) { return ''; } + if (strcasecmp($this->tag, 'style') === 0) { return ''; } $ret = ''; - // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL. - // NOTE: This indicates that there is a problem where it's set to NULL without a clear happening. + + // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed + // for some span tags, and some p tags) $this->nodes is set to NULL. + // NOTE: This indicates that there is a problem where it's set to NULL + // without a clear happening. // WHY is this happening? - if (!is_null($this->nodes)) - { - foreach ($this->nodes as $n) - { + if (!is_null($this->nodes)) { + foreach ($this->nodes as $n) { // Start paragraph after a blank line - if ($n->tag == 'p') - { + if ($n->tag === 'p') { $ret .= "\n\n"; } $ret .= $this->convert_text($n->text()); - // If this node is a span... add a space at the end of it so multiple spans don't run into each other. This is plaintext after all. - if ($n->tag == "span") - { + // If this node is a span... add a space at the end of it so + // multiple spans don't run into each other. This is plaintext + // after all. + if ($n->tag === 'span') { $ret .= $this->dom->default_span_text; } } @@ -597,72 +675,91 @@ class simple_html_dom_node function makeup() { // text, comment, unknown - if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); + if (isset($this->_[HDOM_INFO_TEXT])) { + return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); + } - $ret = '<'.$this->tag; + $ret = '<' . $this->tag; $i = -1; - foreach ($this->attr as $key=>$val) - { + foreach ($this->attr as $key => $val) { ++$i; // skip removed attribute - if ($val===null || $val===false) - continue; + if ($val === null || $val === false) { continue; } $ret .= $this->_[HDOM_INFO_SPACE][$i][0]; + //no value attr: nowrap, checked selected... - if ($val===true) + if ($val === true) { $ret .= $key; - else { + } else { switch ($this->_[HDOM_INFO_QUOTE][$i]) { case HDOM_QUOTE_DOUBLE: $quote = '"'; break; case HDOM_QUOTE_SINGLE: $quote = '\''; break; default: $quote = ''; } - $ret .= $key.$this->_[HDOM_INFO_SPACE][$i][1].'='.$this->_[HDOM_INFO_SPACE][$i][2].$quote.$val.$quote; + + $ret .= $key + . $this->_[HDOM_INFO_SPACE][$i][1] + . '=' + . $this->_[HDOM_INFO_SPACE][$i][2] + . $quote + . $val + . $quote; } } + $ret = $this->dom->restore_noise($ret); return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>'; } - // find elements by css selector - //PaperG - added ability for find to lowercase the value of the selector. - function find($selector, $idx=null, $lowercase=false) + /** + * Find elements by CSS selector + * + * @param string $selector The CSS selector + * @param int|null $idx Index of element to return form the list of matching + * elements (default: `null` = disabled). + * @param bool $lowercase Matches tag names case insensitive (lowercase) if + * enabled (default: `false`) + * @return array|object|null A list of elements matching the specified CSS + * selector or a single element if $idx is specified or null if no element + * was found. + */ + function find($selector, $idx = null, $lowercase = false) { $selectors = $this->parse_selector($selector); - if (($count=count($selectors))===0) return array(); + if (($count = count($selectors)) === 0) { return array(); } $found_keys = array(); // find each selector - for ($c=0; $c<$count; ++$c) - { - // The change on the below line was documented on the sourceforge code tracker id 2788009 + for ($c = 0; $c < $count; ++$c) { + // The change on the below line was documented on the sourceforge + // code tracker id 2788009 // used to be: if (($levle=count($selectors[0]))===0) return array(); - if (($levle=count($selectors[$c]))===0) return array(); - if (!isset($this->_[HDOM_INFO_BEGIN])) return array(); + if (($levle = count($selectors[$c])) === 0) { return array(); } + if (!isset($this->_[HDOM_INFO_BEGIN])) { return array(); } - $head = array($this->_[HDOM_INFO_BEGIN]=>1); + $head = array($this->_[HDOM_INFO_BEGIN] => 1); + $cmd = ' '; // Combinator // handle descendant selectors, no recursive! - for ($l=0; $l<$levle; ++$l) - { + for ($l = 0; $l < $levle; ++$l) { $ret = array(); - foreach ($head as $k=>$v) - { - $n = ($k===-1) ? $this->dom->root : $this->dom->nodes[$k]; + + foreach ($head as $k => $v) { + $n = ($k === -1) ? $this->dom->root : $this->dom->nodes[$k]; //PaperG - Pass this optional parameter on to the seek function. - $n->seek($selectors[$c][$l], $ret, $lowercase); + $n->seek($selectors[$c][$l], $ret, $cmd, $lowercase); } + $head = $ret; + $cmd = $selectors[$c][$l][4]; // Next Combinator } - foreach ($head as $k=>$v) - { - if (!isset($found_keys[$k])) - { + foreach ($head as $k => $v) { + if (!isset($found_keys[$k])) { $found_keys[$k] = 1; } } @@ -672,192 +769,476 @@ class simple_html_dom_node ksort($found_keys); $found = array(); - foreach ($found_keys as $k=>$v) + foreach ($found_keys as $k => $v) { $found[] = $this->dom->nodes[$k]; + } // return nth-element or array - if (is_null($idx)) return $found; - else if ($idx<0) $idx = count($found) + $idx; + if (is_null($idx)) { return $found; } + elseif ($idx < 0) { $idx = count($found) + $idx; } return (isset($found[$idx])) ? $found[$idx] : null; } - // seek for given conditions - // PaperG - added parameter to allow for case insensitive testing of the value of a selector. - protected function seek($selector, &$ret, $lowercase=false) + /** + * Seek DOM elements by selector + * + * **Note** + * The selector element must be compatible to a selector from + * {@see simple_html_dom_node::parse_selector()} + * + * @param array $selector A selector element + * @param array $ret An array of matches + * @param bool $lowercase Matches tag names case insensitive (lowercase) if + * enabled (default: `false`) + * @return void + */ + protected function seek($selector, &$ret, $parent_cmd, $lowercase = false) { global $debug_object; if (is_object($debug_object)) { $debug_object->debug_log_entry(1); } - list($tag, $key, $val, $exp, $no_key) = $selector; + list($tag, $id, $class, $attributes, $cmb) = $selector; + $nodes = array(); - // xpath index - if ($tag && $key && is_numeric($key)) - { - $count = 0; - foreach ($this->children as $c) - { - if ($tag==='*' || $tag===$c->tag) { - if (++$count==$key) { - $ret[$c->_[HDOM_INFO_BEGIN]] = 1; - return; - } + if ($parent_cmd === ' ') { // Descendant Combinator + // Find parent closing tag if the current element doesn't have a closing + // tag (i.e. void element) + $end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0; + if ($end == 0) { + $parent = $this->parent; + while (!isset($parent->_[HDOM_INFO_END]) && $parent !== null) { + $end -= 1; + $parent = $parent->parent; } + $end += $parent->_[HDOM_INFO_END]; } - return; + + // Get list of target nodes + $nodes_start = $this->_[HDOM_INFO_BEGIN] + 1; + $nodes_count = $end - $nodes_start; + $nodes = array_slice($this->dom->nodes, $nodes_start, $nodes_count, true); + } elseif ($parent_cmd === '>') { // Child Combinator + $nodes = $this->children; + } elseif ($parent_cmd === '+' + && $this->parent + && in_array($this, $this->parent->children)) { // Next-Sibling Combinator + $index = array_search($this, $this->parent->children, true) + 1; + $nodes[] = $this->parent->children[$index]; + } elseif ($parent_cmd === '~' + && $this->parent + && in_array($this, $this->parent->children)) { // Subsequent Sibling Combinator + $index = array_search($this, $this->parent->children, true); + $nodes = array_slice($this->parent->children, $index); } - $end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0; - if ($end==0) { - $parent = $this->parent; - while (!isset($parent->_[HDOM_INFO_END]) && $parent!==null) { - $end -= 1; - $parent = $parent->parent; - } - $end += $parent->_[HDOM_INFO_END]; - } - - for ($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) { - $node = $this->dom->nodes[$i]; - + // Go throgh each element starting at this element until the end tag + // Note: If this element is a void tag, any previous void element is + // skipped. + foreach($nodes as $node) { $pass = true; - if ($tag==='*' && !$key) { - if (in_array($node, $this->children, true)) - $ret[$i] = 1; - continue; + // Skip root nodes + if(!$node->parent) { + $pass = false; } - // compare tag - if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;} - // compare key - if ($pass && $key) { - if ($no_key) { - if (isset($node->attr[$key])) $pass=false; - } else { - if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false; - } + // Skip if node isn't a child node (i.e. text nodes) + if($pass && !in_array($node, $node->parent->children, true)) { + $pass = false; } - // compare value - if ($pass && $key && $val && $val!=='*') { - // If they have told us that this is a "plaintext" search then we want the plaintext of the node - right? - if ($key == "plaintext") { - // $node->plaintext actually returns $node->text(); - $nodeKeyValue = $node->text(); - } else { - // this is a normal search, we want the value of that attribute of the tag. - $nodeKeyValue = $node->attr[$key]; - } - if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: " . $node->tag . " for attribute: " . $key . $exp . $val . " where nodes value is: " . $nodeKeyValue);} - //PaperG - If lowercase is set, do a case insensitive test of the value of the selector. - if ($lowercase) { - $check = $this->match($exp, strtolower($val), strtolower($nodeKeyValue)); - } else { - $check = $this->match($exp, $val, $nodeKeyValue); - } - if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: " . ($check ? "true" : "false"));} + // Skip if tag doesn't match + if ($pass && $tag !== '' && $tag !== $node->tag && $tag !== '*') { + $pass = false; + } - // handle multiple class - if (!$check && strcasecmp($key, 'class')===0) { - foreach (explode(' ',$node->attr[$key]) as $k) { - // Without this, there were cases where leading, trailing, or double spaces lead to our comparing blanks - bad form. - if (!empty($k)) { - if ($lowercase) { - $check = $this->match($exp, strtolower($val), strtolower($k)); - } else { - $check = $this->match($exp, $val, $k); - } - if ($check) break; + // Skip if ID doesn't exist + if ($pass && $id !== '' && !isset($node->attr['id'])) { + $pass = false; + } + + // Check if ID matches + if ($pass && $id !== '' && isset($node->attr['id'])) { + // Note: Only consider the first ID (as browsers do) + $node_id = explode(' ', trim($node->attr['id']))[0]; + + if($id !== $node_id) { $pass = false; } + } + + // Check if all class(es) exist + if ($pass && $class !== '' && is_array($class) && !empty($class)) { + if (isset($node->attr['class'])) { + $node_classes = explode(' ', $node->attr['class']); + + if ($lowercase) { + $node_classes = array_map('strtolower', $node_classes); + } + + foreach($class as $c) { + if(!in_array($c, $node_classes)) { + $pass = false; + break; } } + } else { + $pass = false; } - if (!$check) $pass = false; } - if ($pass) $ret[$i] = 1; + + // Check attributes + if ($pass + && $attributes !== '' + && is_array($attributes) + && !empty($attributes)) { + foreach($attributes as $a) { + list ( + $att_name, + $att_expr, + $att_val, + $att_inv, + $att_case_sensitivity + ) = $a; + + // Handle indexing attributes (i.e. "[2]") + /** + * Note: This is not supported by the CSS Standard but adds + * the ability to select items compatible to XPath (i.e. + * the 3rd element within it's parent). + * + * Note: This doesn't conflict with the CSS Standard which + * doesn't work on numeric attributes anyway. + */ + if (is_numeric($att_name) + && $att_expr === '' + && $att_val === '') { + $count = 0; + + // Find index of current element in parent + foreach ($node->parent->children as $c) { + if ($c->tag === $node->tag) ++$count; + if ($c === $node) break; + } + + // If this is the correct node, continue with next + // attribute + if ($count === (int)$att_name) continue; + } + + // Check attribute availability + if ($att_inv) { // Attribute should NOT be set + if (isset($node->attr[$att_name])) { + $pass = false; + break; + } + } else { // Attribute should be set + // todo: "plaintext" is not a valid CSS selector! + if ($att_name !== 'plaintext' + && !isset($node->attr[$att_name])) { + $pass = false; + break; + } + } + + // Continue with next attribute if expression isn't defined + if ($att_expr === '') continue; + + // If they have told us that this is a "plaintext" + // search then we want the plaintext of the node - right? + // todo "plaintext" is not a valid CSS selector! + if ($att_name === 'plaintext') { + $nodeKeyValue = $node->text(); + } else { + $nodeKeyValue = $node->attr[$att_name]; + } + + if (is_object($debug_object)) { + $debug_object->debug_log(2, + 'testing node: ' + . $node->tag + . ' for attribute: ' + . $att_name + . $att_expr + . $att_val + . ' where nodes value is: ' + . $nodeKeyValue + ); + } + + // If lowercase is set, do a case insensitive test of + // the value of the selector. + if ($lowercase) { + $check = $this->match( + $att_expr, + strtolower($att_val), + strtolower($nodeKeyValue), + $att_case_sensitivity + ); + } else { + $check = $this->match( + $att_expr, + $att_val, + $nodeKeyValue, + $att_case_sensitivity + ); + } + + if (is_object($debug_object)) { + $debug_object->debug_log(2, + 'after match: ' + . ($check ? 'true' : 'false') + ); + } + + if (!$check) { + $pass = false; + break; + } + } + } + + // Found a match. Add to list and clear node + if ($pass) $ret[$node->_[HDOM_INFO_BEGIN]] = 1; unset($node); } // It's passed by reference so this is actually what this function returns. - if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret);} + if (is_object($debug_object)) { + $debug_object->debug_log(1, 'EXIT - ret: ', $ret); + } } - protected function match($exp, $pattern, $value) { + /** + * Match value and pattern for a given CSS expression + * + * **Supported Expressions** + * + * | Expression | Description + * | ---------- | ----------- + * | `=` | $value and $pattern must be equal + * | `!=` | $value and $pattern must not be equal + * | `^=` | $value must start with $pattern + * | `$=` | $value must end with $pattern + * | `*=` | $value must contain $pattern + * + * @param string $exp The expression. + * @param string $pattern The pattern + * @param string $value The value + * @value bool True if $value matches $pattern + */ + protected function match($exp, $pattern, $value, $case_sensitivity) + { global $debug_object; if (is_object($debug_object)) {$debug_object->debug_log_entry(1);} + if ($case_sensitivity === 'i') { + $pattern = strtolower($pattern); + $value = strtolower($value); + } + switch ($exp) { case '=': - return ($value===$pattern); + return ($value === $pattern); case '!=': - return ($value!==$pattern); + return ($value !== $pattern); case '^=': - return preg_match("/^".preg_quote($pattern,'/')."/", $value); + return preg_match('/^' . preg_quote($pattern, '/') . '/', $value); case '$=': - return preg_match("/".preg_quote($pattern,'/')."$/", $value); + return preg_match('/' . preg_quote($pattern, '/') . '$/', $value); case '*=': - if ($pattern[0]=='/') { - return preg_match($pattern, $value); - } - return preg_match("/".$pattern."/i", $value); + return preg_match('/' . preg_quote($pattern, '/') . '/', $value); + case '|=': + /** + * [att|=val] + * + * Represents an element with the att attribute, its value + * either being exactly "val" or beginning with "val" + * immediately followed by "-" (U+002D). + */ + return strpos($value, $pattern) === 0; + case '~=': + /** + * [att~=val] + * + * Represents an element with the att attribute whose value is a + * whitespace-separated list of words, one of which is exactly + * "val". If "val" contains whitespace, it will never represent + * anything (since the words are separated by spaces). Also if + * "val" is the empty string, it will never represent anything. + */ + return in_array($pattern, explode(' ', trim($value)), true); } return false; } - protected function parse_selector($selector_string) { + /** + * Parse CSS selector + * + * @param string $selector_string CSS selector string + * @return array List of CSS selectors. The format depends on the type of + * selector: + * + * ```php + * + * array( // list of selectors (each separated by a comma), i.e. 'img, p, div' + * array( // list of combinator selectors, i.e. 'img > p > div' + * array( // selector element + * [0], // (string) The element tag + * [1], // (string) The element id + * [2], // (array) The element classes + * [3], // (array>) The list of attributes, each + * // with four elements: name, expression, value, inverted + * [4] // (string) The selector combinator (' ' | '>' | '+' | '~') + * ) + * ) + * ) + * ``` + * + * @link https://www.w3.org/TR/selectors/#compound Compound selector + */ + protected function parse_selector($selector_string) + { global $debug_object; - if (is_object($debug_object)) {$debug_object->debug_log_entry(1);} + if (is_object($debug_object)) { $debug_object->debug_log_entry(1); } - // pattern of CSS selectors, modified from mootools - // Paperg: Add the colon to the attrbute, so that it properly finds like google does. - // Note: if you try to look at this attribute, yo MUST use getAttribute since $dom->x:y will fail the php syntax check. -// Notice the \[ starting the attbute? and the @? following? This implies that an attribute can begin with an @ sign that is not captured. -// This implies that an html attribute specifier may start with an @ sign that is NOT captured by the expression. -// farther study is required to determine of this should be documented or removed. -// $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is"; - $pattern = "/([\w:\*-]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w:-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is"; - preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER); - if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches);} + /** + * Pattern of CSS selectors, modified from mootools (https://mootools.net/) + * + * Paperg: Add the colon to the attribute, so that it properly finds + * like google does. + * + * Note: if you try to look at this attribute, you MUST use getAttribute + * since $dom->x:y will fail the php syntax check. + * + * Notice the \[ starting the attribute? and the @? following? This + * implies that an attribute can begin with an @ sign that is not + * captured. This implies that an html attribute specifier may start + * with an @ sign that is NOT captured by the expression. Farther study + * is required to determine of this should be documented or removed. + * + * Matches selectors in this order: + * + * [0] - full match + * + * [1] - tag name + * ([\w:\*-]*) + * Matches the tag name consisting of zero or more words, colons, + * asterisks and hyphens. + * + * [2] - id name + * (?:\#([\w-]+)) + * Optionally matches a id name, consisting of an "#" followed by + * the id name (one or more words and hyphens). + * + * [3] - class names (including dots) + * (?:\.([\w\.-]+))? + * Optionally matches a list of classs, consisting of an "." + * followed by the class name (one or more words and hyphens) + * where multiple classes can be chained (i.e. ".foo.bar.baz") + * + * [4] - attributes + * ((?:\[@?(?:!?[\w:-]+)(?:(?:[!*^$|~]?=)[\"']?(?:.*?)[\"']?)?(?:\s*?(?:[iIsS])?)?\])+)? + * Optionally matches the attributes list + * + * [5] - separator + * ([\/, >+~]+) + * Matches the selector list separator + */ + // phpcs:ignore Generic.Files.LineLength + $pattern = "/([\w:\*-]*)(?:\#([\w-]+))?(?:|\.([\w\.-]+))?((?:\[@?(?:!?[\w:-]+)(?:(?:[!*^$|~]?=)[\"']?(?:.*?)[\"']?)?(?:\s*?(?:[iIsS])?)?\])+)?([\/, >+~]+)/is"; + + preg_match_all( + $pattern, + trim($selector_string) . ' ', // Add final ' ' as pseudo separator + $matches, + PREG_SET_ORDER + ); + + if (is_object($debug_object)) { + $debug_object->debug_log(2, 'Matches Array: ', $matches); + } $selectors = array(); $result = array(); - //print_r($matches); foreach ($matches as $m) { $m[0] = trim($m[0]); - if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue; - // for browser generated xpath - if ($m[1]==='tbody') continue; - list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false); - if (!empty($m[2])) {$key='id'; $val=$m[2];} - if (!empty($m[3])) {$key='class'; $val=$m[3];} - if (!empty($m[4])) {$key=$m[4];} - if (!empty($m[5])) {$exp=$m[5];} - if (!empty($m[6])) {$val=$m[6];} + // Skip NoOps + if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') { continue; } - // convert to lowercase - if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);} - //elements that do NOT have the specified attribute - if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;} + // Convert to lowercase + if ($this->dom->lowercase) { + $m[1] = strtolower($m[1]); + } - $result[] = array($tag, $key, $val, $exp, $no_key); - if (trim($m[7])===',') { + // Extract classes + if ($m[3] !== '') { $m[3] = explode('.', $m[3]); } + + /* Extract attributes (pattern based on the pattern above!) + + * [0] - full match + * [1] - attribute name + * [2] - attribute expression + * [3] - attribute value + * [4] - case sensitivity + * + * Note: Attributes can be negated with a "!" prefix to their name + */ + if($m[4] !== '') { + preg_match_all( + "/\[@?(!?[\w:-]+)(?:([!*^$|~]?=)[\"']?(.*?)[\"']?)?(?:\s*?([iIsS])?)?\]/is", + trim($m[4]), + $attributes, + PREG_SET_ORDER + ); + + // Replace element by array + $m[4] = array(); + + foreach($attributes as $att) { + // Skip empty matches + if(trim($att[0]) === '') { continue; } + + $inverted = (isset($att[1][0]) && $att[1][0] === '!'); + $m[4][] = array( + $inverted ? substr($att[1], 1) : $att[1], // Name + (isset($att[2])) ? $att[2] : '', // Expression + (isset($att[3])) ? $att[3] : '', // Value + $inverted, // Inverted Flag + (isset($att[4])) ? strtolower($att[4]) : '', // Case-Sensitivity + ); + } + } + + // Sanitize Separator + if ($m[5] !== '' && trim($m[5]) === '') { // Descendant Separator + $m[5] = ' '; + } else { // Other Separator + $m[5] = trim($m[5]); + } + + // Clear Separator if it's a Selector List + if ($is_list = ($m[5] === ',')) { $m[5] = ''; } + + // Remove full match before adding to results + array_shift($m); + $result[] = $m; + + if ($is_list) { // Selector List $selectors[] = $result; $result = array(); } } - if (count($result)>0) - $selectors[] = $result; + + if (count($result) > 0) { $selectors[] = $result; } return $selectors; } function __get($name) { - if (isset($this->attr[$name])) - { + if (isset($this->attr[$name])) { return $this->convert_text($this->attr[$name]); } - switch ($name) - { + switch ($name) { case 'outertext': return $this->outertext(); case 'innertext': return $this->innertext(); case 'plaintext': return $this->text(); @@ -869,27 +1250,28 @@ class simple_html_dom_node function __set($name, $value) { global $debug_object; - if (is_object($debug_object)) {$debug_object->debug_log_entry(1);} + if (is_object($debug_object)) { $debug_object->debug_log_entry(1); } - switch ($name) - { + switch ($name) { case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value; case 'innertext': - if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value; + if (isset($this->_[HDOM_INFO_TEXT])) { + return $this->_[HDOM_INFO_TEXT] = $value; + } return $this->_[HDOM_INFO_INNER] = $value; } - if (!isset($this->attr[$name])) - { + + if (!isset($this->attr[$name])) { $this->_[HDOM_INFO_SPACE][] = array(' ', '', ''); $this->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE; } + $this->attr[$name] = $value; } function __isset($name) { - switch ($name) - { + switch ($name) { case 'outertext': return true; case 'innertext': return true; case 'plaintext': return true; @@ -898,51 +1280,56 @@ class simple_html_dom_node return (array_key_exists($name, $this->attr)) ? true : isset($this->attr[$name]); } - function __unset($name) { - if (isset($this->attr[$name])) - unset($this->attr[$name]); + function __unset($name) + { + if (isset($this->attr[$name])) { unset($this->attr[$name]); } } - // PaperG - Function to convert the text from one character set to another if the two sets are not the same. + // PaperG - Function to convert the text from one character set to another + // if the two sets are not the same. function convert_text($text) { global $debug_object; - if (is_object($debug_object)) {$debug_object->debug_log_entry(1);} + if (is_object($debug_object)) { $debug_object->debug_log_entry(1); } $converted_text = $text; - $sourceCharset = ""; - $targetCharset = ""; + $sourceCharset = ''; + $targetCharset = ''; - if ($this->dom) - { + if ($this->dom) { $sourceCharset = strtoupper($this->dom->_charset); $targetCharset = strtoupper($this->dom->_target_charset); } - if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: " . $sourceCharset . " target charaset: " . $targetCharset);} - if (!empty($sourceCharset) && !empty($targetCharset) && (strcasecmp($sourceCharset, $targetCharset) != 0)) - { + if (is_object($debug_object)) { + $debug_object->debug_log(3, + 'source charset: ' + . $sourceCharset + . ' target charaset: ' + . $targetCharset + ); + } + + if (!empty($sourceCharset) + && !empty($targetCharset) + && (strcasecmp($sourceCharset, $targetCharset) != 0)) { // Check if the reported encoding could have been incorrect and the text is actually already UTF-8 - if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text))) - { + if ((strcasecmp($targetCharset, 'UTF-8') == 0) + && ($this->is_utf8($text))) { $converted_text = $text; - } - else - { + } else { $converted_text = iconv($sourceCharset, $targetCharset, $text); } } // Lets make sure that we don't have that silly BOM issue with any of the utf-8 text we output. - if ($targetCharset == 'UTF-8') - { - if (substr($converted_text, 0, 3) == "\xef\xbb\xbf") - { + if ($targetCharset === 'UTF-8') { + if (substr($converted_text, 0, 3) === "\xef\xbb\xbf") { $converted_text = substr($converted_text, 3); } - if (substr($converted_text, -3) == "\xef\xbb\xbf") - { + + if (substr($converted_text, -3) === "\xef\xbb\xbf") { $converted_text = substr($converted_text, 0, -3); } } @@ -958,48 +1345,40 @@ class simple_html_dom_node */ static function is_utf8($str) { - $c=0; $b=0; - $bits=0; - $len=strlen($str); - for($i=0; $i<$len; $i++) - { - $c=ord($str[$i]); - if($c > 128) - { - if(($c >= 254)) return false; - elseif($c >= 252) $bits=6; - elseif($c >= 248) $bits=5; - elseif($c >= 240) $bits=4; - elseif($c >= 224) $bits=3; - elseif($c >= 192) $bits=2; - else return false; - if(($i+$bits) > $len) return false; - while($bits > 1) - { + $c = 0; $b = 0; + $bits = 0; + $len = strlen($str); + for($i = 0; $i < $len; $i++) { + $c = ord($str[$i]); + if($c > 128) { + if(($c >= 254)) { return false; } + elseif($c >= 252) { $bits = 6; } + elseif($c >= 248) { $bits = 5; } + elseif($c >= 240) { $bits = 4; } + elseif($c >= 224) { $bits = 3; } + elseif($c >= 192) { $bits = 2; } + else { return false; } + if(($i + $bits) > $len) { return false; } + while($bits > 1) { $i++; - $b=ord($str[$i]); - if($b < 128 || $b > 191) return false; + $b = ord($str[$i]); + if($b < 128 || $b > 191) { return false; } $bits--; } } } return true; } - /* - function is_utf8($string) - { - //this is buggy - return (utf8_encode(utf8_decode($string)) == $string); - } - */ /** - * Function to try a few tricks to determine the displayed size of an img on the page. - * NOTE: This will ONLY work on an IMG tag. Returns FALSE on all other tag types. + * Function to try a few tricks to determine the displayed size of an img on + * the page. NOTE: This will ONLY work on an IMG tag. Returns FALSE on all + * other tag types. * * @author John Schlick * @version April 19 2012 - * @return array an array containing the 'height' and 'width' of the image on the page or -1 if we can't figure it out. + * @return array an array containing the 'height' and 'width' of the image + * on the page or -1 if we can't figure it out. */ function get_display_size() { @@ -1008,57 +1387,54 @@ class simple_html_dom_node $width = -1; $height = -1; - if ($this->tag !== 'img') - { + if ($this->tag !== 'img') { return false; } // See if there is aheight or width attribute in the tag itself. - if (isset($this->attr['width'])) - { + if (isset($this->attr['width'])) { $width = $this->attr['width']; } - if (isset($this->attr['height'])) - { + if (isset($this->attr['height'])) { $height = $this->attr['height']; } // Now look for an inline style. - if (isset($this->attr['style'])) - { + if (isset($this->attr['style'])) { // Thanks to user gnarf from stackoverflow for this regular expression. $attributes = array(); - preg_match_all("/([\w-]+)\s*:\s*([^;]+)\s*;?/", $this->attr['style'], $matches, PREG_SET_ORDER); + + preg_match_all( + '/([\w-]+)\s*:\s*([^;]+)\s*;?/', + $this->attr['style'], + $matches, + PREG_SET_ORDER + ); + foreach ($matches as $match) { - $attributes[$match[1]] = $match[2]; + $attributes[$match[1]] = $match[2]; } // If there is a width in the style attributes: - if (isset($attributes['width']) && $width == -1) - { + if (isset($attributes['width']) && $width == -1) { // check that the last two characters are px (pixels) - if (strtolower(substr($attributes['width'], -2)) == 'px') - { + if (strtolower(substr($attributes['width'], -2)) === 'px') { $proposed_width = substr($attributes['width'], 0, -2); // Now make sure that it's an integer and not something stupid. - if (filter_var($proposed_width, FILTER_VALIDATE_INT)) - { + if (filter_var($proposed_width, FILTER_VALIDATE_INT)) { $width = $proposed_width; } } } // If there is a width in the style attributes: - if (isset($attributes['height']) && $height == -1) - { + if (isset($attributes['height']) && $height == -1) { // check that the last two characters are px (pixels) - if (strtolower(substr($attributes['height'], -2)) == 'px') - { + if (strtolower(substr($attributes['height'], -2)) == 'px') { $proposed_height = substr($attributes['height'], 0, -2); // Now make sure that it's an integer and not something stupid. - if (filter_var($proposed_height, FILTER_VALIDATE_INT)) - { + if (filter_var($proposed_height, FILTER_VALIDATE_INT)) { $height = $proposed_height; } } @@ -1067,47 +1443,132 @@ class simple_html_dom_node } // Future enhancement: - // Look in the tag to see if there is a class or id specified that has a height or width attribute to it. + // Look in the tag to see if there is a class or id specified that has + // a height or width attribute to it. // Far future enhancement - // Look at all the parent tags of this image to see if they specify a class or id that has an img selector that specifies a height or width - // Note that in this case, the class or id will have the img subselector for it to apply to the image. + // Look at all the parent tags of this image to see if they specify a + // class or id that has an img selector that specifies a height or width + // Note that in this case, the class or id will have the img subselector + // for it to apply to the image. // ridiculously far future development - // If the class or id is specified in a SEPARATE css file thats not on the page, go get it and do what we were just doing for the ones on the page. + // If the class or id is specified in a SEPARATE css file thats not on + // the page, go get it and do what we were just doing for the ones on + // the page. + + $result = array( + 'height' => $height, + 'width' => $width + ); - $result = array('height' => $height, - 'width' => $width); return $result; } // camel naming conventions - function getAllAttributes() {return $this->attr;} - function getAttribute($name) {return $this->__get($name);} - function setAttribute($name, $value) {$this->__set($name, $value);} - function hasAttribute($name) {return $this->__isset($name);} - function removeAttribute($name) {$this->__set($name, null);} - function getElementById($id) {return $this->find("#$id", 0);} - function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);} - function getElementByTagName($name) {return $this->find($name, 0);} - function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);} - function parentNode() {return $this->parent();} - function childNodes($idx=-1) {return $this->children($idx);} - function firstChild() {return $this->first_child();} - function lastChild() {return $this->last_child();} - function nextSibling() {return $this->next_sibling();} - function previousSibling() {return $this->prev_sibling();} - function hasChildNodes() {return $this->has_child();} - function nodeName() {return $this->tag;} - function appendChild($node) {$node->parent($this); return $node;} + function getAllAttributes() + { + return $this->attr; + } + + function getAttribute($name) + { + return $this->__get($name); + } + + function setAttribute($name, $value) + { + $this->__set($name, $value); + } + + function hasAttribute($name) + { + return $this->__isset($name); + } + + function removeAttribute($name) + { + $this->__set($name, null); + } + + function getElementById($id) + { + return $this->find("#$id", 0); + } + + function getElementsById($id, $idx = null) + { + return $this->find("#$id", $idx); + } + + function getElementByTagName($name) + { + return $this->find($name, 0); + } + + function getElementsByTagName($name, $idx = null) + { + return $this->find($name, $idx); + } + + function parentNode() + { + return $this->parent(); + } + + function childNodes($idx = -1) + { + return $this->children($idx); + } + + function firstChild() + { + return $this->first_child(); + } + + function lastChild() + { + return $this->last_child(); + } + + function nextSibling() + { + return $this->next_sibling(); + } + + function previousSibling() + { + return $this->prev_sibling(); + } + + function hasChildNodes() + { + return $this->has_child(); + } + + function nodeName() + { + return $this->tag; + } + + function appendChild($node) + { + $node->parent($this); + return $node; + } } /** * simple html dom parser - * Paperg - in the find routine: allow us to specify that we want case insensitive testing of the value of the selector. + * + * Paperg - in the find routine: allow us to specify that we want case + * insensitive testing of the value of the selector. + * * Paperg - change $size from protected to public so we can easily access it - * Paperg - added ForceTagsClosed in the constructor which tells us whether we trust the html or not. Default is to NOT trust it. + * + * Paperg - added ForceTagsClosed in the constructor which tells us whether we + * trust the html or not. Default is to NOT trust it. * * @package PlaceLocalInclude */ @@ -1183,7 +1644,8 @@ class simple_html_dom * Holds the current character at position {@see simple_html_dom::$pos} in * the document {@see simple_html_dom::$doc} * - * _Note_: Using this variable is more efficient than calling `substr($doc, $pos, 1)` + * _Note_: Using this variable is more efficient than calling + * `substr($doc, $pos, 1)` * * @var string */ @@ -1230,7 +1692,8 @@ class simple_html_dom */ protected $token_attr = ' >'; - // Note that this is referenced by a child node, and so it needs to be public for that node to see this information. + // Note that this is referenced by a child node, and so it needs to be + // public for that node to see this information. public $_charset = ''; public $_target_charset = ''; @@ -1239,14 +1702,14 @@ class simple_html_dom * * @var string */ - protected $default_br_text = ""; + protected $default_br_text = ''; /** * Suffix for elements * * @var string */ - public $default_span_text = ""; + public $default_span_text = ''; /** * Defines a list of self-closing tags (Void elements) according to the HTML @@ -1261,20 +1724,20 @@ class simple_html_dom * @link https://www.w3.org/TR/html/syntax.html#void-elements Void elements */ protected $self_closing_tags = array( - 'area'=>1, - 'base'=>1, - 'br'=>1, - 'col'=>1, - 'embed'=>1, - 'hr'=>1, - 'img'=>1, - 'input'=>1, - 'link'=>1, - 'meta'=>1, - 'param'=>1, - 'source'=>1, - 'track'=>1, - 'wbr'=>1 + 'area' => 1, + 'base' => 1, + 'br' => 1, + 'col' => 1, + 'embed' => 1, + 'hr' => 1, + 'img' => 1, + 'input' => 1, + 'link' => 1, + 'meta' => 1, + 'param' => 1, + 'source' => 1, + 'track' => 1, + 'wbr' => 1 ); /** @@ -1289,12 +1752,12 @@ class simple_html_dom * - Sort elements by name for better readability! */ protected $block_tags = array( - 'body'=>1, - 'div'=>1, - 'form'=>1, - 'root'=>1, - 'span'=>1, - 'table'=>1 + 'body' => 1, + 'div' => 1, + 'form' => 1, + 'root' => 1, + 'span' => 1, + 'table' => 1 ); /** @@ -1353,38 +1816,55 @@ class simple_html_dom * the document. */ protected $optional_closing_tags = array( - 'b'=>array('b'=>1), // Not optional, see https://www.w3.org/TR/html/textlevel-semantics.html#the-b-element - 'dd'=>array('dd'=>1, 'dt'=>1), - 'dl'=>array('dd'=>1, 'dt'=>1), // Not optional, see https://www.w3.org/TR/html/grouping-content.html#the-dl-element - 'dt'=>array('dd'=>1, 'dt'=>1), - 'li'=>array('li'=>1), - 'optgroup'=>array('optgroup'=>1, 'option'=>1), - 'option'=>array('optgroup'=>1, 'option'=>1), - 'p'=>array('p'=>1), - 'rp'=>array('rp'=>1, 'rt'=>1), - 'rt'=>array('rp'=>1, 'rt'=>1), - 'td'=>array('td'=>1, 'th'=>1), - 'th'=>array('td'=>1, 'th'=>1), - 'tr'=>array('td'=>1, 'th'=>1, 'tr'=>1), + // Not optional, see + // https://www.w3.org/TR/html/textlevel-semantics.html#the-b-element + 'b' => array('b' => 1), + 'dd' => array('dd' => 1, 'dt' => 1), + // Not optional, see + // https://www.w3.org/TR/html/grouping-content.html#the-dl-element + 'dl' => array('dd' => 1, 'dt' => 1), + 'dt' => array('dd' => 1, 'dt' => 1), + 'li' => array('li' => 1), + 'optgroup' => array('optgroup' => 1, 'option' => 1), + 'option' => array('optgroup' => 1, 'option' => 1), + 'p' => array('p' => 1), + 'rp' => array('rp' => 1, 'rt' => 1), + 'rt' => array('rp' => 1, 'rt' => 1), + 'td' => array('td' => 1, 'th' => 1), + 'th' => array('td' => 1, 'th' => 1), + 'tr' => array('td' => 1, 'th' => 1, 'tr' => 1), ); - function __construct($str=null, $lowercase=true, $forceTagsClosed=true, $target_charset=DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT, $options=0) + function __construct( + $str = null, + $lowercase = true, + $forceTagsClosed = true, + $target_charset = DEFAULT_TARGET_CHARSET, + $stripRN = true, + $defaultBRText = DEFAULT_BR_TEXT, + $defaultSpanText = DEFAULT_SPAN_TEXT, + $options = 0) { - if ($str) - { - if (preg_match("/^http:\/\//i",$str) || is_file($str)) - { + if ($str) { + if (preg_match('/^http:\/\//i', $str) || is_file($str)) { $this->load_file($str); - } - else - { - $this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText, $options); + } else { + $this->load( + $str, + $lowercase, + $stripRN, + $defaultBRText, + $defaultSpanText, + $options + ); } } - // Forcing tags to be closed implies that we don't trust the html, but it can lead to parsing errors if we SHOULD trust the html. + // Forcing tags to be closed implies that we don't trust the html, but + // it can lead to parsing errors if we SHOULD trust the html. if (!$forceTagsClosed) { - $this->optional_closing_array=array(); + $this->optional_closing_array = array(); } + $this->_target_charset = $target_charset; } @@ -1394,7 +1874,13 @@ class simple_html_dom } // load html from string - function load($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT, $options=0) + function load( + $str, + $lowercase = true, + $stripRN = true, + $defaultBRText = DEFAULT_BR_TEXT, + $defaultSpanText = DEFAULT_SPAN_TEXT, + $options = 0) { global $debug_object; @@ -1409,8 +1895,8 @@ class simple_html_dom // strip out the \r \n's if we are told to. if ($stripRN) { - $this->doc = str_replace("\r", " ", $this->doc); - $this->doc = str_replace("\n", " ", $this->doc); + $this->doc = str_replace("\r", ' ', $this->doc); + $this->doc = str_replace("\n", ' ', $this->doc); // set the length of content since we have changed it. $this->size = strlen($this->doc); @@ -1440,7 +1926,6 @@ class simple_html_dom // make load function chainable return $this; - } // load html from file @@ -1448,7 +1933,7 @@ class simple_html_dom { $args = func_get_args(); - if($doc = call_user_func_array('file_get_contents', $args) !== false) { + if(($doc = call_user_func_array('file_get_contents', $args)) !== false) { $this->load($doc, true); } else { return false; @@ -1478,16 +1963,16 @@ class simple_html_dom } // save dom as string - function save($filepath='') + function save($filepath = '') { $ret = $this->root->innertext(); - if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX); + if ($filepath !== '') { file_put_contents($filepath, $ret, LOCK_EX); } return $ret; } // find dom node by css selector // Paperg - allow us to specify that we want case insensitive testing of the value of the selector. - function find($selector, $idx=null, $lowercase=false) + function find($selector, $idx = null, $lowercase = false) { return $this->root->find($selector, $idx, $lowercase); } @@ -1495,28 +1980,49 @@ class simple_html_dom // clean up memory due to php5 circular references memory leak... function clear() { - foreach ($this->nodes as $n) {$n->clear(); $n = null;} - // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear. - if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;} - if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);} - if (isset($this->root)) {$this->root->clear(); unset($this->root);} + foreach ($this->nodes as $n) { + $n->clear(); $n = null; + } + + // This add next line is documented in the sourceforge repository. + // 2977248 as a fix for ongoing memory leaks that occur even with the + // use of clear. + if (isset($this->children)) { + foreach ($this->children as $n) { + $n->clear(); $n = null; + } + } + + if (isset($this->parent)) { + $this->parent->clear(); + unset($this->parent); + } + + if (isset($this->root)) { + $this->root->clear(); + unset($this->root); + } + unset($this->doc); unset($this->noise); } - function dump($show_attr=true) + function dump($show_attr = true) { $this->root->dump($show_attr); } // prepare HTML data and init everything - protected function prepare($str, $lowercase=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT) + protected function prepare( + $str, $lowercase = true, + $defaultBRText = DEFAULT_BR_TEXT, + $defaultSpanText = DEFAULT_SPAN_TEXT) { $this->clear(); $this->doc = trim($str); $this->size = strlen($this->doc); - $this->original_size = $this->size; // Save the original size of the html that we got in. It might be useful to someone. + $this->original_size = $this->size; // original size of the html $this->pos = 0; $this->cursor = 1; $this->noise = array(); @@ -1529,7 +2035,7 @@ class simple_html_dom $this->root->_[HDOM_INFO_BEGIN] = -1; $this->root->nodetype = HDOM_TYPE_ROOT; $this->parent = $this->root; - if ($this->size>0) $this->char = $this->doc[0]; + if ($this->size > 0) { $this->char = $this->doc[0]; } } /** @@ -1542,8 +2048,7 @@ class simple_html_dom while (true) { // Read next tag if there is no text between current position and the // next opening tag. - if (($s = $this->copy_until_char('<'))==='') - { + if (($s = $this->copy_until_char('<')) === '') { if($this->read_tag()) { continue; } else { @@ -1559,80 +2064,122 @@ class simple_html_dom } } - // PAPERG - dkchou - added this to try to identify the character set of the page we have just parsed so we know better how to spit it out later. - // NOTE: IF you provide a routine called get_last_retrieve_url_contents_content_type which returns the CURLINFO_CONTENT_TYPE from the last curl_exec - // (or the content_type header from the last transfer), we will parse THAT, and if a charset is specified, we will use it over any other mechanism. + // PAPERG - dkchou - added this to try to identify the character set of the + // page we have just parsed so we know better how to spit it out later. + // NOTE: IF you provide a routine called + // get_last_retrieve_url_contents_content_type which returns the + // CURLINFO_CONTENT_TYPE from the last curl_exec + // (or the content_type header from the last transfer), we will parse THAT, + // and if a charset is specified, we will use it over any other mechanism. protected function parse_charset() { global $debug_object; $charset = null; - if (function_exists('get_last_retrieve_url_contents_content_type')) - { + if (function_exists('get_last_retrieve_url_contents_content_type')) { $contentTypeHeader = get_last_retrieve_url_contents_content_type(); $success = preg_match('/charset=(.+)/', $contentTypeHeader, $matches); - if ($success) - { + if ($success) { $charset = $matches[1]; - if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: ' . $charset);} + if (is_object($debug_object)) { + $debug_object->debug_log(2, + 'header content-type found charset of: ' + . $charset + ); + } } - } - if (empty($charset)) - { - $el = $this->root->find('meta[http-equiv=Content-Type]',0, true); - if (!empty($el)) - { - $fullvalue = $el->content; - if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found' . $fullvalue);} + if (empty($charset)) { + $el = $this->root->find('meta[http-equiv=Content-Type]', 0, true); - if (!empty($fullvalue)) - { - $success = preg_match('/charset=(.+)/i', $fullvalue, $matches); - if ($success) - { + if (!empty($el)) { + $fullvalue = $el->content; + if (is_object($debug_object)) { + $debug_object->debug_log(2, + 'meta content-type tag found' + . $fullvalue + ); + } + + if (!empty($fullvalue)) { + $success = preg_match( + '/charset=(.+)/i', + $fullvalue, + $matches + ); + + if ($success) { $charset = $matches[1]; - } - else - { - // If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1 - if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');} + } else { + // If there is a meta tag, and they don't specify the + // character set, research says that it's typically + // ISO-8859-1 + if (is_object($debug_object)) { + $debug_object->debug_log(2, + 'meta content-type tag couldn\'t be parsed. using iso-8859 default.' + ); + } + $charset = 'ISO-8859-1'; } } } } - // If we couldn't find a charset above, then lets try to detect one based on the text we got... - if (empty($charset)) - { - // Use this in case mb_detect_charset isn't installed/loaded on this machine. + // If we couldn't find a charset above, then lets try to detect one + // based on the text we got... + if (empty($charset)) { + // Use this in case mb_detect_charset isn't installed/loaded on + // this machine. $charset = false; - if (function_exists('mb_detect_encoding')) - { + if (function_exists('mb_detect_encoding')) { // Have php try to detect the encoding from the text given to us. - $charset = mb_detect_encoding($this->doc . "ascii", $encoding_list = array( "UTF-8", "CP1252" ) ); - if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: ' . $charset);} + $charset = mb_detect_encoding( + $this->doc . 'ascii', + $encoding_list = array( 'UTF-8', 'CP1252' ) + ); + + if (is_object($debug_object)) { + $debug_object->debug_log(2, 'mb_detect found: ' . $charset); + } } - // and if this doesn't work... then we need to just wrongheadedly assume it's UTF-8 so that we can move on - cause this will usually give us most of what we need... - if ($charset === false) - { - if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8');} + // and if this doesn't work... then we need to just wrongheadedly + // assume it's UTF-8 so that we can move on - cause this will + // usually give us most of what we need... + if ($charset === false) { + if (is_object($debug_object)) { + $debug_object->debug_log( + 2, + 'since mb_detect failed - using default of utf-8' + ); + } + $charset = 'UTF-8'; } } - // Since CP1252 is a superset, if we get one of it's subsets, we want it instead. - if ((strtolower($charset) == strtolower('ISO-8859-1')) || (strtolower($charset) == strtolower('Latin1')) || (strtolower($charset) == strtolower('Latin-1'))) - { - if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing ' . $charset . ' with CP1252 as its a superset');} + // Since CP1252 is a superset, if we get one of it's subsets, we want + // it instead. + if ((strtolower($charset) == strtolower('ISO-8859-1')) + || (strtolower($charset) == strtolower('Latin1')) + || (strtolower($charset) == strtolower('Latin-1'))) { + + if (is_object($debug_object)) { + $debug_object->debug_log( + 2, + 'replacing ' . $charset . ' with CP1252 as its a superset' + ); + } + $charset = 'CP1252'; } - if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - ' . $charset);} + if (is_object($debug_object)) { + $debug_object->debug_log(1, 'EXIT - ' . $charset); + } return $this->_charset = $charset; } @@ -1645,88 +2192,100 @@ class simple_html_dom protected function read_tag() { // Set end position if no further tags found - if ($this->char!=='<') - { + if ($this->char !== '<') { $this->root->_[HDOM_INFO_END] = $this->cursor; return false; } + $begin_tag_pos = $this->pos; - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next // end tag - if ($this->char==='/') - { - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next + if ($this->char === '/') { + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next // Skip whitespace in end tags (i.e. in "") $this->skip($this->token_blank); $tag = $this->copy_until_char('>'); // Skip attributes in end tags - if (($pos = strpos($tag, ' '))!==false) + if (($pos = strpos($tag, ' ')) !== false) { $tag = substr($tag, 0, $pos); + } $parent_lower = strtolower($this->parent->tag); $tag_lower = strtolower($tag); // The end tag is supposed to close the parent tag. Handle situations // when it doesn't - if ($parent_lower!==$tag_lower) - { + if ($parent_lower !== $tag_lower) { // Parent tag does not have to be closed necessarily (optional closing tag) // Current tag is a block tag, so it may close an ancestor - if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower])) - { + if (isset($this->optional_closing_tags[$parent_lower]) + && isset($this->block_tags[$tag_lower])) { + $this->parent->_[HDOM_INFO_END] = 0; $org_parent = $this->parent; // Traverse ancestors to find a matching opening tag // Stop at root node - while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) + while (($this->parent->parent) + && strtolower($this->parent->tag) !== $tag_lower + ){ $this->parent = $this->parent->parent; + } // If we don't have a match add current tag as text node - if (strtolower($this->parent->tag)!==$tag_lower) { + if (strtolower($this->parent->tag) !== $tag_lower) { $this->parent = $org_parent; // restore origonal parent - if ($this->parent->parent) $this->parent = $this->parent->parent; + + if ($this->parent->parent) { + $this->parent = $this->parent->parent; + } + $this->parent->_[HDOM_INFO_END] = $this->cursor; return $this->as_text_node($tag); } - } - // Grandparent exists and current tag is a block tag, so our parent doesn't have an end tag - else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) - { + } elseif (($this->parent->parent) + && isset($this->block_tags[$tag_lower]) + ) { + // Grandparent exists and current tag is a block tag, so our + // parent doesn't have an end tag $this->parent->_[HDOM_INFO_END] = 0; // No end tag $org_parent = $this->parent; // Traverse ancestors to find a matching opening tag // Stop at root node - while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) + while (($this->parent->parent) + && strtolower($this->parent->tag) !== $tag_lower + ) { $this->parent = $this->parent->parent; + } // If we don't have a match add current tag as text node - if (strtolower($this->parent->tag)!==$tag_lower) - { + if (strtolower($this->parent->tag) !== $tag_lower) { $this->parent = $org_parent; // restore origonal parent $this->parent->_[HDOM_INFO_END] = $this->cursor; return $this->as_text_node($tag); } - } - // Grandparent exists and current tag closes it - else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower) - { + } elseif (($this->parent->parent) + && strtolower($this->parent->parent->tag) === $tag_lower + ) { // Grandparent exists and current tag closes it $this->parent->_[HDOM_INFO_END] = 0; $this->parent = $this->parent->parent; - } - else // Random tag, add as text node + } else { // Random tag, add as text node return $this->as_text_node($tag); + } } // Set end position of parent tag to current cursor position $this->parent->_[HDOM_INFO_END] = $this->cursor; - if ($this->parent->parent) $this->parent = $this->parent->parent; - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next + if ($this->parent->parent) { + $this->parent = $this->parent->parent; + } + + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next return true; } @@ -1741,25 +2300,27 @@ class simple_html_dom // // // - if (isset($tag[0]) && $tag[0]==='!') { + if (isset($tag[0]) && $tag[0] === '!') { $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>'); - if (isset($tag[2]) && $tag[1]==='-' && $tag[2]==='-') { // Comment ("