From 7c0c3d0dd48e14f9f7f52e3b503f22f887e12199 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 19 Mar 2014 15:04:21 +0100
Subject: [PATCH] Load folder id and default to that if not specified for group
 members in OX < 6.22.

---
 framework/OpenXchange/lib/Horde/OpenXchange/Contacts.php       | 1 +
 framework/OpenXchange/lib/Horde/OpenXchange/EventsAndTasks.php | 1 +
 turba/bin/turba-import-openxchange                             | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/framework/OpenXchange/lib/Horde/OpenXchange/Contacts.php b/framework/OpenXchange/lib/Horde/OpenXchange/Contacts.php
index e3cbb3cae47..2930f6c1eba 100644
--- a/framework/OpenXchange/lib/Horde/OpenXchange/Contacts.php
+++ b/framework/OpenXchange/lib/Horde/OpenXchange/Contacts.php
@@ -37,6 +37,7 @@ class Horde_OpenXchange_Contacts extends Horde_OpenXchange_Base
      */
     protected $_columns = array(
         1 => 'id',
+        20 => 'folder_id',
         100 => 'categories',
         223 => 'uid',
         500 => 'name',
diff --git a/framework/OpenXchange/lib/Horde/OpenXchange/EventsAndTasks.php b/framework/OpenXchange/lib/Horde/OpenXchange/EventsAndTasks.php
index 422357a5b0e..a1031455134 100644
--- a/framework/OpenXchange/lib/Horde/OpenXchange/EventsAndTasks.php
+++ b/framework/OpenXchange/lib/Horde/OpenXchange/EventsAndTasks.php
@@ -30,6 +30,7 @@ abstract class Horde_OpenXchange_EventsAndTasks extends Horde_OpenXchange_Base
      */
     protected $_columns = array(
         1 => 'id',
+        20 => 'folder_id',
         100 => 'categories',
         101 => 'private',
         200 => 'title',
diff --git a/turba/bin/turba-import-openxchange b/turba/bin/turba-import-openxchange
index 9f851d497aa..59ae3efc57e 100755
--- a/turba/bin/turba-import-openxchange
+++ b/turba/bin/turba-import-openxchange
@@ -216,6 +216,9 @@ while ($row = fgetcsv($fp, 0, ' ')) {
             $count++;
             foreach ($group['members'] as $member) {
                 if (isset($member['id'])) {
+                    if (!isset($member['folder_id'])) {
+                        $member['folder_id'] = $group['folder_id'];
+                    }
                     $object->addMember(
                         $contactMap[$member['folder_id']][$member['id']][1],
                         $contactMap[$member['folder_id']][$member['id']][0]