From c46ee6da61815b2dab0088d2ef761af13f465321 Mon Sep 17 00:00:00 2001
From: Jamie P Holcomb <jamie.holcomb@adaptivestack.com>
Date: Tue, 21 Nov 2023 07:29:55 -0500
Subject: [PATCH] Leaf 4118 - new global constances

---
 LEAF_Nexus/admin/index.php                    | 21 +++--
 LEAF_Nexus/ajaxEmployee.php                   |  7 +-
 LEAF_Nexus/ajaxGroup.php                      |  7 +-
 LEAF_Nexus/ajaxIframe.php                     |  5 +-
 LEAF_Nexus/ajaxIndex.php                      | 24 ++----
 LEAF_Nexus/ajaxPosition.php                   |  2 +-
 LEAF_Nexus/api/index.php                      |  2 +-
 LEAF_Nexus/auth_cookie/index.php              | 10 +--
 LEAF_Nexus/auth_domain/index.php              | 10 +--
 LEAF_Nexus/auth_token/index.php               | 10 +--
 LEAF_Nexus/file.php                           |  6 +-
 LEAF_Nexus/image.php                          |  6 +-
 LEAF_Nexus/index.php                          | 42 +++++-----
 LEAF_Nexus/login/index.php                    |  8 +-
 LEAF_Nexus/report.php                         | 10 +--
 LEAF_Nexus/scripts/convertFileNames.php       |  6 +-
 LEAF_Nexus/scripts/firstRun.php               | 10 +--
 .../scripts/refreshOrgchartEmployees.php      | 26 +++----
 LEAF_Nexus/scripts/syncSVNrevision.php        |  4 +-
 LEAF_Nexus/scripts/updateDatabase.php         |  2 +-
 LEAF_Nexus/sources/Config.php                 |  2 -
 LEAF_Nexus/test.php                           |  2 +-
 LEAF_Nexus/utils/exportPDL.php                |  6 +-
 LEAF_Nexus/utils/jsonExport_PDL.php           | 12 +--
 LEAF_Request_Portal/admin/ajaxIndex.php       | 66 +++++++---------
 LEAF_Request_Portal/admin/ajaxJSON.php        |  2 +-
 LEAF_Request_Portal/admin/index.php           | 37 ++++-----
 LEAF_Request_Portal/admin/modgroups.php       |  4 +-
 LEAF_Request_Portal/ajaxIframe.php            | 16 ++--
 LEAF_Request_Portal/ajaxIndex.php             | 43 +++-------
 LEAF_Request_Portal/ajaxJSON.php              |  8 +-
 LEAF_Request_Portal/ajaxMicro.php             |  4 +-
 LEAF_Request_Portal/ajaxScript.php            |  2 +-
 .../api/controllers/SiteController.php        |  2 +-
 LEAF_Request_Portal/api/index.php             | 78 +++++++++----------
 LEAF_Request_Portal/auth_cookie/index.php     | 10 +--
 .../auth_domain/LEAF_coach_key.php            |  4 +-
 LEAF_Request_Portal/auth_domain/api/index.php |  2 +
 LEAF_Request_Portal/auth_domain/index.php     | 10 +--
 LEAF_Request_Portal/auth_token/index.php      | 10 +--
 LEAF_Request_Portal/file.php                  |  2 +-
 LEAF_Request_Portal/image.php                 |  2 +-
 LEAF_Request_Portal/index.php                 | 61 +++++++--------
 LEAF_Request_Portal/login/index.php           |  8 +-
 LEAF_Request_Portal/open.php                  |  2 +-
 LEAF_Request_Portal/report.php                | 22 +++---
 .../scripts/automated_email.php               | 10 +--
 LEAF_Request_Portal/scripts/firstRun.php      |  4 +-
 .../scripts/syncSVNrevision.php               |  2 +-
 LEAF_Request_Portal/scripts/sync_services.php | 14 ++--
 .../scripts/updateDatabase.php                |  2 +-
 LEAF_Request_Portal/sources/Site.php          |  6 --
 .../utils/LEAF_exportStandardConfig.php       | 28 ++++---
 .../utils/LEAF_importStandardConfig.php       | 72 ++++++++---------
 app/libs/loaders/Leaf_autoloader.php          | 28 +++----
 .../automatedDestruction.php                  |  4 +-
 .../refreshOrgchartEmployees.php              |  4 +-
 57 files changed, 359 insertions(+), 450 deletions(-)

diff --git a/LEAF_Nexus/admin/index.php b/LEAF_Nexus/admin/index.php
index 2ae360046..7147bc4f0 100644
--- a/LEAF_Nexus/admin/index.php
+++ b/LEAF_Nexus/admin/index.php
@@ -110,12 +110,11 @@
 
            $t_form->assign('timeZones', DateTimeZone::listIdentifiers(DateTimeZone::PER_COUNTRY, 'US'));
 
-           //$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-           $t_form->assign('timeZone', $settings['timeZone']);
-           $t_form->assign('heading', XSSHelpers::sanitizeHTMLRich($settings['heading'] == '' ? $config->title : $settings['heading']));
-           $t_form->assign('subheading', XSSHelpers::sanitizeHTMLRich($settings['subheading'] == '' ? $config->city : $settings['subheading']));
+           $t_form->assign('timeZone', LEAF_SETTINGS['timeZone']);
+           $t_form->assign('heading', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['heading']));
+           $t_form->assign('subheading', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['subheading']));
 
-           $tagObj = new Orgchart\Tag($db, $oc_login);
+           $tagObj = new Orgchart\Tag(DB, $oc_login);
            $t_form->assign('serviceParent', $tagObj->getParent('service'));
 
            $memberships = $oc_login->getMembership();
@@ -142,9 +141,8 @@
 
            $t_form->assign('CSRFToken', $_SESSION['CSRFToken']);
 
-           //$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-           $t_form->assign('heading', XSSHelpers::sanitizeHTMLRich($settings['heading'] == '' ? $config->title : $settings['heading']));
-           $t_form->assign('subheading', XSSHelpers::sanitizeHTMLRich($settings['subheading'] == '' ? $config->city : $settings['subheading']));
+           $t_form->assign('heading', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['heading']));
+           $t_form->assign('subheading', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['subheading']));
 
            $memberships = $oc_login->getMembership();
            if (isset($memberships['groupID'][1]))
