diff --git a/app/funct.py b/app/funct.py index afe570da..e2de54da 100644 --- a/app/funct.py +++ b/app/funct.py @@ -522,7 +522,7 @@ def check_new_version(): context = ssl._create_unverified_context() if proxy: - proxyDict = { "https" : proxy } + proxyDict = { "https" : proxy, "http" : proxy } response = urllib.request.urlopen('https://haproxy-wi.org/update.py?last_ver=1', context=context, proxies=proxyDict) else: response = urllib.request.urlopen('https://haproxy-wi.org/update.py?last_ver=1', context=context) diff --git a/app/templates/update.html b/app/templates/update.html index 700681e6..ce00dbd6 100644 --- a/app/templates/update.html +++ b/app/templates/update.html @@ -16,7 +16,7 @@ {% if current_ver_without_dots < new_ver_without_dots and current_ver_without_dots != new_ver_without_dots and new_ver != "Sorry cannot get current version" %} - Update + Update {% endif %} diff --git a/app/update.py b/app/update.py index fd63e39c..4c31722a 100644 --- a/app/update.py +++ b/app/update.py @@ -24,6 +24,7 @@ try: current_ver_without_dots = ''.join(current_ver_without_dots) except: current_ver = "Sorry cannot get current version" + current_ver_without_dots = "Sorry cannot get current version" try: new_ver = funct.check_new_version() @@ -31,6 +32,7 @@ try: new_ver_without_dots = ''.join(new_ver_without_dots) except: new_ver = "Sorry cannot get new version" + new_ver_without_dots = "Sorry cannot get new version" output_from_parsed_template = template.render(h2 = 1, title = "Check updates", role = sql.get_user_role_by_uuid(user_id.value),