Fixes for import/export

Monotone-Parent: 3e7ac334a4ea19aa4ec2dcbc525628005ca75fb7
Monotone-Revision: d124c012f70febcfcbb9a2b5d4f3a20a7a001d7a

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-09T13:31:45
Monotone-Branch: ca.inverse.sogo

UI/Contacts/GNUmakefile

@@ -20,7 +20,8 @@ ContactsUI_OBJC_FILES =			\
 	UIxListView.m		\
 	UIxListEditor.m		\
 	UIxContactsListView.m		\
-	UIxContactFoldersView.m
+	UIxContactFoldersView.m \
+	UIxContactFolderActions.m 
 
 ContactsUI_RESOURCE_FILES +=		\
 	Version				\

UI/Contacts/UIxContactFolderActions.h

@@ -0,0 +1,42 @@
+/*
+ Copyright (C) 2004-2005 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.
+*/
+
+#ifndef __UIxContactsListView_H__
+#define __UIxContactsListView_H__
+
+#import <SOGoUI/UIxComponent.h>
+
+@class NSDictionary;
+@class NSString;
+
+@protocol SOGoContactObject;
+
+@interface UIxContactFolderActions : UIxComponent
+{
+}
+
+- (int) importLdifData: (NSString *) ldifData;
+- (int) importVcardData: (NSString *) vcardData;
+- (BOOL) importVcard: (NGVCard *) card;
+
+@end
+
+#endif /* __UIxContactsListView_H__ */

UI/Contacts/UIxContactFolderActions.m

