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

PrintView (from compose) Make sure draftfolder settings from user-defined-account is checked (and applied if existing) before checking for draftfolder settings in felamimail preferences

Browse Source
This commit is contained in:
Klaus Leithoff 2010-05-20 11:45:34 +00:00
parent d8766c735a
commit 4987cc1b4d
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
felamimail/inc/class.uidisplay.inc.php
View File

@ -1135,7 +1135,18 @@
$folder = $this->mailbox;
// the folder for callfromcompose is hardcoded, because the message to be printed from the compose window is saved as draft, and can be
// reopened for composing (only) from there
if ($callfromcompose) $folder = $GLOBALS['egw_info']['user']['preferences']['felamimail']['draftFolder'];
if ($callfromcompose)
{
if (isset($this->mailPreferences->preferences['draftFolder']) &&
$this->mailPreferences->preferences['draftFolder'] != 'none')
{
$folder = $this->mailPreferences->preferences['draftFolder'];
}
else
{
$folder = $GLOBALS['egw_info']['user']['preferences']['felamimail']['draftFolder'];
}
}
$this->bofelamimail->reopen($folder);
# print "$this->mailbox, $this->uid, $partID<br>";
$headers = $this->bofelamimail->getMessageHeader($this->uid, $partID);