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

16 files changed, 15 insertions, 15 deletions

diff --git a/admin/pump_wiki_inc.php b/admin/pump_wiki_inc.php
index 92a6afa..ba4c01e 100644
--- a/admin/pump_wiki_inc.php
+++ b/admin/pump_wiki_inc.php
@@ -7,7 +7,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 $tutorial_intro = '^This tutorial does not contain any direct links to any particular pages. This is to help you understand how to navigate bitweaver. If you don\'t feel confident about finding your way back to this page, it might be useful to open a second browser window to carry out these instructions or print this page before continuing.
 
diff --git a/display_bitpage_inc.php b/display_bitpage_inc.php
index ba8e63b..eaa118c 100644
--- a/display_bitpage_inc.php
+++ b/display_bitpage_inc.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-include_once( WIKI_PKG_PATH.'BitBook.php');
+include_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
 
diff --git a/export_lib.php b/export_lib.php
index 58f9377..e63877c 100644
--- a/export_lib.php
+++ b/export_lib.php
@@ -13,7 +13,7 @@
  * required setup
  */
 require_once( KERNEL_PKG_PATH.'BitBase.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 /**
  * @package wiki
  * @subpackage ExportLib
diff --git a/BitBook.php b/includes/classes/BitBook.php
index 3845e2e..a028742 100644
--- a/BitBook.php
+++ b/includes/classes/BitBook.php
@@ -24,7 +24,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 require_once( LIBERTY_PKG_PATH.'LibertyStructure.php' );
 
 define('BITBOOK_CONTENT_TYPE_GUID', 'bitbook' );
diff --git a/BitPage.php b/includes/classes/BitPage.php
index 7a3680b..7a3680b 100644
--- a/BitPage.php
+++ b/includes/classes/BitPage.php
diff --git a/index.php b/index.php
index c5aecbd..676a1ac 100644
--- a/index.php
+++ b/index.php
@@ -16,7 +16,7 @@
 require_once( '../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 if( !empty( $_REQUEST['structure_id'] ) ) {
 	include( LIBERTY_PKG_PATH.'display_structure_inc.php' );
diff --git a/list_pages.php b/list_pages.php
index be8ef91..56957ca 100644
--- a/list_pages.php
+++ b/list_pages.php
@@ -8,7 +8,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 // verify stuff
 $gBitSystem->verifyPackage( 'wiki' );
diff --git a/lookup_page_inc.php b/lookup_page_inc.php
index 33650be..0fd5e17 100644
--- a/lookup_page_inc.php
+++ b/lookup_page_inc.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitBook.php');
+require_once( WIKI_PKG_CLASS_PATH.'BitBook.php');
 
 global $gContent;
 include_once( LIBERTY_PKG_PATH.'lookup_content_inc.php' );
diff --git a/modules/mod_comm_received_objects.php b/modules/mod_comm_received_objects.php
index 6c857b5..667a588 100644
--- a/modules/mod_comm_received_objects.php
+++ b/modules/mod_comm_received_objects.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 $wikilib = new WikiLib();
 $ranking = $wikilib->list_received_pages(0, -1, $sort_mode = 'title_asc', '');
 $_template->tpl_vars['modReceivedPages'] = new Smarty_variable( $ranking["cant"]);
diff --git a/modules/mod_random_pages.php b/modules/mod_random_pages.php
index a104820..a6674bc 100644
--- a/modules/mod_random_pages.php
+++ b/modules/mod_random_pages.php
@@ -13,7 +13,7 @@
 /**
  * Required files
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 $wp = new BitPage();
 
 if( $gBitUser->hasPermission( 'p_wiki_view_page' ) ) {
diff --git a/modules/mod_recent_page_changes.php b/modules/mod_recent_page_changes.php
index 93e3e14..5299b5b 100644
--- a/modules/mod_recent_page_changes.php
+++ b/modules/mod_recent_page_changes.php
@@ -16,7 +16,7 @@ global $gQueryUserId, $moduleParams;
  */
  
 if( $gBitUser->hasPermission( 'p_wiki_view_page' ) ) {
-	require_once( WIKI_PKG_PATH.'BitPage.php' );
+	require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 	$wp = new BitPage();
 
 	$listHash = array(
diff --git a/modules/mod_top_pages.php b/modules/mod_top_pages.php
index 052228c..0062542 100644
--- a/modules/mod_top_pages.php
+++ b/modules/mod_top_pages.php
@@ -13,7 +13,7 @@
 /**
  * required setup
  */
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 global $gQueryUser, $module_rows, $module_params;
 
 extract( $moduleParams );
diff --git a/page_history.php b/page_history.php
index ebd3063..1c7653e 100644
--- a/page_history.php
+++ b/page_history.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php');
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_history' );
diff --git a/print_multi_pages.php b/print_multi_pages.php
index 0fafcc5..154233b 100644
--- a/print_multi_pages.php
+++ b/print_multi_pages.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 
 $gBitSystem->verifyFeature( 'wiki_multiprint' );
 
diff --git a/print_pages.php b/print_pages.php
index 4c27d5b..cf7c6d8 100644
--- a/print_pages.php
+++ b/print_pages.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-require_once( WIKI_PKG_PATH.'BitPage.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitPage.php' );
 if( !$gBitSystem->isFeatureActive( 'wiki_multiprint' ) ) {
 	$gBitSystem->fatalError( tra("This feature is disabled").": wiki_multiprint" );
 }
diff --git a/sitemap.php b/sitemap.php
index 3556a4e..8828a10 100644
--- a/sitemap.php
+++ b/sitemap.php
@@ -15,7 +15,7 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( WIKI_PKG_PATH.'BitBook.php' );
+require_once( WIKI_PKG_CLASS_PATH.'BitBook.php' );
 
 $book = new BitBook();
 $gSiteMapHash = array();