From ffb7f2ff65e08db5524291a3d6ee026cf4a37494 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Fri, 22 Jun 2012 18:01:00 -0400
Subject: [PATCH 1/2] CC-3933: Replace Airtime version number in source code
 with a hash of the version + uniqueId.

-done
---
 airtime_mvc/application/Bootstrap.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index f2ae6fe86..d7ba2d192 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -23,7 +23,9 @@ date_default_timezone_set('UTC');
 date_default_timezone_set(Application_Model_Preference::GetTimezone());
 
 global $CC_CONFIG;
-$CC_CONFIG['airtime_version'] = Application_Model_Preference::GetAirtimeVersion();
+$airtime_version = Application_Model_Preference::GetAirtimeVersion();
+$uniqueid = Application_Model_Preference::GetUniqueId();
+$CC_CONFIG['airtime_version'] = md5($airtime_version + $uniqueid);
 
 require_once __DIR__."/configs/navigation.php";
 

From 8005049bdcf9201fc47bddc060ffec739508920d Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Mon, 25 Jun 2012 12:22:34 -0400
Subject: [PATCH 2/2] CC-3996: Undefined offset: 0 in StoredFile.php (Apache
 error)

-fixed
---
 airtime_mvc/application/models/StoredFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 4e37a2bad..d69e28e19 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -888,7 +888,7 @@ Logging::log("getting media! - 2");
                 // Check if file is playable
                 $command = sprintf("/usr/bin/airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' 2>&1", $audio_file);
                 exec($command, $output, $rv);
-                if ($rv != 0 || $output[0] == 'TagLib: MPEG::Properties::read() -- Could not find a valid last MPEG frame in the stream.') {
+                if ($rv != 0 || (!empty($output) && $output[0] == 'TagLib: MPEG::Properties::read() -- Could not find a valid last MPEG frame in the stream.')) {
                     $result = array("code" => 110, "message" => "This file appears to be corrupted and will not be added to media library.");
                 }
                 else {