extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 13:51:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: Saving as draft reopens the saved message: thus giving you full control wether saving the message as draft has succeeded, and giving you the opportunity to continue your work

Browse Source
This commit is contained in:
Klaus Leithoff 2010-12-01 13:55:21 +00:00
parent 8327175c81
commit af5f8208bb
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
felamimail/inc/class.uicompose.inc.php
View File

@ -58,8 +58,7 @@
}
$this->t = CreateObject('phpgwapi.Template',EGW_APP_TPL);
$this->bofelamimail = CreateObject('felamimail.bofelamimail',$this->displayCharset);
$this->mailPreferences = ExecMethod('felamimail.bopreferences.getPreferences');
$this->mailPreferences =& $this->bofelamimail->mailPreferences;// ExecMethod('felamimail.bopreferences.getPreferences');
$this->t->set_unknowns('remove');
$this->rowColor[0] = $GLOBALS['egw_info']["theme"]["bg01"];
@ -129,10 +128,22 @@
// save as draft
$messageUid = $this->bocompose->saveAsDraft($formData);
if (!$messageUid) {
print "<script type=\"text/javascript\">alert('".lang("Error: Could not save Message as Draft")."');</script>";
print "<script type=\"text/javascript\">alert('".lang("Error: Could not save Message as Draft")." ".lang("Trying to recover from session data")."');</script>";
//try to reopen the mail from session data
$this->compose();
return;
}
// saving as draft, does not mean closing the message
unset($_POST['composeid']);
unset($_GET['composeid']);
$uicompose = CreateObject('felamimail.uicompose');
$folder = ($uicompose->mailPreferences->ic_server[0]->draftfolder ? $uicompose->mailPreferences->ic_server[0]->draftfolder : $uicompose->mailPreferences->preferences['draftFolder']);
$uicompose->bocompose->getDraftData($uicompose->bofelamimail->icServer, $folder, $messageUid);
$uicompose->compose();
return;
} else {
if(!$this->bocompose->send($formData)) {
print "<script type=\"text/javascript\">alert('".lang("Error: Could not send Message.")." ".lang("Trying to recover from session data")."');</script>";
$this->compose();
return;
}