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

Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1

This commit is contained in:
James 2011-08-23 15:14:17 -04:00
parent 3e3391dfba 87431a24c1
commit 7bb7906ae4
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
install_minimal/include/airtime-db-install.php
View File

@ -49,21 +49,20 @@ AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
if (AirtimeInstall::$databaseTablesCreated) { if (AirtimeInstall::$databaseTablesCreated) {
AirtimeInstall::SetDefaultTimezone();
// set up some keys in DB // set up some keys in DB
AirtimeInstall::SetUniqueId(); AirtimeInstall::SetUniqueId();
AirtimeInstall::SetImportTimestamp(); AirtimeInstall::SetImportTimestamp();
$ini = parse_ini_file(__DIR__."/airtime-install.ini"); $ini = parse_ini_file(__DIR__."/airtime-install.ini");
$stor_dir = realpath($ini["storage_dir"])."/";
echo "* Inserting stor directory location $stor_dir into music_dirs table".PHP_EOL;
$sql = "INSERT INTO cc_music_dirs (directory, type) VALUES ('$stor_dir', 'stor')"; $stor_dir = realpath($ini["storage_dir"])."/";
$result = $CC_DBC->query($sql); echo "* Inserting stor directory location $stor_dir into music_dirs table".PHP_EOL;
if (PEAR::isError($result)) {
echo "* Failed inserting {$stor_dir} in cc_music_dirs".PHP_EOL; $sql = "INSERT INTO cc_music_dirs (directory, type) VALUES ('$stor_dir', 'stor')";
echo "* Message {$result->getMessage()}".PHP_EOL; $result = $CC_DBC->query($sql);
exit(1); if (PEAR::isError($result)) {
} echo "* Failed inserting {$stor_dir} in cc_music_dirs".PHP_EOL;
echo "* Message {$result->getMessage()}".PHP_EOL;
exit(1);
}
} }