X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-memberentry.pl;h=0115d78f989fe68a8126e88cc6014c16c7c87877;hb=217ccf2eaebe847937e0961b307382758caf6338;hp=f317ac8cb4239d617981c563c15e896975a8113a;hpb=5dd44a8f088c5c8537d0e0046a34d57655f2b7fd;p=srvgit diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index f317ac8cb4..0115d78f98 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -19,13 +19,15 @@ use Modern::Perl; use CGI qw ( -utf8 ); use Digest::MD5 qw( md5_base64 md5_hex ); -use JSON; +use JSON qw( to_json ); use List::MoreUtils qw( any each_array uniq ); use String::Random qw( random_string ); -use C4::Auth; -use C4::Output; -use C4::Members; +use C4::Auth qw( get_template_and_user ); +use C4::Output qw( output_html_with_http_headers ); +use C4::Context; +use C4::Letters qw( GetPreparedLetter EnqueueLetter SendQueuedMessages ); +use C4::Members qw( checkcardnumber ); use C4::Form::MessagingPreferences; use Koha::AuthUtils; use Koha::Patrons; @@ -33,18 +35,16 @@ use Koha::Patron::Consent; use Koha::Patron::Modification; use Koha::Patron::Modifications; use C4::Scrubber; -use Email::Valid; -use Koha::DateUtils; +use Koha::DateUtils qw( dt_from_string ); +use Koha::Email; use Koha::Libraries; use Koha::Patron::Attribute::Types; use Koha::Patron::Attributes; use Koha::Patron::Images; -use Koha::Patron::Modification; -use Koha::Patron::Modifications; -use Koha::Patrons; +use Koha::Patron::Categories; use Koha::Token; - -my $cgi = new CGI; +use Koha::AuthorisedValues; +my $cgi = CGI->new; my $dbh = C4::Context->dbh; my ( $template, $borrowernumber, $cookie ) = get_template_and_user( @@ -63,6 +63,11 @@ unless ( C4::Context->preference('PatronSelfRegistration') || $borrowernumber ) } my $action = $cgi->param('action') || q{}; +if ( $borrowernumber && ( $action eq 'create' || $action eq 'new' ) ) { + print $cgi->redirect("/cgi-bin/koha/opac-main.pl"); + exit; +} + if ( $action eq q{} ) { if ($borrowernumber) { $action = 'edit'; @@ -74,10 +79,14 @@ if ( $action eq q{} ) { my $mandatory = GetMandatoryFields($action); -my @libraries = Koha::Libraries->search; -if ( my @libraries_to_display = split '\|', C4::Context->preference('PatronSelfRegistrationLibraryList') ) { - @libraries = map { my $b = $_; my $branchcode = $_->branchcode; grep { $_ eq $branchcode } @libraries_to_display ? $b : () } @libraries; +my $params = {}; +if ( $action eq 'create' || $action eq 'new' ) { + my @PatronSelfRegistrationLibraryList = split '\|', C4::Context->preference('PatronSelfRegistrationLibraryList'); + $params = { branchcode => { -in => \@PatronSelfRegistrationLibraryList } } + if @PatronSelfRegistrationLibraryList; } +my $libraries = Koha::Libraries->search($params); + my ( $min, $max ) = C4::Members::get_cardnumber_length(); if ( defined $min ) { $template->param( @@ -86,12 +95,15 @@ if ( defined $min ) { ); } +my $defaultCategory = Koha::Patron::Categories->find(C4::Context->preference('PatronSelfRegistrationDefaultCategory')); + $template->param( action => $action, hidden => GetHiddenFields( $mandatory, $action ), mandatory => $mandatory, - libraries => \@libraries, + libraries => $libraries, OPACPatronDetails => C4::Context->preference('OPACPatronDetails'), + defaultCategory => $defaultCategory, ); my $attributes = ParsePatronAttributes($borrowernumber,$cgi); @@ -99,13 +111,12 @@ my $conflicting_attribute = 0; foreach my $attr (@$attributes) { my $attribute = Koha::Patron::Attribute->new($attr); - eval {$attribute->check_unique_id}; - if ( $@ ) { - my $attr_info = C4::Members::AttributeTypes->fetch($attr->{code}); + if ( !$attribute->unique_ok ) { + my $attr_type = Koha::Patron::Attribute::Types->find($attr->{code}); $template->param( extended_unique_id_failed_code => $attr->{code}, extended_unique_id_failed_value => $attr->{attribute}, - extended_unique_id_failed_description => $attr_info->description() + extended_unique_id_failed_description => $attr_type->description, ); $conflicting_attribute = 1; } @@ -116,8 +127,9 @@ if ( $action eq 'create' ) { my %borrower = ParseCgiForBorrower($cgi); %borrower = DelEmptyFields(%borrower); + $borrower{categorycode} ||= C4::Context->preference('PatronSelfRegistrationDefaultCategory'); - my @empty_mandatory_fields = CheckMandatoryFields( \%borrower, $action ); + my @empty_mandatory_fields = (CheckMandatoryFields( \%borrower, $action ), CheckMandatoryAttributes( \%borrower, $attributes ) ); my $invalidformfields = CheckForInvalidFields(\%borrower); delete $borrower{'password2'}; my $cardnumber_error_code; @@ -149,10 +161,12 @@ if ( $action eq 'create' ) { borrower => \%borrower ); $template->param( patron_attribute_classes => GeneratePatronAttributesForm( undef, $attributes ) ); + } elsif ( !$libraries->find($borrower{branchcode}) ) { + die "Branchcode not allowed"; # They hack the form } else { if ( - C4::Context->boolean_preference( + C4::Context->preference( 'PatronSelfRegistrationVerifyByEmail') ) { @@ -171,9 +185,10 @@ if ( $action eq 'create' ) { $verification_token = md5_hex( time().{}.rand().{}.$$ ); } - $borrower{password} = Koha::AuthUtils::generate_password unless $borrower{password}; + $borrower{password} = Koha::AuthUtils::generate_password(Koha::Patron::Categories->find($borrower{categorycode})) unless $borrower{password}; $borrower{verification_token} = $verification_token; + $borrower{extended_attributes} = to_json($attributes); Koha::Patron::Modification->new( \%borrower )->store(); #Send verification email @@ -186,7 +201,7 @@ if ( $action eq 'create' ) { }, ); - C4::Letters::EnqueueLetter( + my $message_id = C4::Letters::EnqueueLetter( { letter => $letter, message_transport_type => 'email', @@ -195,9 +210,7 @@ if ( $action eq 'create' ) { C4::Context->preference('KohaAdminEmailAddress'), } ); - my $num_letters_attempted = C4::Letters::SendQueuedMessages( { - letter_code => 'OPAC_REG_VERIFY' - } ); + C4::Letters::SendQueuedMessages({ message_id => $message_id }); } else { ( $template, $borrowernumber, $cookie ) = get_template_and_user( @@ -209,8 +222,7 @@ if ( $action eq 'create' ) { } ); - $borrower{categorycode} ||= C4::Context->preference('PatronSelfRegistrationDefaultCategory'); - $borrower{password} ||= Koha::AuthUtils::generate_password; + $borrower{password} ||= Koha::AuthUtils::generate_password(Koha::Patron::Categories->find($borrower{categorycode})); my $consent_dt = delete $borrower{gdpr_proc_consent}; my $patron = Koha::Patron->new( \%borrower )->store; Koha::Patron::Consent->new({ borrowernumber => $patron->borrowernumber, type => 'GDPR_PROCESSING', given_on => $consent_dt })->store if $consent_dt; @@ -229,6 +241,45 @@ if ( $action eq 'create' ) { $template->param( password_cleartext => $patron->plain_text_password ); $template->param( borrower => $patron->unblessed ); + + # If 'AutoEmailNewUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode. + if ( C4::Context->preference("AutoEmailNewUser") ) { + #look for defined primary email address, if blank - attempt to use borr.email and borr.emailpro instead + my $emailaddr = $patron->notice_email_address; + # if we manage to find a valid email address, send notice + if ($emailaddr) { + eval { + my $letter = GetPreparedLetter( + module => 'members', + letter_code => 'WELCOME', + branchcode => $patron->branchcode,, + lang => $patron->lang || 'default', + tables => { + 'branches' => $patron->branchcode, + 'borrowers' => $patron->borrowernumber, + }, + want_librarian => 1, + ) or return; + + my $message_id = EnqueueLetter( + { + letter => $letter, + borrowernumber => $patron->id, + to_address => $emailaddr, + message_transport_type => 'email' + } + ); + SendQueuedMessages({ message_id => $message_id }); + }; + } + } + + # Notify library of new patron registration + my $notify_library = C4::Context->preference('EmailPatronRegistrations'); + if ($notify_library) { + $patron->notify_library_of_registration($notify_library); + } + } else { # FIXME Handle possible errors here } @@ -252,8 +303,8 @@ elsif ( $action eq 'update' ) { my %borrower = ParseCgiForBorrower($cgi); $borrower{borrowernumber} = $borrowernumber; - my @empty_mandatory_fields = - CheckMandatoryFields( \%borrower, $action ); + my @empty_mandatory_fields = grep { $_ ne 'password' } # password is not required when editing personal details + ( CheckMandatoryFields( \%borrower, $action ), CheckMandatoryAttributes( \%borrower, $attributes ) ); my $invalidformfields = CheckForInvalidFields(\%borrower); # Send back the data to the template @@ -293,6 +344,14 @@ elsif ( $action eq 'update' ) { Koha::Patron::Modifications->search({ borrowernumber => $borrowernumber })->delete; my $m = Koha::Patron::Modification->new( \%borrower_changes )->store(); + #Automatically approve patron profile changes if set in syspref + + if (C4::Context->preference('AutoApprovePatronProfileSettings')) { + # Need to get the object from database, otherwise it is not complete enough to allow deletion + # when approval has been performed. + my $tmp_m = Koha::Patron::Modifications->find({borrowernumber => $borrowernumber}); + $tmp_m->approve() if $tmp_m; + } my $patron = Koha::Patrons->find( $borrowernumber ); $template->param( borrower => $patron->unblessed ); @@ -371,7 +430,8 @@ sub GetMandatoryFields { my %mandatory_fields; - my $BorrowerMandatoryField = + my $BorrowerMandatoryField = $action eq 'edit' || $action eq 'update' ? + C4::Context->preference("PatronSelfModificationMandatoryField") : C4::Context->preference("PatronSelfRegistrationBorrowerMandatoryField"); my @fields = split( /\|/, $BorrowerMandatoryField ); @@ -383,7 +443,7 @@ sub GetMandatoryFields { if ( $action eq 'create' || $action eq 'new' ) { $mandatory_fields{'email'} = 1 - if C4::Context->boolean_preference( + if C4::Context->preference( 'PatronSelfRegistrationVerifyByEmail'); } @@ -406,11 +466,25 @@ sub CheckMandatoryFields { return @empty_mandatory_fields; } +sub CheckMandatoryAttributes{ + my ( $borrower, $attributes ) = @_; + + my @empty_mandatory_fields; + + for my $attribute (@$attributes ) { + my $attr = Koha::Patron::Attribute::Types->find($attribute->{code}); + push @empty_mandatory_fields, $attribute->{code} + if $attr && $attr->mandatory && $attribute->{attribute} =~ m|^\s*$|; + } + + return @empty_mandatory_fields; +} + sub CheckForInvalidFields { my $borrower = shift; my @invalidFields; if ($borrower->{'email'}) { - unless ( Email::Valid->address($borrower->{'email'}) ) { + unless ( Koha::Email->is_valid($borrower->{email}) ) { push(@invalidFields, "email"); } elsif ( C4::Context->preference("PatronSelfRegistrationEmailMustBeUnique") ) { my $patrons_with_same_email = Koha::Patrons->search( # FIXME Should be search_limited? @@ -427,13 +501,19 @@ sub CheckForInvalidFields { if ( $patrons_with_same_email ) { push @invalidFields, "duplicate_email"; } + } elsif ( C4::Context->preference("PatronSelfRegistrationConfirmEmail") + && $borrower->{'email'} ne $borrower->{'repeat_email'} + && !defined $borrower->{borrowernumber} ) { + push @invalidFields, "email_match"; } + # email passed all tests, so prevent attempting to store repeat_email + delete $borrower->{'repeat_email'}; } if ($borrower->{'emailpro'}) { - push(@invalidFields, "emailpro") if (!Email::Valid->address($borrower->{'emailpro'})); + push(@invalidFields, "emailpro") unless Koha::Email->is_valid($borrower->{'emailpro'}); } if ($borrower->{'B_email'}) { - push(@invalidFields, "B_email") if (!Email::Valid->address($borrower->{'B_email'})); + push(@invalidFields, "B_email") unless Koha::Email->is_valid($borrower->{'B_email'}); } if ( defined $borrower->{'password'} and $borrower->{'password'} ne $borrower->{'password2'} ) @@ -441,7 +521,7 @@ sub CheckForInvalidFields { push( @invalidFields, "password_match" ); } if ( $borrower->{'password'} ) { - my ( $is_valid, $error ) = Koha::AuthUtils::is_password_valid( $borrower->{password} ); + my ( $is_valid, $error ) = Koha::AuthUtils::is_password_valid( $borrower->{password}, Koha::Patron::Categories->find($borrower->{categorycode}||C4::Context->preference('PatronSelfRegistrationDefaultCategory')) ); unless ( $is_valid ) { push @invalidFields, 'password_too_short' if $error eq 'too_short'; push @invalidFields, 'password_too_weak' if $error eq 'too_weak'; @@ -470,21 +550,13 @@ sub ParseCgiForBorrower { } } - my $dob_dt; - $dob_dt = eval { dt_from_string( $borrower{'dateofbirth'} ); } - if ( $borrower{'dateofbirth'} ); - - if ( $dob_dt ) { - $borrower{'dateofbirth'} = output_pref ( { dt => $dob_dt, dateonly => 1, dateformat => 'iso' } ); - } - else { - # Trigger validation - $borrower{'dateofbirth'} = undef; - } - # Replace checkbox 'agreed' by datetime in gdpr_proc_consent $borrower{gdpr_proc_consent} = dt_from_string if $borrower{gdpr_proc_consent} && $borrower{gdpr_proc_consent} eq 'agreed'; + delete $borrower{$_} for qw/borrowernumber date_renewed debarred debarredcomment flags privacy privacy_guarantor_fines privacy_guarantor_checkouts checkprevcheckout updated_on lastseen lang login_attempts overdrive_auth_token anonymized/; # See also members/memberentry.pl + delete $borrower{$_} for qw/dateenrolled dateexpiry borrowernotes opacnote sort1 sort2 sms_provider_id autorenew_checkouts gonenoaddress lost relationship/; # On OPAC only + delete $borrower{$_} for split( /\s*\|\s*/, C4::Context->preference('PatronSelfRegistrationBorrowerUnwantedField') || q{} ); + return %borrower; } @@ -578,7 +650,7 @@ sub GeneratePatronAttributesForm { my ( $borrowernumber, $entered_attributes ) = @_; # Get all attribute types and the values for this patron (if applicable) - my @types = grep { $_->opac_editable() or $_->opac_display } + my @types = grep { $_->opac_editable() or $_->opac_display } # FIXME filter using DBIC Koha::Patron::Attribute::Types->search()->as_list(); if ( scalar(@types) == 0 ) { return []; @@ -651,13 +723,14 @@ sub ParsePatronAttributes { my @values = $cgi->multi_param('patron_attribute_value'); my @editable_attribute_types - = map { $_->code } Koha::Patron::Attribute::Types->search({ opac_editable => 1 }); + = map { $_->code } Koha::Patron::Attribute::Types->search({ opac_editable => 1 })->as_list; my $ea = each_array( @codes, @values ); my @attributes; my $delete_candidates = {}; + my $scrubber = C4::Scrubber->new(); while ( my ( $code, $value ) = $ea->() ) { if ( any { $_ eq $code } @editable_attribute_types ) { # It is an editable attribute @@ -667,7 +740,7 @@ sub ParsePatronAttributes { } else { # we've got a value - push @attributes, { code => $code, attribute => $value }; + push @attributes, { code => $code, attribute => $scrubber->scrub( $value ) }; # 'code' is no longer a delete candidate delete $delete_candidates->{$code} @@ -677,7 +750,8 @@ sub ParsePatronAttributes { } foreach my $code ( keys %{$delete_candidates} ) { - if ( Koha::Patron::Attributes->search({ + if ( not $borrowernumber # self-registration + || Koha::Patron::Attributes->search({ borrowernumber => $borrowernumber, code => $code })->count > 0 ) { push @attributes, { code => $code, attribute => '' }