[pLog-svn] r6814 - plog/branches/lifetype-1.2/templates/rss

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2009-02-21 09:28:17 -0500 (Sat, 21 Feb 2009)
New Revision: 6814

Modified:
   plog/branches/lifetype-1.2/templates/rss/atom.template
   plog/branches/lifetype-1.2/templates/rss/rss090.template
   plog/branches/lifetype-1.2/templates/rss/rss10.template
   plog/branches/lifetype-1.2/templates/rss/rss20.template
Log:
rss feeds now pass validation.  http://bugs.lifetype.net/view.php?id=441

Modified: plog/branches/lifetype-1.2/templates/rss/atom.template
===================================================================
--- plog/branches/lifetype-1.2/templates/rss/atom.template	2009-02-21 13:37:22 UTC (rev 6813)
+++ plog/branches/lifetype-1.2/templates/rss/atom.template	2009-02-21 14:28:17 UTC (rev 6814)
@@ -6,7 +6,7 @@
 	{assign var="newestDate" value=$posts[0]->getDateObject()} 
 	<modified>{$locale->formatDate($newestDate, "%Y-%m-%dT%H:%M:%S%G", $blog)}</modified> 
 {/if}
-<tagline>{$blog->getAbout()|escape}</tagline> 
+<tagline>{$blog->getAbout()|strip_tags}</tagline> 
 <generator url="http://www.lifetype.net/" version="1.2">LifeType</generator> 
 {assign var="blogOwner" value=$blog->getOwnerInfo()} 
 <copyright>Copyright (c) {$blogOwner->getUsername()|escape}</copyright> 

Modified: plog/branches/lifetype-1.2/templates/rss/rss090.template
===================================================================
--- plog/branches/lifetype-1.2/templates/rss/rss090.template	2009-02-21 13:37:22 UTC (rev 6813)
+++ plog/branches/lifetype-1.2/templates/rss/rss090.template	2009-02-21 14:28:17 UTC (rev 6814)
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="{$locale->getCharset()}"?>
 <?xml-stylesheet href="{$url->getUrl("/styles/rss.css")}" type="text/css"?>
-<rdf:RDF 
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-  xmlns="http://my.netscape.com/rdf/simple/0.9/"
->
+<rss version="0.91">
 {$locale->setLocale("en_UK")}
  <channel>
   <title>{$blog->getBlog()|escape}</title>
   <link>{$url->blogLink()}</link>
-  <description>{$blog->getAbout()|escape}</description>
- </channel>
+  <description>{$blog->getAbout()|strip_tags}</description>
   {foreach from=$posts item=post}
   <item>
    <title>{$post->getTopic()|escape}</title>
-   <description>{$post->getText()|escape}</description>
+   <description>{$post->getText()|strip_tags}</description>
    <link>{$url->postPermalink($post)}</link>
    {assign var="postDate" value=$post->getDateObject()}
    <pubDate>{$locale->formatDate($postDate, "%a, %d %b %Y %H:%M:%S %O", $blog)}</pubDate>   
   </item>
   {/foreach}
-</rdf:RDF>
+ </channel>
+</rss>
 
 

Modified: plog/branches/lifetype-1.2/templates/rss/rss10.template
===================================================================
--- plog/branches/lifetype-1.2/templates/rss/rss10.template	2009-02-21 13:37:22 UTC (rev 6813)
+++ plog/branches/lifetype-1.2/templates/rss/rss10.template	2009-02-21 14:28:17 UTC (rev 6814)
@@ -10,7 +10,7 @@
  <channel rdf:about="{$url->rssLink("rss10")}">
   <title>{$blog->getBlog()|escape}</title>
   <link>{$url->blogLink()}</link>
-  <description>{$blog->getAbout()|escape}</description>
+  <description>{$blog->getAbout()|strip_tags}</description>
   {assign var="blogOwner" value=$blog->getOwnerInfo()}
   <dc:creator>{$blogOwner->getUsername()}</dc:creator>
   <dc:date>{$smarty.now|date_format:"%Y-%m-%dT%H:%M:%S"}Z</dc:date>

Modified: plog/branches/lifetype-1.2/templates/rss/rss20.template
===================================================================
--- plog/branches/lifetype-1.2/templates/rss/rss20.template	2009-02-21 13:37:22 UTC (rev 6813)
+++ plog/branches/lifetype-1.2/templates/rss/rss20.template	2009-02-21 14:28:17 UTC (rev 6814)
@@ -3,13 +3,15 @@
 <rss version="2.0" 
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
 	xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:atom="http://www.w3.org/2005/Atom"
 >
  <channel>
   <title>{$blog->getBlog()|escape}</title>
   <link>{$url->blogLink()}</link>
-  <description>{$blog->getAbout()|escape}</description>
+  <description>{$blog->getAbout()|strip_tags}</description>
   <pubDate>{$locale->formatDateAsRFC822($now)}</pubDate>
   <generator>http://www.lifetype.net</generator>
+  <atom:link href="{$url->rssLink("rss20")}" rel="self" type="application/rss+xml" />
   {foreach from=$posts item=post}
   <item>
    <title>{$post->getTopic()|escape}</title>