oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use UTF8 JSON encoding and decoding universally

Browse source 
fixed: Import/Export of packages with international text is broken
This commit is contained in:
Graham Knop 2008-04-01 14:42:20 +00:00
parent 35bfeac0ef
commit 9ed284beec
16 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Spectre/Admin.pm
View file

@ -152,7 +152,7 @@ sub loadSiteData {
}
else {
my $siteData = {};
eval { $siteData = JSON::from_json($response->content); };
eval { $siteData = JSON::decode_json($response->content); };
if ($@) {
$self->error("Couldn't fetch Spectre configuration data for $key : $@");
}

4
lib/Spectre/Cron.pm
View file

@ -19,7 +19,7 @@ use DateTime;
use HTTP::Request::Common;
use HTTP::Cookies;
use POE qw(Component::Client::HTTP);
use JSON qw/ to_json /;
use JSON qw/ encode_json /;
#-------------------------------------------------------------------
@ -337,7 +337,7 @@ sub getJsonStatus {
next unless $self->{_jobs}->{$key}->{sitename} eq $sitename;
$data{$key} = $self->{_jobs}->{$key};
}
$kernel->call(IKC => post => $rsvp, to_json(\%data));
$kernel->call(IKC => post => $rsvp, encode_json(\%data));
}

10
lib/Spectre/Workflow.pm
View file

@ -20,7 +20,7 @@ use HTTP::Cookies;
use POE qw(Component::Client::HTTP);
use POE::Queue::Array;
use Tie::IxHash;
use JSON qw/ to_json /;
use JSON qw/ encode_json /;
#-------------------------------------------------------------------
@ -223,7 +223,7 @@ sub editWorkflowPriority {
if ($ackPriority != $newPriority) {
# return an error
my $error = 'edit priority setting error';
$kernel->call(IKC=>post=>$rsvp, to_json({message => $error}));
$kernel->call(IKC=>post=>$rsvp, encode_json({message => $error}));
}
$found = 1;
last;
@ -232,11 +232,11 @@ sub editWorkflowPriority {
if (! $found) {
# return an error message
my $error = 'edit priority instance not found error';
$kernel->call(IKC=>post=>$rsvp, to_json({message => $error}));
$kernel->call(IKC=>post=>$rsvp, encode_json({message => $error}));
}
else {
# return success message
$kernel->call(IKC=>post=>$rsvp, to_json({message => 'edit priority success'}));
$kernel->call(IKC=>post=>$rsvp, encode_json({message => 'edit priority success'}));
}
}
@ -338,7 +338,7 @@ sub getJsonStatus {
}
}
$kernel->call(IKC=>post=>$rsvp, to_json(\%output));
$kernel->call(IKC=>post=>$rsvp, encode_json(\%output));
}
#-------------------------------------------------------------------