X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-userupdate.pl;h=f8273ce9c88c84dcd76cb6bf35b6bafd96b51485;hb=8b65b94636398729e5d919ca2eb6334e8013bdae;hp=2e8fb5e255e54ed97e8042ebd84c0d2a7f467b75;hpb=2a3f7c141798121a75fc9ee670af0fdde431d9c2;p=koha_fer

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index 2e8fb5e255..f8273ce9c8 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -48,12 +48,13 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 
 # get borrower information ....
 my ( $borr ) = GetMemberDetails( $borrowernumber );
+my ( $patronemail ) = GetFirstValidEmailAddress($borrowernumber);
 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', 'email','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','state','zipcode','country','phone','mobile','fax','phonepro', 'emailaddress','emailpro','B_streetnumber','B_address','B_address2','B_city','B_state','B_zipcode','B_country','B_phone','B_email','dateofbirth','sex'
 );
 my $update;
 my $updateemailaddress = $lib->{'branchemail'};
@@ -80,6 +81,10 @@ if ( !$updateemailaddress || $updateemailaddress eq '' ) {
     exit;
 }
 
+if ( !$patronemail || $patronemail eq '' ) {
+	$patronemail = $updateemailaddress;
+};
+
 if ( $query->param('modify') ) {
 
     # get all the fields:
@@ -117,7 +122,7 @@ EOF
     $message .= "\n\nThanks,\nKoha\n\n";
     my %mail = (
         To      => $updateemailaddress,
-        From    => $updateemailaddress,
+        From    => $patronemail,
         Subject => "User Request for update of Record.",
         Message => $message,
         'Content-Type' => 'text/plain; charset="utf8"',