# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
use C4::Auth;
use C4::Output;
use C4::Members;
-use Koha::Borrower::Modifications;
+use C4::Form::MessagingPreferences;
+use Koha::Patrons;
+use Koha::Patron::Modifications;
use C4::Branch qw(GetBranchesLoop);
use C4::Scrubber;
+use Email::Valid;
+use Koha::DateUtils;
my $cgi = new CGI;
my $dbh = C4::Context->dbh;
}
my $mandatory = GetMandatoryFields($action);
-my $hidden = GetHiddenFields($mandatory);
$template->param(
action => $action,
- hidden => $hidden,
+ hidden => GetHiddenFields( $mandatory, 'registration' ),
mandatory => $mandatory,
member_titles => GetTitles() || undef,
branches => GetBranchesLoop(),
%borrower = DelEmptyFields(%borrower);
my @empty_mandatory_fields = CheckMandatoryFields( \%borrower, $action );
+ my $invalidformfields = CheckForInvalidFields(\%borrower);
+ delete $borrower{'password2'};
+ my $cardnumber_error_code;
+ if ( !grep { $_ eq 'cardnumber' } @empty_mandatory_fields ) {
+ # No point in checking the cardnumber if it's missing and mandatory, it'll just generate a
+ # spurious length warning.
+ $cardnumber_error_code = checkcardnumber( $borrower{cardnumber}, $borrower{borrowernumber} );
+ }
+
+ if ( @empty_mandatory_fields || @$invalidformfields || $cardnumber_error_code ) {
+ if ( $cardnumber_error_code == 1 ) {
+ $template->param( cardnumber_already_exists => 1 );
+ } elsif ( $cardnumber_error_code == 2 ) {
+ $template->param( cardnumber_wrong_length => 1 );
+ }
- if (@empty_mandatory_fields) {
$template->param(
empty_mandatory_fields => \@empty_mandatory_fields,
+ invalid_form_fields => $invalidformfields,
borrower => \%borrower
);
}
my $verification_token = md5_hex( \%borrower );
$borrower{'password'} = random_string("..........");
- Koha::Borrower::Modifications->new(
+ Koha::Patron::Modifications->new(
verification_token => $verification_token )
->AddModifications(\%borrower);
C4::Context->preference('OpacPasswordChange') );
my ( $borrowernumber, $password ) = AddMember_Opac(%borrower);
+ C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if $borrowernumber && C4::Context->preference('EnhancedMessagingPreferences');
$template->param( password_cleartext => $password );
$template->param(
my %borrower_changes = DelEmptyFields(%borrower);
my @empty_mandatory_fields =
CheckMandatoryFields( \%borrower_changes, $action );
+ my $invalidformfields = CheckForInvalidFields(\%borrower);
- if (@empty_mandatory_fields) {
+ if (@empty_mandatory_fields || @$invalidformfields) {
$template->param(
empty_mandatory_fields => \@empty_mandatory_fields,
+ invalid_form_fields => $invalidformfields,
borrower => \%borrower
);
$template->param( action => 'edit' );
}
else {
- ( $template, $borrowernumber, $cookie ) = get_template_and_user(
- {
- template_name => "opac-memberentry-update-submitted.tt",
- type => "opac",
- query => $cgi,
- authnotrequired => 1,
- }
- );
-
my %borrower_changes = DelUnchangedFields( $borrowernumber, %borrower );
+ if (%borrower_changes) {
+ ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+ {
+ template_name => "opac-memberentry-update-submitted.tt",
+ type => "opac",
+ query => $cgi,
+ authnotrequired => 1,
+ }
+ );
- my $m =
- Koha::Borrower::Modifications->new(
- borrowernumber => $borrowernumber );
+ my $m =
+ Koha::Patron::Modifications->new(
+ borrowernumber => $borrowernumber );
- $m->DelModifications;
- $m->AddModifications(\%borrower_changes);
- $template->param(
- borrower => GetMember( borrowernumber => $borrowernumber ),
- );
+ $m->DelModifications;
+ $m->AddModifications(\%borrower_changes);
+ $template->param(
+ borrower => GetMember( borrowernumber => $borrowernumber ),
+ );
+ }
+ else {
+ $template->param(
+ action => 'edit',
+ nochanges => 1,
+ borrower => GetMember( borrowernumber => $borrowernumber ),
+ );
+ }
}
}
elsif ( $action eq 'edit' ) { #Display logged in borrower's data
}
$template->param(
- borrower => $borrower, );
+ borrower => $borrower,
+ guarantor => scalar Koha::Patrons->find($borrowernumber)->guarantor(),
+ hidden => GetHiddenFields( $mandatory, 'modification' ),
+ );
if (C4::Context->preference('OPACpatronimages')) {
my ($image, $dberror) = GetPatronImage($borrower->{borrowernumber});
captcha_digest => md5_base64($captcha)
);
-output_html_with_http_headers $cgi, $cookie, $template->output;
+output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };
sub GetHiddenFields {
- my ($mandatory) = @_;
+ my ( $mandatory, $action ) = @_;
my %hidden_fields;
- my $BorrowerUnwantedField =
- C4::Context->preference("PatronSelfRegistrationBorrowerUnwantedField");
+ my $BorrowerUnwantedField = $action eq 'modification' ?
+ C4::Context->preference( "PatronSelfModificationBorrowerUnwantedField" ) :
+ C4::Context->preference( "PatronSelfRegistrationBorrowerUnwantedField" );
- my @fields = split( /\|/, $BorrowerUnwantedField );
+ my @fields = split( /\|/, $BorrowerUnwantedField || q|| );
foreach (@fields) {
next unless m/\w/o;
#Don't hide mandatory fields
return @empty_mandatory_fields;
}
+sub CheckForInvalidFields {
+ my $minpw = C4::Context->preference('minPasswordLength');
+ my $borrower = shift;
+ my @invalidFields;
+ if ($borrower->{'email'}) {
+ push(@invalidFields, "email") if (!Email::Valid->address($borrower->{'email'}));
+ }
+ if ($borrower->{'emailpro'}) {
+ push(@invalidFields, "emailpro") if (!Email::Valid->address($borrower->{'emailpro'}));
+ }
+ 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 ( $borrower->{'password'} ) {
+ push(@invalidFields, "password_spaces") if ($borrower->{'password'} =~ /^\s/ or $borrower->{'password'} =~ /\s$/);
+ }
+
+ return \@invalidFields;
+}
+
sub ParseCgiForBorrower {
my ($cgi) = @_;
}
}
- $borrower{'dateofbirth'} =
- C4::Dates->new( $borrower{'dateofbirth'} )->output("iso")
- if ( defined( $borrower{'dateofbirth'} ) );
+ 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;
+ }
return %borrower;
}
projects / koha.git / blobdiff