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

(-)a/C4/Auth_with_shibboleth.pm (-3 / +22 lines)
Lines 22-27 use warnings; Link Here
22
22
23
use C4::Debug;
23
use C4::Debug;
24
use C4::Context;
24
use C4::Context;
25
use C4::Members qw( AddMember_Auto );
25
use Carp;
26
use Carp;
26
use CGI;
27
use CGI;
27
28
Lines 99-107 sub checkpw_shib { Link Here
99
        return ( 1, $retnumber, $userid );
100
        return ( 1, $retnumber, $userid );
100
    }
101
    }
101
102
102
    # If we reach this point, the user is not a valid koha user
103
    if ( $shib->{'autocreate'} ) {
103
    $debug and warn "User $userid is not a valid Koha user";
104
        return _autocreate( $dbh, $shib, $userid );
104
    return 0;
105
    } else {
106
        # If we reach this point, the user is not a valid koha user
107
        $debug and warn "User $userid is not a valid Koha user";
108
        return 0;
109
    }
110
}
111
112
sub _autocreate {
113
    my ( $dbh, $shib, $userid ) = @_;
114
115
    my %borrower = ( userid => $userid );
116
117
    while ( my ( $key, $entry ) = each %{$shib->{'mapping'}} ) {
118
        $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
119
    }
120
121
    %borrower = AddMember_Auto( %borrower );
122
123
    return ( 1, $borrower{'cardnumber'}, $borrower{'userid'} );
105
}
124
}
106
125
107
1;
126
1;
(-)a/C4/Members.pm (-3 / +13 lines)
Lines 120-125 BEGIN { Link Here
120
    #Insert data
120
    #Insert data
121
    push @EXPORT, qw(
121
    push @EXPORT, qw(
122
        &AddMember
122
        &AddMember
123
	&AddMember_Auto
123
        &AddMember_Opac
124
        &AddMember_Opac
124
        &MoveMemberToDeleted
125
        &MoveMemberToDeleted
125
        &ExtendMemberSubscriptionTo
126
        &ExtendMemberSubscriptionTo
Lines 2388-2393 sub GetBorrowersWithEmail { Link Here
2388
    return @result;
2389
    return @result;
2389
}
2390
}
2390
2391
2392
sub AddMember_Auto {
2393
    my ( %borrower ) = @_;
2394
2395
    $borrower{'cardnumber'} ||= fixup_cardnumber();
2396
2397
    $borrower{'borrowernumber'} = AddMember(%borrower);
2398
2399
    return ( %borrower );
2400
}
2401
2391
sub AddMember_Opac {
2402
sub AddMember_Opac {
2392
    my ( %borrower ) = @_;
2403
    my ( %borrower ) = @_;
2393
2404
Lines 2400-2408 sub AddMember_Opac { Link Here
2400
2411
2401
    $borrower{'cardnumber'} = fixup_cardnumber();
2412
    $borrower{'cardnumber'} = fixup_cardnumber();
2402
2413
2403
    my $borrowernumber = AddMember(%borrower);
2414
    %borrower = AddMember_Auto(%borrower);
2404
2415
2405
    return ( $borrowernumber, $password );
2416
    return ( $borrower{'borrowernumber'}, $borrower{'password'} );
2406
}
2417
}
2407
2418
2408
=head2 AddEnrolmentFeeIfNeeded
2419
=head2 AddEnrolmentFeeIfNeeded
2409
- 

Return to bug 12026