diff --git a/createaccount.py b/createaccount.py index dff17c7..23e0215 100644 --- a/createaccount.py +++ b/createaccount.py @@ -75,4 +75,4 @@ def main(req,form): else: display_create_form(req,form) - req.write(helper.footer()) \ No newline at end of file + req.write(helper.footer(req,form)) \ No newline at end of file diff --git a/gamecreation.py b/gamecreation.py index 7a0da63..b52b77b 100644 --- a/gamecreation.py +++ b/gamecreation.py @@ -2,12 +2,16 @@ from mod_python import * import psql,helper,login -def display_game_creation_form(req,sessionid,username): +def display_game_creation_form(req,form): """ prints a html form with multiple drop-down lists for choosing players, goban size and so on. gets a mod_python request, prints to req.write. """ + + username = form["username"] + sessionid = form["sessionid"] + data = helper.header() p1data = create_user_dropdown_list("player1",username) p2data = create_user_dropdown_list("player2") @@ -29,7 +33,7 @@ def display_game_creation_form(req,sessionid,username): - data+=helper.footer() + data+=helper.footer(req,form) req.write(data) def process_creation_form(req,form): @@ -112,6 +116,6 @@ def main(req,form): if "gobansize" in form.keys(): #user already clicked on create process_creation_form(req,form) else: - display_game_creation_form(req,sessionid,username) + display_game_creation_form(req,form,) \ No newline at end of file diff --git a/goban.py b/goban.py index cf2973e..438344d 100755 --- a/goban.py +++ b/goban.py @@ -163,11 +163,11 @@ def update_goban_dict_and_table(gobandict,gobanlite): ############################################################################### -def main(gamename): - # Print the required header that tells the browser how to render the text. +def main(req,form): + """# Print the required header that tells the browser how to render the text. #(currently done by error logger) #print "Content-Type: text/plain\n\n" - + gamename = form["game"] #do stuff data = helper.header() @@ -184,7 +184,7 @@ def main(gamename): data +="\n
"+retstring+"
\n" - data += helper.footer() + data += helper.footer(req,form) print data - + """ \ No newline at end of file diff --git a/helper.py b/helper.py index 9ec6b5f..4207a4a 100644 --- a/helper.py +++ b/helper.py @@ -31,10 +31,24 @@ def debug(req,form, optstr = ""): else: req.write("Debug: "+optstr+"