var $Author = '';
/**#@-*/
- /**
+ /**#@+
* @todo document
*/
function FeedItem( $Title, $Description, $Url, $Date = '', $Author = '', $Comments = '' ) {
/**
* @static
- * @todo document
*/
function xmlEncode( $string ) {
- global $wgInputEncoding, $wgContLang;
$string = str_replace( "\r\n", "\n", $string );
- if( strcasecmp( $wgInputEncoding, 'utf-8' ) != 0 ) {
- $string = $wgContLang->iconv( $wgInputEncoding, 'utf-8', $string );
- }
+ $string = preg_replace( '/[\x00-\x08\x0b\x0c\x0e-\x1f]/', '', $string );
return htmlspecialchars( $string );
}
- /**
- * @todo document
- */
function getTitle() { return $this->xmlEncode( $this->Title ); }
- /**
- * @todo document
- */
function getUrl() { return $this->xmlEncode( $this->Url ); }
- /**
- * @todo document
- */
function getDescription() { return $this->xmlEncode( $this->Description ); }
- /**
- * @todo document
- */
function getLanguage() {
global $wgContLanguageCode;
return $wgContLanguageCode;
}
- /**
- * @todo document
- */
function getDate() { return $this->Date; }
- /**
- * @todo document
- */
function getAuthor() { return $this->xmlEncode( $this->Author ); }
- /**
- * @todo document
- */
function getComments() { return $this->xmlEncode( $this->Comments ); }
+ /**#@-*/
}
/**
* @access private
*/
function contentType() {
- return 'application/xml';
+ global $wgRequest;
+ $ctype = $wgRequest->getVal('ctype','application/xml');
+ $allowedctypes = array('application/xml','text/xml','application/rss+xml','application/atom+xml');
+ return (in_array($ctype, $allowedctypes) ? $ctype : 'application/xml');
}
/**
global $wgServer, $wgStylePath;
$this->httpHeaders();
- print '<' . '?xml version="1.0" encoding="utf-8"?' . ">\n";
- print '<' . '?xml-stylesheet type="text/css" href="' .
+ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
+ echo '<?xml-stylesheet type="text/css" href="' .
htmlspecialchars( "$wgServer$wgStylePath/common/feed.css" ) . '"?' . ">\n";
}
}
global $wgVersion, $wgOut;
$this->outXmlHeader();
- ?><feed version="0.3" xml:lang="<?php print $this->getLanguage() ?>">
+ ?><feed xmlns="http://www.w3.org/2005/Atom" xml:lang="<?php print $this->getLanguage() ?>">
+ <id><?php print $this->getFeedId() ?></id>
<title><?php print $this->getTitle() ?></title>
+ <link rel="self" type="application/atom+xml" href="<?php print $this->getSelfUrl() ?>"/>
<link rel="alternate" type="text/html" href="<?php print $this->getUrl() ?>"/>
- <modified><?php print $this->formatTime( wfTimestampNow() ) ?>Z</modified>
- <tagline><?php print $this->getDescription() ?></tagline>
+ <updated><?php print $this->formatTime( wfTimestampNow() ) ?>Z</updated>
+ <subtitle><?php print $this->getDescription() ?></subtitle>
<generator>MediaWiki <?php print $wgVersion ?></generator>
<?php
}
+ /**
+ * Atom 1.0 requires a unique, opaque IRI as a unique indentifier
+ * for every feed we create. For now just use the URL, but who
+ * can tell if that's right? If we put options on the feed, do we
+ * have to change the id? Maybe? Maybe not.
+ *
+ * @return string
+ * @access private
+ */
+ function getFeedId() {
+ return $this->getSelfUrl();
+ }
+
+ /**
+ * Atom 1.0 requests a self-reference to the feed.
+ * @return string
+ * @access private
+ */
+ function getSelfUrl() {
+ global $wgRequest;
+ return htmlspecialchars( $wgRequest->getFullRequestURL() );
+ }
+
/**
* @todo document
*/
global $wgMimeType;
?>
<entry>
+ <id><?php print $item->getUrl() ?></id>
<title><?php print $item->getTitle() ?></title>
<link rel="alternate" type="<?php print $wgMimeType ?>" href="<?php print $item->getUrl() ?>"/>
<?php if( $item->getDate() ) { ?>
- <modified><?php print $this->formatTime( $item->getDate() ) ?>Z</modified>
- <issued><?php print $this->formatTime( $item->getDate() ) ?></issued>
- <created><?php print $this->formatTime( $item->getDate() ) ?>Z</created><?php } ?>
+ <updated><?php print $this->formatTime( $item->getDate() ) ?>Z</updated>
+ <?php } ?>
- <summary type="text/plain"><?php print $item->getDescription() ?></summary>
- <?php if( $item->getAuthor() ) { ?><author><name><?php print $item->getAuthor() ?></name><!-- <url></url><email></email> --></author><?php }?>
- <comment>foobar</comment>
+ <summary type="html"><?php print $item->getDescription() ?></summary>
+ <?php if( $item->getAuthor() ) { ?><author><name><?php print $item->getAuthor() ?></name></author><?php }?>
</entry>
<?php /* FIXME need to add comments