| [c5c522c] | 1 | diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp |
|---|
| 2 | --- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000 |
|---|
| 3 | +++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000 |
|---|
| 4 | @@ -935,6 +935,7 @@ |
|---|
| 5 | { "fax_domain", "", CONFIGSETTING_RELOADABLE }, |
|---|
| 6 | { "fax_international", "+", CONFIGSETTING_RELOADABLE }, |
|---|
| 7 | { "always_send_delegates", "no", CONFIGSETTING_RELOADABLE }, |
|---|
| 8 | + { "always_send_as", "no", CONFIGSETTING_RELOADABLE }, |
|---|
| 9 | { "always_send_tnef", "no", CONFIGSETTING_RELOADABLE }, |
|---|
| 10 | { "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE }, |
|---|
| 11 | { "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE }, |
|---|
| 12 | diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp |
|---|
| 13 | --- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000 |
|---|
| 14 | +++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000 |
|---|
| 15 | @@ -1949,6 +1949,10 @@ |
|---|
| 16 | HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b) |
|---|
| 17 | { |
|---|
| 18 | bAllowSendAs = true; |
|---|
| 19 | + } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) { |
|---|
| 20 | + //use alawys_send_as to allow everybody to send as someone else. |
|---|
| 21 | + //(some users hate the 'on behalf of' text, and dont want to do the extra configuration) |
|---|
| 22 | + bAllowSendAs = true; |
|---|
| 23 | } else { |
|---|
| 24 | |
|---|
| 25 | hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner); |
|---|
