Merge to 2.2.5

ActiveSync/SOGoMailObject+ActiveSync.m

@@ -285,20 +285,31 @@ - (void) _sanitizedMIMEPart: (id) thePart
           [self _sanitizedMIMEPart: body
                          performed: b];
         }
-      else if ([body isKindOfClass: [NSData class]] &&
+      else if (([body isKindOfClass: [NSData class]] || [body isKindOfClass: [NSString class]]) &&
                [[[thePart contentType] type] isEqualToString: @"text"] &&
                ([[[thePart contentType] subType] isEqualToString: @"plain"] || [[[thePart contentType] subType] isEqualToString: @"html"]))
         {
           // We make sure everything is encoded in UTF-8
-          NSString *charset, *s;
           NGMimeType *mimeType;
-          int encoding;
+          NSString *s;
 
-          charset = [[thePart contentType] valueOfParameter: @"charset"];
-          encoding = [NGMimeType stringEncodingForCharset: charset];
+          if ([body isKindOfClass: [NSData class]])
+            {
+              NSString *charset;
+              int encoding;
 
-          s = [[NSString alloc] initWithData: body  encoding: encoding];
-          AUTORELEASE(s);
+              charset = [[thePart contentType] valueOfParameter: @"charset"];
+              encoding = [NGMimeType stringEncodingForCharset: charset];
+
+              s = [[NSString alloc] initWithData: body  encoding: encoding];
+              AUTORELEASE(s);
+            }
+          else
+            {
+              // Handle situations when SOPE stupidly returns us a NSString
+              // This can happen for Content-Type: text/plain, Content-Transfer-Encoding: 8bit
+              s = body;
+            }
 
           if (s)
             {

ActiveSync/iCalRecurrenceRule+ActiveSync.m

@@ -34,6 +34,7 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 
+#import <NGCards/iCalEvent.h>
 #import <NGCards/iCalByDayMask.h>
 
 #import "NSCalendarDate+ActiveSync.h"
@@ -77,10 +78,19 @@ - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
       occurrences = [[self byDayMask] weekDayOccurrences];
       v = 0;
 
-      for (i = 0; i < 7; i++)
+      if (occurrences)
         {
-          if (occurrences[0][i])
-            v += (1 << i);
+          for (i = 0; i < 7; i++)
+            {
+              if (occurrences[0][i])
+                v += (1 << i);
+            }
+        }
+      else
+        {
+          // No byDayMask, we take the event's start date to compute the DayOfWeek
+          // 0 == Sunday, 6 == Saturday
+          v = (1 << [[[self parent] startDate] dayOfWeek]);
         }
 
       [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", v];
@@ -125,6 +135,13 @@ - (NSString *) activeSyncRepresentationInContext: (WOContext *) context
               // FIXME
             }
         }
+      else
+        {
+          // Simple reccurrence rule of type "Monthly"
+          type = 2;
+          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
+             [[[self parent] startDate] dayOfMonth]];
+        }
     }
   else if ([self frequency] == iCalRecurrenceFrequenceYearly)
     {

ChangeLog

@@ -1,3 +1,108 @@
+commit ad30df26af2c95f91ad42fd02a3b45ada115502b
+Author: Francis Lachapelle <[email protected]>
+Date:   Thu Jun 5 13:34:40 2014 -0400
+
+    Preparation for release 2.2.5
+
+M	Documentation/SOGo Installation Guide.odt
+M	Documentation/SOGo Mozilla Thunderbird Configuration.odt
+M	Documentation/SOGo Native Microsoft Outlook Configuration.odt
+M	Version
+M	packaging/rhel/sogo.spec
+
+commit 6e56f46f8608c5bc6c2070c848c9fefbf4d95048
+Author: Francis Lachapelle <[email protected]>
+Date:   Thu Jun 5 13:29:10 2014 -0400
+
+    Update Dutch, Finnish, German, Polish translations
+
+M	NEWS
+M	SoObjects/Contacts/Dutch.lproj/Localizable.strings
+M	SoObjects/Contacts/Finnish.lproj/Localizable.strings
+M	SoObjects/Contacts/German.lproj/Localizable.strings
+M	SoObjects/Contacts/Polish.lproj/Localizable.strings
+M	UI/Common/German.lproj/Localizable.strings
+M	UI/Contacts/Dutch.lproj/Localizable.strings
+M	UI/Contacts/Finnish.lproj/Localizable.strings
+M	UI/Contacts/German.lproj/Localizable.strings
+M	UI/MailerUI/Dutch.lproj/Localizable.strings
+M	UI/MailerUI/Finnish.lproj/Localizable.strings
+M	UI/MailerUI/German.lproj/Localizable.strings
+M	UI/PreferencesUI/Dutch.lproj/Localizable.strings
+M	UI/PreferencesUI/Finnish.lproj/Localizable.strings
+M	UI/PreferencesUI/German.lproj/Localizable.strings
+M	UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+M	UI/PreferencesUI/Polish.lproj/Localizable.strings
+M	UI/Scheduler/Dutch.lproj/Localizable.strings
+M	UI/Scheduler/Finnish.lproj/Localizable.strings
+M	UI/Scheduler/German.lproj/Localizable.strings
+
+commit fe38518a36cf0c23eb2888bb79c4ada07553ab4a
+Author: Francis Lachapelle <[email protected]>
+Date:   Thu Jun 5 12:14:34 2014 -0400
+
+    Minor syntax and comments improvements
+
+M	SoObjects/Mailer/SOGoDraftObject.m
+M	UI/PreferencesUI/UIxPreferences.m
+M	UI/Scheduler/UIxCalListingActions.m
+
+commit e118a72eab6f6ed461cbbf493d1cf1924bdf13e6
+Author: Francis Lachapelle <[email protected]>
+Date:   Thu Jun 5 10:32:13 2014 -0400
+
+    Add meta tag to tell IE to use the highest mode
+
+M	NEWS
+M	UI/Templates/UIxPageFrame.wox
+
+commit 72bec939d67ad98c974a339f944877d46f7b831a
+Author: Ludovic Marcotte <[email protected]>
+Date:   Wed Jun 4 15:56:22 2014 -0400
+
+    Fixed text/plain reencoding issues for Outlook
+
+M	ActiveSync/SOGoMailObject+ActiveSync.m
+M	NEWS
+
+commit ba258ca8068e9414f8a5327ea38a0b7c427380b9
+Author: Ludovic Marcotte <[email protected]>
+Date:   Wed Jun 4 15:23:41 2014 -0400
+
+    Fixed repetitive events issues
+
+M	ActiveSync/iCalRecurrenceRule+ActiveSync.m
+M	NEWS
+
+commit 0c2e2f28f7223f9a7e55585614bcf5ae8aaeabcb
+Author: Ludovic Marcotte <[email protected]>
+Date:   Fri May 30 13:53:20 2014 -0400
+
+    Don't try to add attachments during reply operations
+
+M	NEWS
+M	SoObjects/Mailer/SOGoDraftObject.h
+M	SoObjects/Mailer/SOGoDraftObject.m
+M	SoObjects/Mailer/SOGoDraftsFolder.m
+M	UI/MailerUI/UIxMailEditor.m
+
+commit f0dfe37a55a692bc505708782d3c70ccb5b2951b
+Author: Ludovic Marcotte <[email protected]>
+Date:   Fri May 30 08:41:42 2014 -0400
+
+    Avoid crashing when forwarding mails with no Subject header
+
+M	NEWS
+M	SoObjects/Mailer/SOGoDraftObject.m
+
+commit dace1439df1c60c37c7092b44d8117105095f6ee
+Author: Francis Lachapelle <[email protected]>
+Date:   Thu May 29 11:16:59 2014 -0400
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit d91b37413fa0fe7f416311697ad7b487f88d967c
 Author: Francis Lachapelle <[email protected]>
 Date:   Thu May 29 11:16:40 2014 -0400

NEWS

@@ -1,3 +1,16 @@
+2.2.5 (2014-06-05)
+------------------
+
+Enhancements
+ - new meta tag to tell IE to use the highest mode available
+ - updated Dutch, Finnish, German, and Polish translations
+
+Bug fixes
+ - avoid crashing when we forward an email with no Subject header
+ - we no longer try to include attachments when replying to a mail
+ - fixed ActiveSync repetitive events issues with "Weekly" and "Monthly" ones 
+ - fixed ActiveSync text/plain parts re-encoding issues for Outlook
+
 2.2.4 (2014-05-29)
 ------------------
 

SoObjects/Contacts/Dutch.lproj/Localizable.strings

@@ -1 +1,2 @@
 "Personal Address Book" = "Persoonlijk adresboek";
+"Collected Address Book" = "Verzamelde adressen";

SoObjects/Contacts/Finnish.lproj/Localizable.strings

@@ -1 +1,2 @@
 "Personal Address Book" = "Henkilökohtainen osoitekirja";
+"Collected Address Book" = "Kerätty osoitekirja";

SoObjects/Contacts/German.lproj/Localizable.strings

@@ -1 +1,2 @@
 "Personal Address Book" = "Persönliches Adressbuch";
+"Collected Address Book" = "Gesammelte Adressen";

SoObjects/Contacts/Polish.lproj/Localizable.strings

@@ -1,2 +1,2 @@
 "Personal Address Book" = "Osobista książka adresowa";
-"Collected Address Book" = "Zbierana Książka Adresowa";
+"Collected Address Book" = "Książka zebranych adresów";

SoObjects/Mailer/SOGoDraftObject.h

@@ -1,20 +1,21 @@
 /*
+  Copyright (C) 2007-2014 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo 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
+  SOGo 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
+  License along with SOGo; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
@@ -78,6 +79,9 @@
 - (BOOL) isHTML;
 
 /* for replies and forwards */
+- (NSString *) inReplyTo;
+- (void) setInReplyTo: (NSString *) newInReplyTo;
+
 - (void) setSourceURL: (NSString *) newSurceURL;
 - (void) setSourceFlag: (NSString *) newSourceFlag;
 - (void) setSourceFolder: (NSString *) newSourceFolder;

SoObjects/Mailer/SOGoDraftObject.m

@@ -396,6 +396,11 @@ - (BOOL) isHTML
   return isHTML;
 }
 
