From 78b2631980a7c6569cb41a38db6cad6e1a33ebce Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Wed, 8 Apr 2015 15:19:22 -0400
Subject: [PATCH] Remove stream url js escaping and do it on server side
 instead

---
 .../controllers/PlayerController.php           |  4 ++--
 .../views/scripts/player/index.phtml           | 18 ++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/airtime_mvc/application/controllers/PlayerController.php b/airtime_mvc/application/controllers/PlayerController.php
index 2775d1c55..92501bbd4 100644
--- a/airtime_mvc/application/controllers/PlayerController.php
+++ b/airtime_mvc/application/controllers/PlayerController.php
@@ -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);
diff --git a/airtime_mvc/application/views/scripts/player/index.phtml b/airtime_mvc/application/views/scripts/player/index.phtml
index 3f198e642..ee19b337c 100644
--- a/airtime_mvc/application/views/scripts/player/index.phtml
+++ b/airtime_mvc/application/views/scripts/player/index.phtml
@@ -35,21 +35,20 @@
             };
 
             if (this.playerMode == "manual") {
-                this.settings.url = htmlEscape("<?php echo $this->streamURL ?>");
+                this.settings.url = "<?php echo $this->streamURL ?>";
                 this.settings.codec = "<?php echo $this->codec ?>";
             } else if (this.playerMode == "auto") {
                 this.availableMobileStreamQueue = <?php echo $this->availableMobileStreams?>;
                 this.availableDesktopStreamQueue = <?php echo $this->availableDesktopStreams?>;
                 var stream = this.getNextAvailableStream();
-                this.settings.url = htmlEscape(stream["url"]);
+                this.settings.url = stream["url"];
                 this.settings.codec = stream["codec"];
             }
 
             // Create the Muses player object
             MRP.insert(this.settings);
 
-            var station_name = htmlEscape("<?php echo $this->station_name?>");
-            $("p.station_name").html(station_name);
+            $("p.station_name").html("<?php echo $this->station_name?>");
 
             attachStreamMetadataToPlayer();
 
@@ -143,7 +142,7 @@
                     // connection limit reached or problem connecting to stream
                     if (value === "0") {
                         var stream = musesPlayer.getNextAvailableStream();
-                        musesPlayer.setURL(htmlEscape(stream["url"]));
+                        musesPlayer.setURL(stream["url"]);
                         musesPlayer.play();
                     }
             }
@@ -218,15 +217,6 @@
             setTimeout(attachStreamMetadataToPlayer, time_to_next_track_starts);
         }
 
-        function htmlEscape(str) {
-            return String(str)
-                .replace(/&/g, '&amp;')
-                .replace(/"/g, '&quot;')
-                .replace(/'/g, '&#39;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        }
-
     </script>
 
     <style type="text/css">