switch password and id in munge_password

[quix0rs-gnu-social.git] / lib / rssaction.php

diff --git a/lib/rssaction.php b/lib/rssaction.php
index b52de42b2347465e71b64f2db6f135ccf0eb094a..7d79ac043dd4867588c37cc72b3f9a6a3fd7af76 100644 (file)
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -68,6 +68,7 @@ class Rss10Action extends Action {
        }
 
        function show_channel($notices) {
+               global $config;
 
                $channel = $this->get_channel();
                $image = $this->get_image();
@@ -76,6 +77,7 @@ class Rss10Action extends Action {
                common_element('title', NULL, $channel['title']);
                common_element('link', NULL, $channel['link']);
                common_element('description', NULL, $channel['description']);
+               common_element('cc:licence', array('rdf:resource' => $config['license']['url']));
 
                if ($image) {
                        common_element('image', array('rdf:resource' => $image));
@@ -107,12 +109,16 @@ class Rss10Action extends Action {
        }
        
        function show_item($notice) {
+               global $config;
+               $profile = Profile::staticGet($notice->profile_id);
                $nurl = common_local_url('shownotice', array('notice' => $notice->id));
                common_element_start('item', array('rdf:about' => $notice->uri));
-               common_element('title', NULL, $notice->created);
+               common_element('title', NULL, $profile->nickname."'s status on ".common_date_string($notice->created));
                common_element('link', NULL, $nurl);
-               common_element('description', NULL, common_render_content($notice->content));
+               common_element('description', NULL, $notice->content);
                common_element('dc:date', NULL, common_date_w3dtf($notice->created));
+               common_element('dc:creator', NULL, ($profile->fullname) ? $profile->fullname : $profile->nickname);
+               common_element('cc:licence', array('rdf:resource' => $config['license']['url']));
                common_element_end('item');
        }
        
@@ -124,6 +130,8 @@ class Rss10Action extends Action {
                                                                                          'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
                                                                                          'xmlns:dc' =>
                                                                                          'http://purl.org/dc/elements/1.1/',
+                                                                                         'xmlns:cc' =>
+                                                                                         'http://web.resource.org/cc/',
                                                                                          'xmlns' => 'http://purl.org/rss/1.0/'));
        }