From ceafccd685eec9b099b29db834cd7f4dcaf7a650 Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 18 Nov 2015 12:12:57 -0500 Subject: [PATCH 1/2] Hide podcast from radio page for hobbyist plans --- airtime_mvc/application/models/Preference.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 05bc43f8f..82731f524 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -1573,6 +1573,11 @@ class Application_Model_Preference } public static function getStationPodcastPrivacy() { + if (!Billing::isStationPodcastAllowed()) { + // return private setting + return 1; + } + return self::getValue("station_podcast_privacy"); } From dc6c2893b4f678e40c8dc8b947728d9790f2ba9e Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 18 Nov 2015 12:31:31 -0500 Subject: [PATCH 2/2] Hide Soundcloud options from preferences for hobbyist plans --- .../application/controllers/PreferenceController.php | 6 ++++-- .../application/views/scripts/form/preferences.phtml | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 5ab4c5071..5d00bd1a8 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -66,8 +66,10 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::setTuneinPartnerId($values["tunein_partner_id"]); // SoundCloud Preferences - Application_Model_Preference::setDefaultSoundCloudLicenseType($values["SoundCloudLicense"]); - Application_Model_Preference::setDefaultSoundCloudSharingType($values["SoundCloudSharing"]); + if (Billing::isStationPodcastAllowed()) { + Application_Model_Preference::setDefaultSoundCloudLicenseType($values["SoundCloudLicense"]); + Application_Model_Preference::setDefaultSoundCloudSharingType($values["SoundCloudSharing"]); + } $this->view->statusMsg = "
". _("Preferences updated.")."
"; $form = new Application_Form_Preferences(); diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml index 58fd10ea2..d2fa6494f 100644 --- a/airtime_mvc/application/views/scripts/form/preferences.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences.phtml @@ -8,10 +8,14 @@ element->getSubform('preferences_tunein') ?> +

element->getSubform('preferences_soundcloud') ?> +
+