Dont try to uninstall if the config file doesnt exist. Also fixed a bug

where it checking a non-existent variable.
This commit is contained in:
Paul Baranowski 2011-04-07 15:47:31 -04:00
parent df70185ae6
commit b489ccc77e
1 changed files with 6 additions and 1 deletions

View File

@ -9,6 +9,11 @@ require_once(dirname(__FILE__).'/include/AirtimeIni.php');
// Need to check that we are superuser before running this.
AirtimeIni::ExitIfNotRoot();
if (!file_exists('/etc/airtime/airtime.conf')) {
echo PHP_EOL."Airtime config file '/etc/airtime/airtime.conf' does not exist.".PHP_EOL;
echo "Most likely this means that Airtime is not installed, so there is nothing to do.".PHP_EOL.PHP_EOL;
exit();
}
require_once(dirname(__FILE__).'/../application/configs/conf.php');
require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
@ -39,7 +44,7 @@ if ($dbDeleteFailed) {
if (!PEAR::isError($CC_DBC)) {
$sql = "select * from pg_tables where tableowner = 'airtime'";
$rows = $CC_DBC->GetAll($sql);
if (PEAR::isError($result)) {
if (PEAR::isError($rows)) {
$rows = array();
}