43cd8e0 · searx · git.iko.soy

[enh] default settings option to safe_search - #396

commit43cd8e0c4129571a263429173c7a9fe7092e1dec authorAdam Tauber <asciimoo@gmail.com> dateSun 2 Aug 2015, 20:29 (11 years ago) parentc1d9cfd

2 files changed+5−4

unifiedsplit

searx/search.py+3−2

@@ -23,6 +23,7 @@ from operator import itemgetter

2323from Queue import Queue

2424from time import time

2525from urlparse import urlparse, unquote

26+from searx import settings

2627from searx.engines import (

2728 categories, engines

2829)

@@ -480,9 +481,9 @@ class Search(object):

480481

481482 try:

482483 # 0 = None, 1 = Moderate, 2 = Strict

483− request_params['safesearch'] = int(request.cookies.get('safesearch', 1))

484+ request_params['safesearch'] = int(request.cookies.get('safesearch'))

484485 except ValueError:

485− request_params['safesearch'] = 1

486+ request_params['safesearch'] = settings['search']['safe_search']

486487

487488 # update request parameters dependent on

488489 # search-engine (contained in engines folder)

searx/webapp.py+2−2

@@ -312,7 +312,7 @@ def render(template_name, override_theme=None, **kwargs):

312312

313313 kwargs['method'] = request.cookies.get('method', 'POST')

314314

315− kwargs['safesearch'] = request.cookies.get('safesearch', '1')

315+ kwargs['safesearch'] = request.cookies.get('safesearch', str(settings['search']['safe_search']))

316316

317317 # override url_for function in templates

318318 kwargs['url_for'] = url_for_theme

@@ -542,7 +542,7 @@ def preferences():

542542 locale = None

543543 autocomplete = ''

544544 method = 'POST'

545− safesearch = '1'

545+ safesearch = settings['search']['safe_search']

546546 for pd_name, pd in request.form.items():

547547 if pd_name.startswith('category_'):

548548 category = pd_name[9:]