Cleanup media rss feed

added parameters to thumbnail_url and resizes_url to be passed to the url::base call to generate ful urls

2 files changed, 13 insertions, 18 deletions

diff --git a/core/models/item.php b/core/models/item.php
index 485975cb..5fcd16d0 100644
--- a/core/models/item.php
+++ b/core/models/item.php
@@ -65,11 +65,11 @@ class Item_Model extends ORM_MPTT {
    * album: http://example.com/gallery3/var/resizes/album1/.thumb.jpg
    * photo: http://example.com/gallery3/var/albums/album1/photo.thumb.jpg
    */
-  public function thumbnail_url() {
+  public function thumbnail_url($index = FALSE, $protocol = FALSE) {
     if ($this->is_album()) {
-      return $this->_relative_path(url::base() . "var/resizes", "", "/.thumb.jpg");
+      return $this->_relative_path(url::base($index, $protocol) . "var/resizes", "", "/.thumb.jpg");
     } else {
-      return $this->_relative_path(url::base() . "var/resizes", ".thumb", "");
+      return $this->_relative_path(url::base($index, $protocol) . "var/resizes", ".thumb", "");
     }
   }
 
@@ -89,11 +89,11 @@ class Item_Model extends ORM_MPTT {
    * album: http://example.com/gallery3/var/resizes/album1/.resize.jpg
    * photo: http://example.com/gallery3/var/albums/album1/photo.resize.jpg
    */
-  public function resize_url() {
+  public function resize_url($index = FALSE, $protocol = FALSE) {
     if ($this->is_album()) {
-      return $this->_relative_path(url::base() . "var/resizes", "", "/.resize.jpg");
+      return $this->_relative_path(url::base($index, $protocol) . "var/resizes", "", "/.resize.jpg");
     } else {
-      return $this->_relative_path(url::base() . "var/resizes", ".resize", "");
+      return $this->_relative_path(url::base($index, $protocol) . "var/resizes", ".resize", "");
     }
   }
 
diff --git a/modules/media_rss/views/feed.mrss.php b/modules/media_rss/views/feed.mrss.php
index 3728afeb..4ccde722 100644
--- a/modules/media_rss/views/feed.mrss.php
+++ b/modules/media_rss/views/feed.mrss.php
@@ -4,7 +4,7 @@
                    xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title><?= $item->title ?></title>
-    <link><?= url::site("media_rss/{$item->id}") ?></link>
+    <link><?= url::site("media_rss/{$item->id}", "http") ?></link>
     <description><?= $item->description ?></description>
     <language>en-us</language>
     <? if (isset($prevOffset)): ?>
@@ -15,22 +15,17 @@
     <? endif; ?>
     <?
       // @todo do we want to add an upload date to the items table?
-      $date = date("D, dd M Y H:i:s e");
+      $date = date("D, d M Y H:i:s T");
     ?>
     <pubDate><?= $date ?></pubDate>
     <lastBuildDate><?= $date ?></lastBuildDate>
     <? foreach ($children as $child): ?>
       <item>
-        <title type="html"><?= $child->title ?></title>
-        <link></link>
-        <guid><?= $child->id ?></guid>
-        <description type="html"><?= $child->description ?></description>
-        <media:thumbnail url="<?= $child->thumbnail_url() ?>"
-          type="<?= $child->mime_type ?>"
-          height="<?= $child->thumbnail_height ?>"
-          width="<?= $child->thumbnail_width ?>"
-        />
-        <media:content url="<?= $child->resize_url() ?>"
+        <title><?= $child->title ?></title>
+        <link><?= $child->resize_url(false, "http") ?></link>
+        <guid isPermaLink="false"><?= $child->id ?></guid>
+        <description><?= $child->description ?></description>
+        <media:content url="<?= $child->thumbnail_url(false, "http") ?>"
           type="<?= $child->mime_type ?>"
           height="<?= $child->resize_height ?>"
           width="<?= $child->resize_width ?>"