move _inc and _lib to includes/ and use PKG_INCLUDE_PATH constants

14 files changed, 21 insertions, 21 deletions

diff --git a/FisheyeBase.php b/FisheyeBase.php
index d565e46..1519151 100644
--- a/FisheyeBase.php
+++ b/FisheyeBase.php
@@ -6,7 +6,7 @@
 /**
  * required setup
  */
-require_once( LIBERTY_PKG_PATH.'LibertyMime.php' );		// FisheyeGallery base class
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyMime.php' );		// FisheyeGallery base class
 
 /**
  * @package fisheye
diff --git a/FisheyeGallery.php b/FisheyeGallery.php
index 9d5f3fa..b3f1c4a 100644
--- a/FisheyeGallery.php
+++ b/FisheyeGallery.php
@@ -649,7 +649,7 @@ class FisheyeGallery extends FisheyeBase {
     * @return the fully specified path to file to be included
     */
 	function getRenderFile() {
-		return FISHEYE_PKG_PATH."display_fisheye_gallery_inc.php";
+		return FISHEYE_PKG_INCLUDE_PATH.'display_fisheye_gallery_inc.php';
 	}
 
     /**
diff --git a/FisheyeImage.php b/FisheyeImage.php
index 6584507..eaef6e3 100644
--- a/FisheyeImage.php
+++ b/FisheyeImage.php
@@ -595,7 +595,7 @@ class FisheyeImage extends FisheyeBase {
     * @return the fully specified path to file to be included
     */
 	function getRenderFile() {
-		return FISHEYE_PKG_PATH."display_fisheye_image_inc.php";
+		return FISHEYE_PKG_INCLUDE_PATH.'display_fisheye_image_inc.php';
 	}
 
     /**
diff --git a/FisheyeRemote.php b/FisheyeRemote.php
index 8b3acca..7098771 100644
--- a/FisheyeRemote.php
+++ b/FisheyeRemote.php
@@ -255,7 +255,7 @@ class FisheyeRemote {
 			$storeHash['summary'] = !empty( $pParamHash['extrafield.Summary'] ) ? $pParamHash['extrafield.Summary'] : NULL;
 			$storeHash['edit'] = !empty( $pParamHash['extrafield.Description'] ) ? $pParamHash['extrafield.Description'] : NULL;
 
-			require_once (FISHEYE_PKG_PATH.'upload_inc.php');	
+			require_once (FISHEYE_PKG_INCLUDE_PATH.'upload_inc.php');	
 		
 			$parentGallery = new FisheyeGallery();
 			if( $parentGallery = $parentGallery->lookup(array('content_id' => $pParamHash['set_albumName'] ) ) ) {
diff --git a/edit.php b/edit.php
index ae4fbb2..82336f3 100644
--- a/edit.php
+++ b/edit.php
@@ -14,7 +14,7 @@ require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
 
 global $gBitSystem;
 
-include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' );
+include_once( FISHEYE_PKG_INCLUDE_PATH.'gallery_lookup_inc.php' );
 
 // Ensure the user has the permission to create new image galleries
 if( $gContent->isValid() ){
diff --git a/edit_gallery_perms.php b/edit_gallery_perms.php
index d77ba8c..e720d0f 100644
--- a/edit_gallery_perms.php
+++ b/edit_gallery_perms.php
@@ -22,7 +22,7 @@ if (empty($_REQUEST['gallery_id'])) {
 	die;
 }
 
-include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' );
+include_once( FISHEYE_PKG_INCLUDE_PATH.'gallery_lookup_inc.php' );
 
 if (empty($gContent->mContentId)) {
 	$gBitSmarty->assign( 'msg', tra( "The specified gallery does not exist" ));
diff --git a/edit_image.php b/edit_image.php
index 7fd93c4..bb1fc25 100644
--- a/edit_image.php
+++ b/edit_image.php
@@ -14,7 +14,7 @@ require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
 
 global $gBitSystem;
 
-include_once( FISHEYE_PKG_PATH.'image_lookup_inc.php' );
+include_once( FISHEYE_PKG_INCLUDE_PATH.'image_lookup_inc.php' );
 
 if( $gContent->isValid() ) {
 	$gContent->verifyUpdatePermission();
diff --git a/fisheye_rss.php b/fisheye_rss.php
index 68dbb8d..53d251c 100644
--- a/fisheye_rss.php
+++ b/fisheye_rss.php
@@ -15,7 +15,7 @@ $gBitSystem->verifyPackage( 'rss' );
 $gBitSystem->verifyFeature( 'fisheye_rss' );
 
 require_once( FISHEYE_PKG_PATH."FisheyeImage.php" );
-require_once( RSS_PKG_PATH."rss_inc.php" );
+require_once( RSS_PKG_INCLUDE_PATH.'rss_inc.php' );
 
 $rss->title = $gBitSystem->getConfig( 'fisheye_rss_title', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'Image Galleries' ) );
 $rss->description = $gBitSystem->getConfig( 'fisheye_rss_description', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'RSS Feed' ) );
diff --git a/image_order.php b/image_order.php
index 6f2f04c..998579d 100644
--- a/image_order.php
+++ b/image_order.php
@@ -15,7 +15,7 @@ require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
 
 global $gBitSystem;
 
-include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' );
+include_once( FISHEYE_PKG_INCLUDE_PATH.'gallery_lookup_inc.php' );
 
 if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
 	global $gGatekeeper;
diff --git a/templates/center_image_comments.php b/templates/center_image_comments.php
index c803d18..01aeec0 100644
--- a/templates/center_image_comments.php
+++ b/templates/center_image_comments.php
@@ -8,7 +8,7 @@
 /**
  * A specialized version of liberty/modules/mod_last_comments.php for fisheye
  */
