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

Forgot to add file

Browse Source
This commit is contained in:
CodeKevin
2016-04-22 10:06:26 -04:00
parent 5590b11636
commit b46b0c560d
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CTFd/admin.py
View File

@@ -101,6 +101,7 @@ def admin_config():
return redirect(url_for('admin.admin_config')) return redirect(url_for('admin.admin_config'))
ctf_name = get_config('ctf_name') ctf_name = get_config('ctf_name')
max_tries = get_config('max_tries')
mail_server = get_config('mail_server') mail_server = get_config('mail_server')
mail_port = get_config('mail_port') mail_port = get_config('mail_port')
@@ -109,7 +110,6 @@ def admin_config():
mg_api_key = get_config('mg_api_key') mg_api_key = get_config('mg_api_key')
mg_base_url = get_config('mg_base_url') mg_base_url = get_config('mg_base_url')
max_tries = get_config('max_tries')
if not max_tries: if not max_tries:
set_config('max_tries', 0) set_config('max_tries', 0)
max_tries = 0 max_tries = 0
@@ -226,7 +226,7 @@ def delete_page(pageroute):
@admins_only @admins_only
def admin_chals(): def admin_chals():
if request.method == 'POST': if request.method == 'POST':
chals = Challenges.query.add_columns('id', 'name', 'value', 'description', 'category').order_by(Challenges.value).all() chals = Challenges.query.add_columns('id', 'name', 'value', 'description', 'category', 'hidden').order_by(Challenges.value).all()
teams_with_points = db.session.query(Solves.teamid, Teams.name).join(Teams).filter( teams_with_points = db.session.query(Solves.teamid, Teams.name).join(Teams).filter(
Teams.banned == None).group_by( Teams.banned == None).group_by(
@@ -240,11 +240,12 @@ def admin_chals():
else: else:
percentage = 0.0 percentage = 0.0
json_data['game'].append({ json_data['game'].append({
'id': x[1], 'id': x.id,
'name': x[2], 'name': x.name,
'value': x[3], 'value': x.value,
'description': x[4], 'description': x.description,
'category': x[5], 'category': x.category,
'hidden': x.hidden,
'percentage_solved': percentage 'percentage_solved': percentage
}) })
@@ -638,6 +639,10 @@ def admin_create_chal():
# Create challenge # Create challenge
chal = Challenges(request.form['name'], request.form['desc'], request.form['value'], request.form['category'], flags) chal = Challenges(request.form['name'], request.form['desc'], request.form['value'], request.form['category'], flags)
if 'hidden' in request.form:
chal.hidden = True
else:
chal.hidden = False
db.session.add(chal) db.session.add(chal)
db.session.commit() db.session.commit()
@@ -689,6 +694,7 @@ def admin_update_chal():
challenge.description = request.form['desc'] challenge.description = request.form['desc']
challenge.value = request.form['value'] challenge.value = request.form['value']
challenge.category = request.form['category'] challenge.category = request.form['category']
challenge.hidden = 'hidden' in request.form
db.session.add(challenge) db.session.add(challenge)
db.session.commit() db.session.commit()
db.session.close() db.session.close()