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

* eMail: not filtering own(ed) emailaddresses out of drafts while reopening them for continued processing

Browse Source
This commit is contained in:
Klaus Leithoff 2011-01-17 09:18:31 +00:00
parent c0b1198b78
commit b44e70ba85
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,8 @@
$bofelamimail->openConnection(); $bofelamimail->openConnection();
$bofelamimail->reopen($_folder); $bofelamimail->reopen($_folder);
$userEMailAddresses = $this->preferences->getUserEMailAddresses(); // the array $userEMailAddresses was used for filtering out emailaddresses that are owned by the user, for draft data we should not do this
//$userEMailAddresses = $this->preferences->getUserEMailAddresses();
// get message headers for specified message // get message headers for specified message
#$headers = $bofelamimail->getMessageHeader($_folder, $_uid); #$headers = $bofelamimail->getMessageHeader($_folder, $_uid);
@ -227,9 +228,9 @@
continue; continue;
} }
if($userEMailAddresses[$val['EMAIL']]) { //if($userEMailAddresses[$val['EMAIL']]) {
continue; // continue;
} //}
if(!$foundAddresses[$val['EMAIL']]) { if(!$foundAddresses[$val['EMAIL']]) {
$address = $val['PERSONAL_NAME'] != 'NIL' ? $val['RFC822_EMAIL'] : $val['EMAIL']; $address = $val['PERSONAL_NAME'] != 'NIL' ? $val['RFC822_EMAIL'] : $val['EMAIL'];
@ -244,9 +245,9 @@
continue; continue;
} }
if($userEMailAddresses[$val['EMAIL']]) { //if($userEMailAddresses[$val['EMAIL']]) {
continue; // continue;
} //}
if(!$foundAddresses[$val['EMAIL']]) { if(!$foundAddresses[$val['EMAIL']]) {
$address = $val['PERSONAL_NAME'] != 'NIL' ? $val['RFC822_EMAIL'] : $val['EMAIL']; $address = $val['PERSONAL_NAME'] != 'NIL' ? $val['RFC822_EMAIL'] : $val['EMAIL'];
@ -261,9 +262,9 @@
continue; continue;
} }
if($userEMailAddresses[$val['EMAIL']]) { //if($userEMailAddresses[$val['EMAIL']]) {
continue; // continue;
} //}
if(!$foundAddresses[$val['EMAIL']]) { if(!$foundAddresses[$val['EMAIL']]) {
$address = $val['PERSONAL_NAME'] != 'NIL' ? $val['RFC822_EMAIL'] : $val['EMAIL']; $address = $val['PERSONAL_NAME'] != 'NIL' ? $val['RFC822_EMAIL'] : $val['EMAIL'];
@ -278,9 +279,9 @@
continue; continue;
} }
if($userEMailAddresses[$val['EMAIL']]) { //if($userEMailAddresses[$val['EMAIL']]) {
continue; // continue;
} //}
if(!$foundAddresses[$val['EMAIL']]) { if(!$foundAddresses[$val['EMAIL']]) {
$address = $val['PERSONAL_NAME'] != 'NIL' ? $val['RFC822_EMAIL'] : $val['EMAIL']; $address = $val['PERSONAL_NAME'] != 'NIL' ? $val['RFC822_EMAIL'] : $val['EMAIL'];