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

(-)a/C4/Auth_with_shibboleth.pm (-3 / +24 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 );
26
use C4::Members::Messaging;
25
use Carp;
27
use Carp;
26
use CGI;
28
use CGI;
27
29
Lines 104-112 sub checkpw_shib { Link Here
104
        return ( 1, $retnumber, $userid );
106
        return ( 1, $retnumber, $userid );
105
    }
107
    }
106
108
107
    # If we reach this point, the user is not a valid koha user
109
    if ( $config->{'autocreate'} ) {
108
    $debug and warn "User with $config->{matchpoint} of $match is not a valid Koha user";
110
        return _autocreate( $dbh, $config, $match );
109
    return 0;
111
    } else {
112
        # If we reach this point, the user is not a valid koha user
113
        $debug and warn "User with $config->{matchpoint} of $match is not a valid Koha user";
114
        return 0;
115
    }
110
}
116
}
111
117
112
sub _get_uri {
118
sub _get_uri {
Lines 146-151 sub _get_shib_config { Link Here
146
    }
152
    }
147
}
153
}
148
154
155
sub _autocreate {
156
    my ( $dbh, $config, $match ) = @_;
157
158
    my %borrower = ( $config->{matchpoint} => $match );
159
160
    while ( my ( $key, $entry ) = each %{$config->{'mapping'}} ) {
161
        $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
162
    }
163
164
    %borrower = AddMember_Auto( %borrower );
165
    C4::Members::Messaging::SetMessagingPreferencesFromDefaults( { borrowernumber => $borrower{'borrowernumber'}, categorycode => $borrower{'categorycode'} } );
166
167
    return ( 1, $borrower{'cardnumber'}, $borrower{'userid'} );
168
}
169
149
1;
170
1;
150
__END__
171
__END__
151
172
(-)a/C4/Members.pm (-3 / +13 lines)
Lines 121-126 BEGIN { Link Here
121
    #Insert data
121
    #Insert data
122
    push @EXPORT, qw(
122
    push @EXPORT, qw(
123
        &AddMember
123
        &AddMember
124
	&AddMember_Auto
124
        &AddMember_Opac
125
        &AddMember_Opac
125
        &MoveMemberToDeleted
126
        &MoveMemberToDeleted
126
        &ExtendMemberSubscriptionTo
127
        &ExtendMemberSubscriptionTo
Lines 2435-2440 sub GetBorrowersWithEmail { Link Here
2435
    return @result;
2436
    return @result;
2436
}
2437
}
2437
2438
2439
sub AddMember_Auto {
2440
    my ( %borrower ) = @_;
2441
2442
    $borrower{'cardnumber'} ||= fixup_cardnumber();
2443
2444
    $borrower{'borrowernumber'} = AddMember(%borrower);
2445
2446
    return ( %borrower );
2447
}
2448
2438
sub AddMember_Opac {
2449
sub AddMember_Opac {
2439
    my ( %borrower ) = @_;
2450
    my ( %borrower ) = @_;
2440
2451
Lines 2447-2455 sub AddMember_Opac { Link Here
2447
2458
2448
    $borrower{'cardnumber'} = fixup_cardnumber();
2459
    $borrower{'cardnumber'} = fixup_cardnumber();
2449
2460
2450
    my $borrowernumber = AddMember(%borrower);
2461
    %borrower = AddMember_Auto(%borrower);
2451
2462
2452
    return ( $borrowernumber, $password );
2463
    return ( $borrower{'borrowernumber'}, $borrower{'password'} );
2453
}
2464
}
2454
2465
2455
=head2 AddEnrolmentFeeIfNeeded
2466
=head2 AddEnrolmentFeeIfNeeded
2456
- 

Return to bug 12026