From c47955ff4f057d7fc93422797784c04ab956326d Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Thu, 30 Apr 2020 21:10:43 -0400
Subject: [PATCH] Always record IP usage on non-GET and clean up HTML

---
 CTFd/themes/admin/templates/users/user.html | 4 ++--
 CTFd/utils/initialization/__init__.py       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CTFd/themes/admin/templates/users/user.html b/CTFd/themes/admin/templates/users/user.html
index b3f5194..5e4af0b 100644
--- a/CTFd/themes/admin/templates/users/user.html
+++ b/CTFd/themes/admin/templates/users/user.html
@@ -152,7 +152,7 @@
 </div>
 
 <div class="container">
-	<div class="row" style="min-height: 300px;">
+	<div class="row">
 		{% if solves %}
 			<div id="keys-pie-graph" class="col-md-6">
 				<div class="text-center">
@@ -189,7 +189,7 @@
 		   aria-controls="nav-missing" aria-selected="false">Missing</a>
 	</nav>
 
-	<div class="tab-content" id="nav-tabContent" style="min-height: 300px;">
+	<div class="tab-content" id="nav-tabContent">
 		<div class="tab-pane fade show active" id="nav-solves" role="tabpanel" aria-labelledby="nav-solves-tab">
 			<div class="row">
 				<div class="col-md-12">
diff --git a/CTFd/utils/initialization/__init__.py b/CTFd/utils/initialization/__init__.py
index 8118c06..7304584 100644
--- a/CTFd/utils/initialization/__init__.py
+++ b/CTFd/utils/initialization/__init__.py
@@ -185,7 +185,7 @@ def init_request_processors(app):
             ip = get_ip()
 
             track = None
-            if ip not in user_ips:
+            if (ip not in user_ips) or (request.method != "GET"):
                 track = Tracking.query.filter_by(
                     ip=get_ip(), user_id=session["id"]
                 ).first()