Bugzilla – Attachment 3813 Details for
Bug 5630
CAS improvements
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Compilation errors and syspref edition
0001-bug-5630-Compilation-errors-and-syspref-edition.patch (text/plain), 2.33 KB, created by
Matthias Meusburger
on 2011-04-07 15:18:56 UTC
(
hide
)
Description:
Compilation errors and syspref edition
Filename:
MIME Type:
Creator:
Matthias Meusburger
Created:
2011-04-07 15:18:56 UTC
Size:
2.33 KB
patch
obsolete
>From a5b446eb0b40cf12cebf241f026a696d90c97fc1 Mon Sep 17 00:00:00 2001 >From: Matthias Meusburger <matthias.meusburger@biblibre.com> >Date: Thu, 7 Apr 2011 17:12:28 +0200 >Subject: [PATCH] bug 5630 : Compilation errors and syspref edition > > - This patch fixes compilation errors due to previous patches > - It also fixes syspref edition that was broken when CAS authentication > was enabled. *But* this may break CAS-Proxy authentication. It > needs to be tested. >--- > C4/Auth.pm | 15 ++++++++++++--- > C4/Auth_with_cas.pm | 1 + > 2 files changed, 13 insertions(+), 3 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 0069ab0..5daa37b 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -556,8 +556,16 @@ sub _version_check ($$) { > # and so we must redirect to OPAC maintenance page or to the WebInstaller > # also, if OpacMaintenance is ON, OPAC should redirect to maintenance > if (C4::Context->preference('OpacMaintenance') && $type eq 'opac') { >- warn "OPAC Install required, redirecting to maintenance"; >- print $query->redirect("/cgi-bin/koha/maintenance.pl"); >+ warn "OPAC Install required, redirecting to maintenance"; >+ print $query->redirect("/cgi-bin/koha/maintenance.pl"); >+ } >+ unless ($version = C4::Context->preference('Version')) { # >+ >+ if ($type ne 'opac') { >+ warn "Install required, redirecting to Installer"; >+ print $query->redirect("/cgi-bin/koha/installer/install.pl"); >+ } >+ else { > } > exit; > } >@@ -1065,7 +1073,7 @@ sub check_api_auth { > unless ($query->param('userid')) { > $sessionID = $query->cookie("CGISESSID"); > } >- if ($sessionID && not $cas) { >+ if ($sessionID) { > my $session = get_session($sessionID); > C4::Context->_new_userenv($sessionID); > if ($session) { >@@ -1230,6 +1238,7 @@ sub check_api_auth { > ); > return ("ok", $cookie, $sessionID); > } else { >+ > return ("failed", undef, undef); > } > } >diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm >index b096232..acad80d 100644 >--- a/C4/Auth_with_cas.pm >+++ b/C4/Auth_with_cas.pm >@@ -26,6 +26,7 @@ use C4::Utils qw( :all ); > use Authen::CAS::Client; > use CGI; > use FindBin; >+use YAML; > > > use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug); >-- >1.7.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5630
:
3549
|
3550
|
3551
|
3552
|
3553
|
3813
|
4716
|
5219
|
5297