add new option to allow editors to see all available galleries - this makes sense on smaller sites where editors may move around images from one gallery to another

1 files changed, 10 insertions, 8 deletions

diff --git a/edit_image.php b/edit_image.php
index dd8485f..144dc60 100644
--- a/edit_image.php
+++ b/edit_image.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_image.php,v 1.13 2006/12/26 21:46:39 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_image.php,v 1.14 2006/12/27 14:27:40 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -89,13 +89,16 @@ $gContent->loadParentGalleries();
 // Get a list of all existing galleries
 $gFisheyeGallery = new FisheyeGallery();
 $listHash = array(
-	'user_id' => $gContent->isValid() ? $gContent->getField( 'user_id' ) : $gBitUser->mUserId,
-	'max_records'=>-1,
-	'no_thumbnails'=>TRUE,
-	'sort_mode'=>'title_asc',
-	'show_empty' => TRUE,
+	'user_id'       => $gContent->isValid() ? $gContent->getField( 'user_id' ) : $gBitUser->mUserId,
+	'max_records'   => -1,
+	'no_thumbnails' => TRUE,
+	'sort_mode'     => 'title_asc',
+	'show_empty'    => TRUE,
 );
-if( $gBitSystem->isFeatureActive( 'fisheye_show_public_on_upload' ) ) {
+// modify listHash according to global preferences
+if( $gBitSystem->isFeatureActive( 'fisheye_show_all_to_editors' ) && $gBitUser->hasPermission( 'p_fisheye_edit' ) ) {
+	unset( $listHash['user_id'] );
+} elseif( $gBitSystem->isFeatureActive( 'fisheye_show_public_on_upload' ) ) {
 	$listHash['show_public'] = TRUE;
 }
 $galleryList = $gFisheyeGallery->getList( $listHash );
@@ -110,5 +113,4 @@ if( !empty( $_REQUEST['ajax'] ) ) {
 } else {
 	$gBitSystem->display( 'bitpackage:fisheye/edit_image.tpl', 'Edit Image: '.$gContent->getTitle() );
 }
-
 ?>