X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-userupdate.pl;h=3b90498ef537d7212666dd39758962147ee40289;hb=afccbfcce7192c6e1fcd73f137135cb5289c3d3d;hp=deac903696e47f583deacfcf26f95e0bf54c446a;hpb=8138b6dcacaeb283ecce3318c4e13667aed3b60f;p=koha.git

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index deac903696..3b90498ef5 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -13,14 +13,16 @@
 # 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;
-require Exporter;
+use warnings;
+
 use CGI;
 use Mail::Sendmail;
+use Encode;
 
 use C4::Auth;    # checkauth, getborrowernumber.
 use C4::Context;
@@ -46,19 +48,19 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 # get borrower information ....
-my ( $borr, $flags ) = GetMemberDetails( $borrowernumber );
+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',    'phone',
-    'fax', 'address','address2','city','zipcode','phone','mobile','fax','phonepro', 'emailaddress','B_streetaddress','B_city','B_zipcode','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'};
 $updateemailaddress = C4::Context->preference('KohaAdminEmailAddress') unless( $updateemailaddress =~ /\w+@\w+/);
-if ( $updateemailaddress eq '' ) {
+if ( !$updateemailaddress || $updateemailaddress eq '' ) {
     warn
 "KohaAdminEmailAddress system preference not set.  Couldn't send patron update information for $borr->{'firstname'} $borr->{'surname'} (#$borrowernumber)\n";
     my ($template) = get_template_and_user(
@@ -73,39 +75,63 @@ if ( $updateemailaddress eq '' ) {
     );
 
     $template->param(
-        errormessage => 'KohaAdminEmailAddress system preference
-    is not set.  Please visit the library to update your user record'
+        noadminemail => 1,
     );
 
     output_html_with_http_headers $query, $cookie, $template->output;
     exit;
 }
 
-if ( $query->{'modify'} ) {
+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'} || '';
+    my $address = $borr->{'address'} || '';
+    my $address2 = $borr->{'address2'} || '';
+    my $B_streetnumber = $borr->{'B_streetnumber'} || '';
+    my $B_address = $borr->{'B_address'} || '';
+    my $B_address2 = $borr->{'B_address2'} || '';
+
     foreach my $field (@fields) {
-        my $newfield = $query->param($field);
-        $message .= "$field : $borr->{$field}  -->  $newfield\n";
+        my $newfield = decode('utf-8',$query->param($field)) || '';
+        my $borrowerfield = '';
+        if($borr->{$field}) {
+            $borrowerfield = $borr->{$field};
+        }
+        
+        if($field eq "dateofbirth") {
+           $borrowerfield  = format_date( $borr->{'dateofbirth'} ) || '';
+        }
+
+        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
+        Message => encode('utf-8', $message), # Mail::Sendmail doesn't like wide characters
+        'Content-Type' => 'text/plain; charset="utf-8"',
     );
 
     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;
     }
@@ -116,10 +142,8 @@ EOF
     }
 }
 
-$borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
-$borr->{'expiry'}       = format_date( $borr->{'expiry'} );
-$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');
@@ -129,6 +153,30 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     }
 }
 
+my $checkin_prefs  = C4::Members::Messaging::GetMessagingPreferences({
+    borrowernumber => $borrowernumber,
+    message_name   => 'Item Checkout'
+});
+for ( keys %{ $checkin_prefs->{transports} }) {
+    $borr->{"items_returned_$_"} = 1;
+}
+my $checkout_prefs = C4::Members::Messaging::GetMessagingPreferences({
+    borrowernumber => $borrowernumber,
+    message_name   => 'Item Check-in'
+});
+for ( keys %{ $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;