git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1155 d1b88da0-ebda-0310...

[scalable-opengroupware.org] / UI / Contacts / UIxContactEditor.m

diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m
index 0b6dd7b7420601d050e977d5957d705451a84ca9..578c65ce39feffabc2249ee2624bb648d080bc30 100644 (file)
--- a/UI/Contacts/UIxContactEditor.m
+++ b/UI/Contacts/UIxContactEditor.m
@@ -19,14 +19,19 @@
   02111-1307, USA.
 */
 
-#import <NGCards/NGVCard.h>
-#import <NGCards/NSArray+NGCards.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
 
+#import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoObject.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGExtensions/NSNull+misc.h>
+
+#import <NGCards/NGVCard.h>
+#import <NGCards/NSArray+NGCards.h>
 
 #import <Contacts/SOGoContactObject.h>
 #import <Contacts/SOGoContactFolder.h>
-#import "common.h"
 
 #import "UIxContactEditor.h"
 
@@ -536,7 +541,8 @@
 
 - (id) writeAction
 {
-  NSString *email, *url;
+  NSString *email, *cn, *url;
+  NSMutableString *address;
 
   card = [[self clientObject] vCard];
   [self initSnapshot];
@@ -546,7 +552,16 @@
     email = [snapshot objectForKey: @"workMail"];
 
   if (email)
-    url = [NSString stringWithFormat: @"Mail/compose?mailto=%@", email];
+    {
+      address = [NSMutableString string];
+      cn = [card fn];
+      if ([cn length] > 0)
+       [address appendFormat: @"%@ <%@>", cn, email];
+      else
+       [address appendString: email];
+       
+      url = [NSString stringWithFormat: @"Mail/compose?mailto=%@", address];
+    }
   else
     url = @"Mail/compose";
 
@@ -575,13 +590,13 @@
     objectId = nil;
 
   if ([objectId length] == 0)
-    return [NSException exceptionWithHTTPStatus:500 /* Internal Error */
+    return [NSException exceptionWithHTTPStatus: 500 /* Internal Error */
                         reason: @"could not create a unique ID"];
 
   nextMethod = [NSString stringWithFormat: @"../%@/%@", 
                         objectId, [self editActionName]];
-  uri = [self _completeURIForMethod:nextMethod];
-  return [self redirectToLocation:uri];
+  uri = [self _completeURIForMethod: nextMethod];
+  return [self redirectToLocation: uri];
 }
 
 @end /* UIxContactEditor */