move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

21 files changed, 26 insertions, 26 deletions

diff --git a/admin/boardsync_cron.php b/admin/boardsync_cron.php
index c35f3ba..f3672cc 100644
--- a/admin/boardsync_cron.php
+++ b/admin/boardsync_cron.php
@@ -6,7 +6,7 @@ $gShellScript = TRUE;
 
 require_once( '../../kernel/setup_inc.php' );
 
-require_once( BOARDS_PKG_PATH.'admin/boardsync_inc.php');
+require_once( BOARDS_PKG_INCLUDE_PATH.'admin/boardsync_inc.php');
 
 print "Running: ".date(DATE_RFC822)."\r\n";
 
diff --git a/admin/update_lists.php b/admin/update_lists.php
index ce6217d..669f2d0 100644
--- a/admin/update_lists.php
+++ b/admin/update_lists.php
@@ -12,7 +12,7 @@
  */
 
 require_once( '../../kernel/setup_inc.php' );
-require_once( UTIL_PKG_INC.'mailman_lib.php' );
+require_once( UTIL_PKG_INCLUDE_PATH.'mailman_lib.php' );
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'boards' );
diff --git a/assign.php b/assign.php
index 3b7c350..d112b49 100644
--- a/assign.php
+++ b/assign.php
@@ -16,7 +16,7 @@ require_once( '../kernel/setup_inc.php' );
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'boards' );
 
