From 6b16756d921d5037e05d0e7d48946ee93ee11846 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Fri, 29 Oct 2021 09:22:46 +0000
Subject: [PATCH] Fix acessing antispam via sidebar.

---
 core/admin/mailu/ui/templates/sidebar.html | 2 +-
 core/admin/mailu/ui/views/base.py          | 3 +--
 core/nginx/conf/nginx.conf                 | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/admin/mailu/ui/templates/sidebar.html b/core/admin/mailu/ui/templates/sidebar.html
index 818d6076..6145bef3 100644
--- a/core/admin/mailu/ui/templates/sidebar.html
+++ b/core/admin/mailu/ui/templates/sidebar.html
@@ -75,7 +75,7 @@
         </a>
       </li>
       <li class="nav-item" role="none">
-        <a href="{{ config["WEB_ADMIN"] }}/antispam" data-clicked="{{ url_for('.antispam') }}" target="_blank" class="nav-link" role="menuitem">
+        <a href="{{ config["WEB_ADMIN"] }}/antispam/" data-clicked="{{ url_for('.antispam') }}" target="_blank" class="nav-link" role="menuitem">
         <i class="nav-icon fas fa-trash-alt"></i>
         <p>{% trans %}Antispam{% endtrans %}</p>
         </a>
diff --git a/core/admin/mailu/ui/views/base.py b/core/admin/mailu/ui/views/base.py
index d05d1fb3..01e168a1 100644
--- a/core/admin/mailu/ui/views/base.py
+++ b/core/admin/mailu/ui/views/base.py
@@ -33,7 +33,6 @@ def webmail():
 def client():
     return flask.render_template('client.html')
 
-@ui.route('/antispam', methods=['GET'])
+@ui.route('/webui_antispam', methods=['GET'])
 def antispam():
     return flask.render_template('antispam.html')
-
diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index fefa305e..3879798b 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -186,7 +186,7 @@ http {
          expires $expires;
        }
 
-      location ~ {{ WEB_ADMIN }}/antispam/ {
+      location   {{ WEB_ADMIN }}/antispam {
         rewrite ^{{ WEB_ADMIN }}/antispam/(.*) /$1 break;
         auth_request /internal/auth/admin;
         proxy_set_header X-Real-IP "";