explicitly set charsets for mail attachments, changed mails to include appointmentURL...

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@760 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SOGo.xcodeproj/project.pbxproj b/SOGo/SOGo.xcodeproj/project.pbxproj
index 8032f7bdb6551d43842f9ebab8a081ae0f62ba77..06854919c821d847590a64c223a6ec3cbdecd809 100644 (file)
--- a/SOGo/SOGo.xcodeproj/project.pbxproj
+++ b/SOGo/SOGo.xcodeproj/project.pbxproj
@@ -94,8 +94,6 @@
                AD2FA8DC0883CD12009A91E7 /* SOGoAptMailInvitation.wo */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SOGoAptMailInvitation.wo; sourceTree = "<group>"; };
                AD2FA9C50883F922009A91E7 /* SOGoAptMailUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOGoAptMailUpdate.m; sourceTree = "<group>"; };
                AD2FA9C60883F92C009A91E7 /* SOGoAptMailUpdate.wo */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SOGoAptMailUpdate.wo; sourceTree = "<group>"; };
-               AD2FA9FB088401B5009A91E7 /* SOGoUser.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = SOGoUser.h; sourceTree = "<group>"; };
-               AD2FA9FC088401B5009A91E7 /* SOGoUser.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SOGoUser.m; sourceTree = "<group>"; };
                AD2FAA4708840BB8009A91E7 /* common.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; path = common.make; sourceTree = "<group>"; };
                AD2FAA81088417AB009A91E7 /* AgenorUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AgenorUserDefaults.h; sourceTree = "<group>"; };
                AD2FAA82088417AB009A91E7 /* AgenorUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AgenorUserDefaults.m; sourceTree = "<group>"; };
@@ -342,6 +340,10 @@
                ADE0AC150885C45100E62D67 /* searchfield.js */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.javascript; name = searchfield.js; path = ../WebServerResources/searchfield.js; sourceTree = "<group>"; };
                ADE0AC160885C45100E62D67 /* uix.css */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = uix.css; path = ../WebServerResources/uix.css; sourceTree = "<group>"; };
                ADE0AC400885C6D300E62D67 /* homepage.js */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.javascript; path = homepage.js; sourceTree = "<group>"; tabWidth = 2; };
+               ADE0AEA20886CB3A00E62D67 /* SOGoAuthenticator.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = SOGoAuthenticator.h; sourceTree = "<group>"; };
+               ADE0AEA30886CB3A00E62D67 /* SOGoAuthenticator.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SOGoAuthenticator.m; sourceTree = "<group>"; };
+               ADE0AEA40886CB3A00E62D67 /* SOGoUser.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = SOGoUser.h; sourceTree = "<group>"; };
+               ADE0AEA50886CB3A00E62D67 /* SOGoUser.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = SOGoUser.m; sourceTree = "<group>"; };
                ADE2C23D06B7BED40065D56F /* UIxCalWeekListview.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxCalWeekListview.m; sourceTree = "<group>"; };
                ADE2C24006B7BEE60065D56F /* UIxCalWeekChartview.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxCalWeekChartview.m; sourceTree = "<group>"; };
                ADE2C24A06B7BF020065D56F /* UIxCalWeekColumnsview.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxCalWeekColumnsview.m; sourceTree = "<group>"; };
@@ -367,8 +369,6 @@
                E87205D00692E3D00099CBBD /* GNUmakefile.preamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; indentWidth = 8; path = GNUmakefile.preamble; sourceTree = "<group>"; tabWidth = 8; };
                E87205D70692E3D00099CBBD /* product.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = product.plist; sourceTree = "<group>"; };
                E87205D80692E3D00099CBBD /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
-               E87205DF0692E3D00099CBBD /* SOGoAuthenticator.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = SOGoAuthenticator.h; sourceTree = "<group>"; };
-               E87205E00692E3D00099CBBD /* SOGoAuthenticator.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = SOGoAuthenticator.m; sourceTree = "<group>"; };
                E87205E10692E3D00099CBBD /* sogod.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = sogod.m; sourceTree = "<group>"; usesTabs = 0; };
                E87205ED0692E3D00099CBBD /* SOGoProductLoader.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = SOGoProductLoader.h; sourceTree = "<group>"; };
                E87205EE0692E3D00099CBBD /* SOGoProductLoader.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = SOGoProductLoader.m; sourceTree = "<group>"; };
@@ -1083,8 +1083,12 @@
                                AD85C72707C4E8740036AC7A /* AgenorUserManager.m */,
                                AD2FAA81088417AB009A91E7 /* AgenorUserDefaults.h */,
                                AD2FAA82088417AB009A91E7 /* AgenorUserDefaults.m */,
+                               ADE0AEA20886CB3A00E62D67 /* SOGoAuthenticator.h */,
+                               ADE0AEA30886CB3A00E62D67 /* SOGoAuthenticator.m */,
                                AD85C73407C4E8740036AC7A /* SOGoLRUCache.h */,
                                AD85C73507C4E8740036AC7A /* SOGoLRUCache.m */,
+                               ADE0AEA40886CB3A00E62D67 /* SOGoUser.h */,
+                               ADE0AEA50886CB3A00E62D67 /* SOGoUser.m */,
                                E87206A00692E3D10099CBBD /* SOGoObject.h */,
                                E87206A10692E3D10099CBBD /* SOGoObject.m */,
                                E872069C0692E3D10099CBBD /* SOGoContentObject.h */,
@@ -1219,10 +1223,6 @@
                                AD2E1FEC07BD87CB0012FE12 /* MainUIProduct.m */,
                                E87205ED0692E3D00099CBBD /* SOGoProductLoader.h */,
                                E87205EE0692E3D00099CBBD /* SOGoProductLoader.m */,
