merge recent changes with HEAD - R1 and HEAD are identical now

26 files changed, 140 insertions, 119 deletions

diff --git a/FisheyeBase.php b/FisheyeBase.php
index 1751956..d7f67aa 100644
--- a/FisheyeBase.php
+++ b/FisheyeBase.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeBase.php,v 1.6 2005/07/25 20:01:48 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeBase.php,v 1.7 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  */
 
@@ -160,7 +160,7 @@ class FisheyeBase extends LibertyAttachable
 						  WHERE `cb_gallery_content_id`=?
 						  ORDER BY branch
 						";
-				if ( $this->GetOne($query, array( $pGalleryContentId, $pItemContentId ) ) ) {
+				if ( $this->GetOne($query, array(  $pItemContentId, $pGalleryContentId ) ) ) {
 					$ret = TRUE;
 				}
 			} else {
diff --git a/FisheyeGallery.php b/FisheyeGallery.php
index e603e6c..40ac02e 100644
--- a/FisheyeGallery.php
+++ b/FisheyeGallery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.4 2005/07/25 20:02:04 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.5 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  */
 
@@ -354,9 +354,14 @@ class FisheyeGallery extends FisheyeBase {
 		return $ret;
 	}
 
+    /**
+    * Adds a new item (image or gallery) to this gallery. We check to make sure we are not a member
+	* of this gallery and this gallery is not a member of the new item to avoid infinite recursion scenarios
+    * @return boolean wheter or not the item was added
+    */
 	function addItem( $pContentId, $pPosition=NULL ) {
 		$ret = FALSE;
-		if( $this->isValid() && is_numeric( $pContentId ) && ( $this->mContentId != $pContentId ) && !$this->isInGallery( $this->mContentId, $pContentId ) ) {
+		if( $this->isValid() && is_numeric( $pContentId ) && ( $this->mContentId != $pContentId ) && !$this->isInGallery( $this->mContentId, $pContentId  )  && !$this->isInGallery( $pContentId, $this->mContentId ) ) {
 			$query = "INSERT INTO `".BIT_DB_PREFIX."tiki_fisheye_gallery_image_map` (`item_content_id`, `gallery_content_id`, `position`) VALUES (?,?,?)";
 			$rs = $this->query($query, array($pContentId, $this->mContentId, $pPosition ) );
 			$ret = TRUE;
@@ -493,8 +498,10 @@ vd( $this->mErrors );
 		if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
 			$select .= ' ,ts.`security_id`, ts.`security_description`, ts.`is_private`, ts.`is_hidden`, ts.`access_question`, ts.`access_answer` ';
 			$join .= " LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_content_security_map` tcs ON (tc.`content_id`=tcs.`content_id`) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_security` ts ON (ts.`security_id`=tcs.`security_id` )";
-			$mid .= ' AND (tcs.`security_id` IS NULL OR tc.`user_id`=?) ';
-			$bindVars[] = $gBitUser->mUserId;
+			if( !$gBitUser->isAdmin() ) {
+				$mid .= ' AND (tcs.`security_id` IS NULL OR tc.`user_id`=?) ';
+				$bindVars[] = $gBitUser->mUserId;
+			}
 		}
 
 		if ( !empty( $pListHash['sort_mode'] ) ) {
diff --git a/admin/admin_fisheye_inc.php b/admin/admin_fisheye_inc.php
index 13cabdb..472116d 100644
--- a/admin/admin_fisheye_inc.php
+++ b/admin/admin_fisheye_inc.php
@@ -19,7 +19,7 @@ $formGalleryGeneral = array(
 		'type' => 'checkbox'
 	)
 );
-$smarty->assign('formGalleryGeneral', $formGalleryGeneral);
+$gBitSmarty->assign('formGalleryGeneral', $formGalleryGeneral);
 
 $formGalleryListLists = array(
 	"fisheye_list_title" => array(
@@ -51,7 +51,7 @@ $formGalleryListLists = array(
 		'note' => 'List date this gallery was last modified',
 	)
 );
-$smarty->assign('formGalleryListLists', $formGalleryListLists);
+$gBitSmarty->assign('formGalleryListLists', $formGalleryListLists);
 
 // This holds the checkbox options for what to display on a 'view gallery' page
 $formGalleryLists = array(
@@ -76,7 +76,7 @@ $formGalleryLists = array(
 		'note' => 'Show image descriptions underneath each thumbnail',
 	)
 );
-$smarty->assign( 'formGalleryLists',$formGalleryLists );
+$gBitSmarty->assign( 'formGalleryLists',$formGalleryLists );
 
 // This holds the checkbox options for what to display on an 'image details' page
 $formImageLists = array(
@@ -97,7 +97,7 @@ $formImageLists = array(
 		'note' => 'When viewing an image, show <strong>previous</strong> and <strong>next</strong> links as images instead of words',
 	),
 );
-$smarty->assign( 'formImageLists', $formImageLists);
+$gBitSmarty->assign( 'formImageLists', $formImageLists);
 
 //vd($_REQUEST);
 if (!empty($_REQUEST['fisheyeAdminSubmit'])) {
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index c7cc3c9..b2bdb30 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -1,5 +1,5 @@
 <?php
-global $gBitSystem, $smarty;
+global $gBitSystem, $gBitSmarty;
 
 $gBitSystem->registerPackage( 'fisheye', dirname( __FILE__).'/' );
 
@@ -9,9 +9,9 @@ if( $gBitSystem->isPackageActive( 'fisheye' ) ) {
 	define ( 'FISHEYE_DEFAULT_COLS_PER_PAGE', 2 );
 	define ( 'FISHEYE_DEFAULT_THUMBNAIL_SIZE', 'small' );
 	
-	$smarty->assign( 'FISHEYE_DEFAULT_ROWS_PER_PAGE', FISHEYE_DEFAULT_ROWS_PER_PAGE );
-	$smarty->assign( 'FISHEYE_DEFAULT_COLS_PER_PAGE', FISHEYE_DEFAULT_COLS_PER_PAGE );
-	$smarty->assign( 'FISHEYE_DEFAULT_THUMBNAIL_SIZE', FISHEYE_DEFAULT_THUMBNAIL_SIZE );
+	$gBitSmarty->assign( 'FISHEYE_DEFAULT_ROWS_PER_PAGE', FISHEYE_DEFAULT_ROWS_PER_PAGE );
+	$gBitSmarty->assign( 'FISHEYE_DEFAULT_COLS_PER_PAGE', FISHEYE_DEFAULT_COLS_PER_PAGE );
+	$gBitSmarty->assign( 'FISHEYE_DEFAULT_THUMBNAIL_SIZE', FISHEYE_DEFAULT_THUMBNAIL_SIZE );
 
 	$gBitSystem->registerAppMenu( 'fisheye', $gBitSystem->getPreference('fisheye_menu_text','Fisheye'), FISHEYE_PKG_URL.'index.php', 'bitpackage:fisheye/menu_fisheye.tpl', 'Image Galleries');
 	
diff --git a/browse.php b/browse.php
index 8af0c50..e52d33e 100644
--- a/browse.php
+++ b/browse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/browse.php,v 1.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/browse.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -12,11 +12,11 @@ require_once( '../bit_setup_inc.php' );
 
 require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
 require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
-global $gBitSystem, $smarty;
+global $gBitSystem, $gBitSmarty;
 
 $gFisheyeGallery = new FisheyeGallery();
 $galleryList = $gFisheyeGallery->getList( $_REQUEST );
-$smarty->assign_by_ref('galleryList', $galleryList);
+$gBitSmarty->assign_by_ref('galleryList', $galleryList);
 
 $gBitSystem->display("bitpackage:fisheye/browse_galleries.tpl");
 
diff --git a/display_fisheye_gallery_inc.php b/display_fisheye_gallery_inc.php
index 31e59d1..5cc3b6d 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.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_gallery_inc.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -8,7 +8,7 @@
 if( !$gContent->hasUserAccess( 'bit_p_view_fisheye' ) ) {
 	if ( !empty($_REQUEST['submit_answer'])) {	// User is attempting to authenticate themseleves to view this gallery
 		if( !$gContent->validateUserAccess( $_REQUEST['try_access_answer']) ) {
-			$smarty->assign("failedLogin", "Incorrect Answer");
+			$gBitSmarty->assign("failedLogin", "Incorrect Answer");
 			$gBitSystem->display("bitpackage:fisheye/authenticate.tpl", "Password Required to view: ".$gContent->getTitle() );
 			die;
 		}
@@ -46,11 +46,11 @@ if ($page > $gContent->mInfo['num_pages']) {
 $imagesPerPage = $gContent->mInfo['rows_per_page'] * $gContent->mInfo['cols_per_page'];
 $imageOffset = $imagesPerPage * ($page-1);
 
-$smarty->assign_by_ref('page', $page);
-$smarty->assign_by_ref('imagesPerPage', $imagesPerPage);
-$smarty->assign_by_ref('imageOffset', $imageOffset);
-$smarty->assign_by_ref('rows_per_page', $gContent->mInfo['rows_per_page']);
-$smarty->assign_by_ref('cols_per_page', $gContent->mInfo['cols_per_page']);
+$gBitSmarty->assign_by_ref('page', $page);
+$gBitSmarty->assign_by_ref('imagesPerPage', $imagesPerPage);
+$gBitSmarty->assign_by_ref('imageOffset', $imageOffset);
+$gBitSmarty->assign_by_ref('rows_per_page', $gContent->mInfo['rows_per_page']);
+$gBitSmarty->assign_by_ref('cols_per_page', $gContent->mInfo['cols_per_page']);
 
 $gContent->loadImages($imageOffset, $imagesPerPage);
 $gContent->addHit();
diff --git a/display_fisheye_image_inc.php b/display_fisheye_image_inc.php
index fba7099..70241f6 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.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_image_inc.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -12,7 +12,7 @@ if( !$gContent->isValid() ) {
 if( !$gContent->hasUserAccess( 'bit_p_view_fisheye' ) ) {
 	if ( !empty($_REQUEST['submit_answer'])) {	// User is attempting to authenticate themseleves to view this gallery
 		if( !$gContent->validateUserAccess( $_REQUEST['try_access_answer']) ) {
-			$smarty->assign("failedLogin", "Incorrect Answer");
+			$gBitSmarty->assign("failedLogin", "Incorrect Answer");
 			$gBitSystem->display("bitpackage:fisheye/authenticate.tpl", "Password Required to view: ".$gContent->getTitle() );
 			die;
 		}
diff --git a/edit.php b/edit.php
index fd43a97..01ffe42 100644
--- a/edit.php
+++ b/edit.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit.php,v 1.4 2005/07/17 17:36:02 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit.php,v 1.5 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -32,7 +32,7 @@ if( $gBitUser->hasPermission( 'bit_p_change_thumbnail_size' ) ) {
 		'medium' => 'Medium (400x300)',
 		'large' => 'Large (800x600)',
 	);
-	$smarty->assign( 'thumbnailSizes', $thumbnailSizes );
+	$gBitSmarty->assign( 'thumbnailSizes', $thumbnailSizes );
 }
 
 if( !empty($_REQUEST['savegallery']) ) {
@@ -78,15 +78,17 @@ if( !empty($_REQUEST['savegallery']) ) {
 			);
 		$gBitSystem->confirmDialog( $formHash, array( 'warning' => 'Are you sure you want to delete the gallery '.$gContent->getTitle().'?', 'error' => 'This cannot be undone!' ) );
 	} else {
+		$userId = $gContent->mInfo['user_id'];
+
 		$recurseDelete = (!empty( $_REQUEST['recurse'] ) && ($_REQUEST['recurse'] == 'all') );
 
 		if( $gContent->expunge( $recurseDelete ) ) {
-			header( "Location: ".FISHEYE_PKG_URL );
+			header( "Location: ".FISHEYE_PKG_URL.'?user_id='.$userId );
 		}
 	}
 
 } elseif( !empty($_REQUEST['cancelgallery'] ) ) {
-	header("location:".FISHEYE_PKG_URL."view.php?gallery_id=".$gContent->mGalleryId);
+	header( 'Location: '.$gContent->getDisplayUrl() );
 	die();
 }
 
@@ -104,16 +106,16 @@ if ( $gBitSystem->isPackageActive('categories') ) {
 
 // Initalize the errors list which contains any errors which occured during storage
 $errors = (!empty($gContent->mErrors) ? $gContent->mErrors : array());
-$smarty->assign_by_ref('errors', $errors);
+$gBitSmarty->assign_by_ref('errors', $errors);
 
-$smarty->assign_by_ref( 'parentGalleries', $gContent->getParentGalleries() );
+$gBitSmarty->assign_by_ref( 'parentGalleries', $gContent->getParentGalleries() );
 $getHash = array( 'user_id' => $gBitUser->mUserId, 'contain_item' => $gContent->mContentId, 'max_records' => -1, 'no_thumbnails' => TRUE, 'sort_mode'=>'title_asc' );
 $galleryList = $gContent->getList( $getHash );
-$smarty->assign_by_ref('galleryList', $galleryList);
+$gBitSmarty->assign_by_ref('galleryList', $galleryList);
 
 if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
 	global $gGatekeeper;
-	$smarty->assign( 'securities', $gGatekeeper->getSecurityList( $gBitUser->mUserId ) );
+	$gBitSmarty->assign( 'securities', $gGatekeeper->getSecurityList( $gBitUser->mUserId ) );
 }
 
 $gBitSystem->display( 'bitpackage:fisheye/edit_gallery.tpl', 'Edit Gallery: '.$gContent->getTitle() );
diff --git a/edit_gallery_perms.php b/edit_gallery_perms.php
index f89a18a..c0d4266 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.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_gallery_perms.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -17,7 +17,7 @@ global $gBitSystem, $fisheyePermNameMap;
 
 // Make sure an gallery has been specified
 if (empty($_REQUEST['gallery_id'])) {
-	$smarty->assign('msg', tra("No gallery specified"));
+	$gBitSmarty->assign('msg', tra("No gallery specified"));
 	$gBitSystem->display( "error.tpl" );
 	die;
 }
@@ -25,12 +25,12 @@ if (empty($_REQUEST['gallery_id'])) {
 include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' );
 
 if (empty($gContent->mContentId)) {
-	$smarty->assign( 'msg', tra( "The specified gallery does not exist" ));
+	$gBitSmarty->assign( 'msg', tra( "The specified gallery does not exist" ));
 	$gBitSystem->display("error.tpl");
 	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
-	$smarty->assign( 'msg', tra( "You cannot edit this image gallery" ) );
+	$gBitSmarty->assign( 'msg', tra( "You cannot edit this image gallery" ) );
 	$gBitSystem->display( "error.tpl" );
 	die;
 }
@@ -44,7 +44,7 @@ if (!empty($_REQUEST['submitNewPermissions'])) {
 }
 
 $userPerms = $gContent->getAllUserPermissions();
-$smarty->assign_by_ref('userPerms', $userPerms);
+$gBitSmarty->assign_by_ref('userPerms', $userPerms);
 
 if (!empty($_REQUEST['submitUpdatePerms'])) {
 	$existingPerms = $_REQUEST['existingPerms'];
diff --git a/edit_image.php b/edit_image.php
index 619cefb..83818b3 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.3 2005/07/17 17:36:02 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_image.php,v 1.4 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -20,7 +20,7 @@ include_once( FISHEYE_PKG_PATH.'image_lookup_inc.php' );
 
 if ( (!empty($gContent->mImageId)) && ($gContent->mInfo['user_id'] != $gBitUser->mUserId && !$gBitUser->isAdmin()) ) {
 	// This user does not own this image and they are not an Administrator
-	$smarty->assign( 'msg', tra( "You do not own this image!" ) );
+	$gBitSmarty->assign( 'msg', tra( "You do not own this image!" ) );
 	$gBitSystem->display( "error.tpl" );
 	die;
 }
@@ -28,7 +28,7 @@ if ( (!empty($gContent->mImageId)) && ($gContent->mInfo['user_id'] != $gBitUser-
 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!
-		$smarty->assign( 'msg', tra( "No gallery or image was specified" ) );
+		$gBitSmarty->assign( 'msg', tra( "No gallery or image was specified" ) );
 		$gBitSystem->display( "error.tpl" );
 		die;
 	}
@@ -91,7 +91,7 @@ if ( $gBitSystem->isPackageActive('categories') ) {
 }
 
 $errors = $gContent->mErrors;
-$smarty->assign_by_ref('errors', $errors);
+$gBitSmarty->assign_by_ref('errors', $errors);
 
 $gContent->loadParentGalleries();
 
@@ -99,13 +99,13 @@ $gContent->loadParentGalleries();
 $gFisheyeGallery = new FisheyeGallery();
 $listHash = array( 'user_id'=>$gContent->mInfo['user_id'], 'max_records' => -1, 'no_thumbnails' => TRUE, 'sort_mode'=>'title_asc' );
 $galleryList = $gFisheyeGallery->getList( $listHash );
-$smarty->assign_by_ref('galleryList', $galleryList);
+$gBitSmarty->assign_by_ref('galleryList', $galleryList);
 
-$smarty->assign('requested_gallery', !empty($_REQUEST['gallery_id']) ? $_REQUEST['gallery_id'] : NULL);
+$gBitSmarty->assign('requested_gallery', !empty($_REQUEST['gallery_id']) ? $_REQUEST['gallery_id'] : NULL);
 
 if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
 	global $gGatekeeper;
-	$smarty->assign( 'securities', $gGatekeeper->getSecurityList( $gBitUser->mUserId ) );
+	$gBitSmarty->assign( 'securities', $gGatekeeper->getSecurityList( $gBitUser->mUserId ) );
 }
 
 $gBitSystem->display( 'bitpackage:fisheye/edit_image.tpl', 'Edit Image: '.$gContent->getTitle() );
diff --git a/find_user.php b/find_user.php
index bb19c9c..2bc23c5 100644
--- a/find_user.php
+++ b/find_user.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/find_user.php,v 1.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/find_user.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -24,7 +24,7 @@ if (!empty($_REQUEST['submitUserSearch'])) {
 } else {
 	$foundUsers = NULL;
 }
-$smarty->assign_by_ref('foundUsers', $foundUsers);
+$gBitSmarty->assign_by_ref('foundUsers', $foundUsers);
 
-$smarty->display('bitpackage:fisheye/find_user.tpl');
+$gBitSmarty->display('bitpackage:fisheye/find_user.tpl');
 ?>
diff --git a/gallery_lookup_inc.php b/gallery_lookup_inc.php
index 3534649..86344d9 100644
--- a/gallery_lookup_inc.php
+++ b/gallery_lookup_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/gallery_lookup_inc.php,v 1.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/gallery_lookup_inc.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -24,7 +24,7 @@ if( !empty( $_REQUEST['gallery_path'] ) ) {
 	$gContent->setGalleryPath( $_REQUEST['gallery_path'] );
 }
 
-$smarty->assign_by_ref('gContent', $gContent);
-$smarty->assign_by_ref('galleryId', $gContent->mGalleryId);
+$gBitSmarty->assign_by_ref('gContent', $gContent);
+$gBitSmarty->assign_by_ref('galleryId', $gContent->mGalleryId);
 
 ?>
diff --git a/gallery_tree.php b/gallery_tree.php
index a3f5b07..ae7805a 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.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/gallery_tree.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -12,7 +12,7 @@ require_once( '../bit_setup_inc.php' );
 
 require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
 require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
-global $gBitSystem, $smarty;
+global $gBitSystem, $gBitSmarty;
 
 $gBitSystem->display("bitpackage:fisheye/gallery_tree.tpl");
 
diff --git a/image_lookup_inc.php b/image_lookup_inc.php
index 036f59d..d04d893 100644
--- a/image_lookup_inc.php
+++ b/image_lookup_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/image_lookup_inc.php,v 1.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/image_lookup_inc.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -37,12 +37,12 @@ if( empty( $_REQUEST['gallery_id'] ) ) {
 if( !empty($_REQUEST['gallery_id']) && is_numeric($_REQUEST['gallery_id']) ) {
 	$gGallery = new FisheyeGallery( $_REQUEST['gallery_id'], NULL, FALSE );
 	$gGallery->load( $gContent->mImageId );
-	$smarty->assign_by_ref('gGallery', $gGallery);
-	$smarty->assign_by_ref('galleryId', $_REQUEST['gallery_id']);
+	$gBitSmarty->assign_by_ref('gGallery', $gGallery);
+	$gBitSmarty->assign_by_ref('galleryId', $_REQUEST['gallery_id']);
 }
 
-$smarty->assign_by_ref('gContent', $gContent);
-$smarty->assign_by_ref('imageId', $gContent->mImageId );
+$gBitSmarty->assign_by_ref('gContent', $gContent);
+$gBitSmarty->assign_by_ref('imageId', $gContent->mImageId );
 
 
 ?>
diff --git a/image_order.php b/image_order.php
index ffeb3d6..7717c40 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.3 2005/07/25 20:02:04 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/image_order.php,v 1.4 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -19,7 +19,7 @@ include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' );
 
 if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
 	global $gGatekeeper;
-	$smarty->assign( 'securities', $gGatekeeper->getSecurityList( $gBitUser->mUserId ) );
+	$gBitSmarty->assign( 'securities', $gGatekeeper->getSecurityList( $gBitUser->mUserId ) );
 }
 
 // Ensure the user has the permission to create new image galleries
@@ -28,7 +28,10 @@ if( !$gContent->hasUserPermission( 'bit_p_edit_fisheye' ) ) {
 	$gBitSystem->fatalError( tra( "You cannot edit this image gallery" ) );
 }
 
-if (!empty($_REQUEST['updateImageOrder'])) {
+if (!empty($_REQUEST['cancel'])) {
+	header( 'Location: '.$gContent->getDisplayUrl() );
+	die;
+} elseif (!empty($_REQUEST['updateImageOrder'])) {
 	if( !empty( $_REQUEST['batch'] ) ) {
 		// flip so we can do instant has lookup
 		$batchCon = array_flip( $_REQUEST['batch'] );
@@ -131,11 +134,11 @@ if (!empty($_REQUEST['updateImageOrder'])) {
 // Get a list of all existing galleries
 $listHash = array( 'user_id'=>$gBitUser->mUserId );
 $galleryList = $gContent->getList( $listHash );
-$smarty->assign_by_ref('galleryList', $galleryList);
+$gBitSmarty->assign_by_ref('galleryList', $galleryList);
 $gContent->loadImages();
-$smarty->assign_by_ref('galleryImages', $gContent->mItems);
+$gBitSmarty->assign_by_ref('galleryImages', $gContent->mItems);
 
-$smarty->assign_by_ref('formfeedback', $feedback);
+$gBitSmarty->assign_by_ref('formfeedback', $feedback);
 
 $gBitSystem->display( 'bitpackage:fisheye/image_order.tpl', 'Edit Gallery Images: '.$gContent->getTitle() );
 
diff --git a/list_galleries.php b/list_galleries.php
index 72bf507..033b872 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.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/list_galleries.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -12,7 +12,7 @@ require_once( '../bit_setup_inc.php' );
 
 require_once( FISHEYE_PKG_PATH.'FisheyeGallery.php');
 require_once( FISHEYE_PKG_PATH.'FisheyeImage.php');
-global $gBitSystem, $smarty, $gFisheyeGallery;
+global $gBitSystem, $gBitSmarty, $gFisheyeGallery;
 
 $gFisheyeGallery = new FisheyeGallery();
 
@@ -23,7 +23,7 @@ if (!empty($_REQUEST['user_id']) && is_numeric($_REQUEST['user_id'])) {
 	if( $_REQUEST['user_id'] == $gBitUser->mUserId ) {
 		$_REQUEST['show_empty'] = TRUE;
 	}
-	$smarty->assign_by_ref('gQueryUserId', $_REQUEST['user_id']);
+	$gBitSmarty->assign_by_ref('gQueryUserId', $_REQUEST['user_id']);
 	$template = 'user_galleries.tpl';
 } else {
 	$template = 'list_galleries.tpl';
@@ -31,16 +31,16 @@ if (!empty($_REQUEST['user_id']) && is_numeric($_REQUEST['user_id'])) {
 
 $_REQUEST['thumbnail_size'] = $gBitSystem->getPreference( 'fisheye_list_thumbnail_size', 'small' );
 $galleryList = $gFisheyeGallery->getList( $_REQUEST );
-$smarty->assign_by_ref('galleryList', $galleryList);
+$gBitSmarty->assign_by_ref('galleryList', $galleryList);
 
 if (!empty($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) {
-	$smarty->assign_by_ref('iMaxRows', $iMaxRows);
+	$gBitSmarty->assign_by_ref('iMaxRows', $iMaxRows);
 }
 if (!empty($_REQUEST['sort_mode'])) {
-	$smarty->assign_by_ref('iSortMode', $_REQUEST['sort_mode']);
+	$gBitSmarty->assign_by_ref('iSortMode', $_REQUEST['sort_mode']);
 }
 if (!empty($_REQUEST['search'])) {
-	$smarty->assign_by_ref('iSearchString', $iSearchtring);
+	$gBitSmarty->assign_by_ref('iSearchString', $iSearchtring);
 }
 
 $gBitSystem->display("bitpackage:fisheye/$template", "List Galleries" );
diff --git a/modules/mod_images.php b/modules/mod_images.php
index bbdf5a5..8d71319 100644
--- a/modules/mod_images.php
+++ b/modules/mod_images.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/modules/mod_images.php,v 1.4 2005/07/25 20:02:04 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/modules/mod_images.php,v 1.5 2005/08/01 18:40:08 squareing Exp $
  * @package fisheye
  * @subpackage modules
  */
@@ -30,7 +30,7 @@ if( $display ) {
 	if( $gQueryUserId ) {
 		$listHash['user_id'] = $gQueryUserId;
 	} elseif( !empty( $_REQUEST['user_id'] ) ) {
-		$smarty->assign( 'userGallery', $_REQUEST['user_id'] );
+		$gBitSmarty->assign( 'userGallery', $_REQUEST['user_id'] );
 		$listHash['user_id'] = $_REQUEST['user_id'];
 	} elseif( !empty( $module_params['recent_users'] ) ) {
 		$listHash['recent_users'] = TRUE;
@@ -71,13 +71,13 @@ if( $display ) {
 		}
 
 		$listHash['sort_mode'] = $sort_mode;
-		$smarty->assign( 'moduleTitle', $moduleTitle );
+		$gBitSmarty->assign( 'moduleTitle', $moduleTitle );
 	}
 
-	$smarty->assign( 'imageSort', $sort_mode );
-	$smarty->assign( 'modImages', $images );
-	$smarty->assign( 'module_params', $module_params );
-	$smarty->assign( 'maxlen', isset( $module_params["maxlen"] ) ? $module_params["maxlen"] : 0 );
-	$smarty->assign( 'maxlendesc', isset( $module_params["maxlendesc"] ) ? $module_params["maxlendesc"] : 0 );
+	$gBitSmarty->assign( 'imageSort', $sort_mode );
+	$gBitSmarty->assign( 'modImages', $images );
+	$gBitSmarty->assign( 'module_params', $module_params );
+	$gBitSmarty->assign( 'maxlen', isset( $module_params["maxlen"] ) ? $module_params["maxlen"] : 0 );
+	$gBitSmarty->assign( 'maxlendesc', isset( $module_params["maxlendesc"] ) ? $module_params["maxlendesc"] : 0 );
 }
 ?>
diff --git a/templates/center_list_galleries.php b/templates/center_list_galleries.php
index 317f607..d5c3975 100644
--- a/templates/center_list_galleries.php
+++ b/templates/center_list_galleries.php
@@ -6,24 +6,24 @@
 	$_REQUEST['root_only'] = TRUE;
 	$_REQUEST['get_thumbnails'] = TRUE;
 	$galleryList = $gFisheyeGallery->getList( $_REQUEST );
-	$smarty->assign_by_ref('galleryList', $galleryList);
+	$gBitSmarty->assign_by_ref('galleryList', $galleryList);
 
 	/* Process the input parameters this page accepts */
 	if (!empty($gQueryUser) && $gQueryUser->isRegistered()) {
-		$smarty->assign_by_ref('gQuerUserId', $gQueryUser->mUserId);
+		$gBitSmarty->assign_by_ref('gQuerUserId', $gQueryUser->mUserId);
 		$template = 'user_galleries.tpl';
 	} else {
 		$template = 'list_galleries.tpl';
 	}
 
 	if (!empty($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) {
-		$smarty->assign_by_ref('iMaxRows', $iMaxRows);
+		$gBitSmarty->assign_by_ref('iMaxRows', $iMaxRows);
 	}
 	if (!empty($_REQUEST['sort_mode'])) {
-		$smarty->assign_by_ref('iSortMode', $_REQUEST['sort_mode']);
+		$gBitSmarty->assign_by_ref('iSortMode', $_REQUEST['sort_mode']);
 	}
 	if (!empty($_REQUEST['search'])) {
-		$smarty->assign_by_ref('iSearchString', $iSearchtring);
+		$gBitSmarty->assign_by_ref('iSearchString', $iSearchtring);
 	}
 
 
diff --git a/templates/center_list_images.php b/templates/center_list_images.php
index bb6a640..6c4b773 100644
--- a/templates/center_list_images.php
+++ b/templates/center_list_images.php
@@ -5,16 +5,16 @@
 	if( !empty( $module_rows ) ) {
 		$_REQUEST['max_records'] = $module_rows;
 	} elseif (!empty($_REQUEST['offset']) && is_numeric($_REQUEST['offset'])) {
-		$smarty->assign_by_ref('iMaxRows', $iMaxRows);
+		$gBitSmarty->assign_by_ref('iMaxRows', $iMaxRows);
 	}
 	if (empty($_REQUEST['sort_mode'])) {
 		$_REQUEST['sort_mode'] = 'random';
 	}
 	if (!empty($_REQUEST['search'])) {
-		$smarty->assign_by_ref('iSearchString', $iSearchtring);
+		$gBitSmarty->assign_by_ref('iSearchString', $iSearchtring);
 	}
 
-	$smarty->assign_by_ref('iSortMode', $_REQUEST['sort_mode']);
+	$gBitSmarty->assign_by_ref('iSortMode', $_REQUEST['sort_mode']);
 
 	/* Get a list of galleries which matches the imput paramters (default is to list every gallery in the system) */
 	if( !empty( $gQueryUser ) && $gQueryUser->mUserId ) {
@@ -23,11 +23,11 @@
 	$_REQUEST['root_only'] = TRUE;
 	$_REQUEST['get_thumbnails'] = TRUE;
 	$thumbnailList = $gFisheyeImage->getList( $_REQUEST );
-	$smarty->assign_by_ref('thumbnailList', $thumbnailList);
+	$gBitSmarty->assign_by_ref('thumbnailList', $thumbnailList);
 
 	/* Process the input parameters this page accepts */
 	if (!empty($gQueryUser) && $gQueryUser->isRegistered()) {
-		$smarty->assign_by_ref('gQuerUserId', $gQueryUser->mUserId);
+		$gBitSmarty->assign_by_ref('gQuerUserId', $gQueryUser->mUserId);
 		$template = 'user_galleries.tpl';
 	} else {
 		$template = 'list_galleries.tpl';
diff --git a/templates/edit_gallery.tpl b/templates/edit_gallery.tpl
index 3be4a8f..9233990 100644
--- a/templates/edit_gallery.tpl
+++ b/templates/edit_gallery.tpl
@@ -57,6 +57,11 @@
 						</div>
 					{/if}
 					{/legend}
+					{if $gBitSystem->isPackageActive( 'gatekeeper' ) }
+						{legend legend="Security Settings"}
+							{include file="bitpackage:gatekeeper/choose_security.tpl"}
+						{/legend}
+					{/if}
 				{/jstab}
 
 				{if $gBitSystem->isPackageActive( 'categories' )}
@@ -69,6 +74,12 @@
 
 
 				{jstab title="Advanced Options"}
+					{if $gBitSystem->isPackageActive( 'nexus' )}
+						{legend legend="Insert Link in Menu"}
+							{include file="bitpackage:nexus/insert_menu_item_inc.tpl"}
+						{/legend}
+					{/if}
+
 					{if $galleryList}
 						{legend legend="Advanced Options"}
 							<div class="row">
@@ -91,23 +102,13 @@
 							</div>
 						{/legend}
 					{/if}
-
-					{if $gBitSystem->isPackageActive( 'gatekeeper' ) }
-						{legend legend="Security Settings"}
-							{include file="bitpackage:gatekeeper/choose_security.tpl"}
-						{/legend}
-					{/if}
-
-					{if $gBitSystem->isPackageActive( 'nexus' )}
-						{legend legend="Insert Link in Menu"}
-							{include file="bitpackage:nexus/insert_menu_item_inc.tpl"}
-						{/legend}
-					{/if}
 				{/jstab}
 			{/jstabs}
 
 			<div class="row submit">
+{if $gContent->isValid()}
 				<input type="submit" name="cancelgallery" value="Cancel"/>
+{/if}
 				<input type="submit" name="savegallery" value="Save Gallery"/>
 			</div>
 		{/form}
diff --git a/templates/image_order.tpl b/templates/image_order.tpl
index 17d09bd..42e4b26 100644
--- a/templates/image_order.tpl
+++ b/templates/image_order.tpl
@@ -143,7 +143,8 @@ function MoveDown(imageId) {
 			</table>
 
 			<div class="row submit">
-				<input type="submit" name="updateImageOrder" value="Save Changes"/>
+				<input type="submit" name="cancel" value="{tr}Back{/tr}"/>
+				<input type="submit" name="updateImageOrder" value="{tr}Save Changes{/tr}"/>
 			</div>
 
 			<div class="row">
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index d241f97..2c0e0bb 100644
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -32,16 +32,19 @@
 			{foreach from=$galleryList key=galleryId item=gal}
 				<li class="item {cycle values='odd,even'} {$gal.content_type_guid}">
 					<div class="floaticon">
+						{if $gal.is_hidden=='y' || $gal.is_private=='y' || $gal.access_answer}
+							{biticon ipackage=gatekeeper iname="security" iexplain="Security" label=TRUE}
+						{/if}
 						{if $gal.is_hidden=='y'}
-							{biticon ipackage=liberty iname="hidden" iexplain="Hidden"}
+							{tr}Hidden{/tr}
 						{/if}
 						{if $gal.is_private=='y'}
-							{biticon ipackage=liberty iname="private" iexplain="Private"}
+							{tr}Private{/tr}
 						{/if}
-						{* if $gal.access_answer}
-							{biticon ipackage=liberty iname="protected" iexplain="Protected"}
+						{if $gal.access_answer}
+							{tr}Password{/tr}
 						{/if}
-						{if $galleryList[ix]->hasUserPermission('bit_p_edit_fisheye')}
+						{* if $galleryList[ix]->hasUserPermission('bit_p_edit_fisheye')}
 							<a title="{tr}Edit{/tr}" href="{$gBitLoc.FISHEYE_PKG_URL}edit.php?gallery_id={$galleryId}">{biticon ipackage=liberty iname="config" iexplain="Edit"}</a>
 						{/if}
 						{if $galleryList[ix]->hasUserPermission('bit_p_edit_fisheye')}
diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl
index c07c901..1b0095e 100644
--- a/templates/upload_fisheye.tpl
+++ b/templates/upload_fisheye.tpl
@@ -10,7 +10,9 @@
 			{formfeedback error=$errors}
 
 			{formhelp note="Here you can upload images. You can upload single image files, or you can upload archived files (.zip's, .sit's, .tar's, etc.) Archvied uploads will automatically be decompressed, and a gallery will created for every gallery in it. If you have nested folders, the hierarchy will be maintained for you with nested galleries." force=true}
-
+{if $browserInfo.platform=='mac'}
+			{formhelp note="Mac Users: The newer .sitx format is not supported currently because the makers of the StuffIt application have not released new versions of their software for servers. Please use DropZip or similar for best results." force=true}
+{/if}
 			<input type="hidden" name="gallery_id" value="{$galleryId|escape}"/>
 			<input type="hidden" name="image_id" value="{$imageId}"/>
 			<input type="hidden" name="MAX_FILE_SIZE" value="1000000000" />
diff --git a/templates/view_gallery.tpl b/templates/view_gallery.tpl
index 51296c8..59c2557 100644
--- a/templates/view_gallery.tpl
+++ b/templates/view_gallery.tpl
@@ -13,7 +13,7 @@
 			{/if}
 			{if $gContent->hasUserPermission( 'bit_p_edit_fisheye' )}
 				<a title="{tr}Edit{/tr}" href="{$gBitLoc.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage=liberty iname="config" iexplain="Edit"}</a>
-				<a title="{tr}Image Order{/tr}" href="{$gBitLoc.FISHEYE_PKG_URL}image_order.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage=liberty iname="current" iexplain="Image Order"}</a>
+				<a title="{tr}Image Order{/tr}" href="{$gBitLoc.FISHEYE_PKG_URL}image_order.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage=fisheye iname="order" iexplain="Image Order"}</a>
 			{/if}
 			{if $gContent->hasUserPermission( 'bit_p_upload_fisheye' )}
 				<a title="{tr}Add Image{/tr}" href="{$gBitLoc.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage=liberty iname="upload" iexplain="Add Image"}</a>
@@ -69,7 +69,7 @@
 			{if $imageCount % $cols_per_page != 0}</tr>{/if}
 		</table>
 	</div>	<!-- end .body -->
-	{libertypagination numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$page}
+	{libertypagination numPages=$gContent->mInfo.num_pages gallery_id=$gContent->mGalleryId gallery_path=$gContent->mGalleryPath page=$pageCount}
 	{if $gBitSystem->isPackageActive( 'categories' )}
 		{include file="bitpackage:categories/categories_objects.tpl"}
 	{/if}
diff --git a/upload.php b/upload.php
index d9d19c7..c8fbc9d 100644
--- a/upload.php
+++ b/upload.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload.php,v 1.4 2005/07/25 20:02:04 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload.php,v 1.5 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -75,7 +75,7 @@ if (!empty($_REQUEST['save_image'])) {
 		header( 'Location: '.$gContent->getDisplayUrl() );
 		die;
 	} else {
-		$smarty->assign( 'errors', $upErrors );
+		$gBitSmarty->assign( 'errors', $upErrors );
 	}
 }
 
@@ -98,7 +98,7 @@ if( $gBitSystem->isPackageActive( 'quota' ) ) {
 		// Prevent people from uploading more than there quota
 		$q = $quota->getUserQuota( $gBitUser->mUserId );
 		$u = $quota->getUserUsage( $gBitUser->mUserId );
-		$smarty->assign('quotaMessage', tra( 'Your remaining disk quota is' ).' '.round(($q-$u)/1000000, 2).' '.tra('Megabytes') );
+		$gBitSmarty->assign('quotaMessage', tra( 'Your remaining disk quota is' ).' '.round(($q-$u)/1000000, 2).' '.tra('Megabytes') );
 		$qMegs = round( $q / 1000000 );
 		if( $qMegs < $uploadMax ) {
 			$uploadMax = $qMegs;
@@ -110,9 +110,9 @@ if( $gBitSystem->isPackageActive( 'quota' ) ) {
 $gFisheyeGallery = new FisheyeGallery();
 $listHash = array( 'user_id' => $gBitUser->mUserId, 'show_empty' => true, 'max_records'=>-1, 'no_thumbnails'=>TRUE, 'sort_mode'=>'title_asc' );
 $galleryList = $gFisheyeGallery->getList( $listHash );
-$smarty->assign_by_ref('galleryList', $galleryList);
+$gBitSmarty->assign_by_ref('galleryList', $galleryList);
 
-$smarty->assign( 'uploadMax', $uploadMax );
+$gBitSmarty->assign( 'uploadMax', $uploadMax );
 
 $gBitSystem->display( 'bitpackage:fisheye/upload_fisheye.tpl', 'Upload Images' );
 
@@ -185,7 +185,9 @@ function liberty_process_archive( &$pFileHash ) {
 				} elseif( $upExt == 'rar' ) {
 					$shellResult = shell_exec( "rar x -w\"$destDir\" $pFileHash[tmp_name] " );
 				} elseif( $upExt == 'sit' || $upExt == 'sitx' ) {
-				$shellResult = shell_exec( "unstuff -d=\"$destDir\" $pFileHash[tmp_name] " );
+					print( "unstuff -d=\"$destDir\" $pFileHash[tmp_name] " );
+					$shellResult = shell_exec( "unstuff -d=\"$destDir\" $pFileHash[tmp_name] " );
+					vd( $shellResult );
 				}
 				break;
 		}
diff --git a/view_image.php b/view_image.php
index bbaf7bb..cae3b86 100644
--- a/view_image.php
+++ b/view_image.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/view_image.php,v 1.2 2005/06/28 07:45:42 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/view_image.php,v 1.3 2005/08/01 18:40:07 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -22,7 +22,7 @@ if( !empty( $_REQUEST['size'] ) ) {
 }
 
 if( !empty( $_REQUEST['refresh'] ) ) {
-	$smarty->assign( 'refresh', '?refresh='.time() );
+	$gBitSmarty->assign( 'refresh', '?refresh='.time() );
 }
 
 include_once( FISHEYE_PKG_PATH.'image_lookup_inc.php' );