change display call to use a hash for display options, add display_mode to options hash

10 files changed, 24 insertions, 24 deletions

diff --git a/browse.php b/browse.php
index 0a6e7be..e61cd2d 100644
--- a/browse.php
+++ b/browse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/browse.php,v 1.5 2007/10/10 12:10:20 nickpalmer Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/browse.php,v 1.6 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -18,6 +18,6 @@ $gFisheyeGallery = new FisheyeGallery();
 $galleryList = $gFisheyeGallery->getList( $_REQUEST );
 $gBitSmarty->assign_by_ref( 'galleryList', $galleryList );
 
-$gBitSystem->display( "bitpackage:fisheye/browse_galleries.tpl" );
+$gBitSystem->display( "bitpackage:fisheye/browse_galleries.tpl" , NULL, array( 'display_mode' => 'display' ));
 
 ?>
diff --git a/display_fisheye_gallery_inc.php b/display_fisheye_gallery_inc.php
index 2303b86..b2717be 100644
--- a/display_fisheye_gallery_inc.php
+++ b/display_fisheye_gallery_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_gallery_inc.php,v 1.7 2006/11/08 08:02:53 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_gallery_inc.php,v 1.8 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -33,6 +33,6 @@ $gContent->loadImages( $page );
 $gContent->addHit();
 
 $gBitSystem->setBrowserTitle( $gContent->getTitle().' '.tra('Gallery') );
-$gBitSystem->display( $gContent->getRenderTemplate() );
+$gBitSystem->display( $gContent->getRenderTemplate() , NULL, array( 'display_mode' => 'display' ));
 
 ?>
