Refs #4027 updated all rss views except for groups

diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index 0478e292f4d97ce5627aafdbfd59ab5c88be5547..2c589c2075be3c7bc64ca42ad33887fa9dfef129 100644 (file)
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -68,14 +68,14 @@ $english = array(
         */
 
        'bookmarks:save:success' => "Your item was successfully bookmarked.",
-       'bookmarks:delete:success' => "Your bookmarked item was successfully deleted.",
+       'bookmarks:delete:success' => "Your bookmark was deleted.",
 
        /**
         * Error messages
         */
 
        'bookmarks:save:failed' => "Your bookmark could not be saved. Make sure you've entered a title and address and then try again.",
-       'bookmarks:save:invalid' => "The address of the bookmark is invalid and could nto be saved.",
+       'bookmarks:save:invalid' => "The address of the bookmark is invalid and could not be saved.",
        'bookmarks:delete:failed' => "Your bookmark could not be deleted. Please try again.",
 );
 

diff --git a/mod/bookmarks/views/rss/object/bookmarks.php b/mod/bookmarks/views/rss/object/bookmarks.php
index 8e88485f10b1cefa64343bc67024fe89b93fda1d..1abda4710588a124a127058a4acc6bf3b8eefb2f 100644 (file)
--- a/mod/bookmarks/views/rss/object/bookmarks.php
+++ b/mod/bookmarks/views/rss/object/bookmarks.php
@@ -1,23 +1,37 @@
 <?php
 /**
- * Elgg bookmark rss view
- * 
+ * Bookmark RSS object view
+ *
  * @package ElggBookmarks
  */
 
 $title = $vars['entity']->title;
 if (empty($title)) {
-       $title = substr($vars['entity']->description,0,32);
-       if (strlen($vars['entity']->description) > 32)
-               $title .= " ...";
+       $title = strip_tags($vars['entity']->description);
+       $title = elgg_get_excerpt($title, 32);
 }
 
-?>
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
 
+$url_text = elgg_echo('bookmarks:address');
+$link = elgg_view('output/url', array('href' => $vars['entity']->address));
+$description = $vars['entity']->description . "<p>$url_text: $link</p>";
+
+$creator = elgg_view('page/components/creator', $vars);
+$georss = elgg_view('page/components/georss', $vars);
+$extension = elgg_view('extensions/item');
+
+$item = <<<__HTML
 <item>
-  <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>
-  <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
-  <link><?php echo $vars['entity']->address; ?></link>
-  <title><![CDATA[<?php echo $title; ?>]]></title>
-  <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
+       <guid isPermaLink="true">$permalink</guid>
+       <pubDate>$pubdate</pubDate>
+       <link>$permalink</link>
+       <title><![CDATA[$title]]></title>
+       <description><![CDATA[$description]]></description>
+       $creator$georss$extension
 </item>
+
+__HTML;
+
+echo $item;

