From be5d7320060cfbba7d206a6030298d7853036775 Mon Sep 17 00:00:00 2001
From: Jonas L <jooola@users.noreply.github.com>
Date: Thu, 5 May 2022 19:24:51 +0200
Subject: [PATCH] fix(legacy): station url always has a trailing slash (#1838)

---
 legacy/application/common/HTTPHelper.php              | 10 ----------
 legacy/application/models/airtime/CcFiles.php         |  2 +-
 legacy/application/services/PodcastEpisodeService.php |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/legacy/application/common/HTTPHelper.php b/legacy/application/common/HTTPHelper.php
index 28483845d..ff4aa5972 100644
--- a/legacy/application/common/HTTPHelper.php
+++ b/legacy/application/common/HTTPHelper.php
@@ -42,16 +42,6 @@ class Application_Common_HTTPHelper
             ]
         );
 
-        if (empty($baseDir)) {
-            $baseDir = '/';
-        }
-        if ($baseDir[0] != '/') {
-            $baseDir = '/' . $baseDir;
-        }
-        if (substr($baseDir, -1) != '/') {
-            $baseDir = $baseDir . '/';
-        }
-
         return rtrim($url, '/') . '/';
     }
 
diff --git a/legacy/application/models/airtime/CcFiles.php b/legacy/application/models/airtime/CcFiles.php
index 787d2a97a..a7f04017f 100644
--- a/legacy/application/models/airtime/CcFiles.php
+++ b/legacy/application/models/airtime/CcFiles.php
@@ -163,7 +163,7 @@ class CcFiles extends BaseCcFiles
             $file->setDbHidden(true);
             $file->save();
 
-            $callbackUrl = Application_Common_HTTPHelper::getStationUrl() . '/rest/media/' . $file->getPrimaryKey();
+            $callbackUrl = Application_Common_HTTPHelper::getStationUrl() . 'rest/media/' . $file->getPrimaryKey();
 
             Application_Service_MediaService::importFileToLibrary(
                 $callbackUrl,
diff --git a/legacy/application/services/PodcastEpisodeService.php b/legacy/application/services/PodcastEpisodeService.php
index 85206447f..110e1e9c1 100644
--- a/legacy/application/services/PodcastEpisodeService.php
+++ b/legacy/application/services/PodcastEpisodeService.php
@@ -182,7 +182,6 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
     {
         $CC_CONFIG = Config::getConfig();
         $stationUrl = Application_Common_HTTPHelper::getStationUrl();
-        $stationUrl .= substr($stationUrl, -1) == '/' ? '' : '/';
         $data = [
             'id' => $id,
             'url' => $url,