From aa16c52cbf1ce24624f6fd676b5e296c49a988da Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Mon, 5 Nov 2018 14:20:12 +0100
Subject: [PATCH] fix: [NotificationHelper] add config

---
 bin/NotificationHelper.py      | 22 ++++++----------------
 bin/packages/config.cfg.sample |  1 +
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/bin/NotificationHelper.py b/bin/NotificationHelper.py
index d8f7fe92..1e3ab8a0 100755
--- a/bin/NotificationHelper.py
+++ b/bin/NotificationHelper.py
@@ -33,22 +33,12 @@ def sendEmailNotification(recipient, alert_name, content):
     cfg = configparser.ConfigParser()
     cfg.read(configfile)
 
-    sender = cfg.get("Notifications", "sender"),
-    sender_host = cfg.get("Notifications", "sender_host"),
-    sender_port = cfg.getint("Notifications", "sender_port"),
-    sender_pw = cfg.get("Notifications", "sender_pw"),
-
-    if isinstance(sender, tuple):
-        sender = sender[0]
-
-    if isinstance(sender_host, tuple):
-        sender_host = sender_host[0]
-
-    if isinstance(sender_port, tuple):
-        sender_port = sender_port[0]
-
-    if isinstance(sender_pw, tuple):
-        sender_pw = sender_pw[0]
+    sender = cfg.get("Notifications", "sender")
+    sender_host = cfg.get("Notifications", "sender_host")
+    sender_port = cfg.getint("Notifications", "sender_port")
+    sender_pw = cfg.get("Notifications", "sender_pw")
+    if sender_pw = 'None':
+        sender_pw = None
 
     # raise an exception if any of these is None
     if (sender is None or
diff --git a/bin/packages/config.cfg.sample b/bin/packages/config.cfg.sample
index fbe4f6f3..97cd692a 100644
--- a/bin/packages/config.cfg.sample
+++ b/bin/packages/config.cfg.sample
@@ -27,6 +27,7 @@ ail_domain = http://localhost:7000
 sender = sender@example.com
 sender_host = smtp.example.com
 sender_port = 1337
+sender_pw = None
 
 # optional for using with authenticated SMTP over SSL
 # sender_pw = securepassword