From 26c1c5191b4b4167e0084f96e47afa4cb2a5eaa7 Mon Sep 17 00:00:00 2001
From: modela bitweaver <spiderr@bitweaver.org>
Date: Tue, 2 Feb 2021 01:17:15 -0500
Subject: move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

---
 Nexus.php         | 4 ++--
 NexusSystem.php   | 2 +-
 bit_setup_inc.php | 2 +-
 menu_items.php    | 4 ++--
 menu_sort.php     | 2 +-
 menus.php         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Nexus.php b/Nexus.php
index 843b857..ba532ba 100644
--- a/Nexus.php
+++ b/Nexus.php
@@ -522,7 +522,7 @@ class Nexus extends NexusSystem {
 	function expungeDeadItems( $pMenuId=NULL ) {
 		if( isset( $pMenuId ) && is_numeric( $pMenuId ) ) {
 			// get $contentList
-			include_once( LIBERTY_PKG_PATH.'get_content_list_inc.php' );
+			include_once( LIBERTY_PKG_INCLUDE_PATH.'get_content_list_inc.php' );
 			foreach( $contentList as $contentItem ) {
 				$contentIds[] = $contentItem['content_id'];
 			}
@@ -649,7 +649,7 @@ class Nexus extends NexusSystem {
 	*/
 	function importStructure( $pStructureId=NULL ) {
 		if( $pStructureId || !is_numeric( $pStructureId ) ) {
-			include_once( LIBERTY_PKG_PATH.'LibertyStructure.php');
+			include_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php');
 			$structure = new LibertyStructure( $pStructureId );
 			$structure->load();
 
diff --git a/NexusSystem.php b/NexusSystem.php
index 646de91..3578492 100644
--- a/NexusSystem.php
+++ b/NexusSystem.php
@@ -13,7 +13,7 @@
 /**
  * Setup
  */
-require_once( LIBERTY_PKG_PATH.'LibertySystem.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertySystem.php' );
 define( 'NEXUS_DEFAULT_MENU', 'suckerfish' );
 
 /**
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 67a4a63..881b49b 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -27,7 +27,7 @@ if( $gBitSystem->isPackageActive( 'nexus' ) ) {
 	$gBitSmarty->assignByRef( 'gNexusSystem', $gNexusSystem );
 
 	// include service functions
-	require_once( NEXUS_PKG_PATH.'servicefunctions_inc.php' );
+	require_once( NEXUS_PKG_INCLUDE_PATH.'servicefunctions_inc.php' );
 
 	$gLibertySystem->registerService( LIBERTY_SERVICE_MENU, NEXUS_PKG_NAME, array(
 		'content_store_function'   => 'nexus_content_store',
diff --git a/menu_items.php b/menu_items.php
index c912490..1240dbb 100644
--- a/menu_items.php
+++ b/menu_items.php
@@ -11,7 +11,7 @@
 */
 require_once( '../kernel/setup_inc.php' );
 require_once( NEXUS_PKG_PATH.'Nexus.php');
-include_once( NEXUS_PKG_PATH.'menu_lookup_inc.php' );
+include_once( NEXUS_PKG_INCLUDE_PATH.'menu_lookup_inc.php' );
 
 $gBitSystem->verifyPermission( 'p_nexus_create_menus' );
 
@@ -20,7 +20,7 @@ if( empty( $_REQUEST['menu_id'] ) ) {
 }
 
 // get content and pass it on
-include_once( LIBERTY_PKG_PATH.'get_content_list_inc.php' );
+include_once( LIBERTY_PKG_INCLUDE_PATH.'get_content_list_inc.php' );
 $gBitSmarty->assign( 'contentSelect', $contentSelect );
 $gBitSmarty->assign( 'contentTypes', $contentTypes );
 
diff --git a/menu_sort.php b/menu_sort.php
index 63290db..039d6e8 100644
--- a/menu_sort.php
+++ b/menu_sort.php
@@ -12,7 +12,7 @@
 require_once( '../kernel/setup_inc.php' );
 global $gBitSystem;
 require_once( NEXUS_PKG_PATH.'Nexus.php');
-include_once( NEXUS_PKG_PATH.'menu_lookup_inc.php' );
+include_once( NEXUS_PKG_INCLUDE_PATH.'menu_lookup_inc.php' );
 
 $gBitSystem->verifyPermission( 'p_nexus_create_menus' );
 
diff --git a/menus.php b/menus.php
index 56abf17..272eecb 100644
--- a/menus.php
+++ b/menus.php
@@ -12,7 +12,7 @@
 require_once( '../kernel/setup_inc.php' );
 global $gBitSystem;
 require_once( NEXUS_PKG_PATH.'Nexus.php');
-include_once( NEXUS_PKG_PATH.'menu_lookup_inc.php' );
+include_once( NEXUS_PKG_INCLUDE_PATH.'menu_lookup_inc.php' );
 
 $formfeedback = '';
 $gBitSystem->verifyPermission( 'p_nexus_create_menus' );
-- 
cgit v1.3