[Koha-cvs] CVS: koha/opac opac-account.pl,1.3,1.4 opac-detail.pl,1.6,1.7 opac-logout.pl,1.3,1.4 opac-membership.pl,1.2,1.3 opac-moredetail.pl,1.3,1.4 opac-readingrecord.pl,1.2,1.3 opac-reserve.pl,1.4,1.5 opac-search.pl,1.5,1.6 opac-searchresults.pl,1.6,1.7 opac-sidebar.pl,1.2,1.3 opac-userdetails.pl,1.2,1.3 opac-user.pl,1.5,1.6 opac-userupdate.pl,1.5,1.6

[Paul POULAIN]

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1:/tmp/cvs-serv10397/opac

Modified Files:
        opac-account.pl opac-detail.pl opac-logout.pl 
        opac-membership.pl opac-moredetail.pl opac-readingrecord.pl 
        opac-reserve.pl opac-search.pl opac-searchresults.pl 
        opac-sidebar.pl opac-userdetails.pl opac-user.pl 
        opac-userupdate.pl 
Log Message:
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 ?

Index: opac-account.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-account.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-account.pl     4 Dec 2002 22:25:01 -0000       1.3
--- opac-account.pl     19 Dec 2002 11:04:14 -0000      1.4
***************
*** 10,16 ****
  use C4::Circulation::Circ2;
  use C4::Auth;
  
  my $query = new CGI;
! my ($template, $borrowernumber, $cookie) 
      = get_template_and_user({template_name => "opac-account.tmpl",
                             query => $query,
--- 10,17 ----
  use C4::Circulation::Circ2;
  use C4::Auth;
+ use HTML::Template;
  
  my $query = new CGI;
! my ($template, $borrowernumber, $cookie)
      = get_template_and_user({template_name => "opac-account.tmpl",
                             query => $query,
***************
*** 31,35 ****
  
  #get account details
! my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);   
  
  for (my $i=0;$i<$numaccts;$i++){
--- 32,36 ----
  
  #get account details
! my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);
  
  for (my $i=0;$i<$numaccts;$i++){
***************
*** 54,56 ****
  $template->param( total => $total );
  
! print $query->header(-cookie => $cookie), $template->output; 
--- 55,59 ----
  $template->param( total => $total );
  
! #$template->param(loggeninuser => $loggedinuser);
! print $query->header(-cookie => $cookie), $template->output;
! 

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-detail.pl      4 Dec 2002 22:25:04 -0000       1.6
--- opac-detail.pl      19 Dec 2002 11:04:14 -0000      1.7
***************
*** 5,8 ****
--- 5,9 ----
  use C4::Search;
  use C4::Auth;
+ use HTML::Template;
  
  my $query=new CGI;

Index: opac-logout.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-logout.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-logout.pl      11 Oct 2002 12:50:42 -0000      1.3
--- opac-logout.pl      19 Dec 2002 11:04:15 -0000      1.4
***************
*** 4,7 ****
--- 4,8 ----
  use C4::Context;
  use C4::Output;
+ use HTML::Template;
  
  my $query=new CGI;

Index: opac-membership.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-membership.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-membership.pl  4 Dec 2002 22:25:17 -0000       1.2
--- opac-membership.pl  19 Dec 2002 11:04:15 -0000      1.3
***************
*** 3,8 ****
  require Exporter;
  use CGI;
- 
  use C4::Auth;       # get_template_and_user
  
  my $query = new CGI;
--- 3,8 ----
  require Exporter;
  use CGI;
  use C4::Auth;       # get_template_and_user
+ use HTML::Template;
  
  my $query = new CGI;

Index: opac-moredetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-moredetail.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-moredetail.pl  13 Oct 2002 10:45:51 -0000      1.3
--- opac-moredetail.pl  19 Dec 2002 11:04:15 -0000      1.4
***************
*** 11,14 ****
--- 11,15 ----
  use C4::Acquisitions;
  use C4::Biblio;
+ use HTML::Template;
  
  use CGI;

Index: opac-readingrecord.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-readingrecord.pl       4 Dec 2002 22:25:20 -0000       1.2
--- opac-readingrecord.pl       19 Dec 2002 11:04:15 -0000      1.3
***************
*** 8,11 ****
--- 8,12 ----
  use C4::Circulation::Circ2;
  use C4::Search;
+ use HTML::Template;
  
  my $query = new CGI;

Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-reserve.pl     4 Dec 2002 22:25:33 -0000       1.4
--- opac-reserve.pl     19 Dec 2002 11:04:15 -0000      1.5
***************
*** 9,12 ****
--- 9,15 ----
  use C4::Circulation::Circ2;
  use C4::Reserves2;
+ use HTML::Template;
+ 
+ my $MAXIMUM_NUMBER_OF_RESERVES = 5;
  
  my $query = new CGI;
***************
*** 42,50 ****
      }
  }
  $rank++;
  $template->param(rank => $rank);
  
  
- 
  # pass the pickup branch along....
  my $branch = $query->param('branch');
--- 45,55 ----
      }
  }
