#
# 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>.
# pragma
use strict;
use warnings;
# external modules
-use CGI;
+use CGI qw ( -utf8 );
# use Digest::MD5 qw(md5_base64);
use List::MoreUtils qw/uniq/;
use C4::Members::AttributeTypes;
use C4::Koha;
use C4::Dates qw/format_date format_date_in_iso/;
-use C4::Input;
use C4::Log;
use C4::Letters;
use C4::Branch; # GetBranches
use C4::Form::MessagingPreferences;
use Koha::Borrower::Debarments;
use Koha::DateUtils;
+use Email::Valid;
+use Module::Load;
+if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
+ load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );
+}
use vars qw($debug);
my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "members/memberentrygen.tmpl",
+ = get_template_and_user({template_name => "members/memberentrygen.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
my $step = $input->param('step') || 0;
my @errors;
my $default_city;
-# $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2
-my $check_categorytype=$input->param('check_categorytype');
# NOTE: Alert for ethnicity and ethnotes fields, they are invalid in all borrowers form
my $borrower_data;
my $NoUpdateLogin;
foreach (@field_check) {
$template->param( "mandatory$_" => 1);
}
-# we'll need this, later.
-my $dateofbirthmandatory = (scalar grep {$_ eq "dateofbirth"} @field_check) ? 1 : 0;
# function to designate unwanted fields
my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField");
@field_check=split(/\|/,$check_BorrowerUnwantedField);
( $borrower_data = GetMember( 'borrowernumber' => $borrowernumber ) ) if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' );
my $categorycode = $input->param('categorycode') || $borrower_data->{'categorycode'};
my $category_type = $input->param('category_type') || '';
-if ($category_type){
- $template->{VARS}->{'type_only'} = 1;
-}
-my $new_c_type = $category_type; #if we have input param, then we've already chosen the cat_type.
unless ($category_type or !($categorycode)){
my $borrowercategory = GetBorrowercategory($categorycode);
$category_type = $borrowercategory->{'category_type'};
my $category_name = $borrowercategory->{'description'};
$template->param("categoryname"=>$category_name);
- }
+}
$category_type="A" unless $category_type; # FIXME we should display a error message instead of a 500 error !
# if a add or modify is requested => check validity of data.
if ( !$check_member ) {
$nodouble = 1;
}
-
- # recover the category type if the borrowers is a doublon
- if ($check_category) {
- my $tmpborrowercategory = GetBorrowercategory($check_category);
- $check_categorytype = $tmpborrowercategory->{'category_type'};
- }
}
#recover all data from guarantor address phone ,fax...
-if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P' )) {
+if ( $guarantorid ) {
if (my $guarantordata=GetMember(borrowernumber => $guarantorid)) {
+ $category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C';
$guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'};
$newdata{'contactfirstname'}= $guarantordata->{'firstname'};
$newdata{'contactname'} = $guarantordata->{'surname'};
# If the cardnumber is blank, treat it as null.
$newdata{'cardnumber'} = undef if $newdata{'cardnumber'} =~ /^\s*$/;
- if (checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){
- push @errors, 'ERROR_cardnumber';
- }
- if ($newdata{dateofbirth} && $dateofbirthmandatory) {
+ if (my $error_code = checkcardnumber($newdata{cardnumber},$newdata{borrowernumber})){
+ push @errors, $error_code == 1
+ ? 'ERROR_cardnumber_already_exists'
+ : $error_code == 2
+ ? 'ERROR_cardnumber_length'
+ : ()
+ }
+
+ if ( $newdata{dateofbirth} ) {
my $age = GetAge($newdata{dateofbirth});
my $borrowercategory=GetBorrowercategory($newdata{'categorycode'});
my ($low,$high) = ($borrowercategory->{'dateofbirthrequired'}, $borrowercategory->{'upperagelimit'});
}
}
}
- # Check if the userid is unique
- unless (Check_Userid($newdata{'userid'},$borrowernumber)) {
+ # Check if the 'userid' is unique. 'userid' might not always be present in
+ # the edited values list when editing certain sub-forms. Get it straight
+ # from the DB if absent.
+ my $userid = $newdata{ userid } // $borrower_data->{ userid };
+ unless (Check_Userid($userid,$borrowernumber)) {
push @errors, "ERROR_login_exist";
}
push @errors, "ERROR_password_mismatch" if ( $password ne $password2 );
push @errors, "ERROR_short_password" if( $password && $minpw && $password ne '****' && (length($password) < $minpw) );
+ # Validate emails
+ my $emailprimary = $input->param('email');
+ my $emailsecondary = $input->param('emailpro');
+ my $emailalt = $input->param('B_email');
+
+ if ($emailprimary) {
+ push (@errors, "ERROR_bad_email") if (!Email::Valid->address($emailprimary));
+ }
+ if ($emailsecondary) {
+ push (@errors, "ERROR_bad_email_secondary") if (!Email::Valid->address($emailsecondary));
+ }
+ if ($emailalt) {
+ push (@errors, "ERROR_bad_email_alternative") if (!Email::Valid->address($emailalt));
+ }
+
if (C4::Context->preference('ExtendedPatronAttributes')) {
$extended_patron_attributes = parse_extended_patron_attributes($input);
foreach my $attr (@$extended_patron_attributes) {
unless (C4::Members::Attributes::CheckUniqueness($attr->{code}, $attr->{value}, $borrowernumber)) {
+ my $attr_info = C4::Members::AttributeTypes->fetch($attr->{code});
push @errors, "ERROR_extended_unique_id_failed";
- $template->param(ERROR_extended_unique_id_failed_value => "$attr->{code}/$attr->{value}");
+ $template->param(
+ ERROR_extended_unique_id_failed_code => $attr->{code},
+ ERROR_extended_unique_id_failed_value => $attr->{value},
+ ERROR_extended_unique_id_failed_description => $attr_info->description()
+ );
}
}
}
}
}
- if ($data{'organisations'}){
- # need to add the members organisations
- my @orgs=split(/\|/,$data{'organisations'});
- add_member_orgs($borrowernumber,\@orgs);
- }
if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
}
if (C4::Context->preference('EnhancedMessagingPreferences') and $input->param('setting_messaging_prefs')) {
C4::Form::MessagingPreferences::handle_form_action($input, { borrowernumber => $borrowernumber }, $template, 1, $newdata{'categorycode'});
}
+ # Try to do the live sync with the Norwegian national patron database, if it is enabled
+ if ( exists $data{'borrowernumber'} && C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
+ NLSync({ 'borrowernumber' => $borrowernumber });
+ }
} elsif ($op eq 'save'){
if ($NoUpdateLogin) {
delete $newdata{'password'};
delete $newdata{'userid'};
}
- &ModMember(%newdata) unless scalar(keys %newdata) <= 1; # bug 4508 - avoid crash if we're not
+ &ModMember(%newdata) unless scalar(keys %newdata) <= 1; # bug 4508 - avoid crash if we're not
# updating any columns in the borrowers table,
# which can happen if we're only editing the
# patron attributes or messaging preferences sections
if ( $step == 4 ) {
$template->param( categorycode => $borrower_data->{'categorycode'} );
}
+ # Add sync data to the user data
+ if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
+ my $sync = NLGetSyncDataFromBorrowernumber( $borrowernumber );
+ if ( $sync ) {
+ $template->param(
+ sync => $sync->sync,
+ );
+ }
+ }
}
if ( $op eq "duplicate" ) {
$template->param( updtype => 'I' );
$userbranch = C4::Context->userenv->{'branch'};
}
-if (defined ($data{'branchcode'}) and ( $op eq 'modify' || ( $op eq 'add' && $category_type eq 'C' ) )) {
+if (defined ($data{'branchcode'}) and ( $op eq 'modify' || $op eq 'duplicate' || ( $op eq 'add' && $category_type eq 'C' ) )) {
$userbranch = $data{'branchcode'};
}
$template->param(no_categories => 1);
}
$template->param(no_add => $no_add);
-my $CGIorganisations;
-my $member_of_institution;
-if (C4::Context->preference("memberofinstitution")){
- my $organisations=get_institutions();
- my @orgs;
- my %org_labels;
- foreach my $organisation (keys %$organisations) {
- push @orgs,$organisation;
- $org_labels{$organisation}=$organisations->{$organisation}->{'surname'};
- }
- $member_of_institution=1;
-
- $CGIorganisations = CGI::scrolling_list( -id => 'organisations',
- -name => 'organisations',
- -labels => \%org_labels,
- -values => \@orgs,
- -size => 5,
- -multiple => 'true'
-
- );
-}
-
# --------------------------------------------------------------------------------------------------------
-my $CGIsort = buildCGIsort("Bsort1","sort1",$data{'sort1'});
-if ($CGIsort) {
- $template->param(CGIsort1 => $CGIsort);
-}
-$template->param( sort1 => $data{'sort1'}); # shouldn't this be in an "else" statement like the 2nd one?
-
-$CGIsort = buildCGIsort("Bsort2","sort2",$data{'sort2'});
-if ($CGIsort) {
- $template->param(CGIsort2 => $CGIsort);
-} else {
- $template->param( sort2 => $data{'sort2'});
-}
+$template->param( sort1 => $data{'sort1'});
+$template->param( sort2 => $data{'sort2'});
if ($nok) {
foreach my $error (@errors) {
borrotitlepopup => $borrotitlepopup,
guarantorinfo => $guarantorinfo,
flagloop => \@flagdata,
- check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
category_type =>$category_type,
modify => $modify,
nok => $nok,#flag to konw if an error
- memberofinstution => $member_of_institution,
- CGIorganisations => $CGIorganisations,
NoUpdateLogin => $NoUpdateLogin
);
$template->param("contacttitle_" . $data{'contacttitle'} => "SELECTED");
}
-
+
+my ( $min, $max ) = C4::Members::get_cardnumber_length();
+if ( defined $min ) {
+ $template->param(
+ minlength_cardnumber => $min,
+ maxlength_cardnumber => $max
+ );
+}
+
output_html_with_http_headers $input, $cookie, $template->output;
sub parse_extended_patron_attributes {
};
if (exists $attr_hash{$attr_type->code()}) {
foreach my $attr (@{ $attr_hash{$attr_type->code()} }) {
- my $newentry = { map { $_ => $entry->{$_} } %$entry };
+ my $newentry = { %$entry };
$newentry->{value} = $attr->{value};
$newentry->{password} = $attr->{password};
$newentry->{use_dropdown} = 0;
}
} else {
$i++;
- my $newentry = { map { $_ => $entry->{$_} } %$entry };
+ my $newentry = { %$entry };
if ($attr_type->authorised_value_category()) {
$newentry->{use_dropdown} = 1;
$newentry->{auth_val_loop} = GetAuthorisedValues($attr_type->authorised_value_category());
projects / koha.git / blobdiff