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

Conflicts:
	install/upgrades/airtime-1.9/airtime-upgrade.php
This commit is contained in:
martin 2011-07-13 09:32:18 -04:00
commit ce639785dd
6 changed files with 155 additions and 127 deletions

View file

@ -404,4 +404,14 @@ class AirtimeInstall
exec("rm -rf \"$path\"");
}
public static function CreateCronFile(){
// Create CRON task to run every day. Time of day is initialized to a random time.
$hour = rand(0,23);
$minute = rand(0,59);
$fp = fopen('/etc/cron.d/airtime-crons','w');
fwrite($fp, "$minute $hour * * * root /usr/lib/airtime/utils/phone_home_stat\n");
fclose($fp);
}
}

View file

@ -143,12 +143,6 @@ AirtimeInstall::CreateSymlinksToUtils();
AirtimeInstall::CreateZendPhpLogFile();
// Create CRON task to run every day. Time of day is initialized to a random time.
$hour = rand(0,23);
$minute = rand(0,59);
$fp = fopen('/etc/cron.d/airtime-crons','w');
fwrite($fp, "$minute $hour * * * root /usr/lib/airtime/utils/phone_home_stat\n");
fclose($fp);
AirtimeInstall::CreateCronFile();
/* FINISHED AIRTIME PHP INSTALLER */

View file

@ -152,6 +152,8 @@ if(AirtimeInstall::DbTableExists('doctrine_migration_versions') === false) {
//alter cc_files, add a new column named "directory" of type "int".
AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110629143017');
//create cron file for phone home stat
AirtimeInstall::CreateCronFile();
//old database had a "fullpath" column that stored the absolute path of each track. We have to