Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-23 00:30:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix timeHandler problem in eMail plugin

Browse source
This commit is contained in:
Bastian Schroll 2015-07-14 16:59:02 +02:00
parent 1558f05e37
commit ae0fd40e06
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/eMail/eMail.py
View file

@ -132,14 +132,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%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
subject = subject.replace("%TIME%", timeHandler.getTime()).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%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
mailtext = mailtext.replace("%TIME%", timeHandler.getTime()).replace("%DATE%", timeHandler.curtime("%Y-%m-%d")) # replace Wildcards
# send eMail
doSendmail(server, subject, mailtext)
except:
@ -154,12 +154,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%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
subject = subject.replace("%TIME%", timeHandler.getTime()).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%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
mailtext = mailtext.replace("%TIME%", timeHandler.getTime()).replace("%DATE%", timeHandler.curtime("%Y-%m-%d")) # replace Wildcards
# send eMail
doSendmail(server, subject, mailtext)
except:
@ -176,14 +176,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%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
subject = subject.replace("%TIME%", timeHandler.getTime()).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%", timeHandler.curtime("H:M:S")).replace("%DATE%", timeHandler.curtime("Y-m-d")) # replace Wildcards
mailtext = mailtext.replace("%TIME%", timeHandler.getTime()).replace("%DATE%", timeHandler.curtime("%Y-%m-%d")) # replace Wildcards
# send eMail
doSendmail(server, subject, mailtext)
except: