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

33 files changed, 55 insertions, 56 deletions

diff --git a/admin/admin_blogs_inc.php b/admin/admin_blogs_inc.php
index 434816f..0a5f0dc 100644
--- a/admin/admin_blogs_inc.php
+++ b/admin/admin_blogs_inc.php
@@ -2,7 +2,7 @@
 // $Header$
 
 // get a list of blogs for the selection of the home blog
-require_once( BLOGS_PKG_PATH.'BitBlog.php' );
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 $blog = new BitBlog();
 $listHash['sort_mode'] = 'created_desc';
 $blogList = $blog->getList( $listHash );
diff --git a/admin/pump_blogs_inc.php b/admin/pump_blogs_inc.php
index 462d282..caf0ff6 100644
--- a/admin/pump_blogs_inc.php
+++ b/admin/pump_blogs_inc.php
@@ -9,7 +9,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 $pageHash = array(
 		'fSavePage' => TRUE,
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 8625d5b..dd14aba 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -122,8 +122,8 @@ if(defined('RSS_PKG_NAME')) {
 
 // ### Register content types
 $gBitInstaller->registerContentObjects( BLOGS_PKG_NAME, array( 
-	'BitBlog'=>BLOGS_PKG_PATH.'BitBlog.php',
-	'BitBlogPost'=>BLOGS_PKG_PATH.'BitBlogPost.php'
+	'BitBlog'=>BLOGS_PKG_CLASS_PATH.'BitBlog.php',
+	'BitBlogPost'=>BLOGS_PKG_CLASS_PATH.'BitBlogPost.php'
 ));
 
 // Requirements
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index 3edf798..1eaa2c3 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -2,7 +2,7 @@
 
 global $gBitSystem, $gUpgradeFrom, $gUpgradeTo, $gBitDb;
 
-require_once( BLOGS_PKG_PATH.'BitBlogPost.php' );
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' );
 
 $upgrades = array(
 
diff --git a/admin/wp-migrate.php b/admin/wp-migrate.php
index 8389d72..7bd1a9a 100644
--- a/admin/wp-migrate.php
+++ b/admin/wp-migrate.php
@@ -20,8 +20,8 @@
 require_once( '../../kernel/setup_inc.php' );
 
 //require_once(USERS_PKG_PATH.'RoleUser.php');
-require_once(BLOGS_PKG_PATH.'BitBlog.php');
-require_once(BLOGS_PKG_PATH.'BitBlogPost.php');
+require_once(BLOGS_PKG_CLASS_PATH.'BitBlog.php');
+require_once(BLOGS_PKG_CLASS_PATH.'BitBlogPost.php');
 require_once(LIBERTY_PKG_PATH.'LibertyComment.php');
 
 $gBitSystem->verifyPermission( 'p_admin' );
@@ -353,4 +353,4 @@ function migrate_wp_comments() {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 29fa0de..ce421b9 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -37,6 +37,4 @@ if( $gBitSystem->isPackageActive( 'blogs' ) ) {
 
 	$gBitSystem->registerNotifyEvent( array( "blog_post" => tra("An entry is posted to a blog") ) );
 
-	require_once( 'BitBlog.php' );
 }
-?>
diff --git a/blogs_rss.php b/blogs_rss.php
index 6a7fd44..a70541e 100644
--- a/blogs_rss.php
+++ b/blogs_rss.php
@@ -14,7 +14,7 @@ $gBitSystem->verifyPackage( 'rss' );
 $gBitSystem->verifyPackage( 'blogs' );
 $gBitSystem->verifyFeature( 'blogs_rss' );
 
-require_once( BLOGS_PKG_PATH.'BitBlogPost.php' );
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' );
 require_once( RSS_PKG_PATH."rss_inc.php" );
 
 // default feed info
diff --git a/crosspost.php b/crosspost.php
index 5ef2186..f8d9235 100644
--- a/crosspost.php
+++ b/crosspost.php
@@ -17,8 +17,8 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPackage( 'blogs' );
 $gBitSystem->verifyPermission( 'p_blogs_admin' );
 
-require_once( BLOGS_PKG_PATH.'lookup_post_inc.php' );
-require_once( BLOGS_PKG_PATH.'BitBlog.php');
+require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' );
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php');
 $gBlog = new BitBlog();
 
 $gBitUser->verifyTicket();
diff --git a/edit.php b/edit.php
index 2b2d6ea..234c3dc 100644
--- a/edit.php
+++ b/edit.php
@@ -13,11 +13,11 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 $gBitSystem->verifyPackage( 'blogs' );
 
-require_once( BLOGS_PKG_PATH.'lookup_blog_inc.php');
+require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php');
 
 // Now check permissions to access this page
 if( $gContent->isValid() ) {
diff --git a/BitBlog.php b/includes/classes/BitBlog.php
index 50d7c77..87a5708 100644
--- a/BitBlog.php
+++ b/includes/classes/BitBlog.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-require_once( BLOGS_PKG_PATH.'BitBlogPost.php');
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php');
 require_once( LIBERTY_PKG_PATH.'LibertyComment.php');
 
 define( 'BITBLOG_CONTENT_TYPE_GUID', 'bitblog' );
@@ -53,7 +53,7 @@ class BitBlog extends LibertyMime {
 		global $gBitSystem;
 		$ret = NULL;
 
-		if ( BitBase::verifyId( $pParamHash['blog_id'] ) ) {
+		if ( BitBase::verifyIdParameter( $pParamHash, 'blog_id' ) ) {
 			if( $gBitSystem->isFeatureActive( 'pretty_urls_extended' ) ) {
 				$ret = BLOGS_PKG_URL.'view/'.$pParamHash['blog_id'];
 			} elseif( $gBitSystem->isFeatureActive( 'pretty_urls' ) ) {
diff --git a/BitBlogPost.php b/includes/classes/BitBlogPost.php
index 531e23c..a79adbc 100644
--- a/BitBlogPost.php
+++ b/includes/classes/BitBlogPost.php
@@ -22,7 +22,7 @@
  */
 require_once( LIBERTY_PKG_PATH.'LibertyComment.php');
 require_once( LIBERTY_PKG_PATH.'LibertyMime.php');
-require_once( BLOGS_PKG_PATH.'BitBlog.php');
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php');
 
 define( 'BITBLOGPOST_CONTENT_TYPE_GUID', 'bitblogpost' );
 
@@ -92,9 +92,11 @@ class BitBlogPost extends LibertyMime {
 				$this->mInfo['url'] = BitBlogPost::getDisplayUrlFromHash( $this->mInfo );
 				$this->mInfo['display_url'] = BitBlogPost::getDisplayUrlFromHash( $this->mInfo );
 				foreach( array( 'avatar', 'image' ) as $img ) {
-					$this->mInfo[$img] = liberty_fetch_thumbnails( array(
-						'source_file' => $this->getSourceFile( array( 'user_id'=>$this->getField( 'user_id' ), 'package'=>liberty_mime_get_storage_sub_dir_name( array( 'mime_type' => $this->getField( $img.'_mime_type' ), 'name' =>  $this->getField( $img.'_file_name' ) ) ), 'file_name' => basename( $this->mInfo[$img.'_file_name'] ), 'sub_dir' =>  $this->getField( $img.'_attachment_id' ) ) )
-					));
+					if( !empty( $this->mInfo[$img.'_file_name'] ) ) {
+						$this->mInfo[$img] = liberty_fetch_thumbnails( array(
+							'source_file' => $this->getSourceFile( array( 'user_id'=>$this->getField( 'user_id' ), 'package'=>liberty_mime_get_storage_sub_dir_name( array( 'mime_type' => $this->getField( $img.'_mime_type' ), 'name' =>  $this->getField( $img.'_file_name' ) ) ), 'file_name' => basename( $this->mInfo[$img.'_file_name'] ), 'sub_dir' =>  $this->getField( $img.'_attachment_id' ) ) )
+						));
+					}
 				}
 
 				$this->mInfo['raw'] = $this->mInfo['data'];
@@ -187,7 +189,7 @@ class BitBlogPost extends LibertyMime {
 
 			if( $ret = $this->mDb->getAssoc( $query, $bindVars ) ) {
 				foreach( array_keys( $ret ) as $blogContentId ) {
-					$ret[$blogContentId]['blog_url'] = BitBlog::getDisplayUrlFromHash( $ret[$blogContentId]['blog_id'] );
+					$ret[$blogContentId]['blog_url'] = BitBlog::getDisplayUrlFromHash( $ret[$blogContentId] );
 				}
 			}
 		} else {
@@ -710,7 +712,7 @@ class BitBlogPost extends LibertyMime {
     * @return the fully specified path to file to be included
     */
 	function getRenderFile() {
-		return( BLOGS_PKG_PATH.'display_bitblogpost_inc.php' );
+		return( BLOGS_PKG_INCLUDE_PATH.'display_bitblogpost_inc.php' );
 	}
 
 	function sendTrackbacks( $pTrackbacks ) {
@@ -950,7 +952,6 @@ class BitBlogPost extends LibertyMime {
 			$res['no_fatal'] = TRUE;
 			$accessError = $this->invokeServices( 'content_verify_access', $res, FALSE );
 			if( empty( $accessError ) ) {
-
 				foreach( array( 'avatar', 'image' ) as $img ) {
 					$res[$img] = liberty_fetch_thumbnails( array(
 						'source_file' => liberty_mime_get_source_file( array( 'user_id'=>$res['user_id'], 'package'=>liberty_mime_get_storage_sub_dir_name( array( 'mime_type' => $res[$img.'_mime_type'], 'name'=>$res[$img.'_file_name'] ) ), 'file_name'=>basename( $res[$img.'_file_name'] ), 'sub_dir'=>$res[$img.'_attachment_id'] ) )
@@ -961,7 +962,7 @@ class BitBlogPost extends LibertyMime {
 				$res['post_url'] = BitBlogPost::getDisplayUrlFromHash( $res );
 				$res['display_url'] = $res['post_url'];
 				$res['display_link'] = $this->getDisplayLink( $res['title'], $res );
-				$res['blogs'] = $this->getBlogMemberships( $res['content_id'] );
+				$res['blogs'] = $this->getBlogMemberships( $res );
 
 				// trackbacks
 				if($res['trackbacks_from']!=null)
diff --git a/display_bitblog_inc.php b/includes/display_bitblog_inc.php
index 874a875..19c70eb 100644
--- a/display_bitblog_inc.php
+++ b/includes/display_bitblog_inc.php
@@ -14,8 +14,8 @@
  */
 $gBitSystem->verifyPackage( 'blogs' );
 
-require_once( BLOGS_PKG_PATH.'BitBlog.php' );
-require_once( BLOGS_PKG_PATH.'lookup_blog_inc.php');
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
+require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php');
 
 $displayHash = array( 'perm_name' => $gContent->mViewContentPerm );
 $gContent->invokeServices( 'content_display_function', $displayHash );
diff --git a/display_bitblogpost_inc.php b/includes/display_bitblogpost_inc.php
index c44b094..7dd7859 100644
--- a/display_bitblogpost_inc.php
+++ b/includes/display_bitblogpost_inc.php
@@ -7,7 +7,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 if (!isset($gContent->mPostId)) {
 	$parts = parse_url($_SERVER['REQUEST_URI']);
diff --git a/lookup_blog_inc.php b/includes/lookup_blog_inc.php
index a10059e..bf1d41f 100644
--- a/lookup_blog_inc.php
+++ b/includes/lookup_blog_inc.php
@@ -8,7 +8,7 @@
  * required setup
  */
 global $gContent;
-require_once( BLOGS_PKG_PATH.'BitBlog.php' );
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 require_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
 
 // if we already have a gContent, we assume someone else created it for us, and has properly loaded everything up.
diff --git a/lookup_post_inc.php b/includes/lookup_post_inc.php
index 1019995..12d52ce 100644
--- a/lookup_post_inc.php
+++ b/includes/lookup_post_inc.php
@@ -8,7 +8,7 @@
  * Initial Setup
  */
 global $gContent; 
-require_once( BLOGS_PKG_PATH.'BitBlogPost.php');
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php');
 require_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
 
 if( empty( $gContent ) || !is_object( $gContent ) || !$gContent->isValid() ) {
diff --git a/index.php b/index.php
index 3cf4274..09904f7 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,7 @@ if( !@BitBase::verifyId( $_REQUEST['blog_id'] ) && $gBitSystem->isFeatureActive(
 
 // if we have a blog_id, we display the correct blog - otherwise we simply display recent posts
 if( @BitBase::verifyId( $_REQUEST['blog_id'] )) {
-	include_once( BLOGS_PKG_PATH.'display_bitblog_inc.php' );
+	include_once( BLOGS_PKG_INCLUDE_PATH.'display_bitblog_inc.php' );
 } else {
 	include_once( BLOGS_PKG_PATH.'recent_posts.php' );
 }
diff --git a/liberty_plugins/data.blog.php b/liberty_plugins/data.blog.php
index 261b1c6..cc5535d 100644
--- a/liberty_plugins/data.blog.php
+++ b/liberty_plugins/data.blog.php
@@ -87,7 +87,7 @@ function data_blog($data, $params) { // No change in the parameters with Clyde
 	// The next 2 lines allow access to the $pluginParams given above and may be removed when no longer needed
 		$pluginParams = $gLibertySystem->mPlugins[PLUGIN_GUID_DATABLOG];
 		
-		require_once( BLOGS_PKG_PATH.'BitBlog.php');
+		require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php');
 		require_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
 		
 		$module_params = $params;
diff --git a/list_blogs.php b/list_blogs.php
index 7571301..f2a354a 100644
--- a/list_blogs.php
+++ b/list_blogs.php
@@ -13,9 +13,9 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( BLOGS_PKG_PATH.'lookup_blog_inc.php');
+require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php');
 
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 $gBitSystem->verifyPackage( 'blogs' );
 
diff --git a/modules/lastblogposts/mod_last_blog_posts.php b/modules/lastblogposts/mod_last_blog_posts.php
index 845991d..e9c2521 100644
--- a/modules/lastblogposts/mod_last_blog_posts.php
+++ b/modules/lastblogposts/mod_last_blog_posts.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlogPost.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' );
 
 // moduleParams contains lots of goodies: extract for easier handling
 extract( $moduleParams );
diff --git a/modules/mod_blog_roll.php b/modules/mod_blog_roll.php
index 691d38c..f508aa0 100644
--- a/modules/mod_blog_roll.php
+++ b/modules/mod_blog_roll.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 global $gQueryUserId, $module_rows, $moduleParams;
 
diff --git a/modules/mod_last_blog_posts.php b/modules/mod_last_blog_posts.php
index 5cd1b39..14c6e10 100644
--- a/modules/mod_last_blog_posts.php
+++ b/modules/mod_last_blog_posts.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlogPost.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' );
 
 // moduleParams contains lots of goodies: extract for easier handling
 extract( $moduleParams );
diff --git a/modules/mod_last_created_blogs.php b/modules/mod_last_created_blogs.php
index 881aa38..d4e873a 100644
--- a/modules/mod_last_created_blogs.php
+++ b/modules/mod_last_created_blogs.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 global $gQueryUserId, $module_rows, $module_params;
 
diff --git a/modules/mod_last_modified_blogs.php b/modules/mod_last_modified_blogs.php
index 9410044..9aba738 100644
--- a/modules/mod_last_modified_blogs.php
+++ b/modules/mod_last_modified_blogs.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 global $gQueryUserId, $moduleParams;
 //$params = $moduleParams['module_params'];
diff --git a/modules/mod_top_active_blogs.php b/modules/mod_top_active_blogs.php
index 3c87f8c..e9de007 100644
--- a/modules/mod_top_active_blogs.php
+++ b/modules/mod_top_active_blogs.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 global $gQueryUserId, $gBitThemes, $module_rows, $module_params;
 
diff --git a/modules/mod_top_visited_blogs.php b/modules/mod_top_visited_blogs.php
index b2032b8..88ed8c2 100644
--- a/modules/mod_top_visited_blogs.php
+++ b/modules/mod_top_visited_blogs.php
@@ -8,7 +8,7 @@
 /**
  * required setup
  */
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 global $gBitThemes;
 
diff --git a/post.php b/post.php
index 6657d66..be67a3f 100644
--- a/post.php
+++ b/post.php
@@ -18,8 +18,8 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPackage( 'blogs' );
 
 
-require_once( BLOGS_PKG_PATH.'lookup_post_inc.php' );
-require_once( BLOGS_PKG_PATH.'BitBlog.php');
+require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' );
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php');
 
 if ( isset( $_REQUEST["blog_id"] ) ) {
 	#setup so we know what the default target blog is in the template
diff --git a/print_blog_post.php b/print_blog_post.php
index ce96ad0..c970db0 100644
--- a/print_blog_post.php
+++ b/print_blog_post.php
@@ -14,7 +14,7 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-include_once( BLOGS_PKG_PATH.'BitBlogPost.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' );
 
 $gBitSystem->verifyPackage( 'blogs' );
 
@@ -22,7 +22,7 @@ if (!isset($_REQUEST["post_id"])) {
 	$gBitSystem->fatalError( tra( 'No post indicated' ));
 }
 
-include_once( BLOGS_PKG_PATH.'lookup_post_inc.php' );
+include_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' );
 
 $gBitSmarty->assign('post_info', $gContent->mInfo );
 
diff --git a/recent_posts.php b/recent_posts.php
index 5eca0fa..770248c 100644
--- a/recent_posts.php
+++ b/recent_posts.php
@@ -14,7 +14,7 @@ require_once( '../kernel/setup_inc.php' );
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'blogs' );
 
-require_once( BLOGS_PKG_PATH.'lookup_blog_inc.php');
+require_once( BLOGS_PKG_INCLUDE_PATH.'lookup_blog_inc.php');
 
 // Now check permissions to access this page
 $gContent->verifyViewPermission();
diff --git a/send_post.php b/send_post.php
index 2abd390..705e15b 100644
--- a/send_post.php
+++ b/send_post.php
@@ -18,7 +18,7 @@ $_REQUEST['uri_mode'] = TRUE;
  */
 require_once( '../kernel/setup_inc.php' );
 
-include_once( BLOGS_PKG_PATH.'BitBlogPost.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' );
 
 $gBitSystem->verifyPermission( 'p_blogs_send_post' );
 
@@ -26,7 +26,7 @@ if (!isset($_REQUEST["post_id"])) {
 	$gBitSystem->fatalError( tra( 'No post indicated' ));
 }
 
-include_once( BLOGS_PKG_PATH.'lookup_post_inc.php' );
+include_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' );
 // make sure this user can see the post to avoid emailing post to self to circumvent the perm
 $gContent->verifyViewPermission();
 
diff --git a/templates/center_list_blog_posts.php b/templates/center_list_blog_posts.php
index 45c7e62..52e65f1 100644
--- a/templates/center_list_blog_posts.php
+++ b/templates/center_list_blog_posts.php
@@ -8,8 +8,8 @@ if( !empty( $moduleParams ) ) {
 	extract( $moduleParams );
 }
 
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
-include_once( BLOGS_PKG_PATH.'lookup_post_inc.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' );
 
 $blogPost = new BitBlogPost();
 if( empty( $gContent )) {
diff --git a/view.php b/view.php
index 79d9a76..aed1468 100644
--- a/view.php
+++ b/view.php
@@ -15,5 +15,5 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-include_once( BLOGS_PKG_PATH.'display_bitblog_inc.php' );
-?>
\ No newline at end of file
+include_once( BLOGS_PKG_INCLUDE_PATH.'display_bitblog_inc.php' );
+?>
diff --git a/view_post.php b/view_post.php
index 984e44a..6402afb 100644
--- a/view_post.php
+++ b/view_post.php
@@ -17,9 +17,9 @@ require_once( '../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'blogs' );
 
-require_once( BLOGS_PKG_PATH.'BitBlogPost.php' );
+require_once( BLOGS_PKG_CLASS_PATH.'BitBlogPost.php' );
 
-include_once( BLOGS_PKG_PATH.'lookup_post_inc.php' );
+include_once( BLOGS_PKG_INCLUDE_PATH.'lookup_post_inc.php' );
 
 if( !$gContent->isValid() ) {
 	$gBitSystem->setHttpStatus( 404 );
@@ -44,7 +44,7 @@ if ( $gContent->hasAdminPermission()  || ( $gContent->hasUserPermission( 'p_blog
 }
 
 if ($view == TRUE){
-	include_once( BLOGS_PKG_PATH.'display_bitblogpost_inc.php' );
+	include_once( BLOGS_PKG_INCLUDE_PATH.'display_bitblogpost_inc.php' );
 }else{
 	$gBitSystem->setHttpStatus( 404 );
 	$gBitSystem->fatalError( "The blog post you requested could not be found." );
diff --git a/view_post_image.php b/view_post_image.php
index faec5b2..bc6f249 100644
--- a/view_post_image.php
+++ b/view_post_image.php
@@ -15,7 +15,7 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-include_once( BLOGS_PKG_PATH.'BitBlog.php' );
+include_once( BLOGS_PKG_CLASS_PATH.'BitBlog.php' );
 
 if (!isset($_REQUEST["image_id"])) {
 	$gBitSmarty->assign('msg', tra("No image id given"));