From eea89301e07af4772e2e16752e87801e9e348d73 Mon Sep 17 00:00:00 2001
From: Paul Baranowski <paul.baranowski@sourcefabric.org>
Date: Thu, 23 Jun 2011 14:45:56 -0400
Subject: [PATCH] CC-2434: Install script recreates unique ID on every install.
  Moved ID creation into the database install script.

---
 install/include/AirtimeInstall.php     | 15 ++++++++-------
 install/include/airtime-db-install.php |  2 ++
 install/include/airtime-install.php    |  2 --
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php
index 9f2109e9f..a418ef44b 100644
--- a/install/include/AirtimeInstall.php
+++ b/install/include/AirtimeInstall.php
@@ -265,17 +265,18 @@ class AirtimeInstall
         return true;
     }
     
-    public static function SetUniqueId(){
-    	global $CC_DBC;
-    	
-    	$uniqueId = md5(uniqid("", true));
-    	
-    	$sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('uniqueId', '$uniqueId')";
+    public static function SetUniqueId()
+    {
+        global $CC_DBC;
+
+        $uniqueId = md5(uniqid("", true));
+
+        $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('uniqueId', '$uniqueId')";
         $result = $CC_DBC->query($sql);
         if (PEAR::isError($result)) {
             return false;
         }
-        return true;	
+        return true;
     }
 
     public static function GetAirtimeVersion()
diff --git a/install/include/airtime-db-install.php b/install/include/airtime-db-install.php
index d3649d541..1a2208fd5 100644
--- a/install/include/airtime-db-install.php
+++ b/install/include/airtime-db-install.php
@@ -47,6 +47,8 @@ if (isset($argv[1]) && $argv[1] == 'y') {
 echo "* Setting Airtime version".PHP_EOL;
 AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
 
+AirtimeInstall::SetUniqueId();
+
 if (AirtimeInstall::$databaseTablesCreated) {
   echo "* Inserting stor directory into music_dirs table".PHP_EOL;
   $stor_dir = realpath($CC_CONFIG['storageDir']);
diff --git a/install/include/airtime-install.php b/install/include/airtime-install.php
index 400b98f4d..717198a92 100644
--- a/install/include/airtime-install.php
+++ b/install/include/airtime-install.php
@@ -147,8 +147,6 @@ AirtimeInstall::CreateSymlinksToUtils();
 
 AirtimeInstall::CreateZendPhpLogFile();
 
-AirtimeInstall::SetUniqueId();
-
 // Create CRON task to run every day.  Time of day is initialized to a random time.
 $hour = rand(0,23);
 $minute = rand(0,59);