From afeaee6e47588633ee5aa9f04592033d6e46ba85 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Sun, 22 Nov 2009 11:02:02 -0700 Subject: [PATCH] Perms:: -> Horde_Perms:: --- ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h | 4 +- ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m | 84 ++++++++--------- .../TURAnselKit/TURAnselGallery.m | 44 ++++----- ansel/edit_dates.php | 4 +- ansel/faces/custom.php | 2 +- ansel/faces/delete.php | 2 +- ansel/faces/gallery.php | 2 +- ansel/faces/name.php | 4 +- ansel/gallery.php | 10 +-- ansel/gallery/captions.php | 2 +- ansel/gallery/delete.php | 4 +- ansel/gallery/sort.php | 2 +- ansel/group.php | 8 +- ansel/image.php | 20 ++--- ansel/img/download.php | 2 +- ansel/img/full.php | 2 +- ansel/img/index.php | 2 +- ansel/img/mini.php | 2 +- ansel/img/prettythumb.php | 2 +- ansel/img/screen.php | 2 +- ansel/img/thumb.php | 2 +- ansel/img/upload_preview.php | 2 +- ansel/js/googlemap.js | 4 +- ansel/lib/Ajax/Imple/EditCaption.php | 2 +- ansel/lib/Ajax/Imple/EditFaces.php | 4 +- ansel/lib/Ajax/Imple/ImageSaveGeotag.php | 2 +- ansel/lib/Ajax/Imple/TagActions.php | 4 +- ansel/lib/Ansel.php | 4 +- ansel/lib/Api.php | 42 ++++----- ansel/lib/Block/gallery.php | 6 +- ansel/lib/Block/my_galleries.php | 2 +- ansel/lib/Block/recent_comments.php | 6 +- ansel/lib/Block/recently_added.php | 6 +- ansel/lib/Block/recently_added_geodata.php | 6 +- ansel/lib/Faces/Base.php | 10 +-- ansel/lib/Gallery.php | 18 ++-- ansel/lib/GalleryMode/Date.php | 28 +++--- ansel/lib/GalleryMode/Normal.php | 14 +-- ansel/lib/Image.php | 4 +- ansel/lib/ImageView.php | 2 +- ansel/lib/Storage.php | 30 +++---- ansel/lib/Tags.php | 4 +- ansel/lib/Tile/DateGallery.php | 2 +- ansel/lib/Tile/Gallery.php | 4 +- ansel/lib/Tile/Image.php | 6 +- ansel/lib/View/Base.php | 2 +- ansel/lib/View/EmbeddedRenderer/GalleryLink.php | 2 +- ansel/lib/View/EmbeddedRenderer/Mini.php | 2 +- ansel/lib/View/Gallery.php | 2 +- ansel/lib/View/GalleryRenderer/Base.php | 4 +- ansel/lib/View/GalleryRenderer/Gallery.php | 8 +- ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 8 +- ansel/lib/View/Image.php | 2 +- ansel/lib/View/List.php | 6 +- ansel/lib/View/Results.php | 4 +- ansel/lib/Widget/Actions.php | 6 +- ansel/lib/Widget/GalleryFaces.php | 2 +- ansel/lib/Widget/Geotag.php | 2 +- ansel/lib/Widget/ImageFaces.php | 2 +- ansel/lib/Widget/OtherGalleries.php | 2 +- ansel/lib/Widget/Tags.php | 4 +- ansel/map_edit.php | 2 +- ansel/perms.php | 98 ++++++++++---------- ansel/preview.php | 2 +- ansel/rss.php | 8 +- ansel/scripts/ansel.php | 2 +- ansel/scripts/recursive_import.php | 2 +- ansel/scripts/remote_import.php | 2 +- ansel/templates/gallery/gallery.inc | 2 +- ansel/templates/group/category.inc | 6 +- ansel/templates/group/owner.inc | 6 +- ansel/templates/image/preview_cropimage.inc | 4 +- ansel/templates/image/preview_image.inc | 4 +- ansel/templates/view/gallery.inc | 2 +- ansel/templates/view/gallerylightbox.inc | 2 +- ansel/templates/view/image.inc | 4 +- ansel/templates/view/results.inc | 2 +- ansel/templates/view/slideshow.inc | 4 +- ansel/templates/xppublish/list.inc | 2 +- ansel/xppublish.php | 2 +- babel/view.php | 6 +- beatnik/lib/Beatnik.php | 4 +- beatnik/lib/Driver.php | 10 +-- chora/lib/Chora.php | 2 +- fima/account.php | 12 +-- fima/accounts.php | 2 +- fima/lib/Fima.php | 6 +- fima/postings.php | 10 +-- fima/templates/accounts/accounts.inc | 4 +- folks/config/hooks.php.dist | 4 +- folks/lib/Driver.php | 2 +- folks/lib/Friends/shared.php | 2 +- folks/lib/Notification.php | 2 +- folks/perms.php | 80 ++++++++--------- .../lib/Horde/Service/Facebook/Auth.php | 2 +- gollem/lib/Api.php | 12 +-- gollem/lib/Block/tree_menu.php | 2 +- gollem/lib/Gollem.php | 4 +- gollem/manager.php | 6 +- gollem/selectlist.php | 2 +- imp/index-dimp.php | 2 +- imp/lib/IMP.php | 4 +- imp/lib/Message.php | 4 +- imp/saveimage.php | 2 +- ingo/filters.php | 4 +- ingo/lib/Application.php | 2 +- ingo/lib/Ingo.php | 2 +- ingo/lib/base.php | 2 +- ingo/rule.php | 6 +- kastalia/main.php | 4 +- koward/lib/Koward.php | 3 - kronolith/add.php | 4 +- kronolith/ajax.php | 10 +-- kronolith/data.php | 2 +- kronolith/delete.php | 2 +- kronolith/docs/CHANGES | 2 +- kronolith/edit.php | 12 +-- kronolith/feed/index.php | 2 +- kronolith/lib/Ajax/Imple/TagActions.php | 8 +- kronolith/lib/Api.php | 64 ++++++------- kronolith/lib/Block/month.php | 2 +- kronolith/lib/Block/monthlist.php | 2 +- kronolith/lib/Block/prevmonthlist.php | 2 +- kronolith/lib/Block/summary.php | 2 +- kronolith/lib/Driver/Kolab.php | 2 +- kronolith/lib/Driver/Resource.php | 12 +-- kronolith/lib/Driver/Sql.php | 6 +- kronolith/lib/Event.php | 18 ++-- kronolith/lib/Forms/CreateResource.php | 2 +- kronolith/lib/Forms/CreateResourceGroup.php | 2 +- kronolith/lib/Forms/DeleteResource.php | 2 +- kronolith/lib/Forms/DeleteResourceGroup.php | 2 +- kronolith/lib/Forms/EditResource.php | 2 +- kronolith/lib/Forms/EditResourceGroup.php | 2 +- kronolith/lib/Kronolith.php | 46 +++++----- kronolith/lib/LoginTasks/Task/PurgeEvents.php | 4 +- kronolith/lib/Resource/Base.php | 2 +- kronolith/lib/View/Day.php | 2 +- kronolith/lib/View/DeleteEvent.php | 4 +- kronolith/lib/View/EditEvent.php | 14 +-- kronolith/lib/View/Event.php | 4 +- kronolith/lib/View/Month.php | 2 +- kronolith/new.php | 4 +- kronolith/perms.php | 100 ++++++++++----------- kronolith/resources/delete.php | 2 +- kronolith/resources/edit.php | 2 +- kronolith/resources/groups/delete.php | 2 +- kronolith/resources/groups/edit.php | 2 +- kronolith/resources/groups/index.php | 2 +- kronolith/resources/index.php | 2 +- kronolith/scripts/agenda.php | 8 +- kronolith/scripts/import_squirrelmail_calendar.php | 8 +- kronolith/search.php | 2 +- kronolith/templates/data/export.inc | 4 +- kronolith/templates/data/import.inc | 4 +- kronolith/templates/edit/edit.inc | 2 +- kronolith/templates/panel.inc | 2 +- kronolith/templates/perms/perms.inc | 50 +++++------ kronolith/templates/week/head.inc | 2 +- nag/ics.php | 4 +- nag/lib/Api.php | 64 ++++++------- nag/lib/Block/summary.php | 2 +- nag/lib/Driver.php | 4 +- nag/lib/Forms/task.php | 6 +- nag/lib/Nag.php | 23 ++--- nag/task.php | 16 ++-- nag/templates/data/export.inc | 4 +- nag/templates/data/import.inc | 6 +- nag/templates/list/task_summaries.inc | 6 +- nag/templates/view/task.inc | 2 +- nag/view.php | 6 +- news/add.php | 2 +- news/edit.php | 6 +- news/lib/Api.php | 4 +- news/lib/Categories.php | 2 +- news/lib/Driver/sql.php | 8 +- news/lib/Forms/Search.php | 2 +- news/lib/News.php | 2 +- news/lib/Search.php | 2 +- skoli/add.php | 2 +- skoli/classes/delete.php | 2 +- skoli/classes/edit.php | 2 +- skoli/entry.php | 6 +- skoli/lib/Block/tree_menu.php | 2 +- skoli/lib/Forms/Entry.php | 4 +- skoli/lib/Skoli.php | 16 ++-- skoli/list.php | 2 +- turba/contact.php | 4 +- turba/data.php | 2 +- turba/edit.php | 4 +- turba/lib/Api.php | 20 ++--- turba/lib/Application.php | 2 +- turba/lib/Driver.php | 2 +- turba/lib/Driver/Facebook.php | 4 +- turba/lib/Driver/Favourites.php | 4 +- turba/lib/Driver/Group.php | 4 +- turba/lib/Driver/Imsp.php | 8 +- turba/lib/ListView.php | 4 +- turba/lib/Object.php | 2 +- turba/lib/Turba.php | 11 +-- turba/lib/View/Contact.php | 6 +- turba/lib/View/DeleteContact.php | 8 +- turba/lib/View/EditContact.php | 8 +- turba/lib/base.php | 2 +- turba/scripts/upgrades/public_to_horde_share.php | 2 +- turba/templates/browse/row.inc | 2 +- turba/vcard.php | 2 +- turba/view.php | 2 +- vilma/lib/Vilma.php | 2 +- 209 files changed, 796 insertions(+), 797 deletions(-) diff --git a/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h b/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h index 68aed5cc2..a3ffb8cf2 100644 --- a/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h +++ b/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h @@ -2,7 +2,7 @@ * TURAnsel * * Copyright 2009 The Horde Project (http://www.horde.org) - * + * * @license http://opensource.org/licenses/bsd-license.php * @author Michael J. Rubinsky */ @@ -33,7 +33,7 @@ typedef enum { @interface TURAnsel : NSObject #else @interface TURAnsel : NSObject -#endif +#endif { NSString *userAgent; NSString *rpcEndPoint; diff --git a/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m b/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m index 347d5644f..6c752f91d 100644 --- a/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m +++ b/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m @@ -4,7 +4,7 @@ * Main class for interacting with a remote Ansel server. * * Copyright 2009 The Horde Project (http://www.horde.org) - * + * * @license http://opensource.org/licenses/bsd-license.php * @author Michael J. Rubinsky */ @@ -27,9 +27,9 @@ { [super init]; galleryList = [[NSMutableArray alloc] init]; - + // Initialize the connection properties, KVC style - [self setValue:[params objectForKey:@"endpoint"] + [self setValue:[params objectForKey:@"endpoint"] forKey: @"rpcEndPoint"]; [self setValue: [params objectForKey:@"username"] forKey: @"username"]; @@ -37,12 +37,12 @@ forKey: @"password"]; [self setValue: @"The Ansel Cocoa XML-RPC Client" forKey: @"userAgent"]; - + return self; } -(void) dealloc { - NSLog(@"TURAnsel dealloc"); + NSLog(@"TURAnsel dealloc"); [galleryList removeAllObjects]; [galleryList release]; [rpcEndPoint release]; @@ -54,7 +54,7 @@ #pragma mark - #pragma mark Actions -- (void)connect +- (void)connect { [self doLogin]; } @@ -72,37 +72,37 @@ */ - (NSDictionary *)createNewGallery: (NSDictionary *)params { - NSArray *apiparams = [NSArray arrayWithObjects: @"ansel", params, nil]; + NSArray *apiparams = [NSArray arrayWithObjects: @"ansel", params, nil]; NSArray *order = [NSArray arrayWithObjects: kTURAnselAPIParamScope, kTURAnselAPIParamGaleryParams, nil]; - + NSDictionary *response = [self callRPCMethod: @"images.createGallery" withParams: apiparams withOrder: order]; - + if (response) { - NSNumber *gallery_id = [response objectForKey: (NSString *)kWSMethodInvocationResult]; + NSNumber *gallery_id = [response objectForKey: (NSString *)kWSMethodInvocationResult]; NSDictionary *results = [NSDictionary dictionaryWithObjectsAndKeys: gallery_id, kTURAnselGalleryKeyId, [params valueForKey: @"name"], kTURAnselGalleryKeyName, @"", kTURAnselGalleryKeyDescription, [NSNumber numberWithInt: 0], kTURAnselGalleryKeyImages, [NSNumber numberWithInt: 0], kTURAnselGalleryKeyDefaultImage, nil]; - + TURAnselGallery *newGallery = [[TURAnselGallery alloc] initWithObject: results controller: self]; [galleryList addObject: newGallery]; [newGallery release]; - + return results; } - + return nil; } /** - * Entry point for calling RPC methods on the Horde server. - * + * Entry point for calling RPC methods on the Horde server. + * * @param NSString methodName The method to call (e.g. images.listGalleries) * @param NSArray params All the method's parameters * @param NSArray order Keys for the params array, needed because of how @@ -118,15 +118,15 @@ withOrder: (NSArray *) order { NSLog(@"Initiating connection for %@", methodName); - + // Get a URL object NSURL *url = [NSURL URLWithString: [self valueForKey: @"rpcEndPoint"]]; NSDictionary *values = [NSDictionary dictionaryWithObjects: params forKeys:order]; - + // Credentials NSString *user = [self valueForKey:@"username"]; NSString *pass = [self valueForKey:@"password"]; - + if (user != nil && [user length] && pass != nil && [pass length]) { // Create a custom http request with authorization CFHTTPMessageRef request = CFHTTPMessageCreateRequest(kCFAllocatorDefault, @@ -140,26 +140,26 @@ (CFStringRef)pass, kCFHTTPAuthenticationSchemeBasic, false); - + NSLog(@"Results adding credentials to request: %d", success); if (!success) { NSLog(@"Unable to authenticate"); - + if ([[self delegate] respondsToSelector: @selector(TURAnselHadError:)]) { NSError *error = [NSError errorWithDomain:@"TURAnsel" code: 1 userInfo:[NSDictionary dictionaryWithObjectsAndKeys: @"Authentication failure.", @"message", nil]]; - + [[self delegate] TURAnselHadError: error]; } - + return nil; - + } else { // Build a new invocation [self setState:TURAnselStateWaiting]; WSMethodInvocationRef rpcCall; - rpcCall = WSMethodInvocationCreate((CFURLRef)url, (CFStringRef)methodName, kWSXMLRPCProtocol); + rpcCall = WSMethodInvocationCreate((CFURLRef)url, (CFStringRef)methodName, kWSXMLRPCProtocol); WSMethodInvocationSetParameters(rpcCall, (CFDictionaryRef)values, (CFArrayRef)order); WSMethodInvocationSetProperty(rpcCall, kWSHTTPMessage, request); NSDictionary *result = (NSDictionary *)WSMethodInvocationInvoke(rpcCall); @@ -183,9 +183,9 @@ error = [NSError errorWithDomain: @"TURAnsel" code: [faultCode intValue] userInfo: [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithFormat: @"There was an error contacting the Ansel server: %@, %@", resStatusLine, faultString], @"NSLocalizedDescriptionKey", nil]]; - - - } + + + } [resStatusLine release]; } else { // No response @@ -197,25 +197,25 @@ userInfo: [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithFormat: @"There was an error contacting the Ansel server: %@", faultString], @"NSLocalizedDescriptionKey", nil]]; } - + if ([[self delegate] respondsToSelector: @selector(TURAnselHadError:)]) { [[self delegate] TURAnselHadError: error]; } [result autorelease]; return nil; - + } CFHTTPMessageRef response = (CFHTTPMessageRef)[result objectForKey:(id)kWSHTTPResponseMessage]; int resStatusCode = CFHTTPMessageGetResponseStatusCode(response); NSLog(@"ResponseCode: %d", resStatusCode); [self setState:TURAnselStateConnected]; return [result autorelease]; - } + } } - + NSLog(@"No authentication information present."); return nil; - + } #pragma mark - @@ -228,7 +228,7 @@ return g; } } - + return nil; } @@ -268,7 +268,7 @@ } - (id)delegate { - return delegate; + return delegate; } - (void)setDelegate:(id)newDelegate { @@ -285,23 +285,23 @@ - (void)doLogin { NSArray *params = [[NSArray alloc] initWithObjects: - @"ansel", // Scope + @"ansel", // Scope [NSNumber numberWithInt: PERMS_EDIT], // Perms @"", // No parent [NSNumber numberWithBool:YES], // allLevels [NSNumber numberWithInt: 0], // Offset [NSNumber numberWithInt: 0], // Count [self valueForKey:@"username"], nil]; // Restrict to user (This should be an option eventually). - + NSArray *order = [NSArray arrayWithObjects: kTURAnselAPIParamScope, kTURAnselAPIParamPerms, kTURAnselAPIParamParent, kTURAnselAPIParamAllLevels, kTURAnselAPIParamOffset, kTURAnselAPIParamCount, kTURAnselAPIParamUserOnly, nil]; - + NSDictionary *results = [self callRPCMethod: @"images.listGalleries" withParams: params withOrder: order]; - + if (results) { NSDictionary *galleries = [results objectForKey: (id)kWSMethodInvocationResult]; for (NSString *gal in galleries) { @@ -312,15 +312,15 @@ [theGallery release]; theGallery = nil; } - + if ([delegate respondsToSelector:@selector(TURAnselDidInitialize)]) { [delegate performSelectorOnMainThread:@selector(TURAnselDidInitialize) withObject:self waitUntilDone: NO]; } - + } - + [params release]; } -@end \ No newline at end of file +@end diff --git a/ApertureToAnselExportPlugin/TURAnselKit/TURAnselGallery.m b/ApertureToAnselExportPlugin/TURAnselKit/TURAnselGallery.m index a081a6496..b2dcab245 100644 --- a/ApertureToAnselExportPlugin/TURAnselKit/TURAnselGallery.m +++ b/ApertureToAnselExportPlugin/TURAnselKit/TURAnselGallery.m @@ -2,7 +2,7 @@ * TURAnselGallery.m * * Copyright 2009 The Horde Project (http://www.horde.org) - * + * * @license http://opensource.org/licenses/bsd-license.php * @author Michael J. Rubinsky */ @@ -35,7 +35,7 @@ [self setValue:[galleryData valueForKey: kTURAnselGalleryKeyName] forKey:@"galleryName"]; [self setValue: [galleryData valueForKey: kTURAnselGalleryKeyImages] - forKey:@"galleryImageCount"]; + forKey:@"galleryImageCount"]; [self setValue: [galleryData valueForKey: kTURAnselGalleryKeyDefaultImage] forKey:@"galleryKeyImage"]; [self setAnselController: controller]; @@ -46,16 +46,16 @@ NSLog(@"TURAnselGallery dealloc called on Gallery %@", self); [anselController release]; anselController = nil; - + [galleryKeyImageURL release]; galleryKeyImageURL = nil; - + [imageList release]; imageList = nil; - + [super dealloc]; } -- (id)description +- (id)description { NSString *text = [NSString stringWithFormat:@"Description: %@ Id: %d has: %d images", galleryName, _galleryId, galleryImageCount]; return text; @@ -66,7 +66,7 @@ /** * Requests the gallery's key image url to be fetched from the server * (This information is not present in the gallery definition array returned - * from the images.listGalleries call). + * from the images.listGalleries call). */ - (NSURL *)galleryKeyImageURL { @@ -84,19 +84,19 @@ kTURAnselAPIParamImageId, kTURAnselAPIParamThumbnailStyle, kTURAnselAPIParamFullPath, nil]; - + NSDictionary *response = [anselController callRPCMethod: @"images.getImageUrl" withParams: params withOrder: order]; - + if (response) { NSDictionary *url = [response objectForKey:(id)kWSMethodInvocationResult]; [galleryKeyImageURL autorelease]; galleryKeyImageURL = [[NSURL URLWithString: [NSString stringWithFormat: @"%@", url]] retain]; NSLog(@"galleryKeyImageURL: %@", galleryKeyImageURL); return galleryKeyImageURL; - } - + } + return nil; } } @@ -119,21 +119,21 @@ kTURAnselAPIParamPerms, kTURAnselAPIParamThumbnailStyle, kTURAnselAPIParamFullPath, nil]; - + NSDictionary *response = [anselController callRPCMethod: @"images.listImages" withParams: params withOrder: order]; if (response) { [imageList autorelease]; imageList = [[response objectForKey: (id)kWSMethodInvocationResult] retain]; - + NSLog(@"listImages: %@", imageList); } } - + return imageList;; } - + /** * Upload the provided image to this gallery. */ @@ -183,10 +183,10 @@ NSArray *params = [[NSArray alloc] initWithObjects: @"ansel", // app [NSNumber numberWithInt: _galleryId], // gallery_id - [imageParameters valueForKey: @"data"], // image data array + [imageParameters valueForKey: @"data"], // image data array [imageParameters valueForKey: @"default"], // set as default? - @"", // Additional gallery data to set? - @"base64", // Image data encoding + @"", // Additional gallery data to set? + @"base64", // Image data encoding nil]; NSArray *order = [NSArray arrayWithObjects: kTURAnselAPIParamScope, kTURAnselAPIParamGalleryId, @@ -194,20 +194,20 @@ kTURAnselAPIParamSetAsDefault, kTURAnselAPIParamAdditionalData, kTURAnselAPIParamEncoding, nil]; - + // Send the request up to the controller NSDictionary *result = [anselController callRPCMethod: @"images.saveImage" withParams: params withOrder: order]; - + if (result) { if ([delegate respondsToSelector:@selector(TURAnselGalleryDidUploadImage:)]) { [delegate performSelectorOnMainThread: @selector(TURAnselGalleryDidUploadImage:) - withObject: self + withObject: self waitUntilDone: NO]; } } - + [params release]; } @end diff --git a/ansel/edit_dates.php b/ansel/edit_dates.php index e3c5a2082..706083897 100644 --- a/ansel/edit_dates.php +++ b/ansel/edit_dates.php @@ -17,7 +17,7 @@ $page = Horde_Util::getFormData('page', 0); /* If we have a single gallery, check perms now */ if (!empty($gallery_id)) { $gallery = $ansel_storage->getGallery($gallery_id); - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(_("You are not allowed to edit these photos."), 'horde.error'); Horde_Util::closeWindowJS('window.opener.location.href = window.opener.location.href; window.close();'); exit; @@ -47,7 +47,7 @@ if ($actionID == 'edit_dates') { // Images might be from different galleries $gallery = $ansel_storage->getGallery($image->gallery); if (is_a($gallery, 'PEAR_Error') || - !$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + !$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { continue; } } diff --git a/ansel/faces/custom.php b/ansel/faces/custom.php index dc68aba77..dc4a4bc3b 100644 --- a/ansel/faces/custom.php +++ b/ansel/faces/custom.php @@ -29,7 +29,7 @@ if (is_a($image, 'PEAR_Error')) { } $gallery = $ansel_storage->getGallery($image->gallery); -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(_("Access denied editing the photo.")); header('Location: ' . Ansel::getUrlFor('view', array('gallery' => $image->gallery))); exit; diff --git a/ansel/faces/delete.php b/ansel/faces/delete.php index d2e7335d0..34e2b06ce 100644 --- a/ansel/faces/delete.php +++ b/ansel/faces/delete.php @@ -20,7 +20,7 @@ if (is_a($image, 'PEAR_Error')) { } $gallery = &$ansel_storage->getGallery($image->gallery); -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { die(_("Access denied editing the photo.")); } diff --git a/ansel/faces/gallery.php b/ansel/faces/gallery.php index 04c4807ca..fe78eb3d0 100644 --- a/ansel/faces/gallery.php +++ b/ansel/faces/gallery.php @@ -24,7 +24,7 @@ if (is_a($gallery, 'PEAR_Error')) { $notification->push($gallery->getMessage(), 'horde.error'); header('Location: ' . Ansel::getUrlFor('view', array('gallery' => $gallery_id))); exit; -} elseif (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { +} elseif (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(sprintf(_("Access denied editing gallery \"%s\"."), $gallery->get('name')), 'horde.error'); header('Location: ' . Ansel::getUrlFor('view', array('gallery' => $gallery_id))); exit; diff --git a/ansel/faces/name.php b/ansel/faces/name.php index 9a5cf5e85..675ded93a 100644 --- a/ansel/faces/name.php +++ b/ansel/faces/name.php @@ -17,9 +17,9 @@ $name = Horde_Util::getFormData('name'); $image = &$ansel_storage->getImage($image_id); $gallery = &$ansel_storage->getGallery($image->gallery); -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { throw new Horde_Exception('Access denied editing the photo.'); } $faces = Ansel_Faces::factory(); -$result = $faces->setName($face_id, $name); \ No newline at end of file +$result = $faces->setName($face_id, $name); diff --git a/ansel/gallery.php b/ansel/gallery.php index de22af104..a9de34f17 100644 --- a/ansel/gallery.php +++ b/ansel/gallery.php @@ -49,7 +49,7 @@ case 'addchild': $notification->push($parent->getMessage(), 'horde.error'); header('Location: ' . Horde::applicationUrl('view.php?view=List', true)); exit; - } elseif (!$parent->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + } elseif (!$parent->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push( sprintf(_("Access denied adding a gallery to \"%s\"."), $parent->get('name')), 'horde.error'); @@ -80,7 +80,7 @@ case 'downloadzip': $galleryId = Horde_Util::getFormData('gallery'); $gallery = $ansel_storage->getGallery($galleryId); if (!Horde_Auth::getAuth() || is_a($gallery, 'PEAR_Error') || - !$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) { + !$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) { $name = is_a($gallery, 'PEAR_Error') ? $galleryId @@ -123,7 +123,7 @@ case 'save': // Check general permissions. if (!Horde_Auth::isAdmin() && ($GLOBALS['perms']->exists('ansel') && - !$GLOBALS['perms']->hasPermission('ansel', Horde_Auth::getAuth(), PERMS_EDIT))) { + !$GLOBALS['perms']->hasPermission('ansel', Horde_Auth::getAuth(), Horde_Perms::EDIT))) { $notification->push(_("Access denied editing galleries."), 'horde.error'); header('Location: ' . Horde::applicationUrl('view.php?view=List', true)); exit; @@ -161,7 +161,7 @@ case 'save': // Modifying an existing gallery. $gallery = $ansel_storage->getGallery($galleryId); if (is_a($gallery, 'PEAR_Error') || - !$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + !$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $name = is_a($gallery, 'PEAR_Error') ? $galleryId @@ -228,7 +228,7 @@ case 'save': header('Location: ' . Horde::applicationUrl( Ansel::getUrlFor('view', array('view' => 'List'), true))); exit; - } elseif (!$parent->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + } elseif (!$parent->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(sprintf( _("You do not have permission to add children to %s."), $parent->get('name')), 'horde.error'); diff --git a/ansel/gallery/captions.php b/ansel/gallery/captions.php index 9aa3744a8..4f9800273 100644 --- a/ansel/gallery/captions.php +++ b/ansel/gallery/captions.php @@ -25,7 +25,7 @@ if (is_a($gallery, 'PEAR_Error')) { exit; } -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(sprintf(_("Access denied setting captions for %s."), $gallery->get('name')), 'horde.error'); header('Location: ' . Ansel::getUrlFor('view', array('view' => 'List'), true)); diff --git a/ansel/gallery/delete.php b/ansel/gallery/delete.php index b94e7e4c8..bf15aabc0 100644 --- a/ansel/gallery/delete.php +++ b/ansel/gallery/delete.php @@ -21,7 +21,7 @@ if ($galleryId) { case 'delete': if (is_a($gallery, 'PEAR_Error')) { $notification->push($gallery->getMessage(), 'horde.error'); - } elseif (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_DELETE)) { + } elseif (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::DELETE)) { $notification->push(sprintf(_("Access denied deleting gallery \"%s\"."), $gallery->get('name')), 'horde.error'); } else { @@ -50,7 +50,7 @@ if ($galleryId) { case 'empty': if (is_a($gallery, 'PEAR_Error')) { $notification->push($gallery->getMessage(), 'horde.error'); - } elseif (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_DELETE)) { + } elseif (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::DELETE)) { $notification->push(sprintf(_("Access denied deleting gallery \"%s\"."), $gallery->get('name')), 'horde.error'); diff --git a/ansel/gallery/sort.php b/ansel/gallery/sort.php index 68f9873a8..86d341588 100644 --- a/ansel/gallery/sort.php +++ b/ansel/gallery/sort.php @@ -25,7 +25,7 @@ if (is_a($gallery, 'PEAR_Error')) { header('Location: ' . Ansel::getUrlFor('view', array('view' => 'List'), true)); exit; -} elseif (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { +} elseif (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(sprintf(_("Access denied editing gallery \"%s\"."), $gallery->get('name')), 'horde.error'); header('Location: ' . Ansel::getUrlFor('view', array('view' => 'List'), true)); diff --git a/ansel/group.php b/ansel/group.php index 68f2e7d9a..f4c8633d5 100644 --- a/ansel/group.php +++ b/ansel/group.php @@ -27,13 +27,13 @@ $groups_perpage = $prefs->getValue('groupsperpage'); switch ($groupby) { case 'category': - $num_groups = $ansel_storage->countCategories(PERMS_SHOW); + $num_groups = $ansel_storage->countCategories(Horde_Perms::SHOW); if (is_a($num_groups, 'PEAR_Error')) { $notification->push($num_groups); $num_groups = 0; $groups = array(); } elseif ($num_groups) { - $groups = $ansel_storage->listCategories(PERMS_SHOW, + $groups = $ansel_storage->listCategories(Horde_Perms::SHOW, $gbpage * $groups_perpage, $groups_perpage); } else { @@ -42,14 +42,14 @@ case 'category': break; case 'owner': - $num_groups = $ansel_storage->shares->countOwners(PERMS_SHOW, null, + $num_groups = $ansel_storage->shares->countOwners(Horde_Perms::SHOW, null, false); if (is_a($num_groups, 'PEAR_Error')) { $notification->push($num_groups); $num_groups = 0; $groups = array(); } elseif ($num_groups) { - $groups = $ansel_storage->shares->listOwners(PERMS_SHOW, null, + $groups = $ansel_storage->shares->listOwners(Horde_Perms::SHOW, null, false, $gbpage * $groups_perpage, $groups_perpage); diff --git a/ansel/image.php b/ansel/image.php index 7a468814f..23e6a08c0 100644 --- a/ansel/image.php +++ b/ansel/image.php @@ -163,7 +163,7 @@ case 'savecloseimage': case 'saveclose': case 'save': $title = _("Save Photo"); - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(sprintf(_("Access denied saving photo to \"%s\"."), $gallery->get('name')), 'horde.error'); $imageurl = Ansel::getUrlFor('view', array_merge( @@ -289,7 +289,7 @@ case 'resizeedit': 'slug' => $gallery->get('slug')), $date)); - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(_("Access denied editing the photo."), 'horde.error'); @@ -341,7 +341,7 @@ case 'resizeedit': exit; case 'watermark': - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(sprintf(_("Access denied saving photo to \"%s\"."), $gallery->get('name')), 'horde.error'); @@ -383,7 +383,7 @@ case 'mirror': case 'grayscale': case 'crop': case 'resize': - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(sprintf(_("Access denied saving photo to \"%s\"."), $gallery->get('name')), 'horde.error'); @@ -555,7 +555,7 @@ case 'delete': /* Delete the images if we're provided with a valid image ID. */ if (count($images)) { - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_DELETE)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::DELETE)) { $notification->push(sprintf(_("Access denied deleting photos from \"%s\"."), $gallery->get('name')), 'horde.error'); } else { foreach ($images as $image) { @@ -573,7 +573,7 @@ case 'delete': } /* Recalculate the number of pages, since it might have changed */ - $children = $gallery->countGalleryChildren(PERMS_SHOW); + $children = $gallery->countGalleryChildren(Horde_Perms::SHOW); $perpage = min($prefs->getValue('tilesperpage'), $conf['thumbnail']['perpage']); $pages = ceil($children / $perpage); @@ -621,7 +621,7 @@ case 'move': } /* Recalculate the number of pages, since it might have changed */ - $children = $gallery->countGalleryChildren(PERMS_SHOW); + $children = $gallery->countGalleryChildren(Horde_Perms::SHOW); $perpage = min($prefs->getValue('tilesperpage'), $conf['thumbnail']['perpage']); $pages = ceil($children / $perpage); @@ -684,7 +684,7 @@ case 'downloadzip': if ($galleryId) { $gallery = $ansel_storage->getGallery($galleryId); if (!Horde_Auth::getAuth() || is_a($gallery, 'PEAR_Error') || - !$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ) || + !$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ) || $gallery->hasPasswd() || !$gallery->isOldEnough()) { $name = is_a($gallery, 'PEAR_Error') ? $galleryId : $gallery->get('name'); @@ -714,7 +714,7 @@ case 'downloadzip': case 'previewcrop': - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $notification->push(_("Access denied editing the photo."), 'horde.error'); $imageurl = Ansel::getUrlFor( 'view', array('gallery' => $gallery_id, @@ -746,7 +746,7 @@ case 'previewcrop': exit; case 'imagecrop': - if ($gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if ($gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $params = Horde_Util::getFormData('params'); list($x1, $y1, $x2, $y2) = explode('.', $params); $image = &$ansel_storage->getImage($image_id); diff --git a/ansel/img/download.php b/ansel/img/download.php index fab3bad79..528dcea70 100644 --- a/ansel/img/download.php +++ b/ansel/img/download.php @@ -19,7 +19,7 @@ $gallery = $ansel_storage->getGallery($image->gallery); if (is_a($gallery, 'PEAR_Error')) { Horde::fatal($gallery, __FILE__, __LINE__); } -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ) || +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ) || !$gallery->canDownload()) { Horde::fatal(_("Access denied viewing this photo."), __FILE__, __LINE__); } diff --git a/ansel/img/full.php b/ansel/img/full.php index 3d4a93dbd..2737e82d3 100644 --- a/ansel/img/full.php +++ b/ansel/img/full.php @@ -19,7 +19,7 @@ $gallery = $ansel_storage->getGallery($image->gallery); if (is_a($gallery, 'PEAR_Error')) { Horde::fatal($gallery, __FILE__, __LINE__); } -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ) || +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ) || !$gallery->canDownload()) { Horde::fatal(_("Access denied viewing this photo."), __FILE__, __LINE__); } diff --git a/ansel/img/index.php b/ansel/img/index.php index 17791fe7e..c5a7d0728 100644 --- a/ansel/img/index.php +++ b/ansel/img/index.php @@ -19,7 +19,7 @@ $gallery = $ansel_storage->getGallery($image->gallery); if (is_a($gallery, 'PEAR_Error')) { Horde::fatal($gallery, __FILE__, __LINE__); } -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) { Horde::fatal(_("Access denied viewing this photo."), __FILE__, __LINE__); } diff --git a/ansel/img/mini.php b/ansel/img/mini.php index 0c14a039e..f15e9679f 100644 --- a/ansel/img/mini.php +++ b/ansel/img/mini.php @@ -19,7 +19,7 @@ $gallery = $ansel_storage->getGallery(abs($image->gallery)); if (is_a($gallery, 'PEAR_Error')) { Horde::fatal($gallery, __FILE__, __LINE__); } -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) { Horde::fatal(_("Access denied viewing this photo."), __FILE__, __LINE__); } diff --git a/ansel/img/prettythumb.php b/ansel/img/prettythumb.php index 6c3cbd3a7..8dec2331c 100644 --- a/ansel/img/prettythumb.php +++ b/ansel/img/prettythumb.php @@ -20,7 +20,7 @@ $gallery = $ansel_storage->getGallery(abs($image->gallery)); if (is_a($gallery, 'PEAR_Error')) { Horde::fatal($gallery, __FILE__, __LINE__); } -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) { Horde::fatal(_("Access denied viewing this photo."), __FILE__, __LINE__); } diff --git a/ansel/img/screen.php b/ansel/img/screen.php index d7ec53612..7cc8f64f9 100644 --- a/ansel/img/screen.php +++ b/ansel/img/screen.php @@ -19,7 +19,7 @@ $gallery = $ansel_storage->getGallery($image->gallery); if (is_a($gallery, 'PEAR_Error')) { Horde::fatal($gallery, __FILE__, __LINE__); } -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) { Horde::fatal(_("Access denied viewing this photo."), __FILE__, __LINE__); } diff --git a/ansel/img/thumb.php b/ansel/img/thumb.php index 4c4700eab..c72995b43 100644 --- a/ansel/img/thumb.php +++ b/ansel/img/thumb.php @@ -19,7 +19,7 @@ $gallery = $ansel_storage->getGallery(abs($image->gallery)); if (is_a($gallery, 'PEAR_Error')) { Horde::fatal($gallery, __FILE__, __LINE__); } -if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) { +if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) { Horde::fatal(_("Access denied viewing this photo."), __FILE__, __LINE__); } diff --git a/ansel/img/upload_preview.php b/ansel/img/upload_preview.php index 2282a6c35..b89deb6a1 100644 --- a/ansel/img/upload_preview.php +++ b/ansel/img/upload_preview.php @@ -13,7 +13,7 @@ require_once dirname(__FILE__) . '/../lib/base.php'; $gallery_id = (int)Horde_Util::getFormData('gallery'); $gallery = $ansel_storage->getGallery($gallery_id); if (is_a($gallery, 'PEAR_Error') || - !$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_READ)) { + !$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) { die(sprintf(_("Gallery %s not found."), $gallery_id)); } diff --git a/ansel/js/googlemap.js b/ansel/js/googlemap.js index 38f3795b0..4362228a0 100644 --- a/ansel/js/googlemap.js +++ b/ansel/js/googlemap.js @@ -57,7 +57,7 @@ Ansel_GMap.prototype = { // deletion is successful // .clickHandler - optional callback to handle click events on the mainMap - // .hasEdit - Has PERMS_EDIT on the image + // .hasEdit - Has Horde_Perms::EDIT on the image // .calculateMaxZoom - call Google's getMaxZoomAtLatLng() method to // avoid autozooming in to a level with no detail. // Performance penalty because we make another @@ -484,4 +484,4 @@ document.observe('dom:loaded', function () { anselGOverlay.prototype.getLatLng = function() { return this.latlng_; } -}); \ No newline at end of file +}); diff --git a/ansel/lib/Ajax/Imple/EditCaption.php b/ansel/lib/Ajax/Imple/EditCaption.php index 5d3d812a9..e6470f427 100644 --- a/ansel/lib/Ajax/Imple/EditCaption.php +++ b/ansel/lib/Ajax/Imple/EditCaption.php @@ -70,7 +70,7 @@ class Ansel_Ajax_Imple_EditCaption extends Horde_Ajax_Imple_Base $id = $args['id']; $image = $GLOBALS['ansel_storage']->getImage($id); $g = $GLOBALS['ansel_storage']->getGallery($image->gallery); - if ($g->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if ($g->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { $image->caption = $pref_value; $result = $image->save(); if (is_a($result, 'PEAR_Error')) { diff --git a/ansel/lib/Ajax/Imple/EditFaces.php b/ansel/lib/Ajax/Imple/EditFaces.php index 3f33ce078..8e6d1e07e 100644 --- a/ansel/lib/Ajax/Imple/EditFaces.php +++ b/ansel/lib/Ajax/Imple/EditFaces.php @@ -75,7 +75,7 @@ class Ansel_Ajax_Imple_EditFaces extends Horde_Ajax_Imple_Base $face_id = (int)$post['face']; $image = &$GLOBALS['ansel_storage']->getImage($image_id); $gallery = &$GLOBALS['ansel_storage']->getGallery($image->gallery); - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { throw new Horde_Exception('Access denied editing the photo.'); } @@ -93,7 +93,7 @@ class Ansel_Ajax_Imple_EditFaces extends Horde_Ajax_Imple_Base $name = $post['facename']; $image = &$GLOBALS['ansel_storage']->getImage($image_id); $gallery = &$GLOBALS['ansel_storage']->getGallery($image->gallery); - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { throw new Horde_Exception('You are not allowed to edit this photo'); } diff --git a/ansel/lib/Ajax/Imple/ImageSaveGeotag.php b/ansel/lib/Ajax/Imple/ImageSaveGeotag.php index e1ad51da3..a8582ce61 100644 --- a/ansel/lib/Ajax/Imple/ImageSaveGeotag.php +++ b/ansel/lib/Ajax/Imple/ImageSaveGeotag.php @@ -49,7 +49,7 @@ class Ansel_Ajax_Imple_ImageSaveGeotag extends Horde_Ajax_Imple_Base return array('response' => 0); } // Bail out if no perms on the image. - if (!$gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT)) { + if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) { return array('response' => 0); } switch ($type) { diff --git a/ansel/lib/Ajax/Imple/TagActions.php b/ansel/lib/Ajax/Imple/TagActions.php index f0fcd7dee..60da9d91b 100644 --- a/ansel/lib/Ajax/Imple/TagActions.php +++ b/ansel/lib/Ajax/Imple/TagActions.php @@ -81,7 +81,7 @@ class Ansel_Ajax_Imple_TagActions extends Horde_Ajax_Imple_Base return array('response' => 1, 'message' => $this->_getTagHtml($newTags, $owner, - $parent->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT))); + $parent->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT))); } break; @@ -97,7 +97,7 @@ class Ansel_Ajax_Imple_TagActions extends Horde_Ajax_Imple_Base return array('response' => 1, 'message' => $this->_getTagHtml($newTags, $owner, - $parent->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT))); + $parent->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT))); break; } diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php index f7555b902..df933c569 100644 --- a/ansel/lib/Ansel.php +++ b/ansel/lib/Ansel.php @@ -103,7 +103,7 @@ class Ansel * * @return string The