From 965a649d0e0e9d6b070f2d86cd76276d5e96a13e Mon Sep 17 00:00:00 2001 From: James Date: Thu, 22 Sep 2011 14:01:05 -0400 Subject: [PATCH] CC-2591: Change function name - done - extra fix: fix was needed due to class name change --- airtime_mvc/application/controllers/LibraryController.php | 8 ++++---- airtime_mvc/application/models/Shows.php | 6 +++--- airtime_mvc/public/js/airtime/library/library.js | 6 +++--- .../public/js/airtime/schedule/full-calendar-functions.js | 6 +++--- utils/soundcloud-uploader.php | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index dbb4a561c..c1a46343f 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -14,7 +14,7 @@ class LibraryController extends Zend_Controller_Action ->addActionContext('context-menu', 'json') ->addActionContext('get-file-meta-data', 'html') ->addActionContext('upload-file-soundcloud', 'json') - ->addActionContext('get-upload-to-sc-status', 'json') + ->addActionContext('get-upload-to-soundcloud-status', 'json') ->initContext(); $this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME); @@ -180,7 +180,7 @@ class LibraryController extends Zend_Controller_Action //format clip lengh to 1 decimal foreach($datatables["aaData"] as &$data){ if($data[6] == 'audioclip'){ - $file = StoredFile::Recall($data[0]); + $file = Application_Model_StoredFile::Recall($data[0]); $scid = $file->getSoundCloudId(); if($scid == "-2"){ $data[1] .= ''; @@ -249,7 +249,7 @@ class LibraryController extends Zend_Controller_Action die(); } - public function getUploadToScStatusAction(){ + public function getUploadToSoundcloudStatusAction(){ $id = $this->_getParam('id'); $type = $this->_getParam('type'); if($type == "show"){ @@ -259,7 +259,7 @@ class LibraryController extends Zend_Controller_Action $this->view->error_code = $file->getSoundCloudErrorCode(); $this->view->error_msg = $file->getSoundCloudErrorMsg(); }else{ - $file = StoredFile::Recall($id); + $file = Application_Model_StoredFile::Recall($id); $this->view->sc_id = $file->getSoundCloudId(); $this->view->error_code = $file->getSoundCloudErrorCode(); $this->view->error_msg = $file->getSoundCloudErrorMsg(); diff --git a/airtime_mvc/application/models/Shows.php b/airtime_mvc/application/models/Shows.php index 1565f75e6..d0966c6b0 100644 --- a/airtime_mvc/application/models/Shows.php +++ b/airtime_mvc/application/models/Shows.php @@ -1245,7 +1245,7 @@ class Show { // get soundcloud_id if(!is_null($show["file_id"])){ - $file = StoredFile::Recall($show["file_id"]); + $file = Application_Model_StoredFile::Recall($show["file_id"]); $soundcloud_id = $file->getSoundCloudId(); }else{ $soundcloud_id = null; @@ -1364,13 +1364,13 @@ class ShowInstance { public function setSoundCloudFileId($p_soundcloud_id) { - $file = StoredFile::Recall($this->_showInstance->getDbRecordedFile()); + $file = Application_Model_StoredFile::Recall($this->_showInstance->getDbRecordedFile()); $file->setSoundCloudFileId($p_soundcloud_id); } public function getSoundCloudFileId() { - $file = StoredFile::Recall($this->_showInstance->getDbRecordedFile()); + $file = Application_Model_StoredFile::Recall($this->_showInstance->getDbRecordedFile()); return $file->getSoundCloudId(); } diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 6c3e14b6c..6ff2770da 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -159,7 +159,7 @@ function addProgressIcon(id) { } function checkSCUploadStatus(){ - var url = '/Library/get-upload-to-sc-status/format/json'; + var url = '/Library/get-upload-to-soundcloud-status/format/json'; $("span[class*=progress]").each(function(){ var id = $(this).attr("id"); $.post(url, {format: "json", id: id, type:"file"}, function(json){ @@ -198,7 +198,7 @@ function addQtipToSCIcons(){ content: { text: "Retreiving data from the server...", ajax: { - url: "/Library/get-upload-to-sc-status", + url: "/Library/get-upload-to-soundcloud-status", type: "post", data: ({format: "json", id : id, type: "file"}), success: function(json, status){ @@ -224,7 +224,7 @@ function addQtipToSCIcons(){ content: { text: "Retreiving data from the server...", ajax: { - url: "/Library/get-upload-to-sc-status", + url: "/Library/get-upload-to-soundcloud-status", type: "post", data: ({format: "json", id : id, type: "file"}), success: function(json, status){ diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 52df7fb61..aad7c7b18 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -330,7 +330,7 @@ function getFullCalendarEvents(start, end, callback) { } function checkSCUploadStatus(){ - var url = '/Library/get-upload-to-sc-status/format/json'; + var url = '/Library/get-upload-to-soundcloud-status/format/json'; $("span[class*=progress]").each(function(){ var id = $(this).attr("id"); $.post(url, {format: "json", id: id, type:"show"}, function(json){ @@ -368,7 +368,7 @@ function addQtipToSCIcons(ele){ content: { text: "Retreiving data from the server...", ajax: { - url: "/Library/get-upload-to-sc-status", + url: "/Library/get-upload-to-soundcloud-status", type: "post", data: ({format: "json", id : id, type: "file"}), success: function(json, status){ @@ -394,7 +394,7 @@ function addQtipToSCIcons(ele){ content: { text: "Retreiving data from the server...", ajax: { - url: "/Library/get-upload-to-sc-status", + url: "/Library/get-upload-to-soundcloud-status", type: "post", data: ({format: "json", id : id, type: "show"}), success: function(json, status){ diff --git a/utils/soundcloud-uploader.php b/utils/soundcloud-uploader.php index abb5a7cbb..d5036ad64 100644 --- a/utils/soundcloud-uploader.php +++ b/utils/soundcloud-uploader.php @@ -59,7 +59,7 @@ if(count($argv) != 2){ } $id = $argv[1]; -$file = StoredFile::Recall($id); +$file = Application_Model_StoredFile::Recall($id); // set id with -2 which is indicator for processing $file->setSoundCloudFileId(-2); $file->uploadToSoundCloud();