From 665957c5d76d5415831721fb4aaaa049034a817d Mon Sep 17 00:00:00 2001 From: james Date: Fri, 26 Aug 2011 19:45:43 -0400 Subject: [PATCH 1/8] - change on CREDITS file --- CREDITS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CREDITS b/CREDITS index b6108f552..7bcb234b6 100644 --- a/CREDITS +++ b/CREDITS @@ -1,6 +1,17 @@ ======= CREDITS ======= +Version 1.9.3 +------------- +Same as previous version. + +Version 1.9.2 +------------- +Same as previous version. + +Version 1.9.1 +------------- +Same as previous version. Version 1.9.0 ------------- From 8b0b5851f60a465d232c4a57f60ce6ce5dc264fc Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 29 Aug 2011 14:43:30 -0400 Subject: [PATCH 2/8] -fix typo in recorder.py --- python_apps/show-recorder/recorder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py index bb05d02ba..22bf64452 100644 --- a/python_apps/show-recorder/recorder.py +++ b/python_apps/show-recorder/recorder.py @@ -155,7 +155,7 @@ class ShowRecorder(Thread): self.upload_file(filepath) os.remove(filepath) - except Exceptio, e: + except Exception, e: self.logger.error(e) else: self.logger.info("problem recording show") From d0ecd0acf161a5fbdd28a6045cdb9452d7a5da35 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 30 Aug 2011 15:25:33 -0400 Subject: [PATCH 3/8] CC-2740: Upload issue - fixed a bug for uploading a file with "+" signs in IE --- airtime_mvc/application/models/StoredFile.php | 5 +++-- airtime_mvc/public/js/airtime/library/plupload.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index b7bbac9d0..7ff0bb56b 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -728,7 +728,7 @@ class StoredFile { $chunk = isset($_REQUEST["chunk"]) ? $_REQUEST["chunk"] : 0; $chunks = isset($_REQUEST["chunks"]) ? $_REQUEST["chunks"] : 0; $fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : ''; - + Logging::log(__FILE__.':uploadFile(): filename='.$fileName); // Clean the fileName for security reasons //this needs fixing for songs not in ascii. //$fileName = preg_replace('/[^\w\._]+/', '', $fileName); @@ -823,7 +823,7 @@ class StoredFile { public static function copyFileToStor($p_targetDir, $fileName){ $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName; - + Logging::log('copyFileToStor: moving file '.$audio_file); $md5 = md5_file($audio_file); $duplicate = StoredFile::RecallByMd5($md5); if ($duplicate) { @@ -844,6 +844,7 @@ class StoredFile { $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName; $r = @copy($audio_file, $audio_stor); + //$r = @unlink($audio_file); } public static function getFileCount() diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js index 76bdf532b..3fac56d6a 100644 --- a/airtime_mvc/public/js/airtime/library/plupload.js +++ b/airtime_mvc/public/js/airtime/library/plupload.js @@ -25,7 +25,7 @@ $(document).ready(function() { $("#plupload_error").find("table").append(row); }else{ - $.get('/Plupload/copyfile/format/json/name/'+file.name, function(json){ + $.get('/Plupload/copyfile/format/json/name/'+encodeURIComponent(file.name), function(json){ var jr = jQuery.parseJSON(json); if(jr.error !== undefined) { var row = $("") From cdd1da39636aa254a004c4cb05b7aceb285352d3 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 30 Aug 2011 15:35:03 -0400 Subject: [PATCH 4/8] CC-2740: Upload issue - fixed a bug for uploading a file with "+" signs in IE --- airtime_mvc/application/models/StoredFile.php | 5 +++-- airtime_mvc/public/js/airtime/library/plupload.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index b7bbac9d0..7ff0bb56b 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -728,7 +728,7 @@ class StoredFile { $chunk = isset($_REQUEST["chunk"]) ? $_REQUEST["chunk"] : 0; $chunks = isset($_REQUEST["chunks"]) ? $_REQUEST["chunks"] : 0; $fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : ''; - + Logging::log(__FILE__.':uploadFile(): filename='.$fileName); // Clean the fileName for security reasons //this needs fixing for songs not in ascii. //$fileName = preg_replace('/[^\w\._]+/', '', $fileName); @@ -823,7 +823,7 @@ class StoredFile { public static function copyFileToStor($p_targetDir, $fileName){ $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName; - + Logging::log('copyFileToStor: moving file '.$audio_file); $md5 = md5_file($audio_file); $duplicate = StoredFile::RecallByMd5($md5); if ($duplicate) { @@ -844,6 +844,7 @@ class StoredFile { $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName; $r = @copy($audio_file, $audio_stor); + //$r = @unlink($audio_file); } public static function getFileCount() diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js index 76bdf532b..3fac56d6a 100644 --- a/airtime_mvc/public/js/airtime/library/plupload.js +++ b/airtime_mvc/public/js/airtime/library/plupload.js @@ -25,7 +25,7 @@ $(document).ready(function() { $("#plupload_error").find("table").append(row); }else{ - $.get('/Plupload/copyfile/format/json/name/'+file.name, function(json){ + $.get('/Plupload/copyfile/format/json/name/'+encodeURIComponent(file.name), function(json){ var jr = jQuery.parseJSON(json); if(jr.error !== undefined) { var row = $("") From a5b29e12767bcb123ab0a18a8189ee197fa661df Mon Sep 17 00:00:00 2001 From: James Date: Tue, 30 Aug 2011 16:29:27 -0400 Subject: [PATCH 5/8] CC-2722: Overwrute errir on upgrade from 1.8.2 to 1.9.3 - fixed by removing old files before copy --- install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php index 8243ea31b..86b973570 100644 --- a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php @@ -547,7 +547,8 @@ class Airtime190Upgrade{ public static function InstallAirtimePhpServerCode($phpDir) { - + // delete old files + exec("rm -rf ".$phpDir); $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc'); echo "* Installing PHP code to ".$phpDir.PHP_EOL; From b5645d238aacd5c6a556f2ba6c8fd647f82d7fea Mon Sep 17 00:00:00 2001 From: James Date: Tue, 30 Aug 2011 16:50:46 -0400 Subject: [PATCH 6/8] CC-2746: Edit metadata loses data if required data is missing - fixed --- airtime_mvc/application/controllers/LibraryController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 67efa7638..80a242e57 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -179,9 +179,10 @@ class LibraryController extends Zend_Controller_Action { $request = $this->getRequest(); $form = new Application_Form_EditAudioMD(); - + $file_id = $this->_getParam('id', null); $file = StoredFile::Recall($file_id); + $form->populate($file->getDbColMetadata()); if ($request->isPost()) { if ($form->isValid($request->getPost())) { @@ -197,7 +198,6 @@ class LibraryController extends Zend_Controller_Action } } - $form->populate($file->getDbColMetadata()); $this->view->form = $form; } From 1c624d363a6b5ceaf8fba5666257d898550d507c Mon Sep 17 00:00:00 2001 From: James Date: Wed, 31 Aug 2011 10:09:35 -0400 Subject: [PATCH 7/8] CC-2722: Overwrite error on upgrade from 1.8.2 to 1.9.3 - fix on 2.0.0 upgrade --- install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php index cb3dbb510..2f06e8d51 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -144,6 +144,8 @@ class Airtime200Upgrade{ $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc'); + // delete old files + exec("rm -rf ".$phpDir); echo "* Installing PHP code to ".$phpDir.PHP_EOL; exec("mkdir -p ".$phpDir); exec("cp -R ".$AIRTIME_SRC."/* ".$phpDir); From 982c8f9c2064ab716b6fb79cc74ef876919f8576 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 31 Aug 2011 10:13:57 -0400 Subject: [PATCH 8/8] CC-2746: Removing required attribute from all fields - done --- airtime_mvc/application/forms/EditAudioMD.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php index 5e9b5969b..423ef1025 100644 --- a/airtime_mvc/application/forms/EditAudioMD.php +++ b/airtime_mvc/application/forms/EditAudioMD.php @@ -29,21 +29,15 @@ class Application_Form_EditAudioMD extends Zend_Form // Add title field $this->addElement('text', 'track_title', array( 'label' => 'Title:', - 'required' => true, 'class' => 'input_text', 'filters' => array('StringTrim'), - 'validators' => array( - 'NotEmpty', - ) )); // Add artist field $this->addElement('text', 'artist_name', array( 'label' => 'Artist:', - 'required' => true, 'class' => 'input_text', 'filters' => array('StringTrim'), - 'validators' => array('NotEmpty') )); // Add album field