@@ -263,10 +261,9 @@
 $tabText = $tabText == '' ? '' : $tabText . '&nbsp;';
 $main->assign('tabText', $tabText);
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-$main->assign('title', XSSHelpers::sanitizeHTMLRich($settings['heading'] == '' ? $config->title : $settings['heading']));
-$main->assign('city', XSSHelpers::sanitizeHTMLRich($settings['subheading'] == '' ? $config->city : $settings['subheading']));
-$main->assign('revision', XSSHelpers::xscrub($settings['version']));
+$main->assign('title', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['heading']));
+$main->assign('city', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['subheading']));
+$main->assign('revision', XSSHelpers::xscrub(LEAF_SETTINGS['version']));
 
 if (!isset($_GET['iframe']))
 {
diff --git a/LEAF_Nexus/ajaxEmployee.php b/LEAF_Nexus/ajaxEmployee.php
index 457b33536..3e676e55d 100644
--- a/LEAF_Nexus/ajaxEmployee.php
+++ b/LEAF_Nexus/ajaxEmployee.php
@@ -19,18 +19,13 @@
 
 $oc_login->loginUser();
 
-if ($oc_login)
-{
-}
-
-$employee = new Orgchart\Employee($oc_db, $oc_login);
+$employee = new Orgchart\Employee(OC_DB, $oc_login);
 
 $action = isset($_GET['a']) ? $_GET['a'] : '';
 
 $uid = isset($_GET['empUID']) && is_numeric($_GET['empUID']) ? $_GET['empUID'] : 0;
 $indicatorID = isset($_GET['indicatorID']) && is_numeric($_GET['indicatorID']) ? $_GET['indicatorID'] : 0;
 
-
 switch ($action) {
     case 'getForm':
         $t_form = new Smarty;
diff --git a/LEAF_Nexus/ajaxGroup.php b/LEAF_Nexus/ajaxGroup.php
index 5e50a001b..d5e67deb7 100644
--- a/LEAF_Nexus/ajaxGroup.php
+++ b/LEAF_Nexus/ajaxGroup.php
@@ -14,11 +14,8 @@
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
 $oc_login->loginUser();
-if ($oc_login)
-{
-}
 
-$group = new Orgchart\Group($oc_db, $oc_login);
+$group = new Orgchart\Group(OC_DB, $oc_login);
 
 $action = isset($_GET['a']) ? $_GET['a'] : '';
 
@@ -81,7 +78,7 @@
 
         break;
     case 'listPositionData':
-        $employee = new Orgchart\Employee($oc_db, $oc_login);
+        $employee = new Orgchart\Employee(OC_DB, $oc_login);
 
         $t_form = new Smarty;
         $t_form->left_delimiter = '<!--{';
diff --git a/LEAF_Nexus/ajaxIframe.php b/LEAF_Nexus/ajaxIframe.php
index 2513fbdcf..c750705af 100644
--- a/LEAF_Nexus/ajaxIframe.php
+++ b/LEAF_Nexus/ajaxIframe.php
@@ -122,7 +122,7 @@
 
         break;
     case 'view_position_permissions':
-        $position = new Orgchart\Position($oc_db, $oc_login);
+        $position = new Orgchart\Position(OC_DB, $oc_login);
 
         $t_iframe = new Smarty;
         $t_iframe->left_delimiter = '<!--{';
@@ -181,7 +181,6 @@
 $main->assign('title', $config->title);
 $main->assign('city', $config->city);
 
-$rev = $oc_db->prepared_query("SELECT * FROM settings WHERE setting='version'", array());
-$main->assign('revision', XSSHelpers::xscrub($rev[0]['data']));
+$main->assign('revision', XSSHelpers::xscrub(OC_SETTINGS['version']));
 
 $main->display('main_iframe.tpl');
diff --git a/LEAF_Nexus/ajaxIndex.php b/LEAF_Nexus/ajaxIndex.php
index f67f9d6a0..b4adbda65 100644
--- a/LEAF_Nexus/ajaxIndex.php
+++ b/LEAF_Nexus/ajaxIndex.php
@@ -15,30 +15,25 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-//$settings = $oc_db->query_kv('SELECT * FROM settings', 'setting', 'data');
-if (isset($settings['timeZone']))
-{
-    date_default_timezone_set(XSSHelpers::xscrub($settings['timeZone']));
+if (isset(LEAF_SETTINGS['timeZone'])) {
+    date_default_timezone_set(XSSHelpers::xscrub(LEAF_SETTINGS['timeZone']));
 }
 
 
 $oc_login->loginUser();
-if ($oc_login)
-{
-}
 
 $type = null;
 switch ($_GET['categoryID']) {
     case 1:    // employee
-        $type = new Orgchart\Employee($oc_db, $oc_login);
+        $type = new Orgchart\Employee(OC_DB, $oc_login);
 
         break;
     case 2:    // position
-        $type = new Orgchart\Position($oc_db, $oc_login);
+        $type = new Orgchart\Position(OC_DB, $oc_login);
 
         break;
     case 3:    // group
-        $type = new Orgchart\Group($oc_db, $oc_login);
+        $type = new Orgchart\Group(OC_DB, $oc_login);
 
         break;
     default:
@@ -133,12 +128,9 @@
         $tz = isset($_GET['tz']) ? $_GET['tz'] : null;
 
         if($tz == null){
-            //$settings = $oc_db->query_kv('SELECT * FROM settings', 'setting', 'data');
-            if(isset($settings['timeZone']))
-            {
-                $tz = $settings['timeZone'];
-            }
-            else{
+            if (isset(LEAF_SETTINGS['timeZone'])) {
+                $tz = LEAF_SETTINGS['timeZone'];
+            } else {
                 $tz = 'America/New_York';
             }
         }
diff --git a/LEAF_Nexus/ajaxPosition.php b/LEAF_Nexus/ajaxPosition.php
index 5c7f9bc2a..47c509ef4 100644
--- a/LEAF_Nexus/ajaxPosition.php
+++ b/LEAF_Nexus/ajaxPosition.php
@@ -18,7 +18,7 @@
 {
 }
 
-$position = new Orgchart\Position($oc_db, $oc_login);
+$position = new Orgchart\Position(OC_DB, $oc_login);
 
 $action = isset($_GET['a']) ? $_GET['a'] : '';
 
diff --git a/LEAF_Nexus/api/index.php b/LEAF_Nexus/api/index.php
index c4ccb5157..2f98c92f9 100644
--- a/LEAF_Nexus/api/index.php
+++ b/LEAF_Nexus/api/index.php
@@ -8,7 +8,7 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-$oc_db = $oc_db;
+$oc_db = OC_DB;
 $oc_login->setBaseDir('../');
 
 if (strtolower($oc_config->dbName) == strtolower(DIRECTORY_DB)) {
diff --git a/LEAF_Nexus/auth_cookie/index.php b/LEAF_Nexus/auth_cookie/index.php
index f794e2440..2b5e17d1a 100644
--- a/LEAF_Nexus/auth_cookie/index.php
+++ b/LEAF_Nexus/auth_cookie/index.php
@@ -32,7 +32,7 @@
 
     // see if user is valid
     $vars = array(':userName' => $user);
-    $res = $oc_db->prepared_query('SELECT * FROM employee
+    $res = OC_DB->prepared_query('SELECT * FROM employee
                                  WHERE userName=:userName
                                   AND deleted=0', $vars);
 
@@ -65,16 +65,16 @@
                     ':domain' => $res[0]['domain'],
                     ':lastUpdated' => time(),
                     ':new_empUUID' => $res[0]['new_empUUID'] );
-            $oc_db->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
+            OC_DB->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
                                   VALUES (:firstName, :lastName, :middleName, :userName, :phoFirstName, :phoLastName, :domain, :lastUpdated, :new_empUUID)
                                   ON DUPLICATE KEY UPDATE deleted=0', $vars);
 
-            $empUID = $oc_db->getLastInsertID();
+            $empUID = OC_DB->getLastInsertID();
 
             if ($empUID == 0)
             {
                 $vars = array(':userName' => $res[0]['userName']);
-                $empUID = $oc_db->prepared_query('SELECT empUID FROM employee
+                $empUID = OC_DB->prepared_query('SELECT empUID FROM employee
                                                             WHERE userName=:userName', $vars)[0]['empUID'];
             }
 
@@ -84,7 +84,7 @@
                     ':author' => 'viaLogin',
                     ':timestamp' => time(),
             );
-            $oc_db->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
+            OC_DB->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
                                             VALUES (:empUID, :indicatorID, :data, :author, :timestamp)
                                             ON DUPLICATE KEY UPDATE data=:data', $vars);
 
diff --git a/LEAF_Nexus/auth_domain/index.php b/LEAF_Nexus/auth_domain/index.php
index 8a9183663..b69ed6e34 100644
--- a/LEAF_Nexus/auth_domain/index.php
+++ b/LEAF_Nexus/auth_domain/index.php
@@ -35,7 +35,7 @@
 
     // see if user is valid
     $vars = array(':userName' => $user);
-    $res = $oc_db->prepared_query('SELECT * FROM employee
+    $res = OC_DB->prepared_query('SELECT * FROM employee
     										WHERE userName=:userName
 												AND deleted=0', $vars);
 
@@ -68,15 +68,15 @@
                     ':domain' => $res[0]['domain'],
                     ':lastUpdated' => time(),
                     ':new_empUUID' => $res[0]['new_empUUID'] );
-            $oc_db->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
+            OC_DB->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
                                   VALUES (:firstName, :lastName, :middleName, :userName, :phoFirstName, :phoLastName, :domain, :lastUpdated, :new_empUUID)
     								ON DUPLICATE KEY UPDATE deleted=0', $vars);
-            $empUID = $oc_db->getLastInsertID();
+            $empUID = OC_DB->getLastInsertID();
 
             if ($empUID == 0)
             {
                 $vars = array(':userName' => $res[0]['userName']);
-                $empUID = $oc_db->prepared_query('SELECT empUID FROM employee
+                $empUID = OC_DB->prepared_query('SELECT empUID FROM employee
                                                    WHERE userName=:userName', $vars)[0]['empUID'];
             }
 
@@ -86,7 +86,7 @@
                     ':author' => 'viaLogin',
                     ':timestamp' => time(),
             );
-            $oc_db->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
+            OC_DB->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
 											VALUES (:empUID, :indicatorID, :data, :author, :timestamp)
     										ON DUPLICATE KEY UPDATE data=:data', $vars);
 
diff --git a/LEAF_Nexus/auth_token/index.php b/LEAF_Nexus/auth_token/index.php
index bf0f6b65b..275e9c3c9 100644
--- a/LEAF_Nexus/auth_token/index.php
+++ b/LEAF_Nexus/auth_token/index.php
@@ -32,7 +32,7 @@
     }
 
     $vars = array(':email' => $_SERVER['SSL_CLIENT_S_DN_UID']);
-    $res = $oc_db->prepared_query('SELECT * FROM employee_data
+    $res = OC_DB->prepared_query('SELECT * FROM employee_data
 											LEFT JOIN employee USING (empUID)
 											WHERE indicatorID = 6
 												AND data = :email
@@ -67,15 +67,15 @@
                     ':domain' => $res[0]['domain'],
                     ':lastUpdated' => time(),
                     ':new_empUUID' => $res[0]['new_empUUID'] );
-            $oc_db->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
+            OC_DB->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
                                   VALUES (:firstName, :lastName, :middleName, :userName, :phoFirstName, :phoLastName, :domain, :lastUpdated, :new_empUUID)
 									ON DUPLICATE KEY UPDATE deleted=0', $vars);
-            $empUID = $oc_db->getLastInsertID();
+            $empUID = OC_DB->getLastInsertID();
 
             if ($empUID == 0)
             {
                 $vars = array(':userName' => $res[0]['userName']);
-                $empUID = $oc_db->prepared_query('SELECT empUID FROM employee
+                $empUID = OC_DB->prepared_query('SELECT empUID FROM employee
                                                     WHERE userName=:userName', $vars)[0]['empUID'];
             }
 
@@ -85,7 +85,7 @@
                           ':author' => 'viaLogin',
                           ':timestamp' => time(),
             );
-            $oc_db->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
+            OC_DB->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
 											VALUES (:empUID, :indicatorID, :data, :author, :timestamp)
 											ON DUPLICATE KEY UPDATE data=:data', $vars);
 
diff --git a/LEAF_Nexus/file.php b/LEAF_Nexus/file.php
index 6b30e076d..03d4f6eb9 100644
--- a/LEAF_Nexus/file.php
+++ b/LEAF_Nexus/file.php
@@ -12,15 +12,15 @@
 $type = null;
 switch ($_GET['categoryID']) {
     case 1:    // employee
-        $type = new Orgchart\Employee($oc_db, $oc_login);
+        $type = new Orgchart\Employee(OC_DB, $oc_login);
 
         break;
     case 2:    // position
-        $type = new Orgchart\Position($oc_db, $oc_login);
+        $type = new Orgchart\Position(OC_DB, $oc_login);
 
         break;
     case 3:    // group
-        $type = new Orgchart\Group($oc_db, $oc_login);
+        $type = new Orgchart\Group(OC_DB, $oc_login);
 
         break;
     default:
diff --git a/LEAF_Nexus/image.php b/LEAF_Nexus/image.php
index 396327c08..3bb474466 100644
--- a/LEAF_Nexus/image.php
+++ b/LEAF_Nexus/image.php
@@ -10,15 +10,15 @@
 $type = null;
 switch ($_GET['categoryID']) {
     case 1:    // employee
-        $type = new Orgchart\Employee($oc_db, $oc_login);
+        $type = new Orgchart\Employee(OC_DB, $oc_login);
 
         break;
     case 2:    // position
-        $type = new Orgchart\Position($oc_db, $oc_login);
+        $type = new Orgchart\Position(OC_DB, $oc_login);
 
         break;
     case 3:    // group
-        $type = new Orgchart\Group($oc_db, $oc_login);
+        $type = new Orgchart\Group(OC_DB, $oc_login);
 
         break;
     default:
diff --git a/LEAF_Nexus/index.php b/LEAF_Nexus/index.php
index 9dd005792..d320aeafc 100644
--- a/LEAF_Nexus/index.php
+++ b/LEAF_Nexus/index.php
@@ -54,7 +54,7 @@ function customTemplate($tpl)
 
 switch ($action) {
     case 'navigator_service':
-        $group = new Orgchart\Group($oc_db, $oc_login);
+        $group = new Orgchart\Group(OC_DB, $oc_login);
         $_GET['rootID'] = $group->getGroupLeader((int)$_GET['groupID']);
         // no break
     case 'navigator':
@@ -66,7 +66,7 @@ function customTemplate($tpl)
 
         $main->assign('javascripts', array('https://' . HTTP_HOST . '/app/libs/js/jsPlumb/dom.jsPlumb-min.js',
                                            'js/ui/position.js', ));
-        $position = new Orgchart\Position($oc_db, $oc_login);
+        $position = new Orgchart\Position(OC_DB, $oc_login);
 
         $rootID = isset($_GET['rootID']) ? (int)$_GET['rootID'] : $position->getTopSupervisorID(1);
         $t_form->assign('rootID', $rootID);
@@ -97,7 +97,7 @@ function customTemplate($tpl)
                                            'js/dialogController.js',
                                            'js/ui/position.js',
                                            'js/positionSelector.js', ));
-        $position = new Orgchart\Position($oc_db, $oc_login);
+        $position = new Orgchart\Position(OC_DB, $oc_login);
 
         $rootID = isset($_GET['rootID']) ? (int)$_GET['rootID'] : 0;
         $t_form->assign('rootID', $rootID);
@@ -142,7 +142,7 @@ function customTemplate($tpl)
         $empUID = isset($_GET['empUID']) ? (int)$_GET['empUID'] : 0;
         if ($empUID != 0)
         {
-            $employee = new Orgchart\Employee($oc_db, $oc_login);
+            $employee = new Orgchart\Employee(OC_DB, $oc_login);
             $summary = $employee->getSummary($empUID);
 
             $t_form->assign('empUID', $empUID);
@@ -154,7 +154,7 @@ function customTemplate($tpl)
             $main->assign('CSRFToken', $_SESSION['CSRFToken']);
 
 
-            $t_form->assign('ERM_site_resource_management', $oc_settings['ERM_Sites']['resource_management']);
+            $t_form->assign('ERM_site_resource_management', OC_SETTINGS['ERM_Sites']['resource_management']);
 
             if (count($summary['employee']) > 0)
             {
@@ -189,7 +189,7 @@ function customTemplate($tpl)
         $positionID = isset($_GET['positionID']) ? (int)$_GET['positionID'] : 0;
         if ($positionID != 0)
         {
-            $position = new Orgchart\Position($oc_db, $oc_login);
+            $position = new Orgchart\Position(OC_DB, $oc_login);
 
             $summary = $position->getSummary($positionID);
             $t_form->assign('positionID', $positionID);
@@ -201,7 +201,7 @@ function customTemplate($tpl)
             $t_form->assign('userID', $_SESSION['userID']);
             $t_form->assign('CSRFToken', $_SESSION['CSRFToken']);
             $t_form->assign('userDomain', $oc_login->getDomain());
-            $t_form->assign('ERM_site_resource_management', $oc_settings['ERM_Sites']['resource_management']);
+            $t_form->assign('ERM_site_resource_management', OC_SETTINGS['ERM_Sites']['resource_management']);
 
             if (count($summary) > 0)
             {
@@ -241,8 +241,8 @@ function customTemplate($tpl)
 
         if ($groupID != 0)
         {
-            $group = new Orgchart\Group($oc_db, $oc_login);
-            $tag = new Orgchart\Tag($oc_db, $oc_login);
+            $group = new Orgchart\Group(OC_DB, $oc_login);
+            $tag = new Orgchart\Tag(OC_DB, $oc_login);
             $resGroup = $group->getGroup($groupID);
             $t_form->assign('groupID', $groupID);
             $t_form->assign('group', $resGroup);
@@ -278,7 +278,7 @@ function customTemplate($tpl)
                                            'css/view_employee.css', ));
         $empUID = isset($_GET['empUID']) ? (int)$_GET['empUID'] : 0;
 
-        $employee = new Orgchart\Employee($oc_db, $oc_login);
+        $employee = new Orgchart\Employee(OC_DB, $oc_login);
 
         $t_form->assign('empUID', $empUID);
         $t_form->assign('summary', $employee->getSummary($empUID));
@@ -342,7 +342,7 @@ function customTemplate($tpl)
 
         break;
     case 'view_permissions':
-        $indicators = new Orgchart\Indicators($oc_db, $oc_login);
+        $indicators = new Orgchart\Indicators(OC_DB, $oc_login);
 
         $t_form = new \Smarty;
         $t_form->left_delimiter = '<!--{';
@@ -381,7 +381,7 @@ function customTemplate($tpl)
 
         break;
     case 'view_group_permissions':
-        $group = new Orgchart\Group($oc_db, $oc_login);
+        $group = new Orgchart\Group(OC_DB, $oc_login);
 
         $t_form = new \Smarty;
         $t_form->left_delimiter = '<!--{';
@@ -411,7 +411,7 @@ function customTemplate($tpl)
 
         break;
     case 'view_position_permissions':
-        $position = new Orgchart\Position($oc_db, $oc_login);
+        $position = new Orgchart\Position(OC_DB, $oc_login);
 
         $t_form = new \Smarty;
         $t_form->left_delimiter = '<!--{';
@@ -487,8 +487,7 @@ function customTemplate($tpl)
         $t_form->left_delimiter = '<!--{';
         $t_form->right_delimiter = '}-->';
 
-        $rev = $oc_db->prepared_query("SELECT * FROM settings WHERE setting='dbversion'", array());
-        $t_form->assign('dbversion', XSSHelpers::xscrub($rev[0]['data']));
+        $t_form->assign('dbversion', XSSHelpers::xscrub(OC_SETTINGS['dbversion']));
 
         $main->assign('hideFooter', true);
         $main->assign('body', $t_form->fetch('view_about.tpl'));
@@ -504,8 +503,8 @@ function customTemplate($tpl)
             $t_form->left_delimiter = '<!--{';
             $t_form->right_delimiter = '}-->';
 
-            $employee = new Orgchart\Employee($oc_db, $oc_login);
-            $position = new Orgchart\Position($oc_db, $oc_login);
+            $employee = new Orgchart\Employee(OC_DB, $oc_login);
+            $position = new Orgchart\Position(OC_DB, $oc_login);
 
             $currentEmployee = $employee->lookupLogin($oc_login->getUserID());
             $t_form->assign('employee', $currentEmployee);
@@ -518,7 +517,7 @@ function customTemplate($tpl)
             $groupLeader = '';
             if (count($resolvedService) > 0)
             {
-                $group = new Orgchart\Group($oc_db, $oc_login);
+                $group = new Orgchart\Group(OC_DB, $oc_login);
 
                 $groupLeader = $group->getGroupLeader($resolvedService[0]['groupID']);
             }
@@ -566,10 +565,9 @@ function customTemplate($tpl)
 $tabText = $tabText == '' ? '' : $tabText . '&nbsp;';
 $main->assign('tabText', $tabText);
 
-//$settings = $oc_db->query_kv('SELECT * FROM settings', 'setting', 'data');
-$main->assign('title', XSSHelpers::sanitizeHTMLRich($settings['heading'] == '' ? $config->title : $settings['heading']));
-$main->assign('city', XSSHelpers::sanitizeHTMLRich($settings['subheading'] == '' ? $config->city : $settings['subheading']));
-$main->assign('revision', XSSHelpers::xscrub($settings['version']));
+$main->assign('title', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['heading']));
+$main->assign('city', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['subheading']));
+$main->assign('revision', XSSHelpers::xscrub(LEAF_SETTINGS['version']));
 
 if (!isset($_GET['iframe']))
 {
diff --git a/LEAF_Nexus/login/index.php b/LEAF_Nexus/login/index.php
index 45ceb7dfb..f1302a827 100644
--- a/LEAF_Nexus/login/index.php
+++ b/LEAF_Nexus/login/index.php
@@ -11,10 +11,6 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-$settings['heading'] = XSSHelpers::sanitizeHTMLRich($settings['heading'] == '' ? $config->title : $settings['heading']);
-$settings['subHeading'] = XSSHelpers::sanitizeHTMLRich($settings['subHeading'] == '' ? $config->city : $settings['subHeading']);
-
 function getBaseDir()
 {
     $dir = dirname($_SERVER['PHP_SELF']);
@@ -43,8 +39,8 @@ function getBaseDir()
 <div id="header">
     <div>
       <span style="position: absolute"><img src="../images/VA_icon_small.png" style="width: 80px" alt="VA logo" /></span>
-      <span id="headerLabel"><?php echo htmlentities($settings['subHeading']); ?></span>
-      <span id="headerDescription"><?php echo htmlentities($settings['heading']); ?></span>
+      <span id="headerLabel"><?php echo htmlentities(LEAF_SETTINGS['subHeading']); ?></span>
+      <span id="headerDescription"><?php echo htmlentities(LEAF_SETTINGS['heading']); ?></span>
     </div>
     <span id="headerTab">Secure Login</span>
     <span id="headerTabImg"><img src="../images/tab.png" alt="tab" /></span>
diff --git a/LEAF_Nexus/report.php b/LEAF_Nexus/report.php
index 801937711..38c206471 100644
--- a/LEAF_Nexus/report.php
+++ b/LEAF_Nexus/report.php
@@ -56,8 +56,7 @@ function customTemplate($tpl)
         $t_form->left_delimiter = '<!--{';
         $t_form->right_delimiter = '}-->';
 
-        $rev = $oc_db->prepared_query("SELECT * FROM settings WHERE setting='dbversion'", array());
-        $t_form->assign('dbversion', XSSHelpers::xscrub($rev[0]['data']));
+        $t_form->assign('dbversion', XSSHelpers::xscrub(OC_SETTINGS['dbversion']));
 
         $main->assign('hideFooter', true);
         $main->assign('body', $t_form->fetch('view_about.tpl'));
@@ -110,10 +109,9 @@ function customTemplate($tpl)
 $tabText = $tabText == '' ? '' : $tabText . '&nbsp;';
 $main->assign('tabText', $tabText);
 
-//$settings = $oc_db->query_kv('SELECT * FROM settings', 'setting', 'data');
-$main->assign('title', XSSHelpers::sanitizeHTMLRich($settings['heading'] == '' ? $config->title : $settings['heading']));
-$main->assign('city', XSSHelpers::sanitizeHTMLRich($settings['subheading'] == '' ? $config->city : $settings['subheading']));
-$main->assign('revision', XSSHelpers::scrubNewLinesFromURL($settings['version']));
+$main->assign('title', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['heading']));
+$main->assign('city', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['subheading']));
+$main->assign('revision', XSSHelpers::scrubNewLinesFromURL(LEAF_SETTINGS['version']));
 
 if (!isset($_GET['iframe']))
 {
diff --git a/LEAF_Nexus/scripts/convertFileNames.php b/LEAF_Nexus/scripts/convertFileNames.php
index 9e37d1379..32153d629 100644
--- a/LEAF_Nexus/scripts/convertFileNames.php
+++ b/LEAF_Nexus/scripts/convertFileNames.php
@@ -46,15 +46,15 @@ function oldFileHash($categoryID, $uid, $indicatorID, $fileName)
         $res = null;
         switch ($categoryID) {
             case 1:
-                $type = new Orgchart\Employee($db, $login);
+                $type = new Orgchart\Employee(OC_DB, $login);
 
                 break;
             case 2:
-                $type = new Orgchart\Position($db, $login);
+                $type = new Orgchart\Position(OC_DB, $login);
 
                 break;
             case 3:
-                $type = new Orgchart\Group($db, $login);
+                $type = new Orgchart\Group(OC_DB, $login);
 
                 break;
             default:
diff --git a/LEAF_Nexus/scripts/firstRun.php b/LEAF_Nexus/scripts/firstRun.php
index e2b721235..218011e91 100644
--- a/LEAF_Nexus/scripts/firstRun.php
+++ b/LEAF_Nexus/scripts/firstRun.php
@@ -6,8 +6,8 @@
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
 $vars = array();
-$res = $db->prepared_query('SELECT * FROM relation_group_employee WHERE groupID=1', $vars);
-$res2 = $db->prepared_query('SELECT * FROM employee WHERE empUID=1', $vars);
+$res = DB->prepared_query('SELECT * FROM relation_group_employee WHERE groupID=1', $vars);
+$res2 = DB->prepared_query('SELECT * FROM employee WHERE empUID=1', $vars);
 
 if (count($res) == 0
     && count($res2) == 0)
@@ -17,13 +17,13 @@
     if (strlen($user) > 0)
     {
         $vars = array(':name' => $user);
-        $res = $db->prepared_query('INSERT INTO employee (empUID, userName, lastName, firstName, middleName, phoneticFirstName, phoneticLastName)
+        $res = DB->prepared_query('INSERT INTO employee (empUID, userName, lastName, firstName, middleName, phoneticFirstName, phoneticLastName)
                                         VALUES (1, :name, "Please run maintenance scripts", "", "", "", "")', $vars);
 
-        $res = $db->prepared_query('INSERT INTO relation_group_employee (groupID, empUID)
+        $res = DB->prepared_query('INSERT INTO relation_group_employee (groupID, empUID)
                                         VALUES (1, 1)', array());
         echo 'Administrator added: ' . $user;
-        $res = $db->prepared_query('UPDATE SETTINGS SET DATA=RAND() WHERE SETTING="salt"', array());
+        $res = DB->prepared_query('UPDATE SETTINGS SET DATA=RAND() WHERE SETTING="salt"', array());
         echo '<br />Random Salt generated.';
     }
     else
diff --git a/LEAF_Nexus/scripts/refreshOrgchartEmployees.php b/LEAF_Nexus/scripts/refreshOrgchartEmployees.php
index 6e8ef1b78..5d22d31cd 100644
--- a/LEAF_Nexus/scripts/refreshOrgchartEmployees.php
+++ b/LEAF_Nexus/scripts/refreshOrgchartEmployees.php
@@ -50,7 +50,7 @@
  */
 function updateUserInfo(string $userName, int $empUID)
 {
-    global $db, $globalDB, $oc_db;
+    global $globalDB;
 
     $vars = array(':userName' => htmlspecialchars_decode($userName, ENT_QUOTES)); //for users with apostrophe in name
 
@@ -88,7 +88,7 @@ function updateUserInfo(string $userName, int $empUID)
             ':userName' => $userName,
             ':deleted' => time()
         );
-	    $oc_db->prepared_query($sql3, $vars);
+	    OC_DB->prepared_query($sql3, $vars);
     }
 
     if (count($res) > 0) {
@@ -105,7 +105,7 @@ function updateUserInfo(string $userName, int $empUID)
         );
 
 		// sets local employee table
-		$oc_db->prepared_query($sql2, $vars);
+		OC_DB->prepared_query($sql2, $vars);
 
         // sets local employee_data table
         updateEmployeeData($res[0]['empUID'], $empUID);
@@ -123,18 +123,18 @@ function updateUserInfo(string $userName, int $empUID)
                 SET deleted=:deleted
                 WHERE userName=:userName";
 
-            $db->prepared_query($sql4, $vars);
+            DB->prepared_query($sql4, $vars);
         }
     }
 }
 
 function updateLocalOrgchartBatch()
 {
-    global $oc_db, $globalDB;
+    global $globalDB;
 
     // replace the separate function for getting employee
     $localEmployeeSql = "SELECT userName FROM employee";
-    $localEmployees = $oc_db->query($localEmployeeSql);
+    $localEmployees = OC_DB->query($localEmployeeSql);
 
     if (count($localEmployees) == 0) {
         return;
@@ -161,7 +161,7 @@ function updateLocalOrgchartBatch()
 function updateEmployeeDataBatch(array $localEmployeeUsernames = [])
 {
 
-    global $oc_db, $globalDB;
+    global $globalDB;
 
     if (empty($localEmployeeUsernames)) {
         return FALSE;
@@ -185,7 +185,7 @@ function updateEmployeeDataBatch(array $localEmployeeUsernames = [])
 
     // get local empuids
     $localEmployeeSql = "SELECT empUID, userName FROM employee WHERE userName IN (".implode(",",array_fill(1, count($localEmployeeUsernames), '?')).")";
-    $localEmpUIDs = $oc_db->prepared_query($localEmployeeSql,$localEmployeeUsernames);
+    $localEmpUIDs = OC_DB->prepared_query($localEmployeeSql,$localEmployeeUsernames);
 
     $localEmpArray = [];
     foreach ($localEmpUIDs as $localUsername) {
@@ -218,10 +218,10 @@ function updateEmployeeDataBatch(array $localEmployeeUsernames = [])
     $deletedEmployeesSql = "UPDATE employee SET deleted=UNIX_TIMESTAMP(NOW()) WHERE userName IN (" . implode(",", array_fill(1, count($localDeletedEmployees), '?')) . ")";
 
     if (!empty($localDeletedEmployees)) {
-        $oc_db->prepared_query($deletedEmployeesSql,array_values($localDeletedEmployees));
+        OC_DB->prepared_query($deletedEmployeesSql,array_values($localDeletedEmployees));
     }
 
-    $oc_db->insert_batch('employee',$localEmployeeArray,['lastName','firstName','middleName','phoneticFirstName','phoneticLastName','domain','deleted','lastUpdated']);
+    OC_DB->insert_batch('employee',$localEmployeeArray,['lastName','firstName','middleName','phoneticFirstName','phoneticLastName','domain','deleted','lastUpdated']);
 
     // STEP 2: Get employee_data updated
     // get the employee data, we will need to get the employee ids first
@@ -255,7 +255,7 @@ function updateEmployeeDataBatch(array $localEmployeeUsernames = [])
         ];
     }
 
-    $oc_db->insert_batch('employee_data',$localEmployeeDataArray,['indicatorID','data','author','timestamp']);
+    OC_DB->insert_batch('employee_data',$localEmployeeDataArray,['indicatorID','data','author','timestamp']);
 
 
 }
@@ -267,7 +267,7 @@ function updateEmployeeDataBatch(array $localEmployeeUsernames = [])
 */
 function updateEmployeeData($nationalEmpUID, $localEmpUID)
 {
-    global $oc_db, $globalDB;
+    global $globalDB;
 
     $sql = "SELECT empUID, indicatorID, data, author, timestamp
             FROM employee_data
@@ -301,7 +301,7 @@ function updateEmployeeData($nationalEmpUID, $localEmpUID)
                 ':timestamp' => time()
             );
 
-            $oc_db->prepared_query($sql2, $vars);
+            OC_DB->prepared_query($sql2, $vars);
         }
     }
 }
diff --git a/LEAF_Nexus/scripts/syncSVNrevision.php b/LEAF_Nexus/scripts/syncSVNrevision.php
index 99e548174..3d383128d 100644
--- a/LEAF_Nexus/scripts/syncSVNrevision.php
+++ b/LEAF_Nexus/scripts/syncSVNrevision.php
@@ -7,7 +7,5 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-$db = $oc_db;
-
 $vars = array(':version' => $version);
-$res = $db->prepared_query("UPDATE settings SET data=:version WHERE setting='version'", $vars);
+$res = OC_DB->prepared_query("UPDATE settings SET data=:version WHERE setting='version'", $vars);
diff --git a/LEAF_Nexus/scripts/updateDatabase.php b/LEAF_Nexus/scripts/updateDatabase.php
index a8bd17609..4cf93668c 100644
--- a/LEAF_Nexus/scripts/updateDatabase.php
+++ b/LEAF_Nexus/scripts/updateDatabase.php
@@ -6,7 +6,7 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-$update = new DbUpdate($db, $setting_up, 'orgchart', PORTAL_PATH);
+$update = new DbUpdate(DB, $setting_up, 'orgchart', PORTAL_PATH);
 
 $update->run();
 
diff --git a/LEAF_Nexus/sources/Config.php b/LEAF_Nexus/sources/Config.php
index 22e097728..5b105c30c 100644
--- a/LEAF_Nexus/sources/Config.php
+++ b/LEAF_Nexus/sources/Config.php
@@ -18,8 +18,6 @@ class Config
 
     public static $ERM_Sites; // HTTP Path to orgchart with no trailing slash
 
-    public $oc_db;
-
     public $dbName;
 
     public function __construct(array $site_paths, array $oc_settings)
diff --git a/LEAF_Nexus/test.php b/LEAF_Nexus/test.php
index 78131a6a7..e913684dc 100644
--- a/LEAF_Nexus/test.php
+++ b/LEAF_Nexus/test.php
@@ -7,6 +7,6 @@
 
 $login->loginUser();
 
-$emp = new Orgchart\Employee($oc_db, $oc_login);
+$emp = new Orgchart\Employee(OC_DB, $oc_login);
 
 print_r($emp->search('gao'));
diff --git a/LEAF_Nexus/utils/exportPDL.php b/LEAF_Nexus/utils/exportPDL.php
index 2f53d67a6..ee1da190c 100644
--- a/LEAF_Nexus/utils/exportPDL.php
+++ b/LEAF_Nexus/utils/exportPDL.php
@@ -12,15 +12,15 @@
 $login->setBaseDir('../');
 $login->loginUser();
 
-$position = new Orgchart\Position($db, $login);
-$tag = new Orgchart\Tag($db, $login);
+$position = new Orgchart\Position(OC_DB, $login);
+$tag = new Orgchart\Tag(OC_DB, $login);
 
 header('Content-type: text/csv');
 header('Content-Disposition: attachment; filename="Exported_' . time() . '.csv"');
 
 echo "LEAF Position ID, HR Smart Position Number, Service, Position Title, Classification Title, Employee Name, Employee Username, Supervisor Name, Pay Plan, Series, Pay Grade, FTE Ceiling / Total Headcount, Current FTE, PD Number, Note\r\n";
 
-$res = $db->prepared_query('SELECT * FROM positions', array());
+$res = OC_DB->prepared_query('SELECT * FROM positions', array());
 
 //$pos = $res[15]; // for testing
 foreach ($res as $pos)
diff --git a/LEAF_Nexus/utils/jsonExport_PDL.php b/LEAF_Nexus/utils/jsonExport_PDL.php
index 2b10ad8dd..713e5ab80 100644
--- a/LEAF_Nexus/utils/jsonExport_PDL.php
+++ b/LEAF_Nexus/utils/jsonExport_PDL.php
@@ -14,13 +14,13 @@
 
 $memberships = $oc_login->getMembership();
 
-$position = new Orgchart\Position($oc_db, $oc_login);
-$tag = new Orgchart\Tag($oc_db, $oc_login);
+$position = new Orgchart\Position(OC_DB, $oc_login);
+$tag = new Orgchart\Tag(OC_DB, $oc_login);
 
 // check for cached result
 /* if(!isset($_GET['cache'])
     && $_GET['cache'] == 0) {
-    $cache = $oc_db->query_kv('SELECT * FROM cache WHERE cacheID="jsonExport_PDL.php" OR cacheID="lastModified"', 'cacheID', array('data', 'cacheTime'));
+    $cache = OC_DB->query_kv('SELECT * FROM cache WHERE cacheID="jsonExport_PDL.php" OR cacheID="lastModified"', 'cacheID', array('data', 'cacheTime'));
     if (isset($cache['jsonExport_PDL.php'])
         && isset($cache['lastModified'])
         && $cache['jsonExport_PDL.php']['cacheTime'] > $cache['lastModified']['data']
@@ -38,7 +38,7 @@
 
 header('Content-type: application/json');
 
-$res = $oc_db->prepared_query('SELECT * FROM positions', array());
+$res = OC_DB->prepared_query('SELECT * FROM positions', array());
 
 $jsonOut = array();
 $iteration = 0;
@@ -197,7 +197,7 @@
 }
 $empUID_list = implode(',', $uniqueEmps);
 $vars = [];
-$empEmails = $oc_db->query_kv("SELECT * FROM employee_data
+$empEmails = OC_DB->query_kv("SELECT * FROM employee_data
             WHERE indicatorID = 6 AND empUID IN ({$empUID_list})", 'empUID', 'data', $vars);
 foreach($jsonOut as $key => $item) {
     if($item['employeeUID'] != '') {
@@ -216,7 +216,7 @@
 $vars = array(':cacheID' => 'jsonExport_PDL.php',
               ':data' => $result,
               ':cacheTime' => time(), );
-$res = $oc_db->prepared_query('INSERT INTO cache (cacheID, data, cacheTime)
+$res = OC_DB->prepared_query('INSERT INTO cache (cacheID, data, cacheTime)
    								VALUES (:cacheID, :data, :cacheTime)
    								ON DUPLICATE KEY UPDATE data=:data, cacheTime=:cacheTime', $vars);
 
diff --git a/LEAF_Request_Portal/admin/ajaxIndex.php b/LEAF_Request_Portal/admin/ajaxIndex.php
index 100432c40..085632fc4 100644
--- a/LEAF_Request_Portal/admin/ajaxIndex.php
+++ b/LEAF_Request_Portal/admin/ajaxIndex.php
@@ -20,10 +20,8 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-if (isset($settings['timeZone']))
-{
-    date_default_timezone_set($settings['timeZone']);
+if (isset(LEAF_SETTINGS['timeZone'])) {
+    date_default_timezone_set(LEAF_SETTINGS['timeZone']);
 }
 
 $login->setBaseDir('../');
@@ -46,11 +44,12 @@ function checkToken()
 
 $action = isset($_GET['a']) ? $_GET['a'] : '';
 
+$group = new Portal\Group(DB, $login);
+
 switch ($action) {
     case 'add_user_old':
         checkToken();
 
-        $group = new Portal\Group($db, $login);
         $group->addMember($_POST['userID'], $_POST['groups']);
 
         break;
@@ -60,7 +59,6 @@ function checkToken()
 
         $deleteList = XSSHelpers::scrubObjectOrArray(json_decode($_POST['json'], true));
 
-        $group = new Portal\Group($db, $login);
         foreach ($deleteList as $del)
         {
             $group->removeMember(XSSHelpers::xscrub($del['userID']), $del['groupID']);
@@ -70,7 +68,6 @@ function checkToken()
     case 'add_user':
           checkToken();
 
-           $group = new Portal\Group($db, $login);
            $group->addMember($_POST['userID'], $_POST['groupID']);
 
            break;
@@ -78,14 +75,13 @@ function checkToken()
         // this should be deprecated as of 8/18/2023
            checkToken();
 
-           $group = new Portal\Group($db, $login);
            $group->removeMember($_POST['userID'], $_POST['groupID']);
 
            break;
     case 'printview':
         if ($login->isLogin())
         {
-            $form = new Portal\Form($db, $login);
+            $form = new Portal\Form(DB, $login);
 
             $t_form = new Smarty;
             $t_form->left_delimiter = '<!--{';
@@ -100,14 +96,14 @@ function checkToken()
 
         break;
     case 'importForm':
-        $formStack = new Portal\FormStack($db, $login);
+        $formStack = new Portal\FormStack(DB, $login);
         $result = $formStack->importForm();
 
         echo $result;
 
         break;
     case 'manualImportForm':
-           $formStack = new Portal\FormStack($db, $login);
+           $formStack = new Portal\FormStack(DB, $login);
            $result = $formStack->importForm();
 
         if ($result === true)
@@ -122,7 +118,7 @@ function checkToken()
 
            break;
     case 'uploadFile':
-           $system = new Portal\System($db, $login);
+           $system = new Portal\System(DB, $login);
            $result = $system->newFile();
            if ($result === true)
            {
@@ -143,12 +139,9 @@ function checkToken()
         $tz = isset($_GET['tz']) ? $_GET['tz'] : null;
 
         if($tz == null){
-            //$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-            if(isset($settings['timeZone']))
-            {
-                $tz = $settings['timeZone'];
-            }
-            else{
+            if(isset(LEAF_SETTINGS['timeZone'])) {
+                $tz = LEAF_SETTINGS['timeZone'];
+            } else {
                 $tz = 'America/New_York';
             }
         }
@@ -166,17 +159,17 @@ function checkToken()
         switch ($typeName) {
             case 'service':
                 $dataName = "All Services";
-                $type = new Portal\Service($db, $login);
+                $type = new Portal\Service(DB, $login);
                 break;
             case 'form':
                 $dataName = "All Forms";
-                $type = new Portal\FormEditor($db, $login);
+                $type = new Portal\FormEditor(DB, $login);
                 break;
             case 'group':
                 $dataName = "All Groups";
-                $type = new Portal\Group($db, $login);
+                $type = new Portal\Group(DB, $login);
 
-                $orgchartGroup = new Orgchart\Group($oc_db, $login);
+                $orgchartGroup = new Orgchart\Group(OC_DB, $login);
                 break;
         }
 
@@ -227,12 +220,9 @@ function checkToken()
         $gethistoryslice = isset($_GET['gethistoryslice']) ? XSSHelpers::xscrub((int)$_GET['gethistoryslice']) : 0;
 
         if($tz == null){
-            //$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-            if(isset($settings['timeZone']))
-            {
-                $tz = $settings['timeZone'];
-            }
-            else{
+            if(isset(LEAF_SETTINGS['timeZone'])) {
+                $tz = LEAF_SETTINGS['timeZone'];
+            } else {
                 $tz = 'America/New_York';
             }
         }
@@ -248,47 +238,47 @@ function checkToken()
         $type = null;
         switch ($typeName) {
             case 'service':
-                $type = new Portal\Service($db, $login);
+                $type = new Portal\Service(DB, $login);
                 $title = $type->getServiceName($itemID);
                 break;
             case 'form':
-                $type = new Portal\FormEditor($db, $login);
+                $type = new Portal\FormEditor(DB, $login);
                 $title = $type->getFormName($itemID);
                 break;
             case 'group':
-                $type = new Portal\Group($db, $login);
+                $type = new Portal\Group(DB, $login);
                 $title = $type->getGroupName($itemID);
                 break;
             case 'workflow':
-                $type = new Portal\Workflow($db, $login);
+                $type = new Portal\Workflow(DB, $login);
                 $title = $type->getDescription($itemID);
                 break;
             case 'primaryAdmin':
-                $type = new Portal\System($db, $login);
+                $type = new Portal\System(DB, $login);
                 $itemID = null;
                 $title = 'Primary Admin';
                 $t_form->assign('titleOverride', "Primary Admin History");
                 break;
             case 'emailTemplate':
-                $type = new Portal\EmailTemplate($db, $login);
+                $type = new Portal\EmailTemplate(DB, $login);
                 $t_form->assign('titleOverride', ' ');
                 break;
             case 'templateEditor':
                 // this is depricated and should be removed once it has not been used in over 30 days
-                $type = new Portal\Template($db, $login);
+                $type = new Portal\Template(DB, $login);
                 $t_form->assign('titleOverride', ' ');
                 break;
             case 'TemplateReports':
                 // this is depricated and should be removed once it has not been used in over 30 days
-                $type = new Portal\Applet($db, $login);
+                $type = new Portal\Applet(DB, $login);
                 $t_form->assign('titleOverride', ' ');
                 break;
             case 'template':
-                $type = new Portal\Template($db, $login);
+                $type = new Portal\Template(DB, $login);
                 $t_form->assign('titleOverride', ' ');
                 break;
             case 'applet':
-                $type = new Portal\Applet($db, $login);
+                $type = new Portal\Applet(DB, $login);
                 $t_form->assign('titleOverride', ' ');
                 break;
         }
diff --git a/LEAF_Request_Portal/admin/ajaxJSON.php b/LEAF_Request_Portal/admin/ajaxJSON.php
index 0a49633ae..c6e9c6e01 100644
--- a/LEAF_Request_Portal/admin/ajaxJSON.php
+++ b/LEAF_Request_Portal/admin/ajaxJSON.php
@@ -30,7 +30,7 @@
 
 switch ($action) {
     case 'mod_groups_getMembers':
-        $group = new Portal\Group($db, $login);
+        $group = new Portal\Group(DB, $login);
 
         echo $group->getMembers($_GET['groupID'])['data'];
 
diff --git a/LEAF_Request_Portal/admin/index.php b/LEAF_Request_Portal/admin/index.php
index 92cd3b3fd..cf45a2102 100644
--- a/LEAF_Request_Portal/admin/index.php
+++ b/LEAF_Request_Portal/admin/index.php
@@ -48,7 +48,7 @@ function customTemplate($tpl)
     return file_exists("./templates/custom_override/{$tpl}") ? "custom_override/{$tpl}" : $tpl;
 }
 
-function hasDevConsoleAccess($login, $oc_db)
+function hasDevConsoleAccess($login)
 {
     // automatically allow coaches
     $db_national = new Db(DIRECTORY_HOST, DIRECTORY_USER, DIRECTORY_PASS, DIRECTORY_DB);
@@ -67,7 +67,7 @@ function hasDevConsoleAccess($login, $oc_db)
     }
 
     $vars = array(':empUID' => $login->getEmpUID());
-    $res = $oc_db->prepared_query('SELECT data FROM employee_data
+    $res = OC_DB->prepared_query('SELECT data FROM employee_data
                                             WHERE empUID=:empUID
                                                 AND indicatorID=27
                                                 AND data="Yes"
@@ -85,8 +85,6 @@ function hasDevConsoleAccess($login, $oc_db)
     $main->assign('status', 'You appear to be using Microsoft Internet Explorer version 6. Some portions of this website may not display correctly unless you use Internet Explorer version 10 or higher.');
 }
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-
 $main->assign('logo', '<img src="../images/VA_icon_small.png" alt="VA logo" />');
 
 $t_login->assign('name', $login->getName());
@@ -114,13 +112,12 @@ function hasDevConsoleAccess($login, $oc_db)
                                            $site_paths['orgchart_path'] . '/js/groupSelector.js',
         ));
 
-        //$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-        $tz = isset($settings['timeZone']) ? $settings['timeZone'] : null;
+        $tz = isset(LEAF_SETTINGS['timeZone']) ? LEAF_SETTINGS['timeZone'] : null;
 
         $t_form->assign('orgchartPath', $site_paths['orgchart_path']);
         $t_form->assign('CSRFToken', $_SESSION['CSRFToken']);
         $t_form->assign('timeZone', $tz);
-        $t_form->assign('orgchartImportTag', $settings['orgchartImportTags'][0]);
+        $t_form->assign('orgchartImportTag', LEAF_SETTINGS['orgchartImportTags'][0]);
         $t_form->assign('app_libs', APP_LIBS_PATH);
 
         $main->assign('useUI', true);
@@ -170,7 +167,7 @@ function hasDevConsoleAccess($login, $oc_db)
                                            $site_paths['orgchart_path'] . '/css/groupSelector.css',
         ));
         $t_form->assign('orgchartPath', $site_paths['orgchart_path']);
-        $t_form->assign('orgchartImportTags', $settings['orgchartImportTags'][0]);
+        $t_form->assign('orgchartImportTags', LEAF_SETTINGS['orgchartImportTags'][0]);
         $t_form->assign('CSRFToken', $_SESSION['CSRFToken']);
 
         $main->assign('body', $t_form->fetch('mod_workflow.tpl'));
@@ -215,7 +212,7 @@ function hasDevConsoleAccess($login, $oc_db)
         $t_form->assign('libsPath', LEAF_DOMAIN.'app/libs/');
         $t_form->assign('orgchartPath', $site_paths['orgchart_path']);
         $t_form->assign('referFormLibraryID', (int)$_GET['referFormLibraryID']);
-        $t_form->assign('hasDevConsoleAccess', hasDevConsoleAccess($login, $oc_db));
+        $t_form->assign('hasDevConsoleAccess', hasDevConsoleAccess($login));
 
         $main->assign('body', $t_form->fetch('form_editor_vue.tpl'));
 
@@ -258,13 +255,13 @@ function hasDevConsoleAccess($login, $oc_db)
         $t_form->assign('APIroot', '../api/');
         $t_form->assign('orgchartPath', $site_paths['orgchart_path']);
         $t_form->assign('referFormLibraryID', (int)$_GET['referFormLibraryID']);
-        $t_form->assign('hasDevConsoleAccess', hasDevConsoleAccess($login, $oc_db));
+        $t_form->assign('hasDevConsoleAccess', hasDevConsoleAccess($login));
         $t_form->assign('app_js_path', APP_JS_PATH);
 
         if (isset($_GET['form']))
         {
             $vars = array(':categoryID' => XSSHelpers::xscrub($_GET['form']));
-            $res = $db->prepared_query('SELECT * FROM categories WHERE categoryID=:categoryID', $vars);
+            $res = DB->prepared_query('SELECT * FROM categories WHERE categoryID=:categoryID', $vars);
             if (count($res) > 0)
             {
                 $t_form->assign('form', XSSHelpers::xscrub($res[0]['categoryID']));
@@ -279,7 +276,7 @@ function hasDevConsoleAccess($login, $oc_db)
     case 'mod_templates':
     case 'mod_templates_reports':
     case 'mod_templates_email':
-            if(!hasDevConsoleAccess($login, $oc_db)) {
+            if(!hasDevConsoleAccess($login)) {
                header('Location: ../report.php?a=LEAF_start_leaf_dev_console_request');
             }
 
@@ -457,7 +454,7 @@ function hasDevConsoleAccess($login, $oc_db)
 
         $t_form->assign('timeZones', DateTimeZone::listIdentifiers(DateTimeZone::PER_COUNTRY, 'US'));
 
-        $t_form->assign('importTags', $settings['orgchartImportTags'][0]);
+        $t_form->assign('importTags', LEAF_SETTINGS['orgchartImportTags'][0]);
 //   		$main->assign('stylesheets', array('css/mod_groups.css'));
         $main->assign('body', $t_form->fetch(customTemplate('mod_system.tpl')));
 
@@ -472,7 +469,7 @@ function hasDevConsoleAccess($login, $oc_db)
             $main->assign('useUI', true);
             //   		$t_form->assign('orgchartPath', $site_paths['orgchart_path']);
             $t_form->assign('CSRFToken', $_SESSION['CSRFToken']);
-            $t_form->assign('importTags', $settings['orgchartImportTags'][0]);
+            $t_form->assign('importTags', LEAF_SETTINGS['orgchartImportTags'][0]);
             //   		$main->assign('stylesheets', array('css/mod_groups.css'));
             $main->assign('body', $t_form->fetch(customTemplate('mod_file_manager.tpl')));
 
@@ -593,7 +590,7 @@ function hasDevConsoleAccess($login, $oc_db)
             $t_form->right_delimiter = '}-->';
             $t_form->assign('orgchartPath', $site_paths['orgchart_path']);
             $t_form->assign('CSRFToken', $_SESSION['CSRFToken']);
-            $t_form->assign('siteType', XSSHelpers::xscrub($settings['siteType']));
+            $t_form->assign('siteType', XSSHelpers::xscrub(LEAF_SETTINGS['siteType']));
 
             $main->assign('javascripts', array(APP_JS_PATH . '/jquery/jquery.min.js',
                                            APP_JS_PATH . '/jquery/jquery-ui.custom.min.js',
@@ -616,20 +613,20 @@ function hasDevConsoleAccess($login, $oc_db)
         break;
 }
 
-$main->assign('leafSecure', XSSHelpers::sanitizeHTML($settings['leafSecure']));
+$main->assign('leafSecure', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['leafSecure']));
 $main->assign('login', $t_login->fetch('login.tpl'));
 $t_menu->assign('action', $action);
 $t_menu->assign('orgchartPath', $site_paths['orgchart_path']);
 $t_menu->assign('name', XSSHelpers::sanitizeHTML($login->getName()));
-$t_menu->assign('siteType', XSSHelpers::xscrub($settings['siteType']));
+$t_menu->assign('siteType', XSSHelpers::xscrub(LEAF_SETTINGS['siteType']));
 $o_menu = $t_menu->fetch('menu.tpl');
 $main->assign('menu', $o_menu);
 $tabText = $tabText == '' ? '' : $tabText . '&nbsp;';
 $main->assign('tabText', $tabText);
 
-$main->assign('title', XSSHelpers::sanitizeHTMLRich($settings['heading'] == '' ? $config->title : $settings['heading']));
-$main->assign('city', XSSHelpers::sanitizeHTMLRich($settings['subHeading'] == '' ? $config->city : $settings['subHeading']));
-$main->assign('revision', XSSHelpers::xscrub($settings['version']));
+$main->assign('title', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['heading']));
+$main->assign('city', XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS['subHeading']));
+$main->assign('revision', XSSHelpers::xscrub(LEAF_SETTINGS['version']));
 
 if (!isset($_GET['iframe']))
 {
diff --git a/LEAF_Request_Portal/admin/modgroups.php b/LEAF_Request_Portal/admin/modgroups.php
index 59fee25bc..97e0ec7a3 100644
--- a/LEAF_Request_Portal/admin/modgroups.php
+++ b/LEAF_Request_Portal/admin/modgroups.php
@@ -9,7 +9,7 @@
 
 $dir = new Portal\VAMC_Directory();
 
-$groups = $db->prepared_query('SELECT * FROM `groups` ORDER BY name ASC', array());
+$groups = DB->prepared_query('SELECT * FROM `groups` ORDER BY name ASC', array());
 echo 'Access Groups:';
 echo '<ul>';
 foreach ($groups as $group)
@@ -17,7 +17,7 @@
     echo '<li>' . XSSHelpers::xscrub($group['name']) . ' (groupID#: ' . XSSHelpers::xscrub($group['groupID']) . ')';
 
     $vars = array('groupID' => $group['groupID']);
-    $users = $db->prepared_query('SELECT * FROM users WHERE groupID=:groupID ORDER BY userID', $vars);
+    $users = DB->prepared_query('SELECT * FROM users WHERE groupID=:groupID ORDER BY userID', $vars);
     echo '<ul>';
     foreach ($users as $user)
     {
diff --git a/LEAF_Request_Portal/ajaxIframe.php b/LEAF_Request_Portal/ajaxIframe.php
index 503ebd855..a906eaef1 100644
--- a/LEAF_Request_Portal/ajaxIframe.php
+++ b/LEAF_Request_Portal/ajaxIframe.php
@@ -61,10 +61,8 @@ function customTemplate($tpl)
 $main->assign('emergency', '');
 $main->assign('useUI', false);
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-if (isset($settings['timeZone']))
-{
-    date_default_timezone_set(XSSHelpers::xscrub($settings['timeZone']));
+if (isset(LEAF_SETTINGS['timeZone'])) {
+    date_default_timezone_set(XSSHelpers::xscrub(LEAF_SETTINGS['timeZone']));
 }
 
 switch ($action) {
@@ -94,7 +92,7 @@ function customTemplate($tpl)
         $main->assign('useUI', true);
         $main->assign('javascripts', array('js/form.js', 'js/workflow.js', 'js/formGrid.js', 'js/formQuery.js', 'js/jsdiff.js'));
 
-        $form = new Portal\Form($db, $login);
+        $form = new Portal\Form(DB, $login);
         $t_menu->assign('recordID', (int)$_GET['recordID']);
         $t_menu->assign('action', $action);
         $o_login = $t_login->fetch('login.tpl');
@@ -159,7 +157,7 @@ function customTemplate($tpl)
                 break;
         }
 
-        $requestLabel = $settings['requestLabel'] == '' ? 'Request' : XSSHelpers::sanitizeHTML($settings['requestLabel']);
+        $requestLabel = LEAF_SETTINGS['requestLabel'] == '' ? 'Request' : XSSHelpers::sanitizeHTML(LEAF_SETTINGS['requestLabel']);
         $tabText = $requestLabel . ' #' . (int)$_GET['recordID'];
 
         break;
@@ -190,8 +188,8 @@ function customTemplate($tpl)
 $tabText = $tabText == '' ? '' : $tabText . '&nbsp;';
 $main->assign('tabText', $tabText);
 
-$main->assign('title', $settings['heading'] == '' ? $config->title : XSSHelpers::sanitizeHTML($settings['heading']));
-$main->assign('city', $settings['subHeading'] == '' ? $config->city : XSSHelpers::sanitizeHTML($settings['subHeading']));
-$main->assign('revision', XSSHelpers::xscrub($settings['version']));
+$main->assign('title', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['heading']));
+$main->assign('city', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['subHeading']));
+$main->assign('revision', XSSHelpers::xscrub(LEAF_SETTINGS['version']));
 
 $main->display('main_iframe.tpl');
diff --git a/LEAF_Request_Portal/ajaxIndex.php b/LEAF_Request_Portal/ajaxIndex.php
index ee423b88c..7640c8667 100644
--- a/LEAF_Request_Portal/ajaxIndex.php
+++ b/LEAF_Request_Portal/ajaxIndex.php
@@ -21,7 +21,7 @@ function customTemplate($tpl)
     return file_exists("./templates/custom_override/{$tpl}") ? "custom_override/{$tpl}" : $tpl;
 }
 
-$dataActionLogger = new DataActionLogger($db, $login);
+$dataActionLogger = new DataActionLogger(DB, $login);
 
 $login->loginUser();
 if ($login)
@@ -30,17 +30,16 @@ function customTemplate($tpl)
 
 $action = isset($_GET['a']) ? $_GET['a'] : '';
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-if (isset($settings['timeZone']))
-{
-    date_default_timezone_set($settings['timeZone']);
+if (isset(LEAF_SETTINGS['timeZone'])) {
+    date_default_timezone_set(LEAF_SETTINGS['timeZone']);
 }
 $main = new Smarty;
 $main->assign('emergency', '');
 
+$form = new Portal\Form(DB, $login);
+
 switch ($action) {
     case 'newform':
-        $form = new Portal\Form($db, $login);
         $recordID = $form->newForm($_SESSION['userID']);
         if (is_numeric($recordID))
         {   session_write_close();
@@ -54,7 +53,6 @@ function customTemplate($tpl)
 
         break;
     case 'getindicator':
-        $form = new Portal\Form($db, $login);
         if (is_numeric($_GET['indicatorID']))
         {
             $t_form = new Smarty;
@@ -76,7 +74,7 @@ function customTemplate($tpl)
                 $t_form->assign('CSRFToken', $_SESSION['CSRFToken']);
                 $t_form->assign('form', $indicator);
                 $t_form->assign('orgchartPath', $site_paths['orgchart_path']);
-                $t_form->assign('orgchartImportTag', $settings['orgchartImportTags'][0]);
+                $t_form->assign('orgchartImportTag', LEAF_SETTINGS['orgchartImportTags'][0]);
                 $t_form->assign('subindicatorsTemplate', customTemplate('subindicators.tpl'));
                 $t_form->display(customTemplate('ajaxForm.tpl'));
             }
@@ -88,7 +86,6 @@ function customTemplate($tpl)
 
         break;
     case 'getprintindicator':
-        $form = new Portal\Form($db, $login);
         $indicatorID = (int)$_GET['indicatorID'];
         $series = XSSHelpers::xscrub($_GET['series']);
         $recordID = (int)$_GET['recordID'];
@@ -113,7 +110,6 @@ function customTemplate($tpl)
 
         break;
     case 'getindicatorlog':
-        $form = new Portal\Form($db, $login);
         $indicatorID = (int)$_GET['indicatorID'];
         $series = XSSHelpers::xscrub($_GET['series']);
         $recordID = (int)$_GET['recordID'];
@@ -131,7 +127,6 @@ function customTemplate($tpl)
 
         break;
     case 'domodify':
-        $form = new Portal\Form($db, $login);
         echo $form->doModify((int)$_POST['recordID']);
 
         break;
@@ -141,7 +136,7 @@ function customTemplate($tpl)
 
         $vars = array('recordID' => $recordID);
         // check if request has a workflow
-        $res = $db->prepared_query('SELECT * FROM category_count
+        $res = DB->prepared_query('SELECT * FROM category_count
                                              LEFT JOIN categories USING (categoryID)
                                              LEFT JOIN workflows USING (workflowID)
                                              WHERE recordID=:recordID
@@ -163,7 +158,7 @@ function customTemplate($tpl)
             // show normal submit control if a parallel request has been sent back
             // a request is assumed to sent back if a matching entry exists in the records_dependencies table
             $vars = array('recordID' => $recordID);
-            $res = $db->prepared_query('SELECT * FROM records_dependencies
+            $res = DB->prepared_query('SELECT * FROM records_dependencies
                                              WHERE recordID=:recordID
                                                AND dependencyID = 5
         									   AND filled = 0', $vars);
@@ -172,13 +167,13 @@ function customTemplate($tpl)
             }
         }
 
-        $res = $db->prepared_query('SELECT time FROM action_history
+        $res = DB->prepared_query('SELECT time FROM action_history
                 WHERE recordID = :recordID
                 LIMIT 1', $vars);
 
         $lastActionTime = isset($res[0]['time']) ? $res[0]['time'] : 0;
 
-        $requestLabel = $settings['requestLabel'] == '' ? 'Request' : XSSHelpers::sanitizeHTML($settings['requestLabel']);
+        $requestLabel = LEAF_SETTINGS['requestLabel'] == '' ? 'Request' : XSSHelpers::sanitizeHTML(LEAF_SETTINGS['requestLabel']);
 
         $t_form->assign('recordID', $recordID);
         $t_form->assign('lastActionTime', $lastActionTime);
@@ -197,7 +192,6 @@ function customTemplate($tpl)
 
         break;
     case 'dosubmit': // legacy action
-        $form = new Portal\Form($db, $login);
         $recordID = (int)$_GET['recordID'];
         if (is_numeric($recordID) && $form->getProgress($recordID) >= 100)
         {
@@ -221,7 +215,6 @@ function customTemplate($tpl)
         /* This endpoint has been deprecated as of 8/31/2023 */
         if (is_numeric($_POST['cancel']))
         {
-            $form = new Portal\Form($db, $login);
             echo $form->deleteRecord((int)$_POST['cancel']);
         }
 
@@ -229,7 +222,6 @@ function customTemplate($tpl)
     case 'restore':
         if (is_numeric($_POST['restore']))
         {
-            $form = new Portal\Form($db, $login);
             echo $form->restoreRecord((int)$_POST['restore']);
         }
 
@@ -237,7 +229,7 @@ function customTemplate($tpl)
     case 'doapproval':
         // old
         //require 'Action.php';
-        //$approval = new Action($db, $login, $_GET['recordID']);
+        //$approval = new Action(DB, $login, $_GET['recordID']);
         //$approval->addApproval($_POST['groupID'], $_POST['status'], $_POST['comment'], $_POST['dependencyID']);
         break;
     case 'doupload': // handle file upload
@@ -263,7 +255,6 @@ function customTemplate($tpl)
 
         if ($uploadOk)
         {
-            $form = new Portal\Form($db, $login);
             if ($form->doModify($_GET['recordID']))
             {
                 $recordID = (int)$_GET['recordID'];
@@ -335,14 +326,11 @@ function customTemplate($tpl)
 
         break;
     case 'deleteattachment':
-        $form = new Portal\Form($db, $login);
-
         echo $form->deleteAttachment((int)$_POST['recordID'], (int)$_POST['indicatorID'], XSSHelpers::xscrub($_POST['series']), XSSHelpers::xscrub($_POST['file']));
 
         break;
     case 'getstatus':
-        $form = new Portal\Form($db, $login);
-        $view = new Portal\View($db, $login);
+        $view = new Portal\View(DB, $login);
 
         $t_form = new Smarty;
         $t_form->left_delimiter = '<!--{';
@@ -366,7 +354,6 @@ function customTemplate($tpl)
     case 'printview':
         if ($login->isLogin())
         {
-            $form = new Portal\Form($db, $login);
             $recordIDToPrint = (int)$_GET['recordID'];
 
             $recordInfo = $form->getRecordInfo($recordIDToPrint);
@@ -449,7 +436,6 @@ function customTemplate($tpl)
 
         break;
     case 'gettags':
-        $form = new Portal\Form($db, $login);
         if (is_numeric($_GET['recordID']))
         {
             $t_form = new Smarty;
@@ -463,7 +449,6 @@ function customTemplate($tpl)
 
         break;
     case 'getformtags':
-        $form = new Portal\Form($db, $login);
         if (is_numeric($_GET['recordID']))
         {
             $t_form = new Smarty;
@@ -477,7 +462,6 @@ function customTemplate($tpl)
 
         break;
     case 'gettagmembers':
-        $form = new Portal\Form($db, $login);
         $t_form = new Smarty;
         $t_form->left_delimiter = '<!--{';
         $t_form->right_delimiter = '}-->';
@@ -491,7 +475,6 @@ function customTemplate($tpl)
 
         break;
     case 'updatetags':
-        $form = new Portal\Form($db, $login);
         $form->parseTags((int)$_POST['recordID'], XSSHelpers::xscrub($_POST['taginput']));
 
         break;
@@ -500,7 +483,6 @@ function customTemplate($tpl)
         {
             exit();
         }
-        $form = new Portal\Form($db, $login);
         $form->addTag((int)$_GET['recordID'], 'bookmark_' . XSSHelpers::xscrub($login->getUserID()));
 
         break;
@@ -509,7 +491,6 @@ function customTemplate($tpl)
         {
             exit();
         }
-        $form = new Portal\Form($db, $login);
         $form->deleteTag((int)$_GET['recordID'], 'bookmark_' . XSSHelpers::xscrub($login->getUserID()));
 
         break;
diff --git a/LEAF_Request_Portal/ajaxJSON.php b/LEAF_Request_Portal/ajaxJSON.php
index 00ded8753..0b627c63d 100644
--- a/LEAF_Request_Portal/ajaxJSON.php
+++ b/LEAF_Request_Portal/ajaxJSON.php
@@ -21,13 +21,13 @@
 
 switch ($action) {
     case 'getform':
-        $form = new Portal\Form($db, $login);
+        $form = new Portal\Form(DB, $login);
         header('Content-type: application/json');
         echo $form->getFormJSON($_GET['recordID']);
 
         break;
     case 'getprogress': // support legacy customizations
-           $form = new Portal\Form($db, $login);
+           $form = new Portal\Form(DB, $login);
            header('Content-type: application/json');
            // this method does not exist in Form class
            // echo $form->getProgressJSON($_GET['recordID']);
@@ -41,7 +41,7 @@
             exit();
         }
         $vars = array(':lastStatusTime' => $_GET['lastStatusTime']);
-        $res = $db->prepared_query('SELECT recordID FROM action_history
+        $res = DB->prepared_query('SELECT recordID FROM action_history
         								WHERE time > :lastStatusTime
         								GROUP BY recordID', $vars);
         echo json_encode($res);
@@ -54,7 +54,7 @@
         }
 
         $vars = array(':recordID' => $_GET['recordID']);
-        $res = $db->prepared_query('SELECT * FROM records_dependencies
+        $res = DB->prepared_query('SELECT * FROM records_dependencies
     									LEFT JOIN category_count USING (recordID)
     									LEFT JOIN categories USING (categoryID)
     									LEFT JOIN step_dependencies USING (dependencyID)
diff --git a/LEAF_Request_Portal/ajaxMicro.php b/LEAF_Request_Portal/ajaxMicro.php
index cf694a660..e026ddd39 100644
--- a/LEAF_Request_Portal/ajaxMicro.php
+++ b/LEAF_Request_Portal/ajaxMicro.php
@@ -20,7 +20,7 @@
     case 'lastaction':
         if (!isset($_GET['recordID']))
         {
-            $res = $db->prepared_query('SELECT time FROM action_history
+            $res = DB->prepared_query('SELECT time FROM action_history
         							ORDER BY time DESC
         							LIMIT 1', array());
             echo isset($res[0]['time']) ? $res[0]['time'] : 0;
@@ -28,7 +28,7 @@
         else
         {
             $vars = array('recordID' => $_GET['recordID']);
-            $res = $db->prepared_query('SELECT time FROM action_history
+            $res = DB->prepared_query('SELECT time FROM action_history
                     						WHERE recordID = :recordID
                 							ORDER BY time DESC
                 							LIMIT 1', $vars);
diff --git a/LEAF_Request_Portal/ajaxScript.php b/LEAF_Request_Portal/ajaxScript.php
index ee1304557..e9d9439d3 100644
--- a/LEAF_Request_Portal/ajaxScript.php
+++ b/LEAF_Request_Portal/ajaxScript.php
@@ -26,7 +26,7 @@
         {
             $vars = array(':stepID' => $stepID,
                           ':moduleName' => $script);
-            $res = $db->prepared_query('SELECT * FROM step_modules
+            $res = DB->prepared_query('SELECT * FROM step_modules
                                             WHERE stepID=:stepID
                                                 AND moduleName=:moduleName', $vars);
             if(count($res) > 0) {
diff --git a/LEAF_Request_Portal/api/controllers/SiteController.php b/LEAF_Request_Portal/api/controllers/SiteController.php
index 3e60d1cb3..4c470948b 100644
--- a/LEAF_Request_Portal/api/controllers/SiteController.php
+++ b/LEAF_Request_Portal/api/controllers/SiteController.php
@@ -33,7 +33,7 @@ public function get($act)
 		});
 
 		$this->index['GET']->register('site/settings/sitemap_json', function() use ($site){
-			return $site->getSitemapJSON();
+			return LEAF_SETTINGS['sitemap_json'];
 		});
 
 		return $this->index['GET']->runControl($act['key'], $act['args']);
diff --git a/LEAF_Request_Portal/api/index.php b/LEAF_Request_Portal/api/index.php
index 99796eefa..b4b7e6921 100644
--- a/LEAF_Request_Portal/api/index.php
+++ b/LEAF_Request_Portal/api/index.php
@@ -16,7 +16,7 @@
 
 $login->setBaseDir('../');
 
-$p_db = $db;
+$p_db = DB;
 
 $action = isset($_GET['a']) ? $_GET['a'] : $_SERVER['PATH_INFO'];
 $keyIndex = strpos($action, '/');
@@ -115,8 +115,8 @@
     echo $workflowController->handler($action);
 });
 
-$controllerMap->register('workflowRoute', function () use ($db, $login, $action) {
-    $WorkflowRouteController = new Portal\WorkflowRouteController($db, $login);
+$controllerMap->register('workflowRoute', function () use ($p_db, $login, $action) {
+    $WorkflowRouteController = new Portal\WorkflowRouteController($p_db, $login);
     echo $WorkflowRouteController->handler($action);
 });
 
@@ -172,36 +172,36 @@
     echo $NotesController->handler($action);
 });
 
-$controllerMap->register('templateEditor', function () use ($db, $login, $action) {
+$controllerMap->register('templateEditor', function () use ($p_db, $login, $action) {
     // this is depricated and should be removed once it has not been used in over 30 days
-    $TemplateController = new Portal\TemplateController($db, $login);
+    $TemplateController = new Portal\TemplateController($p_db, $login);
     echo $TemplateController->handler($action);
 });
 
-$controllerMap->register('template', function () use ($db, $login, $action) {
-    $TemplateController = new Portal\TemplateController($db, $login);
+$controllerMap->register('template', function () use ($p_db, $login, $action) {
+    $TemplateController = new Portal\TemplateController($p_db, $login);
     echo $TemplateController->handler($action);
 });
 
-$controllerMap->register('reportTemplates', function () use ($db, $login, $action) {
+$controllerMap->register('reportTemplates', function () use ($p_db, $login, $action) {
     // this is depricated and should be removed once it has not been used in over 30 days
-    $AppletController = new Portal\AppletController($db, $login);
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('reportTemplates/mergeFileHistory', function () use ($db, $login, $action) {
+$controllerMap->register('reportTemplates/mergeFileHistory', function () use ($p_db, $login, $action) {
     // this is depricated and should be removed once it has not been used in over 30 days
-    $AppletController = new Portal\AppletController($db, $login);
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('applet', function () use ($db, $login, $action) {
-    $AppletController = new Portal\AppletController($db, $login);
+$controllerMap->register('applet', function () use ($p_db, $login, $action) {
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('applet/mergeFileHistory', function () use ($db, $login, $action) {
-    $AppletController = new Portal\AppletController($db, $login);
+$controllerMap->register('applet/mergeFileHistory', function () use ($p_db, $login, $action) {
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
@@ -210,67 +210,67 @@
     echo $EmailTemplateController->handler($action);
 });
 
-$controllerMap->register('templateFileHistory', function () use ($db, $login, $action) {
-    $TemplateFileHistoryController = new Portal\TemplateFileHistoryController($db, $login);
+$controllerMap->register('templateFileHistory', function () use ($p_db, $login, $action) {
+    $TemplateFileHistoryController = new Portal\TemplateFileHistoryController($p_db, $login);
     echo $TemplateFileHistoryController->handler($action);
 });
 
-$controllerMap->register('templateCompareFileHistory', function () use ($db, $login, $action) {
-    $TemplateFileHistoryController = new Portal\TemplateFileHistoryController($db, $login);
+$controllerMap->register('templateCompareFileHistory', function () use ($p_db, $login, $action) {
+    $TemplateFileHistoryController = new Portal\TemplateFileHistoryController($p_db, $login);
     echo $TemplateFileHistoryController->handler($action);
 });
 
-$controllerMap->register('templateHistoryMergeFile', function () use ($db, $login, $action) {
-    $TemplateFileHistoryController = new Portal\TemplateFileHistoryController($db, $login);
+$controllerMap->register('templateHistoryMergeFile', function () use ($p_db, $login, $action) {
+    $TemplateFileHistoryController = new Portal\TemplateFileHistoryController($p_db, $login);
     echo $TemplateFileHistoryController->handler($action);
 });
 
-$controllerMap->register('templateEmailHistoryMergeFile', function () use ($db, $login, $action) {
-    $TemplateFileHistoryController = new Portal\TemplateFileHistoryController($db, $login);
+$controllerMap->register('templateEmailHistoryMergeFile', function () use ($p_db, $login, $action) {
+    $TemplateFileHistoryController = new Portal\TemplateFileHistoryController($p_db, $login);
     echo $TemplateFileHistoryController->handler($action);
 });
 
-$controllerMap->register('reportTemplates/fileHistory', function () use ($db, $login, $action) {
+$controllerMap->register('reportTemplates/fileHistory', function () use ($p_db, $login, $action) {
     // this is depricated and should be removed once it has not been used in over 30 days
-    $AppletController = new Portal\AppletController($db, $login);
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('reportTemplates/getHistoryFiles', function () use ($db, $login, $action) {
+$controllerMap->register('reportTemplates/getHistoryFiles', function () use ($p_db, $login, $action) {
     // this is depricated and should be removed once it has not been used in over 30 days
-    $AppletController = new Portal\AppletController($db, $login);
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('reportTemplates/saveReportMergeTemplate', function () use ($db, $login, $action) {
+$controllerMap->register('reportTemplates/saveReportMergeTemplate', function () use ($p_db, $login, $action) {
     // this is depricated and should be removed once it has not been used in over 30 days
-    $AppletController = new Portal\AppletController($db, $login);
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('reportTemplates/deleteHistoryFileReport', function () use ($db, $login, $action) {
+$controllerMap->register('reportTemplates/deleteHistoryFileReport', function () use ($p_db, $login, $action) {
     // this is depricated and should be removed once it has not been used in over 30 days
-    $AppletController = new Portal\AppletController($db, $login);
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('applet/fileHistory', function () use ($db, $login, $action) {
-    $AppletController = new Portal\AppletController($db, $login);
+$controllerMap->register('applet/fileHistory', function () use ($p_db, $login, $action) {
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('applet/getHistoryFiles', function () use ($db, $login, $action) {
-    $AppletController = new Portal\AppletController($db, $login);
+$controllerMap->register('applet/getHistoryFiles', function () use ($p_db, $login, $action) {
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('applet/saveReportMergeTemplate', function () use ($db, $login, $action) {
-    $AppletController = new Portal\AppletController($db, $login);
+$controllerMap->register('applet/saveReportMergeTemplate', function () use ($p_db, $login, $action) {
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
-$controllerMap->register('applet/deleteHistoryFileReport', function () use ($db, $login, $action) {
-    $AppletController = new Portal\AppletController($db, $login);
+$controllerMap->register('applet/deleteHistoryFileReport', function () use ($p_db, $login, $action) {
+    $AppletController = new Portal\AppletController($p_db, $login);
     echo $AppletController->handler($action);
 });
 
diff --git a/LEAF_Request_Portal/auth_cookie/index.php b/LEAF_Request_Portal/auth_cookie/index.php
index c6c19a6d7..ca764914e 100644
--- a/LEAF_Request_Portal/auth_cookie/index.php
+++ b/LEAF_Request_Portal/auth_cookie/index.php
@@ -32,7 +32,7 @@
 
     // see if user is valid
     $vars = array(':userName' => $user);
-    $res = $oc_db->prepared_query('SELECT * FROM employee
+    $res = OC_DB->prepared_query('SELECT * FROM employee
                                             WHERE userName=:userName
                                             AND deleted=0', $vars);
 
@@ -65,16 +65,16 @@
                     ':domain' => $res[0]['domain'],
                     ':lastUpdated' => time(),
                     ':new_empUUID' => $res[0]['new_empUUID'] );
-            $oc_db->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
+            OC_DB->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
                                   VALUES (:firstName, :lastName, :middleName, :userName, :phoFirstName, :phoLastName, :domain, :lastUpdated, :new_empUUID)
                                             ON DUPLICATE KEY UPDATE deleted=0', $vars);
 
-            $empUID = $oc_db->getLastInsertID();
+            $empUID = OC_DB->getLastInsertID();
 
             if ($empUID == 0)
             {
                 $vars = array(':userName' => $res[0]['userName']);
-                $empUID = $oc_db->prepared_query('SELECT empUID FROM employee
+                $empUID = OC_DB->prepared_query('SELECT empUID FROM employee
                                                           WHERE userName=:userName', $vars)[0]['empUID'];
             }
 
@@ -84,7 +84,7 @@
                     ':author' => 'viaLogin',
                     ':timestamp' => time(),
             );
-            $oc_db->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
+            OC_DB->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
                                             VALUES (:empUID, :indicatorID, :data, :author, :timestamp)
                                             ON DUPLICATE KEY UPDATE data=:data', $vars);
 
diff --git a/LEAF_Request_Portal/auth_domain/LEAF_coach_key.php b/LEAF_Request_Portal/auth_domain/LEAF_coach_key.php
index 9ddf84963..86359d03d 100644
--- a/LEAF_Request_Portal/auth_domain/LEAF_coach_key.php
+++ b/LEAF_Request_Portal/auth_domain/LEAF_coach_key.php
@@ -21,11 +21,11 @@
 if(count($res) > 0) {
     $vars = array(':groupID' => 1,
                   ':userID' => $userID);
-    $db->prepared_query('INSERT INTO users (userID, groupID, backupID) VALUES (:userID, :groupID, "")', $vars);
+    DB->prepared_query('INSERT INTO users (userID, groupID, backupID) VALUES (:userID, :groupID, "")', $vars);
 
     $vars = array(':groupID' => 1,
                   ':empUID' => $login->getEmpUID());
-    $oc_db->prepared_query('INSERT INTO relation_group_employee (empUID, groupID) VALUES (:empUID, :groupID)', $vars);
+    OC_DB->prepared_query('INSERT INTO relation_group_employee (empUID, groupID) VALUES (:empUID, :groupID)', $vars);
 
     echo "Added {$userID} to Portal and Nexus admin lists";
 }
diff --git a/LEAF_Request_Portal/auth_domain/api/index.php b/LEAF_Request_Portal/auth_domain/api/index.php
index e136af6e5..8bff9b3f6 100644
--- a/LEAF_Request_Portal/auth_domain/api/index.php
+++ b/LEAF_Request_Portal/auth_domain/api/index.php
@@ -12,6 +12,8 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
+$db = DB;
+
 $login->setBaseDir('../');
 
 $action = isset($_GET['a']) ? $_GET['a'] : '';
diff --git a/LEAF_Request_Portal/auth_domain/index.php b/LEAF_Request_Portal/auth_domain/index.php
index 358af4317..07799c7ea 100644
--- a/LEAF_Request_Portal/auth_domain/index.php
+++ b/LEAF_Request_Portal/auth_domain/index.php
@@ -34,7 +34,7 @@
 
     // see if user is valid
     $vars = array(':userName' => $user);
-    $res = $oc_db->prepared_query('SELECT * FROM employee
+    $res = OC_DB->prepared_query('SELECT * FROM employee
     										WHERE userName=:userName
 												AND deleted=0', $vars);
 
@@ -67,15 +67,15 @@
                     ':domain' => $res[0]['domain'],
                     ':lastUpdated' => time(),
                     ':new_empUUID' => $res[0]['new_empUUID'] );
-            $oc_db->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
+            OC_DB->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
                                   VALUES (:firstName, :lastName, :middleName, :userName, :phoFirstName, :phoLastName, :domain, :lastUpdated, :new_empUUID)
     								ON DUPLICATE KEY UPDATE deleted=0', $vars);
-            $empUID = $oc_db->getLastInsertID();
+            $empUID = OC_DB->getLastInsertID();
 
             if ($empUID == 0)
             {
                 $vars = array(':userName' => $res[0]['userName']);
-                $empUID = $oc_db->prepared_query('SELECT empUID FROM employee
+                $empUID = OC_DB->prepared_query('SELECT empUID FROM employee
                                                             WHERE userName=:userName', $vars)[0]['empUID'];
             }
 
@@ -85,7 +85,7 @@
                     ':author' => 'viaLogin',
                     ':timestamp' => time(),
             );
-            $oc_db->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
+            OC_DB->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
 											VALUES (:empUID, :indicatorID, :data, :author, :timestamp)
                                             ON DUPLICATE KEY UPDATE data=:data', $vars);
 
diff --git a/LEAF_Request_Portal/auth_token/index.php b/LEAF_Request_Portal/auth_token/index.php
index 30e44ba82..30401b919 100644
--- a/LEAF_Request_Portal/auth_token/index.php
+++ b/LEAF_Request_Portal/auth_token/index.php
@@ -31,7 +31,7 @@
     }
 
     $vars = array(':email' => $_SERVER['SSL_CLIENT_S_DN_UID']);
-    $res = $oc_db->prepared_query('SELECT * FROM employee_data
+    $res = OC_DB->prepared_query('SELECT * FROM employee_data
 											LEFT JOIN employee USING (empUID)
 											WHERE indicatorID = 6
 												AND data = :email
@@ -66,15 +66,15 @@
                     ':domain' => $res[0]['domain'],
                     ':lastUpdated' => time(),
                     ':new_empUUID' => $res[0]['new_empUUID'] );
-            $oc_db->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
+            OC_DB->prepared_query('INSERT INTO employee (firstName, lastName, middleName, userName, phoneticFirstName, phoneticLastName, domain, lastUpdated, new_empUUID)
                                   VALUES (:firstName, :lastName, :middleName, :userName, :phoFirstName, :phoLastName, :domain, :lastUpdated, :new_empUUID)
 									ON DUPLICATE KEY UPDATE deleted=0', $vars);
-            $empUID = $oc_db->getLastInsertID();
+            $empUID = OC_DB->getLastInsertID();
 
             if ($empUID == 0)
             {
                 $vars = array(':userName' => $res[0]['userName']);
-                $empUID = $oc_db->prepared_query('SELECT empUID FROM employee
+                $empUID = OC_DB->prepared_query('SELECT empUID FROM employee
                                                             WHERE userName=:userName', $vars)[0]['empUID'];
             }
 
@@ -84,7 +84,7 @@
                           ':author' => 'viaLogin',
                           ':timestamp' => time(),
             );
-            $oc_db->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
+            OC_DB->prepared_query('INSERT INTO employee_data (empUID, indicatorID, data, author, timestamp)
 											VALUES (:empUID, :indicatorID, :data, :author, :timestamp)
 											ON DUPLICATE KEY UPDATE data=:data', $vars);
 
diff --git a/LEAF_Request_Portal/file.php b/LEAF_Request_Portal/file.php
index 19bff816c..839c0e569 100644
--- a/LEAF_Request_Portal/file.php
+++ b/LEAF_Request_Portal/file.php
@@ -9,7 +9,7 @@
 
 $login->loginUser();
 
-$form = new Portal\Form($db, $login);
+$form = new Portal\Form(DB, $login);
 
 $data = $form->getIndicator(
     XSSHelpers::xscrub($_GET['id']),
diff --git a/LEAF_Request_Portal/image.php b/LEAF_Request_Portal/image.php
index 1f93f32b2..f0938cc37 100644
--- a/LEAF_Request_Portal/image.php
+++ b/LEAF_Request_Portal/image.php
@@ -9,7 +9,7 @@
 
 $login->loginUser();
 
-$form = new Portal\Form($db, $login);
+$form = new Portal\Form(DB, $login);
 
 $data = $form->getIndicator(
     XSSHelpers::sanitizeHTML($_GET['id']),
diff --git a/LEAF_Request_Portal/index.php b/LEAF_Request_Portal/index.php
index cc9433c91..8d7317b9e 100644
--- a/LEAF_Request_Portal/index.php
+++ b/LEAF_Request_Portal/index.php
@@ -49,19 +49,18 @@ function customTemplate($tpl) {
 $main->assign('useUI', false);
 $main->assign('userID', $login->getUserID());
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-
-if (isset($settings['timeZone'])) {
-    date_default_timezone_set(XSSHelpers::xscrub($settings['timeZone']));
+if (isset(LEAF_SETTINGS['timeZone'])) {
+    date_default_timezone_set(XSSHelpers::xscrub(LEAF_SETTINGS['timeZone']));
 }
 
+$form = new Portal\Form(DB, $login);
+
 switch ($action) {
     case 'newform':
         $main->assign('useLiteUI', true);
         $main->assign('javascripts', array('js/titleValidator.js'));
 
-        $form = new Portal\Form($db, $login);
-        $stack = new Portal\FormStack($db, $login);
+        $stack = new Portal\FormStack(DB, $login);
 
         $t_menu->assign('action', XSSHelpers::xscrub($action));
         $o_login = $t_login->fetch('login.tpl');
@@ -113,7 +112,6 @@ function customTemplate($tpl) {
                 APP_JS_PATH . '/choicesjs/choices.min.js'));
 
         $recordIDToView = (int)$_GET['recordID'];
-        $form = new Portal\Form($db, $login);
         // prevent view if form is submitted
         // defines who can edit the form
         if ($form->hasWriteAccess($recordIDToView) || $login->checkGroup(1))
@@ -156,7 +154,7 @@ function customTemplate($tpl) {
         }
         $o_login = $t_login->fetch('login.tpl');
 
-        $requestLabel = $settings['requestLabel'] == '' ? 'Request' : XSSHelpers::sanitizeHTML($settings['requestLabel']);
+        $requestLabel = LEAF_SETTINGS['requestLabel'] == '' ? 'Request' : XSSHelpers::sanitizeHTML(LEAF_SETTINGS['requestLabel']);
         $tabText = $requestLabel . ' #' . $recordIDToView;
 
         break;
@@ -183,8 +181,6 @@ function customTemplate($tpl) {
 
         $recordIDToPrint = (int)$_GET['recordID'];
 
-        $form = new Portal\Form($db, $login);
-
         $t_menu->assign('recordID', $recordIDToPrint);
         $t_menu->assign('action', XSSHelpers::xscrub($action));
         $o_login = $t_login->fetch('login.tpl');
@@ -224,7 +220,7 @@ function customTemplate($tpl) {
         }
 
         // get workflow status and check permissions
-        $formWorkflow = new Portal\FormWorkflow($db, $login, $recordIDToPrint);
+        $formWorkflow = new Portal\FormWorkflow(DB, $login, $recordIDToPrint);
         $t_form->assign('workflow', $formWorkflow->isActive());
         $t_form->assign('abs_portal_path', ABSOLUTE_PORT_PATH);
         $t_form->assign('app_js_path', APP_JS_PATH);
@@ -257,7 +253,7 @@ function customTemplate($tpl) {
                 break;
         }
 
-        $requestLabel = $settings['requestLabel'] == '' ? 'Request' : XSSHelpers::sanitizeHTML($settings['requestLabel']);
+        $requestLabel = LEAF_SETTINGS['requestLabel'] == '' ? 'Request' : XSSHelpers::sanitizeHTML(LEAF_SETTINGS['requestLabel']);
         $tabText = $requestLabel . ' #' . $recordIDToPrint;
 
         break;
@@ -274,7 +270,7 @@ function customTemplate($tpl) {
         $t_form->left_delimiter = '<!--{';
         $t_form->right_delimiter = '}-->';
 
-        $inbox = new Portal\Inbox($db, $login);
+        $inbox = new Portal\Inbox(DB, $login);
 
         $inboxItems = $inbox->getInbox();
 
@@ -311,8 +307,7 @@ function customTemplate($tpl) {
 
         break;
     case 'status':
-        $form = new Portal\Form($db, $login);
-        $view = new Portal\View($db, $login);
+        $view = new Portal\View(DB, $login);
 
         $recordIDForStatus = (int)$_GET['recordID'];
 
@@ -360,7 +355,7 @@ function customTemplate($tpl) {
 
            break;
     case 'bookmarks':
-        $view = new Portal\View($db, $login);
+        $view = new Portal\View(DB, $login);
         $bookmarks = $view->buildViewBookmarks($login->getUserID());
 
         $t_form = new Smarty;
@@ -378,7 +373,6 @@ function customTemplate($tpl) {
 
         break;
     case 'tag_cloud':
-        $form = new Portal\Form($db, $login);
         $tags = $form->getUniqueTags();
         $count = 0;
         $tempTags = array();
@@ -400,7 +394,6 @@ function customTemplate($tpl) {
 
         break;
     case 'gettagmembers':
-        $form = new Portal\Form($db, $login);
         $t_form = new Smarty;
         $t_form->left_delimiter = '<!--{';
         $t_form->right_delimiter = '}-->';
@@ -420,8 +413,7 @@ function customTemplate($tpl) {
         $t_form->left_delimiter = '<!--{';
         $t_form->right_delimiter = '}-->';
 
-        $rev = $db->prepared_query("SELECT * FROM settings WHERE setting='dbversion'", array());
-        $t_form->assign('dbversion', XSSHelpers::xscrub($rev[0]['data']));
+        $t_form->assign('dbversion', XSSHelpers::xscrub(LEAF_SETTINGS['dbversion']));
 
         $main->assign('hideFooter', true);
         $main->assign('body', $t_form->fetch('view_about.tpl'));
@@ -447,13 +439,12 @@ function customTemplate($tpl) {
         break;
 
     case 'sitemap':
-        $form = new Portal\Form($db, $login);
         $t_form = new Smarty;
         $t_form->left_delimiter = '<!--{';
         $t_form->right_delimiter = '}-->';
 
-        $t_form->assign('sitemap', $settings['sitemap_json']['buttons']);
-        $t_form->assign('city', $settings['subHeading'] == '' ? $config->city : $settings['subHeading']);
+        $t_form->assign('sitemap', LEAF_SETTINGS['sitemap_json']['buttons']);
+        $t_form->assign('city', LEAF_SETTINGS['subHeading']);
         $t_form->assign('css_path', 'https://' . HTTP_HOST . '/app/libs/css');
         $main->assign('body', $t_form->fetch('sitemap.tpl'));
 
@@ -510,11 +501,11 @@ function customTemplate($tpl) {
         $t_form->left_delimiter = '<!--{';
         $t_form->right_delimiter = '}-->';
 
-        $main->assign('title', $settings['heading'] == '' ? $config->title : XSSHelpers::sanitizeHTML($settings['heading']));
-        $main->assign('city', $settings['subHeading'] == '' ? $config->city : XSSHelpers::sanitizeHTML($settings['subHeading']));
+        $main->assign('title', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['heading']));
+        $main->assign('city', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['subHeading']));
         $main->assign('logout', true);
-        $main->assign('leafSecure', XSSHelpers::sanitizeHTML($settings['leafSecure']));
-        $main->assign('revision', XSSHelpers::sanitizeHTML($settings['version']));
+        $main->assign('leafSecure', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['leafSecure']));
+        $main->assign('revision', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['version']));
 
         $main->assign('body', $t_form->fetch(customTemplate('view_logout.tpl')));
         $main->display(customTemplate('main.tpl'));
@@ -543,13 +534,13 @@ function customTemplate($tpl) {
         $t_form->assign('orgchartPath', $site_paths['orgchart_path']);
         $t_form->assign('CSRFToken', $_SESSION['CSRFToken']);
 
-        $inbox = new Portal\Inbox($db, $login);
+        $inbox = new Portal\Inbox(DB, $login);
         //$t_form->assign('inbox_status', $inbox->getInboxStatus()); // see Inbox.php -> getInboxStatus()
 
         $t_form->assign('inbox_status', 1);
-        if (isset($settings['homepage_enabled']) && $settings['homepage_enabled'] == 1) {
-            $t_form->assign('homeDesignJSON', json_encode($settings['homepage_design_json']));
-            $t_form->assign('searchDesignJSON', json_encode($settings['search_design_json']));
+        if (isset(LEAF_SETTINGS['homepage_enabled']) && LEAF_SETTINGS['homepage_enabled'] == 1) {
+            $t_form->assign('homeDesignJSON', json_encode(LEAF_SETTINGS['homepage_design_json']));
+            $t_form->assign('searchDesignJSON', json_encode(LEAF_SETTINGS['search_design_json']));
             $t_form->assign('tpl_search', 'nocode_templates/view_search.tpl');
             $main->assign('body', $t_form->fetch('./templates/nocode_templates/view_homepage.tpl'));
         } else {
@@ -567,7 +558,7 @@ function customTemplate($tpl) {
         break;
 }
 
-$main->assign('leafSecure', XSSHelpers::sanitizeHTML($settings['leafSecure']));
+$main->assign('leafSecure', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['leafSecure']));
 $main->assign('login', $t_login->fetch('login.tpl'));
 $main->assign('empMembership', $login->getMembership());
 $t_menu->assign('action', XSSHelpers::xscrub($action));
@@ -577,9 +568,9 @@ function customTemplate($tpl) {
 $main->assign('menu', $o_menu);
 $main->assign('tabText', XSSHelpers::sanitizeHTML($tabText));
 
-$main->assign('title', $settings['heading'] == '' ? $config->title : XSSHelpers::sanitizeHTML($settings['heading']));
-$main->assign('city', $settings['subHeading'] == '' ? $config->city : XSSHelpers::sanitizeHTML($settings['subHeading']));
-$main->assign('revision', XSSHelpers::sanitizeHTML($settings['version']));
+$main->assign('title', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['heading']));
+$main->assign('city', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['subHeading']));
+$main->assign('revision', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['version']));
 
 if (!isset($_GET['iframe'])) {
     $main->display(customTemplate('main.tpl'));
diff --git a/LEAF_Request_Portal/login/index.php b/LEAF_Request_Portal/login/index.php
index e358371da..272951cbf 100755
--- a/LEAF_Request_Portal/login/index.php
+++ b/LEAF_Request_Portal/login/index.php
@@ -11,10 +11,6 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-$settings['heading'] = XSSHelpers::sanitizeHTMLRich($settings['heading'] == '' ? $config->title : $settings['heading']);
-$settings['subHeading'] = XSSHelpers::sanitizeHTMLRich($settings['subHeading'] == '' ? $config->city : $settings['subHeading']);
-
 function getBaseDir()
 {
     $dir = dirname($_SERVER['PHP_SELF']);
@@ -43,8 +39,8 @@ function getBaseDir()
 <div id="header">
     <div>
       <span style="position: absolute"><img src="../images/VA_icon_small.png" style="width: 80px" alt="VA logo" /></span>
-      <span id="headerLabel"><?php echo htmlentities($settings['subHeading']); ?></span>
-      <span id="headerDescription"><?php echo htmlentities($settings['heading']); ?></span>
+      <span id="headerLabel"><?php echo htmlentities(LEAF_SETTINGS['subHeading']); ?></span>
+      <span id="headerDescription"><?php echo htmlentities(LEAF_SETTINGS['heading']); ?></span>
     </div>
     <span id="headerTab">Secure Login</span>
     <span id="headerTabImg"><img src="../images/tab.png" alt="tab" /></span>
diff --git a/LEAF_Request_Portal/open.php b/LEAF_Request_Portal/open.php
index edb19f188..6567b6db3 100644
--- a/LEAF_Request_Portal/open.php
+++ b/LEAF_Request_Portal/open.php
@@ -9,7 +9,7 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-$short = new Portal\Shortener($db, null);
+$short = new Portal\Shortener(DB, null);
 
 $report = isset($_GET['report']) ? XSSHelpers::xscrub($_GET['report']) : '';
 if($report != '') {
diff --git a/LEAF_Request_Portal/report.php b/LEAF_Request_Portal/report.php
index 0e54be006..b56e88e64 100644
--- a/LEAF_Request_Portal/report.php
+++ b/LEAF_Request_Portal/report.php
@@ -56,11 +56,9 @@ function customTemplate($tpl)
 
 $main->assign('useUI', false);
 
-//$settings = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-
-foreach (array_keys($settings) as $key)
+foreach (array_keys(LEAF_SETTINGS) as $key)
 {
-    $settings[$key] = XSSHelpers::sanitizeHTMLRich($settings[$key]);
+    LEAF_SETTINGS[$key] = XSSHelpers::sanitizeHTMLRich(LEAF_SETTINGS[$key]);
 }
 
 switch ($action) {
@@ -68,7 +66,7 @@ function customTemplate($tpl)
         $main->assign('useUI', true);
         $main->assign('javascripts', array('js/form.js', 'js/workflow.js', 'js/formGrid.js', 'js/formQuery.js'));
 
-        $form = new Portal\Form($db, $login);
+        $form = new Portal\Form(DB, $login);
         $o_login = $t_login->fetch('login.tpl');
 
         $currentEmployee = $form->employee->lookupLogin($login->getUserID());
@@ -107,7 +105,7 @@ function customTemplate($tpl)
                 APP_JS_PATH . '/choicesjs/choices.min.js'
             ));
 
-            $form = new Portal\Form($db, $login);
+            $form = new Portal\Form(DB, $login);
             $o_login = $t_login->fetch('login.tpl');
 
             $t_form = new Smarty;
@@ -119,9 +117,9 @@ function customTemplate($tpl)
             $t_form->assign('empMembership', $login->getMembership());
             $t_form->assign('currUserActualName', XSSHelpers::xscrub($login->getName()));
             $t_form->assign('orgchartPath', $site_paths['orgchart_path']);
-            $t_form->assign('systemSettings', $settings);
+            $t_form->assign('systemSettings', LEAF_SETTINGS);
             $t_form->assign('LEAF_NEXUS_URL', LEAF_NEXUS_URL);
-            $t_form->assign('city', $settings['subHeading'] == '' ? $config->city : $settings['subHeading']);
+            $t_form->assign('city', LEAF_SETTINGS['subHeading']);
             $t_form->assign('app_css_path', APP_CSS_PATH);
             $t_form->assign('app_js_path', APP_JS_PATH);
 
@@ -136,7 +134,7 @@ function customTemplate($tpl)
         break;
 }
 
-$main->assign('leafSecure', XSSHelpers::sanitizeHTML($settings['leafSecure']));
+$main->assign('leafSecure', XSSHelpers::sanitizeHTML(LEAF_SETTINGS['leafSecure']));
 $main->assign('login', $t_login->fetch('login.tpl'));
 $main->assign('empMembership', $login->getMembership());
 $t_menu->assign('action', $action);
@@ -147,9 +145,9 @@ function customTemplate($tpl)
 $tabText = $tabText == '' ? '' : $tabText . '&nbsp;';
 $main->assign('tabText', $tabText);
 
-$main->assign('title', $settings['heading'] == '' ? $config->title : $settings['heading']);
-$main->assign('city', $settings['subHeading'] == '' ? $config->city : $settings['subHeading']);
-$main->assign('revision', $settings['version']);
+$main->assign('title', LEAF_SETTINGS['heading']);
+$main->assign('city', LEAF_SETTINGS['subHeading']);
+$main->assign('revision', LEAF_SETTINGS['version']);
 
 if (!isset($_GET['iframe']))
 {
diff --git a/LEAF_Request_Portal/scripts/automated_email.php b/LEAF_Request_Portal/scripts/automated_email.php
index a9f384586..541ec5d92 100644
--- a/LEAF_Request_Portal/scripts/automated_email.php
+++ b/LEAF_Request_Portal/scripts/automated_email.php
@@ -21,7 +21,7 @@
 
 $getWorkflowStepsSQL = 'SELECT workflowID, stepID,stepTitle,stepData
 FROM workflow_steps WHERE stepData LIKE \'%"AutomateEmailGroup":"true"%\';';
-$getWorkflowStepsRes = $db->prepared_query($getWorkflowStepsSQL, []);
+$getWorkflowStepsRes = DB->prepared_query($getWorkflowStepsSQL, []);
 
 // do we have automated notification setup here
 if (empty($getWorkflowStepsRes)) {
@@ -82,7 +82,7 @@
         AND initialNotificationSent = 0
         AND deleted = 0;';
 
-    $getRecordResInitial = $db->prepared_query($getRecordSql, $getRecordVar);
+    $getRecordResInitial = DB->prepared_query($getRecordSql, $getRecordVar);
 
     foreach($getRecordResInitial as $getRecordResInitialKey=>$getRecordResInitialValue) {
         $getRecordResInitial[$getRecordResInitialKey]['daysSince'] = $daysago;
@@ -117,7 +117,7 @@
         AND initialNotificationSent = 1
         AND deleted = 0;';
 
-    $getRecordResAfter = $db->prepared_query($getRecordSql, $getRecordVar);
+    $getRecordResAfter = DB->prepared_query($getRecordSql, $getRecordVar);
 
     foreach($getRecordResAfter as $getRecordResAfterKey=>$getRecordResAfterValue){
         $getRecordResAfter[$getRecordResAfterKey]['daysSince'] = $addldaysago;
@@ -137,7 +137,7 @@
         // get the last action
         $getLastActionVar = [':recordID' => $record['recordID']];
         $getLastActionSql = "SELECT `time` FROM action_history WHERE recordID = :recordID ORDER BY `time` DESC LIMIT 1;";
-        $getLastActionRes = $db->prepared_query($getLastActionSql, $getLastActionVar);
+        $getLastActionRes = DB->prepared_query($getLastActionSql, $getLastActionVar);
 
         if(!empty($getLastActionRes[0])){
             // if this is not empty use the time of the action
@@ -195,7 +195,7 @@
         $updateRecordsWorkflowStateSql = 'UPDATE records_workflow_state
                                             SET lastNotified=:lastNotified, initialNotificationSent=1
                                             WHERE recordID=:recordID';
-        $db->prepared_query($updateRecordsWorkflowStateSql, $updateRecordsWorkflowStateVars);
+        DB->prepared_query($updateRecordsWorkflowStateSql, $updateRecordsWorkflowStateVars);
 
         echo "Email sent for {$record['recordID']} ({$daysSinceText}) \r\n";
     }
diff --git a/LEAF_Request_Portal/scripts/firstRun.php b/LEAF_Request_Portal/scripts/firstRun.php
index 46b2d9d26..51d66b218 100644
--- a/LEAF_Request_Portal/scripts/firstRun.php
+++ b/LEAF_Request_Portal/scripts/firstRun.php
@@ -6,12 +6,12 @@
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
 $vars = array();
-$res = $db->prepared_query('SELECT * FROM users WHERE groupID=1', $vars);
+$res = DB->prepared_query('SELECT * FROM users WHERE groupID=1', $vars);
 
 if (count($res) == 0) {
     if (strlen(DATABASE_DB_ADMIN) > 0) {
         $vars = array(':name' => DATABASE_DB_ADMIN);
-        $res = $db->prepared_query('INSERT INTO users (userID, groupID, backupID)
+        $res = DB->prepared_query('INSERT INTO users (userID, groupID, backupID)
                                         VALUES (:name, 1, "")', $vars);
         echo 'Administrator added: ' . DATABASE_DB_ADMIN;
     } else {
diff --git a/LEAF_Request_Portal/scripts/syncSVNrevision.php b/LEAF_Request_Portal/scripts/syncSVNrevision.php
index 7bff8c53b..e23e61e7a 100644
--- a/LEAF_Request_Portal/scripts/syncSVNrevision.php
+++ b/LEAF_Request_Portal/scripts/syncSVNrevision.php
@@ -8,4 +8,4 @@
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
 $vars = array(':version' => $version);
-$res = $db->prepared_query("UPDATE settings SET data=:version WHERE setting='version'", $vars);
+$res = DB->prepared_query("UPDATE settings SET data=:version WHERE setting='version'", $vars);
diff --git a/LEAF_Request_Portal/scripts/sync_services.php b/LEAF_Request_Portal/scripts/sync_services.php
index 11c5c6f4f..e943853d9 100644
--- a/LEAF_Request_Portal/scripts/sync_services.php
+++ b/LEAF_Request_Portal/scripts/sync_services.php
@@ -10,14 +10,14 @@
 $login->setBaseDir('../');
 $login->loginUser();
 
-$employee = new Orgchart\Employee($oc_db, $login);
-$group = new Orgchart\Group($oc_db, $login);
-$position = new Orgchart\Position($oc_db, $login);
-$tag = new Orgchart\Tag($oc_db, $login);
+$employee = new Orgchart\Employee(OC_DB, $login);
+$group = new Orgchart\Group(OC_DB, $login);
+$position = new Orgchart\Position(OC_DB, $login);
+$tag = new Orgchart\Tag(OC_DB, $login);
 
-$group_portal = new Portal\Group($db, $login);
-$service_portal = new Portal\Service($db, $login);
-$system_portal = new Portal\System($db, $login);
+$group_portal = new Portal\Group(DB, $login);
+$service_portal = new Portal\Service(DB, $login);
+$system_portal = new Portal\System(DB, $login);
 $syncing = $system_portal->syncSystem($group);
 
 echo $syncing;
\ No newline at end of file
diff --git a/LEAF_Request_Portal/scripts/updateDatabase.php b/LEAF_Request_Portal/scripts/updateDatabase.php
index 260b00ad7..faf045157 100644
--- a/LEAF_Request_Portal/scripts/updateDatabase.php
+++ b/LEAF_Request_Portal/scripts/updateDatabase.php
@@ -6,7 +6,7 @@
 
 require_once getenv('APP_LIBS_PATH') . '/loaders/Leaf_autoloader.php';
 
-$update = new DbUpdate($db, $setting_up, 'portal', PORTAL_PATH);
+$update = new DbUpdate(DB, $setting_up, 'portal', PORTAL_PATH);
 
 $update->run();
 
diff --git a/LEAF_Request_Portal/sources/Site.php b/LEAF_Request_Portal/sources/Site.php
index 1d8f30ed8..6f758ea52 100644
--- a/LEAF_Request_Portal/sources/Site.php
+++ b/LEAF_Request_Portal/sources/Site.php
@@ -114,10 +114,4 @@ public function enableNoCodeHomepage(int $isEnabled = 0): array {
         $status['message'] = "success";
         return $status;
     }
-	public function getSitemapJSON()
-	{
-        $settings = $this->db->prepared_query('SELECT data from settings WHERE setting="sitemap_json"', null);
-
-		return $settings;
-	}
 }
diff --git a/LEAF_Request_Portal/utils/LEAF_exportStandardConfig.php b/LEAF_Request_Portal/utils/LEAF_exportStandardConfig.php
index ab74d31ab..116cf720e 100644
--- a/LEAF_Request_Portal/utils/LEAF_exportStandardConfig.php
+++ b/LEAF_Request_Portal/utils/LEAF_exportStandardConfig.php
@@ -9,14 +9,12 @@
 
 $debug = false;
 
-$res = $db->query_kv('SELECT * FROM settings', 'setting', 'data');
-
-if($res['siteType'] != 'national_primary') {
+if(LEAF_SETTINGS['siteType'] != 'national_primary') {
     exit();
 }
 
 if ($debug) {
-    $db->enableDebug();
+    DB->enableDebug();
 }
 echo "Running Package Builder...<br />\n";
 array_map('unlink', glob($tempFolder . '*.sql'));
@@ -43,14 +41,14 @@ function exportTable($db, $tempFolder, $table) {
     file_put_contents("{$tempFolder}{$table}.sql", serialize($res));
 }
 
-exportTable($db, $tempFolder, 'actions');
-exportTable($db, $tempFolder, 'categories');
-exportTable($db, $tempFolder, 'category_staples');
-exportTable($db, $tempFolder, 'dependencies');
-exportTable($db, $tempFolder, 'indicators');
-exportTable($db, $tempFolder, 'route_events');
-exportTable($db, $tempFolder, 'workflows');
-exportTable($db, $tempFolder, 'workflow_steps');
-exportTable($db, $tempFolder, 'step_dependencies');
-exportTable($db, $tempFolder, 'workflow_routes');
-exportTable($db, $tempFolder, 'step_modules');
+exportTable(DB, $tempFolder, 'actions');
+exportTable(DB, $tempFolder, 'categories');
+exportTable(DB, $tempFolder, 'category_staples');
+exportTable(DB, $tempFolder, 'dependencies');
+exportTable(DB, $tempFolder, 'indicators');
+exportTable(DB, $tempFolder, 'route_events');
+exportTable(DB, $tempFolder, 'workflows');
+exportTable(DB, $tempFolder, 'workflow_steps');
+exportTable(DB, $tempFolder, 'step_dependencies');
+exportTable(DB, $tempFolder, 'workflow_routes');
+exportTable(DB, $tempFolder, 'step_modules');
diff --git a/LEAF_Request_Portal/utils/LEAF_importStandardConfig.php b/LEAF_Request_Portal/utils/LEAF_importStandardConfig.php
index 43479e03f..19f5c78a8 100644
--- a/LEAF_Request_Portal/utils/LEAF_importStandardConfig.php
+++ b/LEAF_Request_Portal/utils/LEAF_importStandardConfig.php
@@ -29,27 +29,27 @@
 
 if ($debug)
 {
-    $db->enableDebug();
+    DB->enableDebug();
 }
 
-$db->query("TRUNCATE TABLE `workflow_routes`;");
-$db->query("TRUNCATE TABLE `step_dependencies`;");
-$db->query("delete from `workflow_steps`;");
-$db->query("delete FROM `workflows`;");
-$db->query("delete FROM `events`;");
-$db->query("TRUNCATE TABLE `email_templates`;");
-$db->query("TRUNCATE TABLE `route_events`;");
-$db->query("TRUNCATE TABLE `indicators`;");
-$db->query("ALTER TABLE records_dependencies DROP FOREIGN KEY fk_records_dependencyID;");
-$db->query("ALTER TABLE dependency_privs DROP FOREIGN KEY fk_privs_dependencyID;");
-$db->query("delete FROM `dependencies`;");
-$db->query("ALTER TABLE category_count DROP FOREIGN KEY category_count_ibfk_1;");
-$db->query("ALTER TABLE category_privs DROP FOREIGN KEY category_privs_ibfk_2;");
-$db->query("TRUNCATE TABLE `category_staples`;");
-$db->query("delete FROM `categories`;");
-$db->query("delete FROM `actions`;");
-$db->query("delete FROM `records_dependencies` WHERE dependencyID=0;"); // delete invalid items -- TODO: figure out how these invalid items got written
-$db->query("TRUNCATE TABLE `step_modules`;");
+DB->query("TRUNCATE TABLE `workflow_routes`;");
+DB->query("TRUNCATE TABLE `step_dependencies`;");
+DB->query("delete from `workflow_steps`;");
+DB->query("delete FROM `workflows`;");
+DB->query("delete FROM `events`;");
+DB->query("TRUNCATE TABLE `email_templates`;");
+DB->query("TRUNCATE TABLE `route_events`;");
+DB->query("TRUNCATE TABLE `indicators`;");
+DB->query("ALTER TABLE records_dependencies DROP FOREIGN KEY fk_records_dependencyID;");
+DB->query("ALTER TABLE dependency_privs DROP FOREIGN KEY fk_privs_dependencyID;");
+DB->query("delete FROM `dependencies`;");
+DB->query("ALTER TABLE category_count DROP FOREIGN KEY category_count_ibfk_1;");
+DB->query("ALTER TABLE category_privs DROP FOREIGN KEY category_privs_ibfk_2;");
+DB->query("TRUNCATE TABLE `category_staples`;");
+DB->query("delete FROM `categories`;");
+DB->query("delete FROM `actions`;");
+DB->query("delete FROM `records_dependencies` WHERE dependencyID=0;"); // delete invalid items -- TODO: figure out how these invalid items got written
+DB->query("TRUNCATE TABLE `step_modules`;");
 
 
 function importTable($db, $tempFolder, $table) {
@@ -92,19 +92,19 @@ function importTable($db, $tempFolder, $table) {
     }
 }
 
-importTable($db, $tempFolder, 'actions');
-importTable($db, $tempFolder, 'categories');
-importTable($db, $tempFolder, 'category_staples');
-importTable($db, $tempFolder, 'dependencies');
-importTable($db, $tempFolder, 'indicators');
-importTable($db, $tempFolder, 'events');
-importTable($db, $tempFolder, 'route_events');
-importTable($db, $tempFolder, 'workflows');
-importTable($db, $tempFolder, 'workflow_steps');
-importTable($db, $tempFolder, 'step_dependencies');
-importTable($db, $tempFolder, 'workflow_routes');
-importTable($db, $tempFolder, 'step_modules');
-importTable($db, $tempFolder, 'email_templates');
+importTable(DB, $tempFolder, 'actions');
+importTable(DB, $tempFolder, 'categories');
+importTable(DB, $tempFolder, 'category_staples');
+importTable(DB, $tempFolder, 'dependencies');
+importTable(DB, $tempFolder, 'indicators');
+importTable(DB, $tempFolder, 'events');
+importTable(DB, $tempFolder, 'route_events');
+importTable(DB, $tempFolder, 'workflows');
+importTable(DB, $tempFolder, 'workflow_steps');
+importTable(DB, $tempFolder, 'step_dependencies');
+importTable(DB, $tempFolder, 'workflow_routes');
+importTable(DB, $tempFolder, 'step_modules');
+importTable(DB, $tempFolder, 'email_templates');
 
 if (is_dir($paste_custom_templates) && is_dir($copy_custom_templates)) {
     // remove files from templates/email/custom_override on subordinate
@@ -122,10 +122,10 @@ function importTable($db, $tempFolder, $table) {
     copyDirectory($copy_custom_templates, $paste_custom_templates);
 }
 
-$db->query("ALTER TABLE `records_dependencies` ADD CONSTRAINT `fk_records_dependencyID` FOREIGN KEY (`dependencyID`) REFERENCES `dependencies`(`dependencyID`) ON DELETE RESTRICT ON UPDATE RESTRICT;");
-$db->query("ALTER TABLE `dependency_privs` ADD CONSTRAINT `fk_privs_dependencyID` FOREIGN KEY (`dependencyID`) REFERENCES `dependencies`(`dependencyID`) ON DELETE RESTRICT ON UPDATE RESTRICT;");
-$db->query("ALTER TABLE `category_count` ADD CONSTRAINT `category_count_ibfk_1` FOREIGN KEY (`categoryID`) REFERENCES `categories`(`categoryID`) ON DELETE RESTRICT ON UPDATE RESTRICT;");
-$db->query("ALTER TABLE `category_privs` ADD CONSTRAINT `category_privs_ibfk_2` FOREIGN KEY (`categoryID`) REFERENCES `categories`(`categoryID`) ON DELETE RESTRICT ON UPDATE RESTRICT;");
+DB->query("ALTER TABLE `records_dependencies` ADD CONSTRAINT `fk_records_dependencyID` FOREIGN KEY (`dependencyID`) REFERENCES `dependencies`(`dependencyID`) ON DELETE RESTRICT ON UPDATE RESTRICT;");
+DB->query("ALTER TABLE `dependency_privs` ADD CONSTRAINT `fk_privs_dependencyID` FOREIGN KEY (`dependencyID`) REFERENCES `dependencies`(`dependencyID`) ON DELETE RESTRICT ON UPDATE RESTRICT;");
+DB->query("ALTER TABLE `category_count` ADD CONSTRAINT `category_count_ibfk_1` FOREIGN KEY (`categoryID`) REFERENCES `categories`(`categoryID`) ON DELETE RESTRICT ON UPDATE RESTRICT;");
+DB->query("ALTER TABLE `category_privs` ADD CONSTRAINT `category_privs_ibfk_2` FOREIGN KEY (`categoryID`) REFERENCES `categories`(`categoryID`) ON DELETE RESTRICT ON UPDATE RESTRICT;");
 
 function copyDirectory(string $source, string $destination): void
 {
diff --git a/app/libs/loaders/Leaf_autoloader.php b/app/libs/loaders/Leaf_autoloader.php
index c7a21d519..c4c733a44 100644
--- a/app/libs/loaders/Leaf_autoloader.php
+++ b/app/libs/loaders/Leaf_autoloader.php
@@ -61,19 +61,19 @@
 */
 
 if (!empty($site_paths['portal_database'])){
-    $db = new Db(DIRECTORY_HOST, DIRECTORY_USER, DIRECTORY_PASS, $site_paths['portal_database']);
+    if (!defined('DB')) define('DB', new Db(DIRECTORY_HOST, DIRECTORY_USER, DIRECTORY_PASS, $site_paths['portal_database']));
 } else {
-    $db = new Db(DIRECTORY_HOST, DIRECTORY_USER, DIRECTORY_PASS, $site_paths['orgchart_database']);
+    if (!defined('DB')) define('DB', new Db(DIRECTORY_HOST, DIRECTORY_USER, DIRECTORY_PASS, $site_paths['orgchart_database']));
 }
 
-$oc_db = new Db(DIRECTORY_HOST, DIRECTORY_USER, DIRECTORY_PASS, $site_paths['orgchart_database']);
+if (!defined('OC_DB')) define('OC_DB', new Db(DIRECTORY_HOST, DIRECTORY_USER, DIRECTORY_PASS, $site_paths['orgchart_database']));
 
 // get the settings for this portal
-$setting_up = new Setting($db);
-$settings = $setting_up->getSettings();
+$setting_up = new Setting(DB);
+if (!defined('LEAF_SETTINGS')) define('LEAF_SETTINGS', $setting_up->getSettings());
 
 if (class_exists('Portal\Config')) {
-    $config = new Portal\Config($site_paths, $settings);
+    $config = new Portal\Config($site_paths, LEAF_SETTINGS);
     if (!defined('PORTAL_CONFIG')) define('PORTAL_CONFIG', $config);
 }
 
@@ -87,10 +87,10 @@
 
 $oc_site_paths = $file_paths_db->prepared_query($sql, $vars)[0];
 
-$oc_setting_up = new Setting($oc_db);
-$oc_settings = $oc_setting_up->getSettings();
+$oc_setting_up = new Setting(OC_DB);
+if (!defined('OC_SETTINGS')) define('OC_SETTINGS', $oc_setting_up->getSettings());
 
-$oc_config = new Orgchart\Config($site_paths, $oc_settings);
+$oc_config = new Orgchart\Config($site_paths, OC_SETTINGS);
 if (!defined('ORGCHART_CONFIG')) define('ORGCHART_CONFIG', $oc_config);
 
 ini_set('session.gc_maxlifetime', 2592000);
@@ -126,24 +126,20 @@
 }
 
 if (class_exists('Portal\Login')) {
-    $login = new Portal\Login($oc_db, $db);
+    $login = new Portal\Login(OC_DB, DB);
 } else if (class_exists('Orgchart\Login')) {
-    $login = new Orgchart\Login($oc_db, $db);
-    $oc_login = new Orgchart\Login($oc_db, $oc_db);
+    $login = new Orgchart\Login(OC_DB, DB);
+    $oc_login = new Orgchart\Login(OC_DB, OC_DB);
 } else {
     error_log(print_r($loader, true));
     exit;
 }
-$data_action_logger = new DataActionLogger($db, $login);
 
 if (!defined('S_LIB_PATH')) define('S_LIB_PATH', 'https://' . getenv('APP_HTTP_HOST') . '/libs');
 if (!defined('ABSOLUTE_ORG_PATH')) define('ABSOLUTE_ORG_PATH', 'https://' . getenv('APP_HTTP_HOST') . $site_paths['orgchart_path']);
 if (!defined('ABSOLUTE_PORT_PATH')) define('ABSOLUTE_PORT_PATH', 'https://' . getenv('APP_HTTP_HOST') . $site_paths['site_path']);
 if (!defined('DOMAIN_PATH')) define('DOMAIN_PATH', 'https://' . getenv('APP_HTTP_HOST'));
 if (!defined('ORGCHART_DB')) define('ORGCHART_DB', $site_paths['orgchart_database']);
-if (!defined('OC_DB')) define('OC_DB', $oc_db);
-if (!defined('LEAF_SETTINGS')) define('LEAF_SETTINGS', $settings);
-if (!defined('OC_SETTINGS')) define('OC_SETTINGS', $oc_settings);
 
 if (!empty($site_paths['portal_database'])) {
     if (!defined('PORTAL_DB')) define('PORTAL_DB', $site_paths['portal_database']);
diff --git a/scripts/scheduled-task-commands/automatedDestruction.php b/scripts/scheduled-task-commands/automatedDestruction.php
index a52b3565b..72aa0038a 100644
--- a/scripts/scheduled-task-commands/automatedDestruction.php
+++ b/scripts/scheduled-task-commands/automatedDestruction.php
@@ -1,6 +1,6 @@
 <?php
-require_once 'globals.php';
-require_once LIB_PATH . '/php-commons/Db.php';
+require_once getenv('APP_LIBS_PATH') . '/globals.php';
+require_once getenv('APP_LIBS_PATH') . '../Leaf/Db.php';
 
 $startTime = microtime(true);
 
diff --git a/scripts/scheduled-task-commands/refreshOrgchartEmployees.php b/scripts/scheduled-task-commands/refreshOrgchartEmployees.php
index fb6974254..9469bef4d 100644
--- a/scripts/scheduled-task-commands/refreshOrgchartEmployees.php
+++ b/scripts/scheduled-task-commands/refreshOrgchartEmployees.php
@@ -1,7 +1,7 @@
 <?php
 // this file will need to be added, Pete's destruction ticket has it already.
-require_once 'globals.php';
-require_once LIB_PATH . '/php-commons/Db.php';
+require_once getenv('APP_LIBS_PATH') . '/globals.php';
+require_once getenv('APP_LIBS_PATH') . '../Leaf/Db.php';
 
 $startTime = microtime(true);