diff options
| -rw-r--r-- | admin/admin_boards_inc.php | 2 | ||||
| -rw-r--r-- | admin/boardsync_cron.php | 2 | ||||
| -rw-r--r-- | admin/update_lists.php | 2 | ||||
| -rw-r--r-- | ajax.php | 2 | ||||
| -rw-r--r-- | assign.php | 2 | ||||
| -rw-r--r-- | bit_setup_inc.php | 6 | ||||
| -rw-r--r-- | boards_rss.php | 4 | ||||
| -rw-r--r-- | edit.php | 2 | ||||
| -rw-r--r-- | edit_topic.php | 2 | ||||
| -rw-r--r-- | includes/boards_comments_inc.php (renamed from boards_comments_inc.php) | 2 | ||||
| -rw-r--r-- | includes/classes/BitBoard.php (renamed from BitBoard.php) | 14 | ||||
| -rw-r--r-- | includes/classes/BitBoardPost.php (renamed from BitBoardPost.php) | 4 | ||||
| -rw-r--r-- | includes/classes/BitBoardTopic.php (renamed from BitBoardTopic.php) | 20 | ||||
| -rw-r--r-- | includes/edit_topic_inc.php (renamed from edit_topic_inc.php) | 0 | ||||
| -rw-r--r-- | includes/list_boards_inc.php (renamed from list_boards_inc.php) | 8 | ||||
| -rw-r--r-- | includes/lookup_inc.php (renamed from lookup_inc.php) | 6 | ||||
| -rw-r--r-- | includes/user_preferences_inc.php (renamed from user_preferences_inc.php) | 0 | ||||
| -rw-r--r-- | includes/view_board_inc.php (renamed from view_board_inc.php) | 12 | ||||
| -rw-r--r-- | includes/view_topic_inc.php (renamed from view_topic_inc.php) | 10 | ||||
| -rw-r--r-- | index.php | 6 | ||||
| -rw-r--r-- | mailing_list.php | 10 | ||||
| -rw-r--r-- | rss.php | 2 | ||||
| -rw-r--r-- | topic_move.php | 2 |
23 files changed, 63 insertions, 57 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/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' ); @@ -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)) { @@ -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 5bd5448..ad81d2a 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', @@ -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'] ) ){ @@ -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/BitBoard.php b/includes/classes/BitBoard.php index b39f7d3..495208d 100644 --- a/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 @@ -97,7 +97,7 @@ class BitBoard extends LibertyMime { return( count( $this->mInfo ) ); } - function lookupByMigrateBoard( $pMigrateBoardId ) { + public static function lookupByMigrateBoard( $pMigrateBoardId ) { global $gBitDb; $ret = NULL; if( BitBase::verifyId( $pMigrateBoardId ) ) { @@ -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; } @@ -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..6081b4c 100644 --- a/BitBoardPost.php +++ b/includes/classes/BitBoardPost.php @@ -14,8 +14,8 @@ /** * required setup */ -require_once( LIBERTY_PKG_PATH.'LibertyMime.php' ); -require_once( BOARDS_PKG_PATH.'BitBoardTopic.php' ); +require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' ); +require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' ); /** * @package boards diff --git a/BitBoardTopic.php b/includes/classes/BitBoardTopic.php index cae8ac4..1196da9 100644 --- a/BitBoardTopic.php +++ b/includes/classes/BitBoardTopic.php @@ -14,8 +14,8 @@ /** * required setup */ -require_once( LIBERTY_PKG_PATH.'LibertyComment.php' ); -require_once( BOARDS_PKG_PATH.'BitBoardPost.php' ); +require_once( LIBERTY_PKG_CLASS_PATH.'LibertyComment.php' ); +require_once( BOARDS_PKG_CLASS_PATH.'BitBoardPost.php' ); /** * This is used to uniquely identify the object @@ -499,18 +499,21 @@ class BitBoardTopic extends LibertyMime { return $ret; } - function isLocked($pThreadId=false) { + public static function isLocked( $pThreadId ) { global $gBitSystem; +/* + // remove mixed static / dynamic function invocation if (!$pThreadId) { $pThreadId = $this->mCommentContentId; } else { $pThreadId=intval($pThreadId); } - $ret = $gBitSystem->mDb->getOne("SELECT `is_locked` FROM `".BIT_DB_PREFIX."boards_topics` WHERE `parent_id` = ?", array( $pThreadId ) ); +*/ + $ret = $gBitSystem->mDb->getOne("SELECT `is_locked` FROM `".BIT_DB_PREFIX."boards_topics` WHERE `parent_id` = ?", array( (int)$pThreadId ) ); return !empty($ret); } - function isLockedMsg($parent_id) { + public static function isLockedMsg( $parent_id ) { // $parentComment = new LibertyComment(NULL,$parent_id); // $topicId = $parentComment->mInfo['thread_forward_sequence']; if (!empty($parent_id)) { @@ -519,16 +522,19 @@ class BitBoardTopic extends LibertyMime { return false; } - function isNotificationOn($pThreadId=false) { + public static function isNotificationOn( $pThreadId ) { global $gBitSystem, $gBitUser; if ($gBitSystem->isPackageActive('boards') && $gBitSystem->isFeatureActive('boards_thread_track')) { +/* + // remove mixed static / dynamic function invocation if (!$pThreadId) { $pThreadId = $this->mRootId; } if (is_numeric($pThreadId)) { $topicId = sprintf("%09d.",$pThreadId); } - return $gBitSystem->mDb->getOne("SELECT SUM(`notify`) FROM `".BIT_DB_PREFIX."boards_tracking` WHERE topic_id='$topicId'"); +*/ + return $gBitSystem->mDb->getOne("SELECT SUM(`notify`) FROM `".BIT_DB_PREFIX."boards_tracking` WHERE topic_id=?", array( (int)$topicId ) ); } return false; } 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 4ab89bf..cce8a67 100644 --- a/list_boards_inc.php +++ b/includes/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' ); @@ -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 9d04ffd..68a7937 100644 --- a/lookup_inc.php +++ b/includes/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/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 8f626e7..51cfb76 100644 --- a/view_board_inc.php +++ b/includes/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'] ); @@ -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 ); @@ -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(); @@ -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,10 +89,10 @@ $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_PATH.'BitBoardTopic.php' ); +require_once( BOARDS_PKG_CLASS_PATH.'BitBoardTopic.php' ); $threads = new BitBoardTopic( $gContent->mContentId ); diff --git a/view_topic_inc.php b/includes/view_topic_inc.php index 80bb38f..f279123 100644 --- a/view_topic_inc.php +++ b/includes/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'] ) ) { @@ -91,7 +91,7 @@ $thread->invokeServices( 'content_display_function', $displayHash ); $thread->readTopic(); $gBitSmarty->assignByRef( 'thread', $thread ); -$gBitSmarty->assign('topic_locked',$thread->isLocked()); +$gBitSmarty->assign( 'topic_locked', BitBoardTopic::isLocked( $thread->mCommentContentId ) ); // Get the thread of comments @@ -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']; @@ -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 8375619..90a1389 100644 --- a/mailing_list.php +++ b/mailing_list.php @@ -13,11 +13,11 @@ * 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_PATH.'lookup_inc.php' ); -require_once( UTIL_PKG_INC.'mailman_lib.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_INCLUDE_PATH.'lookup_inc.php' ); +require_once( UTIL_PKG_INCLUDE_PATH.'mailman_lib.php' ); // Is package installed and enabled $gBitSystem->verifyPackage( 'boards' ); @@ -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() ){ |
