Remove Deprecated library code json_encode and json_decode wrapper as…

… it is native in php5.2 onwards
DiscoverAndChange · Aug 8, 2016 · 49b5f35 · 49b5f35
1 parent addd1c9
commit 49b5f35
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 919 deletions.
diff --git a/interface/batchcom/batch_reminders.php b/interface/batchcom/batch_reminders.php
@@ -17,11 +17,6 @@
 require_once($GLOBALS['srcdir'] . "/reminders.php");
 require_once($GLOBALS['srcdir'] . "/report_database.inc");
 
-// This is only pertinent for users of php versions less than 5.2
-// (ie. this wrapper is only loaded when php version is less than
-// 5.2; otherwise the native php json functions are used)
-require_once "$srcdir/jsonwrapper/jsonwrapper.php";
-
 //To improve performance and not freeze the session when running this
 // report, turn off session writing. Note that php session variables
 // can not be modified after the line below. So, if need to do any php

diff --git a/interface/forms/fee_sheet/review/fee_sheet_ajax.php b/interface/forms/fee_sheet/review/fee_sheet_ajax.php
@@ -24,7 +24,6 @@
 
 require_once("../../../globals.php");
 require_once("fee_sheet_queries.php");
-include_once("$srcdir/jsonwrapper/jsonwrapper.php");
 
 if(!acl_check('acct', 'bill'))
 {

diff --git a/interface/forms/fee_sheet/review/fee_sheet_justify.php b/interface/forms/fee_sheet/review/fee_sheet_justify.php
@@ -23,9 +23,8 @@
 $sanitize_all_escapes=true;
 
 require_once("../../../globals.php");
-
 require_once("fee_sheet_queries.php");
-include_once("$srcdir/jsonwrapper/jsonwrapper.php");
+
 if(!acl_check('acct', 'bill'))
 {
  header("HTTP/1.0 403 Forbidden"); 

diff --git a/interface/forms/fee_sheet/review/fee_sheet_options_ajax.php b/interface/forms/fee_sheet/review/fee_sheet_options_ajax.php
@@ -24,7 +24,7 @@
 
 require_once("../../../globals.php");
 require_once("fee_sheet_options_queries.php");
-include_once("$srcdir/jsonwrapper/jsonwrapper.php");
+
 if(!acl_check('acct', 'bill'))
 {
  header("HTTP/1.0 403 Forbidden"); 

diff --git a/interface/forms/fee_sheet/review/fee_sheet_search_ajax.php b/interface/forms/fee_sheet/review/fee_sheet_search_ajax.php
@@ -24,7 +24,6 @@
 require_once("../../../globals.php");
 require_once("fee_sheet_classes.php");
 require_once("fee_sheet_search_queries.php");
-include_once("$srcdir/jsonwrapper/jsonwrapper.php");
 
 if(!acl_check('acct', 'bill'))
 {

diff --git a/interface/main/finder/dynamic_finder_ajax.php b/interface/main/finder/dynamic_finder_ajax.php
@@ -15,7 +15,6 @@
 require_once("../../globals.php");
 require_once("$srcdir/formdata.inc.php");
 require_once("$srcdir/formatting.inc.php");
-require_once("$srcdir/jsonwrapper/jsonwrapper.php");
 
 $popup = empty($_REQUEST['popup']) ? 0 : 1;
 

diff --git a/interface/reports/cqm.php b/interface/reports/cqm.php
@@ -22,11 +22,6 @@
 require_once "$srcdir/clinical_rules.php";
 require_once "$srcdir/report_database.inc";
 
-// This is only pertinent for users of php versions less than 5.2
-// (ie. this wrapper is only loaded when php version is less than
-// 5.2; otherwise the native php json functions are used)
-require_once "$srcdir/jsonwrapper/jsonwrapper.php";
-
 // See if showing an old report or creating a new report
 $report_id = (isset($_GET['report_id'])) ? trim($_GET['report_id']) : "";
 

diff --git a/library/clinical_rules.php b/library/clinical_rules.php
@@ -34,11 +34,6 @@
 require_once(dirname(__FILE__) . "/options.inc.php");
 require_once(dirname(__FILE__) . "/report_database.inc");
 
-// This is only pertinent for users of php versions less than 5.2
-// (ie. this wrapper is only loaded when php version is less than
-// 5.2; otherwise the native php json functions are used)
-require_once(dirname(__FILE__) . "/jsonwrapper/jsonwrapper.php");
-
 /**
  * Return listing of CDR reminders in log.
  *