Add separate views for the top servers on a map.

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

diff --git a/xonstat/views/admin.py b/xonstat/views/admin.py
index 520f779c03e47d53b960e9eae2b1fd4ce63351b5..48eebb83a462641ffc5ae06f92d393845aaf1049 100644 (file)
--- a/xonstat/views/admin.py
+++ b/xonstat/views/admin.py
@@ -1,9 +1,8 @@
-from pyramid.response import Response
-from pyramid.httpexceptions import HTTPForbidden, HTTPFound
-from pyramid.security import remember, forget
+from pyramid.httpexceptions import HTTPFound
+from pyramid.security import remember
 from pyramid.session import check_csrf_token
-from pyramid_persona.views import verify_login
-from xonstat.models import *
+from xonstat.models import DBSession, Player
+
 
 def forbidden(request):
     '''A simple forbidden view. Does nothing more than set the status and then
@@ -13,14 +12,15 @@ def forbidden(request):
 
 def login(request):
     # Verify the assertion and get the email of the user
-    persona_email = verify_login(request)
+    # Short-circuit this to prevent anyone from logging in right now.
+    persona_email = None
 
     # Check that the email exists in the players table
     player_email = DBSession.query(Player).\
             filter(Player.email_addr == persona_email).one()
 
-    log.debug("Verified email address: %s" % persona_email)
-    log.debug("Corresponding player is %s" % player_email)
+    #log.debug("Verified email address: %s" % persona_email)
+    #log.debug("Corresponding player is %s" % player_email)
 
     if player_email is not None:
         # Add the headers required to remember the user to the response
@@ -41,8 +41,6 @@ def merge(request):
     if request.params.has_key("csrf_token"):
         # check the token to prevent request forgery
         st = request.session.get_csrf_token()
-        log.debug("Session token is %s" % st)
-        log.debug("Request token is %s" % request.params.get('csrf_token'))
         check_csrf_token(request)
 
         if request.params.has_key("w_pid") and request.params.has_key("l_pid"):
@@ -56,7 +54,15 @@ def merge(request):
 
                 s.commit()
 
+                request.session.flash(
+                    "Successfully merged player %s into %s!" % (l_pid, w_pid),
+                    "success")
+
             except:
                 s.rollback()
 
+                request.session.flash(
+                    "Could not merge player %s into %s." % (l_pid, w_pid),
+                    "failure")
+
     return {}