Browse Source

[mod] check time_range parameter in searx/webadapter.py

Alexandre Flament 4 years ago
parent
commit
eecfff2689
2 changed files with 3 additions and 2 deletions
  1. 1 1
      searx/search.py
  2. 2 1
      searx/webadapter.py

+ 1 - 1
searx/search.py

@@ -69,7 +69,7 @@ class SearchQuery:
         self.lang = lang
         self.safesearch = safesearch
         self.pageno = pageno
-        self.time_range = None if time_range in ('', 'None', None) else time_range
+        self.time_range = time_range
         self.timeout_limit = timeout_limit
         self.preferences = preferences
         self.external_bang = external_bang

+ 2 - 1
searx/webadapter.py

@@ -64,7 +64,8 @@ def get_search_query_from_webapp(preferences, form):
     query_time_range = form.get('time_range')
 
     # check time_range
-    if query_time_range not in ('None', None, '', 'day', 'week', 'month', 'year'):
+    query_time_range = None if query_time_range in ('', 'None') else query_time_range
+    if query_time_range not in (None, 'day', 'week', 'month', 'year'):
         raise SearxParameterException('time_range', query_time_range)
 
     # query_engines