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

(-)a/C4/Auth.pm (-2 / +2 lines)
Lines 723-729 sub checkauth { Link Here
723
                $session->param('surname'),      $session->param('branch'),
723
                $session->param('surname'),      $session->param('branch'),
724
                $session->param('branchname'),   $session->param('flags'),
724
                $session->param('branchname'),   $session->param('flags'),
725
                $session->param('emailaddress'), $session->param('branchprinter'),
725
                $session->param('emailaddress'), $session->param('branchprinter'),
726
                $session->param('persona')
726
                $session->param('persona'),      $session->param('shibboleth')
727
            );
727
            );
728
            C4::Context::set_shelves_userenv('bar',$session->param('barshelves'));
728
            C4::Context::set_shelves_userenv('bar',$session->param('barshelves'));
729
            C4::Context::set_shelves_userenv('pub',$session->param('pubshelves'));
729
            C4::Context::set_shelves_userenv('pub',$session->param('pubshelves'));
Lines 735-741 sub checkauth { Link Here
735
            $sessiontype = $session->param('sessiontype') || '';
735
            $sessiontype = $session->param('sessiontype') || '';
736
        }
736
        }
737
        if ( ( $query->param('koha_login_context') && ($q_userid ne $s_userid) )
737
        if ( ( $query->param('koha_login_context') && ($q_userid ne $s_userid) )
738
          || ( $cas && $query->param('ticket') ) ) {
738
          || ( $cas && $query->param('ticket') ) || ( $shib && $shib_login && !$logout ) ) {
739
            #if a user enters an id ne to the id in the current session, we need to log them in...
739
            #if a user enters an id ne to the id in the current session, we need to log them in...
740
            #first we need to clear the anonymous session...
740
            #first we need to clear the anonymous session...
741
            $debug and warn "query id = $q_userid but session id = $s_userid";
741
            $debug and warn "query id = $q_userid but session id = $s_userid";
(-)a/C4/Context.pm (-3 / +2 lines)
Lines 1112-1118 set_userenv is called in Auth.pm Link Here
1112
1112
1113
#'
1113
#'
1114
sub set_userenv {
1114
sub set_userenv {
1115
    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $persona)= @_;
1115
    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $persona, $shibboleth)= @_;
1116
    my $var=$context->{"activeuser"} || '';
1116
    my $var=$context->{"activeuser"} || '';
1117
    my $cell = {
1117
    my $cell = {
1118
        "number"     => $usernum,
1118
        "number"     => $usernum,
Lines 1127-1132 sub set_userenv { Link Here
1127
        "emailaddress"     => $emailaddress,
1127
        "emailaddress"     => $emailaddress,
1128
        "branchprinter"    => $branchprinter,
1128
        "branchprinter"    => $branchprinter,
1129
        "persona"    => $persona,
1129
        "persona"    => $persona,
1130
        "shibboleth" => $shibboleth,
1130
    };
1131
    };
1131
    $context->{userenv}->{$var} = $cell;
1132
    $context->{userenv}->{$var} = $cell;
1132
    return $cell;
1133
    return $cell;
Lines 1300-1303 Andrew Arensburger <arensb at ooblick dot com> Link Here
1300
1301
1301
Joshua Ferraro <jmf at liblime dot com>
1302
Joshua Ferraro <jmf at liblime dot com>
1302
1303
1303
=cut
1304
- 

Return to bug 8446