Refactored header inclusion to use library function.

wsgi/about.py

@@ -7,18 +7,14 @@ import goconfig
 
 def application(environ, start_response):
 
-  f = open(goconfig.doc_root + "/site_data/top.part", "r")
-  top = f.read()
-  f.close()
+  user_logged_in = library.user_logged_in( environ )
+  top = library.get_top( user_logged_in )
+  bottom = library.get_bottom( user_logged_in )
 
   f = open(goconfig.doc_root + "/site_data/about.part", "r")
   about = f.read()
   f.close()
 
-  f = open(goconfig.doc_root + "/site_data/bottom.part", "r")
-  bottom = f.read()
-  f.close()
-
   response = top + about + bottom
 
   status = '200 OK'

wsgi/index.py

@@ -137,12 +137,9 @@ def application(environ, start_response):
         (short_url, display_short))
 
 
-  f = open(goconfig.doc_root + "/site_data/top.part", "r")
-  top = f.read()
-  f.close()
-  f = open(goconfig.doc_root + "/site_data/bottom.part", "r")
-  bottom = f.read()
-  f.close()
+  user_logged_in = library.user_logged_in( environ )
+  top = library.get_top( user_logged_in )
+  bottom = library.get_bottom( user_logged_in )
 
   body = ''.join( body )
   response = top + body + bottom

wsgi/login.py

@@ -91,12 +91,9 @@ def application(environ, start_response):
       body = ["<p>Error: Invalid username or password.</p>"]
 
 
-  f = open(goconfig.doc_root + "/site_data/top.part", "r")
-  top = f.read()
-  f.close()
-  f = open(goconfig.doc_root + "/site_data/bottom.part", "r")
-  bottom = f.read()
-  f.close()
+  user_logged_in = library.user_logged_in( environ )
+  top = library.get_top( user_logged_in )
+  bottom = library.get_bottom( user_logged_in )
 
   body = ''.join( body )
   response = top + body + bottom

wsgi/redir.py

@@ -19,19 +19,13 @@ def application(environ, start_response):
   target = library.get_redirect_target( short_url )
 
   if target is None:
-    f = open(goconfig.doc_root + "/site_data/top.part", "r")
-    top = f.read()
-    f.close()
-    f = open(goconfig.doc_root + "/site_data/bottom.part", "r")
-    bottom = f.read()
-    f.close()
-
-    response = []
-    response.append( top )
-    response.append( "<p>Nothing here.</p>" )
-    response.append( bottom )
-
-    response = ''.join( response )
+
+    user_logged_in = library.user_logged_in( environ )
+    top = library.get_top( user_logged_in )
+    bottom = library.get_bottom( user_logged_in )
+    body = "<p>Nothing here.</p>"
+
+    response = top + body + bottom
 
     status = '200 OK'
     response_headers = [('Content-type', 'text/html'),

wsgi/signup.py

@@ -68,12 +68,9 @@ def application(environ, start_response):
       body.append("<p>Please complete all forms before submitting.<br/><br/></p>")
 
 
-  f = open(goconfig.doc_root + "/site_data/top.part", "r")
-  top = f.read()
-  f.close()
-  f = open(goconfig.doc_root + "/site_data/bottom.part", "r")
-  bottom = f.read()
-  f.close()
+  user_logged_in = library.user_logged_in( environ )
+  top = library.get_top( user_logged_in )
+  bottom = library.get_bottom( user_logged_in )
 
   body = ''.join( body )
   response = top + body + bottom