@@ -0,0 +1,231 @@
+/*
+  Copyright (C) 2004-2005 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.
+*/
+
+#import <Foundation/Foundation.h>
+#import <SoObjects/SOGo/NSArray+Utilities.h>
+#import <SoObjects/SOGo/NSDictionary+Utilities.h>
+#import <SoObjects/SOGo/NSString+Utilities.h>
+
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGExtensions/NSString+misc.h>
+#import <NGExtensions/NSNull+misc.h>
+
+#import <Contacts/SOGoContactObject.h>
+#import <Contacts/SOGoContactFolder.h>
+#import <Contacts/SOGoContactFolders.h>
+
+#import <NGCards/NGVCard.h>
+#import <NGCards/NGVList.h>
+#import <SoObjects/Contacts/SOGoContactGCSEntry.h>
+#import <SoObjects/Contacts/SOGoContactLDIFEntry.h>
+#import <SoObjects/Contacts/SOGoContactGCSList.h>
+#import <SoObjects/Contacts/SOGoContactGCSFolder.h>
+#import <GDLContentStore/GCSFolder.h>
+
+#import "UIxContactFolderActions.h"
+
+@implementation UIxContactFolderActions
+
+
+/* actions */
+
+- (id <WOActionResults>) exportAction
+{
+  WORequest *request;
+  id <WOActionResults> response;
+  NSArray *contactsId;
+  NSEnumerator *uids;
+  NSString *uid;
+  id currentChild;
+  SOGoContactGCSFolder *sourceFolder;
+  NSMutableString *content;
+
+  content = [NSMutableString string];
+  request = [context request];
+  contactsId = [request formValuesForKey: @"uid"];
+  if (contactsId)
+    {
+      sourceFolder = [self clientObject];
+      uids = [contactsId objectEnumerator];
+      while ((uid = [uids nextObject]))
+        {
+          currentChild = [sourceFolder lookupName: uid
+                                        inContext: [self context]
+                                          acquire: NO];
+          if ([currentChild respondsToSelector: @selector (vCard)])
+            [content appendFormat: [[currentChild vCard] ldifString]];
+          else if ([currentChild respondsToSelector: @selector (vList)])
+            [content appendFormat: [[currentChild vList] ldifString]];
+        }
+    }
+  response = [context response];
+  [response setHeader: @"text/directory; charset=utf-8" 
+               forKey: @"content-type"];
+  [response setHeader: @"attachment;filename=SavedContacts.ldif" 
+               forKey: @"Content-Disposition"];
+  [response setContent: [content dataUsingEncoding: NSUTF8StringEncoding]];
+  
+  return response;
+}
+
+- (id <WOActionResults>) importAction
+{
+  WORequest *request;
+  WOResponse *response;
+  id data;
+  NSMutableDictionary *rc;
+  NSString *fileContent;
+  int imported = 0;
+
+
+  request = [context request];
+  rc = [NSMutableDictionary dictionary];
+  data = [request formValueForKey: @"contactsFile"];
+  if ([data respondsToSelector: @selector(isEqualToString:)])
+    fileContent = (NSString *) data;
+  else
+    {
+      fileContent = [[NSString alloc] initWithData: (NSData *) data 
+                                          encoding: NSUTF8StringEncoding];
+      [fileContent autorelease];
+    }
+
+  if (fileContent && [fileContent length])
+    {
+      if ([fileContent hasPrefix: @"dn:"])
+        imported = [self importLdifData: fileContent];
+      else if ([fileContent hasPrefix: @"BEGIN:"])
+        imported = [self importVcardData: fileContent];
+      else
+        imported = 0;
+    }
+
+  [rc setObject: [NSNumber numberWithInt: imported]
+         forKey: @"imported"];
+
+  response = [self responseWithStatus: 200];
+  [response setHeader: @"text/html" 
+               forKey: @"content-type"];
+  [(WOResponse*)response appendContentString: [rc jsonRepresentation]];
+
+  return response;
+}
+
+- (int) importLdifData: (NSString *) ldifData
+{
+  SOGoContactGCSFolder *folder;
+  NSString *key, *value;
+  NSArray *ldifContacts, *lines, *components;
+  NSMutableDictionary *entry;
+  NGVCard *vCard;
+  NSString *uid;
+  int i,j,count,linesCount;
+  int rc = 0;
+
+  folder = [self clientObject];
+  ldifContacts = [ldifData componentsSeparatedByString: @"\ndn"];
+  count = [ldifContacts count];
+
+  for (i = 0; i < count; i++)
+    {
+      SOGoContactLDIFEntry *ldifEntry;
+      entry = [NSMutableDictionary dictionary];
+      lines = [[ldifContacts objectAtIndex: i] 
+               componentsSeparatedByString: @"\n"];
+
+      linesCount = [lines count];
+      for (j = 0; j < linesCount; j++)
+        {
+          components = [[lines objectAtIndex: j] 
+                 componentsSeparatedByString: @": "];
+          if ([components count] == 2)
+            {
+              key = [components objectAtIndex: 0];
+              value = [components objectAtIndex: 1];
+
+              if ([key length] == 0)
+                key = @"dn";
+
+              [entry setObject: value forKey: key];
+            }
+          else
+            {
+              break;
+            }
+        }
+      uid = [folder globallyUniqueObjectId];
+      ldifEntry = [SOGoContactLDIFEntry contactEntryWithName: uid
+                                               withLDIFEntry: entry
+                                                 inContainer: folder];
+      if (ldifEntry)
+        {
+          vCard = [ldifEntry vCard];
+          if ([self importVcard: vCard])
+            rc++;
+          
+        }
+    }
+  return rc;
+}
+
+- (int) importVcardData: (NSString *) vcardData
+{
+  NGVCard *card;
+  int rc;
+
+  rc = 0;
+  card = [NGVCard parseSingleFromSource: vcardData];
+  if ([self importVcard: card])
+    rc = 1;
+
+  return rc;
+}
+
+- (BOOL) importVcard: (NGVCard *) card
+{
+  NSString *uid, *name;
+  SOGoContactGCSFolder *folder;
+  NSException *ex;
+  BOOL rc = NO;
+
+  if (card)
+    {
+      folder = [self clientObject];
+      uid = [folder globallyUniqueObjectId];
+      name = [NSString stringWithFormat: @"%@.vcf", uid];
+      [card setUid: uid];
+      ex = [[folder ocsFolder] writeContent: [card versitString]
+                                     toName: name
+                                baseVersion: 0];
+      if (ex)
+        NSLog (@"write failed: %@", ex);
+      else
+        rc = YES;
+    }
+
+  return rc;
+}
+
+
+@end /* UIxContactsListView */

UI/Contacts/UIxContactsListView.h

@@ -35,10 +35,6 @@
   NSArray *contactInfos;
 }
 
-- (int) importLdifData: (NSString *) ldifData;
-- (int) importVcardData: (NSString *) vcardData;
-- (BOOL) importVcard: (NGVCard *) card;
-
 @end
 
 #endif /* __UIxContactsListView_H__ */

