From 56ecaedd5967fa1b9ac31203d1f68757b56cc2a4 Mon Sep 17 00:00:00 2001 From: Xevion Date: Thu, 3 Oct 2019 22:18:47 -0500 Subject: [PATCH] continued hidden refactor --- app/__init__.py | 2 +- app/hidden.py | 16 ++++++++++++++++ app/routes.py | 6 ------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 1cb1171..2f55c31 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,5 +16,5 @@ db = SQLAlchemy(app) migrate = Migrate(app, db) from app import models -from app import routes, simple_routes, hidden, dashboard, custom +from app import routes, simple_routes, hidden, dashboard, ftbhot, custom app.jinja_env.globals.update(get_hidden=routes.get_hidden) \ No newline at end of file diff --git a/app/hidden.py b/app/hidden.py index 3d964fa..769f412 100644 --- a/app/hidden.py +++ b/app/hidden.py @@ -1,6 +1,22 @@ from app import app, db, login from app.custom import require_role from flask_login import current_user, login_user, logout_user, login_required +from flask import request + +# The only implementation I could get to work +def validate_id(id): + id = str(id).strip() + val = str(app.config['HIDDEN_NUMBER']).strip() + return id == val + +# Parses strings to test for "boolean-ness" +def boolparse(string, default=False): + trues = ['true', '1'] + if string is None: + return default + elif string.lower() in trues: + return True + return False @app.route('/hidden/') @login_required diff --git a/app/routes.py b/app/routes.py index ecbc9cf..3eae538 100644 --- a/app/routes.py +++ b/app/routes.py @@ -171,12 +171,6 @@ def logout(): logout_user() return redirect(url_for('index')) -# The only implementation I could get to work -def validate_id(id): - id = str(id).strip() - val = str(app.config['HIDDEN_NUMBER']).strip() - return id == val - def get_hidden(): return "/hidden{}/".format(app.config['HIDDEN_NUMBER'])