Commit 2c446704 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1033 Fixed log.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 4f278391
...@@ -452,7 +452,7 @@ class BackendKopano implements IBackend, ISearchProvider { ...@@ -452,7 +452,7 @@ class BackendKopano implements IBackend, ISearchProvider {
// the 'X-Push-Sender-Name' header is not used // the 'X-Push-Sender-Name' header is not used
if (preg_match("/^X-Push-Sender:\s(.*?)$/im", $sm->mime, $senderEmail)) { if (preg_match("/^X-Push-Sender:\s(.*?)$/im", $sm->mime, $senderEmail)) {
$sendAsEmail = trim($senderEmail[1]); $sendAsEmail = trim($senderEmail[1]);
ZLog::Write(LOGLEVEL_DEBUG, sprintf("SendMail(): Send-As '%s' requested by KOE", $sendAsEmail)); ZLog::Write(LOGLEVEL_DEBUG, sprintf("KopanoBackend->SendMail(): Send-As '%s' requested by KOE", $sendAsEmail));
$sm->mime = preg_replace("/^From: .*?$/im", "From: ". $sendAsEmail, $sm->mime, 1); $sm->mime = preg_replace("/^From: .*?$/im", "From: ". $sendAsEmail, $sm->mime, 1);
$sendingAsSomeone = true; $sendingAsSomeone = true;
} }
...@@ -465,7 +465,7 @@ class BackendKopano implements IBackend, ISearchProvider { ...@@ -465,7 +465,7 @@ class BackendKopano implements IBackend, ISearchProvider {
if (isset($folders[$sm->source->folderid]) && ($folders[$sm->source->folderid]->Flags & DeviceManager::FLD_FLAGS_REPLYASUSER)) { if (isset($folders[$sm->source->folderid]) && ($folders[$sm->source->folderid]->Flags & DeviceManager::FLD_FLAGS_REPLYASUSER)) {
$sendAs = $this->resolveRecipientGAL($sharedUser, 1); $sendAs = $this->resolveRecipientGAL($sharedUser, 1);
if (isset($sendAs[0])) { if (isset($sendAs[0])) {
ZLog::Write(LOGLEVEL_DEBUG, sprintf("SendMail(): Server side Send-As activated for shared folder. Sending as '%s'.", $sendAs[0]->emailaddress)); ZLog::Write(LOGLEVEL_DEBUG, sprintf("KopanoBackend->SendMail(): Server side Send-As activated for shared folder. Sending as '%s'.", $sendAs[0]->emailaddress));
$sm->mime = preg_replace("/^From: .*?$/im", "From: ". $sendAs[0]->emailaddress, $sm->mime, 1); $sm->mime = preg_replace("/^From: .*?$/im", "From: ". $sendAs[0]->emailaddress, $sm->mime, 1);
$sendingAsSomeone = true; $sendingAsSomeone = true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment