From 709e117f418ba8b70a7dcbc90b348b0aa95cc8d6 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@daniel-PC.(none)>
Date: Tue, 6 Mar 2012 13:50:07 -0500
Subject: [PATCH] CC-3391: Audio Preview cannot play tracks with commas in
 their filename - The content distribution header filename attribute, wasn't
 properly quoted for inline content. This causes a bug for files with comma
 names. - changed the play button in library back to the speaker icon -
 removed some dead code preview_player.js - removed the file name attribute,
 will need better approch to presenting the user with audio information.

---
 .../application/controllers/ApiController.php | 11 ++---
 .../controllers/PlaylistController.php        |  6 +--
 airtime_mvc/application/models/StoredFile.php |  2 +-
 .../playlist/audio-preview-player.phtml       |  3 +-
 .../public/js/airtime/library/library.js      | 10 ++--
 .../js/airtime/library/preview_jplayer.js     | 48 ++-----------------
 airtime_mvc/public/js/airtime/library/spl.js  |  3 +-
 .../jplayer.audio-preview.blue.monday.css     |  6 +--
 8 files changed, 22 insertions(+), 67 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 369d424bb..40cb57c18 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -116,10 +116,9 @@ class ApiController extends Zend_Controller_Action
             return;
         }
 
-        $name = $this->_getParam("name");
-        $filename = $this->_getParam("filename");
-    
-        $file_id = substr($filename, 0, strpos($filename, "."));
+        $fileID = $this->_getParam("fileID");
+        $file_id = substr($fileID, 0, strpos($fileID, "."));
+
         if (ctype_alnum($file_id) && strlen($file_id) == 32)
         {
             $media = Application_Model_StoredFile::RecallByGunid($file_id);
@@ -132,7 +131,7 @@ class ApiController extends Zend_Controller_Action
                     $file_base_name = substr($file_base_name, 1);
                     // possibly use fileinfo module here in the future.
                     // http://www.php.net/manual/en/book.fileinfo.php
-                    $ext = pathinfo($filename, PATHINFO_EXTENSION);
+                    $ext = pathinfo($fileID, PATHINFO_EXTENSION);
                     //Download user left clicks a track and selects Download.
                     if ("true" == $this->_getParam('download')){
                         //path_info breaks up a file path into seperate pieces of informaiton.
@@ -146,7 +145,7 @@ class ApiController extends Zend_Controller_Action
                         header('Content-Disposition: attachment; filename="'.$file_base_name.'"');
                     }else{
                         //user clicks play button for track and downloads it.
-                        header("Content-Disposition: inline; filename=$file_base_name");
+                        header('Content-Disposition: inline; filename="'.$file_base_name.'"');
                     }
                 
                     $this->smartReadFile($filepath, $ext);
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 80ebaf47e..5351812be 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -198,8 +198,7 @@ class PlaylistController extends Zend_Controller_Action
     
     public function audioPreviewPlayerAction()
     {
-        $name = $this->_getParam('name');
-        $fileName = $this->_getParam('filename');
+        $fileID = $this->_getParam('fileID');
         $playlistIndex = $this->_getParam('index');
 
         $request = $this->getRequest();
@@ -218,8 +217,7 @@ class PlaylistController extends Zend_Controller_Action
             $this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png";
         }
         
-        $this->view->name = $name;
-        $this->view->fileName = $fileName;
+        $this->view->fileName = $fileID;
         $this->view->playlistIndex= $playlistIndex;
     }
 
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 1a8821a41..9dfd99e46 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -660,7 +660,7 @@ Logging::log("getting media! - 2");
 
             if($type == "au"){//&& isset( $audioResults )) {
                 $row['audioFile'] = $row['gunid'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION);
-                $row['image'] = '<div class="big_play"><span class="ui-icon ui-icon-play"></span></div>';
+                $row['image'] = '<div class="big_play"><img src="/css/images/icon_audioclip.png"></div>';
             }
             else {
                 $row['image'] = '<img src="/css/images/icon_playlist.png">';
diff --git a/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml b/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml
index a01b2e9ff..cce1ea02b 100644
--- a/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml
@@ -1,6 +1,5 @@
 <div id="content" class="jp-container">
-    <span class='name'><?php echo "$this->name" ?></span>
-    <span class='filename'><?php echo "$this->fileName" ?></span>
+    <span class='fileID'><?php echo "$this->fileName" ?></span>
     <div id="jquery_jplayer_1" class="jp-jplayer"></div>
     <div id="jp_container_1" class="jp-audio">
         <div class="jp-type-single">
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index bc895b20b..3dd7a627b 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -160,7 +160,7 @@
                 
                 //add the play function to the library_type td
                 $(nRow).find('td.library_type').click(function(){
-                    open_audio_preview(aData.track_title, aData.audioFile, aData.id);
+                    open_audio_preview(aData.audioFile, aData.id);
                     return false;
                 });
                 
@@ -360,7 +360,7 @@
                     //define a play callback.
                     if (oItems.play !== undefined) {
                         callback = function() {
-                            open_audio_preview(data.track_title, data.audioFile, data.id);
+                            open_audio_preview(data.audioFile, data.id);
                         };
                         oItems.play.callback = callback;
                     }
@@ -638,13 +638,13 @@
     
     var audio_preview_window = null;
     
-    function open_audio_preview(name, filename, index) {
-        url = 'Playlist/audio-preview-player/name/'+name+'/filename/'+filename+'/index/'+index;
+    function open_audio_preview(fileID, index) {
+        url = 'Playlist/audio-preview-player/fileID/'+fileID+'/index/'+index;
         //$.post(baseUri+'Playlist/audio-preview-player', {fileName: fileName, cueIn: cueIn, cueOut: cueOut, fadeIn: fadeIn, fadeInFileName: fadeInFileName, fadeOut: fadeOut, fadeOutFileName: fadeOutFileName})
         if (audio_preview_window == null || audio_preview_window.closed){
             audio_preview_window = window.open(url, 'Audio Player', 'width=400,height=95');
         } else if (!audio_preview_window.closed) {
-            audio_preview_window.play(name, filename);
+            audio_preview_window.play(fileID);
         } else {
             console.log("something else : "+baseUrl+url);
         }
diff --git a/airtime_mvc/public/js/airtime/library/preview_jplayer.js b/airtime_mvc/public/js/airtime/library/preview_jplayer.js
index 15c53f9ec..d00f83a10 100644
--- a/airtime_mvc/public/js/airtime/library/preview_jplayer.js
+++ b/airtime_mvc/public/js/airtime/library/preview_jplayer.js
@@ -1,49 +1,11 @@
-
-
-function audioPreview(filename, elemID){
-    console.log("in the audio preview");
-    var elems = $('.ui-icon.ui-icon-pause');
-    elems.attr("class", "ui-icon ui-icon-play");
-
-    if ($("#jquery_jplayer_1").data("jPlayer") && $("#jquery_jplayer_1").data("jPlayer").status.paused != true){
-         $('#jquery_jplayer_1').jPlayer('stop');
-        return;
-    }
-
-    var ext = getFileExt(filename);
-    var uri = "/api/get-media/file/" + filename;
-    
-    var media;
-    var supplied;
-    if (ext == "ogg"){
-        media = {oga:uri};
-        supplied = "oga";
-    } else {
-        media = {mp3:uri};
-        supplied = "mp3";
-    }
-
-    $("#jquery_jplayer_1").jPlayer("destroy");
-    $("#jquery_jplayer_1").jPlayer({
-        ready: function () {
-            $(this).jPlayer("setMedia", media).jPlayer("play");
-        },
-        swfPath: "/js/jplayer",
-        supplied: supplied
-    });
-
-    $('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause");
-}
-
 $(document).ready(function(){
-    var filename = $(".filename").text();
-    var name = $(".name").text();
-    play(name, filename);
+    var fileID = $(".fileID").text();
+    play(fileID);
 });
 
-function play(name, filename){
-    var uri = "/api/get-media/name/"+name+"/filename/" + filename;
-    var ext = getFileExt(filename);
+function play(fileID){
+    var uri = "/api/get-media/fileID/" + fileID;
+    var ext = getFileExt(fileID);
     
     
     var media;
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index dd30cc53d..ea99a1e77 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -248,11 +248,10 @@ var AIRTIME = (function(AIRTIME){
     function openAudioPreview(event) {
         event.stopPropagation();
         
-        var name = $(this).parent().find('.spl_title').text();
         var audioFile = $(this).attr('audioFile');
         var id = "";
         
-        open_audio_preview(name, audioFile, id);
+        open_audio_preview(audioFile, id);
     }      
     
 	function editName() {
diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css b/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css
index ca518c523..1a27502fc 100644
--- a/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css
+++ b/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css
@@ -89,12 +89,10 @@ div.jp-video div.jp-interface {
 }
 
 /* Used to hide the filename field **/
-span.filename {
-    display:none; 
-}
-span.name {
+span.fileID {
     display:none; 
 }
+
 /* @group CONTROLS */
 
 div.jp-controls-holder {