Browse Source

[mod] option to enable or disable "proxy" button next to each result (#54)

* [mod] option to enable or disable "proxy" button next to each result

Closes: https://github.com/searxng/searxng/issues/51
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Co-authored-by: Alexandre Flament <alex@al-f.net>
Markus Heiser 4 years ago
parent
commit
5253df946b
4 changed files with 7 additions and 5 deletions
  1. 1 0
      searx/settings.yml
  2. 4 4
      searx/templates/oscar/macros.html
  3. 1 1
      searx/templates/simple/macros.html
  4. 1 0
      searx/webapp.py

+ 1 - 0
searx/settings.yml

@@ -65,6 +65,7 @@ ui:
 #result_proxy:
 #    url : http://127.0.0.1:3000/
 #    key : !!binary "your_morty_proxy_key"
+#    proxify_results : True  # [True|False] enable the "proxy" button next to each result
 
 outgoing: # communication with search engines
     request_timeout : 3.0 # default timeout in seconds, can be override by engine

+ 4 - 4
searx/templates/oscar/macros.html

@@ -39,7 +39,7 @@
             <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }}</small>
             {%- endif -%}
         {%- endif -%}
-        {%- if proxify -%}
+        {%- if proxify and proxify_results -%}
         <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }}</small>
         {%- endif -%}
     </div>
@@ -55,7 +55,7 @@
     {%- for engine in result.engines -%}
         <span class="label label-default">{{ engine }}</span>
     {%- endfor -%}
-    {%- if proxify -%}
+    {%- if proxify and proxify_results -%}
     <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
     {%- endif -%}
 </div>{{- "" -}}
@@ -75,7 +75,7 @@
         <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }}</small>
         {%- endif -%}
     {%- endif -%}
-    {%- if proxify -%}
+    {%- if proxify and proxify_results -%}
     <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }}</small>
     {%- endif -%}
     {%- if result.pretty_url -%}
@@ -89,7 +89,7 @@
     {%- for engine in result.engines -%}
         <span class="label label-default">{{ engine }}</span>
     {%- endfor -%}
-    {%- if proxify -%}
+    {%- if proxify and proxify_results -%}
     <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
     {%- endif -%}
     <div class="external-link">{{ result.pretty_url }}</div>

+ 1 - 1
searx/templates/simple/macros.html

@@ -41,7 +41,7 @@
 <!-- Draw result sub footer -->
 {%- macro result_sub_footer(result, proxify) -%}
 <div class="engines">{% for engine in result.engines %}<span>{{ engine }}</span>{% endfor %}</div>{{- '' -}}
-<p class="url"><span class="url">{{ result.pretty_url }}</span>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "cache_link") }}&lrm; {% if proxify %} {{ result_link(proxify(result.url), icon('link') + _('proxied'), "proxyfied_link") }} {% endif %}</p>{{- '' -}}
+<p class="url"><span class="url">{{ result.pretty_url }}</span>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "cache_link") }}&lrm; {% if proxify and proxify_results %} {{ result_link(proxify(result.url), icon('link') + _('proxied'), "proxyfied_link") }} {% endif %}</p>{{- '' -}}
 <div class="break"></div>{{- '' -}}
 {%- endmacro -%}
 

+ 1 - 0
searx/webapp.py

@@ -444,6 +444,7 @@ def render(template_name, override_theme=None, **kwargs):
     kwargs['image_proxify'] = image_proxify
 
     kwargs['proxify'] = proxify if settings.get('result_proxy', {}).get('url') else None
+    kwargs['proxify_results'] = settings.get('result_proxy', {}).get('proxify_results', True)
 
     kwargs['opensearch_url'] = url_for('opensearch') + '?' \
         + urlencode({'method': kwargs['method'], 'autocomplete': kwargs['autocomplete']})