See ChangeLog

Monotone-Parent: 960e78b7d7470774c06a955e2a985fc80998d735
Monotone-Revision: 0ec0d799e947a37fe72a1bf6e3d5b25ac260164f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-01-06T15:40:27
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,12 @@
+2008-01-06  Ludovic Marcotte  <lmarcotte@inverse.ca>
+	
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	([SOGoCalendarComponent -_filterComponent:]):
+	We now set the proper component summary just like
+	we do in the Web UI when 'securing' the
+	returned component. Also adjusted the Localizable.strings
+	files accordingly.
+
 2008-12-30  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Dropped the following files:

SoObjects/Appointments/Dutch.lproj/Localizable.strings

@@ -1 +1,8 @@
 "Personal Calendar" = "Persoonlijke agenda";
+vevent_class0 = "(Publieke afspraak)";
+vevent_class1 = "(Privé-afspraak)";
+vevent_class2 = "(Vertrouwelijke afspraak)";
+
+vtodo_class0 = "(Publieke taak)";
+vtodo_class1 = "(Privétaak)";
+vtodo_class2 = "(Vertrouwelijke taak)";

SoObjects/Appointments/English.lproj/Localizable.strings

@@ -1 +1,8 @@
 "Personal Calendar" = "Personal Calendar";
+vevent_class0 = "(Public event)";
+vevent_class1 = "(Private event)";
+vevent_class2 = "(Confidential event)";
+
+vtodo_class0 = "(Public task)";
+vtodo_class1 = "(Private task)";
+vtodo_class2 = "(Confidential task)";

SoObjects/Appointments/French.lproj/Localizable.strings

@@ -1 +1,8 @@
 "Personal Calendar" = "Agenda personnel";
+vevent_class0 = "(Événement public)";
+vevent_class1 = "(Événement privé)";
+vevent_class2 = "(Événement confidentiel)";
+
+vtodo_class0 = "(Tâche publique)";
+vtodo_class1 = "(Tâche privée)";
+vtodo_class2 = "(Tâche confidentielle)";

SoObjects/Appointments/German.lproj/Localizable.strings

@@ -1 +1,8 @@
 "Personal Calendar" = "Persönlicher Kalender";
+vevent_class0 = "(Öffentlicher Termin)";
+vevent_class1 = "(Privater Termin)";
+vevent_class2 = "(Vertraulicher Termin)";
+
+vtodo_class0 = "(Öffentliche Aufgabe)";
+vtodo_class1 = "(Private Aufgabe)";
+vtodo_class2 = "(Vertrauliche Aufgabe)";

SoObjects/Appointments/Italian.lproj/Localizable.strings

@@ -1 +1,8 @@
 "Personal Calendar" = "Calendario personale";
+vevent_class0 = "(Evento pubblico)";
+vevent_class1 = "(Evento privato)";
+vevent_class2 = "(Evento confidenziale)";
+
+vtodo_class0 = "(Attività pubblica)";
+vtodo_class1 = "(Attività privata)";
+vtodo_class2 = "(Attività confidenziale)";

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -119,7 +119,21 @@ static BOOL sendEMailNotifications = NO;
 
 - (void) _filterComponent: (iCalEntityObject *) component
 {
-  [component setSummary: @""];
+  NSString *type;
+  int classification;
+
+  type = @"vtodo";
+  classification = 0;
+
+  if ([component isKindOfClass: [iCalEvent class]])
+    type = @"vevent";
+  
+  if ([component symbolicAccessClass] == iCalAccessPrivate)
+    classification = 1;
+  else if ([component symbolicAccessClass] == iCalAccessPrivate)
+    classification = 2;
+  
+  [component setSummary: [self labelForKey: [NSString stringWithFormat: @"%@_class%d", type, classification]]];
   [component setComment: @""];
   [component setUserComment: @""];
   [component setLocation: @""];
@@ -168,6 +182,11 @@ static BOOL sendEMailNotifications = NO;
       tmpComponent = (iCalRepeatableEntityObject *)
 	[tmpCalendar firstChildWithTag: [self componentTag]];
       [self _filterComponent: tmpComponent];
+      
+      // We add an additional header here to inform clients (if necessary) that
+      // we churned the content of the calendar.
+      [tmpComponent addChild: [CardElement simpleElementWithTag: @"X-SOGo-Secure"
+					   value: @"YES"]];
       iCalString = [tmpCalendar versitString];
       [tmpCalendar release];
     }

SoObjects/Appointments/Spanish.lproj/Localizable.strings

@@ -1 +1,8 @@
 "Personal Calendar" = "Calendario personal";
+vevent_class0 = "(Evento público)";
+vevent_class1 = "(Evento privado)";
+vevent_class2 = "(Evento confidencial)";
+
+vtodo_class0 = "(Tarea pública)";
+vtodo_class1 = "(Tarea privada)";
+vtodo_class2 = "(Tarea confidencial)";

UI/SOGoUI/SOGoAptFormatter.m

@@ -1,4 +1,5 @@
 /*
+  Copyright (C) 2008-2009 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of OpenGroupware.org.

UI/Scheduler/UIxCalView.m

@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-//#import <OGoContentStore/OCSFolder.h>
-
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/SoUser.h>
 #import <NGObjWeb/WOResponse.h>