From 3f495e75320a62fc95f3ab9593af09f51fa26d02 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 4 Oct 2011 17:38:21 -0400
Subject: [PATCH] CC-2795: Give option to set download flag of recorded shows
 uploaded to Soundcloud by default

- changed function name
- changed database flag name
---
 airtime_mvc/application/controllers/ApiController.php     | 2 +-
 .../application/controllers/PreferenceController.php      | 2 +-
 airtime_mvc/application/forms/SoundcloudPreferences.php   | 2 +-
 airtime_mvc/application/models/Preference.php             | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index f07281da3..1adc08ae6 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -390,7 +390,7 @@ class ApiController extends Zend_Controller_Action
         $file->setMetadataValue('MDATA_KEY_CREATOR', "Airtime Show Recorder");
         $file->setMetadataValue('MDATA_KEY_TRACKNUMBER', null);
 
-        if (!$showCanceled && Application_Model_Preference::GetDoSoundCloudUpload())
+        if (!$showCanceled && Application_Model_Preference::GetAutoUploadRecordedShowToSoundcloud())
         {
         	for ($i=0; $i<$CC_CONFIG['soundcloud-connection-retries']; $i++) {
 
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 25db6011b..d1d134218 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -36,7 +36,7 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetAllow3rdPartyApi($values["preferences_general"]["thirdPartyApi"]);
                 Application_Model_Preference::SetTimezone($values["preferences_general"]["timezone"]);
 
-                Application_Model_Preference::SetDoSoundCloudUpload($values["preferences_soundcloud"]["UseSoundCloud"]);
+                Application_Model_Preference::SetAutoUploadRecordedShowToSoundcloud($values["preferences_soundcloud"]["UseSoundCloud"]);
                 Application_Model_Preference::SetUploadToSoundcloudOption($values["preferences_soundcloud"]["UploadToSoundcloudOption"]);
                 Application_Model_Preference::SetSoundCloudDownloadbleOption($values["preferences_soundcloud"]["SoundCloudDownloadbleOption"]);
                 Application_Model_Preference::SetSoundCloudUser($values["preferences_soundcloud"]["SoundCloudUser"]);
diff --git a/airtime_mvc/application/forms/SoundcloudPreferences.php b/airtime_mvc/application/forms/SoundcloudPreferences.php
index b9c4c782d..ad85b22b1 100644
--- a/airtime_mvc/application/forms/SoundcloudPreferences.php
+++ b/airtime_mvc/application/forms/SoundcloudPreferences.php
@@ -13,7 +13,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
         $this->addElement('checkbox', 'UseSoundCloud', array(
             'label'      => 'Automatically Upload Recorded Shows',
             'required'   => false,
-            'value' => Application_Model_Preference::GetDoSoundCloudUpload(),
+            'value' => Application_Model_Preference::GetAutoUploadRecordedShowToSoundcloud(),
             'decorators' => array(
                 'ViewHelper'
             )
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index fb361501f..28bceec61 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -118,12 +118,12 @@ class Application_Model_Preference
         return self::getValue("station_name");
     }
 
-    public static function SetDoSoundCloudUpload($upload) {
-        self::SetValue("soundcloud_upload", $upload);
+    public static function SetAutoUploadRecordedShowToSoundcloud($upload) {
+        self::SetValue("soundcloud_auto_upload_recorded_show", $upload);
     }
 
-    public static function GetDoSoundCloudUpload() {
-        return self::GetValue("soundcloud_upload");
+    public static function GetAutoUploadRecordedShowToSoundcloud() {
+        return self::GetValue("soundcloud_auto_upload_recorded_show");
     }
 
     public static function SetSoundCloudUser($user) {