add locale test (Closes: 576) and remove crap underlining

[koha.git] / jmemberentry.pl

diff --git a/jmemberentry.pl b/jmemberentry.pl
index 48212fc..921ce69 100755 (executable)
--- a/jmemberentry.pl
+++ b/jmemberentry.pl
@@ -22,16 +22,25 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use C4::Auth;
 use C4::Output;
 use CGI;
 use C4::Search;
 use HTML::Template;
+use C4::Interface::CGI::Output;
+use C4::Date;
+use C4::Members;
 
 my $input = new CGI;
 
-my $theme = $input->param('theme'); # only used if allowthemeoverride is set
-my %tmpldata = pathtotemplate ( template => 'jmemberentry.tmpl', theme => $theme );
-my $template = HTML::Template->new(filename => $tmpldata{'path'}, die_on_bad_params => 0);
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/jmemberentry.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1},
+                            debug => 1,
+                            });
 
 my $member=$input->param('bornum');
 if ($member eq ''){
@@ -42,6 +51,7 @@ my $type=$input->param('type');
 my $data=borrdata('',$member);
 
 my @titles = ('Miss', 'Mrs', 'Ms', 'Mr', 'Dr', 'Sir');
+       # FIXME - Assumes English. This ought to be made part of i18n.
 my @titledata;
 while (@titles) {
   my $title = shift @titles;
@@ -57,7 +67,7 @@ while (@titles) {
 # get the data for children
 my $cmember1=NewBorrowerNumber();
 my @cmemdata;
-for (my $i=0;$i<3;$i++){
+for (my $i=0;$i<1;$i++){
   my %row;
   $row{'cmember'}=$cmember1+$i;
   $row{'i'}=$i;
@@ -65,16 +75,16 @@ for (my $i=0;$i<3;$i++){
   push(@cmemdata, \%row);
 }
 
+my $jcardnumber=C4::Members::fixup_cardnumber("");
 
-$template->param( startmenumember => startmenu('member'),
-                       endmenumember   => endmenu('member'),
-                       member          => $member,
+$template->param( member => $member,
                        firstname       => $data->{'firstname'},
                        surname         => $data->{'surname'},
                        cardnumber      => $data->{'cardnumber'},
+                       jcardnumber     => $jcardnumber,
                        area            => $data->{'area'},
                        city            => $data->{'city'},
-                       address         => $data->{'address'},
+                       physstreet         => $data->{'physstreet'},
                        streetaddress   => $data->{'streetaddress'},
                        streetcity      => $data->{'streetcity'},
                        phone           => $data->{'phone'},
@@ -83,7 +93,9 @@ $template->param( startmenumember => startmenu('member'),
                        emailaddress    => $data->{'emailaddress'},
                        contactname     => $data->{'contactname'},
                        altphone        => $data->{'altphone'},
+                       dateformat      => display_date_format(),
                        titleloop       => \@titledata,
                        cmemloop        => \@cmemdata );
 
-print "Content-Type: text/html\n\n", $template->output;
+
+output_html_with_http_headers $input, $cookie, $template->output;