Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Hopefully fix all the remaining case where the book summary is full of HTML crap.

Browse source 
Should fix all the OPDS page not working with Mantano and FBReaderJ.
This commit is contained in:
Sébastien Lucas 2013-02-19 21:50:38 +01:00
parent b117f022e6
commit 977e669805
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
base.php
View file

@ -20,6 +20,24 @@ function getUrlWithVersion ($url) {
return $url . "?v=" . VERSION; return $url . "?v=" . VERSION;
} }
function xml2xhtml($xml) {
return preg_replace_callback('#<(\w+)([^>]*)\s*/>#s', create_function('$m', '
$xhtml_tags = array("br", "hr", "input", "frame", "img", "area", "link", "col", "base", "basefont", "param");
return in_array($m[1], $xhtml_tags) ? "<$m[1]$m[2] />" : "<$m[1]$m[2]></$m[1]>";
'), $xml);
}
function html2xhtml ($html) {
$doc = new DOMDocument();
$doc->loadHTML($html); // Load the HTML
$output = utf8_decode($doc->saveXML($doc->documentElement)); // Transform to an Ansi xml stream
$output = xml2xhtml($output); // Fix the br / hr ...
if (preg_match ("/<html><body>(.*)<\/body><\/html>/", $output, $matches)) {
$output = $matches [1]; // Remove <html><body>
}
return $output;
}
/** /**
* This method is a direct copy-paste from * This method is a direct copy-paste from
* http://tmont.com/blargh/2010/1/string-format-in-php * http://tmont.com/blargh/2010/1/string-format-in-php

2
book.php
View file

@ -254,7 +254,7 @@ class Book extends Base {
} }
if (preg_match ("/<\/(div|p|a)>/", $this->comment)) if (preg_match ("/<\/(div|p|a)>/", $this->comment))
{ {
return $addition . preg_replace ("/<(br|hr)>/", "<$1 />", $this->comment); return $addition . html2xhtml ($this->comment);
} }
else else
{ {