aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-18 22:44:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always record IP usage on non-GET and clean up HTML

Browse Source
This commit is contained in:
Kevin Chung
2020-04-30 21:10:43 -04:00
parent e5814592c4
commit c47955ff4f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CTFd/themes/admin/templates/users/user.html
View File

@@ -152,7 +152,7 @@
</div> </div>
<div class="container"> <div class="container">
<div class="row" style="min-height: 300px;"> <div class="row">
{% if solves %} {% if solves %}
<div id="keys-pie-graph" class="col-md-6"> <div id="keys-pie-graph" class="col-md-6">
<div class="text-center"> <div class="text-center">
@@ -189,7 +189,7 @@
aria-controls="nav-missing" aria-selected="false">Missing</a> aria-controls="nav-missing" aria-selected="false">Missing</a>
</nav> </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="tab-pane fade show active" id="nav-solves" role="tabpanel" aria-labelledby="nav-solves-tab">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">

2
CTFd/utils/initialization/__init__.py
View File

@@ -185,7 +185,7 @@ def init_request_processors(app):
ip = get_ip() ip = get_ip()
track = None track = None
if ip not in user_ips: if (ip not in user_ips) or (request.method != "GET"):
track = Tracking.query.filter_by( track = Tracking.query.filter_by(
ip=get_ip(), user_id=session["id"] ip=get_ip(), user_id=session["id"]
).first() ).first()