OPAC basket CGI

[koha.git] / detail.pl

diff --git a/detail.pl b/detail.pl
index b4d48f4..2932a76 100755 (executable)
--- a/detail.pl
+++ b/detail.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -25,16 +26,14 @@ use C4::Output;  # contains gettemplate
 use CGI;
 use C4::Search;
 use C4::Auth;
+use C4::Interface::CGI::Output;
+use C4::Date;
 
 my $query=new CGI;
 my $type=$query->param('type');
-(-e "opac") && ($type='opac');
 ($type) || ($type='intra');
-my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0));
 
 my $biblionumber=$query->param('bib');
-my $type='intra';      # FIXME - There's already a $type in this scope
-
 
 # change back when ive fixed request.pl
 my @items = ItemInfo(undef, $biblionumber, $type);
@@ -70,28 +69,38 @@ my $sitearray=\@websites;
 my $startfrom=$query->param('startfrom');
 ($startfrom) || ($startfrom=0);
 
-my $template;
-if ($type eq 'opac') {
-       $template = gettemplate("catalogue/detail-opac.tmpl");
-} else {
-       $template=gettemplate("catalogue/detail.tmpl");
-}
+my ($template, $loggedinuser, $cookie) = get_template_and_user({
+       template_name   => ($type eq 'opac'? 'catalogue/detail-opac.tmpl':
+                                            'catalogue/detail.tmpl'),
+       query           => $query,
+       type            => "intranet",
+       authnotrequired => ($type eq 'opac'),
+       flagsrequired   => {catalogue => 1},
+    });
+
 my $count=1;
 
 # now to get the items into a hash we can use and whack that thru
 
 
-$template->param(startfrom => $startfrom+1);
-$template->param(endat => $startfrom+20);
-$template->param(numrecords => $count);
 my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20);
 my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0);
-$template->param(nextstartfrom => $nextstartfrom);
-$template->param(prevstartfrom => $prevstartfrom);
-$template->param(BIBLIO_RESULTS => $resultsarray);
-$template->param(ITEM_RESULTS => $itemsarray);
-$template->param(WEB_RESULTS => $webarray);
-$template->param(SITE_RESULTS => $sitearray);
-$template->param(loggedinuser => $loggedinuser);
-print $query->header(-cookie => $cookie), $template->output;
-
+$template->param(startfrom => $startfrom+1,
+                                               endat => $startfrom+20,
+                                               numrecords => $count,
+                                               nextstartfrom => $nextstartfrom,
+                                               prevstartfrom => $prevstartfrom,
+                                               BIBLIO_RESULTS => $resultsarray,
+                                               ITEM_RESULTS => $itemsarray,
+                                               WEB_RESULTS => $webarray,
+                                               SITE_RESULTS => $sitearray,
+                                               loggedinuser => $loggedinuser,
+                                               biblionumber => $biblionumber,
+                                               );
+
+output_html_with_http_headers $query, $cookie, $template->output;
+
+
+# Local Variables:
+# tab-width: 8
+# End: