Changeset 2145 for trunk

Timestamp:

08/16/10 09:55:22 (21 months ago)

Author:

nick_ramsay

Message:

[TRUNK] Important RSS fixes for 1.4.1

Location:

trunk

Files:

• . (modified) (1 prop)
• content/plugins (modified) (1 prop)
• libs/Feeds.php (modified) (1 diff)
• libs/extensions/RSSWriterClass/rsswriter.php (modified) (6 diffs)

trunk/libs/Feeds.php

@@ -39 +39 @@
                 require_once(EXTENSIONS.'RSSWriterClass/rsswriter.php');
                 
-                $feed = new RSS();
+                $feed = new RSS($h->url(array('page'=>'rss')));
                 $feed->title = stripslashes(html_entity_decode(urldecode($title), ENT_QUOTES, 'UTF-8'));
                 $feed->link = html_entity_decode($link, ENT_QUOTES, 'UTF-8');

trunk/libs/extensions/RSSWriterClass/rsswriter.php

@@ -1 +1 @@
 <?php
+/* Publishes content as an RSS feed
+  http://snipplr.com/view/23/rss-writer-class/
 
-/* Publishes content as an RSS feed 
-   http://snipplr.com/view/23/rss-writer-class/ 
-   
-   E X A M P L E -----------------------------------------------
-                $feed = new RSS();
-                $feed->title       = "RSS Feed Title";
-                $feed->link        = "http://website.com";
-                $feed->description = "Recent articles on your website.";
+  E X A M P L E -----------------------------------------------
+  $feed = new RSS();
+  $feed->title       = "RSS Feed Title";
+  $feed->link        = "http://website.com";
+  $feed->description = "Recent articles on your website.";
 
-                $db->query($query);
-                $result = $db->result;
-                while($row = mysql_fetch_array($result, MYSQL_ASSOC))
-                {
-                        $item = new RSSItem();
-                        $item->title = $title;
-                        $item->link  = $link;
-                        $item->setPubDate($create_date); 
-                        $item->description = "<![CDATA[ $html ]]>";
-                        $feed->addItem($item);
-                }
-                echo $feed->serve();
-        ---------------------------------------------------------------- */
+  $db->query($query);
+  $result = $db->result;
+  while($row = mysql_fetch_array($result, MYSQL_ASSOC))
+  {
+  $item = new RSSItem();
+  $item->title = $title;
+  $item->link  = $link;
+  $item->setPubDate($create_date);
+  $item->description = "<![CDATA[ $html ]]>";
+  $feed->addItem($item);
+  }
+  echo $feed->serve();
+  ---------------------------------------------------------------- */
 
 class RSS {
 
-                var $title;
-                var $link;
-                var $description;
-                var $language = "en-us";
-                var $pubDate;
-        var $items = array();
-        var $tags = array();
+        public $title;
+        public $rss_link;
+        public $link;
+        public $description;
+        public $language = "en-us";
+        public $pubDate;
+        public $items = array();
+        public $tags = array();
 
-        public function __construct() {
+        public function __construct($rss_link) {
+                $this->rss_link = (empty($rss_link))? SITEURL.'index.php?page=rss' : $rss_link ;
+        }
 
-                }
-
-                function addItem($item)
-                {
-                if( is_array($item) )
-                {
-                        foreach( $item as $i )
-                        {
+        public function addItem($item) {
+                if (is_array($item)) {
+                        foreach ($item as $i) {
                                 array_push($this->items, new RSSItem($i));
-                }
+                        }
                 }
                 array_push($this->items, $item);
         }
 
-        function setPubDate($when) {
-                $this->pubDate = date("D, d M Y H:i:s ", ((strtotime($when)) ? strtotime($when) : $when))."GMT";
-                }
+        public function setPubDate($when) {
+                $this->pubDate = date("D, d M Y H:i:s O", ((strtotime($when)) ? strtotime($when) : $when));
+        }
 
-        function addTag($tag, $value) {
-                        $this->tags[$tag] = $value;
-                }
+        public function addTag($tag, $value) {
+                $this->tags[$tag] = $value;
+        }
 
-        function out($serve_contentType = FALSE) {
+        public function out($serve_contentType = FALSE) {
 
                 if (is_string($serve_contentType)) {
@@ -67 +64 @@
 
                 $out = '<?xml version="1.0" encoding="utf-8"?>'."\n";
-                $out .= '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">'."\n";
-                        $out .= "<channel>\n";
+                $out .= '<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'."\n";
+                $out .= "<channel>\n";
                 $out .= "<title>".$this->title."</title>\n";
+                $out .= '<atom:link href="'.$this->rss_link.'" rel="self" type="application/rss+xml" />'."\n";
                 $out .= "<link>".$this->link."</link>\n";
                 $out .= "<description>".$this->description."</description>\n";
                 $out .= "<language>".$this->language."</language>\n";
-                $out .= "<pubDate>".((empty($this->pubDate)) ? date("D, d M Y H:i:s \G\M\T") : $this->pubDate)."</pubDate>\n";
+                $out .= "<pubDate>".((empty($this->pubDate)) ? date("D, d M Y H:i:s O") : $this->pubDate)."</pubDate>\n";
 
                 foreach ($this->tags as $key => $val) {
@@ -80 +78 @@
 
                 foreach ($this->items as $item) {
-                        if( $item instanceof RSSItem) {
-                        $out .= $item->out();
+                        if ($item instanceof RSSItem) {
+                                $out .= $item->out();
                         }
                 }
 
-                        $out .= "</channel>\n";
-                        
+                $out .= "</channel>\n";
+
                 $out .= "</rss>";
 
                 return str_replace("&", "&amp;", $out);
-                }
-                
-                }
+        }
+
+}
 
 class RSSItem {
@@ -116 +114 @@
 
                 if (isset($options['date'])) {
-                        $this->pubDate = date("D, d M Y H:i:s ", ((strtotime($options['date'])) ? strtotime($options['date']) : $options['date']))."GMT";
+                        $this->pubDate = date("D, d M Y H:i:s O", ((strtotime($options['date'])) ? strtotime($options['date']) : $options['date']));
                 }
 
@@ -134 +132 @@
         }
 
-        function out() {
-                        $out = "<item>\n";
+        public function out() {
+                $out = "<item>\n";
                 $out .= "<title>".$this->title."</title>\n";
                 $out .= "<link>".$this->link."</link>\n";
                 $out .= "<description>".$this->description."</description>\n";
-                $out .= "<pubDate>".((empty($this->pubDate)) ? date("D, d M Y H:i:s \G\M\T") : $this->pubDate)."</pubDate>\n";
+                $out .= "<pubDate>".((empty($this->pubDate)) ? date("D, d M Y H:i:s O") : $this->pubDate)."</pubDate>\n";
 
                 if (!empty($this->attachment)) {
-                                $out .= "<enclosure url='{$this->attachment}' length='{$this->length}' type='{$this->mimetype}' />";
+                        $out .= "<enclosure url='{$this->attachment}' length='{$this->length}' type='{$this->mimetype}' />";
                 }
 
-                $this->guid = (empty($this->guid)) ? $this->guid : $this->link;
+                $this->guid = (empty($this->guid)) ?  $this->link : $this->guid;
 
                 $out .= "<guid>".$this->guid."</guid>\n";
@@ -154 +152 @@
 
                 return $out."</item>\n";
-                }
-
         }
 
+}
+
 ?>