Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore(legacy): use Config::getPublicUrl helper

Browse source 
Replace Application_Common_HTTPHelper::getStationUrl with Config::getPublicUrl.
This commit is contained in:
jo 2022-07-07 23:32:43 +02:00 • committed by Kyle Robbertze
parent 72960593c7
commit 829b9bcd5b
17 changed files with 23 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
legacy/application/controllers/ApiController.php
View file

@ -313,7 +313,7 @@ class ApiController extends Zend_Controller_Action
$this->returnJsonOrJsonp($request, []);
}
$stationUrl = Application_Common_HTTPHelper::getStationUrl();
$stationUrl = Config::getPublicUrl();
if (isset($result['previous'])) {
if (
@ -701,7 +701,7 @@ class ApiController extends Zend_Controller_Action
$request = $this->getRequest();
$result['name'] = Application_Model_Preference::GetStationName();
$result['logo'] = Application_Common_HTTPHelper::getStationUrl() . 'api/station-logo';
$result['logo'] = Config::getPublicUrl() . 'api/station-logo';
$result['description'] = Application_Model_Preference::GetStationDescription();
$result['timezone'] = Application_Model_Preference::GetDefaultTimezone();
$result['locale'] = Application_Model_Preference::GetDefaultLocale();

2
legacy/application/controllers/EmbedController.php
View file

@ -79,7 +79,7 @@ class EmbedController extends Zend_Controller_Action
$request = $this->getRequest();
$this->view->angular = Application_Common_HTTPHelper::getStationUrl() . 'js/libs/angular.min.js?' . $CC_CONFIG['airtime_version'];
$this->view->angular = Config::getPublicUrl() . 'js/libs/angular.min.js?' . $CC_CONFIG['airtime_version'];
$widgetStyle = $request->getParam('style');
if ($widgetStyle == 'premium') {
$this->view->widgetStyle = 'premium';

2
legacy/application/controllers/IndexController.php
View file

@ -46,7 +46,7 @@ class IndexController extends Zend_Controller_Action
$stationDescription = Application_Model_Preference::GetStationDescription();
$this->view->stationDescription = $stationDescription;
$this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl();
$this->view->stationUrl = Config::getPublicUrl();
$displayRadioPageLoginButtonValue = Application_Model_Preference::getRadioPageDisplayLoginButton();
if ($displayRadioPageLoginButtonValue == '') {

2
legacy/application/controllers/PreferenceController.php
View file

@ -99,7 +99,7 @@ class PreferenceController extends Zend_Controller_Action
// Append sharing token (download key) to Station podcast URL
$stationPodcast = PodcastQuery::create()->findOneByDbId(Application_Model_Preference::getStationPodcastId());
$key = Application_Model_Preference::getStationPodcastDownloadKey();
$url = Application_Common_HTTPHelper::getStationUrl() .
$url = Config::getPublicUrl() .
(((int) $values->stationPodcastPrivacy) ? "feeds/station-rss?sharing_token={$key}" : 'feeds/station-rss');
$stationPodcast->setDbUrl($url)->save();
Application_Model_Preference::setStationPodcastPrivacy($values->stationPodcastPrivacy);

2
legacy/application/controllers/ThirdPartyController.php
View file

@ -20,7 +20,7 @@ abstract class ThirdPartyController extends Zend_Controller_Action
*/
public function init()
{
$this->_baseUrl = Application_Common_HTTPHelper::getStationUrl();
$this->_baseUrl = Config::getPublicUrl();
$this->view->layout()->disableLayout(); // Don't inject the standard Now Playing header.
$this->_helper->viewRenderer->setNoRender(true); // Don't use (phtml) templates