* Fixed a bug where the watchlist count without talk pages would be off by a

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

diff --git a/includes/Feed.php b/includes/Feed.php
index 8b36446..343b24d 100644 (file)
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -1,5 +1,4 @@
 <?php
-# $Id$
 # Basic support for outputting syndication feeds in RSS, other formats
 # 
 # Copyright (C) 2004 Brion Vibber <brion@pobox.com>
@@ -22,16 +21,10 @@
 
 /**
  * Contain a feed class as well as classes to build rss / atom ... feeds
+ * Available feeds are defined in Defines.php
  * @package MediaWiki
  */
 
-/**
- * Available feeds objects
- */
-$wgFeedClasses = array(
-       'rss' => 'RSSFeed',
-       'atom' => 'AtomFeed',
-       );
 
 /**
  * @todo document
@@ -66,11 +59,8 @@ class FeedItem {
         * @todo document
         */
        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', $string );
-               }
+               $string = preg_replace( '/[\x00-\x08\x0b\x0c\x0e-\x1f]/', '', $string );
                return htmlspecialchars( $string );
        }
        
@@ -90,8 +80,8 @@ class FeedItem {
         * @todo document
         */
        function getLanguage() {
-               global $wgLanguageCode;
-               return $wgLanguageCode;
+               global $wgContLanguageCode;
+               return $wgContLanguageCode;
        }
        /**
         * @todo document
@@ -141,20 +131,51 @@ class ChannelFeed extends FeedItem {
        /**#@-*/
        
        /**
-        * @todo document
-        * @param string $mimetype (optional) type of output
+        * Setup and send HTTP headers. Don't send any content;
+        * content might end up being cached and re-sent with
+        * these same headers later.
+        *
+        * This should be called from the outHeader() method,
+        * but can also be called separately.
+        *
+        * @access public
         */
-       function outXmlHeader( $mimetype='application/xml' ) {
-               global $wgServer, $wgStylePath, $wgOut;
+       function httpHeaders() {
+               global $wgOut;
                
                # We take over from $wgOut, excepting its cache header info
                $wgOut->disable();
+               $mimetype = $this->contentType();
                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";
+       }
+       
+       /**
+        * Return an internet media type to be sent in the headers.
+        *
+        * @return string
+        * @access private
+        */
+       function contentType() {
+               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');
+       }
+       
+       /**
+        * Output the initial XML headers with a stylesheet for legibility
+        * if someone finds it in a browser.
+        * @access private
+        */
+       function outXmlHeader() {
+               global $wgServer, $wgStylePath;
+               
+               $this->httpHeaders();
+               echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
+               echo '<?xml-stylesheet type="text/css" href="' .
+                       htmlspecialchars( "$wgServer$wgStylePath/common/feed.css" ) . '"?' . ">\n";
        }
 }