diff --git a/display_fisheye_image_inc.php b/display_fisheye_image_inc.php
index d602628..01c0613 100644
--- a/display_fisheye_image_inc.php
+++ b/display_fisheye_image_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_image_inc.php,v 1.10 2008/06/17 17:05:16 lsces Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_image_inc.php,v 1.11 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -24,6 +24,6 @@ $thumbSize = (!empty( $_REQUEST['size'] ) ? $_REQUEST['size'] :
 // $gContent->mInfo['display_url'] = $gContent->getThumbnailUrl( $thumbSize );
 
 $gBitSystem->setBrowserTitle( $gContent->getTitle() );
-$gBitSystem->display( $gContent->getRenderTemplate() );
+$gBitSystem->display( $gContent->getRenderTemplate() , NULL, array( 'display_mode' => 'display' ));
 
 ?>
diff --git a/edit.php b/edit.php
index 3623f66..3dccfb8 100644
--- a/edit.php
+++ b/edit.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit.php,v 1.26 2008/06/17 17:05:16 lsces Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit.php,v 1.27 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -116,6 +116,6 @@ $gBitSmarty->assign_by_ref( 'galleryList', $galleryList );
 
 $gContent->invokeServices( 'content_edit_function' );
 
-$gBitSystem->display( 'bitpackage:fisheye/edit_gallery.tpl', 'Edit Gallery: '.$gContent->getTitle() );
+$gBitSystem->display( 'bitpackage:fisheye/edit_gallery.tpl', 'Edit Gallery: '.$gContent->getTitle() , array( 'display_mode' => 'edit' ));
 
 ?>
diff --git a/edit_gallery_perms.php b/edit_gallery_perms.php
index 0b6395a..acac972 100644
--- a/edit_gallery_perms.php
+++ b/edit_gallery_perms.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_gallery_perms.php,v 1.4 2005/08/24 20:50:17 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_gallery_perms.php,v 1.5 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -18,7 +18,7 @@ global $gBitSystem, $fisheyePermNameMap;
 // Make sure an gallery has been specified
 if (empty($_REQUEST['gallery_id'])) {
 	$gBitSmarty->assign('msg', tra("No gallery specified"));
-	$gBitSystem->display( "error.tpl" );
+	$gBitSystem->display( "error.tpl" , NULL, array( 'display_mode' => 'edit' ));
 	die;
 }
 
@@ -26,12 +26,12 @@ include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' );
 
 if (empty($gContent->mContentId)) {
 	$gBitSmarty->assign( 'msg', tra( "The specified gallery does not exist" ));
-	$gBitSystem->display("error.tpl");
+	$gBitSystem->display("error.tpl", NULL, array( 'display_mode' => 'edit' ));
 	die;
 } elseif ($gContent->mInfo['user_id'] != $gBitUser->mUserId && $gContent->mInfo['perm_level'] < FISHEYE_PERM_ADMIN) {
 	// This user does not own this gallery and they have not been granted the permission to edit user permissions for this gallery
 	$gBitSmarty->assign( 'msg', tra( "You cannot edit this image gallery" ) );
-	$gBitSystem->display( "error.tpl" );
+	$gBitSystem->display( "error.tpl" , NULL, array( 'display_mode' => 'edit' ));
 	die;
 }
 
@@ -58,6 +58,6 @@ if (!empty($_REQUEST['submitUpdatePerms'])) {
 	$userPerms = $gContent->getAllUserPermissions();
 }
 
-$gBitSystem->display('bitpackage:fisheye/edit_gallery_perms.tpl');
+$gBitSystem->display('bitpackage:fisheye/edit_gallery_perms.tpl', NULL, array( 'display_mode' => 'edit' ));
 
 ?>
diff --git a/edit_image.php b/edit_image.php
index 3bb5bdf..dfe148a 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.22 2007/10/18 01:41:06 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_image.php,v 1.23 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -23,7 +23,7 @@ if( !empty($_REQUEST['saveImage']) || !empty($_REQUEST['regenerateThumbnails'] )
 	if (empty($_REQUEST['gallery_id']) && empty($_REQUEST['image_id'])) {
 		// We have no way to know what gallery to add an image to or what image to edit!
 		$gBitSmarty->assign( 'msg', tra( "No gallery or image was specified" ) );
-		$gBitSystem->display( "error.tpl" );
+		$gBitSystem->display( "error.tpl" , NULL, array( 'display_mode' => 'edit' ));
 		die;
 	}
 
@@ -118,6 +118,6 @@ $gContent->invokeServices( 'content_edit_function' );
 if( !empty( $_REQUEST['ajax'] ) ) {
 	echo $gBitSmarty->fetch( 'bitpackage:fisheye/edit_image_inc.tpl', 'Edit Image: '.$gContent->getTitle() );
 } else {
-	$gBitSystem->display( 'bitpackage:fisheye/edit_image.tpl', 'Edit Image: '.$gContent->getTitle() );
+	$gBitSystem->display( 'bitpackage:fisheye/edit_image.tpl', 'Edit Image: '.$gContent->getTitle() , array( 'display_mode' => 'edit' ));
 }
 ?>
diff --git a/gallery_tree.php b/gallery_tree.php
index ae7805a..cfb4766 100644
--- a/gallery_tree.php
+++ b/gallery_tree.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/gallery_tree.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/gallery_tree.php,v 1.4 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -14,6 +14,6 @@ require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
 require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
 global $gBitSystem, $gBitSmarty;
 
-$gBitSystem->display("bitpackage:fisheye/gallery_tree.tpl");
+$gBitSystem->display("bitpackage:fisheye/gallery_tree.tpl", NULL, array( 'display_mode' => 'display' ));
 
 ?>
diff --git a/image_order.php b/image_order.php
index dfa05f2..d87b2be 100644
--- a/image_order.php
+++ b/image_order.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/image_order.php,v 1.29 2008/06/17 17:05:16 lsces Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/image_order.php,v 1.30 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -218,5 +218,5 @@ $gContent->loadImages();
 $gBitSmarty->assign_by_ref('formfeedback', $feedback);
 
 $gBitThemes->loadAjax( 'mochikit' );
-$gBitSystem->display( 'bitpackage:fisheye/image_order.tpl', tra( 'Edit Gallery Images' ).': '.$gContent->getTitle() );
+$gBitSystem->display( 'bitpackage:fisheye/image_order.tpl', tra( 'Edit Gallery Images' ).': '.$gContent->getTitle() , array( 'display_mode' => 'display' ));
 ?>
diff --git a/list_galleries.php b/list_galleries.php
index eaa6da2..f21fe5d 100644
--- a/list_galleries.php
+++ b/list_galleries.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/list_galleries.php,v 1.11 2007/10/10 12:10:20 nickpalmer Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/list_galleries.php,v 1.12 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -39,6 +39,6 @@ $gBitSmarty->assign( 'galleryList', $galleryList );
 // Display the template
 $gDefaultCenter = "bitpackage:fisheye/$template";
 $gBitSmarty->assign_by_ref( 'gDefaultCenter', $gDefaultCenter );
-$gBitSystem->display( 'bitpackage:kernel/dynamic.tpl', 'List Galleries' );
+$gBitSystem->display( 'bitpackage:kernel/dynamic.tpl', 'List Galleries' , array( 'display_mode' => 'list' ));
 
 ?>
diff --git a/upload.php b/upload.php
index 1a85523..3e3e754 100644
--- a/upload.php
+++ b/upload.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload.php,v 1.35 2007/11/08 21:59:34 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload.php,v 1.36 2008/06/25 22:21:09 spiderr Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -121,5 +121,5 @@ if( $gBitSystem->isPackageActive( 'gigaupload' ) ) {
 	$gBitThemes->loadJavascript( UTIL_PKG_PATH.'javascript/libs/multifile.js', TRUE );
 }
 
-$gBitSystem->display( 'bitpackage:fisheye/upload_fisheye.tpl', 'Upload Images' );
+$gBitSystem->display( 'bitpackage:fisheye/upload_fisheye.tpl', 'Upload Images' , array( 'display_mode' => 'display' ));
 ?>