X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=detail.pl;h=d39c1828a10655276e0943679a4c3ab6f62c6b84;hb=ccc963ab5696f1bb443addb3e1dfaa6a05ffd2c7;hp=6c8605989a3cc9f92b9d3a226ab337636fdcb35e;hpb=7eab6cbfdab9a80c57b2258b05d780d8df815761;p=koha_gimpoz

diff --git a/detail.pl b/detail.pl
index 6c8605989a..d39c1828a1 100755
--- a/detail.pl
+++ b/detail.pl
@@ -20,36 +20,20 @@
 use HTML::Template;
 use strict;
 require Exporter;
-use C4::Database;
-use C4::Output;  # contains picktemplate
+use C4::Context;
+use C4::Output;  # contains gettemplate
 use CGI;
 use C4::Search;
- 
-my $query=new CGI;
-
-
-my $language='french';
+use C4::Auth;
 
-
-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 $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';
+#my $type='intra';	# FIXME - There's already a $type in this scope
 
 
 # change back when ive fixed request.pl
@@ -60,9 +44,6 @@ foreach my $itm (@items) {
 }
 
 
-warn "Biblionumber: $biblionumber";
-warn "Norequests: $norequests"; 
-
 
 my $dat=bibdata($biblionumber);
 my ($authorcount, $addauthor)= &addauthor($biblionumber);
@@ -86,15 +67,15 @@ my $itemsarray=\@items;
 my $webarray=\@webbiblioitems;
 my $sitearray=\@websites;
 
-my $includes=$configfile{'includes'};
-($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
-my $templatebase="catalogue/detail.tmpl";
 my $startfrom=$query->param('startfrom');
 ($startfrom) || ($startfrom=0);
-my $theme=picktemplate($includes, $templatebase);
-
-my $template = HTML::Template->new(filename => "$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => [$includes]);
 
+my $template;
+if ($type eq 'opac') {
+	$template = gettemplate("catalogue/detail-opac.tmpl");
+} else {
+	$template=gettemplate("catalogue/detail.tmpl");
+}
 my $count=1;
 
 # now to get the items into a hash we can use and whack that thru
@@ -107,12 +88,10 @@ 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(template => $templatename);
-# $template->param(search => $search);
-$template->param(includesdir => $includes);
 $template->param(BIBLIO_RESULTS => $resultsarray);
 $template->param(ITEM_RESULTS => $itemsarray);
 $template->param(WEB_RESULTS => $webarray);
 $template->param(SITE_RESULTS => $sitearray);
-print "Content-Type: text/html\n\n", $template->output;
+$template->param(loggedinuser => $loggedinuser);
+print $query->header(-cookie => $cookie), $template->output;