From bcfc5507c6205292f2a4b60f9294b7f8f6edc6af Mon Sep 17 00:00:00 2001
From: james <james@sourcefabric-DX4840.(none)>
Date: Tue, 21 Jun 2011 10:19:39 -0400
Subject: [PATCH 1/3] CC-1724: Phone home statistics

- Email is not required field in Preference
- removed duplicate line from PreferenceController.php
---
 airtime_mvc/application/controllers/PreferenceController.php | 2 --
 airtime_mvc/application/forms/SupportPreferences.php         | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 702d1cf25..d8661fdb2 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -60,8 +60,6 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetStationDescription($values["preferences_support"]["Description"]);
                 Application_Model_Preference::SetStationLogo($imagePath);
 
-                Application_Model_Preference::SetSoundCloudLicense($values["preferences_soundcloud"]["SoundCloudLicense"]);
-
                 $this->view->statusMsg = "<div class='success'>Preferences updated.</div>";
 
             }
diff --git a/airtime_mvc/application/forms/SupportPreferences.php b/airtime_mvc/application/forms/SupportPreferences.php
index 7f1e5f1b8..5e8480f58 100644
--- a/airtime_mvc/application/forms/SupportPreferences.php
+++ b/airtime_mvc/application/forms/SupportPreferences.php
@@ -28,7 +28,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
         $this->addElement('text', 'Email', array(
             'class'      => 'input_text',
             'label'      => 'Email:',
-            'required'   => true,
+            'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => Application_Model_Preference::GetEmail(),
             'decorators' => array(

From ea78991d578e5981d181f6a78a16a6e70625a290 Mon Sep 17 00:00:00 2001
From: james <james@sourcefabric-DX4840.(none)>
Date: Tue, 21 Jun 2011 10:26:34 -0400
Subject: [PATCH 2/3] - removing one line from PreferenceController.php(the
 function doesn't exist anymore)

---
 airtime_mvc/application/controllers/PreferenceController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index d8661fdb2..245a455f9 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -36,7 +36,6 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetDefaultFade($values["preferences_general"]["stationDefaultFade"]);
                 Application_Model_Preference::SetStreamLabelFormat($values["preferences_general"]["streamFormat"]);
                 Application_Model_Preference::SetAllow3rdPartyApi($values["preferences_general"]["thirdPartyApi"]);
-                Application_Model_Preference::SetWatchedDirectory($values["preferences_general"]["watchedFolder"]);
 
                 Application_Model_Preference::SetDoSoundCloudUpload($values["preferences_soundcloud"]["UseSoundCloud"]);
                 Application_Model_Preference::SetSoundCloudUser($values["preferences_soundcloud"]["SoundCloudUser"]);

From 3dcb10c931b29e9ff06880961f047536f1413805 Mon Sep 17 00:00:00 2001
From: james <james@sourcefabric-DX4840.(none)>
Date: Tue, 21 Jun 2011 11:20:02 -0400
Subject: [PATCH 3/3] - adding link to who's using page( it was remove somehow
 ).

---
 .../application/views/scripts/form/register-dialog.phtml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index dcaf794ad..e4a40cc37 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -20,7 +20,7 @@
 		            <?php endif; ?> 
 		        </dd>
                 <dt class="block-display info-text">
-            		Click the box below to advertise your station on Sourcefabric.org. In order to publicise your station, "Send support feedback" must be enabled
+            		Click the box below to advertise your station on <a id="link_to_whos_using" href="">Sourcefabric.org</a>. In order to publicise your station, "Send support feedback" must be enabled
                 </dt>
 				<dd id="publicize-element" class="block-display">
 					<label class="optional" for="Publicise">