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

34 files changed, 40 insertions, 43 deletions

diff --git a/admin/admin_fisheye_inc.php b/admin/admin_fisheye_inc.php
index 5a84ad7..3fe94e2 100644
--- a/admin/admin_fisheye_inc.php
+++ b/admin/admin_fisheye_inc.php
@@ -125,7 +125,7 @@ $formImageLists = array(
 );
 $gBitSmarty->assign( 'formImageLists', $formImageLists);
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php' );
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php' );
 $gBitSmarty->assign( 'galleryPaginationTypes', FisheyeGallery::getAllLayouts() );
 
 $sortOptions = array(
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index 245e450..0aee38b 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -98,8 +98,8 @@ if( defined( 'RSS_PKG_NAME' )) {
 
 // ### Register content types
 $gBitInstaller->registerContentObjects( FISHEYE_PKG_NAME, array( 
-	'FisheyeGallery'=>FISHEYE_PKG_PATH.'FisheyeGallery.php',
-	'FisheyeImage'=>FISHEYE_PKG_PATH.'FisheyeImage.php',
+	'FisheyeGallery'=>FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php',
+	'FisheyeImage'=>FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php',
 ));
 
 // Requirements
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 64686f2..bf0e69e 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -43,6 +43,6 @@ if( $gBitSystem->isPackageActive( 'fisheye' ) ) {
 		}
 	}
 
-	include_once( FISHEYE_PKG_PATH.'FisheyeGallery.php' );
+	include_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php' );
 }
 ?>
diff --git a/browse.php b/browse.php
index 7a7c87d..b3d0bbc 100644
--- a/browse.php
+++ b/browse.php
@@ -10,8 +10,8 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 global $gBitSystem, $gBitSmarty;
 
 $gFisheyeGallery = new FisheyeGallery();
diff --git a/div_layout.css b/css/div_layout.css
index 96f9b3f..96f9b3f 100644
--- a/div_layout.css
+++ b/css/div_layout.css
diff --git a/edit.php b/edit.php
index 82336f3..4f26412 100644
--- a/edit.php
+++ b/edit.php
@@ -9,8 +9,8 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 
 global $gBitSystem;
 
diff --git a/edit_gallery_perms.php b/edit_gallery_perms.php
index e720d0f..79ad38a 100644
--- a/edit_gallery_perms.php
+++ b/edit_gallery_perms.php
@@ -10,8 +10,8 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 
 global $gBitSystem, $fisheyePermNameMap;
 
diff --git a/edit_image.php b/edit_image.php
index bb1fc25..9468f18 100644
--- a/edit_image.php
+++ b/edit_image.php
@@ -9,8 +9,8 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 
 global $gBitSystem;
 
diff --git a/fisheye_rss.php b/fisheye_rss.php
index 53d251c..9129900 100644
--- a/fisheye_rss.php
+++ b/fisheye_rss.php
@@ -14,7 +14,7 @@ $gBitSystem->verifyPackage( 'fisheye' );
 $gBitSystem->verifyPackage( 'rss' );
 $gBitSystem->verifyFeature( 'fisheye_rss' );
 
-require_once( FISHEYE_PKG_PATH."FisheyeImage.php" );
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php' );
 require_once( RSS_PKG_INCLUDE_PATH.'rss_inc.php' );
 
 $rss->title = $gBitSystem->getConfig( 'fisheye_rss_title', $gBitSystem->getConfig( 'site_title' ).' - '.tra( 'Image Galleries' ) );
diff --git a/gallery_tree.php b/gallery_tree.php
index 4ab54e2..b76dde1 100644
--- a/gallery_tree.php
+++ b/gallery_tree.php
@@ -10,8 +10,8 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 global $gBitSystem, $gBitSmarty;
 
 $gBitSystem->display("bitpackage:fisheye/gallery_tree.tpl", NULL, array( 'display_mode' => 'display' ));
diff --git a/image_order.php b/image_order.php
index 998579d..c9cbea5 100644
--- a/image_order.php
+++ b/image_order.php
@@ -10,8 +10,8 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 
 global $gBitSystem;
 
