Merge pull request #39 from mauricerenck/develop

Bugfixes

Author: mauricerenck

README.md

@@ -38,6 +38,8 @@ You can now see your download stats in the panel. This currently works only, if
 
 ## Installation
 
+View this [step by step guide](/docs/kirby-podcaster-starterkit.md) on how to setup the plugin with the Kirby Starterkit.
+
 - `composer require mauricerenck/podcaster`
 - unzip [master.zip](https://github.com/mauricerenck/kirby-podcaster/releases/latest) as folder `site/plugins/kirby-podcaster`
 - `git submodule add https://github.com/mauricerenck/kirby-podcaster.git site/plugins/kirby-podcaster`

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "mauricerenck/podcaster",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "A Kirby Podcast Plugin",
     "type": "kirby-plugin",
     "license": "MIT",

index.js

@@ -1,6 +1,6 @@
 {
     "name": "podcaster",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "A Kirby Podcast Plugin",
     "main": "index.js",
     "author": "Maurice Renck",

package.json

@@ -1,16 +1,20 @@
 <?php
-    namespace Plugin\Podcaster;
 
-    require_once __DIR__ . '/../utils/PodcasterUtils.php';
+namespace Plugin\Podcaster;
+
+use str;
+use addslashes;
+
+require_once __DIR__ . '/../utils/PodcasterUtils.php';
 
     $podcasterUtils = new PodcasterUtils();
     $podcasterUtils->setFeed($podcast);
     $podcasterUtils->setCurrentEpisode($page);
 
     $cover = false;
-    if($page->podcasterCover()->isNotEmpty()) {
+    if ($page->podcasterCover()->isNotEmpty()) {
         $cover = $page->podcasterCover()->toFile()->resize(200)->url();
-    } else if($podcast->podcasterCover()->isNotEmpty()) {
+    } elseif ($podcast->podcasterCover()->isNotEmpty()) {
         $cover = $podcast->podcasterCover()->toFile()->resize(200)->url();
     }
 
@@ -21,7 +25,7 @@
 
 <script>
     podlovePlayer('#podlovePlayerContainer', {
-        <?php if($podcast->podcasterPodloveMainColor()->isNotEmpty() && $podcast->podcasterPodloveHighlighColor()->isNotEmpty()) : ?>
+        <?php if ($podcast->podcasterPodloveMainColor()->isNotEmpty() && $podcast->podcasterPodloveHighlighColor()->isNotEmpty()) : ?>
         theme: {
             main: '#<?php echo str_replace('#', '', $podcast->podcasterPodloveMainColor()); ?>',
             highlight: '#<?php echo str_replace('#', '', $podcast->podcasterPodloveHighlighColor()); ?>'
@@ -34,19 +38,19 @@
             audio: <?php echo ($podcast->podcasterPodloveTabsAudio()->isTrue()) ? 'true' : 'false'; ?>,
             download: <?php echo ($podcast->podcasterPodloveTabsDownload()->isTrue()) ? 'true' : 'false'; ?>
         },
-        title: '<?php echo $page->podcasterTitle()->or($page->title()); ?>',
-        subtitle: '<?php echo $page->podcasterSubtitle(); ?>',
-        summary: '<?php echo $page->podcasterDescription(); ?>',
+        title: '<?php echo addslashes(Str::replace(Str::unhtml($page->podcasterTitle()->or($page->title())), "\n", ' ')); ?>',
+        subtitle: '<?php echo addslashes(Str::replace(Str::unhtml($page->podcasterSubtitle()), "\n", ' ')); ?>',
+        summary: '<?php echo addslashes(Str::replace(Str::unhtml($page->podcasterDescription()), "\n", ' ')); ?>',
         publicationDate: '<?php echo date('r', $page->date()->toDate()); ?>',
-        <?php if($cover !== false) : ?>
+        <?php if ($cover !== false) : ?>
             poster: '<?php echo $cover; ?>',
         <?php endif; ?>
         link: '<?php echo $page->url(); ?>',
         show: {
-            title: '<?php echo $podcast->podcasterTitle(); ?>',
-            subtitle: '<?php echo $podcast->podcasterSubtitle(); ?>',
-            summary: '<?php echo $podcast->podcasterDescription(); ?>',
-            <?php if($cover !== false) : ?>
+            title: '<?php echo addslashes(Str::replace(Str::unhtml(($podcast->podcasterTitle())), "\n", ' ')); ?>',
+            subtitle: '<?php echo addslashes(Str::replace(Str::unhtml($podcast->podcasterSubtitle()), "\n", ' ')); ?>',
+            summary: '<?php echo addslashes(Str::replace(Str::unhtml($podcast->podcasterDescription()), "\n", ' ')); ?>',
+            <?php if ($cover !== false) : ?>
             poster: '<?php echo $cover; ?>',
             <?php endif; ?>
             link: '<?php echo $podcast->podcasterLink(); ?>'

snippets/podlove-player.php

@@ -43,11 +43,8 @@ export default {
         this.getStats()
     },
     computed: {
-        id() {
-            return this.$store.state.form.current
-        },
         pageValues() {
-            return this.$store.getters['form/values'](this.id)
+            return this.$store.getters['content/values'](this.id)
         },
     },
     watch: {

src/components/Episode.vue

@@ -25,11 +25,8 @@ export default {
         }
     },
     computed: {
-        id() {
-            return this.$store.state.form.current
-        },
         pageValues() {
-            return this.$store.getters['form/values'](this.id)
+            return this.$store.getters['content/values'](this.id)
         },
     },
     mounted() {

src/components/FeedStats.vue

@@ -35,11 +35,8 @@ export default {
         });
       },
     computed: {
-        id() {
-            return this.$store.state.form.current
-        },
         pageValues() {
-            return this.$store.getters['form/values'](this.id)
+            return this.$store.getters['content/values'](this.id)
         },
     },
     methods: {

src/components/TopTen.vue

@@ -36,11 +36,8 @@ export default {
         this.headline = this.pageValues.podcasterWizardSrcFeed
     },
     computed: {
-        id() {
-            return this.$store.state.form.current
-        },
         pageValues() {
-            return this.$store.getters['form/values'](this.id)
+            return this.$store.getters['content/values'](this.id)
         },
     },
     methods: {

src/components/Wizard.vue

@@ -24,11 +24,8 @@ export default {
         }
     },
     computed: {
-        id() {
-            return this.$store.state.form.current
-        },
         pageValues() {
-            return this.$store.getters['form/values'](this.id)
+            return this.$store.getters['content/values'](this.id)
         },
     },
     mounted() {