Fixed issues, ajaxified import process

Monotone-Parent: 80ad9ff70fe3d4130d99bbd2590349b71c85b9f3
Monotone-Revision: 33b6c38a250d6ae49e26dd7de548708c132d5c34

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-03T17:53:38
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Publicar Calendário...";
 "Reload Remote Calendars" = "Recarregar Calendários Remotos";
 "Properties" = "Propriedades";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "Compor E-Mail para Todos os Participantes";
 "Compose E-Mail to Undecided Attendees" = "Compor E-Mail para os Participantes não confirmados";

UI/Scheduler/Czech.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Publikovat kalendář...";
 "Reload Remote Calendars" = "Nahrát vzdálené kalendáře";
 "Properties" = "Vlastnosti";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "Vytvořit e-mail pro všechny účastníky";
 "Compose E-Mail to Undecided Attendees" = "Vytvořit e-mail pro nerozhodnuté účastníky";

UI/Scheduler/Dutch.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Agenda publiceren...";
 "Reload Remote Calendars" = "Externe agenda vernieuwen";
 "Properties" = "Instellingen";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "E-mail aan alle deelnemers opstellen";
 "Compose E-Mail to Undecided Attendees" = "E-mail aan deelnemers opstellen die nog niet hebben gereageerd";

UI/Scheduler/English.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Publish Calendar...";
 "Reload Remote Calendars" = "Reload Remote Calendars";
 "Properties" = "Properties";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "Compose E-Mail to All Attendees";
 "Compose E-Mail to Undecided Attendees" = "Compose E-Mail to Undecided Attendees";

UI/Scheduler/French.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Publier l'agenda...";
 "Reload Remote Calendars" = "Recharger les agendas distants";
 "Properties" = "Propriétés";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "Une erreur s'est produite lors de l'importation.";
+"Imported events:" = "Événements importés:";
 
 "Compose E-Mail to All Attendees" = "Rédiger un courriel pour tous les participants";
 "Compose E-Mail to Undecided Attendees" = "Rédiger un courriel pour les participants indécis";

UI/Scheduler/German.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Kalender publizieren...";
 "Reload Remote Calendars" = "Externe Kalender neu laden";
 "Properties" = "Einstellungen";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "E-Mail an alle Teilnehmer erstellen";
 "Compose E-Mail to Undecided Attendees" = "E-Mail an unentschlossene Teilnehmer erstellen";

UI/Scheduler/Hungarian.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Naptár közzététele...";
 "Reload Remote Calendars" = "Távoli naptárak frissítése";
 "Properties" = "Tulajdonságok";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "Üzenet küldése az összes résztvevőnek";
 "Compose E-Mail to Undecided Attendees" = "Üzenet küldése az bizonytalan résztvevőnek";

UI/Scheduler/Italian.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Pubblica calendario...";
 "Reload Remote Calendars" = "Aggiorna calendari remoti";
 "Properties" = "Proprietà";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "Invia Email a tutti gli invitati";
 "Compose E-Mail to Undecided Attendees" = "Invia Email agli invitati indecisi";

UI/Scheduler/Russian.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Опубликовать календарь...";
 "Reload Remote Calendars" = "Обновить удаленные календари";
 "Properties" = "Свойства";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "Составить сообщение ко всем приглашенным";
 "Compose E-Mail to Undecided Attendees" = "Составить сообщение ко всем не решившим приглашенным";

UI/Scheduler/Spanish.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Publicar calendario...";
 "Reload Remote Calendars" = "Recargar calendarios remotos";
 "Properties" = "Propiedades";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "Crear correo para todos los asistentes";
 "Compose E-Mail to Undecided Attendees" = "Crear correo para todos los asistentes indecisos (sin confirmación)";

UI/Scheduler/UIxCalView.m

@@ -20,6 +20,11 @@
  * 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/SoSecurityManager.h>
 #import <NGObjWeb/SoUser.h>
 #import <NGObjWeb/WOResponse.h>
@@ -697,20 +702,25 @@ static BOOL shouldDisplayWeekend = NO;
 - (WOResponse *) importAction
 {
   SOGoAppointmentFolder *folder;
+  NSMutableDictionary *rc;
   NSArray *components;
   WORequest *request;
+  WOResponse *response;
   NSString *fileContent;
   NSData *data;
   iCalCalendar *additions;
-  int i, count;
+  int i, count, imported;
 
+  imported = 0;
+  rc = [NSMutableDictionary dictionary];
   request = [context request];
   folder = [self clientObject];
   data = (NSData *)[request formValueForKey: @"calendarFile"];
   fileContent = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
   [fileContent autorelease];
 
-  if (fileContent && [fileContent length])
+  if (fileContent && [fileContent length] 
+      && [fileContent hasPrefix: @"BEGIN:"])
     {
       additions = [iCalCalendar parseSingleFromSource: fileContent];
       if (additions)
@@ -718,22 +728,39 @@ static BOOL shouldDisplayWeekend = NO;
           components = [additions events];
           count = [components count];
           for (i = 0; i < count; i++)
-            [folder importComponent: [components objectAtIndex: i]];
+            if ([folder importComponent: [components objectAtIndex: i]])
+              imported++;
           components = [additions todos];
           count = [components count];
           for (i = 0; i < count; i++)
-            [folder importComponent: [components objectAtIndex: i]];
+            if ([folder importComponent: [components objectAtIndex: i]])
+              imported++;
           components = [additions journals];
           count = [components count];
           for (i = 0; i < count; i++)
-            [folder importComponent: [components objectAtIndex: i]];
+            if ([folder importComponent: [components objectAtIndex: i]])
+              imported++;
           components = [additions freeBusys];
           count = [components count];
           for (i = 0; i < count; i++)
-            [folder importComponent: [components objectAtIndex: i]];
+            if ([folder importComponent: [components objectAtIndex: i]])
+              imported++;
         }
     }
-  return [self redirectToLocation: @"../view"];
+
+  [rc setObject: [NSNumber numberWithInt: imported]
+         forKey: @"imported"];
+  if (imported <= 0)
+    [rc setObject: [self labelForKey: @"An error occured while importing calendar."]
+           forKey: @"message"];
+  else
+    [rc setObject: [NSString stringWithFormat: @"%@ %d", 
+     [self labelForKey: @"Imported events:"], imported]
+                forKey: @"message"];
+
+  response = [self responseWithStatus: 200];
+  [(WOResponse*)response appendContentString: [rc jsonRepresentation]];
+  return response;
 }
 
 @end /* UIxCalView */

UI/Scheduler/Welsh.lproj/Localizable.strings

@@ -111,6 +111,10 @@
 "Publish Calendar..." = "Cyhoeddi Calendr...";
 "Reload Remote Calendars" = "Ail-lwytho Calendrau Anghysbell";
 "Properties" = "Dewisiadau";
+"Import" = "Import";
+"OK" = "OK";
+"An error occured while importing calendar." = "An error occured while importing calendar.";
+"Imported events:" = "Imported events:";
 
 "Compose E-Mail to All Attendees" = "Cyfansoddi Ebost i bawb sy'n mynychu";
 "Compose E-Mail to Undecided Attendees" = "Cyfansoddi Ebost i bawb sydd heb benderfynu";