View | Details | Raw Unified | Return to bug 5630
Collapse All | Expand All

(-)a/C4/Auth.pm (-3 / +12 lines)
Lines 556-563 sub _version_check ($$) { Link Here
556
    # and so we must redirect to OPAC maintenance page or to the WebInstaller
556
    # and so we must redirect to OPAC maintenance page or to the WebInstaller
557
	# also, if OpacMaintenance is ON, OPAC should redirect to maintenance
557
	# also, if OpacMaintenance is ON, OPAC should redirect to maintenance
558
	if (C4::Context->preference('OpacMaintenance') && $type eq 'opac') {
558
	if (C4::Context->preference('OpacMaintenance') && $type eq 'opac') {
559
        warn "OPAC Install required, redirecting to maintenance";
559
	    warn "OPAC Install required, redirecting to maintenance";
560
        print $query->redirect("/cgi-bin/koha/maintenance.pl");
560
	    print $query->redirect("/cgi-bin/koha/maintenance.pl");
561
        }
562
        unless ($version = C4::Context->preference('Version')) {    #
563
564
          if ($type ne 'opac') {
565
            warn "Install required, redirecting to Installer";
566
            print $query->redirect("/cgi-bin/koha/installer/install.pl");
567
          }
568
          else {
561
      }
569
      }
562
      exit;
570
      exit;
563
    }
571
    }
Lines 1065-1071 sub check_api_auth { Link Here
1065
    unless ($query->param('userid')) {
1073
    unless ($query->param('userid')) {
1066
        $sessionID = $query->cookie("CGISESSID");
1074
        $sessionID = $query->cookie("CGISESSID");
1067
    }
1075
    }
1068
    if ($sessionID && not $cas) {
1076
    if ($sessionID) {
1069
        my $session = get_session($sessionID);
1077
        my $session = get_session($sessionID);
1070
        C4::Context->_new_userenv($sessionID);
1078
        C4::Context->_new_userenv($sessionID);
1071
        if ($session) {
1079
        if ($session) {
Lines 1230-1235 sub check_api_auth { Link Here
1230
            );
1238
            );
1231
            return ("ok", $cookie, $sessionID);
1239
            return ("ok", $cookie, $sessionID);
1232
        } else {
1240
        } else {
1241
1233
            return ("failed", undef, undef);
1242
            return ("failed", undef, undef);
1234
        }
1243
        }
1235
    }
1244
    }
(-)a/C4/Auth_with_cas.pm (-1 / +1 lines)
Lines 26-31 use C4::Utils qw( :all ); Link Here
26
use Authen::CAS::Client;
26
use Authen::CAS::Client;
27
use CGI;
27
use CGI;
28
use FindBin;
28
use FindBin;
29
use YAML;
29
30
30
31
31
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug);
32
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug);
32
- 

Return to bug 5630