[Koha-patches] [PATCH 3/6] Bug 5453 Move declarations out of conditionals
Colin Campbell
colin.campbell at ptfs-europe.com
Mon Nov 29 18:58:25 CET 2010
Fix im members scripts
---
members/mancredit.pl | 7 +++++--
members/maninvoice.pl | 7 +++++--
members/memberentry.pl | 38 +++++++++++++++++++++-----------------
3 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/members/mancredit.pl b/members/mancredit.pl
index 51b71d6..42f8274 100755
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -42,8 +42,11 @@ my $data=GetMember('borrowernumber' => $borrowernumber);
my $add=$input->param('add');
if ($add){
- my $barcode=$input->param('barcode');
- my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode;
+ my $barcode = $input->param('barcode');
+ my $itemnum;
+ if ($barcode) {
+ $itemnum = GetItemnumberFromBarcode($barcode);
+ }
my $desc=$input->param('desc');
my $amount=$input->param('amount') || 0;
$amount = -$amount;
diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index df12a2a..49b8611 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -42,8 +42,11 @@ my $data=GetMember('borrowernumber'=>$borrowernumber);
my $add=$input->param('add');
if ($add){
# print $input->header;
- my $barcode=$input->param('barcode');
- my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode;
+ my $barcode = $input->param('barcode');
+ my $itemnum;
+ if ($barcode) {
+ $itemnum = GetItemnumberFromBarcode($barcode);
+ }
my $desc=$input->param('desc');
my $amount=$input->param('amount');
my $type=$input->param('type');
diff --git a/members/memberentry.pl b/members/memberentry.pl
index fbd8538..dd4c069 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -177,24 +177,28 @@ if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') {
}
#############test for member being unique #############
-if (($op eq 'insert') and !$nodouble){
- my $category_type_send=$category_type if ($category_type eq 'I');
- my $check_category; # recover the category code of the doublon suspect borrowers
- # ($result,$categorycode) = checkuniquemember($collectivity,$surname,$firstname,$dateofbirth)
- ($check_member,$check_category) = checkuniquemember(
- $category_type_send,
- ($newdata{surname} ? $newdata{surname} : $data{surname} ),
- ($newdata{firstname} ? $newdata{firstname} : $data{firstname} ),
- ($newdata{dateofbirth} ? $newdata{dateofbirth} : $data{dateofbirth})
- );
- if(!$check_member){
- $nodouble = 1;
- }
- # recover the category type if the borrowers is a doublon
+if ( ( $op eq 'insert' ) and !$nodouble ) {
+ my $category_type_send;
+ if ( $category_type eq 'I' ) {
+ $category_type_send = $category_type;
+ }
+ my $check_category; # recover the category code of the doublon suspect borrowers
+ # ($result,$categorycode) = checkuniquemember($collectivity,$surname,$firstname,$dateofbirth)
+ ( $check_member, $check_category ) = checkuniquemember(
+ $category_type_send,
+ ( $newdata{surname} ? $newdata{surname} : $data{surname} ),
+ ( $newdata{firstname} ? $newdata{firstname} : $data{firstname} ),
+ ( $newdata{dateofbirth} ? $newdata{dateofbirth} : $data{dateofbirth} )
+ );
+ 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'};
- }
+ my $tmpborrowercategory = GetBorrowercategory($check_category);
+ $check_categorytype = $tmpborrowercategory->{'category_type'};
+ }
}
#recover all data from guarantor address phone ,fax...
--
1.7.3.2
More information about the Koha-patches
mailing list