Attachment #27885 for bug #11944

View | Details | Raw Unified | Return to bug 11944
Collapse All | Expand All

Lines 1809-1815 sub SetSearchHistorySession { Link Here

(-)a/C4/Auth.pm (-1 / +1 lines)
1809	return () unless $sessionID;	1809	return () unless $sessionID;
1810	my $session = get_session($sessionID);	1810	my $session = get_session($sessionID);
1811	return () unless $session;	1811	return () unless $session;
1812	$session->param('search_history', uri_escape(encode_json($search_history)));	1812	$session->param('search_history', uri_escape_utf8(encode_json($search_history)));
1813	}	1813	}
1814		1814
1815	END { } # module clean-up code here (global destructor)	1815	END { } # module clean-up code here (global destructor)




        if ( @limits ) {
            $q .= ' and '.join(' and ', @limits);
        }
        return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' );
    }
    if ( $query =~ /^cql=/ ) {
        return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' );
    }
    if ( $query =~ /^pqf=/ ) {
        if ($query_desc) {
            $query_cgi = "q=".uri_escape_utf8($query_desc);
        } else {
            $query_desc = $';
            $query_cgi = "q=pqf=".uri_escape_utf8($');
        }
        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_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_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];
                    $previous_operand = 1;
                }
            }    #/if $operands

Lines 125-131 if ( $op eq "do_search" ) { Link Here

(-)a/authorities/authorities-home.pl (-1 / +1 lines)
125	# next/previous would not work anymore	125	# next/previous would not work anymore
126		126
127	# construction of the url of each page	127	# construction of the url of each page
128	my $value_url = uri_escape($value);	128	my $value_url = uri_escape_utf8($value);
129	my $base_url = "authorities-home.pl?"	129	my $base_url = "authorities-home.pl?"
130	."marclist=$marclist"	130	."marclist=$marclist"
131	."&and_or=$and_or"	131	."&and_or=$and_or"

Lines 886-892 if ( $op eq "addbiblio" ) { Link Here

(-)a/cataloguing/addbiblio.pl (-1 / +1 lines)
886	.'&frameworkcode='.$frameworkcode	886	.'&frameworkcode='.$frameworkcode
887	.'&circborrowernumber='.$fa_circborrowernumber	887	.'&circborrowernumber='.$fa_circborrowernumber
888	.'&branch='.$fa_branch	888	.'&branch='.$fa_branch
889	.'&barcode='.uri_escape($fa_barcode)	889	.'&barcode='.uri_escape_utf8($fa_barcode)
890	.'&stickyduedate='.$fa_stickyduedate	890	.'&stickyduedate='.$fa_stickyduedate
891	.'&duedatespec='.$fa_duedatespec	891	.'&duedatespec='.$fa_duedatespec
892	);	892	);

