From e796d4c03d18db6569c2b8c64447c00ec6c93dea Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 11:39:42 -0400 Subject: [PATCH 1/5] MM2: equal signs sexified --- airtime_mvc/application/controllers/ApiController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index b3f5bcffc..6d2032693 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -405,9 +405,9 @@ class ApiController extends Zend_Controller_Action public function uploadRecordedAction() { - $show_instance_id = $this->_getParam('showinstanceid'); - $file_id = $this->_getParam('fileid'); - $this->view->fileid = $file_id; + $show_instance_id = $this->_getParam('showinstanceid'); + $file_id = $this->_getParam('fileid'); + $this->view->fileid = $file_id; $this->view->showinstanceid = $show_instance_id; $this->uploadRecordedActionParam($show_instance_id, $file_id); } From ca66073fb59efe8a4f9e5a26f0413512be866a7e Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 12:31:59 -0400 Subject: [PATCH 2/5] did some reformatting. --- .../application/forms/RegisterAirtime.php | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php index a789556fc..9ffd853e1 100644 --- a/airtime_mvc/application/forms/RegisterAirtime.php +++ b/airtime_mvc/application/forms/RegisterAirtime.php @@ -18,8 +18,11 @@ class Application_Form_RegisterAirtime extends Zend_Form } $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/register-dialog.phtml', 'privacyChecked'=>$privacyChecked)), - array('File', array('viewScript' => 'form/register-dialog.phtml', 'placement' => false))) + array('ViewScript', array('viewScript' => + 'form/register-dialog.phtml', 'privacyChecked'=>$privacyChecked)), + + array('File', array('viewScript' => 'form/register-dialog.phtml', + 'placement' => false))) ); // Station Name @@ -36,7 +39,7 @@ class Application_Form_RegisterAirtime extends Zend_Form 'label' => 'Phone:', 'required' => false, 'filters' => array('StringTrim'), - 'value' => Application_Model_Preference::GetPhone(), + 'value' => Application_Model_Preference::GetPhone(), 'decorators' => array( 'ViewHelper' ) @@ -48,7 +51,7 @@ class Application_Form_RegisterAirtime extends Zend_Form 'label' => 'Email:', 'required' => false, 'filters' => array('StringTrim'), - 'value' => Application_Model_Preference::GetEmail(), + 'value' => Application_Model_Preference::GetEmail(), 'decorators' => array( 'ViewHelper' ) @@ -68,10 +71,10 @@ class Application_Form_RegisterAirtime extends Zend_Form // county list dropdown $this->addElement('select', 'Country', array( 'label' => 'Country:', - 'required' => false, + 'required' => false, 'value' => Application_Model_Preference::GetStationCountry(), - 'multiOptions' => $country_list, - 'decorators' => array( + 'multiOptions' => $country_list, + 'decorators' => array( 'ViewHelper' ) )); @@ -128,13 +131,13 @@ class Application_Form_RegisterAirtime extends Zend_Form // text area for sending detail $this->addElement('textarea', 'SendInfo', array( - 'class' => 'sending_textarea', + 'class' => 'sending_textarea', 'required' => false, 'filters' => array('StringTrim'), - 'readonly' => true, - 'rows' => 5, - 'cols' => 61, - 'value' => Application_Model_Preference::GetSystemInfo(false, true), + 'readonly' => true, + 'rows' => 5, + 'cols' => 61, + 'value' => Application_Model_Preference::GetSystemInfo(false, true), 'decorators' => array( 'ViewHelper' ) From 5e180f0ce2b5e025902a0ad2bf46f1c189ac97a3 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 12:57:56 -0400 Subject: [PATCH 3/5] sexified code --- .../application/forms/SmartBlockCriteria.php | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index 55ff54705..4627b7646 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -2,86 +2,86 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm { private $criteriaOptions = array( - 0 => "Select criteria", - "album_title" => "Album", - "bit_rate" => "Bit Rate (Kbps)", - "bpm" => "Bpm", - "comments" => "Comments", - "composer" => "Composer", - "conductor" => "Conductor", - "artist_name" => "Creator", - "disc_number" => "Disc Number", - "genre" => "Genre", - "isrc_number" => "ISRC", - "label" => "Label", - "language" => "Language", - "mtime" => "Last Modified", - "lptime" => "Last Played", - "length" => "Length", - "lyricist" => "Lyricist", - "mood" => "Mood", - "name" => "Name", - "orchestra" => "Orchestra", - "rating" => "Rating", - "sample_rate" => "Sample Rate (kHz)", - "track_title" => "Title", + 0 => "Select criteria", + "album_title" => "Album", + "bit_rate" => "Bit Rate (Kbps)", + "bpm" => "Bpm", + "comments" => "Comments", + "composer" => "Composer", + "conductor" => "Conductor", + "artist_name" => "Creator", + "disc_number" => "Disc Number", + "genre" => "Genre", + "isrc_number" => "ISRC", + "label" => "Label", + "language" => "Language", + "mtime" => "Last Modified", + "lptime" => "Last Played", + "length" => "Length", + "lyricist" => "Lyricist", + "mood" => "Mood", + "name" => "Name", + "orchestra" => "Orchestra", + "rating" => "Rating", + "sample_rate" => "Sample Rate (kHz)", + "track_title" => "Title", "track_number" => "Track Number", - "utime" => "Uploaded", - "year" => "Year" + "utime" => "Uploaded", + "year" => "Year" ); private $criteriaTypes = array( - 0 => "", - "album_title" => "s", - "artist_name" => "s", - "bit_rate" => "n", - "bpm" => "n", - "comments" => "s", - "composer" => "s", - "conductor" => "s", - "utime" => "n", - "mtime" => "n", - "lptime" => "n", - "disc_number" => "n", - "genre" => "s", - "isrc_number" => "s", - "label" => "s", - "language" => "s", - "length" => "n", - "lyricist" => "s", - "mood" => "s", - "name" => "s", - "orchestra" => "s", - "rating" => "n", - "sample_rate" => "n", - "track_title" => "s", + 0 => "", + "album_title" => "s", + "artist_name" => "s", + "bit_rate" => "n", + "bpm" => "n", + "comments" => "s", + "composer" => "s", + "conductor" => "s", + "utime" => "n", + "mtime" => "n", + "lptime" => "n", + "disc_number" => "n", + "genre" => "s", + "isrc_number" => "s", + "label" => "s", + "language" => "s", + "length" => "n", + "lyricist" => "s", + "mood" => "s", + "name" => "s", + "orchestra" => "s", + "rating" => "n", + "sample_rate" => "n", + "track_title" => "s", "track_number" => "n", - "year" => "n" + "year" => "n" ); private $stringCriteriaOptions = array( - "0" => "Select modifier", - "contains" => "contains", + "0" => "Select modifier", + "contains" => "contains", "does not contain" => "does not contain", - "is" => "is", - "is not" => "is not", - "starts with" => "starts with", - "ends with" => "ends with" + "is" => "is", + "is not" => "is not", + "starts with" => "starts with", + "ends with" => "ends with" ); private $numericCriteriaOptions = array( - "0" => "Select modifier", - "is" => "is", - "is not" => "is not", + "0" => "Select modifier", + "is" => "is", + "is not" => "is not", "is greater than" => "is greater than", - "is less than" => "is less than", + "is less than" => "is less than", "is in the range" => "is in the range" ); private $limitOptions = array( - "hours" => "hours", + "hours" => "hours", "minutes" => "minutes", - "items" => "items" + "items" => "items" ); public function init() From f483e271f612bd34e54ea0f02f9a6d7e8bba5f34 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 14:50:10 -0400 Subject: [PATCH 4/5] formatting --- airtime_mvc/application/controllers/LibraryController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 9b7331e10..cba555785 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -271,10 +271,10 @@ class LibraryController extends Zend_Controller_Action $user = Application_Model_User::getCurrentUser(); $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER)); - $files = array(); + $files = array(); $playlists = array(); - $blocks = array(); - $streams = array(); + $blocks = array(); + $streams = array(); $message = null; From 3ca8fe87876ce701b2754bcb05813d7b89f4b90a Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 29 Aug 2012 15:17:14 -0400 Subject: [PATCH 5/5] updated upgrade.sql for owner_id --- install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql index 6d08eec03..1f5cf72de 100644 --- a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql @@ -104,6 +104,7 @@ CREATE TABLE cc_webstream_metadata ( ALTER TABLE cc_files DROP COLUMN gunid, ADD COLUMN replay_gain character varying(16), + ADD COLUMN owner_id integer; ALTER COLUMN bpm TYPE integer using airtime_to_int(bpm) /* TYPE change - table: cc_files original: character varying(8) new: integer */; ALTER TABLE cc_playlistcontents @@ -154,3 +155,9 @@ ALTER TABLE cc_webstream_metadata ADD CONSTRAINT cc_schedule_inst_fkey FOREIGN KEY (instance_id) REFERENCES cc_schedule(id) ON DELETE CASCADE; DROP FUNCTION airtime_to_int(chartoconvert character varying); + +UPDATE cc_files +SET owner_id=(SELECT id FROM cc_subjs WHERE type='A' LIMIT 1) +WHERE owner_id is NULL + +