rel_3_0 moved to HEAD

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

diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index 830a6a7..55bbefc 100755 (executable)
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -17,59 +17,68 @@
 # 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::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;
 
-my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name => "opac-userupdate.tmpl",
-                            query => $query,
-                            type => "opac",
-                            authnotrequired => 0,
-                            flagsrequired => {borrow => 1},
-                            debug => 1,
-                            });
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-userupdate.tmpl",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 0,
+        flagsrequired   => { borrow => 1 },
+        debug           => 1,
+    }
+);
 
 # get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-
+my ( $borr, $flags ) = getpatroninformation( undef, $borrowernumber );
 
 # handle the new information....
 # collect the form values and send an email.
-my @fields = ('title', 'surname', 'firstname', 'phone', 'faxnumber', 'streetaddress', 'emailaddress', 'city');
+my @fields = (
+    'title',     'surname',       'firstname',    'phone',
+    'fax', 'streetaddress', 'emailaddress', 'city','phonepro',
+);
 my $update;
-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');
+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'}) {
+if ( $query->{'title'} ) {
+
     # get all the fields:
     my $message = <<"EOF";
 Borrower $borr->{'cardnumber'}
@@ -77,37 +86,42 @@ Borrower $borr->{'cardnumber'}
 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);
-       $message .= "$field : $borr->{$field}  -->  $newfield\n";
+    foreach my $field (@fields) {
+        my $newfield = $query->param($field);
+        $message .= "$field : $borr->{$field}  -->  $newfield\n";
     }
     $message .= "\n\nThanks,\nKoha\n\n";
-    my %mail = ( To      => $updateemailaddress ,
-                From    => $updateemailaddress ,
-                Subject => "User Request for update of Record.",
-                Message => $message );
-    if (sendmail %mail) {
-# 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....
+    my %mail = (
+        To      => $updateemailaddress,
+        From    => $updateemailaddress,
+        Subject => "User Request for update of Record.",
+        Message => $message
+    );
+
+    if ( sendmail %mail ) {
+
+        # 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";
     }
 }
 
-
-$borr->{'dateenrolled'} = format_date($borr->{'dateenrolled'});
-$borr->{'expiry'}       = format_date($borr->{'expiry'});
-$borr->{'dateofbirth'}  = format_date($borr->{'dateofbirth'});
-$borr->{'ethnicity'}    = fixEthnicity($borr->{'ethnicity'});
-
+$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
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;