Revert "Merge pull request #164 from Zentyal/jgarcia/revert-merge-inverse"

This reverts commit 1404dbdb88, reversing
changes made to 72cbd9a45f.

UI/Contacts/UIxContactEditor.m

@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2004-2005 SKYRIX Software AG
-  Copyright (C) 2005-2010 Inverse inc.
+  Copyright (C) 2005-2015 Inverse inc.
 
   This file is part of SOGo
 
@@ -378,9 +378,8 @@ static Class SOGoContactGCSEntryK = Nil;
     result = [self redirectToLocation: [self modulePath]];
   else
     {
-      jsRefreshMethod
-        = [NSString stringWithFormat: @"refreshContacts(\"%@\")",
-                    [contact nameInContainer]];
+      jsRefreshMethod = [NSString stringWithFormat: @"refreshContacts('%@')",
+                                  [contact nameInContainer]];
       result = [self jsCloseWithRefreshMethod: jsRefreshMethod];
     }
 

UI/Contacts/UIxContactView.m

@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2004 SKYRIX Software AG
-  Copyright (C) 2005-2014 Inverse inc.
+  Copyright (C) 2005-2015 Inverse inc.
 
   This file is part of SOGo.
  
@@ -138,9 +138,13 @@
   if ([email length] > 0)
     {
       fn = [card fn];
-      fn = [fn stringByReplacingString: @"\""  withString: @""];
-      fn = [fn stringByReplacingString: @"'"  withString: @"\\\'"];
-      attrs = [NSString stringWithFormat: @"onclick=\"return openMailTo('%@ <%@>');\"", fn, email];
+      if ([fn length] > 0)
+        attrs = [NSString stringWithFormat: @"%@ <%@>", fn, email];
+      else
+        attrs = email;
+      attrs = [attrs stringByReplacingString: @"'"  withString: @"\\'"];
+      attrs = [attrs stringByReplacingString: @"\""  withString: @"\\\""];
+      attrs = [NSString stringWithFormat: @"onclick=\"return openMailTo('%@');\"", attrs];
     }
   else
     {
@@ -181,16 +185,23 @@
       for (i = 0; i < [emails count]; i++)
 	{
 	  email = [[emails objectAtIndex: i] flattenedValuesForKey: @""];
-          fn = [card fn];
-          fn = [fn stringByReplacingString: @"\""  withString: @""];
-          fn = [fn stringByReplacingString: @"'"  withString: @"\\\'"];
-          attrs = [NSString stringWithFormat: @"onclick=\"return openMailTo('%@ <%@>');\"", fn, email];
-          
-          [secondaryEmails addObject: [self _cardStringWithLabel: nil
-                                                           value: email
-                                            byEscapingHTMLString: YES
-                                                    asLinkScheme: @"mailto:"
-                                              withLinkAttributes: attrs]];
+          if ([email length])
+            {
+              fn = [card fn];
+              if ([fn length])
+                attrs = [NSString stringWithFormat: @"%@ <%@>", fn, email];
+              else
+                attrs = email;
+              attrs = [attrs stringByReplacingString: @"'"  withString: @"\\'"];
+              attrs = [attrs stringByReplacingString: @"\""  withString: @"\\\""];
+              attrs = [NSString stringWithFormat: @"onclick=\"return openMailTo('%@');\"", attrs];
+
+              [secondaryEmails addObject: [self _cardStringWithLabel: nil
+                                                               value: email
+                                                byEscapingHTMLString: YES
+                                                        asLinkScheme: @"mailto:"
+                                                  withLinkAttributes: attrs]];
+            }
         }
     }
   else

UI/Contacts/UIxListEditor.m

@@ -1,6 +1,6 @@
 /* UIxListEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2008-2014 Inverse inc.
+ * Copyright (C) 2008-2015 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
@@ -29,6 +29,8 @@
 #import <NGCards/NGVCardReference.h>
 #import <NGCards/NGVList.h>
 
+#import <SOGo/NSString+Utilities.h>
+
 #import <Contacts/SOGoContactGCSEntry.h>
 #import <Contacts/SOGoContactGCSFolder.h>
 #import <Contacts/SOGoContactGCSList.h>
@@ -289,9 +291,8 @@
         result = [self redirectToLocation: [self modulePath]];
       else
         {
-          jsRefreshMethod
-            = [NSString stringWithFormat: @"refreshContacts(\"%@\")",
-            [co nameInContainer]];
+          jsRefreshMethod = [NSString stringWithFormat: @"refreshContacts('%@')",
+                                      [co nameInContainer]];
           result = [self jsCloseWithRefreshMethod: jsRefreshMethod];
         }
     }