Merge pull request #220 from donker/sept2025

Fixes

Author: donker

Server/Blog/Admin.ascx

@@ -61,13 +61,13 @@ Public Class Admin
 
   Private Sub cmdCreateVocabulary_Click(sender As Object, e As EventArgs) Handles cmdCreateVocabulary.Click
     Settings.VocabularyId = Core.Integration.Integration.CreateNewVocabulary(PortalId).VocabularyId
-    Settings.UpdateSettings()
+    Settings.SaveSettings()
     DataBind()
   End Sub
 
   Private Sub ddVocabularyId_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ddVocabularyId.SelectedIndexChanged
     Settings.VocabularyId = ddVocabularyId.SelectedValue.ToInt
-    Settings.UpdateSettings()
+    Settings.SaveSettings()
     DataBind()
   End Sub
 
@@ -103,7 +103,7 @@ Public Class Admin
     Settings.RssTtl = Integer.Parse(txtRssTtl.Text)
     Settings.IncrementViewCount = Integer.Parse(txtIncrementViewCount.Text)
 
-    Settings.UpdateSettings()
+    Settings.SaveSettings()
     If treeState.Value <> TermsController.GetCategoryTreeAsJson(Categories) Then
       Dim categoryTree As List(Of DynatreeItem) = Newtonsoft.Json.JsonConvert.DeserializeObject(Of List(Of DynatreeItem))(treeState.Value)
       Dim ReturnedIds As New List(Of Integer)

Server/Blog/Admin.ascx.vb

@@ -63,7 +63,7 @@ Public Class Blog
         ' we have a style detection post in storage and it's being requested
         Dim url As String = Settings.StyleDetectionUrl
         Settings.StyleDetectionUrl = ""
-        Settings.UpdateSettings()
+        Settings.SaveSettings()
         Response.Redirect(url, False)
       End If
 

Server/Blog/Blog.ascx.vb

@@ -9,6 +9,7 @@ Namespace Api
       Comments
       Posts
       Terms
+      Rss
     End Enum
 
     Public Const ServicePath As String = "~/DesktopModules/Blog/API/"
@@ -25,6 +26,8 @@ Namespace Api
           Return GetRoute("Comments", method)
         Case ServiceControllers.Posts
           Return GetRoute("Posts", method)
+        Case ServiceControllers.Rss
+          Return GetRoute("Rss", method)
         Case Else
           Return GetRoute("Terms", method)
       End Select

Server/Blog/Components/Api/BlogRouteMapper.vb

@@ -48,7 +48,7 @@ Namespace Api
 
 #Region " Service Methods "
     <HttpPost()>
-    <BlogAuthorizeAttribute(SecurityAccessLevel.Owner Or SecurityAccessLevel.Admin)>
+    <BlogAuthorize(SecurityAccessLevel.Owner Or SecurityAccessLevel.Admin)>
     <ValidateAntiForgeryToken()>
     <ActionName("Export")>
     Public Function ExportBlog(postData As BlogDTO) As HttpResponseMessage
@@ -61,8 +61,10 @@ Namespace Api
       Dim newBlogML As New BlogMLBlog
       newBlogML.Title = Blog.Title
       newBlogML.SubTitle = Blog.Description
-      newBlogML.Authors.Add(New BlogMLAuthor With {.Title = Blog.DisplayName})
       newBlogML.DateCreated = Blog.CreatedOnDate
+      For Each author As PostAuthor In Core.Entities.Posts.PostsController.GetAuthors(Settings.ModuleId, Blog.BlogID)
+        newBlogML.Authors.Add(New BlogMLAuthor With {.Title = author.DisplayName, .ID = author.UserID.ToString, .Email = author.Email})
+      Next
       AddCategories(newBlogML)
       AddPosts(newBlogML)
       Dim blogMLFile As String = Date.Now.ToString("yyyy-MM-dd") & "-" & Guid.NewGuid.ToString("D")
@@ -82,7 +84,7 @@ Namespace Api
 #Region " Private Methods "
     Private Sub SetContext(data As BlogDTO)
       Blog = Core.Entities.Blogs.BlogsController.GetBlog(data.BlogId, UserInfo.UserID, Threading.Thread.CurrentThread.CurrentCulture.Name)
-      Settings = ModuleSettings.GetModuleSettings(ActiveModule.ModuleID)
+      Settings = ModuleSettings.GetSettings(ActiveModule)
     End Sub
 
     Private Sub AddCategories(ByRef TargetBlogML As BlogMLBlog)
@@ -122,7 +124,7 @@ Namespace Api
       For Each t As TermInfo In post.PostCategories
         newPostML.Categories.Add(New BlogMLCategoryReference With {.Ref = t.TermId.ToString})
       Next
-      newPostML.Authors.Add(post.DisplayName)
+      newPostML.Authors.Add(post.CreatedByUserID.ToString())
       newPostML.PostType = BlogML.BlogPostTypes.Normal
       newPostML.DateCreated = post.PublishedOnDate
       If Not String.IsNullOrEmpty(post.Summary) Then
@@ -142,6 +144,7 @@ Namespace Api
       newPostML.DisplayCopyright = post.DisplayCopyright
       newPostML.Copyright = post.Copyright
       newPostML.Locale = post.Locale
+      newPostML.IsPublished = post.Published
 
       ' pack files
       Dim postDir As String = Globals.GetPostDirectoryMapPath(post.BlogID, post.ContentItemId)