-                               E87205DF0692E3D00099CBBD /* SOGoAuthenticator.h */,
-                               E87205E00692E3D00099CBBD /* SOGoAuthenticator.m */,
-                               AD2FA9FB088401B5009A91E7 /* SOGoUser.h */,
-                               AD2FA9FC088401B5009A91E7 /* SOGoUser.m */,
                        );
                        name = Classes;
                        sourceTree = "<group>";

diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog
index be5e960499f83835b96a3d689494b4ca62220cc5..e73587c46660658783e94713cf0eb606a9bb3ec5 100644 (file)
--- a/SOGo/SoObjects/Appointments/ChangeLog
+++ b/SOGo/SoObjects/Appointments/ChangeLog
@@ -1,7 +1,19 @@
 2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * v0.9.44
+
+       * SOGoAppointmentFolder.m: explicitly set encoding for text and
+         calendar attachment parts
+
+       * SOGoAptMailNotification.m: added -appointmentURL accessor
+
+       * SOGoAptMailInvitation.wo, SOGoAptMailUpdate.wo: display
+         -appointmentURL instead of -homePageURL
+
+       * v0.9.43
+
        * SOGoAppointmentFolder.m: changed redirect from 'schedule' to
-         'weekoverview' (v0.9.43)
+         'weekoverview'
 
 2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
 

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m b/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m
index b232e9f0902547236c9c6d61d7ced4b59fc68833..b26772e638bad7f773e18042cb927086bd6422d4 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -596,18 +596,18 @@ static NSTimeZone                *MET    = nil;
     
     /* text part */
     headerMap = [NGMutableHashMap hashMapWithCapacity:1];
-    [headerMap setObject:@"text/plain" forKey:@"content-type"];
+    [headerMap setObject:@"text/plain; charset=utf-8" forKey:@"content-type"];
     bodyPart = [NGMimeBodyPart bodyPartWithHeader:headerMap];
-    [bodyPart setBody:text];
+    [bodyPart setBody:[text dataUsingEncoding:NSUTF8StringEncoding]];
 
     /* attach text part to multipart body */
     [body addBodyPart:bodyPart];
     
     /* calendar part */
     headerMap  = [NGMutableHashMap hashMapWithCapacity:1];
-    [headerMap setObject:@"text/calendar" forKey:@"content-type"];
+    [headerMap setObject:@"text/calendar; charset=utf-8" forKey:@"content-type"];
     bodyPart   = [NGMimeBodyPart bodyPartWithHeader:headerMap];
-    [bodyPart setBody:iCalString];
+    [bodyPart setBody:[iCalString dataUsingEncoding:NSUTF8StringEncoding]];
     
     /* attach calendar part to multipart body */
     [body addBodyPart:bodyPart];

diff --git a/SOGo/SoObjects/Appointments/SOGoAptMailInvitation.wo/SOGoAptMailInvitation.wod b/SOGo/SoObjects/Appointments/SOGoAptMailInvitation.wo/SOGoAptMailInvitation.wod
index 69c6c1c71bc55177410ccc8086e42743b893ab14..3e37496c4d9f3b38577e3a426cbb03c5bf1e1d75 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAptMailInvitation.wo/SOGoAptMailInvitation.wod
+++ b/SOGo/SoObjects/Appointments/SOGoAptMailInvitation.wo/SOGoAptMailInvitation.wod
@@ -20,7 +20,7 @@ HasHomePageURL: WOConditional {
 }
 
 HomePageURL: WOString {
-  value      = homePageURL;
+  value      = appointmentURL;
   escapeHTML = NO;
 }
 

diff --git a/SOGo/SoObjects/Appointments/SOGoAptMailNotification.m b/SOGo/SoObjects/Appointments/SOGoAptMailNotification.m
index a7a11f2be0c5c2b111b116c08f9212366f3a7cf0..cbf6c372877d072f3ff3de4eebdacfc0dbef8d0c 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SOGo/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -75,6 +75,15 @@ static NSTimeZone     *MET = nil;
   ASSIGN(self->homePageURL, _homePageURL);
 }
 
+- (NSString *)appointmentURL {
+  NSString *aptUID;
+  
+  aptUID = [[self newApt] uid];
+  return [NSString stringWithFormat:@"%@/Calendar/%@/view?tab=participants",
+                                    [self homePageURL],
+                                    aptUID];
+}
+
 - (NSTimeZone *)viewTZ {
   if (self->viewTZ) return self->viewTZ;
   return MET;

diff --git a/SOGo/SoObjects/Appointments/SOGoAptMailUpdate.wo/SOGoAptMailUpdate.wod b/SOGo/SoObjects/Appointments/SOGoAptMailUpdate.wo/SOGoAptMailUpdate.wod
index 4ca5da7409ff5da3d12b2785cf974522b147c2d6..3dccef2aaa61351150f599fe9a9ff1df6bc654e1 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAptMailUpdate.wo/SOGoAptMailUpdate.wod
+++ b/SOGo/SoObjects/Appointments/SOGoAptMailUpdate.wo/SOGoAptMailUpdate.wod
@@ -32,7 +32,7 @@ HasHomePageURL: WOConditional {
 }
 
 HomePageURL: WOString {
-  value      = homePageURL;
+  value      = appointmentURL;
   escapeHTML = NO;
 }
 

diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version
index e6df4b3edeb8261f5f0654b089e2b263c7b8596e..fed6879e3c7c05ed1179351ea8f827075ed9be50 100644 (file)
--- a/SOGo/SoObjects/Appointments/Version
+++ b/SOGo/SoObjects/Appointments/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=43
+SUBMINOR_VERSION:=44
 
 # v0.9.42 requires libSOGo            v0.9.54
 # v0.9.32 requires libGDLContentStore v4.5.26