Lines 800-808
sub checkauth {
Link Here
|
800 |
} |
800 |
} |
801 |
|
801 |
|
802 |
# If we are in a shibboleth session (shibboleth is enabled, a shibboleth match attribute is set and matches koha matchpoint) |
802 |
# If we are in a shibboleth session (shibboleth is enabled, a shibboleth match attribute is set and matches koha matchpoint) |
803 |
if ( $shib and $shib_login and $shibSuccess and $type eq 'opac' ) { |
803 |
if ( $shib and $shib_login and $shibSuccess) { |
804 |
|
|
|
805 |
# (Note: $type eq 'opac' condition should be removed when shibboleth authentication for intranet will be implemented) |
806 |
logout_shib($query); |
804 |
logout_shib($query); |
807 |
} |
805 |
} |
808 |
} |
806 |
} |
Lines 887-894
sub checkauth {
Link Here
|
887 |
|
885 |
|
888 |
my ( $return, $cardnumber ); |
886 |
my ( $return, $cardnumber ); |
889 |
|
887 |
|
890 |
# If shib is enabled and we have a shib login, does the login match a valid koha user |
888 |
# If shib is enabled and we have a shib login, does the login match a valid koha user |
891 |
if ( $shib && $shib_login && $type eq 'opac' ) { |
889 |
if ( $shib && $shib_login ) { |
892 |
my $retuserid; |
890 |
my $retuserid; |
893 |
|
891 |
|
894 |
# Do not pass password here, else shib will not be checked in checkpw. |
892 |
# Do not pass password here, else shib will not be checked in checkpw. |