+- (NSString *) inReplyTo
+{
+  return inReplyTo;
+}
+
 - (void) setInReplyTo: (NSString *) newInReplyTo
 {
   ASSIGN (inReplyTo, newInReplyTo);
@@ -921,7 +926,7 @@ - (void) fetchMailForReplying: (SOGoMailObject *) sourceMail
 
   sourceEnvelope = [sourceMail envelope];
   [self _fillInReplyAddresses: info replyToAll: toAll
-	envelope: sourceEnvelope];
+                     envelope: sourceEnvelope];
   msgID = [sourceEnvelope messageID];
   if ([msgID length] > 0)
     [self setInReplyTo: msgID];
@@ -977,7 +982,7 @@ - (void) fetchMailForForwarding: (SOGoMailObject *) sourceMail
 				 @"message/rfc822", @"mimetype",
 				 nil];
       [self saveAttachment: [sourceMail content]
-	    withMetadata: attachment];
+              withMetadata: attachment];
     }
 
   [self storeInfo];
@@ -1602,10 +1607,11 @@ - (NGMutableHashMap *) mimeHeaderMapWithHeaders: (NSDictionary *) _headers
   /* add subject */
   if ([(s = [headers objectForKey: @"subject"]) length] > 0)
     [map setObject: [s asQPSubjectString: @"utf-8"]
-	 forKey: @"subject"];
-
-  [map setObject: [headers objectForKey: @"message-id"]
-       forKey: @"message-id"];
+            forKey: @"subject"];
+
+  if ([(s = [headers objectForKey: @"message-id"]) length] > 0)
+    [map setObject: s
+            forKey: @"message-id"];
 
   /* add standard headers */
   dateString = [[NSCalendarDate date] rfc822DateString];

