move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

8 files changed, 8 insertions, 8 deletions

diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index d1b3edd..346bd46 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -90,7 +90,7 @@ if(defined('RSS_PKG_NAME')) {
 
 // ### Register content types
 $gBitInstaller->registerContentObjects( BOARDS_PKG_NAME, array( 
-	'BitBoard'=>BOARDS_PKG_PATH.'BitBoard.php',
+	'BitBoard'=>BOARDS_PKG_CLASS_PATH.'BitBoard.php',
 ));
 
 // Requirements
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index b7f3914..2b1ae03 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -16,7 +16,7 @@ INSERT INTO boards_map (board_content_id, topic_content_id) (SELECT content_id,
 
 /*
 require_once( '../../kernel/includes/setup_inc.php' );
-require_once( BOARDS_PKG_PATH.'admin/phpbb_migrate.php' );
+require_once( BOARDS_PKG_ADMIN_PATH.'phpbb_migrate.php' );
 
 migrate_phpbb();
  */
diff --git a/admin/upgrades/1.0.1.php b/admin/upgrades/1.0.1.php
index a17626e..154a51c 100644
--- a/admin/upgrades/1.0.1.php
+++ b/admin/upgrades/1.0.1.php
@@ -39,7 +39,7 @@ global $gBitSystem;
 
 $gBitSystem->verifyPackage( "boards" );
 
-require_once( BOARDS_PKG_PATH."BitBoardTopic.php");
+require_once( BOARDS_PKG_CLASS_PATH."BitBoardTopic.php");
 
 $oTopic = new BitBoardTopic();
 
diff --git a/includes/boards_comments_inc.php b/includes/boards_comments_inc.php
index 99dae43..573aef5 100644
--- a/includes/boards_comments_inc.php
+++ b/includes/boards_comments_inc.php
@@ -28,7 +28,7 @@ if (!function_exists("send_board_email")) {
 		if ( !empty( $boardSync ) ||
 			 $storeComment->getContentStatus() > 0 ) {
 
-			require_once( KERNEL_PKG_PATH.'BitMailer.php' );
+			require_once( KERNEL_PKG_CLASS_PATH.'BitMailer.php' );
 			$bitMailer = new BitMailer();
 			$email = $gContent->getPreference('boards_mailing_list').'@'.$gBitSystem->getConfig( 'boards_email_host', $gBitSystem->getConfig( 'kernel_server_name' ) );
 			if( $storeComment->getField( 'user_id' ) == ANONYMOUS_USER_ID ) {
diff --git a/includes/classes/BitBoard.php b/includes/classes/BitBoard.php
index 495208d..e756bca 100644
--- a/includes/classes/BitBoard.php
+++ b/includes/classes/BitBoard.php
@@ -791,7 +791,7 @@ function boards_content_store( $pContent, $pParamHash ) {
 			$p = null;
 			if ( ! empty( $pParamHash['pigoneholes'] ) ) {
 				foreach( $pParamHash['pigeonholes']['pigeonhole'] as $p_id ) {
-					require_once(PIGEONHOLES_PKG_PATH.'Pigeonholes.php');
+					require_once(PIGEONHOLES_PKG_CLASS_PATH.'Pigeonholes.php');
 					if (empty($p)) {
 						$p = new Pigeonholes();
 					}
diff --git a/includes/classes/BitBoardPost.php b/includes/classes/BitBoardPost.php
index 6081b4c..63bb3f4 100644
--- a/includes/classes/BitBoardPost.php
+++ b/includes/classes/BitBoardPost.php
@@ -432,7 +432,7 @@ class BitBoardPost extends LibertyComment {
 		$this->setMetaData($data);
 
 		if ($gBitSystem->isPackageActive('messages')) {
-			require_once(MESSAGES_PKG_PATH.'Messages.php');
+			require_once(MESSAGES_PKG_CLASS_PATH.'Messages.php');
 
 			$u = new BitUser($this->mInfo['user_id']);
 			$u->load();
diff --git a/includes/list_boards_inc.php b/includes/list_boards_inc.php
index 6e735fc..c269de1 100644
--- a/includes/list_boards_inc.php
+++ b/includes/list_boards_inc.php
@@ -28,7 +28,7 @@ $board_all_cids =array();
 
 // @TODO move pigeonholes to its own file library or something
 if($gBitSystem->isPackageActive('pigeonholes')) {
-	require_once(PIGEONHOLES_PKG_PATH.'Pigeonholes.php');
+	require_once(PIGEONHOLES_PKG_CLASS_PATH.'Pigeonholes.php');
 
 	$p = new Pigeonholes();
 	$s = new LibertyStructure();
diff --git a/modules/mod_recent_posts.php b/modules/mod_recent_posts.php
index d39a93d..b677497 100644
--- a/modules/mod_recent_posts.php
+++ b/modules/mod_recent_posts.php
@@ -14,7 +14,7 @@
  * required setup
  */
 
-include_once( BOARDS_PKG_PATH.'BitBoardPost.php' );
+include_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
 
 global $gBitSmarty, $gQueryUserId, $gBitSystem, $moduleParams;
 if( !empty( $moduleParams ) ) {