Merge branch 'master' into gigablast

4 files changed, 25 insertions, 16 deletions

diff --git a/searx/brand.py b/searx/brand.py
index d563447f6..91d2ab321 100644
--- a/searx/brand.py
+++ b/searx/brand.py
@@ -1,4 +1,5 @@
 GIT_URL = 'https://github.com/asciimoo/searx'
+GIT_BRANCH = 'master'
 ISSUE_URL = 'https://github.com/asciimoo/searx/issues'
 SEARX_URL = 'https://searx.me'
 DOCS_URL = 'https://asciimoo.github.io/searx'
diff --git a/searx/static/plugins/js/search_on_category_select.js b/searx/static/plugins/js/search_on_category_select.js
index 1c42d9e9e..d590ed127 100644
--- a/searx/static/plugins/js/search_on_category_select.js
+++ b/searx/static/plugins/js/search_on_category_select.js
@@ -6,19 +6,37 @@ $(document).ready(function() {
             });
             $(document.getElementById($(this).attr("for"))).prop('checked', true);
             if($('#q').val()) {
+                if (getHttpRequest() == "GET") {
+                    $('#search_form').attr('action', $('#search_form').serialize());
+                }
                 $('#search_form').submit();
             }
             return false;
         });
         $('#time-range').change(function(e) {
             if($('#q').val()) {
+                if (getHttpRequest() == "GET") {
+                    $('#search_form').attr('action', $('#search_form').serialize());
+                }
                 $('#search_form').submit();
             }
         });
         $('#language').change(function(e) {
             if($('#q').val()) {
+                if (getHttpRequest() == "GET") {
+                    $('#search_form').attr('action', $('#search_form').serialize());
+                }
                 $('#search_form').submit();
             }
         });
     }
 });
+
+function getHttpRequest() {
+    httpRequest = "POST";
+    urlParams = new URLSearchParams(window.location.search);
+    if (urlParams.has('method')) {
+        httpRequest = urlParams.get('method');
+    }
+    return httpRequest;
+}
diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml
index 15d3eb792..27634245f 100644
--- a/searx/templates/__common__/opensearch.xml
+++ b/searx/templates/__common__/opensearch.xml
@@ -6,23 +6,13 @@
   <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image>
   <LongName>searx metasearch</LongName>
   {% if opensearch_method == 'get' %}
-    <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
-    {% if autocomplete %}
-    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
-        <Param name="format" value="x-suggestions" />
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    {% endif %}
+    <Url rel="results" type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
   {% else %}
-    <Url type="text/html" method="post" template="{{ host }}">
+    <Url rel="results" type="text/html" method="post" template="{{ host }}">
         <Param name="q" value="{searchTerms}" />
     </Url>
-    {% if autocomplete %}
-    <!-- TODO, POST REQUEST doesn't work -->
-    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
-        <Param name="format" value="x-suggestions" />
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    {% endif %}
+  {% endif %}
+  {% if autocomplete %}
+    <Url rel="suggestions" type="application/json" template="{{ host }}autocompleter"/>
   {% endif %}
 </OpenSearchDescription>
diff --git a/searx/webapp.py b/searx/webapp.py
index 68be25584..35495a0ff 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -949,7 +949,7 @@ def opensearch():
 
     resp = Response(response=ret,
                     status=200,
-                    mimetype="text/xml")
+                    mimetype="application/opensearchdescription+xml")
     return resp