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

+ 2
- 2
searx/webapp.py View File

312
 
312
 
313
     kwargs['method'] = request.cookies.get('method', 'POST')
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
     # override url_for function in templates
317
     # override url_for function in templates
318
     kwargs['url_for'] = url_for_theme
318
     kwargs['url_for'] = url_for_theme
542
         locale = None
542
         locale = None
543
         autocomplete = ''
543
         autocomplete = ''
544
         method = 'POST'
544
         method = 'POST'
545
-        safesearch = '1'
545
+        safesearch = settings['search']['safe_search']
546
         for pd_name, pd in request.form.items():
546
         for pd_name, pd in request.form.items():
547
             if pd_name.startswith('category_'):
547
             if pd_name.startswith('category_'):
548
                 category = pd_name[9:]
548
                 category = pd_name[9:]