Merge branch 'develop' into backport/ZEN-35326.7x

Author: Deer-WarLord

src/Products/ZenEvents/MailProcessor.py

@@ -21,6 +21,7 @@
 import rfc822
 import calendar
 from datetime import tzinfo, timedelta, datetime
+from email import header
 
 
 from Products.ZenEvents.Event import Event
@@ -120,7 +121,8 @@ def process(self, messageStr):
             fromIp = None
             log.info('Hostname lookup failed for host: %s', fromHost)
 
-        subject = message.get('Subject').replace("\r","").replace("\n", "")
+        raw_subject = message.get('Subject').replace("\r","").replace("\n", "")
+        subject = header.decode_header(raw_subject)[0][0]
 
         secs = self.getReceiveTime(message)
 
@@ -132,7 +134,12 @@ def process(self, messageStr):
         payload = 'This is the default message'
         if message.is_multipart():
             for msg in message.get_payload():
-                if msg.get_content_maintype() == 'text' or msg.get_content_type() == 'message/rfc822':
+                if msg.is_multipart():
+                    for m in msg.get_payload():
+                        if m.get_content_maintype() == 'text' or m.get_content_type() == 'message/rfc822':
+                            payload = m.get_payload(decode=True)
+                            break
+                elif msg.get_content_maintype() == 'text' or msg.get_content_type() == 'message/rfc822':
                     payload = msg.get_payload(decode=True)
                     break
         else:

src/Products/ZenModel/actions.py

@@ -398,17 +398,21 @@ def _encodeBody(self, body):
             plain_body = MIMEText(body.decode('ascii', 'ignore'))
         return plain_body
 
-    def _targetsByTz(self, notification, signal, targets):
+    def _targetsByTz(self, notification, targets):
         """
         Take timezone from user property to convert a event time in
         notification and also group targets emails by those timezones.
         """
         tz_targets = {}
         targetsCopy = set(targets)
-        for recipient in self._get_recipients_from_signal(notification, signal):
-            if recipient.email in targets:
-                tz_targets.setdefault(recipient.timezone, set()).add(recipient.email)
-                targetsCopy.discard(recipient.email)
+        for recipient in notification.recipients:
+            if recipient['type'] in ['group', 'user']:
+                guid = recipient['value']
+                target_obj = self.guidManager.getObject(guid)
+                if target_obj:
+                    if target_obj.email in targets and target_obj.timezone:
+                        tz_targets.setdefault(target_obj.timezone, set()).add(target_obj.email)
+                        targetsCopy.discard(target_obj.email)
         if targetsCopy: #some emails are not from users in the system
             tz = time.tzname[time.daylight] # get current timezone factoring in daylight saving
             tz_targets.setdefault(tz, set()).update(targetsCopy)
@@ -425,7 +429,7 @@ def _adjustToTimezone(self, millis, timezone):
     def executeBatch(self, notification, signal, targets):
         log.debug("Executing %s action for targets: %s", self.name, targets)
         self.setupAction(notification.dmd)
-        tz_targets = self._targetsByTz(notification, signal, targets)
+        tz_targets = self._targetsByTz(notification, targets)
         original_lst = signal.event.last_seen_time
         original_fst = signal.event.first_seen_time
         original_sct = signal.event.status_change_time