[Koha-cvs] CVS: koha detail.pl,1.13,1.14

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv6726

Modified Files:
        detail.pl 
Log Message:
merging from 1.2 : adding auth
seems to work poorly. Please steve/finlay, fixme or explain...

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/detail.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** detail.pl   5 Oct 2002 09:45:00 -0000       1.13
--- detail.pl   9 Oct 2002 15:48:15 -0000       1.14
***************
*** 25,30 ****
  use CGI;
  use C4::Search;
!  
  my $query=new CGI;
  
  my $biblionumber=$query->param('bib');
--- 25,35 ----
  use CGI;
  use C4::Search;
! use C4::Auth;
! 
  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');
***************
*** 40,46 ****
  
  
- warn "Biblionumber: $biblionumber";
- warn "Norequests: $norequests"; 
- 
  
  my $dat=bibdata($biblionumber);
--- 45,48 ----
***************
*** 66,78 ****
  my address@hidden;
  
- my $includes = C4::Context->config('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 $count=1;
  
--- 68,80 ----
  my address@hidden;
  
  my $startfrom=$query->param('startfrom');
  ($startfrom) || ($startfrom=0);
  
+ my $template;
+ if ($type='opac') {
+       $template = gettemplate("catalogue/detail-opac.tmpl");
+ } else {
+       $template=gettemplate("catalogue/detail.tmpl");
+ }
  my $count=1;
  
***************
*** 87,97 ****
  $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;
  
--- 89,97 ----
  $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;