boyska/rss-bridge
1
0
Fork 0
forked from blallo/rss-bridge
Code Releases Activity

Merge pull request #124 from mro/fix/atom_xml_escape

Browse source 
properly escape atom xml
This commit is contained in:
Mitsu 2015-04-24 17:24:54 +02:00
commit 4e95599d8d
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
formats/AtomFormat.php
View file

@ -1,4 +1,9 @@
<?php <?php
function xml_encode($text) {
return htmlspecialchars($text, ENT_XML1);
}
/** /**
* Atom * Atom
* Documentation Source http://en.wikipedia.org/wiki/Atom_%28standard%29 and http://tools.ietf.org/html/rfc4287 * Documentation Source http://en.wikipedia.org/wiki/Atom_%28standard%29 and http://tools.ietf.org/html/rfc4287
@ -13,20 +18,21 @@ class AtomFormat extends FormatAbstract{
$httpHost = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ''; $httpHost = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
$httpInfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : ''; $httpInfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '';
$serverRequestUri = htmlspecialchars($_SERVER['REQUEST_URI']); $serverRequestUri = xml_encode($_SERVER['REQUEST_URI']);
$extraInfos = $this->getExtraInfos(); $extraInfos = $this->getExtraInfos();
$title = htmlspecialchars($extraInfos['name']); $title = xml_encode($extraInfos['name']);
$uri = htmlspecialchars($extraInfos['uri']); $uri = $extraInfos['uri'];
$icon = 'http://g.etfv.co/'. $uri .'?icon.jpg'; $icon = xml_encode('http://g.etfv.co/'. $uri .'?icon.jpg');
$uri = xml_encode($uri);
$entries = ''; $entries = '';
foreach($this->getDatas() as $data){ foreach($this->getDatas() as $data){
$entryName = strip_tags(is_null($data->name) ? $title : $data->name); $entryName = is_null($data->name) ? $title : xml_encode($data->name);
$entryAuthor = strip_tags(is_null($data->author) ? $uri : $data->author); $entryAuthor = is_null($data->author) ? $uri : xml_encode($data->author);
$entryTitle = strip_tags(is_null($data->title) ? '' : $data->title); $entryTitle = is_null($data->title) ? '' : xml_encode($data->title);
$entryUri = htmlspecialchars(is_null($data->uri) ? '' : $data->uri); $entryUri = is_null($data->uri) ? '' : xml_encode($data->uri);
$entryTimestamp = is_null($data->timestamp) ? '' : date(DATE_ATOM, $data->timestamp); $entryTimestamp = is_null($data->timestamp) ? '' : xml_encode(date(DATE_ATOM, $data->timestamp));
// We prevent content from closing the CDATA too early. // We prevent content from closing the CDATA too early.
$entryContent = is_null($data->content) ? '' : '<![CDATA[' . $this->sanitizeHtml(str_replace(']]>','',$data->content)) . ']]>'; $entryContent = is_null($data->content) ? '' : '<![CDATA[' . $this->sanitizeHtml(str_replace(']]>','',$data->content)) . ']]>';
@ -87,7 +93,7 @@ EOD;
public function display(){ public function display(){
$this $this
->setContentType('application/atom+xml; charset=utf8') // We force UTF-8 in ATOM output. ->setContentType('application/atom+xml; charset=UTF-8') // We force UTF-8 in ATOM output.
->callContentType(); ->callContentType();
return parent::display(); return parent::display();