replace ctfname with organization

Author: eshaan7

src/FlaskRTBCTF/ctf/routes.py

@@ -5,7 +5,7 @@
 from FlaskRTBCTF import db, bcrypt
 from FlaskRTBCTF.models import User, Score
 from FlaskRTBCTF.ctf.forms import UserHashForm, RootHashForm
-from FlaskRTBCTF.config import ctfname, box, userHash, rootHash, userScore, rootScore
+from FlaskRTBCTF.config import organization, box, userHash, rootHash, userScore, rootScore
 from datetime import datetime
 
 ctf = Blueprint('ctf', __name__)
@@ -21,7 +21,8 @@ def scoreboard():
     for score in scores:
         userNameScoreList.append({'username': User.query.get(score.user_id).username,'score':score.points})
 
-    return render_template('scoreboard.html', scores=userNameScoreList, ctfname=ctfname)
+    return render_template('scoreboard.html', scores=userNameScoreList, organization=organization)
+
 
 ''' Machine Info '''
 
@@ -31,7 +32,7 @@ def machine():
     userHashForm = UserHashForm()
     rootHashForm = RootHashForm()
     return render_template('machine.html', userHashForm=userHashForm,
-                           rootHashForm=rootHashForm, ctfname=ctfname, box=box)
+                           rootHashForm=rootHashForm, organization=organization, box=box)
 
 ''' Hash Submission Management '''
 
@@ -54,10 +55,10 @@ def validateRootHash():
         else:
             flash("Sorry! Wrong system hash", "danger")
         return render_template('machine.html', userHashForm=userHashForm,
-                           rootHashForm=rootHashForm, ctfname=ctfname, box=box)
+                           rootHashForm=rootHashForm, organization=organization, box=box)
     else:
         return render_template('machine.html', userHashForm=userHashForm,
-                           rootHashForm=rootHashForm, ctfname=ctfname, box=box)
+                           rootHashForm=rootHashForm, organization=organization, box=box)
 
 
 @ctf.route("/validateUserHash", methods=['POST'])
@@ -79,9 +80,9 @@ def validateUserHash():
         else:
             flash("Sorry! Wrong user hash", "danger")
         return render_template('machine.html', userHashForm=userHashForm,
-                           rootHashForm=rootHashForm, ctfname=ctfname, box=box)
+                           rootHashForm=rootHashForm, organization=organization, box=box)
     else:
         return render_template('machine.html', userHashForm=userHashForm,
-                           rootHashForm=rootHashForm, ctfname=ctfname, box=box)
+                           rootHashForm=rootHashForm, organization=organization, box=box)
 
 

src/FlaskRTBCTF/main/routes.py

@@ -1,5 +1,5 @@
 from flask import render_template, Blueprint
-from FlaskRTBCTF.config import ctfname, RunningTime
+from FlaskRTBCTF.config import organization, RunningTime
 from FlaskRTBCTF.models import Notification
 
 main = Blueprint('main', __name__)
@@ -9,9 +9,9 @@
 @main.route("/")
 @main.route("/home")
 def home():
-    return render_template('home.html', ctfname=ctfname, RunningTime=RunningTime)
+    return render_template('home.html', organization=organization, RunningTime=RunningTime)
 
 @main.route("/notifications")
 def notifications():
     notifs = Notification.query.order_by(Notification.timestamp.desc()).all()
-    return render_template('notifications.html', ctfname=ctfname, title="Notifications", notifs=notifs)
+    return render_template('notifications.html', organization=organization, title="Notifications", notifs=notifs)