Using destination parameter to return users to circulation if they clicked the 'edit...

[koha.git] / moredetail.pl

diff --git a/moredetail.pl b/moredetail.pl
index f8dbb5c..ab48f13 100755 (executable)
--- a/moredetail.pl
+++ b/moredetail.pl
@@ -1,6 +1,9 @@
 #!/usr/bin/perl
+# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
 
-# Copyright 2000-2002 Katipo Communications
+# $Id$
+
+# Copyright 2000-2003 Katipo Communications
 #
 # This file is part of Koha.
 #
@@ -23,47 +26,28 @@ require Exporter;
 use C4::Koha;
 use CGI;
 use C4::Search;
-use C4::Acquisitions;
-use C4::Output; # contains picktemplate
-  
-my $query=new CGI;
-
+use C4::Acquisition;
+use C4::Output; # contains gettemplate
+use C4::Auth;
+use C4::Interface::CGI::Output;
+use C4::Date;
 
-my $language='french';
-
-
-my %configfile;
-open (KC, "/etc/koha.conf");
-while (<KC>) {
- chomp;
- (next) if (/^\s*#/);
- if (/(.*)\s*=\s*(.*)/) {
-   my $variable=$1;
-   my $value=$2;
-   # Clean up white space at beginning and end
-   $variable=~s/^\s*//g;
-   $variable=~s/\s*$//g;
-   $value=~s/^\s*//g;
-   $value=~s/\s*$//g;
-   $configfile{$variable}=$value;
- }
-}
-
-my $includes=$configfile{'includes'};
-($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
-my $templatebase="catalogue/moredetail.tmpl";
-my $startfrom=$query->param('startfrom');
-($startfrom) || ($startfrom=0);
-my $theme=picktemplate($includes, $templatebase);
+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
-if ($subject){
-  $templatebase=~ s/searchresults\.tmpl/subject\.tmpl/;
-}
-my $template = HTML::Template->new(filename => "$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => [$includes]);
+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 
+# get variables
 
 my $biblionumber=$query->param('bib');
 my $title=$query->param('title');
@@ -71,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;}
@@ -88,7 +73,6 @@ my $count=@items;
 $data->{'count'}=$count;
 my ($order,$ordernum)=getorder($bi,$biblionumber);
 
-
 my $env;
 $env->{itemcount}=1;
 
@@ -100,25 +84,29 @@ foreach my $item (@items){
     $item->{'withdrawn'}=~ s/0/No/;
     $item->{'withdrawn'}=~ s/1/Yes/;
     $item->{'replacementprice'}+=0.00;
-    my $year=substr($item->{'timestamp0'},0,4);
-    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->{'datelastborrowed'}= format_date($item->{'datelastborrowed'});
+    $item->{'dateaccessioned'} = format_date($item->{'dateaccessioned'});
+    $item->{'datelastseen'} = format_date($item->{'datelastseen'});
     $item->{'ordernumber'} = $ordernum;
     $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
 
-    if ($item->{'date_due'} = 'Available'){
-       $item->{'issue'}="<b>Available</b><br>";
+    if ($item->{'date_due'} eq 'Available'){
+               $item->{'issue'}= 0;
     } else {
-       $item->{'issue'}="<b>Currently on issue to:</b> <a href=/cgi-bin/koha/moremember.pl?bornum=$item->{'borrower0'}>$item->{'card'}</a><br>";
+               $item->{'date_due'} = format_date($item->{'date_due'});
+               $item->{'issue'}= 1;
+               $item->{'borrowernumber'} = $item->{'borrower'};
+               $item->{'cardnumber'} = $item->{'card'};
     }
-         
 }
 
-$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: