move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

20 files changed, 30 insertions, 30 deletions

diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 373827b..09b7cd3 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -135,7 +135,7 @@ if( defined( 'RSS_PKG_NAME' )) {
 
 // ### Register content types
 $gBitInstaller->registerContentObjects( ARTICLES_PKG_NAME, array( 
-	'BitArticle'=>ARTICLES_PKG_PATH.'BitArticle.php',
+	'BitArticle'=>ARTICLES_PKG_CLASS_PATH.'BitArticle.php',
 ));
 
 // Requirements
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index 096a334..6434a77 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -35,7 +35,7 @@ array( 'DATADICT' => array(
 // we will try to convert article images to attachments
 array( 'PHP' => '
 	global $gBitSystem, $gBitUser;
-	require_once( LIBERTY_PKG_PATH."LibertyAttachable.php" );
+	require_once( LIBERTY_PKG_CLASS_PATH.'LibertyAttachable.php' );
 
 	$query = "
 		SELECT
@@ -185,7 +185,7 @@ array( 'PHP' => '
 	global $gBitSystem;
 	// this define is needed for backwards compatability.
 	define( "ARTICLE_TOPIC_THUMBNAIL_SIZE", 160 );
-	require_once( ARTICLES_PKG_PATH."BitArticle.php" );
+	require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 	// BitArticle has 3 sequences, each needs creating prior to execution
 	$max_articles = $gBitSystem->mDb->getOne( "SELECT MAX(`article_id`) FROM `'.BIT_DB_PREFIX.'tiki_articles`" );
diff --git a/article_history.php b/article_history.php
index 3b28e24..3e26a9a 100644
--- a/article_history.php
+++ b/article_history.php
@@ -27,7 +27,7 @@ if( !isset( $_REQUEST["article_id"] ) ) {
 	$gBitSystem->fatalError( tra( "No article indicated" ));
 }
 
-include_once( ARTICLES_PKG_PATH.'lookup_article_inc.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'lookup_article_inc.php' );
 
 //vd($gContent->mPageId);vd($gContent->mInfo);
 if( !$gContent->isValid() || empty( $gContent->mInfo ) ) {
@@ -42,7 +42,7 @@ if( $gContent->getField( 'status_id' ) != ARTICLE_STATUS_APPROVED && !( $gConten
 }
 
 $smartyContentRef = 'article';
-include_once( LIBERTY_PKG_PATH.'content_history_inc.php' );
+include_once( LIBERTY_PKG_INCLUDE_PATH.'content_history_inc.php' );
 
 $gBitSmarty->assign( 'page', $page = !empty( $_REQUEST['list_page'] ) ? $_REQUEST['list_page'] : 1 );
 $offset = ( $page - 1 ) * $gBitSystem->getConfig( 'max_records' );
diff --git a/articles_rss.php b/articles_rss.php
index ae3237d..23dc9e3 100644
--- a/articles_rss.php
+++ b/articles_rss.php
@@ -16,8 +16,8 @@ $gBitSystem->verifyPackage( 'articles' );
 $gBitSystem->verifyPackage( 'rss' );
 $gBitSystem->verifyFeature( 'articles_rss' );
 
-require_once( ARTICLES_PKG_PATH."BitArticle.php" );
-require_once( RSS_PKG_PATH."rss_inc.php" );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
+require_once( RSS_PKG_INCLUDE_PATH.'rss_inc.php' );
 
 $rss->title = $gBitSystem->getConfig( 'articles_rss_title', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'Articles' ) );
 $rss->description = $gBitSystem->getConfig( 'articles_rss_description', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'RSS Feed' ) );
diff --git a/edit.php b/edit.php
index 376d547..4a83fe9 100644
--- a/edit.php
+++ b/edit.php
@@ -13,12 +13,12 @@
  * Initialization
  */
 require_once '../kernel/setup_inc.php';
-require_once( ARTICLES_PKG_PATH . 'BitArticle.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'articles' );
 
-include_once 'lookup_article_inc.php';
+require_once( ARTICLES_PKG_INCLUDE_PATH.'lookup_article_inc.php' );
 
 if ( $gContent->isValid() ) {
 	$gContent->verifyUpdatePermission();
diff --git a/edit_topic.php b/edit_topic.php
index b027716..816d831 100644
--- a/edit_topic.php
+++ b/edit_topic.php
@@ -9,9 +9,9 @@
  * 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."lookup_article_topic_inc.php" );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'lookup_article_topic_inc.php' );
 
 if ( !$gBitSystem->verifyPackage( 'articles' ) ) {
    $gBitSmarty->assign( 'msg', tra( "This package is disabled" ) . ": Articles" );
diff --git a/article_filter_inc.php b/includes/article_filter_inc.php
index 8635c12..8635c12 100644
--- a/article_filter_inc.php
+++ b/includes/article_filter_inc.php
diff --git a/includes/classes/BitArticle.php b/includes/classes/BitArticle.php
index cc1c7c1..6b9a4e3 100644
--- a/includes/classes/BitArticle.php
+++ b/includes/classes/BitArticle.php
@@ -23,8 +23,8 @@
  */
 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' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyComment.php' );
 
 define( 'BITARTICLE_CONTENT_TYPE_GUID', 'bitarticle' );
 
@@ -592,7 +592,7 @@ return BitArticleTopic::getTopicImageStorageUrl( $pParamHash['topic_id'] );
     */
 	public function getRenderFile()
 	{
-		return ARTICLES_PKG_PATH."display_article_inc.php";
+		return ARTICLES_PKG_INCLUDE_PATH.'display_article_inc.php';
 	}
 
 	/**
diff --git a/includes/classes/BitArticleTopic.php b/includes/classes/BitArticleTopic.php
index b4e2308..1422508 100644
--- a/includes/classes/BitArticleTopic.php
+++ b/includes/classes/BitArticleTopic.php
@@ -12,7 +12,7 @@
  * Required setup
  */
 global $gBitSystem;
-require_once( KERNEL_PKG_PATH."BitBase.php" );
+require_once( KERNEL_PKG_CLASS_PATH.'BitBase.php' );
 require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 /**
diff --git a/includes/classes/BitArticleType.php b/includes/classes/BitArticleType.php
index 55f0fc9..42fa209 100644
--- a/includes/classes/BitArticleType.php
+++ b/includes/classes/BitArticleType.php
@@ -11,8 +11,8 @@
 /**
  * Required setup
  */
-require_once (KERNEL_PKG_PATH."BitBase.php");
-require_once(ARTICLES_PKG_CLASS_PATH.'BitArticle.php');
+require_once( KERNEL_PKG_CLASS_PATH.'BitBase.php' );
+require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 /**
  * @package articles
diff --git a/display_article_inc.php b/includes/display_article_inc.php
index f33270a..3a884bf 100644
--- a/display_article_inc.php
+++ b/includes/display_article_inc.php
@@ -24,7 +24,7 @@ if( @$gContent->mInfo['allow_comments'] == 'y' ) {
 	$comments_object_var='article';
 	$commentsParentId = $gContent->mContentId;
 	$comments_return_url = $_SERVER['SCRIPT_NAME']."?article_id=".$_REQUEST['article_id'];
-	include_once( LIBERTY_PKG_PATH.'comments_inc.php' );
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php' );
 }
 
 // Display the Index Template
diff --git a/lookup_article_inc.php b/includes/lookup_article_inc.php
index 80c6f48..75dfb92 100644
--- a/lookup_article_inc.php
+++ b/includes/lookup_article_inc.php
@@ -9,7 +9,7 @@
  * Initialization
  */
 require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php');
-require_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
+require_once( LIBERTY_PKG_INCLUDE_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.
 if( empty( $gContent ) || !is_object( $gContent ) ) {
diff --git a/lookup_article_topic_inc.php b/includes/lookup_article_topic_inc.php
index 373164c..373164c 100644
--- a/lookup_article_topic_inc.php
+++ b/includes/lookup_article_topic_inc.php
diff --git a/liberty_plugins/data.articles.php b/liberty_plugins/data.articles.php
index 93d67bd..da7a1bd 100644
--- a/liberty_plugins/data.articles.php
+++ b/liberty_plugins/data.articles.php
@@ -85,7 +85,7 @@ function data_articles($data, $params) { // No change in the parameters with Cly
 		$pluginParams = $gLibertySystem->mPlugins[PLUGIN_GUID_DATAARTICLES];
 
 		require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php');
-		require_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
+		require_once( LIBERTY_PKG_INCLUDE_PATH.'lookup_content_inc.php' );
 
 		$module_params = $params;
 		$articlesObject = new BitArticle();
diff --git a/list.php b/list.php
index 6e45e4f..9fb923c 100644
--- a/list.php
+++ b/list.php
@@ -10,7 +10,7 @@
  */
 require_once '../kernel/setup_inc.php';
 require_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
-include_once( ARTICLES_PKG_PATH.'article_filter_inc.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'article_filter_inc.php' );
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'articles' );
diff --git a/list_topics.php b/list_topics.php
index 6865040..d2175e2 100644
--- a/list_topics.php
+++ b/list_topics.php
@@ -11,7 +11,7 @@
 require_once '../kernel/setup_inc.php';
 
 include_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
-include_once( ARTICLES_PKG_PATH.'lookup_article_topic_inc.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'lookup_article_topic_inc.php' );
 
 // Is package installed and enabled
 $gBitSystem->verifyPackage( 'articles' );
diff --git a/rankings.php b/rankings.php
index 3a2929f..d52cafa 100644
--- a/rankings.php
+++ b/rankings.php
@@ -10,8 +10,8 @@
  */
 require_once '../kernel/setup_inc.php';
 
-include_once( LIBERTY_PKG_PATH . 'LibertyContent.php' );
-include_once( ARTICLES_PKG_PATH . 'BitArticle.php' );
+include_once( LIBERTY_PKG_CLASS_PATH.'LibertyContent.php' );
+include_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
 
 $gBitSystem->isPackageActive( 'articles' );
 $gBitSystem->isFeatureActive( 'articles_rankings' );
diff --git a/read.php b/read.php
index 8458f78..07e2dc2 100644
--- a/read.php
+++ b/read.php
@@ -18,7 +18,7 @@ if( !@BitBase::verifyId( $_REQUEST["article_id"] )) {
 	$gBitSystem->fatalError( tra( "No article indicated" ));
 }
 
-include_once( ARTICLES_PKG_PATH.'lookup_article_inc.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'lookup_article_inc.php' );
 
 // Check if we actually have some content
 if( !$gContent->isValid() ) {
@@ -57,7 +57,7 @@ if( @$gContent->mInfo['allow_comments'] == 'y' ) {
 	$comments_object_var='article';
 	$commentsParentId = $gContent->mContentId;
 	$comments_return_url = $_SERVER['SCRIPT_NAME']."?article_id=".$_REQUEST['article_id'];
-	include_once( LIBERTY_PKG_PATH.'comments_inc.php' );
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php' );
 }
 
 // Display the Index Template
diff --git a/templates/center_display_articles.php b/templates/center_display_articles.php
index a7ecd8e..7c6c67d 100644
--- a/templates/center_display_articles.php
+++ b/templates/center_display_articles.php
@@ -6,8 +6,8 @@ if ( !empty( $moduleParams ) ) {
 }
 
 include_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
-include_once( ARTICLES_PKG_PATH."lookup_article_inc.php" );
-include_once( ARTICLES_PKG_PATH.'article_filter_inc.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'lookup_article_inc.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'article_filter_inc.php' );
 
 $listHash = array();
 
diff --git a/templates/center_list_articles.php b/templates/center_list_articles.php
index a7ecd8e..7c6c67d 100644
--- a/templates/center_list_articles.php
+++ b/templates/center_list_articles.php
@@ -6,8 +6,8 @@ if ( !empty( $moduleParams ) ) {
 }
 
 include_once( ARTICLES_PKG_CLASS_PATH.'BitArticle.php' );
-include_once( ARTICLES_PKG_PATH."lookup_article_inc.php" );
-include_once( ARTICLES_PKG_PATH.'article_filter_inc.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'lookup_article_inc.php' );
+include_once( ARTICLES_PKG_INCLUDE_PATH.'article_filter_inc.php' );
 
 $listHash = array();