KaiRo bug 412 - Use composer to load oauth2-server-php and doctrine DBAL

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

diff --git a/app/authsystem.inc.php b/app/authsystem.inc.php
index 17818efe758d995d3eb47660401461f02ec97a02..45d0e0fb64fb78e84594e27c9b3aab7fe5fa620f 100644 (file)
--- a/app/authsystem.inc.php
+++ b/app/authsystem.inc.php
@@ -20,19 +20,42 @@ $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); }
 
 // Extended DOM document class
-require_once('../kairo/include/cbsm/util/document.php-class');
-// Class for sending emails
-require_once('../kairo/include/classes/email.php-class');
+require_once(__DIR__.'/../php-utility-classes/classes/document.php-class');
 // Class for sending emails
+require_once(__DIR__.'/../php-utility-classes/classes/email.php-class');
+// Composer-provided libraries (oauth2-server-php, doctrine DBAL)
+require_once(__DIR__.'/../vendor/autoload.php');
+// Connect to our MySQL DB
+$db = new PDO($dbdata['dsn'], $dbdata['username'], $dbdata['password']);
+// Authentication utilities
 require_once(__DIR__.'/authutils.php-class');
+// Instantiate server utils.
+try {
+  $utils = new AuthUtils($settings, $db);
+}
+catch (Exception $e) {
+  $utils = null;
+}
 
-bindtextdomain('kairo_auth', 'en'); // XXX: Should negotiate locale.
-bind_textdomain_codeset('kairo_auth', 'utf-8');
+// This is an array of locale tags in browser style mapping to unix system locale codes to use with gettext.
+$supported_locales = array(
+    'en-US' => 'en_US',
+    'de' => 'de_DE',
+);
 
-// Connect to our MySQL DB
-$db = new PDO($dbdata['dsn'], $dbdata['username'], $dbdata['password']);
-// Instantiate auth utils.
-$utils = new AuthUtils($settings, $db);
+$textdomain = 'kairo_auth';
+$textlocale = $utils->negotiateLocale(array_keys($supported_locales));
+putenv('LC_ALL='.$supported_locales[$textlocale]);
+$selectedlocale = setlocale(LC_ALL, $supported_locales[$textlocale]);
+bindtextdomain($textdomain, '../locale');
+bind_textdomain_codeset($textdomain, 'utf-8');
+textdomain($textdomain);
+
+// Sanitize settings.
+$settings['piwik_enabled'] = (@$settings['piwik_enabled']) ? true : false;
+$settings['piwik_site_id'] = intval(@$settings['piwik_site_id']);
+$settings['piwik_url'] = strlen(@$settings['piwik_url']) ? $settings['piwik_url'] : '/piwik/';
+$settings['piwik_tracker_path'] = strlen(@$settings['piwik_tracker_path']) ? $settings['piwik_tracker_path'] : '../vendor/piwik/piwik-php-tracker/';
 
 /* Creating the DB tables:
 CREATE TABLE `auth_sessions` (