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

16 files changed, 84 insertions, 103 deletions

diff --git a/admin/admin_topics.php b/admin/admin_topics.php
index 3f09654..c90b756 100644
--- a/admin/admin_topics.php
+++ b/admin/admin_topics.php
@@ -2,8 +2,8 @@
 // $Header$
 require_once '../../kernel/setup_inc.php';
 
-include_once( ARTICLES_PKG_PATH.'BitArticle.php' );
-include_once( ARTICLES_PKG_PATH.'lookup_article_topic_inc.php' );
+include_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'lookup_article_topic_inc.php' );
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'articles' );
diff --git a/admin/admin_types.php b/admin/admin_types.php
index c02c338..057b5c2 100644
--- a/admin/admin_types.php
+++ b/admin/admin_types.php
@@ -2,8 +2,8 @@
 // $Header$
 
 require_once '../../kernel/setup_inc.php';
-require_once( ARTICLES_PKG_PATH.'BitArticle.php' );
-require_once( ARTICLES_PKG_PATH.'BitArticleType.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticleType.php' );
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'articles' );
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index 5519ad2..096a334 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -1,7 +1,7 @@
 <?php
 
 global $gBitSystem, $gUpgradeFrom, $gUpgradeTo;
-require_once( ARTICLES_PKG_PATH.'BitArticle.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 if( !defined( 'BITARTICLE_CONTENT_TYPE_GUID' ) ) {
 	define( 'BITARTICLE_CONTENT_TYPE_GUID', 'bitarticle' );
diff --git a/article_history.php b/article_history.php
index 8e236d3..3b28e24 100644
--- a/article_history.php
+++ b/article_history.php
@@ -17,7 +17,7 @@
  * required setup
  */
 require_once '../kernel/setup_inc.php';
-require_once( ARTICLES_PKG_PATH.'BitArticle.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 $gBitSystem->verifyPackage( 'articles' );
 $gBitSystem->verifyPermission( 'p_articles_read' );
diff --git a/BitArticle.php b/includes/classes/BitArticle.php
index 85b8e80..cc1c7c1 100644
--- a/BitArticle.php
+++ b/includes/classes/BitArticle.php
@@ -21,8 +21,8 @@
 /**
  * Required setup
  */
-require_once( ARTICLES_PKG_PATH.'BitArticleTopic.php' );
-require_once( ARTICLES_PKG_PATH.'BitArticleType.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticleTopic.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticleType.php' );
 require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
 require_once( LIBERTY_PKG_PATH.'LibertyComment.php' );
 
@@ -55,7 +55,7 @@ class BitArticle extends LibertyMime
 				'content_name' => 'Article',
 				'handler_class' => 'BitArticle',
 				'handler_package' => 'articles',
-				'handler_file' => 'BitArticle.php',
+				'handler_file' => 'includes/classes/BitArticle.php',
 				'maintainer_url' => 'http://www.bitweaver.org'
 		));
 		$this->mContentId = $pContentId;
@@ -394,6 +394,7 @@ class BitArticle extends LibertyMime
 			$thumbHash['source_file'] = $pParamHash['image_attachment_path'];
 			$ret = liberty_fetch_thumbnails( $thumbHash );
 		} elseif ( !empty( $pParamHash['has_topic_image'] ) && $pParamHash['has_topic_image'] == 'y' ) {
+return BitArticleTopic::getTopicImageStorageUrl( $pParamHash['topic_id'] );
 			$thumbHash['source_file'] = preg_replace( "#^/+#", "", BitArticleTopic::getTopicImageStorageUrl( $pParamHash['topic_id'] ));
 			$ret = liberty_fetch_thumbnails( $thumbHash );
 		}
diff --git a/BitArticleTopic.php b/includes/classes/BitArticleTopic.php
index 466b604..f2c59b9 100644
--- a/BitArticleTopic.php
+++ b/includes/classes/BitArticleTopic.php
@@ -13,17 +13,15 @@
  */
 global $gBitSystem;
 require_once( KERNEL_PKG_PATH."BitBase.php" );
