Merge branch 'master' of dev.sourcefabric.org:airtime

Conflicts:
	application/configs/conf.php
	install/airtime-install.php
This commit is contained in:
martin 2011-02-22 16:32:04 -05:00
commit a20e279840
64 changed files with 110 additions and 193 deletions

View file

@ -45,7 +45,7 @@ function checkIfRoot(){
if(exec("whoami") != "root"){
echo "Must be root user.\n";
exit(1);
}
}
}
function updateINIKeyValues($filename, $property, $value){
@ -62,7 +62,7 @@ function updateINIKeyValues($filename, $property, $value){
for($i=0; $i<$n; $i++){
fwrite($fp, $lines[$i]);
}
fclose($fp);
fclose($fp);
}
function directorySetup($CC_CONFIG){
@ -90,7 +90,7 @@ echo " *** Directory Setup ***\n";
//exit(1);
}
$CC_CONFIG[$d] = $rp;
}
}
}
@ -153,4 +153,4 @@ $command = __DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/nul
$command = "python ".__DIR__."/../pypo/install/pypo-install.py";
system($command);
echo "******************************* Install Complete *******************************\n";
?>

View file

@ -227,4 +227,4 @@ airtime_uninstall_delete_files($CC_CONFIG['storageDir']);
$command = "python ".__DIR__."/../pypo/install/pypo-uninstall.py";
system($command);
echo "****************************** Uninstall Complete ******************************\n";
?>

View file

@ -99,4 +99,4 @@ if (PEAR::isError($r)) {
die($r->getMessage());
}
exit(0);
?>

View file

@ -1,4 +1,3 @@
<?php
header ("location: ../");
exit;
?>

View file

@ -84,4 +84,4 @@ function install_setDirPermissions($filePath) {
// }
}
?>

View file

@ -8,12 +8,7 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
exit(1);
}
?>
//------------------------------------------------------------------------
// Install twitter Cron job
//------------------------------------------------------------------------
<?php
require_once(dirname(__FILE__).'/../../../storageServer/var/cron/Cron.php');
$m = '*';
$h ='*';
@ -41,4 +36,4 @@ echo " adding new entry\n";
$cron->ct->addCron($m, $h, $dom, $mon, $dow, $command);
$cron->closeCrontab();
echo "Done.\n";
?>

View file

@ -8,12 +8,7 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
exit(1);
}
?>
//------------------------------------------------------------------------
// Uninstall twitter Cron job
//------------------------------------------------------------------------
<?php
require_once(dirname(__FILE__).'/../../../storageServer/var/cron/Cron.php');
$old_regex = '/ui_twitterCron\.php/';
@ -34,4 +29,3 @@ foreach ($cron->ct->getByType(CRON_CMD) as $id => $line) {
$cron->closeCrontab();
echo "Done.\n";
?>