X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-userupdate.pl;h=f8273ce9c88c84dcd76cb6bf35b6bafd96b51485;hb=35bc73eca324c371982747f2f0454a71a4f46245;hp=a9d01011a0ff05a2b6a36163e7265bd3750e364f;hpb=d86c4aa8943054be2b94990c9778eacff9ec4259;p=koha.git

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index a9d01011a0..f8273ce9c8 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -40,7 +40,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-userupdate.tmpl",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
         flagsrequired   => { borrow => 1 },
         debug           => 1,
     }
@@ -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', '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','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,11 +81,15 @@ if ( !$updateemailaddress || $updateemailaddress eq '' ) {
     exit;
 }
 
+if ( !$patronemail || $patronemail eq '' ) {
+	$patronemail = $updateemailaddress;
+};
+
 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 +109,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'} ) || '';
         }
@@ -127,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"',
@@ -150,7 +145,7 @@ $borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
 $borr->{'dateexpiry'}   = format_date( $borr->{'dateexpiry'} );
 $borr->{'dateofbirth'}  = format_date( $borr->{'dateofbirth'} );
 $borr->{'ethnicity'}    = fixEthnicity( $borr->{'ethnicity'} );
-$borr->{'branchcode'}   = GetBranchName($borr->{'branchcode'});
+$borr->{'branchname'}   = GetBranchName($borr->{'branchcode'});
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac');