Migration from Rails 2.3.5 to Rails 8.1 successful.

Merging dev branch.

3 files changed, 21 insertions, 20 deletions

diff --git a/app/views/rss/recent_changes.xml.builder b/app/views/rss/recent_changes.xml.builder
index c3b3ec9..cce3b5d 100644
--- a/app/views/rss/recent_changes.xml.builder
+++ b/app/views/rss/recent_changes.xml.builder
@@ -2,19 +2,19 @@ xml.instruct!
 
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("CCC.de Recent Change")
-  xml.link(:href => "http://www.ccc.de/")
+  xml.link(:href => "https://www.ccc.de/")
   xml.link(:rel => "self", :href => "/rss/updates.xml")
   xml.updated(@items.first.updated_at.xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
   end
-  xml.id("http://www.ccc.de/")
+  xml.id("https://www.ccc.de/")
   
   @items.each do |item|
     xml.entry do
       xml.title(item.title)
       xml.link(
-        :href => "http://www.ccc.de/#{item.node.unique_path}",
+        :href => "https://www.ccc.de/#{item.node.unique_path}",
         :rel => "alternate"
       )
       xml.id(content_url_helper(item.node.unique_path))
@@ -26,4 +26,4 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
     
   end
   
-end
\ No newline at end of file
+end
diff --git a/app/views/rss/updates.rdf.builder b/app/views/rss/updates.rdf.builder
index 00b6242..b02d34f 100644
--- a/app/views/rss/updates.rdf.builder
+++ b/app/views/rss/updates.rdf.builder
@@ -2,26 +2,26 @@ xml.instruct!
 xml.tag!("rdf:RDF", "xmlns:rdf" => "http://www.w3.org/1999/02/22-rdf-syntax-ns#", "xmlns:dc"  => "http://purl.org/dc/elements/1.1/", "xmlns" => "http://purl.org/rss/1.0/") do
   xml.tag!( "rdf:Description",  "rdf:about" => "http://www.w3.org/TR/rdf-syntax-grammar", "dc:title"=>"RDF/XML Syntax Specification (Revised)")
 
-  xml.channel do
+  xml.channel( "rdf:about" => "https://www.ccc.de/de/rss/updates.xml" ) do
     xml.title("Chaos Computer Club: Updates")
-    xml.link("http://www.ccc.de")
+    xml.link("https://www.ccc.de")
     xml.description("Kabelsalat ist gesund.")
     xml.tag!("dc:date", @items.first.published_at.xmlschema)
   end
-  
-  xml.image( "rdf:about" => "http://www.ccc.de/images/chaosknoten.gif") do
+
+  xml.image( "rdf:about" => "https://www.ccc.de/images/chaosknoten.gif") do
     xml.title("Chaos Computer Club (Chaosknoten)")
-    xml.link("http://www.ccc.de")
-    xml.url("http://www.ccc.de/images/chaosknoten.gif")
+    xml.link("https://www.ccc.de")
+    xml.url("https://www.ccc.de/images/chaosknoten.gif")
   end
-  
+
   @items.each do |item|
     xml.item("rdf:about" => content_url(:page_path => item.node.unique_path)) do
-      xml.title(item.title)
+      xml.title(CGI.escapeHTML(item.title.to_s))
       xml.link(content_url(:page_path => item.node.unique_path))
-      xml.description(item.abstract)
-      xml.tag!("dc:creator", item.user.login)
+      xml.description(CGI.escapeHTML(item.abstract.to_s))
+      xml.tag!("dc:creator", (item.user ? item.user.login : "CCC"))
       xml.tag!("dc:date", item.published_at.xmlschema)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder
index c09c9c9..4b2e2f7 100644
--- a/app/views/rss/updates.xml.builder
+++ b/app/views/rss/updates.xml.builder
@@ -2,17 +2,17 @@ xml.instruct!
 
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
   xml.title("Chaos Computer Club Updates")
-  xml.link(:href => "http://www.ccc.de/")
-  xml.link(:rel => "self", :href => "#{@host}/rss/updates")
+  xml.link(:href => "https://www.ccc.de/")
+  xml.link(:rel => "self", :href => "#{@host}/rss/updates.xml")
   xml.updated(@items.first.published_at.xmlschema)
   xml.author do
     xml.name("Chaos Computer Club e.V.")
   end
-  xml.id("#{@host}/rss/updates")
+  xml.id("https://www.ccc.de/rss/updates")
   
   @items.each do |item|
     xml.entry do
-      xml.title(item.title)
+      xml.title(CGI.escapeHTML(item.title.to_s))
       xml.link(
         :href => content_url(:page_path => item.node.unique_path),
         :rel  => "alternate",
@@ -21,6 +21,7 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
       xml.id(content_url(:page_path => item.node.feed_id))
       xml.updated(item.updated_at.xmlschema)
       xml.published(item.published_at.xmlschema)
+      xml.summary(CGI.escapeHTML(item.abstract.to_s))
       xml.content(:type => "xhtml") do
         xml.div(item.body, :xmlns => "http://www.w3.org/1999/xhtml")
       end
@@ -28,4 +29,4 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
     
   end
   
-end
\ No newline at end of file
+end