Lines 515-521 if ($op eq "additem") { Link Here

(-)a/cataloguing/additem.pl (-1 / +1 lines)
515	print $input->redirect(	515	print $input->redirect(
516	'/cgi-bin/koha/circ/circulation.pl?'	516	'/cgi-bin/koha/circ/circulation.pl?'
517	.'borrowernumber='.$fa_circborrowernumber	517	.'borrowernumber='.$fa_circborrowernumber
518	.'&barcode='.uri_escape($fa_barcode)	518	.'&barcode='.uri_escape_utf8($fa_barcode)
519	.'&duedatespec='.$fa_duedatespec	519	.'&duedatespec='.$fa_duedatespec
520	.'&stickyduedate=1'	520	.'&stickyduedate=1'
521	);	521	);

Lines 172-178 sub redirect_to_paycollect { Link Here

(-)a/members/pay.pl (-1 / +1 lines)
172	$redirect .= get_for_redirect( 'notify_id', "notify_id$line_no", 0 );	172	$redirect .= get_for_redirect( 'notify_id', "notify_id$line_no", 0 );
173	$redirect .= get_for_redirect( 'notify_level', "notify_level$line_no", 0 );	173	$redirect .= get_for_redirect( 'notify_level', "notify_level$line_no", 0 );
174	$redirect .= get_for_redirect( 'accountlines_id', "accountlines_id$line_no", 0 );	174	$redirect .= get_for_redirect( 'accountlines_id', "accountlines_id$line_no", 0 );
175	$redirect .= q{&} . 'payment_note' . q{=} . uri_escape( $input->param("payment_note_$line_no") );	175	$redirect .= q{&} . 'payment_note' . q{=} . uri_escape_utf8( $input->param("payment_note_$line_no") );
176	$redirect .= '&remote_user=';	176	$redirect .= '&remote_user=';
177	$redirect .= $user;	177	$redirect .= $user;
178	return print $input->redirect($redirect);	178	return print $input->redirect($redirect);

Lines 745-751 elsif ($phase eq 'Run this report'){ Link Here

(-)a/reports/guided_reports.pl (-1 / +1 lines)
745	my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);	745	my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
746	my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report_id&phase=Run%20this%20report&limit=$limit";	746	my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report_id&phase=Run%20this%20report&limit=$limit";
747	if (@sql_params) {	747	if (@sql_params) {
748	$url = join('&sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params);	748	$url = join('&sql_params=', $url, map { URI::Escape::uri_escape_utf8($_) } @sql_params);
749	}	749	}
750	$template->param(	750	$template->param(
751	'results' => \@rows,	751	'results' => \@rows,

Lines 127-133 foreach my $barcode (@barcodes) { Link Here

(-)a/reserve/renewscript.pl (-1 / +1 lines)
127	# redirection to the referrer page	127	# redirection to the referrer page
128	#	128	#
129	if ( $input->param('destination') eq "circ" ) {	129	if ( $input->param('destination') eq "circ" ) {
130	$cardnumber = uri_escape($cardnumber);	130	$cardnumber = uri_escape_utf8($cardnumber);
131	print $input->redirect( '/cgi-bin/koha/circ/circulation.pl?findborrower='	131	print $input->redirect( '/cgi-bin/koha/circ/circulation.pl?findborrower='
132	. $cardnumber	132	. $cardnumber
133	. $failedrenews	133	. $failedrenews

Lines 133-139 $routingnotes =~ s/\n/\<br \/\>/g; Link Here

(-)a/serials/routing-preview.pl (-1 / +1 lines)
133	$template->param(	133	$template->param(
134	title => $subs->{'bibliotitle'},	134	title => $subs->{'bibliotitle'},
135	issue => $issue,	135	issue => $issue,
136	issue_escaped => URI::Escape::uri_escape($issue),	136	issue_escaped => URI::Escape::uri_escape_utf8($issue),
137	subscriptionid => $subscriptionid,	137	subscriptionid => $subscriptionid,
138	memberloop => $memberloop,	138	memberloop => $memberloop,
139	routingnotes => $routingnotes,	139	routingnotes => $routingnotes,

Lines 62-68 if($op eq 'add'){ Link Here

(-)a/serials/routing.pl (-1 / +1 lines)
62	if($op eq 'save'){	62	if($op eq 'save'){
63	my $sth = $dbh->prepare('UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?');	63	my $sth = $dbh->prepare('UPDATE serial SET routingnotes = ? WHERE subscriptionid = ?');
64	$sth->execute($notes,$subscriptionid);	64	$sth->execute($notes,$subscriptionid);
65	my $urldate = URI::Escape::uri_escape($date_selected);	65	my $urldate = URI::Escape::uri_escape_utf8($date_selected);
66	print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$urldate");	66	print $query->redirect("routing-preview.pl?subscriptionid=$subscriptionid&issue=$urldate");
67	}	67	}
68		68

Lines 33-36 if ($auth_status ne "ok") { Link Here

(-)a/serials/subscription-frequency.pl (-1 / +1 lines)
33	my $frequencyrecord=GetSubscriptionFrequency($frqid);	33	my $frequencyrecord=GetSubscriptionFrequency($frqid);
34	binmode STDOUT, ":encoding(UTF-8)";	34	binmode STDOUT, ":encoding(UTF-8)";
35	print $input->header(-type => 'text/plain', -charset => 'UTF-8');	35	print $input->header(-type => 'text/plain', -charset => 'UTF-8');
36	print "{".join (",",map { "\"$_\":\"".uri_escape($frequencyrecord->{$_})."\"" }sort keys %$frequencyrecord)."}";	36	print "{".join (",",map { "\"$_\":\"".uri_escape_utf8($frequencyrecord->{$_})."\"" }sort keys %$frequencyrecord)."}";

Lines 36-39 my $numpatternid=$input->param("numberpattern_id"); Link Here

(-)a/serials/subscription-numberpattern.pl (-2 / +1 lines)
36	my $numberpatternrecord=GetSubscriptionNumberpattern($numpatternid);	36	my $numberpatternrecord=GetSubscriptionNumberpattern($numpatternid);
37	binmode STDOUT, ":encoding(UTF-8)";	37	binmode STDOUT, ":encoding(UTF-8)";
38	print $input->header(-type => 'text/plain', -charset => 'UTF-8');	38	print $input->header(-type => 'text/plain', -charset => 'UTF-8');
39	print "{",join (",",map {"\"$_\":\"".(uri_escape($numberpatternrecord->{$_}) // '')."\"" }sort keys %$numberpatternrecord),"}";	39	print "{",join (",",map {"\"$_\":\"".(uri_escape_utf8($numberpatternrecord->{$_}) // '')."\"" }sort keys %$numberpatternrecord),"}";
40	-

Return to bug 11944

Lines 1313-1329 sub buildQuery { Link Here

(-)a/C4/Search.pm (-11 / +11 lines)
1313	if ( @limits ) {	1313	if ( @limits ) {
1314	$q .= ' and '.join(' and ', @limits);	1314	$q .= ' and '.join(' and ', @limits);
1315	}	1315	}
1316	return ( undef, $q, $q, "q=ccl=".uri_escape($q), $q, '', '', '', '', 'ccl' );	1316	return ( undef, $q, $q, "q=ccl=".uri_escape_utf8($q), $q, '', '', '', '', 'ccl' );
1317	}	1317	}
1318	if ( $query =~ /^cql=/ ) {	1318	if ( $query =~ /^cql=/ ) {
1319	return ( undef, $', $', "q=cql=".uri_escape($'), $', '', '', '', '', 'cql' );	1319	return ( undef, $', $', "q=cql=".uri_escape_utf8($'), $', '', '', '', '', 'cql' );
1320	}	1320	}
1321	if ( $query =~ /^pqf=/ ) {	1321	if ( $query =~ /^pqf=/ ) {
1322	if ($query_desc) {	1322	if ($query_desc) {
1323	$query_cgi = "q=".uri_escape($query_desc);	1323	$query_cgi = "q=".uri_escape_utf8($query_desc);
1324	} else {	1324	} else {
1325	$query_desc = $';	1325	$query_desc = $';
1326	$query_cgi = "q=pqf=".uri_escape($');	1326	$query_cgi = "q=pqf=".uri_escape_utf8($');
1327	}	1327	}
1328	return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' );	1328	return ( undef, $', $', $query_cgi, $query_desc, '', '', '', '', 'pqf' );
1329	}	1329	}
Lines 1495-1503 sub buildQuery { Link Here
1495	$query .= " $operators[$i-1] ";	1495	$query .= " $operators[$i-1] ";
1496	$query .= " $index_plus " unless $indexes_set;	1496	$query .= " $index_plus " unless $indexes_set;
1497	$query .= " $operand";	1497	$query .= " $operand";
1498	$query_cgi .= "&op=".uri_escape($operators[$i-1]);	1498	$query_cgi .= "&op=".uri_escape_utf8($operators[$i-1]);
1499	$query_cgi .= "&idx=".uri_escape($index) if $index;	1499	$query_cgi .= "&idx=".uri_escape_utf8($index) if $index;
1500	$query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i];	1500	$query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i];
1501	$query_desc .=	1501	$query_desc .=
1502	" $operators[$i-1] $index_plus $operands[$i]";	1502	" $operators[$i-1] $index_plus $operands[$i]";
1503	}	1503	}
Lines 1507-1514 sub buildQuery { Link Here
1507	$query .= " and ";	1507	$query .= " and ";
1508	$query .= "$index_plus " unless $indexes_set;	1508	$query .= "$index_plus " unless $indexes_set;
1509	$query .= "$operand";	1509	$query .= "$operand";
1510	$query_cgi .= "&op=and&idx=".uri_escape($index) if $index;	1510	$query_cgi .= "&op=and&idx=".uri_escape_utf8($index) if $index;
1511	$query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i];	1511	$query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i];
1512	$query_desc .= " and $index_plus $operands[$i]";	1512	$query_desc .= " and $index_plus $operands[$i]";
1513	}	1513	}
1514	}	1514	}
Lines 1520-1527 sub buildQuery { Link Here
1520	$query .= " $index_plus " unless $indexes_set;	1520	$query .= " $index_plus " unless $indexes_set;
1521	$query .= $operand;	1521	$query .= $operand;
1522	$query_desc .= " $index_plus $operands[$i]";	1522	$query_desc .= " $index_plus $operands[$i]";
1523	$query_cgi .= "&idx=".uri_escape($index) if $index;	1523	$query_cgi .= "&idx=".uri_escape_utf8($index) if $index;
1524	$query_cgi .= "&q=".uri_escape($operands[$i]) if $operands[$i];	1524	$query_cgi .= "&q=".uri_escape_utf8($operands[$i]) if $operands[$i];
1525	$previous_operand = 1;	1525	$previous_operand = 1;
1526	}	1526	}
1527	} #/if $operands	1527	} #/if $operands