holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid problems regarding the deletion of messages from Trash, when configured Trash Folder does not match current folder regarding upper/lower case

Browse Source
This commit is contained in:
Klaus Leithoff 2014-11-21 10:24:11 +00:00
parent 7f1d9043b2
commit 2795360ef3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -3062,7 +3062,7 @@ class emailadmin_imapbase
$this->icServer->openMailbox($folderName); $this->icServer->openMailbox($folderName);
if($folderName == $trashFolder && $deleteOptions == "move_to_trash") { if(strtolower($folderName) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") {
$this->deleteMessages('all',$folderName,'remove_immediately'); $this->deleteMessages('all',$folderName,'remove_immediately');
} else { } else {
$this->icServer->expunge($folderName); $this->icServer->expunge($folderName);
@ -3105,8 +3105,8 @@ class emailadmin_imapbase
$trashFolder = $this->getTrashFolder(); $trashFolder = $this->getTrashFolder();
$draftFolder = $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder']; $draftFolder = $this->getDraftFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['draftFolder'];
$templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder']; $templateFolder = $this->getTemplateFolder(); //$GLOBALS['egw_info']['user']['preferences']['mail']['templateFolder'];
if(($_folder == $trashFolder && $deleteOptions == "move_to_trash") || if((strtolower($_folder) == strtolower($trashFolder) && $deleteOptions == "move_to_trash") ||
($_folder == $draftFolder)) { (strtolower($_folder) == strtolower($draftFolder))) {
$deleteOptions = "remove_immediately"; $deleteOptions = "remove_immediately";
} }
if($this->icServer->getCurrentMailbox() != $_folder) { if($this->icServer->getCurrentMailbox() != $_folder) {