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

Merge pull request #1119 from BorderRadio/master

Browse source 
Fix HTML iframe tag in EmbedController(s) and adopt relative URLs
This commit is contained in:
Kyle Robbertze 2020-11-28 20:37:20 +02:00 • committed by GitHub
commit f5cf7d8d1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
airtime_mvc/application/controllers/EmbedController.php
View file

@ -25,18 +25,18 @@ class EmbedController extends Zend_Controller_Action
$request = $this->getRequest(); $request = $this->getRequest();
$this->view->playerhtml5_js = Application_Common_HTTPHelper::getStationUrl() . "js/airtime/player/playerhtml5.js?".$CC_CONFIG['airtime_version']; $this->view->playerhtml5_js = "/js/airtime/player/playerhtml5.js?".$CC_CONFIG['airtime_version'];
$this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "js/libs/jquery-1.10.2.js"; $this->view->jquery = "/js/libs/jquery-1.10.2.js";
$this->view->metadata_api_url = Application_Common_HTTPHelper::getStationUrl() . "api/live-info"; $this->view->metadata_api_url = "/api/live-info";
$this->view->player_title = json_encode($this->view->escape($request->getParam('title'))); $this->view->player_title = json_encode($this->view->escape($request->getParam('title')));
$this->view->jquery_i18n = Application_Common_HTTPHelper::getStationUrl() . "js/i18n/jquery.i18n.js?"; $this->view->jquery_i18n = "/js/i18n/jquery.i18n.js?";
$styleParam = $request->getParam('style'); $styleParam = $request->getParam('style');
$player_style = isset($styleParam) ? $styleParam : "basic"; $player_style = isset($styleParam) ? $styleParam : "basic";
if ($player_style == "premium") { if ($player_style == "premium") {
$this->view->css = Application_Common_HTTPHelper::getStationUrl() . "css/radio-page/premium_player.css?".$CC_CONFIG['airtime_version']; $this->view->css = "/css/radio-page/premium_player.css?".$CC_CONFIG['airtime_version'];
} else { } else {
$this->view->css = Application_Common_HTTPHelper::getStationUrl() . "css/player.css?".$CC_CONFIG['airtime_version']; $this->view->css = "/css/player.css?".$CC_CONFIG['airtime_version'];
} }
$this->view->player_style = $player_style; $this->view->player_style = $player_style;
@ -75,10 +75,10 @@ class EmbedController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$this->view->css = Application_Common_HTTPHelper::getStationUrl() . "widgets/css/airtime-widgets.css?".$CC_CONFIG['airtime_version']; $this->view->css = "/widgets/css/airtime-widgets.css?".$CC_CONFIG['airtime_version'];
$this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version']; $this->view->jquery = "/widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version'];
$this->view->jquery_custom = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery-ui-1.8.10.custom.min.js?".$CC_CONFIG['airtime_version']; $this->view->jquery_custom = "/widgets/js/jquery-ui-1.8.10.custom.min.js?".$CC_CONFIG['airtime_version'];
$this->view->widget_js = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery.showinfo.js?".$CC_CONFIG['airtime_version']; $this->view->widget_js = "/widgets/js/jquery.showinfo.js?".$CC_CONFIG['airtime_version'];
} }
public function weeklyProgramAction() public function weeklyProgramAction()
@ -93,12 +93,12 @@ class EmbedController extends Zend_Controller_Action
$widgetStyle = $request->getParam('style'); $widgetStyle = $request->getParam('style');
if ($widgetStyle == "premium") { if ($widgetStyle == "premium") {
$this->view->widgetStyle = "premium"; $this->view->widgetStyle = "premium";
$this->view->css = Application_Common_HTTPHelper::getStationUrl() . "/css/embed/weekly-schedule-widget.css?" . $CC_CONFIG['airtime_version']; $this->view->css = "/css/embed/weekly-schedule-widget.css?" . $CC_CONFIG['airtime_version'];
} else { } else {
$this->view->widgetStyle = "basic"; $this->view->widgetStyle = "basic";
$this->view->css = Application_Common_HTTPHelper::getStationUrl() . "/css/embed/weekly-schedule-widget-basic.css?" . $CC_CONFIG['airtime_version']; $this->view->css = "/css/embed/weekly-schedule-widget-basic.css?" . $CC_CONFIG['airtime_version'];
} }
$this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version']; $this->view->jquery = "/widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version'];
$weeklyScheduleData = WidgetHelper::getWeekInfoV2(); $weeklyScheduleData = WidgetHelper::getWeekInfoV2();

4
airtime_mvc/application/views/scripts/index/index.phtml
View file

@ -34,7 +34,7 @@
<?php endif; ?> <?php endif; ?>
<div id="tab-1" class="schedule tab_content current"> <div id="tab-1" class="schedule tab_content current">
<iframe onLoad="autoResize('schedule_iframe');" id="schedule_iframe" height="300px" scrolling="yes" frameborder="0" src="<?php echo $this->stationUrl."embed/weekly-program?style=premium"?>"></iframe> <iframe onLoad="autoResize('schedule_iframe');" id="schedule_iframe" height="300px" scrolling="yes" frameborder="0" src="/embed/weekly-program?style=premium"></iframe>
</div> </div>
@ -299,7 +299,7 @@
} }
?> ?>
<iframe id="player_iframe" frameborder="0" width="100%" style="bottom:0px; left:0px; position:fixed; right:0px;" src=<?php echo $this->stationUrl."embed/player?stream=auto&style=premium";?>></iframe> <iframe id="player_iframe" frameborder="0" width="100%" style="bottom:0px; left:0px; position:fixed; right:0px;" src="/embed/player?stream=auto&style=premium"></iframe>
</div> </div>