26 lines
1.4 KiB
Diff
26 lines
1.4 KiB
Diff
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
|
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
|
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
|
@@ -935,6 +935,7 @@
|
|
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
|
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
|
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
|
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
|
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
|
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
|
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
|
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
|
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
|
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
|
@@ -1949,6 +1949,10 @@
|
|
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
|
{
|
|
bAllowSendAs = true;
|
|
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
|
+ //use always_send_as to allow everybody to send as someone else.
|
|
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
|
+ bAllowSendAs = true;
|
|
} else {
|
|
|
|
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|