Merge pull request #18 from mauricerenck/develop

Fixes some issue
mauricerenck · May 14, 2019 · 9301d98 · 9301d98
2 parents 62a0c2f + 6671293
commit 9301d98
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
             "email": "[email protected]"
         }
     ],
-    "version": "1.0.4",
+    "version": "1.0.5",
     "autoload": {
         "files": [
             "utils/PodcasterUtils.php",

diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -62,7 +62,7 @@
             'action' => function ($slug) {
                 $podcasterUtils = new PodcasterUtils();
 
-                $page = $podcasterUtils->getPageFromSlug($slug. '/' . option('mauricerenck.podcaster.defaultFeed', 'feed'));
+                $page = $podcasterUtils->getPageFromSlug($slug . '/' . option('mauricerenck.podcaster.defaultFeed', 'feed'));
 
                 if(option('mauricerenck.podcaster.statsInternal') === true) {
                     $stats = new PodcasterStats();

diff --git a/templates/podcasterfeed.php b/templates/podcasterfeed.php
@@ -59,8 +59,8 @@
 
 		<?php if ($user = $page->podcasterAuthor()->toUser()) : ?>
 			<googleplay:author><?php echo Xml::encode($user->name()); ?></googleplay:author>
+			<googleplay:email><?php echo Xml::encode($user->email()); ?></googleplay:email>
 		<?php endif ?>
-		<googleplay:email><?php echo Xml::encode($user->email()); ?></googleplay:email>
 		<?php $rssUtils->printFieldValue('rssFeed', 'googleplay:description', 'podcasterDescription'); ?>
 		<?php $rssUtils->printBoolValue('rssFeed', 'googleplay:explicit', 'podcasterExplicit'); ?>
 		<?php $rssUtils->printBoolValue('rssFeed', 'googleplay:block', 'podcasterBlock'); ?>

diff --git a/utils/PodcasterUtils.php b/utils/PodcasterUtils.php
@@ -68,7 +68,8 @@ public function printItunesCategories() {
     }
 
     public function getCoverImage() {
-        if($this->rssFeed->podcasterCover()->isNotEmpty()) {
+
+        if($this->rssFeed->podcasterCover()->isNotEmpty() && !is_null($this->rssFeed->podcasterCover()->toFile())) {
             $output = '<image>';
             $output .= '<url>' . Xml::encode($this->rssFeed->podcasterCover()->toFile()->url()) . '</url>';
             $output .= '<title>' . Xml::encode($this->rssFeed->podcasterTitle()) . '</title>';
@@ -153,7 +154,7 @@ private function parseItunesCategories(): array {
 
     public function getPageFromSlug($slug) {
         $currentLanguage = kirby()->language();
-        $cleanedSlug = str_replace($currentLanguage . '/', '', $slug);
+        $cleanedSlug = (is_null($currentLanguage)) ? $slug : str_replace($currentLanguage . '/', '', $slug);
 
         return page($cleanedSlug);
     }