+ 
+ 
+ 
  $rank++;
  $template->param(rank => $rank);
  
  
  # pass the pickup branch along....
  my $branch = $query->param('branch');
***************
*** 196,200 ****
        $template->param(too_much_oweing => $amount);
      }
!     my ($resnum, $reserves) = FindReserves(undef, $borrowernumber); 
      $template->param(RESERVES => $reserves);
      if ($resnum >= $MAXIMUM_NUMBER_OF_RESERVES) {
--- 201,205 ----
        $template->param(too_much_oweing => $amount);
      }
!     my ($resnum, $reserves) = FindReserves(undef, $borrowernumber);
      $template->param(RESERVES => $reserves);
      if ($resnum >= $MAXIMUM_NUMBER_OF_RESERVES) {

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-search.pl      4 Dec 2002 22:25:40 -0000       1.5
--- opac-search.pl      19 Dec 2002 11:04:15 -0000      1.6
***************
*** 4,13 ****
  
  use C4::Auth;
  use CGI;
  use C4::Database;
  
  my $classlist='';
  
! my $dbh=C4Connect;
  my $sth=$dbh->prepare("select groupname,itemtypes from itemtypesearchgroups 
order by groupname");
  $sth->execute;
--- 4,15 ----
  
  use C4::Auth;
+ use C4::Context;
  use CGI;
  use C4::Database;
+ use HTML::Template;
  
  my $classlist='';
  
! my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select groupname,itemtypes from itemtypesearchgroups 
order by groupname");
  $sth->execute;

Index: opac-searchresults.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-searchresults.pl       4 Dec 2002 22:25:42 -0000       1.6
--- opac-searchresults.pl       19 Dec 2002 11:04:15 -0000      1.7
***************
*** 5,12 ****
  use C4::Search;
  use C4::Auth;
  
  my $query=new CGI;
  
! my ($template, $borrowernumber, $cookie) 
      = get_template_and_user({template_name => "opac-searchresults.tmpl",
                             query => $query,
--- 5,13 ----
  use C4::Search;
  use C4::Auth;
+ use HTML::Template;
  
  my $query=new CGI;
  
! my ($template, $borrowernumber, $cookie)
      = get_template_and_user({template_name => "opac-searchresults.tmpl",
                             query => $query,

Index: opac-sidebar.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sidebar.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-sidebar.pl     4 Dec 2002 22:25:46 -0000       1.2
--- opac-sidebar.pl     19 Dec 2002 11:04:15 -0000      1.3
***************
*** 5,8 ****
--- 5,9 ----
  
  use C4::Auth;       # get_template_and_user
+ use HTML::Template;
  
  my $query = new CGI;

Index: opac-userdetails.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-userdetails.pl 4 Dec 2002 22:26:03 -0000       1.2
--- opac-userdetails.pl 19 Dec 2002 11:04:15 -0000      1.3
***************
*** 8,11 ****
--- 8,12 ----
  use C4::Circulation::Circ2;
  use C4::Search;
+ use HTML::Template;
  
  my $query = new CGI;

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-user.pl        4 Dec 2002 22:25:55 -0000       1.5
--- opac-user.pl        19 Dec 2002 11:04:15 -0000      1.6
***************
*** 10,13 ****
--- 10,14 ----
  use C4::Reserves2;
  use C4::Search;
+ use HTML::Template;
  
  my $query = new CGI;

Index: opac-userupdate.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-userupdate.pl  4 Dec 2002 22:26:08 -0000       1.5
--- opac-userupdate.pl  19 Dec 2002 11:04:15 -0000      1.6
***************
*** 8,11 ****
--- 8,12 ----
  use C4::Koha;
  use C4::Circulation::Circ2;
+ use HTML::Template;