From 933aa8e2a9ab891ee5b504e0aaa53089b523c7e4 Mon Sep 17 00:00:00 2001 From: wolfgang Date: Thu, 22 Feb 2007 17:59:44 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1027 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ChangeLog | 12 ++++++++ SOPE/NGCards/versitCardsSaxDriver/Version | 2 +- SoObjects/Contacts/product.plist | 6 ---- SoObjects/SOGo/SOGoObject.m | 2 ++ SoObjects/SOGo/SOGoUser.m | 10 +++++-- UI/Contacts/product.plist | 7 ----- UI/MailPartViewers/UIxMailPartHTMLViewer.h | 34 ++++++++++++++++++++++ UI/MailPartViewers/UIxMailPartViewer.m | 14 +++++---- UI/MainUI/product.plist | 9 +----- 9 files changed, 65 insertions(+), 31 deletions(-) create mode 100644 UI/MailPartViewers/UIxMailPartHTMLViewer.h diff --git a/ChangeLog b/ChangeLog index 5f811c70..711bd874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-02-21 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject + -rolesOfUser:logininContext:context]): if object does not exists + (for example when it's being created), the current user has the + same rights on it than he/she has on its parent container. + + * SoObjects/SOGo/SOGoFolder.m ([SOGoFolder + -nameExistsInFolder:objectName]): methods that tests if a c_name + corresponding to the name passed as parameter is present in the db + folder. + 2007-02-16 Wolfgang Sourdeau * SoObjects/SOGo/SOGoUser.m ([SOGoUser diff --git a/SOPE/NGCards/versitCardsSaxDriver/Version b/SOPE/NGCards/versitCardsSaxDriver/Version index 462cacfe..160d8124 100644 --- a/SOPE/NGCards/versitCardsSaxDriver/Version +++ b/SOPE/NGCards/versitCardsSaxDriver/Version @@ -2,6 +2,6 @@ # SOPE version: MAJOR_VERSION=4 -MINOR_VERSION=5 +MINOR_VERSION=7 SUBMINOR_VERSION:=24 diff --git a/SoObjects/Contacts/product.plist b/SoObjects/Contacts/product.plist index 9c7b5f82..4ff7a937 100644 --- a/SoObjects/Contacts/product.plist +++ b/SoObjects/Contacts/product.plist @@ -22,18 +22,12 @@ SOGoContactGCSFolder = { superclass = "SOGoFolder"; - defaultRoles = { - "PUT" = ( "Owner", "Delegate" ); - "Add Documents, Images, and Files" = ( "Owner", "Delegate" ); - }; }; SOGoContactGCSEntry = { superclass = "SOGoContentObject"; defaultRoles = { "View" = ( "Owner", "Delegate", "Organizer", "Authenticated" ); - "PUT" = ( "Owner", "Delegate" ); - "Add Documents, Images, and Files" = ( "Owner", "Delegate" ); }; }; diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index a548e523..5e0ba15c 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -21,7 +21,9 @@ #import #import +#import #import +#import #import #import diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index 0c7a3947..d3bb2eaa 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -151,9 +151,13 @@ NSArray *sogoRoles; NSString *role; - rolesForObject - = [NSMutableArray arrayWithArray: [super rolesForObject: object - inContext: context]]; + rolesForObject = [NSMutableArray new]; + [rolesForObject autorelease]; + + sogoRoles = [super rolesForObject: object inContext: context]; + if (sogoRoles) + [rolesForObject addObjectsFromArray: sogoRoles]; + if ([[object ownerInContext: context] isEqualToString: [self login]]) [rolesForObject addObject: SoRole_Owner]; if ([object isKindOfClass: [SOGoObject class]]) diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist index ce080e9e..a3424d7b 100644 --- a/UI/Contacts/product.plist +++ b/UI/Contacts/product.plist @@ -111,10 +111,6 @@ pageName = "UIxContactsListView"; actionName = "addressBooksContacts"; }; - PUT = { - protectedBy = "PUT"; - actionName = "PUT"; - }; }; }; @@ -193,9 +189,6 @@ pageName = "UIxContactView"; actionName = "vcard"; }; - PUT = { - protectedBy = "PUT"; - }; }; }; diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.h b/UI/MailPartViewers/UIxMailPartHTMLViewer.h new file mode 100644 index 00000000..edc0143c --- /dev/null +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.h @@ -0,0 +1,34 @@ +/* UIxMailPartHTMLViewer.h - this file is part of SOGo + * + * Copyright (C) 2007 Inverse groupe conseil + * + * Author: Wolfgang Sourdeau + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef UIXMAILPARTHTMLVIEWER_H +#define UIXMAILPARTHTMLVIEWER_H + +#import "UIxMailPartViewer.h" + +@interface UIxMailPartHTMLViewer : UIxMailPartViewer + +- (NSString *) flatContentAsString; + +@end + +#endif /* UIXMAILPARTHTMLVIEWER_H */ diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m index bb988c40..9f6285ac 100644 --- a/UI/MailPartViewers/UIxMailPartViewer.m +++ b/UI/MailPartViewers/UIxMailPartViewer.m @@ -19,12 +19,14 @@ 02111-1307, USA. */ -#include "UIxMailPartViewer.h" -#include "UIxMailRenderingContext.h" -#include "UIxMailSizeFormatter.h" -#include "../MailerUI/WOContext+UIxMailer.h" -#include -#include "common.h" +#import + +#import "UIxMailPartViewer.h" +#import "UIxMailRenderingContext.h" +#import "UIxMailSizeFormatter.h" +#import "../MailerUI/WOContext+UIxMailer.h" +#import +#import "common.h" @implementation UIxMailPartViewer diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist index 1a32d592..0a3857ca 100644 --- a/UI/MainUI/product.plist +++ b/UI/MainUI/product.plist @@ -33,7 +33,7 @@ "View" = ( "Owner", "Delegate", "Assistant" ); "WebDAV Access" = ( "Owner", "Delegate", "Assistant" ); "Access Contents Information" = ( "Owner", "Assistant", "Delegate" ); - "ReadAcls" = ( "Owner", "Assistant", "Delegate" ); + "ReadAcls" = ( "Owner", "Delegate", "Assistant" ); "SaveAcls" = ( "Owner" ); "Delete Objects" = ( "Owner", "Delegate" ); }; @@ -67,13 +67,6 @@ }; SOGoRootPage = { }; - SOGoFolder = { - methods = { - PUT = { - protectedBy = "Add Documents, Images, and Files"; - }; - }; - }; SOGoUserFolder = { methods = { view = { -- 2.39.5