X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-userupdate.pl;h=b37d88c3dacb20f6006d520f2bad044aebc77673;hb=84f53799d7574693e1dd520230a2bba9ab439703;hp=8495d349ddc709b4160526afb8a58e6057659302;hpb=8594f3f14196641040fe1900b6fec2e1b050df06;p=koha_gimpoz

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index 8495d349dd..b37d88c3da 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -13,9 +13,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -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,14 +81,17 @@ 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 to these fields:
 
-has requested to change her/his personal details.
-Please check these new details and make the changes:
 EOF
 
     my $streetnumber = $borr->{'streetnumber'} || '';
@@ -104,30 +108,21 @@ 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'} ) || '';
         }
 
-        if($borrowerfield eq $newfield) {
-            $message .= "$field : $borrowerfield  -->  $newfield\n";
-        } else {
-            $message .= uc($field) . " : $borrowerfield  -->  $newfield\n";
+        if($borrowerfield ne $newfield) {
+            $message .= $field . " : $borrowerfield  -->  $newfield\n";
         }
     }
+
+    $message .= "\nEdit this patron's record: http://".C4::Context->preference('staffClientBaseURL ')."/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=".$borr->{'borrowernumber'}."&categorycode=".$borr->{'categorycode'} if C4::Context->preference('staffClientBaseURL ');
+
     $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"',
@@ -136,7 +131,6 @@ EOF
     if ( sendmail %mail ) {
 
         # do something if it works....
-        warn "Mail sent ok\n";
         print $query->redirect('/cgi-bin/koha/opac-user.pl?patronupdate=sent');
         exit;
     }
@@ -147,10 +141,8 @@ EOF
     }
 }
 
-$borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
-$borr->{'dateexpiry'}       = format_date( $borr->{'dateexpiry'} );
-$borr->{'dateofbirth'}  = format_date( $borr->{'dateofbirth'} );
 $borr->{'ethnicity'}    = fixEthnicity( $borr->{'ethnicity'} );
+$borr->{'branchname'}   = GetBranchName($borr->{'branchcode'});
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac');
@@ -175,6 +167,15 @@ for (@{ $checkout_prefs->{transports} }) {
     $borr->{"items_borrowed_$_"} = 1;
 }
 
+if (C4::Context->preference('OPACpatronimages')) {
+    my ($image, $dberror) = GetPatronImage($borr->{'cardnumber'});
+    if ($image) {
+        $template->param(
+            display_patron_image => 1
+        );
+    }
+}
+
 my @bordat;
 $bordat[0] = $borr;