use strict;
use warnings;
-
use Digest::MD5 qw(md5_base64);
use Storable qw(thaw freeze);
use URI::Escape;
$ip = $session->param('ip');
$lasttime = $session->param('lasttime');
$userid = $session->param('id');
- utf8::decode($userid);
$sessiontype = $session->param('sessiontype') || '';
}
if ( ( ($query->param('koha_login_context')) && ($query->param('userid') ne $session->param('id')) )
-HttpOnly => 1
);
$userid = $query->param('userid');
- utf8::decode($userid);
if ( ( $cas && $query->param('ticket') )
|| $userid
|| ( my $pki_field = C4::Context->preference('AllowPKIAuth') ) ne
LibraryName => C4::Context->preference("LibraryName"),
);
$template->param( %info );
-
- require C4::Output;
- C4::Output::output_html_with_http_headers( $query, $cookie,
- $template->output);
+# $cookie = $query->cookie(CGISESSID => $session->id
+# );
+ print $query->header(
+ -type => 'text/html',
+ -charset => 'utf-8',
+ -cookie => $cookie
+ ),
+ $template->output;
safe_exit;
}
#'
sub set_userenv {
- my (
- $usernum, $userid, $usercnum, $userfirstname,
- $usersurname, $userbranch, $branchname, $userflags,
- $emailaddress, $branchprinter, $persona
- ) = @_;
- for (
- $usernum, $userid, $usercnum, $userfirstname,
- $usersurname, $userbranch, $branchname, $userflags,
- $emailaddress, $branchprinter, $persona
- )
- {
- utf8::decode($_) if $_;
- }
-
- # CGI::Session doesn't handle utf-8, so we decode it here
-
+ my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $persona)= @_;
my $var=$context->{"activeuser"} || '';
my $cell = {
"number" => $usernum,
for ( @{$dbh->selectall_arrayref(
"SELECT * FROM itemtypes ORDER BY description", { Slice => {} })} )
{
-# utf8::encode($_->{description});
+ utf8::encode($_->{description});
push @itypes, $class->new($_);
}
return @itypes;
$options->{'Content-Script-Type'} = 'text/javascript';
}
+# We can't encode here, that will double encode our templates, and xslt
+# We need to fix the encoding as it comes out of the database, or when we pass the variables to templates
+
+# utf8::encode($data) if utf8::is_utf8($data);
+
$data =~ s/\&\;amp\; /\&\; /g;
- utf8::encode($data);
print $query->header($options), $data;
}
sub output_html_with_http_headers {
+ binmode( STDOUT, ":encoding(utf8)" );
my ( $query, $cookie, $data, $status ) = @_;
output_with_http_headers( $query, $cookie, $data, 'html', $status );
}
# not an index scan
else {
$record = $results[ $i - 1 ]->record($j)->raw();
- utf8::decode( $record );
# warn "RECORD $j:".$record;
$results_hash->{'RECORDS'}[$j] = $record;
for ( my $j = 0 ; $j < $jmax ; $j++ ) {
my $render_record =
$results[ $i - 1 ]->record($j)->render();
- utf8::decode($render_record);
my @used_datas = ();
foreach my $tag ( @{ $facet->{tags} } ) {
for (my $i = 0; $i < $count; $i++) {
# FIXME -- may need to worry about diacritics here
my $rec = $paz->record($recid, $i);
- utf8::decode( $rec );
push @{ $result_group->{'RECORDS'} }, $rec;
}
if ( @limits ) {
$q .= ' and '.join(' and ', @limits);
}
- return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' );
+ return ( undef, $q, $q, "q=ccl=".uri_escape($q), $q, '', '', '', '', 'ccl' );
}
if ( $query =~ /^cql=/ ) {
- return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' );
+ return ( undef, $', $', "q=cql=".uri_escape($'), $', '', '', '', '', 'cql' );
}
if ( $query =~ /^pqf=/ ) {
if ($query_desc) {
- $query_cgi = "q=".uri_escape_utf8($query_desc);
+ $query_cgi = "q=".uri_escape($query_desc);
} else {
$query_desc = $';
- $query_cgi = "q=pqf=".uri_escape_utf8($');
+ $query_cgi = "q=pqf=".uri_escape($');
}
return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' );
}
$query .= " $operators[$i-1] ";
$query .= " $index_plus " unless $indexes_set;
$query .= " $operand";
- $query_cgi .= "&op=".uri_escape_utf8($operators[$i-1]);
- $query_cgi .= "&idx=".uri_escape_utf8($index) if $index;
- $query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i];
+ $query_cgi .= "&op=".uri_escape($operators[$i-1]);
+ $query_cgi .= "&idx=".uri_escape($index) if $index;
+ $query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i];
$query_desc .=
" $operators[$i-1] $index_plus $operands[$i]";
}
$query .= " and ";
$query .= "$index_plus " unless $indexes_set;
$query .= "$operand";
- $query_cgi .= "&op=and&idx=".uri_escape_utf8($index) if $index;
- $query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i];
+ $query_cgi .= "&op=and&idx=".uri_escape($index) if $index;
+ $query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i];
$query_desc .= " and $index_plus $operands[$i]";
}
}
$query .= " $index_plus " unless $indexes_set;
$query .= $operand;
$query_desc .= " $index_plus $operands[$i]";
- $query_cgi .= "&idx=".uri_escape_utf8($index) if $index;
- $query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i];
+ $query_cgi .= "&idx=".uri_escape($index) if $index;
+ $query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i];
$previous_operand = 1;
}
} #/if $operands
COMPILE_DIR => C4::Context->config('template_cache_dir')?C4::Context->config('template_cache_dir'):'',,
INCLUDE_PATH => \@includes,
FILTERS => {},
- ENCODING => 'utf8', # templates don't have BOM, see Template::FAQ
}
) or die Template->error();
my $self = {
C4::Context->preference('opaclayoutstylesheet');
# add variables set via param to $vars for processing
+ # and clean any utf8 mess
for my $k ( keys %{ $self->{VARS} } ) {
$vars->{$k} = $self->{VARS}->{$k};
+ if (ref($vars->{$k}) eq 'ARRAY'){
+ utf8_arrayref($vars->{$k});
+ }
+ elsif (ref($vars->{$k}) eq 'HASH'){
+ utf8_hashref($vars->{$k});
+ }
+ else {
+ utf8::encode($vars->{$k}) if utf8::is_utf8($vars->{$k});
+ }
}
my $data;
+# binmode( STDOUT, ":utf8" );
$template->process( $self->filename, $vars, \$data )
|| die "Template process failed: ", $template->error();
return $data;
}
-
+sub utf8_arrayref {
+ my $arrayref = shift;
+ foreach my $element (@$arrayref){
+ if (ref($element) eq 'ARRAY'){
+ utf8_arrayref($element);
+ next;
+ }
+ if (ref($element) eq 'HASH'){
+ utf8_hashref($element);
+ next;
+ }
+ utf8::encode($element) if utf8::is_utf8($element);
+ }
+}
+
+sub utf8_hashref {
+ my $hashref = shift;
+ for my $key (keys %{$hashref}){
+ if (ref($hashref->{$key}) eq 'ARRAY'){
+ utf8_arrayref($hashref->{$key});
+ next;
+ }
+ if (ref($hashref->{$key}) eq 'HASH'){
+ utf8_hashref($hashref->{$key});
+ next;
+ }
+ utf8::encode($hashref->{$key}) if utf8::is_utf8($hashref->{$key});
+ }
+}
+
+
# FIXME - this is a horrible hack to cache
# the current known-good language, temporarily
# put in place to resolve bug 4403. It is
$stylesheet->{$xslfilename} = $xslt->parse_stylesheet($style_doc);
}
my $results = $stylesheet->{$xslfilename}->transform($source);
- my $newxmlrecord = $stylesheet->{$xslfilename}->output_as_chars($results);
- #no need to decode with UTF-8 in header of XSLT templates: BZ 6554
+ my $newxmlrecord = $stylesheet->{$xslfilename}->output_string($results);
return $newxmlrecord;
}
#parameters
my $supplier = $query->param('supplier');
-utf8::decode($supplier);
my $booksellerid = $query->param('booksellerid');
my @suppliers;
my $input = new CGI;
my $title = $input->param( 'title');
-utf8::decode($title);
my $author = $input->param('author');
-utf8::decode($author);
my $isbn = $input->param('isbn');
-utf8::decode($isbn);
my $name = $input->param( 'name' );
-utf8::decode($name);
my $ean = $input->param('ean');
-utf8::decode($ean);
my $basket = $input->param( 'basket' );
-utf8::decode($basket);
my $basketgroupname = $input->param('basketgroupname');
-utf8::decode($basketgroupname);
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
-utf8::decode($booksellerinvoicenumber);
-
my $do_search = $input->param('do_search') || 0;
my $from_placed_on = C4::Dates->new($input->param('from'));
my $to_placed_on = C4::Dates->new($input->param('to'));
use warnings;
use CGI;
-
use C4::Auth;
use C4::Context;
use C4::Koha;
use IO::File;
use YAML::Syck qw();
$YAML::Syck::ImplicitTyping = 1;
-$YAML::Syck::ImplicitUnicode = 1; # force utf-8 for preference encoding
our $lang;
# use Smart::Comments;
my @TABS;
if ( $op eq 'search' ) {
- my $searchfield = $input->param('searchfield');
- utf8::decode($searchfield);
+ my $searchfield = $input->param( 'searchfield' );
$searchfield =~ s/\p{IsC}//g;
$searchfield =~ s/\s+/ /;
use strict;
use warnings;
-use CGI qw( -utf8 );
+use CGI;
use C4::Context;
use C4::Auth;
use C4::Output;
# next/previous would not work anymore
# construction of the url of each page
- my $value_url = uri_escape_utf8($value);
+ my $value_url = uri_escape($value);
my $base_url = "authorities-home.pl?"
."marclist=$marclist"
."&and_or=$and_or"
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
# create a new CGI object
# FIXME: no_undef_params needs to be tested
-use CGI qw( -no_undef_params -utf8 );
+use CGI qw('-no_undef_params');
my $cgi = new CGI;
my ($template,$borrowernumber,$cookie);
.'&frameworkcode='.$frameworkcode
.'&circborrowernumber='.$fa_circborrowernumber
.'&branch='.$fa_branch
- .'&barcode='.uri_escape_utf8($fa_barcode)
+ .'&barcode='.uri_escape($fa_barcode)
.'&stickyduedate='.$fa_stickyduedate
.'&duedatespec='.$fa_duedatespec
);
print $input->redirect(
'/cgi-bin/koha/circ/circulation.pl?'
.'borrowernumber='.$fa_circborrowernumber
- .'&barcode='.uri_escape_utf8($fa_barcode)
+ .'&barcode='.uri_escape($fa_barcode)
.'&duedatespec='.$fa_duedatespec
.'&stickyduedate=1'
);
use strict;
use warnings;
-use CGI qw( -utf8 );
+use CGI;
use C4::Auth;
use C4::Output;
use strict;
use warnings;
use CGI;
-
use C4::Output;
use C4::Print;
use C4::Auth qw/:DEFAULT get_session/;
for (@failedreturns) { $return_failed{$_} = 1; }
my $findborrower = $query->param('findborrower') || q{};
-utf8::decode($findborrower);
$findborrower =~ s|,| |g;
my $borrowernumber = $query->param('borrowernumber');
require Exporter;
use C4::Context;
+use C4::Output;
use C4::Templates;
use C4::Koha;
use CGI::Session;
-HttpOnly => 1,
-expires => ''
);
-
- require C4::Output;
- C4::Output::output_html_with_http_headers($query,$cookie,$template->output);
+ print $query->header(
+ -type => 'text/html; charset=utf-8',
+ -cookie => $cookie
+ ),
+ $template->output;
exit;
}
#use warnings; FIXME - Bug 2505
use C4::Auth;
use C4::Output;
-use CGI qw( -utf8 );
+use CGI;
use C4::Members;
use C4::Branch;
use C4::Category;
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
# create a new CGI object
# FIXME: no_undef_params needs to be tested
-use CGI qw( -no_undef_params -utf8 );
+use CGI qw('-no_undef_params');
my $cgi = new CGI;
my $branch_group_limit = $cgi->param("branch_group_limit");
my $resultsperpage = $cgi->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20;
my $category = $cgi->param('category') || undef;
my $member = $cgi->param('member') || '';
-utf8::decode($member);
my $orderby = $cgi->param('orderby') || undef;
my @categories=C4::Category->all;
my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report_id&phase=Run%20this%20report&limit=$limit";
if (@sql_params) {
- $url = join('&sql_params=', $url, map { URI::Escape::uri_escape_utf8($_) } @sql_params);
+ $url = join('&sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params);
}
$template->param(
'results' => \@rows,
# redirection to the referrer page
#
if ( $input->param('destination') eq "circ" ) {
- $cardnumber = uri_escape_utf8($cardnumber);
+ $cardnumber = uri_escape($cardnumber);
print $input->redirect( '/cgi-bin/koha/circ/circulation.pl?findborrower='
. $cardnumber
. $failedrenews
$template->param(
title => $subs->{'bibliotitle'},
issue => $issue,
- issue_escaped => URI::Escape::uri_escape_utf8($issue),
+ issue_escaped => URI::Escape::uri_escape($issue),
subscriptionid => $subscriptionid,
memberloop => $memberloop,
routingnotes => $routingnotes,
if($op eq 'save'){
my $sth = $dbh->prepare('UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?');
$sth->execute($notes,$subscriptionid);
- my $urldate = URI::Escape::uri_escape_utf8($date_selected);
+ my $urldate = URI::Escape::uri_escape($date_selected);
print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$urldate");
}
my $query = new CGI;
my $title = $query->param('title_filter') || '';
-utf8::decode($title);
my $ISSN = $query->param('ISSN_filter') || '';
my $EAN = $query->param('EAN_filter') || '';
my $publisher = $query->param('publisher_filter') || '';
-utf8::decode($publisher);
my $bookseller = $query->param('bookseller_filter') || '';
-utf8::decode($bookseller);
my $biblionumber = $query->param('biblionumber') || '';
my $branch = $query->param('branch_filter') || '';
my $routing = $query->param('routing') || C4::Context->preference("RoutingSerials");
use strict;
use Data::Dumper;
use POSIX;
-use CGI qw/-utf8/;
+use CGI;
use CGI::Cookie; # need to check cookies before having CGI parse the POST request
use C4::Auth qw(:DEFAULT check_cookie_auth);
use strict;
#use warnings; FIXME - Bug 2505
use C4::Auth;
-use CGI qw/-utf8/;
+use CGI;
use C4::Context;
use C4::Koha;
use C4::Dates;
projects / koha.git / commitdiff