Browse Source

[enh] default settings option to safe_search - #396

Adam Tauber 9 years ago
parent
commit
43cd8e0c41
2 changed files with 5 additions and 4 deletions
  1. 3
    2
      searx/search.py
  2. 2
    2
      searx/webapp.py

+ 3
- 2
searx/search.py View File

@@ -23,6 +23,7 @@ from operator import itemgetter
23 23
 from Queue import Queue
24 24
 from time import time
25 25
 from urlparse import urlparse, unquote
26
+from searx import settings
26 27
 from searx.engines import (
27 28
     categories, engines
28 29
 )
@@ -480,9 +481,9 @@ class Search(object):
480 481
 
481 482
             try:
482 483
                 # 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'))
484 485
             except ValueError:
485
-                request_params['safesearch'] = 1
486
+                request_params['safesearch'] = settings['search']['safe_search']
486 487
 
487 488
             # update request parameters dependent on
488 489
             # search-engine (contained in engines folder)

+ 2
- 2
searx/webapp.py View File

@@ -312,7 +312,7 @@ def render(template_name, override_theme=None, **kwargs):
312 312
 
313 313
     kwargs['method'] = request.cookies.get('method', 'POST')
314 314
 
315
-    kwargs['safesearch'] = request.cookies.get('safesearch', '1')
315
+    kwargs['safesearch'] = request.cookies.get('safesearch', str(settings['search']['safe_search']))
316 316
 
317 317
     # override url_for function in templates
318 318
     kwargs['url_for'] = url_for_theme
@@ -542,7 +542,7 @@ def preferences():
542 542
         locale = None
543 543
         autocomplete = ''
544 544
         method = 'POST'
545
-        safesearch = '1'
545
+        safesearch = settings['search']['safe_search']
546 546
         for pd_name, pd in request.form.items():
547 547
             if pd_name.startswith('category_'):
548 548
                 category = pd_name[9:]