Branch 'kolab-syncroton-2.2' - lib/kolab_sync_backend.php

[Aleksander Machniak]

 lib/kolab_sync_backend.php |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 25600d1e03ae1222ae01e402f2e587d90d0ea9c0
Author: Aleksander Machniak <alec at alec.pl>
Date:   Thu Jan 30 19:02:39 2014 +0100

    Fix default subscription of Junk folder

diff --git a/lib/kolab_sync_backend.php b/lib/kolab_sync_backend.php
index 205201e..7e7ea66 100644
--- a/lib/kolab_sync_backend.php
+++ b/lib/kolab_sync_backend.php
@@ -566,13 +566,13 @@ class kolab_sync_backend
 
         // below we support additionally all mail folders
         $supported_types[] = 'mail';
-        $supported_types[] = 'mail.junkemails';
+        $supported_types[] = 'mail.junkemail';
 
         // get configured special folders
         $special_folders = array();
         $map             = array(
             'drafts' => 'mail.drafts',
-            'junk'   => 'mail.junkemails',
+            'junk'   => 'mail.junkemail',
             'sent'   => 'mail.sentitems',
             'trash'  => 'mail.wastebasket',
         );
@@ -585,7 +585,7 @@ class kolab_sync_backend
 
         // get folders list(s)
         if (($mode & $modes['ALL_PERSONAL']) || ($mode & $modes['ALL_OTHER']) || ($mode & $modes['ALL_SHARED'])) {
-            $all_folders        = $this->storage->list_folders();
+            $all_folders = $this->storage->list_folders();
             if (($mode & $modes['SUB_PERSONAL']) || ($mode & $modes['SUB_OTHER']) || ($mode & $modes['SUB_SHARED'])) {
                 $subscribed_folders = $this->storage->list_folders_subscribed();
             }