UI/Contacts/UIxContactsListView.m

@@ -187,183 +187,4 @@
   return YES;
 }
 
-
-- (id <WOActionResults>) exportAction
-{
-  WORequest *request;
-  id <WOActionResults> response;
-  NSArray *contactsId;
-  NSEnumerator *uids;
-  NSString *uid;
-  id currentChild;
-  SOGoContactGCSFolder *sourceFolder;
-  NSMutableString *content;
-
-  content = [NSMutableString string];
-  request = [context request];
-  if ( (contactsId = [request formValuesForKey: @"uid"]) )
-    {
-      sourceFolder = [self clientObject];
-      uids = [contactsId objectEnumerator];
-      while ((uid = [uids nextObject]))
-        {
-          currentChild = [sourceFolder lookupName: uid
-                                        inContext: [self context]
-                                          acquire: NO];
-          if ([currentChild respondsToSelector: @selector (vCard)])
-            [content appendFormat: [[currentChild vCard] ldifString]];
-          else if ([currentChild respondsToSelector: @selector (vList)])
-            [content appendFormat: [[currentChild vList] ldifString]];
-        }
-    }
-  response = [[WOResponse alloc] init];
-  [response autorelease];
-  [response setHeader: @"text/directory" 
-               forKey:@"content-type"];
-  [response setHeader: @"attachment;filename=SavedContacts.ldif" 
-               forKey: @"Content-Disposition"];
-  [response setContent: [content dataUsingEncoding: NSUTF8StringEncoding]];
-  
-  return response;
-}
-
-- (id <WOActionResults>) importAction
-{
-  WORequest *request;
-  WOResponse *response;
-  id data;
-  NSMutableDictionary *rc;
-  NSString *fileContent;
-  int imported = 0;
-
-
-  request = [context request];
-  rc = [NSMutableDictionary dictionary];
-  data = [request formValueForKey: @"contactsFile"];
-  if ([data respondsToSelector: @selector(isEqualToString:)])
-    fileContent = (NSString *) data;
-  else
-    {
-      fileContent = [[NSString alloc] initWithData: (NSData *) data 
-                                          encoding: NSUTF8StringEncoding];
-      [fileContent autorelease];
-    }
-
-  if (fileContent && [fileContent length])
-    {
-      if ([fileContent hasPrefix: @"dn:"])
-        imported = [self importLdifData: fileContent];
-      else if ([fileContent hasPrefix: @"BEGIN:"])
-        imported = [self importVcardData: fileContent];
-      else
-        imported = 0;
-    }
-
-  [rc setObject: [NSNumber numberWithInt: imported]
-         forKey: @"imported"];
-
-  response = [self responseWithStatus: 200];
-  [response setHeader: @"text/html" 
-               forKey: @"content-type"];
-  [(WOResponse*)response appendContentString: [rc jsonRepresentation]];
-
-  return response;
-}
-
-- (int) importLdifData: (NSString *) ldifData
-{
-  SOGoContactGCSFolder *folder;
-  NSString *key, *value;
-  NSArray *ldifContacts, *lines, *components;
-  NSMutableDictionary *entry;
-  NGVCard *vCard;
-  NSString *uid;
-  int i,j,count,linesCount;
-  int rc = 0;
-
-  folder = [self clientObject];
-  ldifContacts = [ldifData componentsSeparatedByString: @"\ndn"];
-  count = [ldifContacts count];
-
-  for (i = 0; i < count; i++)
-    {
-      SOGoContactLDIFEntry *ldifEntry;
-      entry = [NSMutableDictionary dictionary];
-      lines = [[ldifContacts objectAtIndex: i] 
-               componentsSeparatedByString: @"\n"];
-
-      linesCount = [lines count];
-      for (j = 0; j < linesCount; j++)
-        {
-          components = [[lines objectAtIndex: j] 
-                 componentsSeparatedByString: @": "];
-          if ([components count] == 2)
-            {
-              key = [components objectAtIndex: 0];
-              value = [components objectAtIndex: 1];
-
-              if ([key length] == 0)
-                key = @"dn";
-
-              [entry setObject: value forKey: key];
-            }
-          else
-            {
-              break;
-            }
-        }
-      uid = [folder globallyUniqueObjectId];
-      ldifEntry = [SOGoContactLDIFEntry contactEntryWithName: uid
-                                               withLDIFEntry: entry
-                                                 inContainer: folder];
-      if (ldifEntry)
-        {
-          vCard = [ldifEntry vCard];
-          if ([self importVcard: vCard])
-            rc++;
-          
-        }
-    }
-  return rc;
-}
-
-- (int) importVcardData: (NSString *) vcardData
-{
-  NGVCard *card;
-  int rc;
-
-  rc = 0;
-  card = [NGVCard parseSingleFromSource: vcardData];
-  if ([self importVcard: card])
-    rc = 1;
-
-  return rc;
-}
-
-- (BOOL) importVcard: (NGVCard *) card
-{
-  NSString *uid, *name;
-  SOGoContactGCSFolder *folder;
-  NSException *ex;
-  BOOL rc = NO;
-
-  if (card)
-    {
-      folder = [self clientObject];
-      uid = [folder globallyUniqueObjectId];
-      name = [NSString stringWithFormat: @"%@.vcf", uid];
-      [card setUid: uid];
-      ex = [[folder ocsFolder] writeContent: [card versitString]
-                                     toName: name
-                                baseVersion: 0];
-      if (ex)
-        NSLog (@"write failed: %@", ex);
-      else
-        rc = YES;
-    }
-
-  return rc;
-}
-
-
 @end /* UIxContactsListView */

