move building the HTML into a function in utils, KaiRo bug 410 - Add Piwik support...

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

diff --git a/app/authsystem.inc.php b/app/authsystem.inc.php
index 068fb2fadae62ed8fa6fa40b519f634d60a10880..17ff7002557bf2ab0efcbe4b31c6a40cd54f42a5 100644 (file)
--- a/app/authsystem.inc.php
+++ b/app/authsystem.inc.php
@@ -20,9 +20,9 @@ $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-utils/document.php-class');
+require_once('../php-utility-classes/classes/document.php-class');
 // Class for sending emails
-require_once('../kairo-utils/email.php-class');
+require_once('../php-utility-classes/classes/email.php-class');
 // Class for sending emails
 require_once(__DIR__.'/authutils.php-class');
 
@@ -45,6 +45,11 @@ 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/';
+
 /* Creating the DB tables:
 CREATE TABLE `auth_sessions` (
  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT ,