File kolab-syncroton-2.2.4-dont-omit-junk-folder.patch of Package kolab-syncroton

File kolab-syncroton-2.2.4-dont-omit-junk-folder.patch of Package kolab-syncroton (Revision 45)

Currently displaying revision 45 , Show latest

diff -ur kolab-syncroton-2.2.4.orig/lib/kolab_sync_backend.php kolab-syncroton-2.2.4/lib/kolab_sync_backend.php
--- kolab-syncroton-2.2.4.orig/lib/kolab_sync_backend.php	2014-01-24 12:23:35.000000000 +0100
+++ kolab-syncroton-2.2.4/lib/kolab_sync_backend.php	2014-02-06 10:20:58.351064191 +0100
@@ -566,13 +566,13 @@
 
         // 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 @@
 
         // 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();
             }
@@ -602,7 +602,7 @@
 
             $type = $foldertypes[$folder] ?: 'mail';
             if ($type == 'mail' && isset($special_folders[$folder])) {
-                $type == $special_folders[$folder];
+                $type = $special_folders[$folder];
             }
 
             if (!in_array($type, $supported_types)) {