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

[Ambrose Li]

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

Modified Files:
        opac-account.pl opac-detail.pl opac-main.pl opac-membership.pl 
        opac-readingrecord.pl opac-reserve.pl opac-search.pl 
        opac-searchresults.pl opac-sidebar.pl opac-user.pl 
        opac-userdetails.pl opac-userupdate.pl 
Log Message:
Moved C4/Charset.pm to C4/Interface/CGI/Output.pm

Create output_html_with_http_headers function to contain the "print $query
->header(-type => guesstype...),..." call. This is in preparation for
non-HTML output (e.g., text/xml) and charset conversion before output in
the future.

Created C4/Interface/CGI/Template.pm to hold convenience functions specific
to the CGI interface using HTML::Template

Modified moremembers.pl to make the "sex" field localizable for languages
where M and F doesn't make sense


Index: opac-account.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-account.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-account.pl     19 Dec 2002 11:04:14 -0000      1.4
--- opac-account.pl     2 Feb 2003 07:18:38 -0000       1.5
***************
*** 56,59 ****
  
  #$template->param(loggeninuser => $loggedinuser);
! print $query->header(-cookie => $cookie), $template->output;
  
--- 56,59 ----
  
  #$template->param(loggeninuser => $loggedinuser);
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** opac-detail.pl      20 Jan 2003 07:39:28 -0000      1.8
--- opac-detail.pl      2 Feb 2003 07:18:38 -0000       1.9
***************
*** 5,9 ****
  use C4::Search;
  use C4::Auth;
! use C4::Charset;
  use HTML::Template;
  
--- 5,9 ----
  use C4::Search;
  use C4::Auth;
! use C4::Interface::CGI::Output;
  use HTML::Template;
  
***************
*** 55,61 ****
  $template->param(SITE_RESULTS => $sitearray);
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
  
--- 55,58 ----
  $template->param(SITE_RESULTS => $sitearray);
  
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-main.pl        20 Jan 2003 07:39:28 -0000      1.6
--- opac-main.pl        2 Feb 2003 07:18:38 -0000       1.7
***************
*** 6,10 ****
  
  use C4::Auth;       # get_template_and_user
! use C4::Charset;
  
  my $query = new CGI;
--- 6,10 ----
  
  use C4::Auth;       # get_template_and_user
! use C4::Interface::CGI::Output;
  
  my $query = new CGI;
***************
*** 18,23 ****
                         });
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 18,20 ----
                         });
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-membership.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-membership.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-membership.pl  19 Dec 2002 11:04:15 -0000      1.3
--- opac-membership.pl  2 Feb 2003 07:18:38 -0000       1.4
***************
*** 16,18 ****
                         });
  
! print $query->header(-cookie => $cookie), $template->output;
--- 16,18 ----
                         });
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-readingrecord.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-readingrecord.pl       19 Dec 2002 11:04:15 -0000      1.3
--- opac-readingrecord.pl       2 Feb 2003 07:18:38 -0000       1.4
***************
*** 52,55 ****
  
  
! print $query->header(-cookie => $cookie), $template->output;
  
--- 52,55 ----
  
  
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-reserve.pl     19 Dec 2002 11:04:15 -0000      1.5
--- opac-reserve.pl     2 Feb 2003 07:18:38 -0000       1.6
***************
*** 226,228 ****
  
  
! print $query->header(-cookie => $cookie), $template->output;
--- 226,228 ----
  
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-search.pl      20 Jan 2003 07:39:28 -0000      1.7
--- opac-search.pl      2 Feb 2003 07:18:38 -0000       1.8
***************
*** 4,8 ****
  
  use C4::Auth;
! use C4::Charset;
  use C4::Context;
  use CGI;
--- 4,8 ----
  
  use C4::Auth;
! use C4::Interface::CGI::Output;
  use C4::Context;
  use CGI;
***************
*** 33,38 ****
  $template->param(classlist => $classlist);
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
--- 33,35 ----
  $template->param(classlist => $classlist);
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-searchresults.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** opac-searchresults.pl       20 Jan 2003 07:39:28 -0000      1.8
--- opac-searchresults.pl       2 Feb 2003 07:18:38 -0000       1.9
***************
*** 5,9 ****
  use C4::Search;
  use C4::Auth;
! use C4::Charset;
  use HTML::Template;
  
--- 5,9 ----
  use C4::Search;
  use C4::Auth;
! use C4::Interface::CGI::Output;
  use HTML::Template;
  
***************
*** 128,134 ****
  $template->param(numbers => $numbers);
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;
  
--- 128,131 ----
  $template->param(numbers => $numbers);
  
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: opac-sidebar.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sidebar.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-sidebar.pl     19 Dec 2002 11:04:15 -0000      1.3
--- opac-sidebar.pl     2 Feb 2003 07:18:38 -0000       1.4
***************
*** 29,31 ****
  $template->param(url => $self_url);
  
! print $query->header(-cookie => $cookie), $template->output;
--- 29,31 ----
  $template->param(url => $self_url);
  
! output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-user.pl        19 Dec 2002 11:04:15 -0000      1.6
--- opac-user.pl        2 Feb 2003 07:18:38 -0000       1.7
***************
*** 132,135 ****
  $template->param(waiting_count => $wcount);
  
! print $query->header(-cookie => $cookie), $template->output;
  
--- 132,135 ----
  $template->param(waiting_count => $wcount);
  
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: opac-userdetails.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-userdetails.pl 19 Dec 2002 11:04:15 -0000      1.3
--- opac-userdetails.pl 2 Feb 2003 07:18:38 -0000       1.4
***************
*** 31,34 ****
  $template->param($borr);
  
! print $query->header(-cookie => $cookie), $template->output;
  
--- 31,34 ----
  $template->param($borr);
  
! output_html_with_http_headers $query, $cookie, $template->output;
  

Index: opac-userupdate.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-userupdate.pl  19 Dec 2002 11:04:15 -0000      1.6
--- opac-userupdate.pl  2 Feb 2003 07:18:38 -0000       1.7
***************
*** 69,71 ****
  $template->param(BORROWER_INFO => address@hidden);
  
! print $query->header(-cookie => $cookie), $template->output;
--- 69,71 ----
  $template->param(BORROWER_INFO => address@hidden);
  
! output_html_with_http_headers $query, $cookie, $template->output;