UI/Contacts/product.plist

@@ -100,12 +100,12 @@
            };
            export = {
               protectedBy = "View";
-              pageName    = "UIxContactsListView";
+              actionClass = "UIxContactFolderActions";
               actionName  = "export";
            };
            import = {
               protectedBy = "View";
-              pageName    = "UIxContactsListView";
+              actionClass = "UIxContactFolderActions";
               actionName  = "import";
            };
 	   userRights = {

UI/Scheduler/GNUmakefile

@@ -21,6 +21,7 @@ SchedulerUI_OBJC_FILES =		\
 	UIxCalDayTable.m		\
 	UIxCalDateSelector.m		\
 	UIxCalUserRightsEditor.m	\
+	UIxCalFolderActions.m \
 					\
 	UIxCalView.m			\
 	UIxCalDayView.m			\

UI/Scheduler/UIxCalFolderActions.h

@@ -0,0 +1,36 @@
+/*
+ Copyright (C) 2004-2005 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.
+*/
+
+#ifndef __UIxContactsListView_H__
+#define __UIxContactsListView_H__
+
+#import <SOGoUI/UIxComponent.h>
+
+@class NSDictionary;
+@class NSString;
+
+@interface UIxCalFolderActions : UIxComponent
+{
+}
+
+@end
+
+#endif /* __UIxContactsListView_H__ */

UI/Scheduler/UIxCalFolderActions.m

@@ -0,0 +1,163 @@
+/*
+  Copyright (C) 2004-2005 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.
+*/
+
+#import <Foundation/Foundation.h>
+#import <SoObjects/SOGo/NSArray+Utilities.h>
+#import <SoObjects/SOGo/NSDictionary+Utilities.h>
+#import <SoObjects/SOGo/NSString+Utilities.h>
+
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGExtensions/NSString+misc.h>
+#import <NGExtensions/NSNull+misc.h>
+
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentObject.h>
+#import <GDLContentStore/GCSFolder.h>
+#import <NGCards/iCalCalendar.h>
+
+#import "UIxCalFolderActions.h"
+
+@implementation UIxCalFolderActions
+
+- (WOResponse *) exportAction
+{
+  WOResponse *response;
+  SOGoAppointmentFolder *folder;
+  SOGoAppointmentObject *appt;
+  NSArray *array, *values, *fields;
+  NSMutableString *rc;
+  iCalCalendar *calendar, *component;
+  int i, count;
+
+  fields = [NSArray arrayWithObjects: @"c_name", @"c_content", nil];
+  rc = [NSMutableString string];
+
+  response = [context response];
+
+  folder = [self clientObject];
+  calendar = [iCalCalendar groupWithTag: @"vcalendar"];
+
+  array = [[folder ocsFolder] fetchFields: fields matchingQualifier: nil];
+  count = [array count];
+  for (i = 0; i < count; i++)
+    {
+      appt = [folder lookupName: [[array objectAtIndex: i] objectForKey: @"c_name"]
+                      inContext: [self context]
+                        acquire: NO];
+
+      component = [appt calendar: NO secure: NO];
+      values = [component events];
+      if (values && [values count])
+        [calendar addChildren: values];
+      values = [component todos];
+      if (values && [values count])
+        [calendar addChildren: values];
+      values = [component journals];
+      if (values && [values count])
+        [calendar addChildren: values];
+      values = [component freeBusys];
+      if (values && [values count])
+        [calendar addChildren: values];
+      values = [component childrenWithTag: @"vtimezone"];
+      if (values && [values count])
+        [calendar addChildren: values];
+    }
+  NSLog ([calendar versitString]);
+  
+  [response setHeader: @"text/calendar; charset=utf-8" 
+               forKey:@"content-type"];
+  [response setHeader: @"attachment;filename=Calendar.ics" 
+               forKey: @"Content-Disposition"];
+  [response setContent: [[calendar versitString] dataUsingEncoding: NSUTF8StringEncoding]];
+  
+  return response;
+}
+
+- (WOResponse *) importAction
+{
+  SOGoAppointmentFolder *folder;
+  NSMutableDictionary *rc;
+  NSArray *components;
+  WORequest *request;
+  WOResponse *response;
+  NSString *fileContent;
+  id data;
+  iCalCalendar *additions;
+  int i, count, imported;
+
+  imported = 0;
+  rc = [NSMutableDictionary dictionary];
+  request = [context request];
+  folder = [self clientObject];
+  data = [request formValueForKey: @"calendarFile"];
+  if ([data respondsToSelector: @selector(isEqualToString:)])
+    fileContent = (NSString *) data;
+  else
+    {
+      fileContent = [[NSString alloc] initWithData: (NSData *) data 
+                                          encoding: NSUTF8StringEncoding];
+      [fileContent autorelease];
+    }
+
+  if (fileContent && [fileContent length] 
+      && [fileContent hasPrefix: @"BEGIN:"])
+    {
+      additions = [iCalCalendar parseSingleFromSource: fileContent];
+      if (additions)
+        {
+          components = [additions events];
+          count = [components count];
+          for (i = 0; i < count; i++)
+            if ([folder importComponent: [components objectAtIndex: i]])
+              imported++;
+          components = [additions todos];
+          count = [components count];
+          for (i = 0; i < count; i++)
+            if ([folder importComponent: [components objectAtIndex: i]])
+              imported++;
+          components = [additions journals];
+          count = [components count];
+          for (i = 0; i < count; i++)
+            if ([folder importComponent: [components objectAtIndex: i]])
+              imported++;
+          components = [additions freeBusys];
+          count = [components count];
+          for (i = 0; i < count; i++)
+            if ([folder importComponent: [components objectAtIndex: i]])
+              imported++;
+        }
+    }
+
+  [rc setObject: [NSNumber numberWithInt: imported]
+         forKey: @"imported"];
+
+  response = [self responseWithStatus: 200];
+  [response setHeader: @"text/html" 
+               forKey: @"content-type"];
+  [(WOResponse*)response appendContentString: [rc jsonRepresentation]];
+  return response;
+}
+
+
+@end /* UIxCalFolderActions */

UI/Scheduler/UIxCalView.m

@@ -643,125 +643,4 @@ static BOOL shouldDisplayWeekend = NO;
   return r;
 }
 
