From 758f8e876f005ee8092e6a2f3f66cd979702da37 Mon Sep 17 00:00:00 2001
From: Timur Ismagilov <bouncepaw2@ya.ru>
Date: Fri, 29 Apr 2022 12:52:31 +0300
Subject: [PATCH] Auth: Fix the links appearing on anonymous wikis

---
 viewutil/base.html   | 25 +------------------------
 viewutil/viewutil.go | 33 +++++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/viewutil/base.html b/viewutil/base.html
index 64f49fb..0e3e0b0 100644
--- a/viewutil/base.html
+++ b/viewutil/base.html
@@ -26,30 +26,7 @@
 				</form>
 			</li>
 			<li class="top-bar__section top-bar__section_auth">
-                {{block "auth" .}}
-					<ul class="top-bar__auth auth-links">
-						<li class="auth-links__box auth-links__user-box">
-                            {{if .Meta.U.Group | eq "anon" }}
-								<a href="/login" class="auth-links__link auth-links__login-link">
-									{{block "login" .}}Login{{end}}
-								</a>
-                            {{else}}
-								<a href="/hypha/{{block "user hypha" .}}{{end}}/{{.Meta.U.Name}}" class="auth-links__link auth-links__user-link">
-									{{beautifulName .Meta.U.Name}}
-								</a>
-                            {{end}}
-						</li>
-                        {{block "registration" .}}
-	                        {{if .Meta.U.Group | eq "anon"}}
-	                            <li class="auth-links__box auth-links__register-box">
-		                            <a href="/register" class="auth-links__link auth-links__register-link">
-			                            {{block "register" .}}Register{{end}}
-		                            </a>
-	                            </li>
-							{{end}}
-                        {{end}}
-					</ul>
-                {{end}}
+                {{block "auth" .}}{{end}}
 			</li>
 			<li class="top-bar__section top-bar__section_highlights">
 				<ul class="top-bar__highlights">
diff --git a/viewutil/viewutil.go b/viewutil/viewutil.go
index 08791ca..f0b2aac 100644
--- a/viewutil/viewutil.go
+++ b/viewutil/viewutil.go
@@ -38,11 +38,36 @@ func Init() {
 			"inc":           func(i int) int { return i + 1 },
 		}).ParseFS(fsys, "base.html")).
 		Parse(dataText))
-	if !cfg.UseAuth {
-		m(BaseEn.Parse(`{{define "auth"}}{{end}}`))
+	if cfg.UseAuth {
+		BaseEn = m(BaseEn.Parse(`
+{{define "auth"}}
+<ul class="top-bar__auth auth-links">
+	<li class="auth-links__box auth-links__user-box">
+		{{if .Meta.U.Group | eq "anon" }}
+			<a href="/login" class="auth-links__link auth-links__login-link">
+				{{block "login" .}}Login{{end}}
+			</a>
+		{{else}}
+			<a href="/hypha/{{block "user hypha" .}}{{end}}/{{.Meta.U.Name}}" class="auth-links__link auth-links__user-link">
+				{{beautifulName .Meta.U.Name}}
+			</a>
+		{{end}}
+	</li>
+	{{block "registration" .}}{{end}}
+</ul>
+{{end}}
+`))
 	}
-	if !cfg.AllowRegistration {
-		m(BaseEn.Parse(`{{define "registration"}}{{end}}`))
+	if cfg.AllowRegistration {
+		m(BaseEn.Parse(`{{define "registration"}}
+{{if .Meta.U.Group | eq "anon"}}
+	 <li class="auth-links__box auth-links__register-box">
+		 <a href="/register" class="auth-links__link auth-links__register-link">
+			 {{block "register" .}}Register{{end}}
+		 </a>
+	 </li>
+{{end}}
+{{end}}`))
 	}
 	BaseRu = m(m(BaseEn.Clone()).Parse(ruText))
 }