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

Fixed hardcoded database name in AirtimeInstall.php

Browse source
This commit is contained in:
Albert Santoni 2014-01-23 13:10:13 -05:00
parent 5d2aae4525
commit 25be2fc3ff
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
install_minimal/include/AirtimeInstall.php
View file

@ -117,7 +117,8 @@ class AirtimeInstall
{ {
AirtimeInstall::InstallQuery("DROP SEQUENCE IF EXISTS $p_sequenceName", false); AirtimeInstall::InstallQuery("DROP SEQUENCE IF EXISTS $p_sequenceName", false);
} }
/** /**
* Try to connect to the database. Return true on success, false on failure. * Try to connect to the database. Return true on success, false on failure.
* @param boolean $p_exitOnError * @param boolean $p_exitOnError
@ -215,12 +216,14 @@ class AirtimeInstall
$database = $CC_CONFIG['dsn']['database']; $database = $CC_CONFIG['dsn']['database'];
$username = $CC_CONFIG['dsn']['username']; $username = $CC_CONFIG['dsn']['username'];
#$command = "echo \"CREATE DATABASE $database OWNER $username\" | su postgres -c psql 2>/dev/null"; #$command = "echo \"CREATE DATABASE $database OWNER $username\" | su postgres -c psql 2>/dev/null";
$command = "su postgres -c \"psql -l | cut -f2 -d' ' | grep -w 'airtime'\";"; echo $database . PHP_EOL;
$command = "su postgres -c \"psql -l | cut -f2 -d' ' | grep -w '{$database}'\";";
exec($command, $output, $rv); exec($command, $output, $rv);
if ($rv == 0) { if ($rv == 0) {
//database already exists //database already exists
echo "Database already exists." . PHP_EOL;
return true; return true;
} }