Load folder id and default to that if not specified for group members…

… in OX < 6.22.
horde · Mar 19, 2014 · 7c0c3d0 · 7c0c3d0
1 parent 9504538
commit 7c0c3d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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]