diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php index 1944905f..bb9abb5b 100644 --- a/formats/AtomFormat.php +++ b/formats/AtomFormat.php @@ -27,9 +27,14 @@ class AtomFormat extends FormatAbstract{ $entryTimestamp = isset($item['timestamp']) ? $this->xml_encode(date(DATE_ATOM, $item['timestamp'])) : ''; $entryContent = isset($item['content']) ? $this->xml_encode($this->sanitizeHtml($item['content'])) : ''; - $entryEnclosure = ''; - if(isset($item['enclosure'])){ - $entryEnclosure = ''; + $entryEnclosures = ''; + if(isset($item['enclosures'])){ + foreach($item['enclosures'] as $enclosure){ + $entryEnclosures .= '' + . PHP_EOL; + } } $entries .= <<{$entryUri} {$entryTimestamp} {$entryContent} - {$entryEnclosure} + {$entryEnclosures} EOD; diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php index 8f96466b..3e5e59de 100644 --- a/formats/HtmlFormat.php +++ b/formats/HtmlFormat.php @@ -30,11 +30,21 @@ class HtmlFormat extends FormatAbstract { . ''; } - $entryEnclosure = ''; - if(isset($item['enclosure'])){ - $entryEnclosure = '
enclosure
'; + $entryEnclosures = ''; + if(isset($item['enclosures'])){ + $entryEnclosures = '

Attachments:

'; + + foreach($item['enclosures'] as $enclosure){ + $url = $this->sanitizeHtml($enclosure); + + $entryEnclosures .= '
  • ' + . substr($url, strrpos($url, '/') + 1) + . '
  • '; + } + + $entryEnclosures .= '
    '; } $entries .= << EOD; diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php index 19c703ea..a7573f56 100644 --- a/formats/MrssFormat.php +++ b/formats/MrssFormat.php @@ -31,9 +31,23 @@ class MrssFormat extends FormatAbstract { $itemTimestamp = isset($item['timestamp']) ? $this->xml_encode(date(DATE_RFC2822, $item['timestamp'])) : ''; $itemContent = isset($item['content']) ? $this->xml_encode($this->sanitizeHtml($item['content'])) : ''; - $entryEnclosure = ''; - if(isset($item['enclosure'])){ - $entryEnclosure = ''; + $entryEnclosuresWarning = ''; + $entryEnclosures = ''; + if(isset($item['enclosures'])){ + $entryEnclosures .= ''; + + if(count($item['enclosures']) > 1){ + $entryEnclosures .= PHP_EOL; + $entryEnclosuresWarning = '<br>Warning: +Some media files might not be shown to you. Consider using the ATOM format instead!'; + foreach($item['enclosures'] as $enclosure){ + $entryEnclosures .= '' + . PHP_EOL; + } + } } $items .= <<{$itemUri} {$itemUri} {$itemTimestamp} - {$itemContent} + {$itemContent}{$entryEnclosuresWarning} {$itemAuthor} - {$entryEnclosure} + {$entryEnclosures} EOD;