From 443c6aa65ad26640dc835d00d11a5cfe7e9d1349 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Fri, 10 Apr 2009 13:01:53 +0200
Subject: [PATCH] Fix the generation of IDs if on of the ID attributes has more
 than one value.

Do not require the mail attribute if the object is modified.
---
 .../Horde/Kolab/Server/Object/Kolabgroupofnames.php  | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php
index fa9d901bf..ef55303bf 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabgroupofnames.php
@@ -103,10 +103,14 @@ class Horde_Kolab_Server_Object_Kolabgroupofnames extends Horde_Kolab_Server_Obj
     public function generateId($info)
     {
         if (isset($info[self::ATTRIBUTE_MAIL])) {
-            return self::ATTRIBUTE_CN . '=' . $this->server->structure->quoteForUid(trim($info[self::ATTRIBUTE_MAIL]), " \t\n\r\0\x0B,");
+            $id = $info[self::ATTRIBUTE_MAIL];
         } else {
-            return self::ATTRIBUTE_CN . '=' . $this->server->structure->quoteForUid(trim($info[self::ATTRIBUTE_CN]), " \t\n\r\0\x0B,");
+            $id = $info[self::ATTRIBUTE_CN];
         }
+        if (is_array($id)) {
+            $id = $id[0];
+        }
+        return self::ATTRIBUTE_CN . '=' . $this->server->structure->quoteForUid(trim($id, " \t\n\r\0\x0B,"));
     }
 
     /**
@@ -118,11 +122,13 @@ class Horde_Kolab_Server_Object_Kolabgroupofnames extends Horde_Kolab_Server_Obj
      */
     public function save($info)
     {
-        if (!isset($info[self::ATTRIBUTE_CN])) {
-            if (!isset($info[self::ATTRIBUTE_MAIL])) {
-                throw new Horde_Kolab_Server_Exception('Either the mail address or the common name has to be specified for a group object!');
-            } else {
-                $info[self::ATTRIBUTE_CN] = $info[self::ATTRIBUTE_MAIL];
+        if (!$this->exists()) {
+            if (!isset($info[self::ATTRIBUTE_CN])) {
+                if (!isset($info[self::ATTRIBUTE_MAIL])) {
+                    throw new Horde_Kolab_Server_Exception('Either the mail address or the common name has to be specified for a group object!');
+                } else {
+                    $info[self::ATTRIBUTE_CN] = $info[self::ATTRIBUTE_MAIL];
+                }
             }
         }
         return parent::save($info);
-- 
2.11.0