Changeset 10471 in hybrid for branches/releng-9.0/nanobsd/files/usr/local

Timestamp:

Apr 13, 2012, 4:32:48 AM (13 years ago)

Author:

rick

Message:

• Going for an template solution instead to avoid having all the issues with escapes.

• '/tmp/network.status' will contain the results of various (local) nagios checks.

File:

• branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi (modified) (5 diffs)

branches/releng-9.0/nanobsd/files/usr/local/www/wlportal/index.cgi

@@ -39 +39 @@
 import urlparse
 import yaml
+
+from jinja2 import Template
 
 # XXX: Make me dynamic for example put me in the conf file
@@ -55 +57 @@
   'expire_time'   : None,
   'accessdb'      : '/var/db/clients',
+  'net_status'    : '/tmp/network.status',
 }
 
@@ -62 +65 @@
 if os.path.isfile(cfg['config_file']):
   cfg.update(yaml.load(open(cfg['config_file'])))
+
+internet_up = True
+if os.path.isfile(cfg['net_status']):
+  internet_up = 'internet=up' in open(cfg['net_status'], 'r').read().lower()
+
+if not internet_up:
+  cfg['warning_msg'] = "<b>Internet Problemen</b>: De laatste 15 minuten zijn er problemen met de (internet) verbinding geconstateerd, de gebruikers ervaring kan dus niet optimaal zijn. Onze excuses voor het eventuele ongemak. Bij aanhoudende problemen kunt u contact opnemen met gebruikers@lijst.wirelessleiden.nl" 
 
 def log_registered_host(remote_mac, remote_host):
@@ -233 +243 @@
 # Helpers for HTML 'templates'
 content = cfg.copy()
-content.update(extra_header='',tech_footer='',status_msg='')
+content.update(extra_header='')
 
 # IP or MAC on the whitelist does not need to authenticate, used for devices
@@ -309 +319 @@
 """
 
-print page % content
+print Template(page).render(content)