From 270d7449fd23de4a4dde2cca9f7cabdfb4156cbf Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 14 Feb 2019 20:09:16 -0800 Subject: [PATCH 1/2] iiab-banner6.png moved --- roles/captive-portal/templates/capture-wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/captive-portal/templates/capture-wsgi.py b/roles/captive-portal/templates/capture-wsgi.py index 37352603f..a15b596c0 100755 --- a/roles/captive-portal/templates/capture-wsgi.py +++ b/roles/captive-portal/templates/capture-wsgi.py @@ -340,7 +340,7 @@ def banner(environ, start_response): status = '200 OK' headers = [('Content-type', 'image/png')] start_response(status, headers) - image = open("%s/iiab-menu/menu-files/images/iiab_banner6.png"%doc_root, "rb").read() + image = open("%s/js-menu/menu-files/images/iiab_banner6.png"%doc_root, "rb").read() return [image] def bootstrap(environ, start_response): From e7fb41877a9fb5ac77105f9789e3bb7c0031de00 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 14 Feb 2019 21:10:46 -0800 Subject: [PATCH 2/2] test for uninitialized system_version was flawed --- roles/captive-portal/templates/capture-wsgi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/captive-portal/templates/capture-wsgi.py b/roles/captive-portal/templates/capture-wsgi.py index a15b596c0..ad16f2e98 100755 --- a/roles/captive-portal/templates/capture-wsgi.py +++ b/roles/captive-portal/templates/capture-wsgi.py @@ -228,8 +228,8 @@ def android(environ, start_response): else: ip = environ['REMOTE_ADDR'].strip() system,system_version = platform_info(ip) - if not system_version: - put_302(environ, start_response) + if system_version is None: + return put_302(environ, start_response) if system_version[0:1] < '6': logger.debug("system < 6:%s"%system_version) location = '/android_splash'