Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop

This commit is contained in:
JHCD 2015-07-03 23:59:17 +02:00
commit 32a5e0a20a

View file

@ -15,7 +15,7 @@ import httplib #for the HTTP request
from urlparse import urlparse #for split the URL into url and path
from includes import globals # Global variables
from includes import helper #Global helper functions
from includes.helper import timeHandler
##
#
@ -94,8 +94,8 @@ def run(typ,freq,data):
#same in all types
url = url.replace("%DESCR%", data["description"]) # replace Wildcards
url = url.replace("%TIME%", helper.curtime("%H:%M:%S")) # replace Wildcards
url = url.replace("%DATE%", helper.curtime("%d.%m.%Y")) # replace Wildcards
url = url.replace("%TIME%", timeHandler.getTime()) # replace Wildcards
url = url.replace("%DATE%", timeHandler.getDate()) # replace Wildcards
#
# HTTP-Request