-
-- (WOResponse *) exportAction
-{
-  WOResponse *response;
-  SOGoAppointmentFolder *folder;
-  SOGoAppointmentObject *appt;
-  NSArray *array, *values, *fields;
-  NSMutableString *rc;
-  iCalCalendar *calendar, *component;
-  int i, count;
-
-  fields = [NSArray arrayWithObjects: @"c_name", @"c_content", nil];
-  rc = [NSMutableString string];
-
-  response = [[WOResponse alloc] init];
-  [response autorelease];
-
-  folder = [self clientObject];
-  calendar = [iCalCalendar groupWithTag: @"vcalendar"];
-
-  array = [[folder ocsFolder] fetchFields: fields matchingQualifier: nil];
-  count = [array count];
-  for (i = 0; i < count; i++)
-    {
-      appt = [folder lookupName: [[array objectAtIndex: i] objectForKey: @"c_name"]
-                      inContext: [self context]
-                        acquire: NO];
-
-      component = [appt calendar: NO secure: NO];
-      values = [component events];
-      if (values && [values count])
-        [calendar addChildren: values];
-      values = [component todos];
-      if (values && [values count])
-        [calendar addChildren: values];
-      values = [component journals];
-      if (values && [values count])
-        [calendar addChildren: values];
-      values = [component freeBusys];
-      if (values && [values count])
-        [calendar addChildren: values];
-      values = [component childrenWithTag: @"vtimezone"];
-      if (values && [values count])
-        [calendar addChildren: values];
-    }
-  NSLog ([calendar versitString]);
-  
-  [response setHeader: @"text/calendar" 
-               forKey:@"content-type"];
-  [response setHeader: @"attachment;filename=Calendar.ics" 
-               forKey: @"Content-Disposition"];
-  [response setContent: [[calendar versitString] dataUsingEncoding: NSUTF8StringEncoding]];
-  
-  return response;
-}
-
-- (WOResponse *) importAction
-{
-  SOGoAppointmentFolder *folder;
-  NSMutableDictionary *rc;
-  NSArray *components;
-  WORequest *request;
-  WOResponse *response;
-  NSString *fileContent;
-  id data;
-  iCalCalendar *additions;
-  int i, count, imported;
-
-  imported = 0;
-  rc = [NSMutableDictionary dictionary];
-  request = [context request];
-  folder = [self clientObject];
-  data = [request formValueForKey: @"calendarFile"];
-  if ([data respondsToSelector: @selector(isEqualToString:)])
-    fileContent = (NSString *) data;
-  else
-    {
-      fileContent = [[NSString alloc] initWithData: (NSData *) data 
-                                          encoding: NSUTF8StringEncoding];
-      [fileContent autorelease];
-    }
-
-  if (fileContent && [fileContent length] 
-      && [fileContent hasPrefix: @"BEGIN:"])
-    {
-      additions = [iCalCalendar parseSingleFromSource: fileContent];
-      if (additions)
-        {
-          components = [additions events];
-          count = [components count];
-          for (i = 0; i < count; i++)
-            if ([folder importComponent: [components objectAtIndex: i]])
-              imported++;
-          components = [additions todos];
-          count = [components count];
-          for (i = 0; i < count; i++)
-            if ([folder importComponent: [components objectAtIndex: i]])
-              imported++;
-          components = [additions journals];
-          count = [components count];
-          for (i = 0; i < count; i++)
-            if ([folder importComponent: [components objectAtIndex: i]])
-              imported++;
-          components = [additions freeBusys];
-          count = [components count];
-          for (i = 0; i < count; i++)
-            if ([folder importComponent: [components objectAtIndex: i]])
-              imported++;
-        }
-    }
-
-  [rc setObject: [NSNumber numberWithInt: imported]
-         forKey: @"imported"];
-
-  response = [self responseWithStatus: 200];
-  [response setHeader: @"text/html" 
-               forKey: @"content-type"];
-  [(WOResponse*)response appendContentString: [rc jsonRepresentation]];
-  return response;
-}
-
 @end /* UIxCalView */

UI/Scheduler/product.plist

@@ -79,11 +79,6 @@
 	  actionClass = "UIxCalListingActions";
 	  actionName = "findPossibleSlot";
 	};
-	export = {
-	  protectedBy = "View";
-	  actionClass = "UIxCalListingActions";
-	  actionName = "export";
-	};
 	dayview = {
 	  protectedBy = "View";
 	  pageName    = "UIxCalDayView"; 
@@ -151,12 +146,12 @@
 	};
   export = {
     protectedBy = "View";
-    pageName    = "UIxCalView";
+    actionClass = "UIxCalFolderActions";
     actionName  = "export";
   };
   import = {
     protectedBy = "View";
-    pageName    = "UIxCalView";
+    actionClass = "UIxCalFolderActions";
     actionName  = "import";
   };
 	userRights = {

UI/WebServerResources/SchedulerUI.js

@@ -1932,7 +1932,7 @@ function uploadCompleted (response) {
       $("uploadResultsContent").update (labels["An error occured while importing calendar."]);
     else {
         $("uploadResultsContent").update (labels["Imported events:"] + " " + data.imported);
-        refreshCurrentFolder ();
+        refreshEventsAndDisplay ();
     }
 
     hideCalendarImport ();