fix rss xml validation issues. thanks oliver!

Signed-off-by: Bruno Meilick <[email protected]>

Author: bnomei

.gitignore

@@ -1,6 +1,7 @@
 # OS files
 .DS_Store
 .php_cs.cache
+.idea
 
 # files of Composer dependencies that are not needed for the plugin
 /vendor/**/.*
@@ -21,4 +22,4 @@
 /vendor/**/test/*
 /vendor/**/tests/*
 /vendor/**/php4/*
-/vendor/getkirby/composer-installer
+/vendor/getkirby/composer-installer

README.md

@@ -38,6 +38,7 @@ If you use these defaults you need to provide the fields `date (type: date)` and
 ```php
 [
     'url'         => site()->url(),
+    'feedurl'     => site()->url() . '/feed/',
     'title'       => 'Feed',
     'description' => '',
     'link'        => site()->url(),

classes/Feed.php

@@ -69,6 +69,7 @@ public static function data($pages, $options = [])
     {
         $defaults = array(
             'url'         => site()->url(),
+            'feedurl'     => site()->url() . '/feed/',
             'title'       => 'Feed',
             'description' => '',
             'link'        => site()->url(),

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby3-feed",
     "type": "kirby-plugin",
-    "version": "1.1.5",
+    "version": "1.2.0",
     "description": "Generate a RSS/JSON-Feed from a Pages-Collection",
     "license": "MIT",
     "authors": [

composer.lock

@@ -7,7 +7,7 @@
     <title><?php echo Xml::encode($title) ?></title>
     <link><?php echo Xml::encode($link) ?></link>
     <lastBuildDate><?php echo $modified ?></lastBuildDate>
-    <atom:link href="<?php echo Xml::encode($url) ?>" rel="self" type="application/rss+xml" />
+    <atom:link href="<?php echo Xml::encode($feedurl) ?>" rel="self" type="application/rss+xml" />
 
     <?php if (!empty($description)): ?>
     <description><?php echo Xml::encode($description) ?></description>
@@ -17,7 +17,7 @@
     <item>
       <title><?php echo Xml::encode($item->title()) ?></title>
       <link><?php echo Xml::encode($item->{$urlfield}()) ?></link>
-      <guid><?php echo Xml::encode($item->id()) ?></guid>
+      <guid><?php echo Xml::encode($item->url()) ?></guid>
       <pubDate><?php echo $datefield == 'modified' ? $item->modified('r', 'date') : date('r', $item->{$datefield}()->toTimestamp()) ?></pubDate>
       <description><![CDATA[<?php echo $item->{$textfield}()->kirbytext() ?>]]></description>
     </item>