SoObjects/Mailer/SOGoDraftsFolder.m

@@ -1,8 +1,6 @@
 /* SOGoDraftsFolder.m - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <[email protected]>
+ * Copyright (C) 2007-2014 Inverse inc.
  *
  * 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

UI/Common/German.lproj/Localizable.strings

@@ -39,15 +39,15 @@
 "Sorry, the user rights can not be configured for that object." = "Leider können die Benutzerrechte für dieses Objekt nicht konfiguriert werden.";
 
 "Any user with an account on this system will be able to access your mailbox \"%{0}\". Are you certain you trust them all?"
-     = "Jeder Benutzer mit einem Account auf diesem System wird in der Lage sein auf Ihren E-Mail-Ordner \"%{0}\" zuzugreifen. Sind Sie sicher, dass Sie allen trauen?";
+     = "Jeder Benutzer mit einem Konto auf diesem System wird in der Lage sein auf Ihren E-Mail-Ordner \"%{0}\" zuzugreifen. Sind Sie sicher, dass Sie allen vertrauen?";
 "Any user with an account on this system will be able to access your calendar \"%{0}\". Are you certain you trust them all?" 
-     = "Jeder Benutzer mit einem Account auf diesem System wird in der Lage sein, auf Ihren Kalender \"%{0}\" zuzugreifen. Sind Sie sicher, dass Sie allen vertrauen?";
+     = "Jeder Benutzer mit einem Konto auf diesem System wird in der Lage sein, auf Ihren Kalender \"%{0}\" zuzugreifen. Sind Sie sicher, dass Sie allen vertrauen?";
 "Potentially anyone on the Internet will be able to access your calendar \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?"
-     = "Jeder aus dem Internet wird in der Lage sein, auf Ihren Kalender \"%{0}\" zuzugreifen, selbst wenn jene Personen keinen Account auf diesem System haben. Sind diese Informationen für das öffentliche Internet gedacht?";
+     = "Jeder aus dem Internet wird in der Lage sein, auf Ihren Kalender \"%{0}\" zuzugreifen, selbst wenn jene Personen kein Konto auf diesem System haben. Sind diese Informationen für das öffentliche Internet gedacht?";
 "Any user with an account on this system will be able to access your address book \"%{0}\". Are you certain you trust them all?"
-     = "Jeder Benutzer mit einem Account auf diesem System wird auf Ihr Adressbuch \"%{0}\" zugreifen können. Sind Sie sicher, dass Sie allen trauen?";
+     = "Jeder Benutzer mit einem Konto auf diesem System wird auf Ihr Adressbuch \"%{0}\" zugreifen können. Sind Sie sicher, dass Sie allen vertrauen?";
 "Potentially anyone on the Internet will be able to access your address book \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?"
-     = "Jeder im Internet wird in der Lage sein auf Ihr Adressbuch \"%{0}\" zuzugreifen, selbst wenn diese keinen Account auf diesem System haben. Ist diese Information passend für das öffentliche Internet?";
+     = "Jeder im Internet wird in der Lage sein auf Ihr Adressbuch \"%{0}\" zuzugreifen, selbst wenn diese kein Konto auf diesem System haben. Ist diese Information passend für das öffentliche Internet?";
 "Give Access" = "Allen Zugriff gewähren";
 "Keep Private" = "Privat halten";
 
@@ -69,6 +69,7 @@
 "You cannot create a list in a shared address book." 
         = "Sie können keine Liste in einem gemeinsamen Adressbuch erstellen.";
 "Warning" = "Warnung";
+"Can't contact server" = "Beim Verbindungsaufbau mit dem Server ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.";
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "Sie sind nicht berechtigt auf dieses Modul oder System zuzugreifen. Bitte kontaktieren Sie ihren Systemadministrator.";
@@ -101,10 +102,9 @@
 "Due Date:" = "Fällig:";
 "Location:" = "Ort:";
 
-/* Mail labels */
+/* mail labels */
 "Important" = "Wichtig";
 "Work" = "Geschäftlich";
