From 747a71aa67aa29825c211c6f17da77a8e1d127c8 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 19 Dec 2002 11:04:14 +0000
Subject: [PATCH] little bugfixes for opac templated. Need "use HTML::Template"
 at the beginning of every script.

Note : opac-reserve does not work at all.
Could katipo/finlay check why ?
---
 opac/opac-account.pl       | 9 ++++++---
 opac/opac-detail.pl        | 1 +
 opac/opac-logout.pl        | 1 +
 opac/opac-membership.pl    | 2 +-
 opac/opac-moredetail.pl    | 1 +
 opac/opac-readingrecord.pl | 1 +
 opac/opac-reserve.pl       | 9 +++++++--
 opac/opac-search.pl        | 4 +++-
 opac/opac-searchresults.pl | 3 ++-
 opac/opac-sidebar.pl       | 1 +
 opac/opac-user.pl          | 1 +
 opac/opac-userdetails.pl   | 1 +
 opac/opac-userupdate.pl    | 1 +
 13 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 9a658c2e85..4d0e27cdca 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -9,9 +9,10 @@ use CGI;
 use C4::Search;
 use C4::Circulation::Circ2;
 use C4::Auth;
+use HTML::Template;
 
 my $query = new CGI;
-my ($template, $borrowernumber, $cookie) 
+my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => "opac-account.tmpl",
 			     query => $query,
 			     type => "opac",
@@ -30,7 +31,7 @@ $template->param( BORROWER_INFO => \@bordat );
 
 
 #get account details
-my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);   
+my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);
 
 for (my $i=0;$i<$numaccts;$i++){
     $accts->[$i]{'amount'}+=0.00;
@@ -53,4 +54,6 @@ $template->param( ACCOUNT_LINES => $accts );
 
 $template->param( total => $total );
 
-print $query->header(-cookie => $cookie), $template->output; 
+#$template->param(loggeninuser => $loggedinuser);
+print $query->header(-cookie => $cookie), $template->output;
+
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 0b32a357d7..93c1243134 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -4,6 +4,7 @@ require Exporter;
 use CGI;
 use C4::Search;
 use C4::Auth;
+use HTML::Template;
 
 my $query=new CGI;
 my ($template, $borrowernumber, $cookie) 
diff --git a/opac/opac-logout.pl b/opac/opac-logout.pl
index 1d707135d1..9fd65e012c 100755
--- a/opac/opac-logout.pl
+++ b/opac/opac-logout.pl
@@ -3,6 +3,7 @@
 use CGI;
 use C4::Context;
 use C4::Output;
+use HTML::Template;
 
 my $query=new CGI;
 
diff --git a/opac/opac-membership.pl b/opac/opac-membership.pl
index 220df6361c..7096e65996 100644
--- a/opac/opac-membership.pl
+++ b/opac/opac-membership.pl
@@ -2,8 +2,8 @@
 use strict;
 require Exporter;
 use CGI;
-
 use C4::Auth;       # get_template_and_user
+use HTML::Template;
 
 my $query = new CGI;
 
diff --git a/opac/opac-moredetail.pl b/opac/opac-moredetail.pl
index 4cc77b498f..59b626fac8 100755
--- a/opac/opac-moredetail.pl
+++ b/opac/opac-moredetail.pl
@@ -10,6 +10,7 @@ use C4::Koha;
 use C4::Output;
 use C4::Acquisitions;
 use C4::Biblio;
+use HTML::Template;
 
 use CGI;
 my $input = new CGI;
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 5cd31e8e65..1db46633e7 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -7,6 +7,7 @@ use C4::Auth;
 use C4::Koha;
 use C4::Circulation::Circ2;
 use C4::Search;
+use HTML::Template;
 
 my $query = new CGI;
 my ($template, $borrowernumber, $cookie) 
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 21a7617687..3e490c75b3 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -8,6 +8,9 @@ use C4::Auth;         # checkauth, getborrowernumber.
 use C4::Koha;
 use C4::Circulation::Circ2;
 use C4::Reserves2;
+use HTML::Template;
+
+my $MAXIMUM_NUMBER_OF_RESERVES = 5;
 
 my $query = new CGI;
 my ($template, $borrowernumber, $cookie) 
@@ -41,11 +44,13 @@ foreach my $res (@$reserves) {
 	$rank--;
     }
 }
+
+
+
 $rank++;
 $template->param(rank => $rank);
 
 
-
 # pass the pickup branch along....
 my $branch = $query->param('branch');
 $template->param(branch => $branch);
@@ -195,7 +200,7 @@ if ($query->param('item_types_selected')) {
 	$noreserves = 1;
 	$template->param(too_much_oweing => $amount);
     }
-    my ($resnum, $reserves) = FindReserves(undef, $borrowernumber); 
+    my ($resnum, $reserves) = FindReserves(undef, $borrowernumber);
     $template->param(RESERVES => $reserves);
     if ($resnum >= $MAXIMUM_NUMBER_OF_RESERVES) {
 	$template->param(message => 1);
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 43a5141f93..c541dae331 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -3,12 +3,14 @@ use strict;
 require Exporter;
 
 use C4::Auth;
+use C4::Context;
 use CGI;
 use C4::Database;
+use HTML::Template;
 
 my $classlist='';
 
-my $dbh=C4Connect;
+my $dbh=C4::Context->dbh;
 my $sth=$dbh->prepare("select groupname,itemtypes from itemtypesearchgroups order by groupname");
 $sth->execute;
 while (my ($groupname,$itemtypes) = $sth->fetchrow) {
diff --git a/opac/opac-searchresults.pl b/opac/opac-searchresults.pl
index 86f4abc4b8..5be330314f 100755
--- a/opac/opac-searchresults.pl
+++ b/opac/opac-searchresults.pl
@@ -4,10 +4,11 @@ require Exporter;
 use CGI;
 use C4::Search;
 use C4::Auth;
+use HTML::Template;
 
 my $query=new CGI;
 
-my ($template, $borrowernumber, $cookie) 
+my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => "opac-searchresults.tmpl",
 			     query => $query,
 			     type => "opac",
diff --git a/opac/opac-sidebar.pl b/opac/opac-sidebar.pl
index 8400e530bf..059896d4b0 100755
--- a/opac/opac-sidebar.pl
+++ b/opac/opac-sidebar.pl
@@ -4,6 +4,7 @@ require Exporter;
 use CGI;
 
 use C4::Auth;       # get_template_and_user
+use HTML::Template;
 
 my $query = new CGI;
 
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 481bb07dae..cdcdde8b5e 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -9,6 +9,7 @@ use C4::Circulation::Circ2;
 use C4::Circulation::Renewals2;
 use C4::Reserves2;
 use C4::Search;
+use HTML::Template;
 
 my $query = new CGI;
 my ($template, $borrowernumber, $cookie) 
diff --git a/opac/opac-userdetails.pl b/opac/opac-userdetails.pl
index 3e187bc445..d914528729 100755
--- a/opac/opac-userdetails.pl
+++ b/opac/opac-userdetails.pl
@@ -7,6 +7,7 @@ use C4::Auth;
 use C4::Koha;
 use C4::Circulation::Circ2;
 use C4::Search;
+use HTML::Template;
 
 my $query = new CGI;
 my ($template, $borrowernumber, $cookie) 
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index 0c9babf6eb..c609da103f 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -7,6 +7,7 @@ use Mail::Sendmail;
 use C4::Auth;         # checkauth, getborrowernumber.
 use C4::Koha;
 use C4::Circulation::Circ2;
+use HTML::Template;
 
 
 my $query = new CGI;
-- 
2.39.2