-require_once(BOARDS_PKG_PATH.'lookup_inc.php' );
+require_once(BOARDS_PKG_INCLUDE_PATH.'lookup_inc.php' );
 
 // verify minimal edit permission level
 $gContent->verifyUpdatePermission();
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index ca80a79..ad81d2a 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -74,7 +74,7 @@ if( $gBitSystem->isPackageActive( 'boards' ) && $gBitUser->hasPermission( 'p_boa
 					$approved = $board->getPreference('boards_mailing_list_password');
 					// Possible race. Did we beat the cron?
 					if( empty($code) ) {
-						require_once(BOARDS_PKG_PATH.'admin/boardsync_inc.php');
+						require_once(BOARDS_PKG_INCLUDE_PATH.'admin/boardsync_inc.php');
 						// Try to pick up the message!
 						board_sync_run(TRUE);
 					}
diff --git a/boards_rss.php b/boards_rss.php
index a266cc1..9494a6f 100644
--- a/boards_rss.php
+++ b/boards_rss.php
@@ -13,10 +13,10 @@ require_once( "../kernel/setup_inc.php" );
 $gBitSystem->verifyPackage( 'boards' );
 $gBitSystem->verifyPackage( 'rss' );
 
-require_once( RSS_PKG_PATH."rss_inc.php" );
+require_once( RSS_PKG_INCLUDE_PATH.'rss_inc.php' );
 
 // Load up the board or topic
-require_once( BOARDS_PKG_PATH.'lookup_inc.php' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'lookup_inc.php' );
 
 // access check
 if( !empty( $_REQUEST['t'] ) || !empty($_REQUEST['b'] ) ){
diff --git a/edit.php b/edit.php
index 14c202c..f2a6936 100644
--- a/edit.php
+++ b/edit.php
@@ -20,7 +20,7 @@ if( isset( $_REQUEST['bitboard']['board_id'] ) ) {
 	$_REQUEST['b'] = $_REQUEST['bitboard']['board_id'];
 }
 
-require_once(BOARDS_PKG_PATH.'lookup_inc.php' );
+require_once(BOARDS_PKG_INCLUDE_PATH.'lookup_inc.php' );
 
 //must be owner or admin to edit an existing board
 if( $gContent->isValid() ) {
diff --git a/edit_topic.php b/edit_topic.php
index 15ba29b..381879e 100644
--- a/edit_topic.php
+++ b/edit_topic.php
@@ -17,7 +17,7 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPackage( 'boards' );
 
 // Look up Topic (lookup_inc is universal, gContent == BitBoardTopic)
-require_once( BOARDS_PKG_PATH.'lookup_inc.php' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'lookup_inc.php' );
 
 // Make sure topic exists since we only run through here for existing topics. New topics are created via comment system.
 if( !$gContent->isValid() ){
diff --git a/boards_comments_inc.php b/includes/boards_comments_inc.php
index 7978ab2..99dae43 100644
--- a/boards_comments_inc.php
+++ b/includes/boards_comments_inc.php
@@ -13,7 +13,7 @@
 /**
  * Initialization
  */
-require_once (LIBERTY_PKG_PATH.'comments_inc.php');
+require_once (LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php');
 
 if (!function_exists("send_board_email")) {
 	function send_board_email($storeComment) {
diff --git a/includes/classes/BitBoard.php b/includes/classes/BitBoard.php
index 1c62a35..f21b8d5 100644
--- a/includes/classes/BitBoard.php
+++ b/includes/classes/BitBoard.php
@@ -14,7 +14,7 @@
 /**
  * required setup
  */
-require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' );
 
 /**
 * This is used to uniquely identify the object
@@ -139,7 +139,7 @@ class BitBoard extends LibertyMime {
 				$result = $this->mDb->associateInsert( BIT_DB_PREFIX."boards_map",array('board_content_id'=>$pParamHash['board_store']['content_id'],'topic_content_id'=>$pParamHash['board_store']['content_id']));
 				if( !empty( $pParamHash['boards_mailing_list'] ) ) {
 					global $gBitSystem, $gBitUser;
-					require_once( UTIL_PKG_INC.'mailman_lib.php' );
+					require_once( UTIL_PKG_INCLUDE_PATH.'mailman_lib.php' );
 					if( $gBitSystem->getConfig( 'boards_sync_mail_server' ) ) {
 						if( !($error = mailman_newlist( array( 'listname' => $pParamHash['boards_mailing_list'], 'listhost' => $gBitSystem->getConfig( 'boards_email_host', $gBitSystem->getConfig( 'kernel_server_name' ) ), 'admin-password'=>$pParamHash['boards_mailing_list_password'], 'listadmin-addr'=>$gBitUser->getField( 'email' ) ) )) ) {
 							$this->storePreference( 'boards_mailing_list', !empty( $pParamHash['boards_mailing_list'] ) ? $pParamHash['boards_mailing_list'] : NULL );
@@ -283,7 +283,7 @@ class BitBoard extends LibertyMime {
 			$result = $this->mDb->query( $query, array( $this->mContentId ) );
 			if( LibertyMime::expunge() ) {
 				if( $mailingList ) {
-					require_once( UTIL_PKG_INC.'mailman_lib.php' );
+					require_once( UTIL_PKG_INCLUDE_PATH.'mailman_lib.php' );
 					if( $error = mailman_rmlist( $mailingList ) ) {
 						$this->mErrors['mailing_list'] = $error;
 					}
diff --git a/includes/classes/BitBoardPost.php b/includes/classes/BitBoardPost.php
index 1043897..6081b4c 100644
--- a/includes/classes/BitBoardPost.php
+++ b/includes/classes/BitBoardPost.php
@@ -14,7 +14,7 @@
 /**
  * required setup
  */
-require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' );
 require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
 
 /**
diff --git a/includes/classes/BitBoardTopic.php b/includes/classes/BitBoardTopic.php
index 1b1235d..1196da9 100644
--- a/includes/classes/BitBoardTopic.php
+++ b/includes/classes/BitBoardTopic.php
@@ -14,7 +14,7 @@
 /**
  * required setup
  */
-require_once( LIBERTY_PKG_PATH.'LibertyComment.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyComment.php' );
 require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' );
 
 /**
diff --git a/edit_topic_inc.php b/includes/edit_topic_inc.php
index c1cbbf2..c1cbbf2 100644
--- a/edit_topic_inc.php
+++ b/includes/edit_topic_inc.php
diff --git a/list_boards_inc.php b/includes/list_boards_inc.php
index 8d2c1e2..cce8a67 100644
--- a/list_boards_inc.php
+++ b/includes/list_boards_inc.php
@@ -91,7 +91,7 @@ $board = new BitBoard();
 $ret['members'] = $board->getList($listHash);
 if (count($ret['members']) == 1) {
 	$_REQUEST['b'] = $ret['members'][0]['board_id'];
-	require( BOARDS_PKG_PATH.'view_board_inc.php' );
+	require( BOARDS_PKG_INCLUDE_PATH.'view_board_inc.php' );
 	die;
 } elseif (count($ret['members']) > 0) {
 	$ns[] = $ret;
diff --git a/lookup_inc.php b/includes/lookup_inc.php
index 68a7937..68a7937 100644
--- a/lookup_inc.php
+++ b/includes/lookup_inc.php
diff --git a/user_preferences_inc.php b/includes/user_preferences_inc.php
index 201acd9..201acd9 100644
--- a/user_preferences_inc.php
+++ b/includes/user_preferences_inc.php
diff --git a/view_board_inc.php b/includes/view_board_inc.php
index 92eaa57..51cfb76 100644
--- a/view_board_inc.php
+++ b/includes/view_board_inc.php
@@ -28,7 +28,7 @@ if ( @BitBase::verifyId( $_REQUEST['migrate_board_id'] ) ) {
 $_REQUEST['board_id'] = BitBase::getParameter( $_REQUEST, 'b' );
 
 // Load up the board
-require_once( BOARDS_PKG_PATH.'lookup_inc.php' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'lookup_inc.php' );
 
 if( !$gContent->isValid() ) {
 	$gBitSystem->fatalError( "The board you requested could not be found. <a href='".BOARDS_PKG_URL."'>View all boards</a>", NULL, NULL, HttpStatusCodes::HTTP_GONE );
@@ -75,7 +75,7 @@ if (!empty($_REQUEST['action'])) {
  *
  * @TODO perhaps move this into the action process above
  */
-require_once( BOARDS_PKG_PATH.'edit_topic_inc.php' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'edit_topic_inc.php' );
 
 
 // Ok finally we can get on with viewing our board
@@ -89,7 +89,7 @@ $commentsParentId=$gContent->mContentId;
 $comments_return_url=  BOARDS_PKG_URL."index.php?b=".urlencode($gContent->mBitBoardId);
 
 // @TODO not clear why we load up comments and topics after this when its likely to get both. If someone figures it out please clarify.
-require_once( BOARDS_PKG_PATH.'boards_comments_inc.php' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'boards_comments_inc.php' );
 
 // get the topics for this board
 require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' );
diff --git a/view_topic_inc.php b/includes/view_topic_inc.php
index e285975..f279123 100644
--- a/view_topic_inc.php
+++ b/includes/view_topic_inc.php
@@ -106,7 +106,7 @@ if( empty( $_REQUEST["comments_style"] ) ) {
 	$_REQUEST["comments_style"] = "flat";
 }
 
-require_once( BOARDS_PKG_PATH.'boards_comments_inc.php' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'boards_comments_inc.php' );
 
 if( $gBitUser->isRegistered() ) {
 	$postComment['registration_date']=$gBitUser->mInfo['registration_date'];
diff --git a/index.php b/index.php
index a6895d3..0059cd5 100644
--- a/index.php
+++ b/index.php
@@ -8,9 +8,9 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPackage( 'boards' );
 
 if( !empty( $_REQUEST['t'] ) || !empty( $_REQUEST['migrate_topic_id'] ) || !empty( $_REQUEST['migrate_post_id'] ) ) {
-	require( BOARDS_PKG_PATH.'view_topic_inc.php' );
+	require( BOARDS_PKG_INCLUDE_PATH.'view_topic_inc.php' );
 } elseif (!empty($_REQUEST['b']) || !empty( $_REQUEST['migrate_board_id'] ) ) {
-	require( BOARDS_PKG_PATH.'view_board_inc.php' );
+	require( BOARDS_PKG_INCLUDE_PATH.'view_board_inc.php' );
 } else {
-	require( BOARDS_PKG_PATH.'list_boards_inc.php' );
+	require( BOARDS_PKG_INCLUDE_PATH.'list_boards_inc.php' );
 }
diff --git a/mailing_list.php b/mailing_list.php
index cee68b4..90a1389 100644
--- a/mailing_list.php
+++ b/mailing_list.php
@@ -16,8 +16,8 @@ require_once( '../kernel/setup_inc.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' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'lookup_inc.php' );
+require_once( UTIL_PKG_INCLUDE_PATH.'mailman_lib.php' );
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'boards' );
diff --git a/rss.php b/rss.php
index 63c076a..b04b478 100644
--- a/rss.php
+++ b/rss.php
@@ -29,7 +29,7 @@ $feedFormat = array(
 $gBitSmarty->assign( "feedFormat", $feedFormat );
 
 // Load up the board or topic
-require_once( BOARDS_PKG_PATH.'lookup_inc.php' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'lookup_inc.php' );
 
 if( !empty( $_REQUEST['get_feed'] ) ) {
 	$feedlink['url'] = BOARDS_PKG_URL.'boards_rss.php?';
diff --git a/topic_move.php b/topic_move.php
index b924eb7..0dc6aed 100644
--- a/topic_move.php
+++ b/topic_move.php
@@ -13,7 +13,7 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPackage( 'boards' );
 
 // Look up Topic (lookup_inc is universal, gContent == BitBoardTopic)
-require_once( BOARDS_PKG_PATH.'lookup_inc.php' );
+require_once( BOARDS_PKG_INCLUDE_PATH.'lookup_inc.php' );
 
 // Make sure topic exists since we only run through here for existing topics. New topics are created via comment system.
 if( !$gContent->isValid() ){