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

Remove stream url js escaping and do it on server side instead

Browse source
This commit is contained in:
drigato 2015-04-08 15:19:22 -04:00
parent 94a7643ebc
commit 78b2631980
2 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/PlayerController.php
View file

@ -51,7 +51,7 @@ class PlayerController extends Zend_Controller_Action
$this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "js/libs/jquery-1.10.2.js";
$this->view->muses_swf = Application_Common_HTTPHelper::getStationUrl() . "js/airtime/player/muses.swf";
$this->view->metadata_api_url = Application_Common_HTTPHelper::getStationUrl() . "api/live-info";
$this->view->station_name = addslashes(Application_Model_Preference::GetStationName());
$this->view->station_name = json_encode(Application_Model_Preference::GetStationName());
$stream = $request->getParam('stream');
$streamData = Application_Model_StreamSetting::getEnabledStreamData();
@ -70,7 +70,7 @@ class PlayerController extends Zend_Controller_Action
} else {
$this->view->playerMode = "manual";
$selectedStreamData = $streamData[$stream];
$this->view->streamURL = $selectedStreamData["url"];
$this->view->streamURL = json_encode($selectedStreamData["url"]);
$this->view->codec = $selectedStreamData["codec"];
}
$this->view->availableMobileStreams = json_encode($availableMobileStreams);