From 96fa5ac7159ced53125df234a9f584be7cb6306c Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Mon, 7 May 2012 12:01:36 -0400
Subject: [PATCH 1/2] SAAS-157: Automated metrics: gather info about soundcloud
 usage

-added soundclound_enabled check
---
 airtime_mvc/application/models/Preference.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 2042d0f16..2265bafd8 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -415,7 +415,11 @@ class Application_Model_Preference
     	$outputArray = array();
 
     	$outputArray['SOUNDCLOUD_ENABLED'] = self::GetUploadToSoundcloudOption();
-    	$outputArray['NUM_SOUNDCLOUD_TRACKS_UPLOADED'] = Application_Model_StoredFile::getSoundCloudUploads();
+        if ($outputArray['SOUNDCLOUD_ENABLED']) {
+    	    $outputArray['NUM_SOUNDCLOUD_TRACKS_UPLOADED'] = Application_Model_StoredFile::getSoundCloudUploads();
+        } else {
+            $outputArray['NUM_SOUNDCLOUD_TRACKS_UPLOADED'] = NULL;
+        }
     	$outputArray['STATION_NAME'] = self::GetStationName();
     	$outputArray['PHONE'] = self::GetPhone();
     	$outputArray['EMAIL'] = self::GetEmail();

From bdf314b93aff0357878938143857981fb8818b92 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Mon, 7 May 2012 12:12:08 -0400
Subject: [PATCH 2/2] SAAS-157: Automated metrics: gather info about soundcloud
 usage

- put DB query inside try-catch
---
 airtime_mvc/application/models/StoredFile.php | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 37839996a..a5580c0db 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -942,15 +942,21 @@ Logging::log("getting media! - 2");
      */
     public static function getSoundCloudUploads()
     {
-    	$con = Propel::getConnection();
+        try {
+    	    $con = Propel::getConnection();
     	
-    	$sql = "SELECT soundcloud_id as id, soundcloud_upload_time"
-                ." FROM CC_FILES"
-                ." WHERE (id != -2 and id != -3) and"
-                ." (soundcloud_upload_time >= (now() - (INTERVAL '1 day')))";
+    	    $sql = "SELECT soundcloud_id as id, soundcloud_upload_time"
+                    ." FROM CC_FILES"
+                    ." WHERE (id != -2 and id != -3) and"
+                    ." (soundcloud_upload_time >= (now() - (INTERVAL '1 day')))";
                 
-        $rows = $con->query($sql)->fetchAll();
-        return count($rows);
+            $rows = $con->query($sql)->fetchAll();
+            return count($rows);
+        } catch (Exception $e) {
+            header('HTTP/1.0 503 Service Unavailable');
+            Logging::log("Could not connect to database.");
+            exit;            
+        }
         
     }