From 3e9fc7934f609d40948c343fd31fea035a573e32 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 7 Jun 2022 15:08:58 +0200
Subject: [PATCH] [mod] source code url: GIT_URL + '/tree/' + GIT_BRANCH

The link 'Source code' in the footer should link to the branch URL:

    GIT_URL + '/tree/' + GIT_BRANCH

This URL fits at least for github and gitlab.

BTW clear the naming and replace:

- `searx_git_url` and `searx_git_branch` by `GIT_URL` and `GIT_BRANCH`
- 'searx_version' by 'searxng_version'

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/templates/simple/base.html      | 6 +++---
 searx/templates/simple/new_issue.html | 8 ++++----
 searx/utils.py                        | 4 ++--
 searx/webapp.py                       | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html
index d8eaaa02b..b7aced8ca 100644
--- a/searx/templates/simple/base.html
+++ b/searx/templates/simple/base.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8" />
   <meta name="description" content="SearXNG — a privacy-respecting, hackable metasearch engine">
   <meta name="keywords" content="SearXNG, search, search engine, metasearch, meta search">
-  <meta name="generator" content="searxng/{{ searx_version }}">
+  <meta name="generator" content="searxng/{{ searxng_version }}">
   <meta name="referrer" content="no-referrer">
   <meta name="robots" content="noarchive">
   <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -51,8 +51,8 @@
   </main>
   <footer>
     <p>
-    {{ _('Powered by') }} <a href="{{ url_for('info', pagename='about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}<br/>
-        <a href="{{ searx_git_url }}">{{ _('Source code') }}</a> |
+    {{ _('Powered by') }} <a href="{{ url_for('info', pagename='about') }}">searxng</a> - {{ searxng_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}<br/>
+        <a href="{{ GIT_URL + '/tree/' + GIT_BRANCH }}">{{ _('Source code') }}</a> |
         <a href="{{ get_setting('brand.issue_url') }}">{{ _('Issue tracker') }}</a> |
         <a href="{{ url_for('stats') }}">{{ _('Engine stats') }}</a> |
         <a href="{{ get_setting('brand.public_instances') }}">{{ _('Public instances') }}</a>{% if get_setting('general.contact_url') %} |
diff --git a/searx/templates/simple/new_issue.html b/searx/templates/simple/new_issue.html
index 55dbefe60..a8e6532fa 100644
--- a/searx/templates/simple/new_issue.html
+++ b/searx/templates/simple/new_issue.html
@@ -6,10 +6,10 @@
     <textarea name="body" class="issue-hide">{{- '' -}}
 
 **Version of SearXNG, commit number if you are using on master branch and stipulate if you forked SearXNG**
-{% if searx_git_url and searx_git_url != 'unknow' %}
-Repository: {{ searx_git_url }}
-Branch: {{ searx_git_branch }}
-Version: {{ searx_version }}
+{% if GIT_URL and GIT_URL != 'unknow' %}
+Repository: {{ GIT_URL }}
+Branch: {{ GIT_BRANCH }}
+Version: {{ searxng_version }}
 <!-- Check if these values are correct -->
 
 {% else %}
diff --git a/searx/utils.py b/searx/utils.py
index 15f4d7092..fb0c7b4e7 100644
--- a/searx/utils.py
+++ b/searx/utils.py
@@ -61,8 +61,8 @@ _NOTSET = _NotSetClass()
 
 def searx_useragent() -> str:
     """Return the searx User Agent"""
-    return 'searx/{searx_version} {suffix}'.format(
-        searx_version=VERSION_TAG, suffix=settings['outgoing']['useragent_suffix']
+    return 'searx/{searxng_version} {suffix}'.format(
+        searxng_version=VERSION_TAG, suffix=settings['outgoing']['useragent_suffix']
     ).strip()
 
 
diff --git a/searx/webapp.py b/searx/webapp.py
index 425233a3b..a0d130668 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -448,8 +448,9 @@ def render(template_name: str, **kwargs):
     # values from settings
     kwargs['search_formats'] = [x for x in settings['search']['formats'] if x != 'html']
     kwargs['instance_name'] = get_setting('general.instance_name')
-    kwargs['searx_version'] = VERSION_STRING
-    kwargs['searx_git_url'] = GIT_URL
+    kwargs['searxng_version'] = VERSION_STRING
+    kwargs['GIT_URL'] = GIT_URL
+    kwargs['GIT_BRANCH'] = GIT_BRANCH  # url: GIT_URL + '/tree/' + GIT_BRANCH
     kwargs['get_setting'] = get_setting
     kwargs['get_pretty_url'] = get_pretty_url
 
@@ -1241,7 +1242,6 @@ def stats():
         engine_stats = engine_stats,
         engine_reliabilities = engine_reliabilities,
         selected_engine_name = selected_engine_name,
-        searx_git_branch = GIT_BRANCH,
         # fmt: on
     )