use C4::Auth;
use C4::Output;
use C4::Context;
-use C4::Branch qw/GetBranchesLoop/;
use C4::Members;
use C4::Members::Attributes qw(:all);
use C4::Members::AttributeTypes;
# č
use CGI qw ( -utf8 );
-# use encoding 'utf8'; # don't do this
-use Digest::MD5 qw(md5_base64);
my (@errors, @feedback);
my $extended = C4::Context->preference('ExtendedPatronAttributes');
debug => 1,
});
-# get the branches and pass them to the template
-my $branches = GetBranchesLoop();
-$template->param( branches => $branches ) if ( $branches );
# get the patron categories and pass them to the template
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
$template->param( categories => \@patron_categories );
if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
die "Wrong CSRF token"
unless Koha::Token->new->check_csrf({
- id => C4::Context->userenv->{id},
- secret => md5_base64( C4::Context->config('pass') ),
+ session_id => scalar $input->cookie('CGISESSID'),
token => scalar $input->param('csrf_token'),
});
}
push @feedback, {feedback=>1, name=>'headerrow', value=>join(', ', @csvcolumns)};
- my $today_iso = output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' });
+ my $today = output_pref;
my @criticals = qw(surname branchcode categorycode); # there probably should be others
my @bad_dates; # I've had a few.
LINE: while ( my $borrowerline = <$handle> ) {
push @missing_criticals, {key=>$_, line=>$. , lineraw=>$borrowerline, bad_date=>1};
}
}
- $borrower{dateenrolled} = $today_iso unless $borrower{dateenrolled};
- $borrower{dateexpiry} = GetExpiryDate($borrower{categorycode},$borrower{dateenrolled}) unless $borrower{dateexpiry};
+ $borrower{dateenrolled} ||= $today;
+ $borrower{dateexpiry} ||= Koha::Patron::Categories->find( $borrower{categorycode} )->get_expiry_date( $borrower{dateenrolled} );
my $borrowernumber;
my $member;
if ( ($matchpoint eq 'cardnumber') && ($borrower{'cardnumber'}) ) {
- $member = GetMember( 'cardnumber' => $borrower{'cardnumber'} );
- if ($member) {
- $borrowernumber = $member->{'borrowernumber'};
- }
+ $member = Koha::Patrons->find( { cardnumber => $borrower{'cardnumber'} } );
} elsif ( ($matchpoint eq 'userid') && ($borrower{'userid'}) ) {
- $member = GetMember( 'userid' => $borrower{'userid'} );
- if ($member) {
- $borrowernumber = $member->{'borrowernumber'};
- }
+ $member = Koha::Patrons->find( { userid => $borrower{'userid'} } )->unblessed;
} elsif ($extended) {
if (defined($matchpoint_attr_type)) {
foreach my $attr (@$patron_attributes) {
}
}
+ if ($member) {
+ $member = $member->unblessed;
+ $borrowernumber = $member->{'borrowernumber'};
+ } else {
+ $member = {};
+ }
+
if ( C4::Members::checkcardnumber( $borrower{cardnumber}, $borrowernumber ) ) {
push @errors, {
invalid_cardnumber => 1,
$template->param(
csrf_token => Koha::Token->new->generate_csrf(
- { id => C4::Context->userenv->{id},
- secret => md5_base64( C4::Context->config('pass') ),
- }
+ { session_id => scalar $input->cookie('CGISESSID'), }
),
);