From 43cd8e0c4129571a263429173c7a9fe7092e1dec Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Sun, 2 Aug 2015 20:29:19 +0200 Subject: [PATCH] [enh] default settings option to safe_search - #396 --- searx/search.py | 5 +++-- searx/webapp.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/searx/search.py b/searx/search.py index bb440352b..5054ce798 100644 --- a/searx/search.py +++ b/searx/search.py @@ -23,6 +23,7 @@ from operator import itemgetter from Queue import Queue from time import time from urlparse import urlparse, unquote +from searx import settings from searx.engines import ( categories, engines ) @@ -480,9 +481,9 @@ class Search(object): try: # 0 = None, 1 = Moderate, 2 = Strict - request_params['safesearch'] = int(request.cookies.get('safesearch', 1)) + request_params['safesearch'] = int(request.cookies.get('safesearch')) except ValueError: - request_params['safesearch'] = 1 + request_params['safesearch'] = settings['search']['safe_search'] # update request parameters dependent on # search-engine (contained in engines folder) diff --git a/searx/webapp.py b/searx/webapp.py index 4292b32d7..06f246620 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -312,7 +312,7 @@ def render(template_name, override_theme=None, **kwargs): kwargs['method'] = request.cookies.get('method', 'POST') - kwargs['safesearch'] = request.cookies.get('safesearch', '1') + kwargs['safesearch'] = request.cookies.get('safesearch', str(settings['search']['safe_search'])) # override url_for function in templates kwargs['url_for'] = url_for_theme @@ -542,7 +542,7 @@ def preferences(): locale = None autocomplete = '' method = 'POST' - safesearch = '1' + safesearch = settings['search']['safe_search'] for pd_name, pd in request.form.items(): if pd_name.startswith('category_'): category = pd_name[9:]