From 6b38c2b6cf48ff0ef06d4fefe2d568780598c3db Mon Sep 17 00:00:00 2001
From: notangelmario <savin@angelmario.eu>
Date: Tue, 27 Apr 2021 10:57:11 +0300
Subject: [PATCH] Made some changes

---
 app.json        | 2 +-
 app/__init__.py | 1 +
 app/routes.py   | 7 ++++---
 whoogle.env     | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app.json b/app.json
index e359d3c..c138432 100644
--- a/app.json
+++ b/app.json
@@ -75,7 +75,7 @@
         "value": "",
         "required": false
     },
-    "WHOOGLE_CONFIG_DISABLE_CHANGE": {
+    "WHOOGLE_CONFIG_DISABLE": {
         "description": "[CONFIG] Disable ability for client to change config (set to 1 or leave blank)",
         "value": "",
         "required": false
diff --git a/app/__init__.py b/app/__init__.py
index 164b8e9..a6dbd38 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -39,6 +39,7 @@ app.config['CONFIG_PATH'] = os.getenv(
 app.config['DEFAULT_CONFIG'] = os.path.join(
     app.config['CONFIG_PATH'],
     'config.json')
+app.config['CONFIG_DISABLE'] = os.getenv('WHOOGLE_CONFIG_DISABLE', '')
 app.config['SESSION_FILE_DIR'] = os.path.join(
     app.config['CONFIG_PATH'],
     'session')
diff --git a/app/routes.py b/app/routes.py
index 0248843..46a8497 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -129,7 +129,7 @@ def index():
                            logo=render_template(
                                'logo.html',
                                dark=g.user_config.dark),
-                           config_disabled=os.getenv('WHOOGLE_CONFIG_DISABLE_CHANGE', ''),
+                           config_disabled=app.config['CONFIG_DISABLE'],
                            config=g.user_config,
                            tor_available=int(os.environ.get('TOR_AVAILABLE')),
                            version_number=app.config['VERSION_NUMBER'])
@@ -238,9 +238,10 @@ def search():
 @app.route('/config', methods=['GET', 'POST', 'PUT'])
 @auth_required
 def config():
+    config_disabled = app.config['CONFIG_DISABLE']
     if request.method == 'GET':
         return json.dumps(g.user_config.__dict__)
-    elif request.method == 'PUT' and os.getenv('WHOOGLE_CONFIG_DISABLE_CHANGE', '') == '':
+    elif request.method == 'PUT' and not config_disabled: 
         if 'name' in request.args:
             config_pkl = os.path.join(
                 app.config['CONFIG_PATH'],
@@ -251,7 +252,7 @@ def config():
             return json.dumps(session['config'])
         else:
             return json.dumps({})
-    elif os.getenv('WHOOGLE_CONFIG_DISABLE_CHANGE', '') == '':
+    elif not config_disabled:
         config_data = request.form.to_dict()
         if 'url' not in config_data or not config_data['url']:
             config_data['url'] = g.user_config.url
diff --git a/whoogle.env b/whoogle.env
index ead595c..8c5dba9 100644
--- a/whoogle.env
+++ b/whoogle.env
@@ -15,7 +15,7 @@
 
 #WHOOGLE_CONFIG_COUNTRY=countryUK  # See app/static/settings/countries.json for values
 #WHOOGLE_CONFIG_LANGUAGE=lang_en   # See app/static/settings/languages.json for values
-#WHOOGLE_CONFIG_DISABLE_CHANGE=1   # Disables changing of config from client
+#WHOOGLE_CONFIG_DISABLE=1   # Disables changing of config from client
 #WHOOGLE_CONFIG_DARK=1  # Dark mode
 #WHOOGLE_CONFIG_SAFE=1  # Safe searches
 #WHOOGLE_CONFIG_ALTS=1  # Use social media site alternatives