From: Garry Collum <gcollum@gmail.com>
Date: Wed, 12 Aug 2009 00:46:21 +0000 (-0400)
Subject: Bug 2505: Enabled warnings in opac-userupdate.pl
X-Git-Tag: v3.02.00-alpha~256
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=90d1248a1ba6c1221327b20fda4eef752589ce3b;p=koha_fer

Bug 2505: Enabled warnings in opac-userupdate.pl

Enabled warnings.  Corrected all resulting warnings by initializing variables.

Some fixes and enhancements possibly related to Bug: 1153 - Existing B_address now shows in the resulting email. Birthdate now appears in the email using the System's default format. If the patron changes data in the form data took place the FIELD name now appears as uppercase in the resulting email.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index ebfe619e21..866431601a 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -18,6 +18,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
 
 use CGI;
 use Mail::Sendmail;
@@ -52,8 +53,8 @@ my $lib = GetBranchDetail($borr->{'branchcode'});
 # handle the new information....
 # collect the form values and send an email.
 my @fields = (
-    'surname',       'firstname',    'phone',
-    'fax', 'address','address2','city','zipcode','phone','mobile','fax','phonepro', 'emailaddress','B_streetaddress','B_city','B_zipcode','dateofbirth','sex'
+    'surname',       'firstname', 
+    'address','address2','city','zipcode','phone','mobile','fax','phonepro', 'emailaddress','B_streetaddress','B_city','B_zipcode','dateofbirth','sex'
 );
 my $update;
 my $updateemailaddress = $lib->{'branchemail'};
@@ -89,9 +90,30 @@ Borrower $borr->{'cardnumber'}
 has requested to change her/his personal details.
 Please check these new details and make the changes:
 EOF
+
+    my $B_streetnumber = $borr->{'B_streetnumber'} || '';
+    my $B_address = $borr->{'B_address'} || '';
+
     foreach my $field (@fields) {
-        my $newfield = $query->param($field);
-        $message .= "$field : $borr->{$field}  -->  $newfield\n";
+        my $newfield = $query->param($field) || '';
+        my $borrowerfield = '';
+        if($borr->{$field}) {
+            $borrowerfield = $borr->{$field};
+        }
+        # reconstruct the alternate address
+        if($field eq "B_streetaddress") {
+            $borrowerfield = "$B_streetnumber $B_address";
+        }
+
+        if($field eq "dateofbirth") {
+           $borrowerfield  = format_date( $borr->{'dateofbirth'} ) || '';
+        }
+
+        if($borrowerfield eq $newfield) {
+            $message .= "$field : $borrowerfield  -->  $newfield\n";
+        } else {
+            $message .= uc($field) . " : $borrowerfield  -->  $newfield\n";
+        }
     }
     $message .= "\n\nThanks,\nKoha\n\n";
     my %mail = (