[Koha-cvs] CVS: koha admin-home.pl,1.5,1.6 catalogue-home.pl,1.4,1.5 mainpage.pl,1.5,1.6

[Ambrose Li]

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

Modified Files:
        admin-home.pl catalogue-home.pl mainpage.pl 
Log Message:
Preliminary fix of the CGI.pm problem of always assuming that everything is
in ISO-8859-1.

A new C4::Charset module (tentative name) has been created to guess the
charset of a piece of HTML markup. The CGI programs will be modified to use
this module as they are encountered during translation.


Index: admin-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin-home.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** admin-home.pl       10 Dec 2002 17:35:27 -0000      1.5
--- admin-home.pl       19 Jan 2003 06:15:44 -0000      1.6
***************
*** 5,8 ****
--- 5,9 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Charset;
  use C4::Database;
  use HTML::Template;
***************
*** 19,21 ****
  $template->param(loggeninuser => $loggedinuser);
  
! print $query->header(-cookie => $cookie),$template->output;
--- 20,25 ----
  $template->param(loggeninuser => $loggedinuser);
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ),$template->output;

Index: catalogue-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/catalogue-home.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** catalogue-home.pl   10 Dec 2002 17:35:28 -0000      1.4
--- catalogue-home.pl   19 Jan 2003 06:15:44 -0000      1.5
***************
*** 5,8 ****
--- 5,9 ----
  use C4::Auth;
  use C4::Output;
+ use C4::Charset;
  use C4::Database;
  use HTML::Template;
***************
*** 27,29 ****
                                                type => 'intranet',);
  
! print $query->header(-cookie => $cookie), $template->output;
--- 28,33 ----
                                                type => 'intranet',);
  
! print $query->header(
!     -type => guesstype($template->output),
!     -cookie => $cookie
! ), $template->output;

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mainpage.pl 10 Dec 2002 17:35:28 -0000      1.5
--- mainpage.pl 19 Jan 2003 06:15:44 -0000      1.6
***************
*** 5,8 ****
--- 5,9 ----
  use C4::Database;
  use C4::Output;  # contains gettemplate
+ use C4::Charset;
  use CGI;
  use C4::Auth;
***************
*** 18,20 ****
                             });
  
! print  $query->header(-cookie => $cookie), $template->output;
--- 19,24 ----
                             });
  
! print  $query->header(
!    -type => guesstype($template->output),
!    -cookie => $cookie
! ), $template->output;