Further changes on #1162 fixing RSS validation errors

nopSolutions · Feb 12, 2016 · 0d1e0bb · 0d1e0bb
1 parent 4cdfb4f
commit 0d1e0bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Presentation/Nop.Web/Controllers/BlogController.cs b/src/Presentation/Nop.Web/Controllers/BlogController.cs
@@ -223,7 +223,7 @@ public ActionResult ListRss(int languageId)
                                     string.Format("{0}: Blog", _storeContext.CurrentStore.GetLocalized(x => x.Name)),
                                     "Blog",
                                     new Uri(_webHelper.GetStoreLocation(false)),
-                                   _webHelper.GetThisPageUrl(false),
+                                    string.Format("urn:store:{0}:blog", _storeContext.CurrentStore.Id),
                                     DateTime.UtcNow);
 
             if (!_blogSettings.Enabled)
@@ -234,7 +234,7 @@ public ActionResult ListRss(int languageId)
             foreach (var blogPost in blogPosts)
             {
                 string blogPostUrl = Url.RouteUrl("BlogPost", new { SeName = blogPost.GetSeName(blogPost.LanguageId, ensureTwoPublishedLanguages: false) }, "http");
-                items.Add(new SyndicationItem(blogPost.Title, blogPost.Body, new Uri(blogPostUrl), String.Format("Blog:{0}", blogPost.Id), blogPost.CreatedOnUtc));
+                items.Add(new SyndicationItem(blogPost.Title, blogPost.Body, new Uri(blogPostUrl), String.Format("urn:store:{0}:blog:post:{1}", _storeContext.CurrentStore.Id, blogPost.Id), blogPost.CreatedOnUtc));
             }
             feed.Items = items;
             return new RssActionResult { Feed = feed };

diff --git a/src/Presentation/Nop.Web/Controllers/BoardsController.cs b/src/Presentation/Nop.Web/Controllers/BoardsController.cs
@@ -275,7 +275,7 @@ public ActionResult ActiveDiscussionsRss(int forumId = 0)
                                     string.Format(feedTitle, _storeContext.CurrentStore.GetLocalized(x => x.Name)),
                                     feedDescription,
                                     new Uri(url),
-                                    _webHelper.GetThisPageUrl(false),
+                                    string.Format("urn:store:{0}:activeDiscussions", _storeContext.CurrentStore.Id),
                                     DateTime.UtcNow);
 
             var items = new List<SyndicationItem>();
@@ -289,7 +289,7 @@ public ActionResult ActiveDiscussionsRss(int forumId = 0)
                 string content = String.Format("{2}: {0}, {3}: {1}", topic.NumReplies.ToString(), topic.Views.ToString(), repliesText, viewsText);
 
                 items.Add(new SyndicationItem(topic.Subject, content, new Uri(topicUrl),
-                    String.Format("Topic:{0}", topic.Id), (topic.LastPostTime ?? topic.UpdatedOnUtc)));
+                    String.Format("urn:store:{0}:activeDiscussions:topic:{1}", _storeContext.CurrentStore.Id, topic.Id), (topic.LastPostTime ?? topic.UpdatedOnUtc)));
             }
             feed.Items = items;
 
@@ -391,7 +391,7 @@ public ActionResult ForumRss(int id)
                                         string.Format(feedTitle, _storeContext.CurrentStore.GetLocalized(x => x.Name), forum.Name),
                                         feedDescription,
                                         new Uri(url),
-                                        _webHelper.GetThisPageUrl(false),
+                                        string.Format("urn:store:{0}:forum", _storeContext.CurrentStore.Id),
                                         DateTime.UtcNow);
 
                 var items = new List<SyndicationItem>();
@@ -404,7 +404,7 @@ public ActionResult ForumRss(int id)
                     string topicUrl = Url.RouteUrl("TopicSlug", new { id = topic.Id, slug = topic.GetSeName() }, "http");
                     string content = string.Format("{2}: {0}, {3}: {1}", topic.NumReplies.ToString(), topic.Views.ToString(), repliesText, viewsText);
 
-                    items.Add(new SyndicationItem(topic.Subject, content, new Uri(topicUrl), String.Format("Topic:{0}", topic.Id),
+                    items.Add(new SyndicationItem(topic.Subject, content, new Uri(topicUrl), String.Format("urn:store:{0}:forum:topic:{1}", _storeContext.CurrentStore.Id, topic.Id),
                         (topic.LastPostTime ?? topic.UpdatedOnUtc)));
                 }
 

diff --git a/src/Presentation/Nop.Web/Controllers/NewsController.cs b/src/Presentation/Nop.Web/Controllers/NewsController.cs
@@ -207,7 +207,7 @@ public ActionResult ListRss(int languageId)
                                     string.Format("{0}: News", _storeContext.CurrentStore.GetLocalized(x => x.Name)),
                                     "News",
                                     new Uri(_webHelper.GetStoreLocation(false)),
-                                    _webHelper.GetThisPageUrl(false),
+                                    string.Format("urn:store:{0}:news}", _storeContext.CurrentStore.Id),
                                     DateTime.UtcNow);
 
             if (!_newsSettings.Enabled)
@@ -218,7 +218,7 @@ public ActionResult ListRss(int languageId)
             foreach (var n in newsItems)
             {
                 string newsUrl = Url.RouteUrl("NewsItem", new { SeName = n.GetSeName(n.LanguageId, ensureTwoPublishedLanguages: false) }, "http");
-                items.Add(new SyndicationItem(n.Title, n.Short, new Uri(newsUrl), String.Format("Blog:{0}", n.Id), n.CreatedOnUtc));
+                items.Add(new SyndicationItem(n.Title, n.Short, new Uri(newsUrl), String.Format("urn:store:{0}:news:blog:{1}", _storeContext.CurrentStore.Id, n.Id), n.CreatedOnUtc));
             }
             feed.Items = items;
             return new RssActionResult { Feed = feed };

diff --git a/src/Presentation/Nop.Web/Controllers/ProductController.cs b/src/Presentation/Nop.Web/Controllers/ProductController.cs
@@ -1178,7 +1178,7 @@ public ActionResult NewProductsRss()
                                     string.Format("{0}: New products", _storeContext.CurrentStore.GetLocalized(x => x.Name)),
                                     "Information about products",
                                     new Uri(_webHelper.GetStoreLocation(false)),
-                                    _webHelper.GetThisPageUrl(false),
+                                    string.Format("urn:store:{0}:newProducts", _storeContext.CurrentStore.Id),
                                     DateTime.UtcNow);
 
             if (!_catalogSettings.NewProductsEnabled)
@@ -1197,7 +1197,7 @@ public ActionResult NewProductsRss()
                 string productUrl = Url.RouteUrl("Product", new { SeName = product.GetSeName() }, "http");
                 string productName = product.GetLocalized(x => x.Name);
                 string productDescription = product.GetLocalized(x => x.ShortDescription);
-                var item = new SyndicationItem(productName, productDescription, new Uri(productUrl), String.Format("NewProduct:{0}", product.Id), product.CreatedOnUtc);
+                var item = new SyndicationItem(productName, productDescription, new Uri(productUrl), String.Format("urn:store:{0}:newProducts:product:{1}", _storeContext.CurrentStore.Id, product.Id), product.CreatedOnUtc);
                 items.Add(item);
                 //uncomment below if you want to add RSS enclosure for pictures
                 //var picture = _pictureService.GetPicturesByProductId(product.Id, 1).FirstOrDefault();