git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1103 d1b88da0-ebda-0310...

diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index d3f73984a7bf12334a34292f2ac4913d6c34813f..530a0e0efb1462e18efc7c40649927f2dd5c5c36 100644 (file)
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -261,9 +261,11 @@ static NSString *defaultUserID = @"<default>";
 
   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 = @"<default>";
           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 = @"<default>";
 
 /* 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/MainUI/product.plist b/UI/MainUI/product.plist
index c751208bb5d9328ea3f861d0fa87a332c19f2535..7582875fb91bb3f6d813648528c84cd1661a21f6 100644 (file)
--- 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 c03fc476bdb0e21dfb0cfc23b8157d8175d9f291..0089f139a2354c5a6f851fefde8f93f20142bedf 100644 (file)
--- 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 62e7192ecd3b55110ef8982e876fd39b6b51ef87..bc34f84ede313c0023787c90f3e4e708cdd5597b 100644 (file)
--- 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$
 
 #import <Foundation/NSObject.h>
 
 @interface SchedulerUIProduct : NSObject
-{
-}
-
 @end
 
-#include "common.h"
-
 @implementation SchedulerUIProduct
 @end /* SchedulerUIProduct */

diff --git a/UI/Scheduler/UIxAppointmentProposal.m b/UI/Scheduler/UIxAppointmentProposal.m
index f81d87eba8e784222ef7fcfc9d786febacb053db..c8b65ac8ed04bb0e81f4631f27de2dff80d3d4ed 100644 (file)
--- 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 <SOGoUI/UIxComponent.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSValue.h>
+
+#import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGCards/iCalPerson.h>
+
+#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
+#import <SoObjects/Appointments/SOGoFreeBusyObject.h>
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxAppointmentProposal : UIxComponent
 {
@@ -54,12 +63,6 @@
 - (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp;
 @end
 
-#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
-#include <SoObjects/Appointments/SOGoFreeBusyObject.h>
-#include <NGExtensions/NGCalendarDateRange.h>
-#include <NGCards/NGCards.h>
-#include "common.h"
-
 @implementation UIxAppointmentProposal
 
 - (void)dealloc {

diff --git a/UI/Scheduler/UIxAptTableView.m b/UI/Scheduler/UIxAptTableView.m
index 420c4df08c91ec160157db4e33c9156f3ae4e98e..a634f9257a0adaa7f02cb44358f9454ffc6a54d7 100644 (file)
--- 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$
 
-#include <NGObjWeb/SoComponent.h>
+#import <NGObjWeb/SoComponent.h>
 
 @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 3160607baa6ae2693146f08e48b01c465c6f0bd2..9931a5c85ef5015b0673699f4516359006890756 100644 (file)
--- 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$
 
-#include <SOGoUI/UIxComponent.h>
+#import <Foundation/NSCalendarDate.h>
+
+#import <NGCards/NSCalendarDate+ICal.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxCalDateLabel : UIxComponent
 {
@@ -36,9 +40,6 @@
 
 @end
 
-#include "common.h"
-#include <NGCards/NGCards.h>
-
 @implementation UIxCalDateLabel
 
 - (void)dealloc {

diff --git a/UI/Scheduler/UIxCalMonthOverview.h b/UI/Scheduler/UIxCalMonthOverview.h
index 52c9b1ab5fa5da4f64c75e92b56488977ec2cd3f..f265d43d07fd14e582caf4348b14564e5765159c 100644 (file)
--- 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 f00893c72632bd67a41cfe04b8d5891b202d330c..5ab7be0dafa252795263bf94982c22f3b0648a22 100644 (file)
--- a/UI/Scheduler/UIxCalMonthOverview.m
+++ b/UI/Scheduler/UIxCalMonthOverview.m
@@ -1,8 +1,10 @@
-// $Id$
 
-#include "UIxCalMonthOverview.h"
-#include "common.h"
-#include <SOGoUI/SOGoAptFormatter.h>
+#import <Foundation/NSCalendarDate.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import <SOGoUI/SOGoAptFormatter.h>
+
+#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/UIxCalMonthView.h b/UI/Scheduler/UIxCalMonthView.h
deleted file mode 100644 (file)
index 830c17c..0000000
--- a/UI/Scheduler/UIxCalMonthView.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* UIxCalMonthView.h - this file is part of SOGo
- *
- * Copyright (C) 2006 Inverse groupe conseil
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *
- * 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 UIXCALMONTHVIEW_H
-#define UIXCALMONTHVIEW_H
-
-#import "UIxCalView.h"
-
-@class NSArray;
-@class NSCalendarDate;
-@class NSDictionary;
-@class NSMutableDictionary;
-
-@class SOGoAptFormatter;
-@class SOGoDateFormatter;
-
-@protocol WOActionResults;
-
-@interface UIxCalMonthView : UIxCalView
-{
-  SOGoAptFormatter *monthAptFormatter;
-  SOGoDateFormatter *dateFormatter;
-
-  NSMutableDictionary *sortedAppointments;
-  NSArray *daysToDisplay;
-  NSCalendarDate *currentTableDay;
-  NSArray *currentTableColumn;
-
-  NSArray *dayNames;
-  NSArray *monthNames;
-}
-
-- (NSDictionary *) monthBeforePrevMonthQueryParameters;
-- (NSDictionary *) prevMonthQueryParameters;
-- (NSDictionary *) nextMonthQueryParameters;
-- (NSDictionary *) monthAfterNextMonthQueryParameters;
-
-- (NSString *) monthNameOfTwoMonthAgo;
-- (NSString *) monthNameOfOneMonthAgo;
-- (NSString *) monthNameOfThisMonth;
-- (NSString *) monthNameOfNextMonth;
-- (NSString *) monthNameOfTheMonthAfterNextMonth;
-
-- (NSArray *) daysToDisplay;
-
-- (NSString *) labelForCurrentDayToDisplay;
-- (NSString *) dayCellClasses;
-
-- (void) setCurrentTableDay: (NSCalendarDate *) newCurrentTableDay;
-- (NSCalendarDate *) currentTableDay;
-- (NSString *) labelForCurrentDayCell;
-
-@end
-
-#endif /* UIXCALMONTHVIEW_H */

diff --git a/UI/Scheduler/UIxCalMonthViewOld.m b/UI/Scheduler/UIxCalMonthViewOld.m
index e681b63895b8820f032a45933e5aa1efc7e7a0b0..292e98cafaf822fce7ee6cc5efccbc611b7f6e69 100644 (file)
--- 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 <Foundation/NSCalendarDate.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
 
-#include <SOGo/NSCalendarDate+SOGo.h>
-#include "UIxCalMonthViewOld.h"
-#include "common.h"
+#import <SOGo/NSCalendarDate+SOGo.h>
+
+#import "UIxCalMonthViewOld.h"
 
 @implementation UIxCalMonthViewOld
 

diff --git a/UI/Scheduler/UIxCalParticipationStatusView.m b/UI/Scheduler/UIxCalParticipationStatusView.m
index 361edf6fe05c3a0f887f6ff0bf5eefaafe617696..fc1c1ec430a70121e0ab653aca96c5424580d604 100644 (file)
--- 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$
 
-#include <NGObjWeb/NGObjWeb.h>
+#import <NGCards/iCalPerson.h>
+#import <NGObjWeb/WOComponent.h>
 
 @interface UIxCalParticipationStatusView : WOComponent
 {
@@ -31,9 +31,6 @@
 
 @end
 
-#include <NGCards/NGCards.h> /* for iCalPersonPartStat */
-#include "common.h"
-
 @implementation UIxCalParticipationStatusView
 
 - (void)setPartStat:(id)_partStat {

diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index 7db34e8075f6d19e97b0145540e99be5aeb90e9e..fd5b0f2441a2d0ed3f86bd6f633dfa2acf6e00f5 100644 (file)
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -1,20 +1,23 @@
-// $Id$
 
-#import "common.h"
 //#import <OGoContentStore/OCSFolder.h>
 
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/SoUser.h>
 #import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSString+misc.h>
 #import <NGCards/NGCards.h>
 
+#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
+#import <SoObjects/SOGo/NSArray+Utilities.h>
+#import <SoObjects/SOGo/SOGoUser.h>
+#import <SoObjects/SOGo/SOGoObject.h>
+
 #import <SOGoUI/SOGoAptFormatter.h>
-#import "UIxComponent+Scheduler.h"
 
-#import "SoObjects/Appointments/SOGoAppointmentFolder.h"
-#import <SOGo/NSArray+Utilities.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoObject.h>
+#import "UIxComponent+Scheduler.h"
 
 #import "UIxCalView.h"
 

diff --git a/UI/Scheduler/UIxDatePicker.m b/UI/Scheduler/UIxDatePicker.m
index dbcc15a8f0fd01e3d4e86dd64ebdfd9a6b2acd80..82893b4c5d218e98ec55dd22daba44a708027416 100644 (file)
--- a/UI/Scheduler/UIxDatePicker.m
+++ b/UI/Scheduler/UIxDatePicker.m
@@ -19,7 +19,13 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/WOComponent.h>
+#import <Foundation/NSValue.h>
+#import <Foundation/NSCalendarDate.h>
+
+#import <NGObjWeb/WOComponent.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGExtensions/NSObject+Logs.h>
 
 @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 bdd092d02c696ef50576a6ad5ae86f3cea494523..c472684b8ee56029b17b3dfebfcc6bd876266a48 100644 (file)
--- 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 <SOGoUI/UIxComponent.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSValue.h>
+
+#import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGCards/iCalPerson.h>
+
+#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
+#import <SoObjects/Appointments/SOGoFreeBusyObject.h>
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxTaskProposal : UIxComponent
 {
@@ -54,12 +64,6 @@
 - (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp;
 @end
 
-#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
-#include <SoObjects/Appointments/SOGoFreeBusyObject.h>
-#include <NGExtensions/NGCalendarDateRange.h>
-#include <NGCards/NGCards.h>
-#include "common.h"
-
 @implementation UIxTaskProposal
 
 - (void)dealloc {

diff --git a/UI/Scheduler/common.h b/UI/Scheduler/common.h
deleted file mode 100644 (file)
index f8c223d..0000000
--- 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$
-
-#import <Foundation/Foundation.h>
-
-#if LIB_FOUNDATION_LIBRARY
-#  import <Foundation/exceptions/GeneralExceptions.h>
-#elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  import <NGExtensions/NGObjectMacros.h>
-#  import <NGExtensions/NSString+Ext.h>
-#endif
-
-#import <NGExtensions/NGExtensions.h>
-#import <NGObjWeb/NGObjWeb.h>
-#import <NGObjWeb/SoObjects.h>
-
-#warning importing common.h is baaad