Merge branch 'master' into zykure/wip

[xonotic/xonstat.git] / xonstat / views / player.py

diff --git a/xonstat/views/player.py b/xonstat/views/player.py
index 19ec08165039cd55790f70f51dc757b8284ceb09..75e9ff8b5651759747dd69f74979e929d88160d9 100644 (file)
--- a/xonstat/views/player.py
+++ b/xonstat/views/player.py
@@ -795,7 +795,11 @@ def player_hashkey_info_data(request):
     # hashkey = unquote(hashkey)
 
     # if using request verification to obtain the hashkey
-    (hashkey, status) = verify_request(request)
+    (idfp, status) = verify_request(request)
+    log.debug("d0_blind_id verification: idfp={0} status={1}\n".format(idfp, status))
+
+    log.debug("\n----- BEGIN REQUEST BODY -----\n" + request.body +
+            "----- END REQUEST BODY -----\n\n")
 
     # if config is to *not* verify requests and we get nothing back, this
     # query will return nothing and we'll 404.
@@ -803,7 +807,7 @@ def player_hashkey_info_data(request):
         player = DBSession.query(Player).\
                 filter(Player.player_id == Hashkey.player_id).\
                 filter(Player.active_ind == True).\
-                filter(Hashkey.hashkey == hashkey).one()
+                filter(Hashkey.hashkey == idfp).one()
 
         games_played      = get_games_played(player.player_id)
         overall_stats     = get_overall_stats(player.player_id)
@@ -816,7 +820,7 @@ def player_hashkey_info_data(request):
         raise pyramid.httpexceptions.HTTPNotFound
 
     return {'player':player,
-            'hashkey':hashkey,
+            'hashkey':idfp,
             'games_played':games_played,
             'overall_stats':overall_stats,
             'fav_maps':fav_maps,
@@ -919,10 +923,18 @@ def player_elo_info_data(request):
     """
     Provides elo information on a specific player. Raw data is returned.
     """
+    (idfp, status) = verify_request(request)
+    log.debug("d0_blind_id verification: idfp={0} status={1}\n".format(idfp, status))
+
     hashkey = request.matchdict['hashkey']
+<<<<<<< HEAD
+    log.debug("\n----- BEGIN REQUEST BODY -----\n" + request.body +
+            "----- END REQUEST BODY -----\n\n")
+=======
 
     # the incoming hashkey is double quoted, and WSGI unquotes once...
     hashkey = unquote(hashkey)
+>>>>>>> master
 
     try:
         player = DBSession.query(Player).\