|
@@ -13,17 +13,20 @@ preference_section = 'query'
|
|
query_keywords = ['user-agent']
|
|
query_keywords = ['user-agent']
|
|
query_examples = ''
|
|
query_examples = ''
|
|
|
|
|
|
|
|
+# "ip" or "my ip" regex
|
|
|
|
+ip_regex = re.compile('^ip$|my ip', re.IGNORECASE)
|
|
|
|
+
|
|
# Self User Agent regex
|
|
# Self User Agent regex
|
|
-p = re.compile('.*user[ -]agent.*', re.IGNORECASE)
|
|
|
|
|
|
+ua_regex = re.compile('.*user[ -]agent.*', re.IGNORECASE)
|
|
|
|
|
|
|
|
|
|
def post_search(request, search):
|
|
def post_search(request, search):
|
|
if search.search_query.pageno > 1:
|
|
if search.search_query.pageno > 1:
|
|
return True
|
|
return True
|
|
- if search.search_query.query == 'ip':
|
|
|
|
|
|
+ if ip_regex.search(search.search_query.query):
|
|
ip = get_real_ip(request)
|
|
ip = get_real_ip(request)
|
|
- search.result_container.answers['ip'] = {'answer': ip}
|
|
|
|
- elif p.match(search.search_query.query):
|
|
|
|
|
|
+ search.result_container.answers['ip'] = {'answer': gettext('Your IP is: ') + ip}
|
|
|
|
+ elif ua_regex.match(search.search_query.query):
|
|
ua = request.user_agent
|
|
ua = request.user_agent
|
|
- search.result_container.answers['user-agent'] = {'answer': ua}
|
|
|
|
|
|
+ search.result_container.answers['user-agent'] = {'answer': gettext('Your user-agent is: ') + ua}
|
|
return True
|
|
return True
|