[freeside-commits] branch FREESIDE_4_BRANCH updated. 0a2c29c0f22bee8cb30ef4eea31881ab1ae525f7
Ivan
ivan at 420.am
Sun Dec 13 15:32:07 PST 2015
The branch, FREESIDE_4_BRANCH has been updated
via 0a2c29c0f22bee8cb30ef4eea31881ab1ae525f7 (commit)
from 9e0a36966f7cbd8fd1584ce2a88c61448a5cec68 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0a2c29c0f22bee8cb30ef4eea31881ab1ae525f7
Author: Ivan Kohler <ivan at freeside.biz>
Date: Sun Dec 13 15:29:00 2015 -0800
JSON::XS -> Cpanel::JSON::XS
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index acfe571..a2a7617 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -77,7 +77,7 @@ if ( -e $addl_handler_use_file ) {
use HTML::TableExtract qw(tree);
use HTML::FormatText;
use HTML::Defang;
- use JSON::XS;
+ use Cpanel::JSON::XS;
use MIME::Base64;
use IO::Handle;
use IO::File;
diff --git a/FS/FS/Misc/Geo.pm b/FS/FS/Misc/Geo.pm
index 1aa5939..e83d6dc 100644
--- a/FS/FS/Misc/Geo.pm
+++ b/FS/FS/Misc/Geo.pm
@@ -7,7 +7,7 @@ use LWP::UserAgent;
use HTTP::Request;
use HTTP::Request::Common qw( GET POST );
use HTML::TokeParser;
-use JSON;
+use Cpanel::JSON::XS;
use URI::Escape 3.31;
use Data::Dumper;
use FS::Conf;
diff --git a/FS/FS/TaxEngine/avalara.pm b/FS/FS/TaxEngine/avalara.pm
index fd6e324..cb841c3 100644
--- a/FS/FS/TaxEngine/avalara.pm
+++ b/FS/FS/TaxEngine/avalara.pm
@@ -8,11 +8,11 @@ use FS::cust_pkg;
use FS::cust_location;
use FS::cust_bill_pkg;
use FS::tax_rate;
-use JSON;
+use Cpanel::JSON::XS;
use Geo::StreetAddress::US;
our $DEBUG = 0;
-our $json = JSON->new->pretty(1);
+our $json = Cpanel::JSON::XS->new->pretty(1);
our $conf;
diff --git a/FS/FS/TaxEngine/suretax.pm b/FS/FS/TaxEngine/suretax.pm
index 4e7edd5..073d19b 100644
--- a/FS/FS/TaxEngine/suretax.pm
+++ b/FS/FS/TaxEngine/suretax.pm
@@ -4,7 +4,7 @@ use strict;
use base 'FS::TaxEngine';
use FS::Conf;
use FS::Record qw(qsearch qsearchs dbh);
-use JSON;
+use Cpanel::JSON::XS;
use XML::Simple qw(XMLin);
use LWP::UserAgent;
use HTTP::Request::Common;
@@ -14,7 +14,7 @@ our $DEBUG = 1; # prints progress messages
# $DEBUG = 2; # prints decoded request and response (noisy, be careful)
# $DEBUG = 3; # prints raw response from the API, ridiculously unreadable
-our $json = JSON->new->pretty(1);
+our $json = Cpanel::JSON::XS->new->pretty(1);
our %taxproduct_cache;
diff --git a/FS/FS/UI/REST.pm b/FS/FS/UI/REST.pm
index b6503ba..45b26a0 100644
--- a/FS/FS/UI/REST.pm
+++ b/FS/FS/UI/REST.pm
@@ -3,7 +3,7 @@ use base qw( Exporter );
use strict;
use vars qw( @EXPORT_OK );
-use JSON::XS;
+use Cpanel::JSON::XS;
use FS::UID qw( adminsuidsetup );
use FS::Conf;
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index 0e54aa2..cb0cc99 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -655,7 +655,7 @@ use vars qw($DEBUG);
use Carp;
use Storable qw(nfreeze);
use MIME::Base64;
-use JSON::XS;
+use Cpanel::JSON::XS;
use FS::CurrentUser;
use FS::Record qw(qsearchs);
use FS::queue;
diff --git a/FS/FS/deploy_zone.pm b/FS/FS/deploy_zone.pm
index 71129cf..ee68321 100644
--- a/FS/FS/deploy_zone.pm
+++ b/FS/FS/deploy_zone.pm
@@ -6,7 +6,7 @@ use FS::Record qw( qsearch qsearchs dbh );
use Storable qw(thaw);
use MIME::Base64;
-use JSON qw(encode_json decode_json) ;
+use Cpanel::JSON::XS;
use LWP::UserAgent;
use HTTP::Request::Common;
diff --git a/FS/FS/msg_template/http.pm b/FS/FS/msg_template/http.pm
index 9c4e68b..12269a1 100644
--- a/FS/FS/msg_template/http.pm
+++ b/FS/FS/msg_template/http.pm
@@ -7,7 +7,7 @@ use vars qw( $DEBUG $conf );
# needed to talk to the external service
use LWP::UserAgent;
use HTTP::Request::Common;
-use JSON;
+use Cpanel::JSON::XS;
# needed to manage prepared messages
use FS::cust_msg;
@@ -45,7 +45,7 @@ sub prepare {
my( $self, %opt ) = @_;
- my $json = JSON->new->canonical(1);
+ my $json = Cpanel::JSON::XS->new->canonical(1);
my $cust_main = $opt{'cust_main'}; # or die 'cust_main required';
my $object = $opt{'object'} or die 'object required';
diff --git a/FS/FS/part_event/Action/http.pm b/FS/FS/part_event/Action/http.pm
index b8715a7..673cd43 100644
--- a/FS/FS/part_event/Action/http.pm
+++ b/FS/FS/part_event/Action/http.pm
@@ -1,12 +1,16 @@
package FS::part_event::Action::http;
+use base qw( FS::part_event::Action );
use strict;
-use base qw( FS::part_event::Action );
+use vars qw( $me );
+use Data::Dumper;
use LWP::UserAgent;
use HTTP::Request::Common;
-use JSON::XS;
+use Cpanel::JSON::XS;
use FS::Misc::DateTime qw( iso8601 );
+$me = '[FS::part_event::Action::http]';
+
#sub description { 'Send an HTTP or HTTPS GET or POST request'; }
sub description { 'Send an HTTP or HTTPS POST request'; }
@@ -37,6 +41,10 @@ sub option_fields {
type => 'textarea',
},
#'response_error_param' => 'Response error parameter',
+ 'debug' => { label => 'Enable debugging',
+ type => 'checkbox',
+ value => 1,
+ },
);
}
@@ -73,6 +81,9 @@ sub do_action {
Content => $content,
);
+ if ( $self->option('debug') ) {
+
+ }
my $response = $ua->request($req);
die $response->status_line if $response->is_error;
diff --git a/FS/FS/part_export/pbxware.pm b/FS/FS/part_export/pbxware.pm
index 36b1a2a..cb75c9b 100644
--- a/FS/FS/part_export/pbxware.pm
+++ b/FS/FS/part_export/pbxware.pm
@@ -5,7 +5,7 @@ use strict;
use Tie::IxHash;
use LWP::UserAgent;
-use JSON;
+use Cpanel::JSON::XS;
use HTTP::Request::Common;
use Digest::MD5 qw(md5_hex);
use FS::Record qw(dbh);
diff --git a/FS/FS/part_export/thinktel.pm b/FS/FS/part_export/thinktel.pm
index d208523..67cf2b0 100644
--- a/FS/FS/part_export/thinktel.pm
+++ b/FS/FS/part_export/thinktel.pm
@@ -7,7 +7,7 @@ use Tie::IxHash;
use URI::Escape;
use LWP::UserAgent;
use URI::Escape;
-use JSON;
+use Cpanel::JSON::XS;
use FS::Record qw( qsearch qsearchs );
@@ -214,7 +214,7 @@ sub insert_gateway {
my $content = {
ContactIPAddress => $svc_x->ip_addr,
ContactPort => 5060,
- IPMatchRequired => JSON::true,
+ IPMatchRequired => Cpanel::JSON::XS::true,
SipDomainName => $self->option('proxy'),
SipTrunkType => $self->option('trunktype'),
SipUsername => $trunknum,
@@ -270,7 +270,7 @@ sub insert_trunk {
my $endpoint = "SipTrunks";
my $content = {
Account => $self->option('username'),
- Enabled => JSON::true,
+ Enabled => Cpanel::JSON::XS::true,
Label => $svc_x->phone_name_or_cust,
Locale => $locales{$self->option('locale')},
MaxChannels => $svc_x->max_simultaneous,
@@ -325,7 +325,7 @@ sub replace_trunk {
my $self = FS::part_export->by_key($exportnum);
my $svc_x = FS::svc_phone->by_key($svcnum);
- my $enabled = JSON::is_bool( $self->cust_svc->cust_pkg->susp == 0 );
+ my $enabled = Cpanel::JSON::XS::is_bool( $self->cust_svc->cust_pkg->susp == 0 );
my $phonenum = $svc_x->phonenum;
my $endpoint = "SipTrunks/$phonenum";
@@ -398,7 +398,7 @@ sub replace_gateway {
ContactIPAddress => $svc_x->ip_addr,
ContactPort => 5060,
ID => $binding_id,
- IPMatchRequired => JSON::true,
+ IPMatchRequired => Cpanel::JSON::XS::true,
Name => $binding_name,
SipDomainName => $self->option('proxy'),
SipTrunkType => $self->option('trunktype'),
@@ -606,7 +606,7 @@ have a 'Message' element.
sub api_request {
my $self = shift;
my ($method, $endpoint, $content) = @_;
- my $json = JSON->new->canonical(1); # hash keys are ordered
+ my $json = Cpanel::JSON::XS->new->canonical(1); # hash keys are ordered
$DEBUG ||= 1 if $self->option('debug');
diff --git a/FS/FS/part_export/voip_ms.pm b/FS/FS/part_export/voip_ms.pm
index a23345c..2519884 100644
--- a/FS/FS/part_export/voip_ms.pm
+++ b/FS/FS/part_export/voip_ms.pm
@@ -7,7 +7,7 @@ use Tie::IxHash;
use LWP::UserAgent;
use URI;
use URI::Escape;
-use JSON;
+use Cpanel::JSON::XS;
use HTTP::Request::Common;
use Cache::FileCache;
use FS::Record qw(dbh);
diff --git a/FS/bin/freeside-cdr-portaone-import b/FS/bin/freeside-cdr-portaone-import
index 5b28e3f..e2023c8 100644
--- a/FS/bin/freeside-cdr-portaone-import
+++ b/FS/bin/freeside-cdr-portaone-import
@@ -5,7 +5,7 @@ use strict;
use Date::Format 'time2str';
use Date::Parse 'str2time';
use Getopt::Long;
-use JSON;
+use Cpanel::JSON::XS;
use Net::HTTPS::Any qw(https_post);
use Time::Local;
diff --git a/debian/control b/debian/control
index ad4b04d..6534e2f 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,8 @@ Depends: gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
libemail-address-list-perl,
libsymbol-global-name-perl, libdate-extract-perl, librole-basic-perl,
libhtml-formattext-withlinks-andtables-perl, libcrypt-x509-perl,
- libdata-guid-perl, libparams-classify-perl (>= 0.013-5.1)
+ libdata-guid-perl, libparams-classify-perl (>= 0.013-5.1),
+ libcpanel-json-xs-perl
Suggests: libbusiness-onlinepayment-perl
Description: Libraries for Freeside billing and trouble ticketing
Freeside is a web-based billing and trouble ticketing application.
@@ -130,7 +131,7 @@ Description: Integrated network monitoring and billing
Package: freeside-selfservice-ui
Architecture: all
-Depends: freeside-selfservice-lib,apache2
+Depends: freeside-selfservice-lib,libjson-perl,apache2
Description: Self-service portal html/cgi filesfor Freeside billing and trouble ticketing
Freeside is a web-based billing and trouble ticketing application.
.
diff --git a/httemplate/edit/cust_main_note.cgi b/httemplate/edit/cust_main_note.cgi
index 9ae29c2..c295e0d 100755
--- a/httemplate/edit/cust_main_note.cgi
+++ b/httemplate/edit/cust_main_note.cgi
@@ -26,7 +26,7 @@
<& /elements/htmlarea.html,
'field' => 'comment_html',
'curr_value' => $comment,
- 'config' => { toolbarStartupExpanded => JSON::false,
+ 'config' => { toolbarStartupExpanded => Cpanel::JSON::XS::false,
height => 315,
},
&>
diff --git a/httemplate/edit/payment_gateway.html b/httemplate/edit/payment_gateway.html
index 156910f..a85ba57 100644
--- a/httemplate/edit/payment_gateway.html
+++ b/httemplate/edit/payment_gateway.html
@@ -39,7 +39,7 @@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-my $json = JSON::XS->new;
+my $json = Cpanel::JSON::XS->new;
$json->canonical(1);
my %modules = (
'Business::OnlinePayment' => [
diff --git a/httemplate/elements/htmlarea.html b/httemplate/elements/htmlarea.html
index 4f9b721..dba744e 100644
--- a/httemplate/elements/htmlarea.html
+++ b/httemplate/elements/htmlarea.html
@@ -32,7 +32,7 @@ Example:
my %opt = @_;
my $config = {
'height' => ($opt{height} || 420),
- 'startupFocus' => JSON::true,
+ 'startupFocus' => Cpanel::JSON::XS::true,
'skin' => 'kama',
'toolbarCanCollapse' => JSON::true,
'removePlugins' => 'elementspath',
diff --git a/httemplate/elements/select-tiered.html b/httemplate/elements/select-tiered.html
index 48469dc..e76bf76 100644
--- a/httemplate/elements/select-tiered.html
+++ b/httemplate/elements/select-tiered.html
@@ -124,7 +124,7 @@ my %opt = @_;
my $pre = $opt{prefix} || '';
my $tiers = $opt{tiers} or die "no tiers defined";
-my $json = JSON::XS->new();
+my $json = Cpanel::JSON::XS->new();
$json->canonical;
my $i;
diff --git a/httemplate/misc/xmlhttp-mib-browse.html b/httemplate/misc/xmlhttp-mib-browse.html
index f3084ff..6b00853 100644
--- a/httemplate/misc/xmlhttp-mib-browse.html
+++ b/httemplate/misc/xmlhttp-mib-browse.html
@@ -1,5 +1,5 @@
%#<% Data::Format::HTML->new->format($index{by_path}) %>
-% my $json = "JSON"->new->canonical;
+% my $json = Cpanel::JSON::XS->new->canonical;
<% $json->encode($result) %>
<%init>
#<%once> #enable me in production
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Mason.pm | 2 +-
FS/FS/Misc/Geo.pm | 2 +-
FS/FS/TaxEngine/avalara.pm | 4 ++--
FS/FS/TaxEngine/suretax.pm | 4 ++--
FS/FS/UI/REST.pm | 2 +-
FS/FS/UI/Web.pm | 2 +-
FS/FS/deploy_zone.pm | 2 +-
FS/FS/msg_template/http.pm | 4 ++--
FS/FS/part_event/Action/http.pm | 15 +++++++++++++--
FS/FS/part_export/pbxware.pm | 2 +-
FS/FS/part_export/thinktel.pm | 12 ++++++------
FS/FS/part_export/voip_ms.pm | 2 +-
FS/bin/freeside-cdr-portaone-import | 2 +-
debian/control | 5 +++--
httemplate/edit/cust_main_note.cgi | 2 +-
httemplate/edit/payment_gateway.html | 2 +-
httemplate/elements/htmlarea.html | 2 +-
httemplate/elements/select-tiered.html | 2 +-
httemplate/misc/xmlhttp-mib-browse.html | 2 +-
19 files changed, 41 insertions(+), 29 deletions(-)
More information about the freeside-commits
mailing list