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

(-)a/C4/Auth_with_shibboleth.pm (-5 / +24 lines)
Lines 23-28 use C4::Debug; Link Here
23
use C4::Context;
23
use C4::Context;
24
use Koha::AuthUtils qw(get_script_name);
24
use Koha::AuthUtils qw(get_script_name);
25
use Koha::Database;
25
use Koha::Database;
26
use C4::Members qw( AddMember_Auto );
27
use C4::Members::Messaging;
26
use Carp;
28
use Carp;
27
use CGI;
29
use CGI;
28
30
Lines 102-112 sub checkpw_shib { Link Here
102
        return ( 1, $borrower->get_column('cardnumber'), $borrower->get_column('userid') );
104
        return ( 1, $borrower->get_column('cardnumber'), $borrower->get_column('userid') );
103
    }
105
    }
104
106
105
    # If we reach this point, the user is not a valid koha user
107
    if ( $shib->{'autocreate'} ) {
106
    $debug
108
        return _autocreate( $dbh, $shib, $userid );
107
      and warn
109
    } else {
108
      "User with $config->{matchpoint} of $match is not a valid Koha user";
110
        # If we reach this point, the user is not a valid koha user
109
    return 0;
111
        $debug and warn "User $userid is not a valid Koha user";
112
        return 0;
113
    }
114
}
115
116
sub _autocreate {
117
    my ( $dbh, $shib, $userid ) = @_;
118
119
    my %borrower = ( userid => $userid );
120
121
    while ( my ( $key, $entry ) = each %{$shib->{'mapping'}} ) {
122
        $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
123
    }
124
125
    %borrower = AddMember_Auto( %borrower );
126
    C4::Members::Messaging::SetMessagingPreferencesFromDefaults( { borrowernumber => $borrower{'borrowernumber'}, categorycode => $borrower{'categorycode'} } );
127
128
    return ( 1, $borrower{'cardnumber'}, $borrower{'userid'} );
110
}
129
}
111
130
112
sub _get_uri {
131
sub _get_uri {
(-)a/C4/Members.pm (-3 / +17 lines)
Lines 97-102 BEGIN { Link Here
97
    #Insert data
97
    #Insert data
98
    push @EXPORT, qw(
98
    push @EXPORT, qw(
99
        &AddMember
99
        &AddMember
100
	&AddMember_Auto
100
        &AddMember_Opac
101
        &AddMember_Opac
101
    );
102
    );
102
103
Lines 1633-1638 sub GetBorrowersWithEmail { Link Here
1633
    return @result;
1634
    return @result;
1634
}
1635
}
1635
1636
1637
=head2 AddMember_Auto
1638
1639
=cut
1640
1641
sub AddMember_Auto {
1642
    my ( %borrower ) = @_;
1643
1644
    $borrower{'cardnumber'} ||= fixup_cardnumber();
1645
1646
    $borrower{'borrowernumber'} = AddMember(%borrower);
1647
1648
    return ( %borrower );
1649
}
1650
1636
=head2 AddMember_Opac
1651
=head2 AddMember_Opac
1637
1652
1638
=cut
1653
=cut
Lines 1650-1658 sub AddMember_Opac { Link Here
1650
1665
1651
    $borrower{'cardnumber'} = fixup_cardnumber( $borrower{'cardnumber'} );
1666
    $borrower{'cardnumber'} = fixup_cardnumber( $borrower{'cardnumber'} );
1652
1667
1653
    my $borrowernumber = AddMember(%borrower);
1668
    %borrower = AddMember_Auto(%borrower);
1654
1669
1655
    return ( $borrowernumber, $borrower{'password'} );
1670
    return ( $borrower{'borrowernumber'}, $borrower{'password'} );
1656
}
1671
}
1657
1672
1658
=head2 DeleteExpiredOpacRegistrations
1673
=head2 DeleteExpiredOpacRegistrations
1659
- 

Return to bug 12026