From 691bf315e826b6ffd423e829b419abaab6e5d77e Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 31 Aug 2012 09:29:11 -0400
Subject: [PATCH] Adjusted default authentication configuration to correspond
with class names.
---
config/vufind/config.ini | 4 ++--
module/VuFind/src/VuFind/Config/Upgrade.php | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index 4c99b683475..a33e8a530f2 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -149,12 +149,12 @@ renewals_enabled = false
title_level_holds_mode = "disabled"
; This section allows you to determine how the users will authenticate.
-; You can use an LDAP directory, the local ILS, the VuFind database (DB),
+; You can use an LDAP directory, the local ILS, the VuFind database (Database),
; Shibboleth, SIP2 or some combination of these (via the MultiAuth option).
[Authentication]
;method = LDAP
;method = ILS
-method = DB
+method = Database
;method = Shibboleth
;method = SIP2
;method = MultiAuth
diff --git a/module/VuFind/src/VuFind/Config/Upgrade.php b/module/VuFind/src/VuFind/Config/Upgrade.php
index 68d33a61123..af2abde59d0 100644
--- a/module/VuFind/src/VuFind/Config/Upgrade.php
+++ b/module/VuFind/src/VuFind/Config/Upgrade.php
@@ -374,6 +374,14 @@ class Upgrade
$this->checkTheme('theme', 'blueprint');
$this->checkTheme('mobile_theme', 'jquerymobile');
+ // Translate legacy auth settings:
+ if (strtolower($newConfig['Authentication']['method']) == 'db') {
+ $newConfig['Authentication']['method'] = 'Database';
+ }
+ if (strtolower($newConfig['Authentication']['method']) == 'sip') {
+ $newConfig['Authentication']['method'] = 'SIP2';
+ }
+
// Translate legacy session settings:
$newConfig['Session']['type'] = ucwords(
str_replace('session', '', strtolower($newConfig['Session']['type']))
--
GitLab