X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-memberentry.pl;h=dbb6d99e5c3892eceeca68ad7c10c34a01d4a0ab;hb=62f1b2df68f16dcd7eec324d487963f737cbe450;hp=a08f65e0fc40e95a61a38ecb34facc222f6a5092;hpb=0a40e0c60ff2ac405960cfd34033dd3d5896ac08;p=koha.git diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index a08f65e0fc..dbb6d99e5c 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -19,22 +19,30 @@ use Modern::Perl; use CGI qw ( -utf8 ); use Digest::MD5 qw( md5_base64 md5_hex ); -use Encode qw( encode ); -use List::MoreUtils qw( each_array uniq ); +use 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::Members::Attributes qw( GetBorrowerAttributes ); use C4::Form::MessagingPreferences; +use Koha::AuthUtils; use Koha::Patrons; +use Koha::Patron::Consent; use Koha::Patron::Modification; use Koha::Patron::Modifications; use C4::Scrubber; use Email::Valid; use Koha::DateUtils; 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::Token; my $cgi = new CGI; @@ -81,13 +89,13 @@ if ( defined $min ) { $template->param( action => $action, - hidden => GetHiddenFields( $mandatory, 'registration' ), + hidden => GetHiddenFields( $mandatory, $action ), mandatory => $mandatory, libraries => \@libraries, OPACPatronDetails => C4::Context->preference('OPACPatronDetails'), ); -my $attributes = ParsePatronAttributes($cgi); +my $attributes = ParsePatronAttributes($borrowernumber,$cgi); my $conflicting_attribute = 0; foreach my $attr (@$attributes) { @@ -162,7 +170,7 @@ if ( $action eq 'create' ) { $verification_token = md5_hex( time().{}.rand().{}.$$ ); } - $borrower{password} = random_string(".........."); + $borrower{password} = Koha::AuthUtils::generate_password unless $borrower{password}; $borrower{verification_token} = $verification_token; Koha::Patron::Modification->new( \%borrower )->store(); @@ -171,6 +179,7 @@ if ( $action eq 'create' ) { my $letter = C4::Letters::GetPreparedLetter( module => 'members', letter_code => 'OPAC_REG_VERIFY', + lang => 'default', # Patron does not have a preferred language defined yet tables => { borrower_modifications => $verification_token, }, @@ -199,13 +208,28 @@ if ( $action eq 'create' ) { $template->param( OpacPasswordChange => C4::Context->preference('OpacPasswordChange') ); - my ( $borrowernumber, $password ) = AddMember_Opac(%borrower); - C4::Members::Attributes::SetBorrowerAttributes( $borrowernumber, $attributes ); - C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if $borrowernumber && C4::Context->preference('EnhancedMessagingPreferences'); + $borrower{categorycode} ||= C4::Context->preference('PatronSelfRegistrationDefaultCategory'); + $borrower{password} ||= Koha::AuthUtils::generate_password; + 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; + if ( $patron ) { + C4::Members::Attributes::SetBorrowerAttributes( $patron->borrowernumber, $attributes ); + if ( C4::Context->preference('EnhancedMessagingPreferences') ) { + C4::Form::MessagingPreferences::handle_form_action( + $cgi, + { borrowernumber => $patron->borrowernumber }, + $template, + 1, + C4::Context->preference('PatronSelfRegistrationDefaultCategory') + ); + } - $template->param( password_cleartext => $password ); - $template->param( - borrower => GetMember( borrowernumber => $borrowernumber ) ); + $template->param( password_cleartext => $patron->plain_text_password ); + $template->param( borrower => $patron->unblessed ); + } else { + # FIXME Handle possible errors here + } $template->param( PatronSelfRegistrationAdditionalInstructions => C4::Context->preference( @@ -216,15 +240,15 @@ if ( $action eq 'create' ) { } elsif ( $action eq 'update' ) { - my $borrower = GetMember( borrowernumber => $borrowernumber ); + my $borrower = Koha::Patrons->find( $borrowernumber )->unblessed; die "Wrong CSRF token" unless Koha::Token->new->check_csrf({ - id => Encode::encode( 'UTF-8', $borrower->{userid} ), - secret => md5_base64( Encode::encode( 'UTF-8', C4::Context->config('pass') ) ), + session_id => scalar $cgi->cookie('CGISESSID'), token => scalar $cgi->param('csrf_token'), }); my %borrower = ParseCgiForBorrower($cgi); + $borrower{borrowernumber} = $borrowernumber; my %borrower_changes = DelEmptyFields(%borrower); my @empty_mandatory_fields = @@ -240,17 +264,18 @@ elsif ( $action eq 'update' ) { invalid_form_fields => $invalidformfields, borrower => \%borrower, csrf_token => Koha::Token->new->generate_csrf({ - id => Encode::encode( 'UTF-8', $borrower->{userid} ), - secret => md5_base64( Encode::encode( 'UTF-8', C4::Context->config('pass') ) ), + session_id => scalar $cgi->cookie('CGISESSID'), }), ); - $template->param( patron_attribute_classes => GeneratePatronAttributesForm( undef, $attributes ) ); + $template->param( patron_attribute_classes => GeneratePatronAttributesForm( $borrowernumber, $attributes ) ); $template->param( action => 'edit' ); } else { my %borrower_changes = DelUnchangedFields( $borrowernumber, %borrower ); - if (%borrower_changes) { + my $extended_attributes_changes = FilterUnchangedAttributes( $borrowernumber, $attributes ); + + if ( %borrower_changes || scalar @{$extended_attributes_changes} > 0 ) { ( $template, $borrowernumber, $cookie ) = get_template_and_user( { template_name => "opac-memberentry-update-submitted.tt", @@ -261,54 +286,49 @@ elsif ( $action eq 'update' ) { ); $borrower_changes{borrowernumber} = $borrowernumber; + $borrower_changes{extended_attributes} = to_json($extended_attributes_changes); - # FIXME update the following with - # Koha::Patron::Modifications->search({ borrowernumber => $borrowernumber })->delete; - # when bug 17091 will be pushed - my $patron_modifications = Koha::Patron::Modifications->search({ borrowernumber => $borrowernumber }); - while ( my $patron_modification = $patron_modifications->next ) { - $patron_modification->delete; - } + Koha::Patron::Modifications->search({ borrowernumber => $borrowernumber })->delete; my $m = Koha::Patron::Modification->new( \%borrower_changes )->store(); - $template->param( - borrower => GetMember( borrowernumber => $borrowernumber ), - ); + my $patron = Koha::Patrons->find( $borrowernumber ); + $template->param( borrower => $patron->unblessed ); } else { + my $patron = Koha::Patrons->find( $borrowernumber ); $template->param( action => 'edit', nochanges => 1, - borrower => GetMember( borrowernumber => $borrowernumber ), + borrower => $patron->unblessed, + patron_attribute_classes => GeneratePatronAttributesForm( $borrowernumber, $attributes ), csrf_token => Koha::Token->new->generate_csrf({ - id => Encode::encode( 'UTF-8', $borrower->{userid} ), - secret => md5_base64( Encode::encode( 'UTF-8', C4::Context->config('pass') ) ), + session_id => scalar $cgi->cookie('CGISESSID'), }), ); } } } elsif ( $action eq 'edit' ) { #Display logged in borrower's data - my $borrower = GetMember( borrowernumber => $borrowernumber ); + my $patron = Koha::Patrons->find( $borrowernumber ); + my $borrower = $patron->unblessed; $template->param( borrower => $borrower, guarantor => scalar Koha::Patrons->find($borrowernumber)->guarantor(), - hidden => GetHiddenFields( $mandatory, 'modification' ), + hidden => GetHiddenFields( $mandatory, 'edit' ), csrf_token => Koha::Token->new->generate_csrf({ - id => Encode::encode( 'UTF-8', $borrower->{userid} ), - secret => md5_base64( Encode::encode( 'UTF-8', C4::Context->config('pass') ) ), + session_id => scalar $cgi->cookie('CGISESSID'), }), ); if (C4::Context->preference('OPACpatronimages')) { - my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber}); - $template->param( display_patron_image => 1 ) if $patron_image; + $template->param( display_patron_image => 1 ) if $patron->image; } - $template->param( patron_attribute_classes => GeneratePatronAttributesForm( $borrower ) ); + $template->param( patron_attribute_classes => GeneratePatronAttributesForm( $borrowernumber ) ); } else { + # Render self-registration page $template->param( patron_attribute_classes => GeneratePatronAttributesForm() ); } @@ -325,7 +345,7 @@ sub GetHiddenFields { my ( $mandatory, $action ) = @_; my %hidden_fields; - my $BorrowerUnwantedField = $action eq 'modification' ? + my $BorrowerUnwantedField = $action eq 'edit' || $action eq 'update' ? C4::Context->preference( "PatronSelfModificationBorrowerUnwantedField" ) : C4::Context->preference( "PatronSelfRegistrationBorrowerUnwantedField" ); @@ -349,6 +369,7 @@ sub GetMandatoryFields { C4::Context->preference("PatronSelfRegistrationBorrowerMandatoryField"); my @fields = split( /\|/, $BorrowerMandatoryField ); + push @fields, 'gdpr_proc_consent' if C4::Context->preference('GDPR_Policy'); foreach (@fields) { $mandatory_fields{$_} = 1; @@ -380,14 +401,23 @@ sub CheckMandatoryFields { } sub CheckForInvalidFields { - my $minpw = C4::Context->preference('minPasswordLength'); my $borrower = shift; my @invalidFields; if ($borrower->{'email'}) { unless ( Email::Valid->address($borrower->{'email'}) ) { push(@invalidFields, "email"); } elsif ( C4::Context->preference("PatronSelfRegistrationEmailMustBeUnique") ) { - my $patrons_with_same_email = Koha::Patrons->search( { email => $borrower->{email} })->count; + my $patrons_with_same_email = Koha::Patrons->search( # FIXME Should be search_limited? + { + email => $borrower->{email}, + ( + exists $borrower->{borrowernumber} + ? ( borrowernumber => + { '!=' => $borrower->{borrowernumber} } ) + : () + ) + } + )->count; if ( $patrons_with_same_email ) { push @invalidFields, "duplicate_email"; } @@ -399,14 +429,18 @@ sub CheckForInvalidFields { if ($borrower->{'B_email'}) { push(@invalidFields, "B_email") if (!Email::Valid->address($borrower->{'B_email'})); } - if ( $borrower->{'password'} ne $borrower->{'password2'} ){ - push(@invalidFields, "password_match"); - } - if ( $borrower->{'password'} && $minpw && (length($borrower->{'password'}) < $minpw) ) { - push(@invalidFields, "password_invalid"); + if ( defined $borrower->{'password'} + and $borrower->{'password'} ne $borrower->{'password2'} ) + { + push( @invalidFields, "password_match" ); } if ( $borrower->{'password'} ) { - push(@invalidFields, "password_spaces") if ($borrower->{'password'} =~ /^\s/ or $borrower->{'password'} =~ /\s$/); + my ( $is_valid, $error ) = Koha::AuthUtils::is_password_valid( $borrower->{password} ); + unless ( $is_valid ) { + push @invalidFields, 'password_too_short' if $error eq 'too_short'; + push @invalidFields, 'password_too_weak' if $error eq 'too_weak'; + push @invalidFields, 'password_has_whitespaces' if $error eq 'has_whitespaces'; + } } return \@invalidFields; @@ -418,10 +452,15 @@ sub ParseCgiForBorrower { my $scrubber = C4::Scrubber->new(); my %borrower; - foreach ( $cgi->param ) { - if ( $_ =~ '^borrower_' ) { - my ($key) = substr( $_, 9 ); - $borrower{$key} = $scrubber->scrub( scalar $cgi->param($_) ); + foreach my $field ( $cgi->param ) { + if ( $field =~ '^borrower_' ) { + my ($key) = substr( $field, 9 ); + if ( $field !~ '^borrower_password' ) { + $borrower{$key} = $scrubber->scrub( scalar $cgi->param($field) ); + } else { + # Allow html characters for passwords + $borrower{$key} = $cgi->param($field); + } } } @@ -437,13 +476,17 @@ sub ParseCgiForBorrower { $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'; + return %borrower; } sub DelUnchangedFields { my ( $borrowernumber, %new_data ) = @_; - my $current_data = GetMember( borrowernumber => $borrowernumber ); + my $patron = Koha::Patrons->find( $borrowernumber ); + my $current_data = $patron->unblessed; foreach my $key ( keys %new_data ) { if ( $current_data->{$key} eq $new_data{$key} ) { @@ -464,51 +507,109 @@ sub DelEmptyFields { return %borrower; } -sub GeneratePatronAttributesForm { - my ( $borrower, $entered_attributes ) = @_; +sub FilterUnchangedAttributes { + my ( $borrowernumber, $entered_attributes ) = @_; - # Get all attribute types and the values for this patron (if applicable) - my @types = C4::Members::AttributeTypes::GetAttributeTypes(); + my @patron_attributes = grep {$_->opac_editable} Koha::Patron::Attributes->search({ borrowernumber => $borrowernumber })->as_list; - if (scalar(@types) == 0) { - return []; + my $patron_attribute_types; + foreach my $attr (@patron_attributes) { + $patron_attribute_types->{ $attr->code } += 1; } - my %attr_values = (); + my $passed_attribute_types; + foreach my $attr (@{ $entered_attributes }) { + $passed_attribute_types->{ $attr->{ code } } += 1; + } + + my @changed_attributes; - if ( $borrower ) { - my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber); + # Loop through the current patron attributes + foreach my $attribute_type ( keys %{ $patron_attribute_types } ) { + if ( $patron_attribute_types->{ $attribute_type } != $passed_attribute_types->{ $attribute_type } ) { + # count differs, overwrite all attributes for given type + foreach my $attr (@{ $entered_attributes }) { + push @changed_attributes, $attr + if $attr->{ code } eq $attribute_type; + } + } else { + # count matches, check values + my $changes = 0; + foreach my $attr (grep { $_->code eq $attribute_type } @patron_attributes) { + $changes = 1 + unless any { $_->{ value } eq $attr->attribute } @{ $entered_attributes }; + last if $changes; + } + + if ( $changes ) { + foreach my $attr (@{ $entered_attributes }) { + push @changed_attributes, $attr + if $attr->{ code } eq $attribute_type; + } + } + } + } - # Remap the patron's attributes into a hash of arrayrefs per attribute (depends on - # autovivification) - foreach my $attr (@$attributes) { - push @{ $attr_values{ $attr->{code} } }, $attr; + # Loop through passed attributes, looking for new ones + foreach my $attribute_type ( keys %{ $passed_attribute_types } ) { + if ( !defined $patron_attribute_types->{ $attribute_type } ) { + # YAY, new stuff + foreach my $attr (grep { $_->{code} eq $attribute_type } @{ $entered_attributes }) { + push @changed_attributes, $attr; + } } } - if ( $entered_attributes ) { + return \@changed_attributes; +} + +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 } + Koha::Patron::Attribute::Types->search()->as_list(); + if ( scalar(@types) == 0 ) { + return []; + } + + my @displayable_attributes = grep { $_->opac_display } + Koha::Patron::Attributes->search({ borrowernumber => $borrowernumber })->as_list; + + my %attr_values = (); + + # Build the attribute values list either from the passed values + # or taken from the patron itself + if ( defined $entered_attributes ) { foreach my $attr (@$entered_attributes) { - push @{ $attr_values{ $attr->{code} } }, $attr; + push @{ $attr_values{ $attr->{code} } }, $attr->{value}; } } + elsif ( defined $borrowernumber ) { + my @editable_attributes = grep { $_->opac_editable } @displayable_attributes; + foreach my $attr (@editable_attributes) { + push @{ $attr_values{ $attr->code } }, $attr->attribute; + } + } + + # Add the non-editable attributes (that don't come from the form) + foreach my $attr ( grep { !$_->opac_editable } @displayable_attributes ) { + push @{ $attr_values{ $attr->code } }, $attr->attribute; + } # Find all existing classes - my @classes = uniq( map { $_->{class} } @types ); - @classes = sort @classes; + my @classes = sort( uniq( map { $_->class } @types ) ); my %items_by_class; - foreach my $attr_type_desc (@types) { - my $attr_type = C4::Members::AttributeTypes->fetch( $attr_type_desc->{code} ); - # Make sure this attribute should be displayed in the OPAC - next unless ( $attr_type->opac_display() ); - # Then, make sure it either has values or is editable - next unless ( $attr_values{ $attr_type->code() } || $attr_type->opac_editable() ); - + foreach my $attr_type (@types) { push @{ $items_by_class{ $attr_type->class() } }, { type => $attr_type, - # If editable, make sure there's at least one empty entry, to make the template's job easier - values => $attr_values{ $attr_type->code() } || [{}] - }; + # If editable, make sure there's at least one empty entry, + # to make the template's job easier + values => $attr_values{ $attr_type->code() } || [''] + } + unless !defined $attr_values{ $attr_type->code() } + and !$attr_type->opac_editable; } # Finally, build a list of containing classes @@ -516,37 +617,65 @@ sub GeneratePatronAttributesForm { foreach my $class (@classes) { next unless ( $items_by_class{$class} ); - my $av = Koha::AuthorisedValues->search({ category => 'PA_CLASS', authorised_value => $class }); + my $av = Koha::AuthorisedValues->search( + { category => 'PA_CLASS', authorised_value => $class } ); + my $lib = $av->count ? $av->next->opac_description : $class; - push @class_loop, { + push @class_loop, + { class => $class, items => $items_by_class{$class}, lib => $lib, - }; + }; } return \@class_loop; } sub ParsePatronAttributes { - my ( $cgi ) = @_; + my ( $borrowernumber, $cgi ) = @_; - my @codes = $cgi->param('patron_attribute_code'); - my @values = $cgi->param('patron_attribute_value'); - my @passwords = $cgi->param('patron_attribute_password'); + my @codes = $cgi->multi_param('patron_attribute_code'); + my @values = $cgi->multi_param('patron_attribute_value'); - my $ea = each_array( @codes, @values, @passwords ); + my @editable_attribute_types + = map { $_->code } Koha::Patron::Attribute::Types->search({ opac_editable => 1 }); + + my $ea = each_array( @codes, @values ); my @attributes; - my %dups = (); - while ( my ( $code, $value, $password ) = $ea->() ) { - next unless defined($value) and $value ne ''; - next if exists $dups{$code}->{$value}; - $dups{$code}->{$value} = 1; + my $delete_candidates = {}; + + while ( my ( $code, $value ) = $ea->() ) { + if ( any { $_ eq $code } @editable_attribute_types ) { + # It is an editable attribute + if ( !defined($value) or $value eq '' ) { + $delete_candidates->{$code} = 1 + unless $delete_candidates->{$code}; + } + else { + # we've got a value + push @attributes, { code => $code, value => $value }; - push @attributes, { code => $code, value => $value, password => $password }; + # 'code' is no longer a delete candidate + delete $delete_candidates->{$code} + if defined $delete_candidates->{$code}; + } + } + } + + foreach my $code ( keys %{$delete_candidates} ) { + if ( Koha::Patron::Attributes->search({ + borrowernumber => $borrowernumber, code => $code })->count > 0 ) + { + push @attributes, { code => $code, value => '' } + unless any { $_->{code} eq $code } @attributes; + } } return \@attributes; } + + +1;