Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-2434: Install script recreates unique ID on every install. Moved ID creation into the database install script.

This commit is contained in:
Paul Baranowski 2011-06-23 14:45:56 -04:00
parent e725e4fbe4
commit eea89301e0
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
install/include/AirtimeInstall.php
View File

@ -265,17 +265,18 @@ class AirtimeInstall
return true; return true;
} }
public static function SetUniqueId(){ public static function SetUniqueId()
global $CC_DBC; {
global $CC_DBC;
$uniqueId = md5(uniqid("", true));
$uniqueId = md5(uniqid("", true));
$sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('uniqueId', '$uniqueId')";
$sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('uniqueId', '$uniqueId')";
$result = $CC_DBC->query($sql); $result = $CC_DBC->query($sql);
if (PEAR::isError($result)) { if (PEAR::isError($result)) {
return false; return false;
} }
return true; return true;
} }
public static function GetAirtimeVersion() public static function GetAirtimeVersion()

2
install/include/airtime-db-install.php
View File

@ -47,6 +47,8 @@ if (isset($argv[1]) && $argv[1] == 'y') {
echo "* Setting Airtime version".PHP_EOL; echo "* Setting Airtime version".PHP_EOL;
AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION); AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
AirtimeInstall::SetUniqueId();
if (AirtimeInstall::$databaseTablesCreated) { if (AirtimeInstall::$databaseTablesCreated) {
echo "* Inserting stor directory into music_dirs table".PHP_EOL; echo "* Inserting stor directory into music_dirs table".PHP_EOL;
$stor_dir = realpath($CC_CONFIG['storageDir']); $stor_dir = realpath($CC_CONFIG['storageDir']);

2
install/include/airtime-install.php
View File

@ -147,8 +147,6 @@ AirtimeInstall::CreateSymlinksToUtils();
AirtimeInstall::CreateZendPhpLogFile(); AirtimeInstall::CreateZendPhpLogFile();
AirtimeInstall::SetUniqueId();
// Create CRON task to run every day. Time of day is initialized to a random time. // Create CRON task to run every day. Time of day is initialized to a random time.
$hour = rand(0,23); $hour = rand(0,23);
$minute = rand(0,59); $minute = rand(0,59);