[freeside-commits] branch FREESIDE_3_BRANCH updated. ad508340f946534f49c3050bee4dd704b0c945fa

Mitch Jackson mitch at freeside.biz
Tue Oct 9 16:21:29 PDT 2018


The branch, FREESIDE_3_BRANCH has been updated
       via  ad508340f946534f49c3050bee4dd704b0c945fa (commit)
       via  79800f746bcbea85297b8ec0a94f19a75ed080d0 (commit)
      from  828f56957dcd4fb4409eccc8436bf935aa47a8c6 (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 ad508340f946534f49c3050bee4dd704b0c945fa
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Tue Oct 9 19:20:23 2018 -0400

    RT# 71955 JSON::XS -> Cpanel::JSON::XS

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index d3994e57f..b22748a4d 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2486,7 +2486,7 @@ use CAM::PDF;
 use IO::Socket::SSL;
 use LWP::UserAgent;
 use HTTP::Request::Common qw( POST );
-use JSON::XS;
+use Cpanel::JSON::XS;
 use MIME::Base64;
 sub postal_mail_fsinc {
   my ( $self, %opt ) = @_;
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm
index 2c8350834..f8eef017c 100644
--- a/FS/FS/cdr.pm
+++ b/FS/FS/cdr.pm
@@ -29,7 +29,7 @@ use FS::rate_detail;
 use LWP::UserAgent;
 use HTTP::Request::Common qw(POST);
 use IO::Socket::SSL;
-use JSON::XS qw(decode_json);
+use Cpanel::JSON::XS;
 
 @ISA = qw(FS::Record);
 @EXPORT_OK = qw( _cdr_date_parser_maker _cdr_min_parser_maker _cdr_date_parse );
diff --git a/FS/FS/part_export/portaone.pm b/FS/FS/part_export/portaone.pm
index 27a956f42..986a556ba 100644
--- a/FS/FS/part_export/portaone.pm
+++ b/FS/FS/part_export/portaone.pm
@@ -5,7 +5,7 @@ use strict;
 use base qw( FS::part_export );
 
 use Date::Format 'time2str';
-use JSON::XS;
+use Cpanel::JSON::XS;
 use Net::HTTPS::Any qw(https_post);
 
 use FS::Conf;
diff --git a/FS/FS/part_export/sipwise.pm b/FS/FS/part_export/sipwise.pm
index 2585991f8..9d4e3366e 100644
--- a/FS/FS/part_export/sipwise.pm
+++ b/FS/FS/part_export/sipwise.pm
@@ -8,7 +8,7 @@ use Tie::IxHash;
 use IO::Socket::SSL;
 use LWP::UserAgent;
 use URI;
-use JSON::XS;
+use Cpanel::JSON::XS;
 use HTTP::Request::Common qw(GET POST PUT DELETE);
 use FS::Misc::DateTime qw(parse_datetime);
 use DateTime;

commit 79800f746bcbea85297b8ec0a94f19a75ed080d0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Dec 13 15:28:57 2015 -0800

    JSON::XS -> Cpanel::JSON::XS

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 5beb100b7..dd9c57a3c 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -77,8 +77,7 @@ if ( -e $addl_handler_use_file ) {
   use HTML::TableExtract qw(tree);
   use HTML::FormatText;
   use HTML::Defang;
-#  use JSON::XS;        ! Maintainers deployed app-breaking defaults,
-  use Cpanel::JSON::XS; # this is considered safe compatible drop-in replacement
+  use Cpanel::JSON::XS;
 #  use XMLRPC::Transport::HTTP;
 #  use XMLRPC::Lite; # for XMLRPC::Serializer
   use MIME::Base64;
diff --git a/FS/FS/Misc/Geo.pm b/FS/FS/Misc/Geo.pm
index 2050fdf70..8533e37d9 100644
--- a/FS/FS/Misc/Geo.pm
+++ b/FS/FS/Misc/Geo.pm
@@ -8,7 +8,7 @@ use HTTP::Request;
 use HTTP::Request::Common qw( GET POST );
 use IO::Socket::SSL;
 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/UI/Web.pm b/FS/FS/UI/Web.pm
index 43a387227..d8117590c 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -739,8 +739,7 @@ use vars qw($DEBUG);
 use Carp;
 use Storable qw(nfreeze);
 use MIME::Base64;
-#use JSON::XS;        ! maintainers deployed app breaking changes
-use Cpanel::JSON::XS; # safe, compatible drop-in replacement
+use Cpanel::JSON::XS;
 use FS::UID qw(getotaker);
 use FS::Record qw(qsearchs);
 use FS::queue;
diff --git a/FS/FS/deploy_zone.pm b/FS/FS/deploy_zone.pm
index 7c3a76ca5..306b4fb44 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 Cpanel::JSON::XS qw(encode_json decode_json);
+use Cpanel::JSON::XS;
 use LWP::UserAgent;
 use HTTP::Request::Common;
 
diff --git a/FS/FS/part_event/Action/http.pm b/FS/FS/part_event/Action/http.pm
index 10e9bd463..13d13f292 100644
--- a/FS/FS/part_event/Action/http.pm
+++ b/FS/FS/part_event/Action/http.pm
@@ -6,7 +6,7 @@ use vars qw( $me );
 use IO::Socket::SSL;
 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]';
diff --git a/FS/FS/part_export/pbxware.pm b/FS/FS/part_export/pbxware.pm
index c6fc407e7..e535e6ed0 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 d20852395..67cf2b0da 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 a23345c5a..251988485 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 855f68fdd..dfd130bbb 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 90a21a324..8e92bf6d7 100644
--- a/debian/control
+++ b/debian/control
@@ -133,7 +133,7 @@ Description: Integrated network monitoring and billing
 
 Package: freeside-selfservice-ui
 Architecture: all
-Depends: freeside-selfservice-lib,apache2-suexec-custom,apache2
+Depends: freeside-selfservice-lib,apache2-suexec-custom,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/payment_gateway.html b/httemplate/edit/payment_gateway.html
index b28be2358..b44b31513 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 0ba417795..68acb970c 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,
   'basePath'            => $p.'elements/ckeditor/',
diff --git a/httemplate/elements/select-tiered.html b/httemplate/elements/select-tiered.html
index 9c7dfcf82..bdec95caf 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;
 $json->allow_nonref(1);
 
diff --git a/httemplate/misc/xmlhttp-mib-browse.html b/httemplate/misc/xmlhttp-mib-browse.html
index f3084ff6f..6b008538e 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                          |  3 +--
 FS/FS/Misc/Geo.pm                       |  2 +-
 FS/FS/Template_Mixin.pm                 |  2 +-
 FS/FS/UI/Web.pm                         |  3 +--
 FS/FS/cdr.pm                            |  2 +-
 FS/FS/deploy_zone.pm                    |  2 +-
 FS/FS/part_event/Action/http.pm         |  2 +-
 FS/FS/part_export/pbxware.pm            |  2 +-
 FS/FS/part_export/portaone.pm           |  2 +-
 FS/FS/part_export/sipwise.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                          |  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 +-
 18 files changed, 23 insertions(+), 25 deletions(-)




More information about the freeside-commits mailing list