X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=moredetail.pl;h=328cb6e4291c3aa335df4954627c139a35a7225b;hb=58d97ddc24ba71d53218ac51361c012c3cfde010;hp=357169873b3f51bae97f49197e6b594bc302f84a;hpb=54ff89f0912edeae2dd632a168dd010207ca6519;p=koha_fer

diff --git a/moredetail.pl b/moredetail.pl
index 357169873b..328cb6e429 100755
--- a/moredetail.pl
+++ b/moredetail.pl
@@ -1,8 +1,9 @@
 #!/usr/bin/perl
+# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
 
 # $Id$
 
-# Copyright 2000-2002 Katipo Communications
+# Copyright 2000-2003 Katipo Communications
 #
 # This file is part of Koha.
 #
@@ -27,20 +28,26 @@ use CGI;
 use C4::Search;
 use C4::Catalogue;
 use C4::Output; # contains gettemplate
-my $query=new CGI;
+use C4::Auth;
+use C4::Interface::CGI::Output;
+use C4::Date;
 
-my $includes = C4::Context->config('includes') ||
-	"/usr/local/www/hdl/htdocs/includes";
-my $startfrom=$query->param('startfrom') || 0;
+my $query=new CGI;
 
+# FIXME  subject is not exported to the template?
 my $subject=$query->param('subject');
+
 # if its a subject we need to use the subject.tmpl
-my $template;
-if ($subject){
-	$template = gettemplate("catalogue/subject.tmpl");
-} else {
-	$template = gettemplate("catalogue/moredetail.tmpl");
-}
+my ($template, $loggedinuser, $cookie) = get_template_and_user({
+	template_name   => ($subject? 'catalogue/subject.tmpl':
+				      'catalogue/moredetail.tmpl'),
+	query           => $query,
+	type            => "intranet",
+	authnotrequired => 0,
+	flagsrequired   => {catalogue => 1},
+    });
+
+# get variables
 
 my $biblionumber=$query->param('bib');
 my $title=$query->param('title');
@@ -48,6 +55,7 @@ my $bi=$query->param('bi');
 
 my $data=bibitemdata($bi);
 my $dewey = $data->{'dewey'};
+# FIXME Dewey is a string, not a number, & we should use a function
 $dewey =~ s/0+$//;
 if ($dewey eq "000.") { $dewey = "";};
 if ($dewey < 10){$dewey='00'.$dewey;}
@@ -65,6 +73,9 @@ my $count=@items;
 $data->{'count'}=$count;
 my ($order,$ordernum)=getorder($bi,$biblionumber);
 
+my $env;
+$env->{itemcount}=1;
+
 $results[0]=$data;
 
 foreach my $item (@items){
@@ -77,11 +88,12 @@ foreach my $item (@items){
     my $mon=substr($item->{'timestamp0'},4,2);
     my $day=substr($item->{'timestamp0'},6,2);
     $item->{'timestamp0'}="$day/$mon/$year";
-    $item->{'dateaccessioned'} = slashifyDate($item->{'dateaccessioned'});
-    $item->{'datelastseen'} = slashifyDate($item->{'datelastseen'});
+    $item->{'dateaccessioned'} = format_date($item->{'dateaccessioned'});
+    $item->{'datelastseen'} = format_date($item->{'datelastseen'});
     $item->{'ordernumber'} = $ordernum;
     $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
 
+    # FIXME untranslatable strings
     if ($item->{'date_due'} eq 'Available'){
 	$item->{'issue'}="<b>Available</b><br>";
     } else {
@@ -89,8 +101,13 @@ foreach my $item (@items){
     }
 }
 
-$template->param(includesdir => $includes);
 $template->param(BIBITEM_DATA => \@results);
 $template->param(ITEM_DATA => \@items);
-print "Content-Type: text/html\n\n", $template->output;
+$template->param(loggedinuser => $loggedinuser);
+
+output_html_with_http_headers $query, $cookie, $template->output;
+
 
+# Local Variables:
+# tab-width: 8
+# End: