Merge pull request #586 in ZP/z-push from feature/ZP-1279-imap-backend-delete to develop

* commit 'a14da0e0':
  ZP-1279 Remove parenthesis for return.
  ZP-1279 Add missing paren -- apologies for the miss. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1279 Change log message per comment. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1279 Make changes per Manfred Kuntas.  The "$this" is not required but yes, it makes sense.  Also added requested debug-level log. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1279 Imap backend delete change if not in trash (move to trash). Released under the Affero GNU General Public License (AGPL) version 3.

src/backend/imap/imap.php

@@ -1547,6 +1547,10 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->DeleteMessage('%s','%s')", $folderid, $id));
 
         $folderImapid = $this->getImapIdFromFolderId($folderid);
+        if (strcasecmp($folderImapid, $this->create_name_folder(IMAP_FOLDER_TRASH)) != 0) {
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->DeleteMessage('%s','%s') move message to trash folder", $folderid, $id));
+            return $this->MoveMessage($folderid, $id, $this->create_name_folder(IMAP_FOLDER_TRASH), $contentparameters);
+        }
         $this->imap_reopen_folder($folderImapid);
 
         if ($this->imap_inside_cutoffdate(Utils::GetCutOffDate($contentparameters->GetFilterType()), $id)) {