move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

7 files changed, 12 insertions, 12 deletions

diff --git a/Pigeonholes.php b/Pigeonholes.php
index 695ee52..558fca9 100644
--- a/Pigeonholes.php
+++ b/Pigeonholes.php
@@ -24,8 +24,8 @@
 /**
  * required setup
  */
-require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );
-require_once( LIBERTY_PKG_PATH.'LibertyStructure.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php' );
 
 /**
  * Pigeonholes
@@ -879,7 +879,7 @@ class Pigeonholes extends LibertyMime {
 		if( $this->isValid() ) {
 			$this->mDb->StartTrans();
 			// get all items that are part of the sub tree
-			require_once( LIBERTY_PKG_PATH.'LibertyStructure.php' );
+			require_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php' );
 			$struct = new LibertyStructure();
 
 			// include the current structure id as well
diff --git a/assign_content.php b/assign_content.php
index 9e15b47..25cf558 100644
--- a/assign_content.php
+++ b/assign_content.php
@@ -21,7 +21,7 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPackage( 'pigeonholes' );
 $gBitSystem->verifyPermission( 'p_pigeonholes_insert_member' );
 
-include_once( PIGEONHOLES_PKG_PATH.'lookup_pigeonholes_inc.php' );
+include_once( PIGEONHOLES_PKG_INCLUDE_PATH.'lookup_pigeonholes_inc.php' );
 
 $feedback = '';
 $gBitSmarty->assignByRef( 'feedback', $feedback );
diff --git a/edit_pigeonholes.php b/edit_pigeonholes.php
index d489f4f..5453471 100644
--- a/edit_pigeonholes.php
+++ b/edit_pigeonholes.php
@@ -21,14 +21,14 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPackage( 'pigeonholes' );
 $gBitSystem->verifyPermission( 'p_pigeonholes_create' );
 
-include_once( LIBERTY_PKG_PATH.'LibertyStructure.php' );
-include_once( PIGEONHOLES_PKG_PATH.'lookup_pigeonholes_inc.php' );
+include_once( LIBERTY_PKG_CLASS_PATH.'LibertyStructure.php' );
+include_once( PIGEONHOLES_PKG_INCLUDE_PATH.'lookup_pigeonholes_inc.php' );
 
 // include edit structure file only when structure_id is known
 if( !empty( $_REQUEST["structure_id"] ) && ( empty( $_REQUEST['action'] ) || $_REQUEST['action'] != 'remove' ) ) {
 	$verifyStructurePermission = 'p_pigeonholes_create';
 	$noAjaxContent = TRUE;
-	include_once( LIBERTY_PKG_PATH.'edit_structure_inc.php' );
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'edit_structure_inc.php' );
 
 	// get all the nodes in this structure
 	foreach( $rootTree as $node ) {
diff --git a/edit_structure.php b/edit_structure.php
index 17acbe5..43ba53d 100644
--- a/edit_structure.php
+++ b/edit_structure.php
@@ -28,10 +28,10 @@ if( $gSniffer->_browser_info['browser'] == 'ie' && $gSniffer->_browser_info['maj
 }
 $gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/libs/mygosu/DynamicTreeBuilder.js' );
 
-include_once( PIGEONHOLES_PKG_PATH.'lookup_pigeonholes_inc.php' );
+include_once( PIGEONHOLES_PKG_INCLUDE_PATH.'lookup_pigeonholes_inc.php' );
 
 $verifyStructurePermission = 'p_pigeonholes_create';
-include_once( LIBERTY_PKG_PATH.'edit_structure_inc.php' );
+include_once( LIBERTY_PKG_INCLUDE_PATH.'edit_structure_inc.php' );
 
 // Display the template
 $gBitSystem->display( 'bitpackage:pigeonholes/edit_structure.tpl', $gStructure->mInfo["title"] , array( 'display_mode' => 'edit' ));
diff --git a/index.php b/index.php
index 223a677..a608e95 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,7 @@
  * required setup
  */
 require_once( '../kernel/setup_inc.php' );
-include_once( PIGEONHOLES_PKG_PATH.'lookup_pigeonholes_inc.php' );
+include_once( PIGEONHOLES_PKG_INCLUDE_PATH.'lookup_pigeonholes_inc.php' );
 if( !empty( $gContent->mStructureId ) ) {
 	header( 'Location: '.$gContent->getDisplayUrl() );
 } else {
diff --git a/list.php b/list.php
index 9ea6d6f..4132067 100644
--- a/list.php
+++ b/list.php
@@ -16,7 +16,7 @@ require_once("../kernel/setup_inc.php");
 $gBitSystem->verifyPackage( 'pigeonholes' );
 $gBitSystem->verifyPermission( 'p_pigeonholes_view' );
 
-include_once( PIGEONHOLES_PKG_PATH.'lookup_pigeonholes_inc.php' );
+include_once( PIGEONHOLES_PKG_INCLUDE_PATH.'lookup_pigeonholes_inc.php' );
 
 $listHash = &$_REQUEST;
 $listHash['load_only_root'] = TRUE;
diff --git a/view.php b/view.php
index 0158937..c0df7ea 100644
--- a/view.php
+++ b/view.php
@@ -21,7 +21,7 @@ require_once( '../kernel/setup_inc.php' );
 $gBitSystem->verifyPackage( 'pigeonholes' );
 $gBitSystem->verifyPermission( 'p_pigeonholes_view' );
 
-include_once( PIGEONHOLES_PKG_PATH.'lookup_pigeonholes_inc.php' );
+include_once( PIGEONHOLES_PKG_INCLUDE_PATH.'lookup_pigeonholes_inc.php' );
 
 /* If we came in via structure_id redirect to content_id */
 if (isset($_REQUEST['structure_id'])) {