Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
This commit is contained in:
commit
cd6c4f7ede
5 changed files with 27 additions and 23 deletions
|
@ -18,7 +18,7 @@ class UpgradeController extends Zend_Controller_Action
|
|||
}
|
||||
|
||||
//Begin upgrade
|
||||
$filename = "/etc/airtime/airtime.conf";
|
||||
$filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
|
||||
$values = parse_ini_file($filename, true);
|
||||
|
||||
$username = $values['database']['dbuser'];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue