changes to make Anais happy ;-)

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

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 6cba983ac203e531e30fca89423e76dcd151ab2e..3921ca40d5b38f6b37789345b0b355dd1002f29a 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-13  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+        * UIxMailToSelection.m: sanitize CN's a bit before using them (v0.9.39)
+
         * v0.9.38
 
         * UIxMailToSelection.[wox|m]: removed superfluous debug messages

diff --git a/SOGo/UI/Mailer/UIxMailToSelection.m b/SOGo/UI/Mailer/UIxMailToSelection.m
index 046887c08d32b21ec46cb6c6c857273764ac4012..c86e79a7109a5653d8b3250fd2f106440be85dcd 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailToSelection.m
+++ b/SOGo/UI/Mailer/UIxMailToSelection.m
@@ -329,11 +329,19 @@ static NSArray *headers = nil;
   @"  list.appendChild(span);\n"
   @"}\n"
   @"\n"
+  @"function sanitizedCn(cn) {\n"
+  @"  var parts;\n"
+  @"  parts = cn.split(', ');\n"
+  @"  if(parts.length == 1)\n"
+  @"    return cn;\n"
+  @"  return parts[0];\n"
+  @"}\n"
+  @"\n"
   @"function addAddress(type, cn, dn, email, uid, sn) {\n"
   @"  var shouldAddRow, s, e;\n"
   @"  \n"
   @"  shouldAddRow = true;\n"
-  @"  s = cn + ' <' + email + '>';\n"
+  @"  s = this.sanitizedCn(cn) + ' <' + email + '>';\n"
   @"\n"
   @"  if(this.hasAddress(email))\n"
   @"    return;\n"

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 62c8c2f88caff08f73de59d413798b4448cf7c8f..760afe2d42040b34cb2f81900f7858995e07f5ee 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=37
+SUBMINOR_VERSION:=39