diff --git a/FisheyeBase.php b/includes/classes/FisheyeBase.php
index 1519151..1519151 100644
--- a/FisheyeBase.php
+++ b/includes/classes/FisheyeBase.php
diff --git a/FisheyeGallery.php b/includes/classes/FisheyeGallery.php
index b3f1c4a..b0f710d 100644
--- a/FisheyeGallery.php
+++ b/includes/classes/FisheyeGallery.php
@@ -6,7 +6,7 @@
 /**
  * required setup
  */
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php' );		// A gallery is composed of FisheyeImages
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php' );		// A gallery is composed of FisheyeImages
 
 define('FISHEYEGALLERY_CONTENT_TYPE_GUID', 'fisheyegallery' );
 
@@ -254,7 +254,6 @@ class FisheyeGallery extends FisheyeBase {
 					WHERE fgim.`gallery_content_id` = ? $whereSql
 					ORDER BY fgim.`item_position` $orderSql";
 			$rs = $this->mDb->query($query, $bindVars, $rowCount, $offset);
-
 			$rows = $rs->getRows();
 			foreach ($rows as $row) {
 				$pass = TRUE;
@@ -262,8 +261,6 @@ class FisheyeGallery extends FisheyeBase {
 					$pass = $gBitUser->hasPermission( 'p_fisheye_admin' ) || !@$this->verifyId( $row['security_id'] ) || ( $row['user_id'] == $gBitUser->mUserId ) || @$this->verifyId( $_SESSION['gatekeeper_security'][$row['security_id']] );
 				}
 				if( $pass ) {
-					$type = $gLibertySystem->mContentTypes[$row['content_type_guid']];
-					require_once( constant( strtoupper( $type['handler_package'] ).'_PKG_PATH' ).$type['handler_file'] );
 					if( $item = parent::getLibertyObject( $row['item_content_id'], $row['content_type_guid'], $this->isCacheableObject() ) ) {
 						$item->loadThumbnail( $this->mInfo['thumbnail_size'] );
 						$item->setGalleryPath( $this->mGalleryPath.'/'.$this->mGalleryId );
diff --git a/FisheyeImage.php b/includes/classes/FisheyeImage.php
index eaef6e3..84e08bf 100644
--- a/FisheyeImage.php
+++ b/includes/classes/FisheyeImage.php
@@ -6,7 +6,7 @@
 /**
  * required setup
  */
-require_once( FISHEYE_PKG_PATH.'FisheyeBase.php' );
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeBase.php' );
 // Needed for getting event_time and possible image title and data
 require_once( LIBERTY_PKG_PATH.'plugins/mime.image.php' );
 
diff --git a/FisheyeRemote.php b/includes/classes/FisheyeRemote.php
index 7098771..ec69114 100644
--- a/FisheyeRemote.php
+++ b/includes/classes/FisheyeRemote.php
@@ -219,7 +219,7 @@ class FisheyeRemote {
 	}	
 
     function cmdFetchAlbums( $pParamHash ) {
-		require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php' );
+		require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php' );
 		global $gBitUser;
 		if( $gBitUser->isRegistered() ) {
 			$treeGallery = new FisheyeGallery();
diff --git a/display_fisheye_gallery_inc.php b/includes/display_fisheye_gallery_inc.php
index 3682290..f83d6e1 100644
--- a/display_fisheye_gallery_inc.php
+++ b/includes/display_fisheye_gallery_inc.php
@@ -23,7 +23,7 @@ $imagesPerPage = $gContent->getField( 'rows_per_page' ) * $gContent->getField( '
 
 switch( $gContent->getLayout() ) {
 	case 'auto_flow':
-		$gBitThemes->loadCss( FISHEYE_PKG_PATH."div_layout.css", TRUE );
+		$gBitThemes->loadCss( FISHEYE_PKG_PATH."css/div_layout.css", TRUE );
 		break;
 	case 'matteo':
 		$gBitThemes->loadCss( FISHEYE_PKG_PATH."gallery_view/matteo/mb_layout.css", TRUE );
diff --git a/display_fisheye_image_inc.php b/includes/display_fisheye_image_inc.php
index ae341e1..ae341e1 100644
--- a/display_fisheye_image_inc.php
+++ b/includes/display_fisheye_image_inc.php
diff --git a/gallery_lookup_inc.php b/includes/gallery_lookup_inc.php
index b504585..b504585 100644
--- a/gallery_lookup_inc.php
+++ b/includes/gallery_lookup_inc.php
diff --git a/image_lookup_inc.php b/includes/image_lookup_inc.php
index 8de4b0e..8de4b0e 100644
--- a/image_lookup_inc.php
+++ b/includes/image_lookup_inc.php
diff --git a/upload_inc.php b/includes/upload_inc.php
index 90957fb..90957fb 100644
--- a/upload_inc.php
+++ b/includes/upload_inc.php
diff --git a/liberty_plugins/data.carousel.php b/liberty_plugins/data.carousel.php
index 72d5235..71f9dba 100644
--- a/liberty_plugins/data.carousel.php
+++ b/liberty_plugins/data.carousel.php
@@ -66,7 +66,7 @@ function data_carousel( $pData, $pParams ) {
 	if( !empty( $pParams['src'] ) ) {
 		$thumbUrl = $pParams['src'];
 	} elseif( @BitBase::verifyId( $pParams['id'] ) && $gBitSystem->isPackageActive( 'fisheye' )) {
-		require_once( FISHEYE_PKG_PATH.'FisheyeImage.php' );
+		require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php' );
 		$gBitSmarty->loadPlugin( 'smarty_modifier_display_bytes' );
 
 		$gallery = new FisheyeImage();
diff --git a/liberty_plugins/data.gallery.php b/liberty_plugins/data.gallery.php
index fa86592..fd3d047 100644
--- a/liberty_plugins/data.gallery.php
+++ b/liberty_plugins/data.gallery.php
@@ -66,7 +66,7 @@ function data_gallery( $pData, $pParams ) {
 	if( !empty( $pParams['src'] ) ) {
 		$thumbUrl = $pParams['src'];
 	} elseif( @BitBase::verifyId( $pParams['id'] ) && $gBitSystem->isPackageActive( 'fisheye' )) {
-		require_once( FISHEYE_PKG_PATH.'FisheyeImage.php' );
+		require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php' );
 		$gBitSmarty->loadPlugin( 'smarty_modifier_display_bytes' );
 
 		$gallery = new FisheyeImage();
diff --git a/liberty_plugins/data.image.php b/liberty_plugins/data.image.php
index e9b51ec..2b79893 100644
--- a/liberty_plugins/data.image.php
+++ b/liberty_plugins/data.image.php
@@ -66,7 +66,7 @@ function data_image( $pData, $pParams ) {
 	if( !empty( $pParams['src'] ) ) {
 		$thumbUrl = $pParams['src'];
 	} elseif( @BitBase::verifyId( $pParams['id'] ) && $gBitSystem->isPackageActive( 'fisheye' )) {
-		require_once( FISHEYE_PKG_PATH.'FisheyeImage.php' );
+		require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php' );
 		$gBitSmarty->loadPlugin( 'smarty_modifier_display_bytes' );
 
 		$item = new FisheyeImage( $pParams['id'], NULL );
diff --git a/list_galleries.php b/list_galleries.php
index 69bae81..bb36843 100644
--- a/list_galleries.php
+++ b/list_galleries.php
@@ -10,7 +10,7 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
 global $gBitSystem, $gBitSmarty, $gFisheyeGallery;
 
 //$gBitSystem->verifyPermission( 'p_fisheye_list_galleries' );
diff --git a/main.php b/main.php
index 437450f..c1f199b 100644
--- a/main.php
+++ b/main.php
@@ -28,7 +28,7 @@ require_once( '../kernel/setup_inc.php' );
 
 //Point of access for FisheyeRemote requests
 require_once( 'FisheyeRemote.php' );
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php' );
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php' );
 
 $gFisheyeRemote = new FisheyeRemote();
 
diff --git a/modules/mod_banner_rand.php b/modules/mod_banner_rand.php
index a375e86..719cd3b 100644
--- a/modules/mod_banner_rand.php
+++ b/modules/mod_banner_rand.php
@@ -13,7 +13,7 @@ extract( $moduleParams );
 /**
  * required setup
  */
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php' );
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php' );
 
 $image = new FisheyeImage();
 
diff --git a/modules/mod_images.php b/modules/mod_images.php
index 2bbb2c0..b8cd111 100644
--- a/modules/mod_images.php
+++ b/modules/mod_images.php
@@ -13,7 +13,7 @@ extract( $moduleParams );
 /**
  * required setup
  */
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php' );
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php' );
 
 $image = new FisheyeImage();
 
diff --git a/modules/mod_specials.php b/modules/mod_specials.php
index 1c27440..1f24291 100755
--- a/modules/mod_specials.php
+++ b/modules/mod_specials.php
@@ -13,7 +13,7 @@ extract( $moduleParams );
 /**
  * required setup
  */
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php' );
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php' );
 
 $image = new FisheyeImage();
 
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index d7e28a0..4b9fa7d 100644
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -38,8 +38,8 @@
 			<div class="col-xs-6 col-sm-4 col-md-3 ">
 				<div class="{$gal.content_type_guid} thumbnail">
 					{if $gBitSystem->isFeatureActive('fisheye_list_thumbnail') && $gal.display_url}
-					{assign var=thumbnaiUri value=$gBitSystem->getParameter( $gal, 'thumbnail_uri', "`$smarty.const.FISHEYE_PKG_URL`image/no_image.png")}
-					<a href="{$gal.display_url}"><div class="square" style="background-image:url('{$thumbnaiUri}');"alt="{$gal.title|escape}" title="{$gal.title|truncate:50|escape}" {if !empty($gal.data)} data-toggle="popover" data-trigger="click hover focus" data-placement="top" data-content="{$gal.data|truncate:100}"{else}{/if}><img src="{$thumbnaiUri}" alt="{$gal.title|escape}"><h3 class="gallery-title"><a href="{$gal.display_url}">{if $gBitSystem->isFeatureActive('fisheye_list_title')}{$gal.title|truncate:25|escape}{else}Gallery {$gal.gallery_id}{/if}</a></h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
+					{assign var=thumbnailUri value=$gBitSystem->getParameter( $gal, 'thumbnail_uri', "`$smarty.const.FISHEYE_PKG_URL`image/no_image.png")}
+					<a href="{$gal.display_url}"><div class="square" style="background-image:url('{$thumbnailUri}');"alt="{$gal.title|escape}" title="{$gal.title|truncate:50|escape}" {if !empty($gal.data)} data-toggle="popover" data-trigger="click hover focus" data-placement="top" data-content="{$gal.data|truncate:100}"{else}{/if}><img src="{$thumbnailUri}" alt="{$gal.title|escape}"><h3 class="gallery-title"><a href="{$gal.display_url}">{if $gBitSystem->isFeatureActive('fisheye_list_title')}{$gal.title|truncate:25|escape}{else}Gallery {$gal.gallery_id}{/if}</a></h3><div class="security" style="position:absolute; top:5%;right:5%;color:#fff;">
 							{if $gal.is_hidden=='y' || $gal.is_private=='y' || $gal.access_answer}
 								{booticon iname="icon-lock" ipackage="icons" iexplain="Security" label=TRUE}
 							{/if}
diff --git a/thumbnailer.php b/thumbnailer.php
index 34418a3..c94cdf7 100644
--- a/thumbnailer.php
+++ b/thumbnailer.php
@@ -33,7 +33,7 @@
 	// running from cron can cause us not to be in the right dir.
 	chdir( dirname( __FILE__ ) );
 	require_once( '../kernel/setup_inc.php' );
-	require_once( FISHEYE_PKG_PATH.'FisheyeImage.php' );
+	require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php' );
 
 	// add some protection for arbitrary thumbail execution.
 	// if argc is present, we will trust it was exec'ed command line.
diff --git a/upload.php b/upload.php
index c019d82..f3af448 100644
--- a/upload.php
+++ b/upload.php
@@ -9,8 +9,8 @@
  */
 require_once( '../kernel/setup_inc.php' );
 
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 
 global $gBitSystem;
 global $fisheyeErrors, $fisheyeWarnings, $fisheyeSuccess, $gFisheyeUploads;
diff --git a/view.php b/view.php
index d18c185..1e173c8 100644
--- a/view.php
+++ b/view.php
@@ -11,8 +11,8 @@
 require_once( '../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'fisheye' );
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 
 global $gBitSystem, $fisheyeErrors, $fisheyeWarnings, $fisheyeSuccess;
 
diff --git a/view_image.php b/view_image.php
index 604c085..1df880c 100644
--- a/view_image.php
+++ b/view_image.php
@@ -10,8 +10,8 @@
 require_once( '../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'fisheye' );
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 
 global $gBitSystem, $gDebug;
 
diff --git a/view_image_details.php b/view_image_details.php
index 4df70b9..5c37356 100644
--- a/view_image_details.php
+++ b/view_image_details.php
@@ -11,8 +11,8 @@
 require_once( '../kernel/setup_inc.php' );
 
 $gBitSystem->verifyPackage( 'fisheye' );
-require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
-require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeGallery.php');
+require_once( FISHEYE_PKG_CLASS_PATH.'FisheyeImage.php');
 
 global $gBitSystem, $gDebug;