move classes to includes/classes and use PKG_CLASS/INCLUDE_PATH constants

11 files changed, 24 insertions, 24 deletions

diff --git a/admin/admin_boards_inc.php b/admin/admin_boards_inc.php
index 1eb39c0..e9c494e 100644
--- a/admin/admin_boards_inc.php
+++ b/admin/admin_boards_inc.php
@@ -10,7 +10,7 @@
 //	$gBitSmarty->assign('home_bitboard', $_REQUEST["homeBitBoards"]);
 //}
 
-require_once( BOARDS_PKG_PATH.'BitBoard.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' );
 
 $formBitBoardsLists = array(
 	'boards_thread_track' => array(
diff --git a/ajax.php b/ajax.php
index 4b8c28b..8da05f7 100644
--- a/ajax.php
+++ b/ajax.php
@@ -87,7 +87,7 @@ set_error_handler("ajax_nice_error");
 
 switch ($_GET['req']) {
 	case 10:
-		require_once( BOARDS_PKG_PATH.'BitBoardPost.php' );
+		require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
 		$comment = new BitBoardPost($_GET['comment_id']);
 		$comment->loadMetaData();
 		if (@$comment->verifyId($comment->mCommentId)) {
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 5bd5448..ca80a79 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -16,8 +16,8 @@ if( $gBitSystem->isPackageActive( 'boards' ) && $gBitUser->hasPermission( 'p_boa
 	);
 	$gBitSystem->registerAppMenu( $menuHash );
 
-	require_once( BOARDS_PKG_PATH.'BitBoard.php' );
-	require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' );
+	require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' );
+	require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
 
 	$registerArray = array(
 		'content_display_function' => 'boards_content_display',
diff --git a/BitBoard.php b/includes/classes/BitBoard.php
index 91f8352..1c62a35 100644
--- a/BitBoard.php
+++ b/includes/classes/BitBoard.php
@@ -619,7 +619,7 @@ WHERE map.`board_content_id`=lc.`content_id` AND ((s_lc.`user_id` < 0) AND (s.`i
 			$seq = explode( ".",  $pParamHash['comment']['thread_forward_sequence'] );
 			$topicRootId = 	(int)$seq[0];
 			if( BitBase::verifyId( $topicRootId )) {
-				require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' );
+				require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
 				$hash = array( 'topic_id' => $topicRootId );
 				$ret = BitBoardTopic::getDisplayUrlFromHash( $hash );
 				// we're out of here with our topic url
@@ -768,7 +768,7 @@ function boards_content_edit ( $pContent, $pParamHash ) {
 			$boardInfo['board_content_id'] = $pParamHash['linked_board_cid'];
 			$gBitSmarty->assign( 'boardInfo', $boardInfo );
 		}
-		require_once( BOARDS_PKG_PATH.'BitBoard.php' );
+		require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' );
 		$board = new BitBoard();
 		$boardList = $board->getBoardSelectList( TRUE );
 		$gBitSmarty->assign( 'boardList', $boardList );
@@ -779,7 +779,7 @@ function boards_content_edit ( $pContent, $pParamHash ) {
 function boards_content_store( $pContent, $pParamHash ) {
 	global $gBitDb, $gBitSmarty, $gBitSystem;
 
-	require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' );
+	require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
 	// do not allow unassigning topics. the UI should prevent this, but just to make sure...
 	if( $pContent->isValid() && !$pContent->isContentType( BITBOARDTOPIC_CONTENT_TYPE_GUID ) && !$pContent->isContentType( BITBOARD_CONTENT_TYPE_GUID ) ) {
 		// wipe out all previous assignments for good measure. Not the sanest thing to do, but edits are infrequent - at least for now
diff --git a/BitBoardPost.php b/includes/classes/BitBoardPost.php
index 65d0743..1043897 100644
--- a/BitBoardPost.php
+++ b/includes/classes/BitBoardPost.php
@@ -15,7 +15,7 @@
  * required setup
  */
 require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
-require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
 
 /**
  * @package boards
diff --git a/BitBoardTopic.php b/includes/classes/BitBoardTopic.php
index 2000583..1b1235d 100644
--- a/BitBoardTopic.php
+++ b/includes/classes/BitBoardTopic.php
@@ -15,7 +15,7 @@
  * required setup
  */
 require_once( LIBERTY_PKG_PATH.'LibertyComment.php' );
-require_once( BOARDS_PKG_PATH.'BitBoardPost.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
 
 /**
 * This is used to uniquely identify the object
diff --git a/list_boards_inc.php b/list_boards_inc.php
index 4ab89bf..8d2c1e2 100644
--- a/list_boards_inc.php
+++ b/list_boards_inc.php
@@ -12,9 +12,9 @@
  * required setup
  */
 require_once("../kernel/setup_inc.php");
-require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' );
-require_once( BOARDS_PKG_PATH.'BitBoardPost.php' );
-require_once( BOARDS_PKG_PATH.'BitBoard.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' );
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'boards' );
diff --git a/lookup_inc.php b/lookup_inc.php
index 9d04ffd..68a7937 100644
--- a/lookup_inc.php
+++ b/lookup_inc.php
@@ -7,9 +7,9 @@
 /**
  * required setup
  */
-require_once( BOARDS_PKG_PATH.'BitBoardTopic.php');
-require_once( BOARDS_PKG_PATH.'BitBoardPost.php' );
-require_once( BOARDS_PKG_PATH.'BitBoard.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php');
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' );
 // if t supplied, use that
 if( @BitBase::verifyId( $_REQUEST['t'] ) ) {
 	$gContent = new BitBoardTopic( $_REQUEST['t'] );
diff --git a/mailing_list.php b/mailing_list.php
index 8375619..cee68b4 100644
--- a/mailing_list.php
+++ b/mailing_list.php
@@ -13,9 +13,9 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' );
-require_once( BOARDS_PKG_PATH.'BitBoardPost.php' );
-require_once( BOARDS_PKG_PATH.'BitBoard.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' );
 require_once( BOARDS_PKG_PATH.'lookup_inc.php' );
 require_once( UTIL_PKG_INC.'mailman_lib.php' );
 
diff --git a/view_board_inc.php b/view_board_inc.php
index 8f626e7..92eaa57 100644
--- a/view_board_inc.php
+++ b/view_board_inc.php
@@ -18,7 +18,7 @@ $gBitSystem->verifyPackage( 'boards' );
 
 // if we're getting a migrate id then lets move on right away
 if ( @BitBase::verifyId( $_REQUEST['migrate_board_id'] ) ) {
-	require_once( BOARDS_PKG_PATH.'BitBoard.php' );
+	require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' );
 
 	if( $_REQUEST['b'] = BitBoard::lookupByMigrateBoard( $_REQUEST['migrate_board_id'] ) ) {
 		bit_redirect( BOARDS_PKG_URL.'index.php?b='. $_REQUEST['b'] );
@@ -43,7 +43,7 @@ if (!empty($_REQUEST['action'])) {
 	$gBitUser->verifyTicket();
 
 	// Load up the comment as a board post
-	require_once( BOARDS_PKG_PATH.'BitBoardPost.php' );
+	require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
 	$comment = new BitBoardPost($_REQUEST['comment_id']);
 	$comment->loadComment();
 
@@ -92,7 +92,7 @@ $comments_return_url=  BOARDS_PKG_URL."index.php?b=".urlencode($gContent->mBitBo
 require_once( BOARDS_PKG_PATH.'boards_comments_inc.php' );
 
 // get the topics for this board
-require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
 
 $threads = new BitBoardTopic( $gContent->mContentId );
 
diff --git a/view_topic_inc.php b/view_topic_inc.php
index 1368d94..e285975 100644
--- a/view_topic_inc.php
+++ b/view_topic_inc.php
@@ -10,9 +10,9 @@
 require_once( '../kernel/setup_inc.php' );
 
 // we need all three
-require_once( BOARDS_PKG_PATH.'BitBoard.php' );
-require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' );
-require_once( BOARDS_PKG_PATH.'BitBoardPost.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoard.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
+require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
 
 // if we're getting a migrate id then lets move on right away
 if( @BitBase::verifyId( $_REQUEST['migrate_topic_id'] ) ) {