From c6bba21ef9f3bf266a58235601cac8ca76a2462b Mon Sep 17 00:00:00 2001 From: jo Date: Thu, 7 Jul 2022 12:53:46 +0200 Subject: [PATCH] fix(legacy): station-metadata api endpoint - Remove hardcoded http:// - Add missing $request variable --- legacy/application/controllers/ApiController.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/legacy/application/controllers/ApiController.php b/legacy/application/controllers/ApiController.php index 81d2c50f5..bea4e790d 100644 --- a/legacy/application/controllers/ApiController.php +++ b/legacy/application/controllers/ApiController.php @@ -698,12 +698,10 @@ class ApiController extends Zend_Controller_Action $this->view->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(true); - $CC_CONFIG = Config::getConfig(); - $baseDir = Application_Common_OsPath::formatDirectoryWithDirectorySeparators($CC_CONFIG['baseDir']); - $path = 'http://' . $_SERVER['HTTP_HOST'] . $baseDir . 'api/station-logo'; + $request = $this->getRequest(); $result['name'] = Application_Model_Preference::GetStationName(); - $result['logo'] = $path; + $result['logo'] = Application_Common_HTTPHelper::getStationUrl() . 'api/station-logo'; $result['description'] = Application_Model_Preference::GetStationDescription(); $result['timezone'] = Application_Model_Preference::GetDefaultTimezone(); $result['locale'] = Application_Model_Preference::GetDefaultLocale();