dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- new import for static "region"/"constellation" universe data #515

Browse Source 
- refactored DB connection handling
- removed build.js (RequireJs is now handled by Gulp task)
This commit is contained in:
Exodus4D
2017-07-30 15:34:32 +02:00
parent ab35a916a0
commit d00e550972
10 changed files with 245 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/main/db/database.php
View File

@@ -9,6 +9,7 @@
namespace DB;
use Controller;
use controller\LogController;
use lib\Config;
class Database extends \Prefab {
@@ -31,21 +32,9 @@ class Database extends \Prefab {
// check if DB connection already exists
if( !$f3->exists($dbHiveKey, $db) ){
if($database === 'CCP'){
// CCP DB
$dns = Controller\Controller::getEnvironmentData('DB_CCP_DNS');
$name = Controller\Controller::getEnvironmentData('DB_CCP_NAME');
$user = Controller\Controller::getEnvironmentData('DB_CCP_USER');
$password = Controller\Controller::getEnvironmentData('DB_CCP_PASS');
}else{
// Pathfinder(PF) DB
$dns = Controller\Controller::getEnvironmentData('DB_DNS');
$name = Controller\Controller::getEnvironmentData('DB_NAME');
$user = Controller\Controller::getEnvironmentData('DB_USER');
$password = Controller\Controller::getEnvironmentData('DB_PASS');
}
$dbConfig = Config::getDatabaseConfig($database);
$db = $this->connect($dns, $name, $user, $password);
$db = call_user_func_array([$this, 'connect'], $dbConfig);
if( !is_null($db) ){
// set DB timezone to UTC +00:00 (eve server time)