File kolab-syncroton-2.2.4-fix-from-header-displayna... of Package kolab-syncroton

File kolab-syncroton-2.2.4-fix-from-header-displayname.patch of Package kolab-syncroton (Revision e25a7cf477c0e39445c05a9970764b7b)

Currently displaying revision e25a7cf477c0e39445c05a9970764b7b , Show latest

diff --git a/lib/kolab_sync_message.php b/lib/kolab_sync_message.php
index 79ac8d9..77892ee 100644
--- a/lib/kolab_sync_message.php
+++ b/lib/kolab_sync_message.php
@@ -169,6 +169,22 @@ class kolab_sync_message
         if (empty($headers['From'])) {
             $headers['From'] = $this->get_identity();
         }
+        // make sure there's sender name in From:
+        else if ($rcube->config->get('activesync_fix_from')
+            && preg_match('/^<?((\S+|("[^"]+"))@\S+)>?$/', trim($headers['From']), $m)
+        ) {
+            $identities = kolab_sync::get_instance()->user->list_identities();
+            $email      = $m[1];
+
+            foreach ((array) $identities as $ident) {
+                if ($ident['email'] == $email) {
+                    if ($ident['name']) {
+                        $headers['From'] = format_email_recipient($email, $ident['name']);
+                    }
+                    break;
+                }
+            }
+        }
 
         if (empty($headers['Message-ID'])) {
             $headers['Message-ID'] = $rcube->gen_message_id();