-require_once( ARTICLES_PKG_PATH.'BitArticle.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 /**
  * @package articles
  */
-class BitArticleTopic extends BitBase
-{
-	public $mTopicId;
+class BitArticleTopic extends BitBase {
+	var $mTopicId;
 
-	public function __construct($iTopicId = NULL, $iTopicName = NULL)
-	{
+	function __construct($iTopicId = NULL, $iTopicName = NULL) {
 		$this->mTopicId = NULL;
 		parent::__construct();
 		if ($iTopicId || $iTopicName) {
@@ -31,19 +29,17 @@ class BitArticleTopic extends BitBase
 		}
 	}
 
-	public function isValid()
-	{
+	function isValid() {
 		return ($this->verifyId($this->mTopicId));
 	}
 
-	public function loadTopic($iParamHash = NULL)
-	{
+	function loadTopic($iParamHash = NULL) {
 		$whereSQL = ' WHERE artt.';
 		$ret = NULL;
 
 		if (@$this->verifyId($iParamHash['topic_id']) || !empty($iParamHash['topic_name'])) {
 			$whereSQL .= "`".((@$this->verifyId($iParamHash['topic_id']) || $this->mTopicId) ? 'topic_id' : 'topic_name')."` = ?";
-			$bindVars = array((@$this->verifyId($iParamHash['topic_id']) ? (int) $iParamHash['topic_id'] : ($this->mTopicId ? $this->mTopicId : $iParamHash['topic_name'])) );
+			$bindVars = array((@$this->verifyId($iParamHash['topic_id']) ? (int)$iParamHash['topic_id'] : ($this->mTopicId ? $this->mTopicId : $iParamHash['topic_name'])) );
 
 			$sql = "SELECT artt.*".
 				   "FROM `".BIT_DB_PREFIX."article_topics` artt ".
@@ -64,11 +60,10 @@ class BitArticleTopic extends BitBase
 		return $ret;
 	}
 
-	public function verify(&$iParamHash)
-	{
+	function verify(&$iParamHash) {
 		// Validate the (optional) topic_id parameter
 		if (@$this->verifyId($iParamHash['topic_id'])) {
-			$cleanHash['topic_id'] = (int) $iParamHash['topic_id'];
+			$cleanHash['topic_id'] = (int)$iParamHash['topic_id'];
 		} else {
 			$cleanHash['topic_id'] = NULL;
 		}
@@ -76,17 +71,19 @@ class BitArticleTopic extends BitBase
 		// Was an acceptable name given?
 		if (empty($iParamHash['topic_name']) || ($iParamHash['topic_name'] == '')) {
 			$this->mErrors['topic_name'] = tra("Invalid or blank topic name supplied");
-		} elseif (empty($iParamHash['topic_id'])) {
+		} else if (empty($iParamHash['topic_id'])) {
 			$ret = $this->getTopicList( array( 'topic_name' => $iParamHash['topic_name'] ) );
 			if ( sizeof( $ret ) ) {
 				$this->mErrors['topic_name'] = 'Topic "'.$iParamHash['topic_name'].'" already exists. Please choose a different name.';
 			} else {
 				$cleanHash['topic_name'] = $iParamHash['topic_name'];
 			}
-		} else {
+		}
+		else {
 			$cleanHash['topic_name'] = $iParamHash['topic_name'];
 		}
 
+
 		// Whether the topic is active or not
 		if ( empty($iParamHash['active_topic']) || (strtoupper($iParamHash['active_topic']) != 'CHECKED' && strtoupper($iParamHash['active_topic']) != 'ON' && strtoupper($iParamHash['active_topic']) != 'Y')) {
 			if (@$this->verifyId($cleanHash['topic_id'])) {
@@ -109,8 +106,7 @@ class BitArticleTopic extends BitBase
 		return(count($this->mErrors) == 0);
 	}
 
-	public function storeTopic($iParamHash = NULL)
-	{
+	function storeTopic($iParamHash = NULL) {
 		global $gLibertySystem;
 		global $gBitUser;
 
@@ -152,10 +148,9 @@ class BitArticleTopic extends BitBase
 	* @return path on success, FALSE on failure
 	* @access public
 	**/
-	public function getTopicImageBaseUrl($pTopicId = NULL)
-	{
+	function getTopicImageBaseUrl( $pTopicId = NULL ) {
 		$ret = FALSE;
-		if ( !@BitBase::verifyId( $pTopicId ) && $this->isValid() ) {
+		if( !@BitBase::verifyId( $pTopicId ) && $this->isValid() ) {
 			$pTopicId = $this->mTopicId;
 		}
 
@@ -172,30 +167,25 @@ class BitArticleTopic extends BitBase
 	 * @access public
 	 * @return Path to thumbnail, FALSE on failure
 	 */
-	public function getTopicImageThumbUrl($pTopicId = NULL)
-	{
+	function getTopicImageThumbUrl( $pTopicId = NULL ) {
 		global $gBitSystem;
 		$ret = FALSE;
-		if ( !@BitBase::verifyId( $pTopicId ) && $this->isValid() ) {
+		if( !@BitBase::verifyId( $pTopicId ) && $this->isValid() ) {
 			$pTopicId = $this->mTopicId;
 		}
 
-		if ( @BitBase::verifyId( $pTopicId )) {
-			$ret = liberty_fetch_thumbnail_url( array(
-				'source_file'   => BitArticleTopic::getTopicImageBaseUrl( $pTopicId ),
-				'default_image' => $gBitSystem->getConfig( 'articles_image_size', 'small' )
-			));
+		if( @BitBase::verifyId( $pTopicId )) {
+			$ret = STORAGE_PKG_URL.ARTICLES_PKG_NAME.'/topic_'.$pTopicId.'.jpg';
 		}
 		return $ret;
 	}
 
-	public static function getTopicList($pOptionHash=NULL)
-	{
+	public static function getTopicList( $pOptionHash=NULL ) {
 		global $gBitSystem;
 
 		$where = '';
 		$bindVars = array();
-		if ( !empty( $pOptionHash['active_topic'] ) ) {
+		if( !empty( $pOptionHash['active_topic'] ) ) {
 			$where = " WHERE artt.`active_topic` = 'y' ";
 		}
 		if ( !empty(  $pOptionHash['topic_name'] ) ) {
@@ -211,10 +201,10 @@ class BitArticleTopic extends BitBase
 
         $ret = array();
 
-        while ( $res = $result->fetchRow() ) {
+        while( $res = $result->fetchRow() ) {
 			$res["num_articles"] = $gBitSystem->mDb->getOne( "SELECT COUNT(*) FROM `".BIT_DB_PREFIX."articles` WHERE `topic_id`= ?", array( $res["topic_id"] ) );
-			if ( empty( $res['topic_image_url'] ) && $res['has_topic_image'] == 'y' ) {
-				$res['topic_image_url'] = BitArticleTopic::getTopicImageStorageUrl( $res['topic_id'] );
+			if( empty( $res['topic_image_url'] ) && $res['has_topic_image'] == 'y' ) {
+				$res['topic_image_url'] = self::getTopicImageStorageUrl( $res['topic_id'] );
 			}
 
             $ret[] = $res;
@@ -223,10 +213,9 @@ class BitArticleTopic extends BitBase
         return $ret;
     }
 
-	public function removeTopicImage()
-	{
-		if ($this->mTopicId) {
-			if ( file_exists($this->getTopicImageStoragePath() ) ) {
+	function removeTopicImage() {
+		if( $this->mTopicId ) {
+			if( file_exists($this->getTopicImageStoragePath() ) ) {
 				@unlink( $this->getTopicImageStoragePath() );
 			}
 			$sql = "UPDATE `".BIT_DB_PREFIX."article_topics` SET `has_topic_image` = 'n' WHERE `topic_id` = ?";
@@ -235,25 +224,21 @@ class BitArticleTopic extends BitBase
 		}
 	}
 
-	public function activateTopic()
-	{
+	function activateTopic() {
 		$this->setActivation(TRUE);
 	}
 
-	public function deactivateTopic()
-	{
+	function deactivateTopic() {
 		$this->setActivation(FALSE);
 	}
 
-	public function setActivation($iIsActive = FALSE)
-	{
+	function setActivation($iIsActive = FALSE) {
 		$sql = "UPDATE `".BIT_DB_PREFIX."article_topics` SET `active_topic` = '".($iIsActive ? 'y' : 'n')."' WHERE `topic_id` = ?";
 		$rs = $this->mDb->query($sql, array($this->mTopicId));
 		$this->mInfo['active_topic'] = ($iIsActive ? 'y' : 'n');
 	}
 
-	public function getTopicArticles()
-	{
+	function getTopicArticles() {
 		if (!$this->mTopicId) {
 			return NULL;
 		}
@@ -269,8 +254,7 @@ class BitArticleTopic extends BitBase
 		}
 	}
 
-	public function removeTopic($iRemoveArticles = FALSE)
-	{
+	function removeTopic($iRemoveArticles = FALSE) {
 		if (!$this->mTopicId) {
 			return NULL;
 		}
@@ -307,10 +291,9 @@ class BitArticleTopic extends BitBase
 	 * @access public
 	 * @return TRUE on success, FALSE on failure
 	 */
-	public function getTopicImageStorageName($pTopicId = NULL)
-	{
-		if ( !@BitBase::verifyId( $pTopicId ) ) {
-			if ( $this->isValid() ) {
+	function getTopicImageStorageName( $pTopicId = NULL ) {
+		if( !@BitBase::verifyId( $pTopicId ) ) {
+			if( $this->isValid() ) {
 				$pTopicId = $this->mTopicId;
 			} else {
 				return NULL;
@@ -328,15 +311,14 @@ class BitArticleTopic extends BitBase
 	* @return path on success, FALSE on failure
 	* @access public
 	**/
-	public function getTopicImageStoragePath($pTopicId = NULL, $pBasePathOnly = FALSE)
-	{
-		$path = BitArticleTopic::getArticleImageStoragePath( NULL, TRUE );
+	function getTopicImageStoragePath( $pTopicId = NULL, $pBasePathOnly = FALSE ) {
+		$path = self::getArticleImageStoragePath( NULL, TRUE );
 
-		if ($pBasePathOnly) {
+		if( $pBasePathOnly ) {
 			return $path;
 		}
 
-		if ( !@BitBase::verifyId( $pTopicId ) ) {
+		if( !@BitBase::verifyId( $pTopicId ) ) {
 			if( $this->isValid() ) {
 				$pTopicId = $this->mTopicId;
 			} else {
@@ -344,8 +326,8 @@ class BitArticleTopic extends BitBase
 			}
 		}
 
-		if ( !empty( $pTopicId ) ) {
-			return $path.BitArticleTopic::getTopicImageStorageName( $pTopicId );
+		if( !empty( $pTopicId ) ) {
+			return $path.self::getTopicImageStorageName( $pTopicId );
 		} else {
 			return FALSE;
 		}
@@ -358,28 +340,27 @@ class BitArticleTopic extends BitBase
 	* @return URL on success, FALSE on failure
 	* @access public
 	**/
-	public function getTopicImageStorageUrl($pTopicId = NULL, $pBasePathOnly = FALSE, $pForceRefresh = FALSE)
-	{
+	function getTopicImageStorageUrl( $pTopicId = NULL, $pBasePathOnly = FALSE, $pForceRefresh = FALSE ) {
 		global $gBitSystem;
 		$ret = FALSE;
 
 		// first we check to see if this is a new type thumbnail. if that fails we'll use the old method
-		if ( !( $ret = BitArticleTopic::getTopicImageThumbUrl( $pTopicId ))) {
-			$url = BitArticleTopic::getArticleImageStorageUrl( NULL, TRUE );
-			if ($pBasePathOnly) {
+		if( !( $ret = self::getTopicImageThumbUrl( $pTopicId ))) {
+			$url = self::getArticleImageStorageUrl( NULL, TRUE );
+			if( $pBasePathOnly ) {
 				return $url;
 			}
 
-			if ( !@BitBase::verifyId( $pTopicId ) ) {
-				if ( $this->isValid() ) {
+			if( !@BitBase::verifyId( $pTopicId ) ) {
+				if( $this->isValid() ) {
 					$pTopicId = $this->mTopicId;
 				} else {
 					return NULL;
 				}
 			}
 
-			if ( is_file( BitArticleTopic::getTopicImageStoragePath( NULL, TRUE ).BitArticleTopic::getTopicImageStorageName( $pTopicId ))) {
-				$ret = $url.BitArticleTopic::getTopicImageStorageName( $pTopicId ).( $pForceRefresh ? "?".$gBitSystem->getUTCTime() : '' );
+			if( is_file( self::getTopicImageStoragePath( NULL, TRUE ).self::getTopicImageStorageName( $pTopicId ))) {
+				$ret = $url.self::getTopicImageStorageName( $pTopicId ).( $pForceRefresh ? "?".$gBitSystem->getUTCTime() : '' );
 			}
 		}
 
@@ -407,10 +388,9 @@ class BitArticleTopic extends BitBase
 	 * @access public
 	 * @return TRUE on success, FALSE on failure
 	 */
-	public function getArticleImageStorageName($pArticleId = NULL)
-	{
-		if ( !@BitBase::verifyId( $pArticleId ) ) {
-			if ( $this->isValid() ) {
+	function getArticleImageStorageName( $pArticleId = NULL ) {
+		if( !@BitBase::verifyId( $pArticleId ) ) {
+			if( $this->isValid() ) {
 				$pArticleId = $this->mArticleId;
 			} else {
 				return NULL;
@@ -427,14 +407,13 @@ class BitArticleTopic extends BitBase
 	* @return path on success, FALSE on failure
 	* @access public
 	**/
-	public function getArticleImageStoragePath($pArticleId = NULL, $pBasePathOnly = FALSE)
-	{
+	function getArticleImageStoragePath( $pArticleId = NULL, $pBasePathOnly = FALSE ) {
 		$path = STORAGE_PKG_PATH.ARTICLES_PKG_NAME.'/';
-		if ( !is_dir( $path ) ) {
+		if( !is_dir( $path ) ) {
 			mkdir_p( $path );
 		}
 
-		if ($pBasePathOnly) {
+		if( $pBasePathOnly ) {
 			return $path;
 		}
 
@@ -446,8 +425,8 @@ class BitArticleTopic extends BitBase
 			}
 		}
 
-		if ( !empty( $pArticleId ) ) {
-			return $path.BitArticleTopic::getArticleImageStorageName( $pArticleId );
+		if( !empty( $pArticleId ) ) {
+			return $path.self::getArticleImageStorageName( $pArticleId );
 		} else {
 			return FALSE;
 		}
@@ -460,11 +439,10 @@ class BitArticleTopic extends BitBase
 	* @return URL on success, FALSE on failure
 	* @access public
 	**/
-	public function getArticleImageStorageUrl($pArticleId = NULL, $pBasePathOnly = FALSE, $pForceRefresh = FALSE)
-	{
+	function getArticleImageStorageUrl( $pArticleId = NULL, $pBasePathOnly = FALSE, $pForceRefresh = FALSE ) {
 		global $gBitSystem;
 		$url = STORAGE_PKG_URL.ARTICLES_PKG_NAME.'/';
-		if ($pBasePathOnly) {
+		if( $pBasePathOnly ) {
 			return $url;
 		}
 
@@ -476,10 +454,12 @@ class BitArticleTopic extends BitBase
 			}
 		}
 
-		if ( is_file( BitArticleTopic::getArticleImageStoragePath( NULL, TRUE ).BitArticleTopic::getArticleImageStorageName( $pArticleId ) ) ) {
-			return $url.BitArticleTopic::getArticleImageStorageName( $pArticleId ).( $pForceRefresh ? "?".$gBitSystem->getUTCTime() : '' );
+		if( is_file( self::getArticleImageStoragePath( NULL, TRUE ).self::getArticleImageStorageName( $pArticleId ) ) ) {
+			return $url.self::getArticleImageStorageName( $pArticleId ).( $pForceRefresh ? "?".$gBitSystem->getUTCTime() : '' );
 		} else {
 			return FALSE;
 		}
 	}
 }
+
+?>
diff --git a/BitArticleType.php b/includes/classes/BitArticleType.php
index 025d405..55f0fc9 100644
--- a/BitArticleType.php
+++ b/includes/classes/BitArticleType.php
@@ -12,7 +12,7 @@
  * Required setup
  */
 require_once (KERNEL_PKG_PATH."BitBase.php");
-require_once(ARTICLES_PKG_PATH.'BitArticle.php');
+require_once(ARTICLES_PKG_CLASS_PATH.'BitArticle.php');
 
 /**
  * @package articles
diff --git a/index.php b/index.php
index dff3e67..89daec0 100644
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@ require_once '../kernel/setup_inc.php';
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'articles' );
-require_once( ARTICLES_PKG_PATH.'BitArticle.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 // Now check permissions to access this page
 $gBitSystem->verifyPermission( 'p_articles_read' );
diff --git a/liberty_plugins/data.articles.php b/liberty_plugins/data.articles.php
index 5009a7a..93d67bd 100644
--- a/liberty_plugins/data.articles.php
+++ b/liberty_plugins/data.articles.php
@@ -84,7 +84,7 @@ function data_articles($data, $params) { // No change in the parameters with Cly
 		// The next 2 lines allow access to the $pluginParams given above and may be removed when no longer needed
 		$pluginParams = $gLibertySystem->mPlugins[PLUGIN_GUID_DATAARTICLES];
 
-		require_once( ARTICLES_PKG_PATH.'BitArticle.php');
+		require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php');
 		require_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
 
 		$module_params = $params;
diff --git a/list.php b/list.php
index 08f1616..6e45e4f 100644
--- a/list.php
+++ b/list.php
@@ -9,7 +9,7 @@
  * Initialization
  */
 require_once '../kernel/setup_inc.php';
-require_once( ARTICLES_PKG_PATH.'BitArticle.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 include_once( ARTICLES_PKG_PATH.'article_filter_inc.php' );
 
 // Is package installed and enabled
diff --git a/list_topics.php b/list_topics.php
index 2425aa4..6865040 100644
--- a/list_topics.php
+++ b/list_topics.php
@@ -10,7 +10,7 @@
  */
 require_once '../kernel/setup_inc.php';
 
-include_once( ARTICLES_PKG_PATH.'BitArticle.php' );
+include_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 include_once( ARTICLES_PKG_PATH.'lookup_article_topic_inc.php' );
 
 // Is package installed and enabled
diff --git a/lookup_article_inc.php b/lookup_article_inc.php
index 16141bf..80c6f48 100644
--- a/lookup_article_inc.php
+++ b/lookup_article_inc.php
@@ -8,7 +8,7 @@
 /**
  * Initialization
  */
-require_once( ARTICLES_PKG_PATH.'BitArticle.php');
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.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_article_topic_inc.php b/lookup_article_topic_inc.php
index b6619ba..373164c 100644
--- a/lookup_article_topic_inc.php
+++ b/lookup_article_topic_inc.php
@@ -9,7 +9,7 @@
  * Initialization
  */
 	global $gContent;
-	require_once( ARTICLES_PKG_PATH.'BitArticle.php');
+	require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php');
 	
 	// if we already have a gContent, we assume someone else created it for us, and has properly loaded everything up.
 	if( empty( $gContent ) || !is_object( $gContent ) ) {
diff --git a/modules/mod_articles.php b/modules/mod_articles.php
index b3120e7..21123c4 100644
--- a/modules/mod_articles.php
+++ b/modules/mod_articles.php
@@ -8,7 +8,7 @@
 /**
  * Initialization
  */
-include_once( ARTICLES_PKG_PATH.'BitArticle.php' );
+include_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 extract( $moduleParams );
 
diff --git a/read.php b/read.php
index 3992222..8458f78 100644
--- a/read.php
+++ b/read.php
@@ -10,7 +10,7 @@
  */
 require_once '../kernel/setup_inc.php';
 
-require_once( ARTICLES_PKG_PATH.'BitArticle.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 $gBitSystem->verifyPackage( 'articles' );
 
diff --git a/test/TestTikiArticle.php b/test/TestTikiArticle.php
index 9b80cd7..c24bce9 100644
--- a/test/TestTikiArticle.php
+++ b/test/TestTikiArticle.php
@@ -1,6 +1,6 @@
 <?php
 require_once '../../kernel/setup_inc.php';
-require_once(ARTICLES_PKG_PATH.'BitArticle.php');
+require_once(ARTICLES_PKG_CLASS_PATH.'BitArticle.php');
 
 class TestBitArticle extends Test
 {