ZP-227 #comment Merge contribution - imap wasteID should be converted to...

ZP-227 #comment Merge contribution - imap wasteID should be converted to imapId - rev 1391  #time 15m

git-svn-id: https://z-push.org/svn/z-push/trunk@1451 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/backend/combined/combined.php

@@ -61,6 +61,7 @@ class BackendCombined extends Backend {
     public $config;
     public $backends;
     private $activeBackend;
+    private $activeBackendID;
 
     /**
      * Constructor of the combined backend
@@ -310,8 +311,14 @@ class BackendCombined extends Backend {
      */
     function GetWasteBasket(){
         ZLog::Write(LOGLEVEL_DEBUG, "Combined->GetWasteBasket()");
+
         if (isset($this->activeBackend))
-            return $this->activeBackend->GetWasteBasket();
+        {
+            if (!$this->activeBackend->GetWasteBasket())
+                return false;
+            else
+                return $this->activeBackendID . $this->config['delimiter'] . $this->activeBackend->GetWasteBasket();
+        }
 
         return false;
     }
@@ -376,6 +383,7 @@ class BackendCombined extends Backend {
             return false;
 
         $this->activeBackend = $this->backends[$id];
+        $this->activeBackendID = $id;
         return $this->backends[$id];
     }