extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-06 19:21:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for TRACKER BUG#2018 FROM account lost when saving draft reported by C.Brunet

Browse Source
This commit is contained in:
Klaus Leithoff 2009-05-22 12:58:44 +00:00
parent 4bdd3e2772
commit 4d1d92766a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
felamimail/inc/class.bocompose.inc.php
View File

@ -828,6 +828,7 @@
$this->sessionData['folder'] = $_formData['folder']; $this->sessionData['folder'] = $_formData['folder'];
$this->sessionData['bcc'] = $_formData['bcc']; $this->sessionData['bcc'] = $_formData['bcc'];
$this->sessionData['signatureID'] = $_formData['signatureID']; $this->sessionData['signatureID'] = $_formData['signatureID'];
$this->sessionData['identity'] = $_formData['identity'];
foreach((array)$this->sessionData['bcc'] as $address) { foreach((array)$this->sessionData['bcc'] as $address) {
$address_array = imap_rfc822_parse_adrlist($address,''); $address_array = imap_rfc822_parse_adrlist($address,'');
foreach((array)$address_array as $addressObject) { foreach((array)$address_array as $addressObject) {

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

@ -146,7 +146,6 @@
// read the data from session // read the data from session
// all values are empty for a new compose window // all values are empty for a new compose window
$sessionData = $this->bocompose->getSessionData(); $sessionData = $this->bocompose->getSessionData();
if (is_array($_REQUEST['preset'])) if (is_array($_REQUEST['preset']))
{ {
#_debug_array($_REQUEST); #_debug_array($_REQUEST);
@ -203,6 +202,9 @@
{ {
$presetSig = (strtolower($_REQUEST['signature']) == 'no' ? -2 : -1); $presetSig = (strtolower($_REQUEST['signature']) == 'no' ? -2 : -1);
} }
if ($sessionData['isDraft'] && !empty($sessionData['signatureID'])) $presetSig = (int)$sessionData['signatureID'];
$presetId = NULL;
if ($sessionData['isDraft'] && !empty($sessionData['identity'])) $presetId = (int)$sessionData['identity'];
$this->display_app_header(); $this->display_app_header();
$this->t->set_file(array("composeForm" => "composeForm.tpl")); $this->t->set_file(array("composeForm" => "composeForm.tpl"));
@ -270,7 +272,7 @@
$sessionData['signatureID'] = $singleIdentity->signature; $sessionData['signatureID'] = $singleIdentity->signature;
} }
} }
$selectFrom = html::select('identity', $defaultIdentity, $identities, true, "style='width:100%;' onchange='changeIdentity(this);'"); $selectFrom = html::select('identity', ($presetId ? $presetId : $defaultIdentity), $identities, true, "style='width:100%;' onchange='changeIdentity(this);'");
$this->t->set_var('select_from', $selectFrom); $this->t->set_var('select_from', $selectFrom);
// navbar(, kind of) // navbar(, kind of)