Handle meta tags for non-latin1 charsets

diff --git a/acqui.simple/isbnsearch.pl b/acqui.simple/isbnsearch.pl
index 487726a..20c7d94 100755 (executable)
--- a/acqui.simple/isbnsearch.pl
+++ b/acqui.simple/isbnsearch.pl
@@ -25,6 +25,7 @@ use C4::Catalogue;
 use C4::Biblio;
 use C4::Search;
 use C4::Output;
+use C4::Charset;
 use HTML::Template;
 
 my $input      = new CGI;
@@ -90,5 +91,8 @@ if (! $isbn) {
                                                        loop => \@loop_data,
                                                        loop_links => \@loop_links);
 
-       print $input->header(-cookie => $cookie),$template->output;
+       print $input->header(
+           -type => guesstype($template->output),
+           -cookie => $cookie
+       ),$template->output;
 } # else

diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
index ed254ae..0362fa4 100755 (executable)
--- a/admin/koha2marclinks.pl
+++ b/admin/koha2marclinks.pl
@@ -20,6 +20,7 @@
 
 use strict;
 use C4::Output;
+use C4::Charset;
 use C4::Auth;
 use CGI;
 use C4::Search;
@@ -135,4 +136,7 @@ if ($op eq 'add_form') {
                                                        );
 } #---- END $OP eq DEFAULT
 
-print $input->header(-cookie => $cookie), $template->output;
+print $input->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;

diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index cbb2f2a..52caa5f 100755 (executable)
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -23,6 +23,7 @@ use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
+use C4::Charset;
 use C4::Search;
 use C4::Context;
 use HTML::Template;
@@ -196,4 +197,7 @@ if ($op eq 'add_form') {
 } #---- END $OP eq DEFAULT
 
 $template->param(loggeninuser => $loggedinuser);
-print $input->header(-cookie => $cookie), $template->output;
+print $input->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;

diff --git a/admin/thesaurus.pl b/admin/thesaurus.pl
index 61bf992..4ceb41f 100755 (executable)
--- a/admin/thesaurus.pl
+++ b/admin/thesaurus.pl
@@ -20,11 +20,11 @@
 use strict;
 use CGI;
 use C4::Auth;
+use C4::Charset;
 use C4::Context;
 use C4::Output;
 use C4::Search;
 use HTML::Template;
-use C4::Context;
 use C4::Authorities;
 
 my $input = new CGI;
@@ -256,4 +256,7 @@ if ($op eq 'add_form') {
        }
 } #---- END $OP eq DEFAULT
 
-print $input->header(-cookie => $cookie), $template->output;
+print $input->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;

diff --git a/memberentry.pl b/memberentry.pl
index 0b3e3bc..d481409 100755 (executable)
--- a/memberentry.pl
+++ b/memberentry.pl
@@ -27,6 +27,7 @@ use strict;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
+use C4::Charset;
 use CGI;
 use C4::Search;
 use C4::Koha;
@@ -242,7 +243,10 @@ if ($delete){
                        cardnumber      => $cardnumber,
                        dateofbirth     => $data->{'dateofbirth'});
 
-print $input->header(-cookie => $cookie),$template->output;
+print $input->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+),$template->output;
 
 
 }

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 93c1243..3a01739 100755 (executable)
--- 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 C4::Charset;
 use HTML::Template;
 
 my $query=new CGI;
@@ -53,5 +54,8 @@ $template->param(ITEM_RESULTS => $itemsarray);
 $template->param(WEB_RESULTS => $webarray);
 $template->param(SITE_RESULTS => $sitearray);
 
-print $query->header(-cookie => $cookie), $template->output;
+print $query->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;
 

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index 4cc12bc..b3a9854 100755 (executable)
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -5,6 +5,7 @@ use CGI;
 use HTML::Template;
 
 use C4::Auth;       # get_template_and_user
+use C4::Charset;
 
 my $query = new CGI;
 
@@ -16,4 +17,7 @@ my ($template, $borrowernumber, $cookie)
                             flagsrequired => {borrow => 1},
                         });
 
-print $query->header(-cookie => $cookie), $template->output;
+print $query->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index c541dae..b03de61 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -3,6 +3,7 @@ use strict;
 require Exporter;
 
 use C4::Auth;
+use C4::Charset;
 use C4::Context;
 use CGI;
 use C4::Database;
@@ -31,4 +32,7 @@ my ($template, $borrowernumber, $cookie)
 
 $template->param(classlist => $classlist);
 
-print $query->header(-cookie => $cookie), $template->output;
+print $query->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;

diff --git a/opac/opac-searchresults.pl b/opac/opac-searchresults.pl
index 5be3303..dafdcb0 100755 (executable)
--- a/opac/opac-searchresults.pl
+++ b/opac/opac-searchresults.pl
@@ -4,6 +4,7 @@ require Exporter;
 use CGI;
 use C4::Search;
 use C4::Auth;
+use C4::Charset;
 use HTML::Template;
 
 my $query=new CGI;
@@ -126,5 +127,8 @@ if ($count>10) {
 
 $template->param(numbers => $numbers);
 
-print $query->header(-cookie => $cookie), $template->output;
+print $query->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;
 

diff --git a/search.pl b/search.pl
index f9dfc5f..04a5b18 100755 (executable)
--- a/search.pl
+++ b/search.pl
@@ -26,6 +26,7 @@ use C4::Context;
 use C4::Search;
 use C4::Auth;
 use C4::Output;
+use C4::Charset;
 
 my $query=new CGI;
 my $type=$query->param('type');
@@ -199,5 +200,8 @@ if (C4::Context->preference('acquisitions') eq 'simple') {
 }
 
 # Print the page
-print $query->header(-cookie => $cookie), $template->output;
+print $query->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;