From a1f9be2a8b5fbafffb27bcc23de59c9dd66e45e0 Mon Sep 17 00:00:00 2001
From: wakie87 <scott@npclinics.com.au>
Date: Wed, 10 Aug 2016 07:07:15 +0800
Subject: [PATCH] remove legacy includes dir

---
 includes/config.php                  | 11 -----------
 interface/billing/get_claim_file.php |  2 +-
 library/classes/OFX.class.php        |  2 +-
 library/classes/WSClaim.class.php    |  2 +-
 library/classes/WSProvider.class.php |  2 +-
 library/freeb/process_bills.php      |  2 +-
 library/freeb/xmlrpc_server.php      |  2 +-
 7 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 includes/config.php

diff --git a/includes/config.php b/includes/config.php
deleted file mode 100644
index 9ed07c29d..000000000
--- a/includes/config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-// Copyright (C) 2010 Rod Roark <rod@sunsetsystems.com>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-
-// $GLOBALS['OE_SITE_DIR'] is set in globals.php.
-require_once $GLOBALS['OE_SITE_DIR'] . "/config.php";
-?>
diff --git a/interface/billing/get_claim_file.php b/interface/billing/get_claim_file.php
index 53a62c257..b2fea9f5a 100644
--- a/interface/billing/get_claim_file.php
+++ b/interface/billing/get_claim_file.php
@@ -5,7 +5,7 @@
 // of the License, or (at your option) any later version.
 
 require_once(dirname(__FILE__) . "/../globals.php");
-require_once(dirname(__FILE__) . "/../../includes/config.php");
+require_once $GLOBALS['OE_SITE_DIR'] . "/config.php";
 
 $fconfig = $GLOBALS['oer_config']['freeb'];
 $content_type = "text/plain";
diff --git a/library/classes/OFX.class.php b/library/classes/OFX.class.php
index 18470f5e3..eb0d6a2cf 100644
--- a/library/classes/OFX.class.php
+++ b/library/classes/OFX.class.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once(dirname(__FILE__) . "/../../includes/config.php");
+require_once $GLOBALS['OE_SITE_DIR'] . "/config.php";
 
 /**
  * class OFX
diff --git a/library/classes/WSClaim.class.php b/library/classes/WSClaim.class.php
index b12eb0455..36a64727c 100644
--- a/library/classes/WSClaim.class.php
+++ b/library/classes/WSClaim.class.php
@@ -3,7 +3,7 @@
 require_once (dirname(__FILE__) . "/WSWrapper.class.php");
 include_once (dirname(__FILE__) . "/../sqlconf.php");
 include_once (dirname(__FILE__) . "/../sql.inc");
-include_once (dirname(__FILE__) . "/../../includes/config.php");
+require_once $GLOBALS['OE_SITE_DIR'] . "/config.php";
 
 class WSClaim extends WSWrapper{
 
diff --git a/library/classes/WSProvider.class.php b/library/classes/WSProvider.class.php
index 9a3545814..565feef40 100644
--- a/library/classes/WSProvider.class.php
+++ b/library/classes/WSProvider.class.php
@@ -1,7 +1,7 @@
 <?php
 require_once(dirname(__FILE__) . "/../patient.inc");
 include_once (dirname(__FILE__) . "/../sqlconf.php");
-include_once (dirname(__FILE__) . "/../../includes/config.php");
+require_once $GLOBALS['OE_SITE_DIR'] . "/config.php";
 
 class WSProvider extends WSWrapper{
 	
diff --git a/library/freeb/process_bills.php b/library/freeb/process_bills.php
index edd992853..92ad88254 100644
--- a/library/freeb/process_bills.php
+++ b/library/freeb/process_bills.php
@@ -2,7 +2,7 @@
 set_time_limit(0);
 require_once("xmlrpc.inc");
 require_once(dirname(__FILE__) . "/../sql.inc");
-require_once(dirname(__FILE__) . "/../../includes/config.php");
+require_once $GLOBALS['OE_SITE_DIR'] . "/config.php";
 require_once(dirname(__FILE__) . "/../billing.inc");
 
 if ($argv[1] != "bill") {
diff --git a/library/freeb/xmlrpc_server.php b/library/freeb/xmlrpc_server.php
index a022b38ff..927244929 100644
--- a/library/freeb/xmlrpc_server.php
+++ b/library/freeb/xmlrpc_server.php
@@ -3,7 +3,7 @@ require_once("xmlrpc.inc");
 require_once("xmlrpcs.inc");
 require_once("OpenemrBillingServer.class.php");
 
-require_once(dirname(__FILE__) . "/../../includes/config.php");
+require_once $GLOBALS['OE_SITE_DIR'] . "/config.php";
 
 $auth=false; 
 
-- 
2.11.4.GIT