diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/feedparser.php | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/classes/feedparser.php b/classes/feedparser.php index 4a2c6c2da..1c97e496b 100644 --- a/classes/feedparser.php +++ b/classes/feedparser.php @@ -2,6 +2,7 @@ class FeedParser { private $doc; private $error; + private $libxml_errors = array(); private $items; private $link; private $title; @@ -23,18 +24,12 @@ class FeedParser { $error = libxml_get_last_error(); // libxml compiled without iconv? - if ($error && ($error->code == 32 || $error->code == 9)) { - if (preg_match('/^(<\?xml[\t\n\r ].*?encoding=["\'])(.+?)(["\'].*?\?>)/s', $data, $matches) === 1) { - $enc = $matches[2]; - - $data = mb_convert_encoding($data, 'UTF-8', $enc); + if ($error && $error->code == 32) { + if (preg_match('/^(<\?xml[\t\n\r ].*?encoding[\t\n\r ]*=[\t\n\r ]*["\'])(.+?)(["\'].*?\?>)/s', $data, $matches) === 1) { + $data = mb_convert_encoding($data, 'UTF-8', $matches[2]); $data = preg_replace('/^<\?xml[\t\n\r ].*?\?>/s', $matches[1] . "UTF-8" . $matches[3] , $data); - - // apparently not all UTF-8 characters are valid for XML - $data = preg_replace('/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u', ' ', $data); - if ($data) { libxml_clear_errors(); @@ -43,24 +38,41 @@ class FeedParser { $error = libxml_get_last_error(); } - } + } } // some terrible invalid unicode entity? - if ($error && $error->code == 9) { - $data = mb_convert_encoding($data, 'UTF-8', 'UTF-8'); + if ($error) { + foreach (libxml_get_errors() as $err) { + if ($err->code == 9) { + // remove dangling bytes + $data = mb_convert_encoding($data, 'UTF-8', 'UTF-8'); + + // apparently not all UTF-8 characters are valid for XML + $data = preg_replace('/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}]+/u', ' ', $data); - if ($data) { - libxml_clear_errors(); + if ($data) { + libxml_clear_errors(); - $this->doc = new DOMDocument(); - $this->doc->loadXML($data); + $this->doc = new DOMDocument(); + $this->doc->loadXML($data); - $error = libxml_get_last_error(); + $error = libxml_get_last_error(); + } + break; + } } } - $this->error = $this->format_error($error); + if ($error) { + foreach (libxml_get_errors() as $error) { + if ($error->level == LIBXML_ERR_FATAL) { + if(!isset($this->error)) //currently only the first error is reported + $this->error = $this->format_error($error); + $this->libxml_errors [] = $this->format_error($error); + } + } + } libxml_clear_errors(); $this->items = array(); @@ -81,7 +93,7 @@ class FeedParser { $root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)"); - if ($root) { + if ($root && $root->length > 0) { $root = $root->item(0); if ($root) { @@ -205,6 +217,10 @@ class FeedParser { return $this->error; } + function errors() { + return $this->libxml_errors; + } + function get_link() { return $this->link; } |