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 107-112 BEGIN { Link Here
107
    #Insert data
107
    #Insert data
108
    push @EXPORT, qw(
108
    push @EXPORT, qw(
109
        &AddMember
109
        &AddMember
110
	&AddMember_Auto
110
        &AddMember_Opac
111
        &AddMember_Opac
111
        &MoveMemberToDeleted
112
        &MoveMemberToDeleted
112
    );
113
    );
Lines 1793-1798 sub GetBorrowersWithEmail { Link Here
1793
    return @result;
1794
    return @result;
1794
}
1795
}
1795
1796
1797
=head2 AddMember_Auto
1798
1799
=cut
1800
1801
sub AddMember_Auto {
1802
    my ( %borrower ) = @_;
1803
1804
    $borrower{'cardnumber'} ||= fixup_cardnumber();
1805
1806
    $borrower{'borrowernumber'} = AddMember(%borrower);
1807
1808
    return ( %borrower );
1809
}
1810
1796
=head2 AddMember_Opac
1811
=head2 AddMember_Opac
1797
1812
1798
=cut
1813
=cut
Lines 1810-1818 sub AddMember_Opac { Link Here
1810
1825
1811
    $borrower{'cardnumber'} = fixup_cardnumber( $borrower{'cardnumber'} );
1826
    $borrower{'cardnumber'} = fixup_cardnumber( $borrower{'cardnumber'} );
1812
1827
1813
    my $borrowernumber = AddMember(%borrower);
1828
    %borrower = AddMember_Auto(%borrower);
1814
1829
1815
    return ( $borrowernumber, $borrower{'password'} );
1830
    return ( $borrower{'borrowernumber'}, $borrower{'password'} );
1816
}
1831
}
1817
1832
1818
=head2 AddEnrolmentFeeIfNeeded
1833
=head2 AddEnrolmentFeeIfNeeded
1819
- 

Return to bug 12026