diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Feed/Writer/Renderer/Entry/Atom.php --- a/web/lib/Zend/Feed/Writer/Renderer/Entry/Atom.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Feed/Writer/Renderer/Entry/Atom.php Thu Mar 21 19:50:53 2013 +0100 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Atom.php 22758 2010-08-01 19:23:27Z padraic $ + * @version $Id: Atom.php 24593 2012-01-05 20:35:02Z matthew $ */ /** @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Feed_Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Feed_Writer_Renderer_Entry_Atom @@ -38,8 +38,8 @@ { /** * Constructor - * - * @param Zend_Feed_Writer_Entry $container + * + * @param Zend_Feed_Writer_Entry $container * @return void */ public function __construct (Zend_Feed_Writer_Entry $container) @@ -49,7 +49,7 @@ /** * Render atom entry - * + * * @return Zend_Feed_Writer_Renderer_Entry_Atom */ public function render() @@ -58,7 +58,7 @@ $this->_dom->formatOutput = true; $entry = $this->_dom->createElementNS(Zend_Feed_Writer::NAMESPACE_ATOM_10, 'entry'); $this->_dom->appendChild($entry); - + $this->_setSource($this->_dom, $entry); $this->_setTitle($this->_dom, $entry); $this->_setDescription($this->_dom, $entry); @@ -77,15 +77,15 @@ $ext->setDomDocument($this->getDomDocument(), $entry); $ext->render(); } - + return $this; } - + /** * Set entry title - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setTitle(DOMDocument $dom, DOMElement $root) @@ -108,12 +108,12 @@ $cdata = $dom->createCDATASection($this->getDataContainer()->getTitle()); $title->appendChild($cdata); } - + /** * Set entry description - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDescription(DOMDocument $dom, DOMElement $root) @@ -129,12 +129,12 @@ ); $subtitle->appendChild($cdata); } - + /** * Set date entry was modified - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateModified(DOMDocument $dom, DOMElement $root) @@ -159,12 +159,12 @@ ); $updated->appendChild($text); } - + /** * Set date entry was created - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setDateCreated(DOMDocument $dom, DOMElement $root) @@ -179,12 +179,12 @@ ); $el->appendChild($text); } - + /** - * Set entry authors - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry authors + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setAuthors(DOMDocument $dom, DOMElement $root) @@ -218,12 +218,12 @@ } } } - + /** * Set entry enclosure - * - * @param DOMDocument $dom - * @param DOMElement $root + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setEnclosure(DOMDocument $dom, DOMElement $root) @@ -243,7 +243,7 @@ $enclosure->setAttribute('href', $data['uri']); $root->appendChild($enclosure); } - + protected function _setLink(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getLink()) { @@ -255,12 +255,12 @@ $link->setAttribute('type', 'text/html'); $link->setAttribute('href', $this->getDataContainer()->getLink()); } - + /** - * Set entry identifier - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry identifier + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setId(DOMDocument $dom, DOMElement $root) @@ -297,7 +297,7 @@ $text = $dom->createTextNode($this->getDataContainer()->getId()); $id->appendChild($text); } - + /** * Validate a URI using the tag scheme (RFC 4151) * @@ -329,12 +329,12 @@ } return false; } - + /** - * Set entry content - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry content + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setContent(DOMDocument $dom, DOMElement $root) @@ -364,7 +364,7 @@ $element->appendChild($xhtml); $root->appendChild($element); } - + /** * Load a HTML string and attempt to normalise to XML */ @@ -386,19 +386,19 @@ $xhtml = $content; } $xhtml = preg_replace(array( - "/(<[\/]?)([a-zA-Z]+)/" + "/(<[\/]?)([a-zA-Z]+)/" ), '$1xhtml:$2', $xhtml); $dom = new DOMDocument('1.0', $this->getEncoding()); $dom->loadXML('' . $xhtml . ''); return $dom->documentElement; } - + /** - * Set entry cateories - * - * @param DOMDocument $dom - * @param DOMElement $root + * Set entry cateories + * + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setCategories(DOMDocument $dom, DOMElement $root) @@ -421,12 +421,12 @@ $root->appendChild($category); } } - + /** * Append Source element (Atom 1.0 Feed Metadata) * - * @param DOMDocument $dom - * @param DOMElement $root + * @param DOMDocument $dom + * @param DOMElement $root * @return void */ protected function _setSource(DOMDocument $dom, DOMElement $root) @@ -439,6 +439,6 @@ $renderer->setType($this->getType()); $element = $renderer->render()->getElement(); $imported = $dom->importNode($element, true); - $root->appendChild($imported); + $root->appendChild($imported); } }