With &debugmsg=1, PHP output a warning because the link trail no longer

[lhc/web/wiklou.git] / includes / Feed.php

diff --git a/includes/Feed.php b/includes/Feed.php
index c7dd64c..b0d208b 100644 (file)
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -20,31 +20,32 @@
 # http://www.gnu.org/copyleft/gpl.html
 
 $wgFeedClasses = array(
-       "rss" => "RSSFeed",
-       # "atom" => "AtomFeed",
+       'rss' => 'RSSFeed',
+       'atom' => 'AtomFeed',
        );
 
 class FeedItem {
-       var $Title = "Wiki";
-       var $Description = "";
-       var $Url = "";
-       var $Date = "";
-       var $Author = "";
+       var $Title = 'Wiki';
+       var $Description = '';
+       var $Url = '';
+       var $Date = '';
+       var $Author = '';
        
-       function FeedItem( $Title, $Description, $Url, $Date = "", $Author = "" ) {
+       function FeedItem( $Title, $Description, $Url, $Date = '', $Author = '', $Comments = '' ) {
                $this->Title = $Title;
                $this->Description = $Description;
                $this->Url = $Url;
                $this->Date = $Date;
                $this->Author = $Author;
+               $this->Comments = $Comments;
        }
        
        /* Static... */
        function xmlEncode( $string ) {
                global $wgInputEncoding, $wgLang;
                $string = str_replace( "\r\n", "\n", $string );
-               if( strcasecmp( $wgInputEncoding, "utf-8" ) != 0 ) {
-                       $string = $wgLang->iconv( $wgInputEncoding, "utf-8" );
+               if( strcasecmp( $wgInputEncoding, 'utf-8' ) != 0 ) {
+                       $string = $wgLang->iconv( $wgInputEncoding, 'utf-8', $string );
                }
                return htmlspecialchars( $string );
        }
@@ -67,6 +68,9 @@ class FeedItem {
        function getAuthor() {
                return $this->xmlEncode( $this->Author );
        }
+       function getComments() {
+               return $this->xmlEncode( $this->Comments );
+       }
 }
 
 class ChannelFeed extends FeedItem {
@@ -80,19 +84,32 @@ class ChannelFeed extends FeedItem {
        function outFooter() {
                # print "</feed>";
        }
+       
+       function outXmlHeader( $mimetype='application/xml' ) {
+               global $wgServer, $wgStylePath, $wgOut;
+               
+               # We take over from $wgOut, excepting its cache header info
+               $wgOut->disable();
+               header( "Content-type: $mimetype; charset=UTF-8" );
+               $wgOut->sendCacheControl();
+               
+               print '<' . '?xml version="1.0" encoding="utf-8"?' . ">\n";
+               print '<' . '?xml-stylesheet type="text/css" href="' .
+                       htmlspecialchars( "$wgServer$wgStylePath/feed.css" ) . '"?' . ">\n";
+       }
 }
 
 class RSSFeed extends ChannelFeed {
+
        function formatTime( $ts ) {
-               return gmdate( "D, d M Y H:i:s T", wfTimestamp2Unix( $ts ) );
+               return gmdate( 'D, d M Y H:i:s \G\M\T', wfTimestamp2Unix( $ts ) );
        }
        
        function outHeader() {
                global $wgVersion;
                
-               header( "Content-type: application/xml; charset=UTF-8" );
-               print '<' . '?xml version="1.0" encoding="utf-8"?' . ">\n";
-               ?><rss version="2.0">
+               $this->outXmlHeader();
+               ?><rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
        <channel>
                <title><?php print $this->getTitle() ?></title>
                <link><?php print $this->getUrl() ?></link>
@@ -110,8 +127,8 @@ class RSSFeed extends ChannelFeed {
                        <link><?php print $item->getUrl() ?></link>
                        <description><?php print $item->getDescription() ?></description>
                        <?php if( $item->getDate() ) { ?><pubDate><?php print $this->formatTime( $item->getDate() ) ?></pubDate><?php } ?>
-                       <?php if( $item->getAuthor() ) { ?><author><?php print $item->getAuthor() ?></author><?php }?>
-
+                       <?php if( $item->getAuthor() ) { ?><dc:creator><?php print $item->getAuthor() ?></dc:creator><?php }?>
+                       <?php if( $item->getComments() ) { ?><comments><?php print $item->getComments() ?></comments><?php }?>
                </item>
 <?php
        }
@@ -123,4 +140,50 @@ class RSSFeed extends ChannelFeed {
        }
 }
 
-?>
\ No newline at end of file
+class AtomFeed extends ChannelFeed {
+       function formatTime( $ts ) {
+               // need to use RFC 822 time format at least for rss2.0
+               return gmdate( 'Y-m-d\TH:i:s', wfTimestamp2Unix( $ts ) );
+       }
+
+       function outHeader() {
+               global $wgVersion, $wgOut;
+               
+               $this->outXmlHeader();
+               ?><feed version="0.3" xml:lang="<?php print $this->getLanguage() ?>">   
+               <title><?php print $this->getTitle() ?></title>
+               <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>
+               <generator>MediaWiki <?php print $wgVersion ?></generator>
+               
+<?php
+       }
+       
+       function outItem( $item ) {
+               global $wgMimeType;
+       ?>
+       <entry>
+               <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 } ?>
+       
+               <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>
+       </entry>
+
+<?php /* FIXME need to add comments
+       <?php if( $item->getComments() ) { ?><dc:comment><?php print $item->getComments() ?></dc:comment><?php }?>
+      */
+       }
+       
+       function outFooter() {?>
+       </feed><?php
+       }
+}
+
+?>