From 6a1c77b9167345a8905e1614846e11984d0e00e8 Mon Sep 17 00:00:00 2001
From: JHCD <github@jhc.de>
Date: Fri, 3 Jul 2015 23:43:22 +0200
Subject: [PATCH] solve issue #41: support more than one recipient

---
 plugins/eMail/eMail.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/eMail/eMail.py b/plugins/eMail/eMail.py
index 5c13369..586696a 100644
--- a/plugins/eMail/eMail.py
+++ b/plugins/eMail/eMail.py
@@ -18,7 +18,7 @@ from email.utils import formatdate # need for confirm to RFC2822 standard
 from email.utils import make_msgid # need for confirm to RFC2822 standard
 
 from includes import globals  # Global variables
-from includes import helper #Global helper functions
+from includes.helper import timeHandler # helper function
 
 ##
 #
@@ -63,7 +63,7 @@ def doSendmail(server, subject, mailtext):
 		msg['Date'] = formatdate()
 		msg['Message-Id'] = make_msgid()
 		msg['Priority'] = globals.config.get("eMail", "priority")
-		server.sendmail(globals.config.get("eMail", "from"), globals.config.get("eMail", "to"), msg.as_string())
+		server.sendmail(globals.config.get("eMail", "from"), globals.config.get("eMail", "to").split(), msg.as_string())
 	except:
 		logging.error("send eMail failed")
 		logging.debug("send eMail failed", exc_info=True)
@@ -141,14 +141,14 @@ def run(typ,freq,data):
 						subject = subject.replace("%DIR%", data["direction"]).replace("%DIRT%", data["directionText"]) #replace Wildcards
 						subject = subject.replace("%TSI%", data["tsi"]) #replace Wildcards
 						subject = subject.replace("%DESCR%", data["description"]) # replace Wildcards
-						subject = subject.replace("%TIME%", helper.curtime("H:M:S")).replace("%DATE%", helper.curtime("Y-m-d")) # replace Wildcards
+						subject = subject.replace("%TIME%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
 						# read mailtext-structure from config.ini
 						mailtext = globals.config.get("eMail", "fms_message")
 						mailtext = mailtext.replace("%FMS%", data["fms"]).replace("%STATUS%", data["status"]) #replace Wildcards
 						mailtext = mailtext.replace("%DIR%", data["direction"]).replace("%DIRT%", data["directionText"]) #replace Wildcards
 						mailtext = mailtext.replace("%TSI%", data["tsi"]) #replace Wildcards
 						mailtext = mailtext.replace("%DESCR%", data["description"]) # replace Wildcards
-						mailtext = mailtext.replace("%TIME%", helper.curtime("H:M:S")).replace("%DATE%", helper.curtime("Y-m-d")) # replace Wildcards
+						mailtext = mailtext.replace("%TIME%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
 						# send eMail
 						doSendmail(server, subject, mailtext)
 					except:
@@ -163,12 +163,12 @@ def run(typ,freq,data):
 						subject = globals.config.get("eMail", "zvei_subject")
 						subject = subject.replace("%ZVEI%", data["zvei"]) #replace Wildcards
 						subject = subject.replace("%DESCR%", data["description"]) # replace Wildcards
-						subject = subject.replace("%TIME%", helper.curtime("H:M:S")).replace("%DATE%", helper.curtime("Y-m-d")) # replace Wildcards
+						subject = subject.replace("%TIME%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
 						# read mailtext-structure from config.ini
 						mailtext = globals.config.get("eMail", "zvei_message")
 						mailtext = mailtext.replace("%ZVEI%", data["zvei"]) #replace Wildcards
 						mailtext = mailtext.replace("%DESCR%", data["description"]) # replace Wildcards
-						mailtext = mailtext.replace("%TIME%", helper.curtime("H:M:S")).replace("%DATE%", helper.curtime("Y-m-d")) # replace Wildcards
+						mailtext = mailtext.replace("%TIME%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
 						# send eMail
 						doSendmail(server, subject, mailtext)
 					except:
@@ -185,14 +185,14 @@ def run(typ,freq,data):
 						subject = subject.replace("%FUNC%", data["function"]).replace("%FUNCCHAR%", data["functionChar"]) #replace Wildcards
 						subject = subject.replace("%MSG%", data["msg"]).replace("%BITRATE%", str(data["bitrate"])) #replace Wildcards
 						subject = subject.replace("%DESCR%", data["description"]) # replace Wildcards
-						subject = subject.replace("%TIME%", helper.curtime("H:M:S")).replace("%DATE%", helper.curtime("Y-m-d")) # replace Wildcards
+						subject = subject.replace("%TIME%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
 						# read mailtext-structure from config.ini
 						mailtext = globals.config.get("eMail", "poc_message")
 						mailtext = mailtext.replace("%RIC%", data["ric"]) #replace Wildcards
 						mailtext = mailtext.replace("%FUNC%", data["function"]).replace("%FUNCCHAR%", data["functionChar"]) #replace Wildcards
 						mailtext = mailtext.replace("%MSG%", data["msg"]).replace("%BITRATE%", str(data["bitrate"])) #replace Wildcards
 						mailtext = mailtext.replace("%DESCR%", data["description"]) # replace Wildcards
-						mailtext = mailtext.replace("%TIME%", helper.curtime("H:M:S")).replace("%DATE%", helper.curtime("Y-m-d")) # replace Wildcards
+						mailtext = mailtext.replace("%TIME%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
 						# send eMail
 						doSendmail(server, subject, mailtext)
 					except: