Fixes a bug with MARChtml2xml and sync with dev_week

[koha.git] / opac / opac-userupdate.pl

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index c609da1..830a6a7 100755 (executable)
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -1,14 +1,36 @@
 #!/usr/bin/perl
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# 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
+
+
 use strict;
 require Exporter;
 use CGI;
 use Mail::Sendmail;
 
 use C4::Auth;         # checkauth, getborrowernumber.
+use C4::Context;
 use C4::Koha;
 use C4::Circulation::Circ2;
+use C4::Interface::CGI::Output;
 use HTML::Template;
-
+use C4::Date;
+use C4::Members;
 
 my $query = new CGI;
 
@@ -29,13 +51,31 @@ my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
 # collect the form values and send an email.
 my @fields = ('title', 'surname', 'firstname', 'phone', 'faxnumber', 'streetaddress', 'emailaddress', 'city');
 my $update;
-my $updateemailaddress = "finlay\@katipo.co.nz";      #Will have to change this! !!!!!!!!!!!!!!!!!!!
+my $updateemailaddress= C4::Context->preference('KohaAdminEmailAddress');
+if ($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({template_name => "kohaerror.tmpl",
+                            query => $query,
+                            type => "opac",
+                            authnotrequired => 1,
+                            flagsrequired => {borrow => 1},
+                            debug => 1,
+                            });
+
+    $template->param(errormessage => 'KohaAdminEmailAddress system preference
+    is not set.  Please visit the library to update your user record');
+
+    output_html_with_http_headers $query, $cookie, $template->output;
+    exit;
+}
+
 if ($query->{'title'}) {
     # get all the fields:
     my $message = <<"EOF";
-Borrower $borr->{'cardnumber'} http://intradev.katipo.co.nz/cgi-bin/koha/moremember.pl?bornum=$borrowernumber
+Borrower $borr->{'cardnumber'}
 
-has requested to change their personal details. Please check these new details and make the changes:
+has requested to change her/his personal details.
+Please check these new details and make the changes:
 EOF
     foreach my $field (@fields){
        my $newfield = $query->param($field);
@@ -50,6 +90,7 @@ EOF
 # do something if it works....
        warn "Mail sent ok\n";
        print $query->redirect('/cgi-bin/koha/opac-user.pl');
+       exit;
     } else {
 # do something if it doesnt work....
         warn "Error sending mail: $Mail::Sendmail::error \n";
@@ -57,15 +98,16 @@ EOF
 }
 
 
-$borr->{'dateenrolled'} = slashifyDate($borr->{'dateenrolled'});
-$borr->{'expiry'}       = slashifyDate($borr->{'expiry'});
-$borr->{'dateofbirth'}  = slashifyDate($borr->{'dateofbirth'});
+$borr->{'dateenrolled'} = format_date($borr->{'dateenrolled'});
+$borr->{'expiry'}       = format_date($borr->{'expiry'});
+$borr->{'dateofbirth'}  = format_date($borr->{'dateofbirth'});
 $borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
 
 
 my @bordat;
 $bordat[0] = $borr;
 
-$template->param(BORROWER_INFO => \@bordat);
+$template->param(BORROWER_INFO => \@bordat,
+);
 
-print $query->header(-cookie => $cookie), $template->output;
+output_html_with_http_headers $query, $cookie, $template->output;