-require_once( LIBERTY_PKG_PATH.'LibertyComment.php' );
+require_once( LIBERTY_PKG_CLASS_PATH.'LibertyComment.php' );
 global $gQueryUser, $gBitUser, $gLibertySystem, $moduleParams;
 $params = $moduleParams['module_params'];
 $moduleTitle = !empty($moduleParams['title'])? $moduleParams['title'] : 'Recent Image Comments';
diff --git a/upload.php b/upload.php
index 6d8d915..c019d82 100644
--- a/upload.php
+++ b/upload.php
@@ -15,8 +15,8 @@ require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
 global $gBitSystem;
 global $fisheyeErrors, $fisheyeWarnings, $fisheyeSuccess, $gFisheyeUploads;
 
-include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' );
-require_once( FISHEYE_PKG_PATH.'upload_inc.php');
+include_once( FISHEYE_PKG_INCLUDE_PATH.'gallery_lookup_inc.php' );
+require_once( FISHEYE_PKG_INCLUDE_PATH.'upload_inc.php');
 
 $gBitSystem->verifyPermission( 'p_fisheye_upload' );
 
@@ -36,7 +36,7 @@ if ( !empty($_REQUEST['on_complete'])){
 
 }
 
-require_once( LIBERTY_PKG_PATH.'calculate_max_upload_inc.php' );
+require_once( LIBERTY_PKG_INCLUDE_PATH.'calculate_max_upload_inc.php' );
 
 $gContent->invokeServices( 'content_edit_function' );
 
diff --git a/view.php b/view.php
index d7b6490..d18c185 100644
--- a/view.php
+++ b/view.php
@@ -18,7 +18,7 @@ global $gBitSystem, $fisheyeErrors, $fisheyeWarnings, $fisheyeSuccess;
 
 //$gDebug = TRUE;
 
-include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' );
+include_once( FISHEYE_PKG_INCLUDE_PATH.'gallery_lookup_inc.php' );
 
 if( $gContent && $gContent->isValid() ) {
 	$gBitSystem->setCanonicalLink( $gContent->getDisplayUrl() );
@@ -39,7 +39,7 @@ if( $gContent->isCommentable() ) {
 	$comments_prefix_var='fisheyegallery:';
 	$comments_object_var='fisheyegallery';
 	$comments_return_url = $_SERVER['SCRIPT_NAME']."?gallery_id=".$gContent->mGalleryId;
-	include_once( LIBERTY_PKG_PATH.'comments_inc.php' );
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php' );
 }
 
 if (!empty($_REQUEST['download'])){			
@@ -48,7 +48,7 @@ if (!empty($_REQUEST['download'])){
 	$gContent->verifyUserPermission('p_fisheye_download_gallery_arc');
 	$gContent->download();
 } else {
-	require_once( FISHEYE_PKG_PATH.'display_fisheye_gallery_inc.php' );
+	require_once( FISHEYE_PKG_INCLUDE_PATH.'display_fisheye_gallery_inc.php' );
 }
 
 ?>
diff --git a/view_image.php b/view_image.php
index 4c362cd..604c085 100644
--- a/view_image.php
+++ b/view_image.php
@@ -25,7 +25,7 @@ if( !empty( $_REQUEST['refresh'] ) ) {
 	$gBitSmarty->assign( 'refresh', '?refresh='.time() );
 }
 
-include_once( FISHEYE_PKG_PATH.'image_lookup_inc.php' );
+include_once( FISHEYE_PKG_INCLUDE_PATH.'image_lookup_inc.php' );
 
 if( $gContent && $gContent->isValid() ) {
 	$gBitSystem->setCanonicalLink( $gContent->getDisplayUrl() );
@@ -40,7 +40,7 @@ if( is_object( $gGallery ) && $gGallery->isCommentable() ) {
 	$comments_prefix_var='fisheyeimage:';
 	$comments_object_var='fisheyeimage';
 	$comments_return_url = $_SERVER['SCRIPT_NAME']."?image_id=".$gContent->mImageId;
-	include_once( LIBERTY_PKG_PATH.'comments_inc.php' );
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php' );
 }
 
 $gContent->addHit();
@@ -56,4 +56,4 @@ if( $gContent->hasUpdatePermission() ) {
 	}
 }
 
-require_once( FISHEYE_PKG_PATH.'display_fisheye_image_inc.php' );
+require_once( FISHEYE_PKG_INCLUDE_PATH.'display_fisheye_image_inc.php' );
diff --git a/view_image_details.php b/view_image_details.php
index 0264a6a..4df70b9 100644
--- a/view_image_details.php
+++ b/view_image_details.php
@@ -16,7 +16,7 @@ require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
 
 global $gBitSystem, $gDebug;
 
-include_once( FISHEYE_PKG_PATH.'image_lookup_inc.php' );
+include_once( FISHEYE_PKG_INCLUDE_PATH.'image_lookup_inc.php' );
 
 $gContent->invokeServices( 'content_display_function', $displayHash );
 
@@ -26,7 +26,7 @@ if( is_object( $gGallery ) && $gGallery->isCommentable() ) {
 	$comments_prefix_var='fisheyeimage:';
 	$comments_object_var='fisheyeimage';
 	$comments_return_url = FISHEYE_PKG_URL."view_image.php?image_id=".$gContent->mImageId;
-	include_once( LIBERTY_PKG_PATH.'comments_inc.php' );
+	include_once( LIBERTY_PKG_INCLUDE_PATH.'comments_inc.php' );
 }
 
 $gBitSmarty->display( 'bitpackage:fisheye/view_image_details.tpl' );