From 6e753bf88b6c4ce17f416464ee10674ebb444a35 Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Thu, 4 Feb 2021 11:57:38 -0500
Subject: move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

---
 bit_setup_inc.php | 2 +-
 broadcast.php     | 2 +-
 compose.php       | 2 +-
 contact.php       | 2 +-
 message_box.php   | 2 +-
 read.php          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 0bde39f..e7d1a42 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -8,7 +8,7 @@ $registerHash = array(
 $gBitSystem->registerPackage( $registerHash );
 
 if( $gBitSystem->isPackageActive( 'messages' ) && $gBitUser->hasPermission( 'p_messages_send' ) ) {
-	require_once( MESSAGES_PKG_PATH.'Messages.php' );
+	require_once( MESSAGES_PKG_CLASS_PATH.'Messages.php' );
 	$messages = new Messages();
 	$unreadMsgs = $messages->unreadMessages( $gBitUser->mUserId );
 	$gBitSmarty->assignByRef( 'unreadMsgs', $unreadMsgs );
diff --git a/broadcast.php b/broadcast.php
index 58a6c49..57eb60d 100644
--- a/broadcast.php
+++ b/broadcast.php
@@ -13,7 +13,7 @@
  */
 require_once( '../kernel/includes/setup_inc.php' );
 
-include_once( MESSAGES_PKG_PATH.'Messages.php' );
+include_once( MESSAGES_PKG_CLASS_PATH.'Messages.php' );
 
 if( !$gBitUser->isRegistered() ) {
 	$gBitSmarty->fatalError( tra( "You are not logged in" ) );
diff --git a/compose.php b/compose.php
index c2e21f5..4ef75ac 100644
--- a/compose.php
+++ b/compose.php
@@ -16,7 +16,7 @@
  * required setup
  */
 require_once( '../kernel/includes/setup_inc.php' );
-require_once( MESSAGES_PKG_PATH.'Messages.php' );
+require_once( MESSAGES_PKG_CLASS_PATH.'Messages.php' );
 
 if( !$gBitUser->isRegistered() ) {
 	$gBitSmarty->assign('msg', tra("You are not logged in"));
diff --git a/contact.php b/contact.php
index c2b4545..79082b4 100644
--- a/contact.php
+++ b/contact.php
@@ -16,7 +16,7 @@
  * required setup
  */
 require_once( '../kernel/includes/setup_inc.php' );
-require_once( MESSAGES_PKG_PATH.'Messages.php' );
+require_once( MESSAGES_PKG_CLASS_PATH.'Messages.php' );
 
 $gBitSystem->verifyFeature( 'messages_site_contact' );
 $messages = new Messages();
diff --git a/message_box.php b/message_box.php
index 87e57a5..5a84d2b 100644
--- a/message_box.php
+++ b/message_box.php
@@ -16,7 +16,7 @@
  * required setup
  */
 require_once( '../kernel/includes/setup_inc.php' );
-require_once( MESSAGES_PKG_PATH.'Messages.php' );
+require_once( MESSAGES_PKG_CLASS_PATH.'Messages.php' );
 
 if( !$gBitUser->isRegistered() ) {
 	$gBitSmarty->assign('msg', tra("You are not logged in"));
diff --git a/read.php b/read.php
index b91806e..fe68231 100644
--- a/read.php
+++ b/read.php
@@ -16,7 +16,7 @@
  * required setup
  */
 require_once( '../kernel/includes/setup_inc.php' );
-require_once( MESSAGES_PKG_PATH.'Messages.php' );
+require_once( MESSAGES_PKG_CLASS_PATH.'Messages.php' );
 
 if( !$gBitUser->isRegistered() ) {
 	$gBitSystem->fatalError( tra( "You are not logged in" ) );
-- 
cgit v1.3