merge DB config into normal settings - this is another part of bug 415

[authserver.git] / app / authsystem.inc.php

diff --git a/app/authsystem.inc.php b/app/authsystem.inc.php
index 59d65cc4df0f04161fb1d9a3ac31d7ac090273b4..ac5469b416743c35f12dc1a1be66e9d829b5466d 100644 (file)
--- a/app/authsystem.inc.php
+++ b/app/authsystem.inc.php
@@ -13,13 +13,6 @@
 // error reporting (for testing)
 ini_set('display_errors', 1); error_reporting(E_ALL);
 
-// Read DB settings
-$dbdata = json_decode(file_get_contents('/etc/kairo/auth_db.json'), true);
-if (!is_array($dbdata)) { trigger_error('DB configuration not found', E_USER_ERROR); }
-$settings = json_decode(file_get_contents('/etc/kairo/auth_settings.json'), true);
-if (!is_array($settings)) { trigger_error('Auth settings not found', E_USER_ERROR); }
-$settings['dbdata'] = $dbdata;
-
 // Extended DOM document class
 require_once(__DIR__.'/../php-utility-classes/classes/document.php-class');
 // Class for sending emails
@@ -30,11 +23,14 @@ require_once(__DIR__.'/../vendor/autoload.php');
 require_once(__DIR__.'/authutils.php-class');
 // Instantiate server utils.
 try {
-  $utils = new AuthUtils($settings);
+  $utils = new AuthUtils();
   $db = $utils->db;
+  $settings = $utils->settings;
 }
 catch (Exception $e) {
   $utils = null;
+  print('Failed to set up utilities: '.$e->getMessage());
+  exit(1);
 }
 
 $utils->setUpL10n();