From 03bdc7ca9d77722f0138de59e64f56936495ea4b Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 26 Feb 2009 07:19:00 +0000
Subject: [PATCH] Configuration: replace in-tree uses of copyFromBase and init
with getConfig and setConfigDir.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1329 44740490-163a-0410-bde0-09ae8108e29a
---
bin/memcacheSync.php | 2 +-
lib/SimpleSAML/Auth/Source.php | 3 +--
lib/SimpleSAML/AuthMemCookie.php | 4 +---
lib/SimpleSAML/MetaShare/Store.php | 2 +-
modules/InfoCard/lib/Auth/Source/ICAuth.php | 3 +--
modules/InfoCard/www/getcardform.php | 2 +-
modules/InfoCard/www/login-infocard.php | 2 +-
modules/InfoCard/www/mex.php | 3 +--
modules/InfoCard/www/tokenservice.php | 3 +--
modules/aggregator/www/index.php | 2 +-
modules/casserver/www/login.php | 2 +-
modules/casserver/www/serviceValidate.php | 3 +--
modules/casserver/www/validate.php | 3 +--
modules/certcheck/www/index.php | 4 ++--
modules/consentSimpleAdmin/hooks/hook_sanitycheck.php | 3 +--
modules/consentSimpleAdmin/www/consentAdmin.php | 2 +-
modules/consentSimpleAdmin/www/consentStats.php | 2 +-
modules/cron/hooks/hook_cron.php | 3 +--
modules/cron/www/cron.php | 2 +-
modules/cron/www/croninfo.php | 2 +-
modules/discopower/lib/PowerIdPDisco.php | 2 +-
modules/ldapstatus/www/index.php | 4 ++--
modules/logpeek/www/index.php | 2 +-
modules/metarefresh/bin/metarefresh.php | 2 +-
modules/metarefresh/hooks/hook_cron.php | 2 +-
modules/sanitycheck/hooks/hook_cron.php | 3 +--
modules/sanitycheck/www/index.php | 2 +-
modules/statistics/bin/loganalyzer.php | 2 +-
modules/statistics/hooks/hook_cron.php | 3 +--
modules/statistics/hooks/hook_sanitycheck.php | 3 +--
modules/statistics/lib/Aggregator.php | 4 +---
modules/statistics/www/showstats.php | 2 +-
www/_include.php | 3 +--
www/auth/login-auto.php | 2 +-
www/auth/login-feide.php | 2 +-
www/auth/login-tlsclient.php | 3 +--
www/auth/login.php | 3 +--
www/metashare/add.php | 2 +-
www/metashare/download.php | 2 +-
www/metashare/downloadall.php | 2 +-
www/metashare/index.php | 2 +-
41 files changed, 43 insertions(+), 61 deletions(-)
diff --git a/bin/memcacheSync.php b/bin/memcacheSync.php
index 13a41f99f..26c9cf7cd 100755
--- a/bin/memcacheSync.php
+++ b/bin/memcacheSync.php
@@ -25,7 +25,7 @@ require_once($baseDir . '/lib/_autoload.php');
/* Initialize the configuration. */
$configdir = $baseDir . '/config';
-SimpleSAML_Configuration::init($configdir);
+SimpleSAML_Configuration::setConfigDir($configdir);
/* Things we should warn the user about. */
$warnServerDown = 0;
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index f0a0c948b..95e9b2a13 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -163,8 +163,7 @@ abstract class SimpleSAML_Auth_Source {
assert('is_string($authId)');
/* For now - load and parse config file. */
- $globalConfig = SimpleSAML_Configuration::getInstance();
- $config = $globalConfig->copyFromBase('authsources', 'authsources.php');
+ $config = SimpleSAML_Configuration::getConfig('authsources.php');
$authConfig = $config->getValue($authId, NULL);
if ($authConfig === NULL) {
diff --git a/lib/SimpleSAML/AuthMemCookie.php b/lib/SimpleSAML/AuthMemCookie.php
index b9ec11f8f..771b73740 100644
--- a/lib/SimpleSAML/AuthMemCookie.php
+++ b/lib/SimpleSAML/AuthMemCookie.php
@@ -40,9 +40,7 @@ class SimpleSAML_AuthMemCookie {
*/
private function __construct() {
/* Load Auth MemCookie configuration. */
- $globalConfig = SimpleSAML_Configuration::getInstance();
- SimpleSAML_Configuration::init($GLOBALS['configdir'], 'authmemcookie', 'authmemcookie.php');
- $this->amcConfig = SimpleSAML_Configuration::getInstance('authmemcookie');
+ $this->amcConfig = SimpleSAML_Configuration::getConfig('authmemcookie.php');
}
diff --git a/lib/SimpleSAML/MetaShare/Store.php b/lib/SimpleSAML/MetaShare/Store.php
index 7e476b177..69ee45f5c 100644
--- a/lib/SimpleSAML/MetaShare/Store.php
+++ b/lib/SimpleSAML/MetaShare/Store.php
@@ -27,7 +27,7 @@ class SimpleSAML_MetaShare_Store {
* singleton accessor.
*/
private function __construct() {
- $metaConfig = SimpleSAML_Configuration::getInstance()->copyFromBase('metashare', 'metashare.php');
+ $metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
$this->metadataPath = $metaConfig->getString('metashare.path');
$this->metadataPath = SimpleSAML_Utilities::resolvePath($this->metadataPath);
diff --git a/modules/InfoCard/lib/Auth/Source/ICAuth.php b/modules/InfoCard/lib/Auth/Source/ICAuth.php
index 47d85f86c..94850fda3 100644
--- a/modules/InfoCard/lib/Auth/Source/ICAuth.php
+++ b/modules/InfoCard/lib/Auth/Source/ICAuth.php
@@ -45,8 +45,7 @@ class sspmod_InfoCard_Auth_Source_ICAuth extends SimpleSAML_Auth_Source {
SimpleSAML_Logger::debug('ENTRA en icauth');
assert('is_string($authStateId)');
- $config = SimpleSAML_Configuration::getInstance();
- $autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
+ $autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$idp_key = $autoconfig->getValue('idp_key');
$sts_crt = $autoconfig->getValue('sts_crt');
$Infocard = $autoconfig->getValue('InfoCard');
diff --git a/modules/InfoCard/www/getcardform.php b/modules/InfoCard/www/getcardform.php
index 992af0f57..27d7d85ec 100644
--- a/modules/InfoCard/www/getcardform.php
+++ b/modules/InfoCard/www/getcardform.php
@@ -13,7 +13,7 @@
/* Load the configuration. */
$config = SimpleSAML_Configuration::getInstance();
-$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
+$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$Infocard = $autoconfig->getValue('InfoCard');
diff --git a/modules/InfoCard/www/login-infocard.php b/modules/InfoCard/www/login-infocard.php
index af12e8f85..77c13e38b 100644
--- a/modules/InfoCard/www/login-infocard.php
+++ b/modules/InfoCard/www/login-infocard.php
@@ -13,7 +13,7 @@
/* Load the configuration. */
$config = SimpleSAML_Configuration::getInstance();
-$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
+$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$server_key = $autoconfig->getValue('server_key');
$server_crt = $autoconfig->getValue('server_crt');
diff --git a/modules/InfoCard/www/mex.php b/modules/InfoCard/www/mex.php
index 43c6554c6..8fd9d0304 100644
--- a/modules/InfoCard/www/mex.php
+++ b/modules/InfoCard/www/mex.php
@@ -19,8 +19,7 @@ if ($method == "POST"){
}
-$config = SimpleSAML_Configuration::getInstance();
-$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
+$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$ICconfig['tokenserviceurl'] = $autoconfig->getValue('tokenserviceurl');
$ICconfig['certificates'] = $autoconfig->getValue('certificates');
$ICconfig['UserCredential'] = $autoconfig->getValue('UserCredential');
diff --git a/modules/InfoCard/www/tokenservice.php b/modules/InfoCard/www/tokenservice.php
index 3c076dfaf..62cc37bc5 100644
--- a/modules/InfoCard/www/tokenservice.php
+++ b/modules/InfoCard/www/tokenservice.php
@@ -45,7 +45,6 @@ function decryptMcrypt($data,$key) {
Header('Content-Type: application/soap+xml;charset=utf-8');
-$config = SimpleSAML_Configuration::getInstance();
SimpleSAML_Logger::debug('Tokenservice');
$token = new DOMDocument();
@@ -57,7 +56,7 @@ $cardId = $doc->getElementsByTagname('CardId')->item(0)->nodeValue;
$authenticated = false;
-$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
+$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$ICconfig['UserCredential'] = $autoconfig->getValue('UserCredential');
$debugDir = $autoconfig->getValue('debugDir');
diff --git a/modules/aggregator/www/index.php b/modules/aggregator/www/index.php
index 5cf8b605c..0b0dd375e 100644
--- a/modules/aggregator/www/index.php
+++ b/modules/aggregator/www/index.php
@@ -9,7 +9,7 @@ $metadataSets = array(
);
$globalConfig = SimpleSAML_Configuration::getInstance();
-$aggregatorConfig = $globalConfig->copyFromBase('aggregator', 'aggregator.php');
+$aggregatorConfig = SimpleSAML_Configuration::getConfig('aggregator.php');
$aggregators = $aggregatorConfig->getArray('aggragators');
diff --git a/modules/casserver/www/login.php b/modules/casserver/www/login.php
index a953bd663..cfe3a714c 100644
--- a/modules/casserver/www/login.php
+++ b/modules/casserver/www/login.php
@@ -31,7 +31,7 @@ if (array_key_exists('gateway', $_GET)) {
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
-$casconfig = $config->copyFromBase('casconfig', 'module_casserver.php');
+$casconfig = SimpleSAML_Configuration::getConfig('module_casserver.php');
$session = SimpleSAML_Session::getInstance();
diff --git a/modules/casserver/www/serviceValidate.php b/modules/casserver/www/serviceValidate.php
index 7b78932b4..ab1073954 100644
--- a/modules/casserver/www/serviceValidate.php
+++ b/modules/casserver/www/serviceValidate.php
@@ -29,8 +29,7 @@ if (array_key_exists('renew', $_GET)) {
try {
/* Load simpleSAMLphp, configuration and metadata */
- $config = SimpleSAML_Configuration::getInstance();
- $casconfig = $config->copyFromBase('casconfig', 'module_casserver.php');
+ $casconfig = SimpleSAML_Configuration::getConfig('module_casserver.php');
$path = $casconfig->resolvePath($casconfig->getValue('ticketcache', 'ticketcache'));
diff --git a/modules/casserver/www/validate.php b/modules/casserver/www/validate.php
index 4a2b32639..9d01c5a84 100644
--- a/modules/casserver/www/validate.php
+++ b/modules/casserver/www/validate.php
@@ -29,8 +29,7 @@ if (array_key_exists('renew', $_GET)) {
try {
/* Load simpleSAMLphp, configuration and metadata */
- $config = SimpleSAML_Configuration::getInstance();
- $casconfig = $config->copyFromBase('casconfig', 'module_casserver.php');
+ $casconfig = SimpleSAML_Configuration::getConfig('module_casserver.php');
$path = $casconfig->resolvePath($casconfig->getValue('ticketcache', 'ticketcache'));
diff --git a/modules/certcheck/www/index.php b/modules/certcheck/www/index.php
index 329bf9525..4168aa1b6 100644
--- a/modules/certcheck/www/index.php
+++ b/modules/certcheck/www/index.php
@@ -24,8 +24,8 @@ function phpping($host, $port) {
}
-$ldapconfig = $config->copyFromBase('loginfeide', 'config-login-feide.php');
-$ldapStatusConfig = $config->copyFromBase('ldapstatus', 'module_ldapstatus.php');
+$ldapconfig = SimpleSAML_Configuration::getConfig('config-login-feide.php');
+$ldapStatusConfig = SimpleSAML_Configuration::getConfig('module_ldapstatus.php');
$pingcommand = $ldapStatusConfig->getValue('ping');
diff --git a/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php b/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
index 9c207dc3a..117d60229 100644
--- a/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
+++ b/modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
@@ -9,8 +9,7 @@ function consentSimpleAdmin_hook_sanitycheck(&$hookinfo) {
assert('array_key_exists("info", $hookinfo)');
try {
- $config = SimpleSAML_Configuration::getInstance();
- $consentconfig = $config->copyFromBase('consentSimpleAdminConfig', 'module_consentSimpleAdmin.php');
+ $consentconfig = SimpleSAML_Configuration::getConfig('module_consentSimpleAdmin.php');
// Parse consent config
$consent_storage = sspmod_consent_Store::parseStoreConfig($consentconfig->getValue('store'));
diff --git a/modules/consentSimpleAdmin/www/consentAdmin.php b/modules/consentSimpleAdmin/www/consentAdmin.php
index 17c05c71c..fba1e12a6 100644
--- a/modules/consentSimpleAdmin/www/consentAdmin.php
+++ b/modules/consentSimpleAdmin/www/consentAdmin.php
@@ -14,7 +14,7 @@
// Get config object
$config = SimpleSAML_Configuration::getInstance();
-$consentconfig = $config->copyFromBase('consentSimpleAdminConfig', 'module_consentSimpleAdmin.php');
+$consentconfig = SimpleSAML_Configuration::getConfig('module_consentSimpleAdmin.php');
// Get session object
$session = SimpleSAML_Session::getInstance();
diff --git a/modules/consentSimpleAdmin/www/consentStats.php b/modules/consentSimpleAdmin/www/consentStats.php
index 433f4434d..f27aee0d5 100644
--- a/modules/consentSimpleAdmin/www/consentStats.php
+++ b/modules/consentSimpleAdmin/www/consentStats.php
@@ -12,7 +12,7 @@
// Get config object
$config = SimpleSAML_Configuration::getInstance();
-$consentconfig = $config->copyFromBase('consentSimpleAdminConfig', 'module_consentSimpleAdmin.php');
+$consentconfig = SimpleSAML_Configuration::getConfig('module_consentSimpleAdmin.php');
// Parse consent config
diff --git a/modules/cron/hooks/hook_cron.php b/modules/cron/hooks/hook_cron.php
index 6113523d3..27488d023 100644
--- a/modules/cron/hooks/hook_cron.php
+++ b/modules/cron/hooks/hook_cron.php
@@ -9,8 +9,7 @@ function cron_hook_cron(&$croninfo) {
assert('array_key_exists("summary", $croninfo)');
assert('array_key_exists("tag", $croninfo)');
- $config = SimpleSAML_Configuration::getInstance();
- $cronconfig = $config->copyFromBase('cron', 'module_cron.php');
+ $cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
if ($cronconfig->getValue('debug_message', TRUE)) {
diff --git a/modules/cron/www/cron.php b/modules/cron/www/cron.php
index 2f973fbe6..38076c58e 100644
--- a/modules/cron/www/cron.php
+++ b/modules/cron/www/cron.php
@@ -1,7 +1,7 @@
<?php
$config = SimpleSAML_Configuration::getInstance();
-$cronconfig = $config->copyFromBase('cron', 'module_cron.php');
+$cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
if (!is_null($cronconfig->getValue('key'))) {
if ($_REQUEST['key'] !== $cronconfig->getValue('key')) {
diff --git a/modules/cron/www/croninfo.php b/modules/cron/www/croninfo.php
index 54122dc95..12e066792 100644
--- a/modules/cron/www/croninfo.php
+++ b/modules/cron/www/croninfo.php
@@ -17,7 +17,7 @@ if (!isset($session) || !$session->isValid('login-admin') ) {
);
}
-$cronconfig = $config->copyFromBase('cron', 'module_cron.php');
+$cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
$key = $cronconfig->getValue('key', '');
$tags = $cronconfig->getValue('allowed_tags');
diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index 54875c2f9..ceb465c48 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -27,7 +27,7 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco {
parent::__construct($discoType);
- $this->discoconfig = $this->config->copyFromBase('discopower', 'module_discopower.php');
+ $this->discoconfig = SimpleSAML_Configuration::getConfig('module_discopower.php');
}
diff --git a/modules/ldapstatus/www/index.php b/modules/ldapstatus/www/index.php
index c6df46b84..0e178cfe1 100644
--- a/modules/ldapstatus/www/index.php
+++ b/modules/ldapstatus/www/index.php
@@ -81,8 +81,8 @@ function myErrorHandler($errno, $errstr, $errfile, $errline) {
-$ldapconfig = $config->copyFromBase('loginfeide', 'config-login-feide.php');
-$ldapStatusConfig = $config->copyFromBase('ldapstatus', 'module_ldapstatus.php');
+$ldapconfig = SimpleSAML_Configuration::getConfig('config-login-feide.php');
+$ldapStatusConfig = SimpleSAML_Configuration::getConfig('module_ldapstatus.php');
$debug = $ldapconfig->getValue('ldapDebug', FALSE);
$orgs = $ldapconfig->getValue('orgldapconfig');
diff --git a/modules/logpeek/www/index.php b/modules/logpeek/www/index.php
index d1bd15adb..691ff1628 100644
--- a/modules/logpeek/www/index.php
+++ b/modules/logpeek/www/index.php
@@ -11,7 +11,7 @@ if (!$session->isValid('login-admin') ) {
}
-$logpeekconfig = $config->copyFromBase('logpeek', 'module_logpeek.php');
+$logpeekconfig = SimpleSAML_Configuration::getConfig('module_logpeek.php');
$logfile = $logpeekconfig->getValue('logfile', '/var/simplesamlphp.log');
diff --git a/modules/metarefresh/bin/metarefresh.php b/modules/metarefresh/bin/metarefresh.php
index 115be45a2..49bc64803 100755
--- a/modules/metarefresh/bin/metarefresh.php
+++ b/modules/metarefresh/bin/metarefresh.php
@@ -14,7 +14,7 @@ $baseDir = dirname(dirname(dirname(dirname(__FILE__))));
require_once($baseDir . '/lib/_autoload.php');
/* Initialize the configuration. */
-SimpleSAML_Configuration::init($baseDir . '/config');
+SimpleSAML_Configuration::setConfigDir($baseDir . '/config');
/* $outputDir contains the directory we will store the generated metadata in. */
$outputDir = $baseDir . '/metadata-generated';
diff --git a/modules/metarefresh/hooks/hook_cron.php b/modules/metarefresh/hooks/hook_cron.php
index a80a5551e..d0a5ac514 100644
--- a/modules/metarefresh/hooks/hook_cron.php
+++ b/modules/metarefresh/hooks/hook_cron.php
@@ -13,7 +13,7 @@ function metarefresh_hook_cron(&$croninfo) {
try {
$config = SimpleSAML_Configuration::getInstance();
- $mconfig = $config->copyFromBase('mconfig', 'config-metarefresh.php');
+ $mconfig = SimpleSAML_Configuration::getConfig('config-metarefresh.php');
$sets = $mconfig->getValue('sets');
if (count($sets) < 1) return;
diff --git a/modules/sanitycheck/hooks/hook_cron.php b/modules/sanitycheck/hooks/hook_cron.php
index 74c6f221b..68ee1b20e 100644
--- a/modules/sanitycheck/hooks/hook_cron.php
+++ b/modules/sanitycheck/hooks/hook_cron.php
@@ -13,8 +13,7 @@ function sanitycheck_hook_cron(&$croninfo) {
try {
- $config = SimpleSAML_Configuration::getInstance();
- $sconfig = $config->copyFromBase('sconfig', 'config-sanitycheck.php');
+ $sconfig = SimpleSAML_Configuration::getConfig('config-sanitycheck.php');
if (is_null($sconfig->getValue('cron_tag', NULL))) return;
if ($sconfig->getValue('cron_tag', NULL) !== $croninfo['tag']) return;
diff --git a/modules/sanitycheck/www/index.php b/modules/sanitycheck/www/index.php
index b177bae6e..3446187d4 100644
--- a/modules/sanitycheck/www/index.php
+++ b/modules/sanitycheck/www/index.php
@@ -2,7 +2,7 @@
$config = SimpleSAML_Configuration::getInstance();
-$sconfig = $config->copyFromBase('sconfig', 'config-sanitycheck.php');
+$sconfig = SimpleSAML_Configuration::getConfig('config-sanitycheck.php');
$info = array();
$errors = array();
diff --git a/modules/statistics/bin/loganalyzer.php b/modules/statistics/bin/loganalyzer.php
index fb64f3531..a34f08bd6 100755
--- a/modules/statistics/bin/loganalyzer.php
+++ b/modules/statistics/bin/loganalyzer.php
@@ -9,7 +9,7 @@ $baseDir = dirname(dirname(dirname(dirname(__FILE__))));
require_once($baseDir . '/lib/_autoload.php');
/* Initialize the configuration. */
-SimpleSAML_Configuration::init($baseDir . '/config');
+SimpleSAML_Configuration::setConfigDir($baseDir . '/config');
diff --git a/modules/statistics/hooks/hook_cron.php b/modules/statistics/hooks/hook_cron.php
index 87d599078..1847682d6 100644
--- a/modules/statistics/hooks/hook_cron.php
+++ b/modules/statistics/hooks/hook_cron.php
@@ -9,8 +9,7 @@ function statistics_hook_cron(&$croninfo) {
assert('array_key_exists("summary", $croninfo)');
assert('array_key_exists("tag", $croninfo)');
- $config = SimpleSAML_Configuration::getInstance();
- $statconfig = $config->copyFromBase('statconfig', 'module_statistics.php');
+ $statconfig = SimpleSAML_Configuration::getConfig('module_statistics.php');
if (is_null($statconfig->getValue('cron_tag', NULL))) return;
if ($statconfig->getValue('cron_tag', NULL) !== $croninfo['tag']) return;
diff --git a/modules/statistics/hooks/hook_sanitycheck.php b/modules/statistics/hooks/hook_sanitycheck.php
index 822561a82..ab10ea381 100644
--- a/modules/statistics/hooks/hook_sanitycheck.php
+++ b/modules/statistics/hooks/hook_sanitycheck.php
@@ -10,8 +10,7 @@ function statistics_hook_sanitycheck(&$hookinfo) {
assert('array_key_exists("info", $hookinfo)');
try {
- $config = SimpleSAML_Configuration::getInstance();
- $statconfig = $config->copyFromBase('statconfig', 'module_statistics.php');
+ $statconfig = SimpleSAML_Configuration::getConfig('module_statistics.php');
} catch(Exception $e) {
$hookinfo['errors'][] = '[statistics] Could not get configuration: ' . $e->getMessage(); return;
}
diff --git a/modules/statistics/lib/Aggregator.php b/modules/statistics/lib/Aggregator.php
index 6a75354e0..4ba6e362e 100644
--- a/modules/statistics/lib/Aggregator.php
+++ b/modules/statistics/lib/Aggregator.php
@@ -6,7 +6,6 @@
*/
class sspmod_statistics_Aggregator {
- private $config;
private $statconfig;
private $statdir;
private $inputfile;
@@ -18,8 +17,7 @@ class sspmod_statistics_Aggregator {
*/
public function __construct() {
- $this->config = SimpleSAML_Configuration::getInstance();
- $this->statconfig = $this->config->copyFromBase('statconfig', 'module_statistics.php');
+ $this->statconfig = SimpleSAML_Configuration::getConfig('module_statistics.php');
$this->statdir = $this->statconfig->getValue('statdir');
$this->inputfile = $this->statconfig->getValue('inputfile');
diff --git a/modules/statistics/www/showstats.php b/modules/statistics/www/showstats.php
index 9ca6399f7..c41de5dad 100644
--- a/modules/statistics/www/showstats.php
+++ b/modules/statistics/www/showstats.php
@@ -1,7 +1,7 @@
<?php
$config = SimpleSAML_Configuration::getInstance();
-$statconfig = $config->copyFromBase('statconfig', 'module_statistics.php');
+$statconfig = SimpleSAML_Configuration::getConfig('module_statistics.php');
$statdir = $statconfig->getValue('statdir');
$inputfile = $statconfig->getValue('inputfile');
diff --git a/www/_include.php b/www/_include.php
index 4afefbbed..a3d64029e 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -62,8 +62,7 @@ if (!file_exists($configdir . '/config.php')) {
exit(1);
}
-SimpleSAML_Configuration::init($configdir);
-SimpleSAML_Configuration::setConfigDir($configdir, 'simplesaml');
+SimpleSAML_Configuration::setConfigDir($configdir);
diff --git a/www/auth/login-auto.php b/www/auth/login-auto.php
index 859597e9c..e947506ec 100644
--- a/www/auth/login-auto.php
+++ b/www/auth/login-auto.php
@@ -21,7 +21,7 @@ require_once('../../www/_include.php');
/* Load the configuration. */
$config = SimpleSAML_Configuration::getInstance();
-$autoconfig = $config->copyFromBase('loginauto', 'config-login-auto.php');
+$autoconfig = SimpleSAML_Configuration::getConfig('config-login-auto.php');
$enable = (bool)$autoconfig->getValue('auth.auto.enable');
diff --git a/www/auth/login-feide.php b/www/auth/login-feide.php
index efec4e21a..38365766b 100644
--- a/www/auth/login-feide.php
+++ b/www/auth/login-feide.php
@@ -21,7 +21,7 @@
require_once('../../www/_include.php');
$config = SimpleSAML_Configuration::getInstance();
-$ldapconfig = $config->copyFromBase('loginfeide', 'config-login-feide.php');
+$ldapconfig = SimpleSAML_Configuration::getConfig('config-login-feide.php');
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
$session = SimpleSAML_Session::getInstance();
diff --git a/www/auth/login-tlsclient.php b/www/auth/login-tlsclient.php
index 8fd3f534c..9570945cb 100644
--- a/www/auth/login-tlsclient.php
+++ b/www/auth/login-tlsclient.php
@@ -9,8 +9,7 @@ $session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('AUTH - ldap: Accessing auth endpoint login');
-SimpleSAML_Configuration::init($configdir, 'ldapconfig', 'ldap.php');
-$ldapconfig = SimpleSAML_Configuration::getInstance('ldapconfig');
+$ldapconfig = SimpleSAML_Configuration::getConfig('ldap.php');
$error = null;
diff --git a/www/auth/login.php b/www/auth/login.php
index 289de7467..e92564b0d 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -9,8 +9,7 @@ $session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('AUTH - ldap: Accessing auth endpoint login');
-SimpleSAML_Configuration::init($configdir, 'ldapconfig', 'ldap.php');
-$ldapconfig = SimpleSAML_Configuration::getInstance('ldapconfig');
+$ldapconfig = SimpleSAML_Configuration::getConfig('ldap.php');
$error = null;
diff --git a/www/metashare/add.php b/www/metashare/add.php
index 138d07b5b..bd42b2cf2 100644
--- a/www/metashare/add.php
+++ b/www/metashare/add.php
@@ -7,7 +7,7 @@ require_once('../_include.php');
*/
$config = SimpleSAML_Configuration::getInstance();
-$metaConfig = $config->copyFromBase('metashare', 'metashare.php');
+$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
if(!$metaConfig->getBoolean('metashare.enable', FALSE)) {
header('HTTP/1.0 401 Forbidden');
diff --git a/www/metashare/download.php b/www/metashare/download.php
index 5b50e1abe..b509caee8 100644
--- a/www/metashare/download.php
+++ b/www/metashare/download.php
@@ -6,7 +6,7 @@ require_once('../_include.php');
* This page handles downloading of single metadata entries from the MetaShare.
*/
-$metaConfig = SimpleSAML_Configuration::getInstance()->copyFromBase('metashare', 'metashare.php');
+$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
if(!$metaConfig->getBoolean('metashare.enable', FALSE)) {
header('HTTP/1.0 401 Forbidden');
diff --git a/www/metashare/downloadall.php b/www/metashare/downloadall.php
index 8eb5815f4..c4a4a1421 100644
--- a/www/metashare/downloadall.php
+++ b/www/metashare/downloadall.php
@@ -6,7 +6,7 @@ require_once('../_include.php');
* This page handles downloading of all metadata entries from the MetaShare.
*/
-$metaConfig = SimpleSAML_Configuration::getInstance()->copyFromBase('metashare', 'metashare.php');
+$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
if(!$metaConfig->getBoolean('metashare.enable', FALSE)) {
header('HTTP/1.0 401 Forbidden');
diff --git a/www/metashare/index.php b/www/metashare/index.php
index 920ecc873..759194c86 100644
--- a/www/metashare/index.php
+++ b/www/metashare/index.php
@@ -7,7 +7,7 @@ require_once('../_include.php');
*/
$config = SimpleSAML_Configuration::getInstance();
-$metaConfig = $config->copyFromBase('metashare', 'metashare.php');
+$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
if(!$metaConfig->getBoolean('metashare.enable', FALSE)) {
header('HTTP/1.0 401 Forbidden');
--
GitLab