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/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index c3237faf6..b38da1207 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -438,10 +438,10 @@ class Application_Model_StoredFile { * Get the URL to access this file. */ public function getFileUrl() - { + { $serverName = $_SERVER['SERVER_NAME']; $serverPort = $_SERVER['SERVER_PORT']; - + return "http://$serverName:$serverPort/api/get-media/file/".$this->getGunId().".".$this->getFileExtension(); } @@ -834,7 +834,7 @@ class Application_Model_StoredFile { } if (file_exists($duplicate->getFilePath())) { $duplicateName = $duplicate->getMetadataValue('MDATA_KEY_TITLE'); - die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}'); + die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named \"' . $duplicateName . '\" already exists on the server."}}'); } } @@ -878,39 +878,39 @@ class Application_Model_StoredFile { return $results; } - + public function setSoundCloudFileId($p_soundcloud_id) { $this->_file->setDbSoundCloudId($p_soundcloud_id) ->save(); } - + public function getSoundCloudId(){ return $this->_file->getDbSoundCloudId(); } - + public function setSoundCloudErrorCode($code){ $this->_file->setDbSoundCloudErrorCode($code) ->save(); } - + public function getSoundCloudErrorCode(){ return $this->_file->getDbSoundCloudErrorCode(); } - + public function setSoundCloudErrorMsg($msg){ $this->_file->setDbSoundCloudErrorMsg($msg) ->save(); } - + public function getSoundCloudErrorMsg(){ return $this->_file->getDbSoundCloudErrorMsg(); } - + public function uploadToSoundCloud() { global $CC_CONFIG; - + $file = $this->_file; if(is_null($file)) { return "File does not exist"; diff --git a/airtime_mvc/application/views/scripts/error/error.phtml b/airtime_mvc/application/views/scripts/error/error.phtml index feea0c563..e84196941 100644 --- a/airtime_mvc/application/views/scripts/error/error.phtml +++ b/airtime_mvc/application/views/scripts/error/error.phtml @@ -6,24 +6,12 @@ Zend Framework Default Application -

An error occurred

-

message ?>

- - - -

Exception information:

-

- Message: exception->getMessage() ?> -

- -

Stack trace:

- 
exception->getTraceAsString() ?>
-
- -

Request Parameters:

- 
request->getParams(), 1) ?>
-
- - +
+

Page not found!

+

Looks like the page you were looking for doesn't exist!

+
+ Help +
+
diff --git a/airtime_mvc/public/css/images/404.png b/airtime_mvc/public/css/images/404.png new file mode 100644 index 000000000..c89f60ffb Binary files /dev/null and b/airtime_mvc/public/css/images/404.png differ 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/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index c9f676148..eaa7d44fa 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -374,16 +374,16 @@ function setAddShowEvents() { function calculateDuration(endDateTime, startDateTime){ var duration; var durationSeconds = (endDateTime.getTime() - startDateTime.getTime())/1000; - if(durationSeconds != 0){ + if(isNaN(durationSeconds)){ + duration = '1h'; + } + else if(durationSeconds != 0){ var durationHour = parseInt(durationSeconds/3600, 10); var durationMin = parseInt((durationSeconds%3600)/60, 10); duration = (durationHour == 0 ? '' : durationHour+'h'+' ')+(durationMin == 0 ? '' : durationMin+'m'); }else{ duration = '0m'; } - if(isNaN(duration)){ - duration = '1h'; - } $('#add_show_duration').val(duration); } 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..df1577d4b 100644 --- a/utils/soundcloud-uploader.php +++ b/utils/soundcloud-uploader.php @@ -22,8 +22,7 @@ $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_r require_once($CC_CONFIG['phpDir'].'/application/configs/constants.php'); require_once($CC_CONFIG['phpDir'].'/application/configs/conf.php'); -//$CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; -$CC_CONFIG['phpDir'] = "/home/james/src/airtime/airtime_mvc"; +$CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; require_once($CC_CONFIG['phpDir'].'/application/models/StoredFile.php'); require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php'); @@ -59,7 +58,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();