diff --git a/mod/file/start.php b/mod/file/start.php
index 843ae07941e98d862c5983b862df8b8167118db7..9007fc9ba8d01bcd1def483dee872170e978cf12 100644 (file)
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -22,6 +22,9 @@ function file_init() {
        // Extend CSS
        elgg_extend_view('css/elgg', 'file/css');
 
+       // add enclosure to rss item
+       elgg_extend_view('extensions/item', 'file/enclosure');
+
        // extend group main page
        elgg_extend_view('groups/tool_latest', 'file/group_module');
 

diff --git a/mod/file/views/rss/file/enclosure.php b/mod/file/views/rss/file/enclosure.php
new file mode 100644 (file)
index 0000000..600d287
--- /dev/null
+++ b/mod/file/views/rss/file/enclosure.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Link to download the file
+ *
+ * @uses $vars['entity']
+ */
+
+if (elgg_instanceof($vars['entity'], 'object', 'file')) {
+       $download_url = elgg_get_site_url() . 'mod/file/download.php?file_guid=' . $vars['entity']->getGUID();
+       $size = $vars['entity']->size();
+       $mime_type = $vars['entity']->getMimeType();
+       echo <<<END
+
+       <enclosure url="$download_url" length="$size" type="$mime_type" />";
+END;
+}

diff --git a/mod/file/views/rss/object/file.php b/mod/file/views/rss/object/file.php
deleted file mode 100644 (file)
index a0660d6..0000000
--- a/mod/file/views/rss/object/file.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Elgg RSS file object view
- * 
- * @package ElggFile
- * @subpackage Core
- */
-$title = $vars['entity']->title;
-if (empty($title)) {
-       $title = elgg_get_excerpt($vars['entity']->description, 32);
-}
-?>
-
-<item>
-       <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid>
-       <pubDate><?php echo date("r", $vars['entity']->time_created) ?></pubDate>
-       <link><?php echo $vars['entity']->getURL(); ?></link>
-       <title><![CDATA[<?php echo $title; ?>]]></title>
-       <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
-       <enclosure url="<?php echo elgg_get_site_url(); ?>mod/file/download.php?file_guid=<?php echo $vars['entity']->getGUID(); ?>" length="<?php echo $vars['entity']->size(); ?>" type="<?php echo $vars['entity']->getMimeType(); ?>" />
-</item>

diff --git a/mod/search/views/rss/search/listing.php b/mod/search/views/rss/search/list.php
similarity index 100%
rename from mod/search/views/rss/search/listing.php
rename to mod/search/views/rss/search/list.php

diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index 9716fc060df78e13eb8a56407f78a3d91d1d16b0..3c83d145f09a62ee61df70ee66ab6883a1d185ec 100644 (file)
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -20,6 +20,7 @@ $english = array(
        'thewire:noposts' => "No wire posts yet",
        'item:object:thewire' => "Wire posts",
        'thewire:update' => 'Update',
+       'thewire:by' => 'Wire post by %s',
 
        'thewire:previous' => "Previous",
        'thewire:hide' => "Hide",

diff --git a/mod/thewire/views/rss/object/thewire.php b/mod/thewire/views/rss/object/thewire.php
index 8229f46f1a5bd47e016542d3834090efe5024586..494c2c8dce7fab505fcfa52e095bcef954445b53 100644 (file)
--- a/mod/thewire/views/rss/object/thewire.php
+++ b/mod/thewire/views/rss/object/thewire.php
@@ -2,46 +2,35 @@
 /**
  * Elgg thewire rss view
  *
- * @package Elgg
- * @subpackage Core
+ * @package ElggTheWire
  */
 
 $owner = $vars['entity']->getOwnerEntity();
-if ($owner) {
-       $title = elgg_echo('thewire:by', array($owner->name));
-} else {
-       $subtitle = strip_tags($vars['entity']->description);
-       $title = elgg_get_excerpt($subtitle, 32);
+if (!$owner) {
+       return true;
 }
 
-?>
+$title = elgg_echo('thewire:by', array($owner->name));
 
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
+
+$description = autop($vars['entity']->description);
+
+$creator = elgg_view('page/components/creator', $vars);
+$georss = elgg_view('page/components/georss', $vars);
+$extension = elgg_view('extensions/item', $vars);
+
+$item = <<<__HTML
 <item>
-<guid isPermaLink='false'><?php echo $vars['entity']->getGUID(); ?></guid>
-<pubDate><?php echo date("r", $vars['entity']->time_created) ?></pubDate>
-<link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
-<title><![CDATA[<?php echo $title; ?>]]></title>
-<description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
-<?php
-$owner = $vars['entity']->getOwnerEntity();
-if ($owner) {
-       ?>
-       <dc:creator><?php echo $owner->name; ?></dc:creator>
-       <?php
-}
-?>
-<?php
-if (
-       ($vars['entity'] instanceof Locatable) &&
-       ($vars['entity']->getLongitude()) &&
-       ($vars['entity']->getLatitude())
-) {
-       ?>
-       <georss:point>
-               <?php echo $vars['entity']->getLatitude(); ?> <?php echo $vars['entity']->getLongitude(); ?>
-       </georss:point>
-       <?php
-}
-?>
-<?php echo elgg_view('extensions/item'); ?>
+       <guid isPermaLink="true">$permalink</guid>
+       <pubDate>$pubdate</pubDate>
+       <link>$permalink</link>
+       <title><![CDATA[$title]]></title>
+       <description><![CDATA[$description]]></description>
+       $creator$georss$extension
 </item>
+
+__HTML;
+
+echo $item;

diff --git a/views/rss/annotation/generic_comment.php b/views/rss/annotation/generic_comment.php
index 9e91075686960726b3f24a8635dc38a6165cabf7..de652fc8ec56266e60e7bf870a6e982e29561b4d 100644 (file)
--- a/views/rss/annotation/generic_comment.php
+++ b/views/rss/annotation/generic_comment.php
@@ -16,7 +16,7 @@ $permalink = $annotation->getURL();
 $title = elgg_echo('generic_comment:title', array($poster_name));
 
 $creator = elgg_view('page/components/creator', array('entity' => $annotation));
-$extensions = elgg_view('extensions/item');
+$extensions = elgg_view('extensions/item', $vars);
 
 $item = <<<__HTML
 <item>

diff --git a/views/rss/group/default.php b/views/rss/group/default.php
index 1276ab8f12f0bbf407eb5dc72abd82663ebcd27e..f57c7f82c7bfbb00b224ed2e7da3ba002caacc2f 100644 (file)
--- a/views/rss/group/default.php
+++ b/views/rss/group/default.php
@@ -20,7 +20,7 @@ if ($vars['entity']->description) {
 
 $creator = elgg_view('page/components/creator', $vars);
 $georss = elgg_view('page/components/georss', $vars);
-$extension = elgg_view('extensions/item');
+$extension = elgg_view('extensions/item', $vars);
 
 $item = <<<__HTML
 <item>

diff --git a/views/rss/object/default.php b/views/rss/object/default.php
index b5d269ac7bb8b78d1b80c192c323adceebc66a78..be802595349d4d7e5837b966371655cca1018d12 100644 (file)
--- a/views/rss/object/default.php
+++ b/views/rss/object/default.php
@@ -15,9 +15,11 @@ if (empty($title)) {
 $permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
 $pubdate = date('r', $vars['entity']->getTimeCreated());
 
+$description = autop($vars['entity']->description);
+
 $creator = elgg_view('page/components/creator', $vars);
 $georss = elgg_view('page/components/georss', $vars);
-$extension = elgg_view('extensions/item');
+$extension = elgg_view('extensions/item', $vars);
 
 $item = <<<__HTML
 <item>
@@ -25,7 +27,7 @@ $item = <<<__HTML
        <pubDate>$pubdate</pubDate>
        <link>$permalink</link>
        <title><![CDATA[$title]]></title>
-       <description><![CDATA[{$vars['entity']->description}]]></description>
+       <description><![CDATA[$description]]></description>
        $creator$georss$extension
 </item>
 

diff --git a/views/rss/user/default.php b/views/rss/user/default.php
index 1500881f8c874f10d3ac7c206c6cb937c6c63d89..1c7bf75e771dd63c276d8d94dd2dd0e046e0dae1 100644 (file)
--- a/views/rss/user/default.php
+++ b/views/rss/user/default.php
@@ -17,7 +17,7 @@ if ($vars['entity']->description) {
 }
 
 $georss = elgg_view('page/components/georss', $vars);
-$extension = elgg_view('extensions/item');
+$extension = elgg_view('extensions/item', $vars);
 
 $item = <<<__HTML
 <item>