From a21d045c1c6f3172db125fffdffbcca0f6267c5d Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Thu, 9 Feb 2017 18:23:06 +0000
Subject: [PATCH] Update to suit setup of combined

---
 conf/backend/config-combined.php | 36 +++++++++++---------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/conf/backend/config-combined.php b/conf/backend/config-combined.php
index aa9f002..0efb4c0 100644
--- a/conf/backend/config-combined.php
+++ b/conf/backend/config-combined.php
@@ -47,22 +47,10 @@ class BackendCombinedConfig {
                 'i' => array(
                     'name' => 'BackendIMAP',
                 ),
-                'z' => array(
-                    'name' => 'BackendKopano',
-                ),
-                'm' => array(
-                    'name' => 'BackendMaildir',
-                ),
-                'v' => array(
-                    'name' => 'BackendVCardDir',
-                ),
-                'l' => array(
-                    'name' => 'BackendLDAP',
-                ),
                 'd' => array(
                     'name' => 'BackendCardDAV',
                 ),
-                'c' => array(
+                'l' => array(
                     'name' => 'BackendCalDAV',
                 ),
             ),
@@ -75,19 +63,19 @@ class BackendCombinedConfig {
                 SYNC_FOLDER_TYPE_WASTEBASKET => 'i',
                 SYNC_FOLDER_TYPE_SENTMAIL => 'i',
                 SYNC_FOLDER_TYPE_OUTBOX => 'i',
-                SYNC_FOLDER_TYPE_TASK => 'z',
-                SYNC_FOLDER_TYPE_APPOINTMENT => 'z',
-                SYNC_FOLDER_TYPE_CONTACT => 'z',
-                SYNC_FOLDER_TYPE_NOTE => 'z',
-                SYNC_FOLDER_TYPE_JOURNAL => 'z',
+                SYNC_FOLDER_TYPE_TASK => 'l',
+                SYNC_FOLDER_TYPE_APPOINTMENT => 'l',
+                SYNC_FOLDER_TYPE_CONTACT => 'd',
+                SYNC_FOLDER_TYPE_NOTE => 'l',
+                SYNC_FOLDER_TYPE_JOURNAL => 'l',
                 SYNC_FOLDER_TYPE_OTHER => 'i',
                 SYNC_FOLDER_TYPE_USER_MAIL => 'i',
-                SYNC_FOLDER_TYPE_USER_APPOINTMENT => 'z',
-                SYNC_FOLDER_TYPE_USER_CONTACT => 'z',
-                SYNC_FOLDER_TYPE_USER_TASK => 'z',
-                SYNC_FOLDER_TYPE_USER_JOURNAL => 'z',
-                SYNC_FOLDER_TYPE_USER_NOTE => 'z',
-                SYNC_FOLDER_TYPE_UNKNOWN => 'z',
+                SYNC_FOLDER_TYPE_USER_APPOINTMENT => 'l',
+                SYNC_FOLDER_TYPE_USER_CONTACT => 'd',
+                SYNC_FOLDER_TYPE_USER_TASK => 'l',
+                SYNC_FOLDER_TYPE_USER_JOURNAL => 'l',
+                SYNC_FOLDER_TYPE_USER_NOTE => 'l',
+                SYNC_FOLDER_TYPE_UNKNOWN => 'i',
             ),
             //creating a new folder in the root folder should create a folder in one backend
             'rootcreatefolderbackend' => 'i',