Moved CAS configuration from config file to sysprefs

diff --git a/C4/Auth.pm b/C4/Auth.pm
index e1d8003..b84e40d 100755 (executable)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -43,7 +43,7 @@ BEGIN {
     @EXPORT_OK = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &get_all_subpermissions &get_user_subpermissions);
     %EXPORT_TAGS = (EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)]);
     $ldap = C4::Context->config('useldapserver') || 0;
-    $cas = C4::Context->config('usecasserver') || 0;
+    $cas = C4::Context->preference('casAuthentication');
     if ($ldap) {
         require C4::Auth_with_ldap;             # no import
         import  C4::Auth_with_ldap qw(checkpw_ldap);

diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm
index 694cbbb..8298dc7 100644 (file)
--- a/C4/Auth_with_cas.pm
+++ b/C4/Auth_with_cas.pm
@@ -37,7 +37,7 @@ BEGIN {
 
 
 my $context = C4::Context->new()       or die 'C4::Context->new failed';
-my $casserver = C4::Context->config("usecasserver") or die 'No "usecasserver" in KOHA_CONF: ' . $ENV{KOHA_CONF};
+my $casserver = C4::Context->preference('casServerUrl');
 
 sub logout_cas {
     my ($query) = @_;