-"Work" = "Geschäftlich";
 "Personal" = "Persönlich";
 "To Do" = "To-Do";
 "Later" = "Später";

UI/Contacts/Dutch.lproj/Localizable.strings

@@ -36,7 +36,6 @@
 "delete" = "Verwijderen";
 "edit" = "Bewerken";
 "invalidemailwarn" = "Het ingevoerde e-mailadres is ongeldig.";
-"invaliddatewarn" = "De ingevoerde datum is ongeldig.";
 "new" = "Nieuw";
 "Preferred Phone" = "Voorkeurstelefoon";
 
@@ -64,6 +63,7 @@
 
 "New Card" = "Nieuw contactpersoon";
 "New List" = "Nieuwe lijst";
+"Edit" = "Bewerken";
 "Properties" = "Eigenschappen";
 "Sharing..." = "Delen...";
 "Write" = "Bericht opstellen...";
@@ -147,7 +147,7 @@
 "You cannot delete the card of \"%{0}\"."
 = "U kunt da kaart van \"%{0}\" niet verwijderen.";
 
-"Address Book Name" = "Naam van het adresboek";
+
 
 "You cannot subscribe to a folder that you own!"
 = "U kunt uzelf niet abonneren op uw eigen mappen!";
@@ -206,3 +206,10 @@
 "A total of %{0} cards were imported in the addressbook." = "Een totaal van %{0} kaarten werd in het adresboek geïmporteerd.";
 
 "Reload" = "Herlaad";
+
+/* Properties window */
+"Address Book Name:" = "Naam van het adresboek";
+"Links to this Address Book" = "Koppeling naar adresboek";
+"Authenticated User Access" = "Toegang voor geauthenticeerde gebruikers";
+"CardDAV URL: " = "CardDAV-URL:";
+