move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

15 files changed, 18 insertions, 18 deletions

diff --git a/backlinks.php b/backlinks.php
index 3c01f90..7491ed9 100644
--- a/backlinks.php
+++ b/backlinks.php
@@ -13,7 +13,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'lookup_page_inc.php');
+include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php');
 
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_backlinks' );
diff --git a/copyrights.php b/copyrights.php
index 6a5dd46..31160e2 100644
--- a/copyrights.php
+++ b/copyrights.php
@@ -17,8 +17,8 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->isFeatureActive( 'wiki_copyrights', tra("The copyright management feature is not enabled.") );
 
 $gBitUser->hasPermission( 'p_wiki_edit_copyright' );
-require_once( WIKI_PKG_PATH.'copyrights_lib.php' );
-require_once( WIKI_PKG_PATH.'lookup_page_inc.php' );
+require_once( WIKI_PKG_INCLUDE_PATH.'copyrights_lib.php' );
+require_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 if (isset($_REQUEST['addcopyright'])) {
 	if ($gBitSystem->isFeatureActive( 'wiki_copyrights' ) && isset($_REQUEST['copyrightTitle']) && isset($_REQUEST['copyrightYear'])
diff --git a/edit.php b/edit.php
index 76b2cb3..36cf39e 100644
--- a/edit.php
+++ b/edit.php
@@ -14,7 +14,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitBook.php' );
+include_once( WIKI_PKG_CLASS_PATH.'BitBook.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
 
@@ -22,7 +22,7 @@ $gBitSystem->verifyPackage( 'wiki' );
 unset($_REQUEST['content_id']);
 // Disable parsing data if not asking to preview page
 $_REQUEST["parse"] = false;
-include( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 if( $gContent->isValid() ) {
 	$gContent->verifyUpdatePermission();
@@ -142,7 +142,7 @@ if( isset( $_REQUEST["fCancel"] ) ) {
 		&& !empty( $_REQUEST['copyrightYear'] )
 		&& !empty( $_REQUEST['copyrightTitle'] )
 	) {
-		require_once( WIKI_PKG_PATH.'copyrights_lib.php' );
+		require_once( WIKI_PKG_INCLUDE_PATH.'copyrights_lib.php' );
 		$copyrightYear = $_REQUEST['copyrightYear'];
 		$copyrightTitle = $_REQUEST['copyrightTitle'];
 		$copyrightAuthors = $_REQUEST['copyrightAuthors'];
diff --git a/export_wiki_pages.php b/export_wiki_pages.php
index c6f18fb..1c5d5bb 100644
--- a/export_wiki_pages.php
+++ b/export_wiki_pages.php
@@ -15,7 +15,7 @@
  */
 require_once( '../kernel/setup_inc.php' );
 include_once( UTIL_PKG_INC.'zip_lib.php' );
-include_once( WIKI_PKG_PATH.'export_lib.php' );
+include_once( WIKI_PKG_INCLUDE_PATH.'export_lib.php' );
 if (!$gBitUser->hasPermission( 'p_wiki_admin' ))
 	die;
 if (!isset($_REQUEST["page_id"])) {
diff --git a/includes/classes/BitPage.php b/includes/classes/BitPage.php
index 7a3680b..48e2f84 100644
--- a/includes/classes/BitPage.php
+++ b/includes/classes/BitPage.php
@@ -484,7 +484,7 @@ class BitPage extends LibertyMime implements BitCacheable {
 	* @return the fully specified path to file to be included
 	*/
 	function getRenderFile() {
-		return WIKI_PKG_PATH."display_bitpage_inc.php";
+		return WIKI_PKG_INCLUDE_PATH."display_bitpage_inc.php";
 	}
 
 
diff --git a/copyrights_lib.php b/includes/copyrights_lib.php
index ef8d1be..ef8d1be 100644
--- a/copyrights_lib.php
+++ b/includes/copyrights_lib.php
diff --git a/display_bitpage_inc.php b/includes/display_bitpage_inc.php
index eaa118c..a8c92f6 100644
--- a/display_bitpage_inc.php
+++ b/includes/display_bitpage_inc.php
@@ -122,7 +122,7 @@ if( $gBitSystem->isFeatureActive( 'wiki_footnotes' ) && $gBitUser->isValid() ) {
 
 // Copyrights
 if( $gBitSystem->isFeatureActive( 'wiki_copyrights' ) ) {
-	require_once( WIKI_PKG_PATH.'copyrights_lib.php' );
+	require_once( WIKI_PKG_INCLUDE_PATH.'copyrights_lib.php' );
 	$copyrights = $copyrightslib->list_copyrights( $gContent->mPageId );
 	$gBitSmarty->assign('pageCopyrights', $copyrights["data"]);
 }
diff --git a/export_lib.php b/includes/export_lib.php
index e63877c..e63877c 100644
--- a/export_lib.php
+++ b/includes/export_lib.php
diff --git a/lookup_page_inc.php b/includes/lookup_page_inc.php
index 0fd5e17..0fd5e17 100644
--- a/lookup_page_inc.php
+++ b/includes/lookup_page_inc.php
diff --git a/plugins_lib.php b/includes/plugins_lib.php
index 61ffe41..61ffe41 100644
--- a/plugins_lib.php
+++ b/includes/plugins_lib.php
diff --git a/index.php b/index.php
index 676a1ac..21f4986 100644
--- a/index.php
+++ b/index.php
@@ -43,9 +43,9 @@ if( !empty( $_REQUEST['structure_id'] ) ) {
 		$gHome->store( $homeHash );
 	}
 
-	include( WIKI_PKG_PATH.'lookup_page_inc.php' );
+	include( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 	if( $gContent->isValid() ) {
 		$gBitSystem->setCanonicalLink( $gContent->getDisplayUrl() );
 	}
-	include( WIKI_PKG_PATH.'display_bitpage_inc.php' );
+	include( WIKI_PKG_INCLUDE_PATH.'display_bitpage_inc.php' );
 }
diff --git a/like_pages.php b/like_pages.php
index d23c719..5a9a700 100644
--- a/like_pages.php
+++ b/like_pages.php
@@ -14,8 +14,8 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php');
-include_once( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
+include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_like_pages' );
 $gBitSystem->verifyPermission( 'p_wiki_list_pages' );
diff --git a/page_history.php b/page_history.php
index 1c7653e..03f8af2 100644
--- a/page_history.php
+++ b/page_history.php
@@ -20,7 +20,7 @@ $gBitSystem->verifyPackage( 'wiki' );
 $gBitSystem->verifyFeature( 'wiki_history' );
 
 // Get the page from the request var or default it to HomePage
-include( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 //vd($gContent->mPageId);vd($gContent->mInfo);
 if( !$gContent->isValid() || empty( $gContent->mInfo ) ) {
diff --git a/remove_page.php b/remove_page.php
index ea7f86e..dbf0247 100644
--- a/remove_page.php
+++ b/remove_page.php
@@ -14,8 +14,8 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php');
-include_once( WIKI_PKG_PATH.'lookup_page_inc.php' );
+include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
+include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php' );
 
 $gBitSystem->verifyPackage( 'wiki' );
 
diff --git a/wiki_graph.php b/wiki_graph.php
index d4c82fa..19b34c6 100644
--- a/wiki_graph.php
+++ b/wiki_graph.php
@@ -14,8 +14,8 @@
  * required setup
  */
 include_once( '../kernel/setup_inc.php' );
-include_once( WIKI_PKG_PATH.'BitPage.php');
-include_once( WIKI_PKG_PATH.'lookup_page_inc.php');
+include_once( WIKI_PKG_CLASS_PATH.'BitPage.php');
+include_once( WIKI_PKG_INCLUDE_PATH.'lookup_page_inc.php');
 include_once( 'Image/GraphViz.php' );
 $graph = new Image_GraphViz();