From 0b832f19bf6590f099c572686d847db7cf7487e9 Mon Sep 17 00:00:00 2001
From: Grant Lanham <contact@grantlanham.com>
Date: Tue, 10 Sep 2024 21:44:30 -0400
Subject: [PATCH] [fix] Removes ``/>`` ending tags for void HTML elements
Removes ``/>`` ending tags for void elements [1] and replaces them with ``>``.
Part of the larger cleanup to cleanup invalid HTML throughout the codebase [2].
[1] https://html.spec.whatwg.org/multipage/syntax.html#void-elements
[2] https://github.com/searxng/searxng/issues/3793
---
docs/admin/api.rst | 10 +++++-----
searx/botdetection/link_token.py | 2 +-
searx/engines/btdigg.py | 1 -
searx/templates/simple/base.html | 14 +++++++-------
searx/templates/simple/categories.html | 2 +-
searx/templates/simple/elements/infobox.html | 2 +-
searx/templates/simple/preferences.html | 6 +++---
searx/templates/simple/preferences/cookies.html | 4 ++--
searx/templates/simple/preferences/footer.html | 4 ++--
searx/templates/simple/result_templates/map.html | 4 ++--
searx/templates/simple/results.html | 2 +-
11 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/docs/admin/api.rst b/docs/admin/api.rst
index 8f4552f9c..8bd563ba7 100644
--- a/docs/admin/api.rst
+++ b/docs/admin/api.rst
@@ -84,9 +84,9 @@ HTML of the site. URL of the SearXNG instance and values are customizable.
.. code:: html
<form method="post" action="https://example.org/">
- <!-- search --> <input type="text" name="q" />
- <!-- categories --> <input type="hidden" name="categories" value="general,social media" />
- <!-- language --> <input type="hidden" name="lang" value="all" />
- <!-- locale --> <input type="hidden" name="locale" value="en" />
- <!-- date filter --> <input type="hidden" name="time_range" value="month" />
+ <!-- search --> <input type="text" name="q">
+ <!-- categories --> <input type="hidden" name="categories" value="general,social media">
+ <!-- language --> <input type="hidden" name="lang" value="all">
+ <!-- locale --> <input type="hidden" name="locale" value="en">
+ <!-- date filter --> <input type="hidden" name="time_range" value="month">
</form>
diff --git a/searx/botdetection/link_token.py b/searx/botdetection/link_token.py
index 7a484d6d5..8f8e9839c 100644
--- a/searx/botdetection/link_token.py
+++ b/searx/botdetection/link_token.py
@@ -28,7 +28,7 @@ And in the HTML template from flask a stylesheet link is needed (the value of
<link rel="stylesheet"
href="{{ url_for('client_token', token=link_token) }}"
- type="text/css" />
+ type="text/css" >
.. _X-Forwarded-For:
https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For
diff --git a/searx/engines/btdigg.py b/searx/engines/btdigg.py
index 193785182..5743f4142 100644
--- a/searx/engines/btdigg.py
+++ b/searx/engines/btdigg.py
@@ -54,7 +54,6 @@ def response(resp):
excerpt = result.xpath('.//div[@class="torrent_excerpt"]')[0]
content = html.tostring(excerpt, encoding='unicode', method='text', with_tail=False)
- # it is better to emit <br/> instead of |, but html tags are verboten
content = content.strip().replace('\n', ' | ')
content = ' '.join(content.split())
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html
index ff9b610f6..4aeab383a 100644
--- a/searx/templates/simple/base.html
+++ b/searx/templates/simple/base.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html class="no-js theme-{{ preferences.get_value('simple_style') or 'auto' }} center-aligment-{{ preferences.get_value('center_alignment') and 'yes' or 'no' }}" lang="{{ locale_rfc5646 }}" {% if rtl %} dir="rtl"{% endif %}>
<head>
- <meta charset="UTF-8" />
+ <meta charset="UTF-8">
<meta name="description" content="SearXNG — a privacy-respecting, open metasearch engine">
<meta name="keywords" content="SearXNG, search, search engine, metasearch, meta search">
<meta name="generator" content="searxng/{{ searx_version }}">
@@ -13,23 +13,23 @@
<title>{% block title %}{% endblock %}{{ instance_name }}</title>
{% block meta %}{% endblock %}
{% if rtl %}
- <link rel="stylesheet" href="{{ url_for('static', filename='css/searxng-rtl.min.css') }}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{{ url_for('static', filename='css/searxng-rtl.min.css') }}" type="text/css" media="screen">
{% else %}
- <link rel="stylesheet" href="{{ url_for('static', filename='css/searxng.min.css') }}" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{{ url_for('static', filename='css/searxng.min.css') }}" type="text/css" media="screen">
{% endif %}
{% if get_setting('server.limiter') or get_setting('server.public_instance') %}
- <link rel="stylesheet" href="{{ url_for('client_token', token=link_token) }}" type="text/css" />
+ <link rel="stylesheet" href="{{ url_for('client_token', token=link_token) }}" type="text/css">
{% endif %}
{% block styles %}{% endblock %}
<!--[if gte IE 9]>-->
<script src="{{ url_for('static', filename='js/searxng.head.min.js') }}" client_settings="{{ client_settings }}"></script>
<!--<![endif]-->
{% block head %}
- <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
+ <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}">
{% endblock %}
<link rel="icon" href="{{ url_for('static', filename='img/favicon.png') }}" sizes="any">
<link rel="icon" href="{{ url_for('static', filename='img/favicon.svg') }}" type="image/svg+xml">
- <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/favicon.png') }}"/>
+ <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/favicon.png') }}">
</head>
<body class="{{ endpoint }}_endpoint" >
<main id="main_{{ self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}" class="{{body_class}}">
@@ -65,7 +65,7 @@
</main>
<footer>
<p>
- {{ _('Powered by') }} <a href="{{ url_for('info', pagename='about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, open metasearch engine') }}<br/>
+ {{ _('Powered by') }} <a href="{{ url_for('info', pagename='about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, open metasearch engine') }}<br>
<a href="{{ searx_git_url }}">{{ _('Source code') }}</a>
| <a href="{{ get_setting('brand.issue_url') }}">{{ _('Issue tracker') }}</a>
{% if enable_metrics %}| <a href="{{ url_for('stats') }}">{{ _('Engine stats') }}</a>{% endif %}
diff --git a/searx/templates/simple/categories.html b/searx/templates/simple/categories.html
index 698c857e9..2bef2f8f6 100644
--- a/searx/templates/simple/categories.html
+++ b/searx/templates/simple/categories.html
@@ -16,7 +16,7 @@
{%- if not search_on_category_select or not display_tooltip -%}
{%- for category in categories -%}
<div class="category category_checkbox">{{- '' -}}
- <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}/>
+ <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}>
<label for="checkbox_{{ category|replace(' ', '_') }}" class="tooltips">
{{- icon_big(category_icons[category]) if category in category_icons else icon_big('globe-outline') -}}
<div class="category_name">{{- _(category) -}}</div>
diff --git a/searx/templates/simple/elements/infobox.html b/searx/templates/simple/elements/infobox.html
index 68fd32559..4d75ad802 100644
--- a/searx/templates/simple/elements/infobox.html
+++ b/searx/templates/simple/elements/infobox.html
@@ -38,7 +38,7 @@
<input type="hidden" name="safesearch" value="{{ safesearch }}">
<input type="hidden" name="theme" value="{{ theme }}">
{%- if timeout_limit -%}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{%- endif -%}
- <input type="submit" value="{{ suggestion }}" />
+ <input type="submit" value="{{ suggestion }}">
</form>
{%- endfor -%}
</div>
diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html
index 9dab84fd1..5b72d5f9e 100644
--- a/searx/templates/simple/preferences.html
+++ b/searx/templates/simple/preferences.html
@@ -6,7 +6,7 @@
{%- endmacro -%}
{%- macro tab_header(name, id, label, checked) -%}
-<input type="radio" name="{{ name }}" id="tab-{{ id }}" {% if checked is sameas true %}checked="checked"{% endif %} />
+<input type="radio" name="{{ name }}" id="tab-{{ id }}" {% if checked is sameas true %}checked="checked"{% endif %}>
<label id="tab-label-{{ id }}" for="tab-{{ id }}" role="tab" aria-controls="tab-content-{{ id }}">{{ label }}</label>
<section id="tab-content-{{ id }}" role="tabpanel" aria-labelledby="tab-label-{{ id }}" aria-hidden="false">
{%- endmacro -%}
@@ -23,7 +23,7 @@
{%- if checked == '?' -%}
{{- icon_small('warning') -}}
{%- else -%}
- <input type="checkbox" {%- if name %} name="{{ name }}" {%- endif %} value="None" {%- if checked %} checked {%- endif -%}{%- if disabled %} disabled {%- endif -%}/>
+ <input type="checkbox" {%- if name %} name="{{ name }}" {%- endif %} value="None" {%- if checked %} checked {%- endif -%}{%- if disabled %} disabled {%- endif -%}>
{%- endif -%}
{%- endmacro -%}
@@ -33,7 +33,7 @@
id="{{ name }}" {{- ' ' -}}
aria-labelledby="pref_{{ name }}"{{- ' ' -}}
class="checkbox-onoff reversed-checkbox"{{- ' ' -}}
- {%- if checked -%} checked{%- endif -%}/>
+ {%- if checked -%} checked{%- endif -%}>
{%- endmacro -%}
{%- macro plugin_preferences(section) -%}
diff --git a/searx/templates/simple/preferences/cookies.html b/searx/templates/simple/preferences/cookies.html
index b13dc6845..674d68234 100644
--- a/searx/templates/simple/preferences/cookies.html
+++ b/searx/templates/simple/preferences/cookies.html
@@ -1,7 +1,7 @@
<p class="text-muted">
{{- _('This is the list of cookies and their values SearXNG is storing on your computer.') }}
- <br />{{- _('With that list, you can assess SearXNG transparency.') -}}
- <br />{{- '' -}}
+ <br>{{- _('With that list, you can assess SearXNG transparency.') -}}
+ <br>{{- '' -}}
</p>
{% if cookies %}
<table class="cookies">
diff --git a/searx/templates/simple/preferences/footer.html b/searx/templates/simple/preferences/footer.html
index 57a0ddaf8..ec14eb74b 100644
--- a/searx/templates/simple/preferences/footer.html
+++ b/searx/templates/simple/preferences/footer.html
@@ -1,9 +1,9 @@
<p class="small_font">
{{- _('These settings are stored in your cookies, this allows us not to store this data about you.') -}}
- <br />{{- _("These cookies serve your sole convenience, we don't use these cookies to track you.") -}}
+ <br>{{- _("These cookies serve your sole convenience, we don't use these cookies to track you.") -}}
</p>{{- '' -}}
-<input type="submit" value="{{ _('Save') }}" />{{- '' -}}
+<input type="submit" value="{{ _('Save') }}">{{- '' -}}
<div class="{% if rtl %}left{% else %}right{% endif %} preferences_back">{{- '' -}}
<a href="{{ url_for('clear_cookies') }}">{{ _('Reset defaults') }}</a>{{- '' -}}
diff --git a/searx/templates/simple/result_templates/map.html b/searx/templates/simple/result_templates/map.html
index 3bdc378d6..d123137cb 100644
--- a/searx/templates/simple/result_templates/map.html
+++ b/searx/templates/simple/result_templates/map.html
@@ -18,12 +18,12 @@
<span itemprop="streetAddress">
{%- if result.address.house_number -%}{{- result.address.house_number -}}, {% endif %}
{{- result.address.road -}}
- </span><br/>
+ </span><br>
{%- endif %}
{%- if result.address.locality -%}
<span itemprop="addressLocality">{{- result.address.locality -}}</span>
{%- if result.address.postcode -%}, <span itemprop="postalCode">{{- result.address.postcode -}}</span>{% endif %}
- <br/>
+ <br>
{%- endif -%}
{%- if result.address.country -%}
<span itemprop="addressCountry">{{- result.address.country -}}</span>
diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html
index 05a21674f..fbc41a17a 100644
--- a/searx/templates/simple/results.html
+++ b/searx/templates/simple/results.html
@@ -3,7 +3,7 @@
{% macro engine_data_form(engine_data) -%}
{% for engine_name, kv_data in engine_data.items() %}
{% for k, v in kv_data.items() %}
- <input type="hidden" name="engine_data-{{ engine_name }}-{{ k|e }}" value="{{ v|e }}" />
+ <input type="hidden" name="engine_data-{{ engine_name }}-{{ k|e }}" value="{{ v|e }}">
{% endfor %}
{% endfor %}
{%- endmacro %}