diff --git a/NEWS b/NEWS index 9f170c71d..7fd55c2e7 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,7 @@ whenever they were set once; - imap folders with non-ascii characters are now correctly accessed; - display the quotas of the selected mailbox on servers that support quotas; +- a bug in the folder acl description was preventing from accessing resources in dav; Local variables: mode: text diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m index d3f73984a..530a0e0ef 100644 --- a/SoObjects/SOGo/SOGoFolder.m +++ b/SoObjects/SOGo/SOGoFolder.m @@ -261,9 +261,11 @@ static NSString *defaultUserID = @""; if ([self respondsToSelector: @selector (groupDavResourceType)]) { - groupDavCollection = [NSArray arrayWithObjects: [self groupDavResourceType], - XMLNS_GROUPDAV, nil]; - rType = [NSArray arrayWithObjects: @"collection", groupDavCollection, nil]; + groupDavCollection + = [NSArray arrayWithObjects: [self groupDavResourceType], + XMLNS_GROUPDAV, nil]; + rType = [NSArray arrayWithObjects: @"collection", groupDavCollection, + nil]; } else rType = [NSArray arrayWithObject: @"collection"]; @@ -296,8 +298,8 @@ static NSString *defaultUserID = @""; name = [names objectAtIndex: i]; r = [name rangeOfString: @"."]; if (r.length == 0) - name = [[name stringByAppendingString:@"."] stringByAppendingString: ext]; - [ma addObject:name]; + name = [NSMutableString stringWithFormat: @"%@.%@", name, ext]; + [ma addObject: name]; } names = ma; @@ -530,19 +532,24 @@ static NSString *defaultUserID = @""; /* folder type */ -- (NSString *)outlookFolderClass { +- (NSString *) outlookFolderClass +{ + [self subclassResponsibility: _cmd]; + return nil; } /* description */ -- (void)appendAttributesToDescription:(NSMutableString *)_ms { +- (void) appendAttributesToDescription: (NSMutableString *) _ms +{ [super appendAttributesToDescription:_ms]; [_ms appendFormat:@" ocs=%@", [self ocsPath]]; } -- (NSString *)loggingPrefix { +- (NSString *) loggingPrefix +{ return [NSString stringWithFormat:@"<0x%08X[%@]:%@>", self, NSStringFromClass([self class]), [self nameInContainer]]; diff --git a/UI/MailerUI/UIxMailListView.h b/UI/MailerUI/UIxMailListView.h index fddbfea8b..8ab751e3e 100644 --- a/UI/MailerUI/UIxMailListView.h +++ b/UI/MailerUI/UIxMailListView.h @@ -29,10 +29,10 @@ @interface UIxMailListView : UIxComponent { - NSArray *sortedUIDs; /* we always need to retrieve all anyway! */ - NSArray *messages; - unsigned firstMessageNumber; - id message; + NSArray *sortedUIDs; /* we always need to retrieve all anyway! */ + NSArray *messages; + unsigned firstMessageNumber; + id message; EOQualifier *qualifier; SOGoDateFormatter *dateFormatter; NSTimeZone *userTimeZone; diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m index b63b740c1..41ba101bb 100644 --- a/UI/MailerUI/UIxMailListView.m +++ b/UI/MailerUI/UIxMailListView.m @@ -92,7 +92,7 @@ static int attachmentFlagSize = 8096; { NSCalendarDate *messageDate; - messageDate = [[message objectForKey: @"envelope"] date]; + messageDate = [[message valueForKey: @"envelope"] date]; [messageDate setTimeZone: userTimeZone]; return [dateFormatter formattedDateAndTime: messageDate]; diff --git a/UI/MailerUI/common.h b/UI/MailerUI/common.h index 4906cbaeb..ca5c2267c 100644 --- a/UI/MailerUI/common.h +++ b/UI/MailerUI/common.h @@ -32,5 +32,3 @@ #include #include #include - -#warning importing common.h is baaad diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist index 6746f77a8..44a84862e 100644 --- a/UI/MailerUI/product.plist +++ b/UI/MailerUI/product.plist @@ -348,8 +348,8 @@ categories = { }; methods = { view = { /* somewhat hackish */ - protectedBy = "View"; - pageName = "UIxMailEditor"; + protectedBy = "View"; + pageName = "UIxMailView"; }; edit = { protectedBy = "View"; diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist index c751208bb..7582875fb 100644 --- a/UI/MainUI/product.plist +++ b/UI/MainUI/product.plist @@ -41,7 +41,7 @@ protectedBy = "Access Object"; defaultRoles = { "Change Images And Files" = ( "Owner", "ObjectEditor" ); - "WebDAV Access" = ( "Owner", "ObjectViewer" ); + "WebDAV Access" = ( "Owner", "AuthorizedSubscriber" ); "Access Object" = ( "Owner", "ObjectViewer" ); "Access Contents Information" = ( "Owner", "ObjectViewer" ); }; diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index c03fc476b..0089f139a 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -25,7 +25,6 @@ SchedulerUI_OBJC_FILES = \ UIxCalMulticolumnDayView.m \ UIxCalWeekView.m \ UIxCalMonthView.m \ - UIxCalMonthViewOld.m \ UIxAptTableView.m \ \ UIxCalListingActions.m \ @@ -40,8 +39,9 @@ SchedulerUI_OBJC_FILES = \ UIxCalDateLabel.m \ UIxDatePicker.m \ UIxTimeDateControl.m \ - UIxCalParticipationStatusView.m \ - UIxCalMonthOverview.m + UIxCalParticipationStatusView.m \ + UIxCalMonthOverview.m \ + UIxCalMonthViewOld.m SchedulerUI_RESOURCE_FILES += \ Version \ diff --git a/UI/Scheduler/SchedulerUIProduct.m b/UI/Scheduler/SchedulerUIProduct.m index c2936c2b7..bc34f84ed 100644 --- a/UI/Scheduler/SchedulerUIProduct.m +++ b/UI/Scheduler/SchedulerUIProduct.m @@ -18,17 +18,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: SchedulerUIProduct.m 904 2005-07-22 15:00:36Z helge $ #import @interface SchedulerUIProduct : NSObject -{ -} - @end -#include "common.h" - @implementation SchedulerUIProduct @end /* SchedulerUIProduct */ diff --git a/UI/Scheduler/UIxAppointmentProposal.m b/UI/Scheduler/UIxAppointmentProposal.m index f81d87eba..c8b65ac8e 100644 --- a/UI/Scheduler/UIxAppointmentProposal.m +++ b/UI/Scheduler/UIxAppointmentProposal.m @@ -18,9 +18,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $ -#include +#import +#import +#import + +#import +#import +#import + +#import +#import +#import @interface UIxAppointmentProposal : UIxComponent { @@ -54,12 +63,6 @@ - (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp; @end -#include -#include -#include -#include -#include "common.h" - @implementation UIxAppointmentProposal - (void)dealloc { diff --git a/UI/Scheduler/UIxAptTableView.m b/UI/Scheduler/UIxAptTableView.m index bb0fbd729..a634f9257 100644 --- a/UI/Scheduler/UIxAptTableView.m +++ b/UI/Scheduler/UIxAptTableView.m @@ -18,9 +18,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: UIxAptTableView.m 59 2004-06-22 13:40:19Z znek $ -#include +#import @class NSArray, NSCalendarDate; @@ -37,8 +36,6 @@ @end -#include "common.h" - @implementation UIxAptTableView - (void)dealloc { diff --git a/UI/Scheduler/UIxCalDateLabel.m b/UI/Scheduler/UIxCalDateLabel.m index c75ba5ba5..9931a5c85 100644 --- a/UI/Scheduler/UIxCalDateLabel.m +++ b/UI/Scheduler/UIxCalDateLabel.m @@ -18,9 +18,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: UIxCalDateLabel.m 619 2005-03-02 15:16:32Z znek $ -#include +#import + +#import +#import + +#import @interface UIxCalDateLabel : UIxComponent { @@ -36,9 +40,6 @@ @end -#include "common.h" -#include - @implementation UIxCalDateLabel - (void)dealloc { diff --git a/UI/Scheduler/UIxCalMonthOverview.h b/UI/Scheduler/UIxCalMonthOverview.h index 374a50438..511d0819f 100644 --- a/UI/Scheduler/UIxCalMonthOverview.h +++ b/UI/Scheduler/UIxCalMonthOverview.h @@ -54,7 +54,7 @@ /* appointments */ -- (NSArray *)appointments; +// - (NSArray *)appointments; @end diff --git a/UI/Scheduler/UIxCalMonthOverview.m b/UI/Scheduler/UIxCalMonthOverview.m index ad7b63923..5ab7be0da 100644 --- a/UI/Scheduler/UIxCalMonthOverview.m +++ b/UI/Scheduler/UIxCalMonthOverview.m @@ -1,8 +1,10 @@ -// $Id: UIxCalMonthOverview.m 885 2005-07-21 16:41:34Z znek $ -#include "UIxCalMonthOverview.h" -#include "common.h" -#include +#import +#import + +#import + +#import "UIxCalMonthOverview.h" @implementation UIxCalMonthOverview @@ -96,8 +98,8 @@ /* appointments */ -- (NSArray *)appointments { - return [self fetchCoreAppointmentsInfos]; -} +// - (NSArray *)appointments { +// return [self fetchCoreAppointmentsInfos]; +// } @end /* UIxCalMonthOverview */ diff --git a/UI/Scheduler/UIxCalMonthViewOld.m b/UI/Scheduler/UIxCalMonthViewOld.m index e681b6389..292e98caf 100644 --- a/UI/Scheduler/UIxCalMonthViewOld.m +++ b/UI/Scheduler/UIxCalMonthViewOld.m @@ -1,8 +1,9 @@ -// $Id: UIxCalMonthView.m 191 2004-08-12 16:28:32Z helge $ +#import +#import -#include -#include "UIxCalMonthViewOld.h" -#include "common.h" +#import + +#import "UIxCalMonthViewOld.h" @implementation UIxCalMonthViewOld diff --git a/UI/Scheduler/UIxCalParticipationStatusView.m b/UI/Scheduler/UIxCalParticipationStatusView.m index 63dd22f2a..fc1c1ec43 100644 --- a/UI/Scheduler/UIxCalParticipationStatusView.m +++ b/UI/Scheduler/UIxCalParticipationStatusView.m @@ -18,9 +18,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: UIxCalParticipationStatusView.m 759 2005-07-14 16:26:32Z znek $ -#include +#import +#import @interface UIxCalParticipationStatusView : WOComponent { @@ -31,9 +31,6 @@ @end -#include /* for iCalPersonPartStat */ -#include "common.h" - @implementation UIxCalParticipationStatusView - (void)setPartStat:(id)_partStat { diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m index b808e61c7..fd5b0f244 100644 --- a/UI/Scheduler/UIxCalView.m +++ b/UI/Scheduler/UIxCalView.m @@ -1,20 +1,23 @@ -// $Id: UIxCalView.m 1080 2007-06-12 22:15:47Z wolfgang $ -#import "common.h" //#import #import #import #import +#import +#import +#import +#import #import -#import -#import "UIxComponent+Scheduler.h" +#import +#import +#import +#import -#import "SoObjects/Appointments/SOGoAppointmentFolder.h" -#import -#import -#import +#import + +#import "UIxComponent+Scheduler.h" #import "UIxCalView.h" diff --git a/UI/Scheduler/UIxDatePicker.m b/UI/Scheduler/UIxDatePicker.m index dbcc15a8f..82893b4c5 100644 --- a/UI/Scheduler/UIxDatePicker.m +++ b/UI/Scheduler/UIxDatePicker.m @@ -19,7 +19,13 @@ 02111-1307, USA. */ -#include +#import +#import + +#import +#import +#import +#import @class NSString; @@ -33,14 +39,12 @@ BOOL isDisabled; } -- (NSString *)dateID; -- (NSString *)dateFormat; -- (NSString *)jsDateFormat; -- (BOOL)useISOFormats; +- (NSString *) dateID; +- (NSString *) dateFormat; +- (NSString *) jsDateFormat; +- (BOOL) useISOFormats; @end -#include "common.h" - @implementation UIxDatePicker - (id) init diff --git a/UI/Scheduler/UIxTaskProposal.m b/UI/Scheduler/UIxTaskProposal.m index bdd092d02..c472684b8 100644 --- a/UI/Scheduler/UIxTaskProposal.m +++ b/UI/Scheduler/UIxTaskProposal.m @@ -20,7 +20,17 @@ */ // $Id: UIxTaskEditor.m 181 2004-08-11 15:13:25Z helge $ -#include +#import +#import +#import + +#import +#import +#import + +#import +#import +#import @interface UIxTaskProposal : UIxComponent { @@ -54,12 +64,6 @@ - (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp; @end -#include -#include -#include -#include -#include "common.h" - @implementation UIxTaskProposal - (void)dealloc { diff --git a/UI/Scheduler/common.h b/UI/Scheduler/common.h deleted file mode 100644 index 80c19bf13..000000000 --- a/UI/Scheduler/common.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (C) 2004 SKYRIX Software AG - - This file is part of OpenGroupware.org. - - OGo is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - OGo 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 Lesser General Public - License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with OGo; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. -*/ -// $Id: common.h 1101 2007-07-10 19:27:48Z wolfgang $ - -#import - -#if LIB_FOUNDATION_LIBRARY -# import -#elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY -# import -# import -#endif - -#import -#import -#import - -#warning importing common.h is baaad diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js index 2755a613f..ca472c522 100644 --- a/UI/WebServerResources/UIxContactsUserFolders.js +++ b/UI/WebServerResources/UIxContactsUserFolders.js @@ -23,7 +23,6 @@ function addLineToTree(tree, parent, line) { var parentNode = nodes[0]; var userInfos = parentNode.split(":"); var email = userInfos[1] + " <" + userInfos[2] + ">"; - log ("email: " + email); tree.add(parent, 0, email, 0, '#', userInfos[0], 'person', '', '', ResourcesURL + '/abcard.gif',