From 4095d45eaf374f99b1962b8e41c0c10f1c23f76c Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 10 Dec 2010 15:32:20 +0000
Subject: [PATCH] Fix for Bug 5443, Inaccurate highlighting of fields in patron
 update email

- email was incorrectly named emailaddress
- string processing was being done to address and B_address
  which didn't seem to be serving a purpose

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |  2 +-
 opac/opac-userupdate.pl                            | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index 73f5c21941..24c3068742 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -37,7 +37,7 @@
 <li><label for="mobile">Mobile Phone:</label> <input id="mobile" type="text" value="<!-- TMPL_VAR name="mobile" -->"  name="mobile" /></li>
 <li><label for="phonepro">Work phone:</label> <input id="phonepro"  type="text" value="<!-- TMPL_VAR name="phonepro" -->"  name="phonepro" /></li>
 <li><label for="fax">Fax:</label> <input id="fax" type="text" value="<!-- TMPL_VAR name="fax" -->"  name="fax" /></li>
-<li><label for="emailaddress">Email:</label> <input id="emailaddress" type="text" value="<!-- TMPL_VAR name="email" -->"  name="emailaddress" /></li>
+<li><label for="emailaddress">Email:</label> <input id="emailaddress" type="text" value="<!-- TMPL_VAR name="email" -->"  name="email" /></li>
 <li><label for="emailpro">Work Email:</label> <input id="emailpro" type="text" value="<!-- TMPL_VAR name="emailpro" -->"  name="emailpro" /></li>
 </ol>
 </fieldset>
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index ab2e15ddd4..18cafdbe22 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -53,7 +53,7 @@ my $lib = GetBranchDetail($borr->{'branchcode'});
 # handle the new information....
 # collect the form values and send an email.
 my @fields = (
-    'surname','firstname','othernames','streetnumber','address','address2','city','zipcode','country','phone','mobile','fax','phonepro', 'emailaddress','emailpro','B_streetnumber','B_address','B_address2','B_city','B_zipcode','B_country','B_phone','B_email','dateofbirth','sex'
+    'surname','firstname','othernames','streetnumber','address','address2','city','zipcode','country','phone','mobile','fax','phonepro', 'email','emailpro','B_streetnumber','B_address','B_address2','B_city','B_zipcode','B_country','B_phone','B_email','dateofbirth','sex'
 );
 my $update;
 my $updateemailaddress = $lib->{'branchemail'};
@@ -84,7 +84,7 @@ if ( $query->param('modify') ) {
 
     # get all the fields:
     my $message = <<"EOF";
-Borrower $borr->{'cardnumber'}
+Patron $borr->{'cardnumber'}
 
 has requested to change her/his personal details.
 Please check these new details and make the changes:
@@ -104,16 +104,6 @@ EOF
             $borrowerfield = $borr->{$field};
         }
         
-        # reconstruct the address
-        if($field eq "address") {
-            $borrowerfield = "$streetnumber $address, $address2";
-        }
-        
-        # reconstruct the alternate address
-        if($field eq "B_address") {
-            $borrowerfield = "$B_streetnumber $B_address, $B_address2";
-        }
-        
         if($field eq "dateofbirth") {
            $borrowerfield  = format_date( $borr->{'dateofbirth'} ) || '';
         }
-- 
2.39.5