diff options
| -rw-r--r-- | FisheyeBase.php | 6 | ||||
| -rw-r--r-- | FisheyeGallery.php | 4 | ||||
| -rw-r--r-- | admin/schema_inc.php | 12 | ||||
| -rw-r--r-- | display_fisheye_gallery_inc.php | 4 | ||||
| -rw-r--r-- | display_fisheye_image_inc.php | 4 | ||||
| -rw-r--r-- | edit.php | 8 | ||||
| -rw-r--r-- | edit_image.php | 4 | ||||
| -rw-r--r-- | image_order.php | 4 | ||||
| -rw-r--r-- | templates/list_galleries.tpl | 8 | ||||
| -rw-r--r-- | templates/menu_fisheye.tpl | 10 | ||||
| -rw-r--r-- | templates/upload_fisheye.tpl | 2 | ||||
| -rw-r--r-- | templates/view_gallery.tpl | 6 | ||||
| -rw-r--r-- | templates/view_image.tpl | 6 | ||||
| -rw-r--r-- | upload.php | 4 | ||||
| -rw-r--r-- | upload_inc.php | 6 |
15 files changed, 44 insertions, 44 deletions
diff --git a/FisheyeBase.php b/FisheyeBase.php index 15f7666..b1a80e2 100644 --- a/FisheyeBase.php +++ b/FisheyeBase.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeBase.php,v 1.18 2006/02/19 19:54:17 lsces Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeBase.php,v 1.19 2006/04/11 13:04:24 squareing Exp $ * @package fisheye */ @@ -123,7 +123,7 @@ class FisheyeBase extends LibertyAttachable $galleries[$galleryId]->load(); } if( $galleries[$galleryId]->isValid() ) { - if( $galleries[$galleryId]->hasUserPermission( 'bit_p_edit_fisheye' ) ) { + if( $galleries[$galleryId]->hasUserPermission( 'p_fisheye_edit' ) ) { $galleries[$galleryId]->addItem( $this->mContentId, $pPosition ); } else { $this->mErrors[] = "You do not have permission to attach ".$this->getTitle()." to ".$galleries[$galleryId]->getTitle(); @@ -184,7 +184,7 @@ class FisheyeBase extends LibertyAttachable */ function hasUserPermission( $pPermName, $pFatalIfFalse=FALSE, $pFatalMessage=NULL ) { $ret = FALSE; - if( $pPermName == 'bit_p_edit_fisheye' || $pPermName == 'bit_p_upload_fisheye' ) { + if( $pPermName == 'p_fisheye_edit' || $pPermName == 'p_fisheye_upload' ) { if( !($ret = $this->isOwner()) ) { global $gBitUser; if( !($ret = $gBitUser->isAdmin()) ) { diff --git a/FisheyeGallery.php b/FisheyeGallery.php index 6716f75..a914dde 100644 --- a/FisheyeGallery.php +++ b/FisheyeGallery.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.26 2006/03/19 16:14:11 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/FisheyeGallery.php,v 1.27 2006/04/11 13:04:24 squareing Exp $ * @package fisheye */ @@ -177,7 +177,7 @@ class FisheyeGallery extends FisheyeBase { foreach ($rows as $row) { $pass = TRUE; if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) { - $pass = $gBitUser->hasPermission( 'bit_p_admin_fisheye' ) || !@$this->verifyId( $row['security_id'] ) || ( $row['user_id'] == $gBitUser->mUserId ) || @$this->verifyId( $_SESSION['gatekeeper_security'][$row['security_id']] ); + $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 && $item = $gLibertySystem->getLibertyObject( $row['item_content_id'], $row['content_type_guid'] ) ) { $item->loadThumbnail( $this->mInfo['thumbnail_size'] ); diff --git a/admin/schema_inc.php b/admin/schema_inc.php index c037a12..5c63373 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -92,12 +92,12 @@ $gBitInstaller->registerPreferences( FISHEYE_PKG_NAME, array( // ### Default User Permissions $gBitInstaller->registerUserPermissions( FISHEYE_PKG_NAME, array( - array('bit_p_view_fisheye', 'Can view image galleries', 'basic', FISHEYE_PKG_NAME), - array('bit_p_create_fisheye', 'Can create an image gallery', 'registered', FISHEYE_PKG_NAME), - array('bit_p_edit_fisheye', 'Can edit image gallery', 'registered', FISHEYE_PKG_NAME), - array('bit_p_upload_fisheye', 'Can upload images to gallery', 'registered', FISHEYE_PKG_NAME), - array('bit_p_admin_fisheye', 'Can admin image galleries', 'editors', FISHEYE_PKG_NAME), - array('bit_p_fisheye_upload_nonimages', 'Can upload non_image files', 'editors', FISHEYE_PKG_NAME) + array('p_fisheye_view', 'Can view image galleries', 'basic', FISHEYE_PKG_NAME), + array('p_fisheye_create', 'Can create an image gallery', 'registered', FISHEYE_PKG_NAME), + array('p_fisheye_edit', 'Can edit image gallery', 'registered', FISHEYE_PKG_NAME), + array('p_fisheye_upload', 'Can upload images to gallery', 'registered', FISHEYE_PKG_NAME), + array('p_fisheye_admin', 'Can admin image galleries', 'editors', FISHEYE_PKG_NAME), + array('p_fisheye_upload_nonimages', 'Can upload non_image files', 'editors', FISHEYE_PKG_NAME) ) ); ?> diff --git a/display_fisheye_gallery_inc.php b/display_fisheye_gallery_inc.php index 1b9464a..1cea4d7 100644 --- a/display_fisheye_gallery_inc.php +++ b/display_fisheye_gallery_inc.php @@ -1,11 +1,11 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_gallery_inc.php,v 1.4 2005/08/24 20:50:17 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_gallery_inc.php,v 1.5 2006/04/11 13:04:24 squareing Exp $ * @package fisheye * @subpackage functions */ -$displayHash = array( 'perm_name' => 'bit_p_view_fisheye' ); +$displayHash = array( 'perm_name' => 'p_fisheye_view' ); $gContent->invokeServices( 'content_display_function', $displayHash ); if (!empty($_REQUEST['page']) && is_numeric($_REQUEST['page'])) { diff --git a/display_fisheye_image_inc.php b/display_fisheye_image_inc.php index 78a32a3..1c97b13 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.5 2006/03/01 20:16:07 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/display_fisheye_image_inc.php,v 1.6 2006/04/11 13:04:24 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -9,7 +9,7 @@ if( !$gContent->isValid() ) { $gBitSystem->fatalError( "No image exists with the given ID" ); } -$displayHash = array( 'perm_name' => 'bit_p_view_fisheye' ); +$displayHash = array( 'perm_name' => 'p_fisheye_view' ); $gContent->invokeServices( 'content_display_function', $displayHash ); // Get the proper thumbnail size to display on this page @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit.php,v 1.8 2005/11/22 07:25:47 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit.php,v 1.9 2006/04/11 13:04:24 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -19,8 +19,8 @@ include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' ); // Ensure the user has the permission to create new image galleries if (empty($_REQUEST['gallery_id'])) { - $gBitSystem->verifyPermission('bit_p_create_fisheye'); -} elseif( !$gContent->hasUserPermission( 'bit_p_edit_fisheye' ) ) { + $gBitSystem->verifyPermission('p_fisheye_create'); +} elseif( !$gContent->hasUserPermission( 'p_fisheye_edit' ) ) { // This user does not own this gallery and they have not been granted the permission to edit this gallery $gBitSystem->fatalError( tra( "You cannot edit this image gallery" ) ); } @@ -50,7 +50,7 @@ if( !empty($_REQUEST['savegallery']) ) { die(); } }elseif( !empty($_REQUEST['delete']) ) { - $gContent->hasUserPermission( 'bit_p_admin_fisheye', TRUE, tra( "You do not have permission to delete this image gallery" ) ); + $gContent->hasUserPermission( 'p_fisheye_admin', TRUE, tra( "You do not have permission to delete this image gallery" ) ); if( !empty( $_REQUEST['cancel'] ) ) { // user cancelled - just continue on, doing nothing diff --git a/edit_image.php b/edit_image.php index 132df57..63a7b53 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.11 2006/01/23 12:30:10 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_image.php,v 1.12 2006/04/11 13:04:24 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -64,7 +64,7 @@ if( !empty($_REQUEST['saveImage']) || !empty($_REQUEST['regenerateThumbnails'] ) } } } elseif( !empty($_REQUEST['delete']) ) { - $gContent->hasUserPermission( 'bit_p_admin_fisheye', TRUE, tra( "You do not have permission to delete this image." ) ); + $gContent->hasUserPermission( 'p_fisheye_admin', TRUE, tra( "You do not have permission to delete this image." ) ); if( !empty( $_REQUEST['cancel'] ) ) { // user cancelled - just continue on, doing nothing diff --git a/image_order.php b/image_order.php index 7d2873b..b44dccf 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.13 2006/03/25 14:54:34 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/image_order.php,v 1.14 2006/04/11 13:04:24 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -23,7 +23,7 @@ if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) { } // Ensure the user has the permission to create new image galleries -if( !$gContent->hasUserPermission( 'bit_p_edit_fisheye' ) ) { +if( !$gContent->hasUserPermission( 'p_fisheye_edit' ) ) { // This user does not own this gallery and they have not been granted the permission to edit this gallery $gBitSystem->fatalError( tra( "You cannot edit this image gallery" ) ); } diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl index f3232fc..305741f 100644 --- a/templates/list_galleries.tpl +++ b/templates/list_galleries.tpl @@ -44,16 +44,16 @@ {if $gal.access_answer} {tr}Password{/tr} {/if} - {* if $galleryList[ix]->hasUserPermission('bit_p_edit_fisheye')} + {* if $galleryList[ix]->hasUserPermission('p_fisheye_edit')} <a title="{tr}Edit{/tr}" href="{$smarty.const.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')} + {if $galleryList[ix]->hasUserPermission('p_fisheye_edit')} <a title="{tr}Image Order{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image_order.php?gallery_id={$galleryId}">{biticon ipackage=liberty iname="current" iexplain="Item Order"}</a> {/if} - {if $galleryList[ix]->hasUserPermission('bit_p_upload_fisheye')} + {if $galleryList[ix]->hasUserPermission('p_fisheye_upload')} <a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$galleryId}">{biticon ipackage=liberty iname="upload" iexplain="Add Image"}</a> {/if} - {if $galleryList[ix]->hasUserPermission('bit_p_admin_fisheye')} + {if $galleryList[ix]->hasUserPermission('p_fisheye_admin')} <a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_gallery_perms.php?gallery_id={$galleryId}">{biticon ipackage=liberty iname="permissions" iexplain="User Permissions"}</a> {/if *} </div> diff --git a/templates/menu_fisheye.tpl b/templates/menu_fisheye.tpl index 1e859b5..bedb9a0 100644 --- a/templates/menu_fisheye.tpl +++ b/templates/menu_fisheye.tpl @@ -1,17 +1,17 @@ {strip} <ul> - {if $gBitUser->hasPermission('bit_p_view_fisheye')} + {if $gBitUser->hasPermission('p_fisheye_view')} <li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php">{biticon ipackage=liberty iname=list iexplain="list galleries" iforce="icon"} {tr}List Galleries{/tr}</a></li> {/if} - {if $gBitUser->hasPermission('bit_p_create_fisheye')} + {if $gBitUser->hasPermission('p_fisheye_create')} <li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}list_galleries.php?user_id={$gBitUser->mUserId}">{biticon ipackage=liberty iname=spacer iexplain="my galleries" iforce="icon"} {tr}My Galleries{/tr}</a></li> <li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}edit.php">{biticon ipackage=liberty iname=new iexplain="create galleries" iforce="icon"} {tr}Create a Gallery{/tr}</a></li> <!--<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}edit_collection.php">{tr}Create a Collection{/tr}</a></li>--> {/if} - {if $gBitUser->hasPermission('bit_p_upload_fisheye')} + {if $gBitUser->hasPermission('p_fisheye_upload')} <li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}upload.php">{biticon ipackage=liberty iname=upload iexplain="upload images" iforce="icon"} {tr}Upload Images{/tr}</a></li> {/if} -{* if $gBitUser->hasPermission('bit_p_view_fisheye')} +{* if $gBitUser->hasPermission('p_fisheye_view')} <!--<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}browse.php">{tr}Browse Galleries{/tr}</a></li>--> <!--<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}collection.php">{tr}List Collections{/tr}</a></li>--> <li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}gallery_tree.php">{biticon ipackage=liberty iname=tree iexplain="growser gallery tree" iforce="icon"} {tr}Browse Gallery Tree{/tr}</a></li> @@ -22,7 +22,7 @@ {if $gBitUser->isRegistered() && $gBitSystem->isPackageActive('gatekeeper')} <li><a class="item" href="{$smarty.const.GATEKEEPER_PKG_URL}">{biticon ipackage=gatekeeper iname=security iexplain="security" iforce="icon"} {tr}Security{/tr}</a></li> {/if} - {if $gBitUser->hasPermission('bit_p_admin_fisheye')} + {if $gBitUser->hasPermission('p_fisheye_admin')} <!--<li><a class="item" href="{$smarty.const.FISHEYE_PKG_URL}admin/admin_imagegals.php">{tr}Admin Galleries{/tr}</a></li>--> {/if} </ul> diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl index 8c50622..32f3451 100644 --- a/templates/upload_fisheye.tpl +++ b/templates/upload_fisheye.tpl @@ -41,7 +41,7 @@ {/forminput} </div> - {if $gBitUser->hasPermission( 'bit_p_fisheye_upload_nonimages' )} + {if $gBitUser->hasPermission( 'p_fisheye_upload_nonimages' )} <div class="row"> {formlabel label="Process Archive(s)" for="process_archive"} {forminput} diff --git a/templates/view_gallery.tpl b/templates/view_gallery.tpl index 0625dd3..70d78f4 100644 --- a/templates/view_gallery.tpl +++ b/templates/view_gallery.tpl @@ -5,14 +5,14 @@ <div class="header"> <div class="floaticon"> {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo} - {if $gContent->hasUserPermission( 'bit_p_edit_fisheye' )} + {if $gContent->hasUserPermission( 'p_fisheye_edit' )} <a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage=liberty iname="config" iexplain="Edit"}</a> <a title="{tr}Image Order{/tr}" href="{$smarty.const.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' )} + {if $gContent->hasUserPermission( 'p_fisheye_upload' )} <a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage=liberty iname="upload" iexplain="Add Image"}</a> {/if} - {if $gContent->hasUserPermission( 'bit_p_admin_fisheye' )} + {if $gContent->hasUserPermission( 'p_fisheye_admin' )} <a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}&delete=1">{biticon ipackage=liberty iname="delete" iexplain="Delete Gallery"}</a> {* appears broken at the moment <a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_gallery_perms.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage=liberty iname="permissions" iexplain="User Permissions"}</a> *} {/if} diff --git a/templates/view_image.tpl b/templates/view_image.tpl index a7e3a85..95d6ab3 100644 --- a/templates/view_image.tpl +++ b/templates/view_image.tpl @@ -3,14 +3,14 @@ <div class="display fisheye"> <div class="floaticon"> - {if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'bit_p_pdf_generation' )} + {if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'p_pdf_generation' )} {if $structureInfo.root_structure_id} <a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}index.php?structure_id={$structureInfo.root_structure_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a> {else} <a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}index.php?content_id={$gContent->mContentId}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a> {/if} {/if} - {if $gContent->hasUserPermission('bit_p_admin')} + {if $gContent->hasUserPermission('p_admin')} <a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}">{biticon ipackage=liberty iname="edit" iexplain="Edit Image"}</a> <a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}&delete=1">{biticon ipackage=liberty iname="delete" iexplain="Delete Image"}</a> {/if} @@ -47,7 +47,7 @@ {/if} </div> - {if $gBitUser->hasPermission( 'bit_p_content_attachments' )} + {if $gBitUser->hasPermission( 'p_liberty_attach_attachments' )} <p class="formhelp"> {tr}To include this file in a wiki page, blog post, article …, use the following string{/tr}: <strong>{ldelim}attachment id={$gContent->mInfo.image_file.attachment_id}{rdelim}</strong> </p> @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload.php,v 1.10 2006/04/08 08:25:10 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload.php,v 1.11 2006/04/11 13:04:24 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -19,7 +19,7 @@ global $fisheyeErrors, $fisheyeWarnings, $fisheyeSuccess; include_once( FISHEYE_PKG_PATH.'gallery_lookup_inc.php' ); require_once( FISHEYE_PKG_PATH.'upload_inc.php'); -$gBitSystem->verifyPermission( 'bit_p_upload_fisheye' ); +$gBitSystem->verifyPermission( 'p_fisheye_upload' ); if( !empty( $_REQUEST['save_image'] ) ) { // first of all set the execution time for this process to unlimited diff --git a/upload_inc.php b/upload_inc.php index 6cb60f8..253eabe 100644 --- a/upload_inc.php +++ b/upload_inc.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload_inc.php,v 1.5 2006/03/22 14:19:30 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_fisheye/upload_inc.php,v 1.6 2006/04/11 13:04:24 squareing Exp $ * @package fisheye * @subpackage functions */ @@ -55,7 +55,7 @@ function fisheye_store_upload( &$pFileHash, $pOrder = 10 ) { function fisheye_process_archive( &$pFileHash, &$pParentGallery, $pRoot=FALSE ) { global $gBitSystem, $gBitUser; $errors = array(); - if( ($destDir = liberty_process_archive( $pFileHash )) && (!empty( $_REQUEST['process_archive'] ) || !$gBitUser->hasPermission( 'bit_p_fisheye_upload_nonimages' )) ) { + if( ($destDir = liberty_process_archive( $pFileHash )) && (!empty( $_REQUEST['process_archive'] ) || !$gBitUser->hasPermission( 'p_fisheye_upload_nonimages' )) ) { if( empty( $pParentGallery ) && !is_uploaded_file( $pFileHash['tmp_name'] ) ) { $pParentGallery = new FisheyeGallery(); $galleryHash = array( 'title' => basename( $destDir ) ); @@ -69,7 +69,7 @@ function fisheye_process_archive( &$pFileHash, &$pParentGallery, $pRoot=FALSE ) fisheye_process_directory( $destDir, $pParentGallery, $pRoot ); } else { global $gBitUser; - if( $gBitUser->hasPermission( 'bit_p_fisheye_upload_nonimages' ) ) { + if( $gBitUser->hasPermission( 'p_fisheye_upload_nonimages' ) ) { fisheye_store_upload( $pFileHash ); } else { $errors['upload'] = tra( 'Your upload could not be processed because it was determined to be a non-image and you only have permission to upload images.' ); |