Server/Blog/Components/Api/BlogsController.vb

@@ -62,7 +62,7 @@ Namespace Api
     Private Property Settings() As ModuleSettings
       Get
         If _Settings Is Nothing Then
-          _Settings = ModuleSettings.GetModuleSettings(ActiveModule.ModuleID)
+          _Settings = ModuleSettings.GetSettings(ActiveModule)
         End If
         Return _Settings
       End Get

Server/Blog/Components/Api/CommentsController.vb

@@ -0,0 +1,44 @@
+'
+' DNN Connect - http://dnn-connect.org
+' Copyright (c) 2015
+' by DNN Connect
+'
+' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
+' documentation files (the "Software"), to deal in the Software without restriction, including without limitation 
+' the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and 
+' to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+'
+' The above copyright notice and this permission notice shall be included in all copies or substantial portions 
+' of the Software.
+'
+' THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED 
+' TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+' THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
+' CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+' DEALINGS IN THE SOFTWARE.
+'
+
+Imports System.Net
+Imports System.Net.Http
+Imports System.Web.Http
+Imports DotNetNuke.Modules.Blog.Core.Common
+Imports DotNetNuke.Modules.Blog.Core.Rss
+Imports DotNetNuke.Web.Api
+
+Namespace Api
+  Public Class RssController
+    Inherits DnnApiController
+
+    <HttpGet()>
+    <DnnModuleAuthorize(AccessLevel:=DotNetNuke.Security.SecurityAccessLevel.View)>
+    <ActionName("Get")>
+    Public Function GetRss() As HttpResponseMessage
+      Dim res As New HttpResponseMessage(HttpStatusCode.OK)
+      Dim queryString As NameValueCollection = HttpUtility.ParseQueryString(Request.RequestUri.Query)
+      Dim feed As New BlogRssFeed(ActiveModule.ModuleID, queryString)
+      res.Content = New StringContent(Globals.ReadFile(feed.CacheFile), Encoding.UTF8, "application/xml")
+      Return res
+    End Function
+
+  End Class
+End Namespace

Server/Blog/Components/Api/RssController.vb

@@ -63,7 +63,7 @@ Namespace Controls
 
     Private Sub CategorySelect_Load(sender As Object, e As EventArgs) Handles Me.Load
 
-      Dim modVersion As String = ModuleSettings.GetModuleSettings(ModuleConfiguration.ModuleID).Version
+      Dim modVersion As String = ModuleSettings.GetSettings(ModuleConfiguration).Version
       Page.AddJavascriptFile(modVersion, "jquery.dynatree.min.js", "jquery.dynatree", "1.2.4", 60)
       Page.AddCssFile(modVersion, "dynatree.css", "dynatree", "1.2.4")
       MainControlId = ClientID & "_CategorySelect"

Server/Blog/Controls/CategorySelect.vb

@@ -53,7 +53,7 @@ Namespace Controls
           Else
             BlogModuleId = ModuleId
           End If
-          ctlCategories.VocabularyId = Core.Common.ModuleSettings.GetModuleSettings(BlogModuleId).VocabularyId
+          ctlCategories.VocabularyId = Core.Common.ModuleSettings.GetSettings(BlogModuleId).VocabularyId
         End If
       Catch ex As Exception
       End Try
@@ -64,7 +64,7 @@ Namespace Controls
 
     Private Sub ddBlogModuleId_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ddBlogModuleId.SelectedIndexChanged
       BlogModuleId = CInt(ddBlogModuleId.SelectedValue)
-      ctlCategories.VocabularyId = Core.Common.ModuleSettings.GetModuleSettings(BlogModuleId).VocabularyId
+      ctlCategories.VocabularyId = Core.Common.ModuleSettings.GetSettings(BlogModuleId).VocabularyId
       LoadDropdowns()
     End Sub
 #End Region
@@ -96,7 +96,7 @@ Namespace Controls
             ddTemplate.Items.Add(New ListItem(d.Name & " [System]", "[G]" & d.Name))
           End If
         Next
-        For Each d As IO.DirectoryInfo In (New IO.DirectoryInfo(Core.Common.ModuleSettings.GetModuleSettings(BlogModuleId).PortalTemplatesMapPath)).GetDirectories
+        For Each d As IO.DirectoryInfo In (New IO.DirectoryInfo(Core.Common.ModuleSettings.GetSettings(BlogModuleId).PortalTemplatesMapPath)).GetDirectories
           ddTemplate.Items.Add(New ListItem(d.Name & " [Local]", "[P]" & d.Name))
         Next
         Dim skinTemplatePath As String = Server.MapPath(DotNetNuke.UI.Skins.Skin.GetSkin(CType(Page, Framework.PageBase)).SkinPath) & "Templates\Blog\"

Server/Blog/Controls/ViewSettings.ascx.vb

@@ -301,6 +301,7 @@
     <Compile Include="Components\Api\CommentsController.vb" />
     <Compile Include="Components\Api\NotificationServiceController.vb" />
     <Compile Include="Components\Api\PostsController.vb" />
+    <Compile Include="Components\Api\RssController.vb" />
     <Compile Include="Components\Api\TermsController.vb" />
     <Compile Include="Components\Common\Extensions.vb" />
     <Compile Include="Components\Common\Globals.vb" />