From f65319fd93a3394ea2325de8d2264ab4d1461619 Mon Sep 17 00:00:00 2001
From: Chris Mann <chris@lesgrandsvoisins.com>
Date: Tue, 25 Jul 2023 14:34:19 +0200
Subject: [PATCH] Fixed Change Password Bug

---
 home.go    | 22 ++++++++++++----------
 session.go |  7 -------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/home.go b/home.go
index b94f161..a364b92 100644
--- a/home.go
+++ b/home.go
@@ -18,16 +18,18 @@ func handleHome(w http.ResponseWriter, r *http.Request) {
 
 	login := checkLogin(w, r)
 	if login == nil {
+		handleLogin(w, r)
 		return
-	} else {
-		templateHome := getTemplate("home.html")
-		data := &HomePageData{
-			Login:    login,
-			BaseDN:   config.BaseDN,
-			Org:      config.Org,
-			CanAdmin: login.CanAdmin,
-			LoggedIn: true,
-		}
-		templateHome.Execute(w, data)
 	}
+
+	templateHome := getTemplate("home.html")
+	data := &HomePageData{
+		Login:    login,
+		BaseDN:   config.BaseDN,
+		Org:      config.Org,
+		CanAdmin: login.CanAdmin,
+		LoggedIn: true,
+	}
+	templateHome.Execute(w, data)
+
 }
diff --git a/session.go b/session.go
index 8529cad..075cb61 100644
--- a/session.go
+++ b/session.go
@@ -25,13 +25,6 @@ func checkLogin(w http.ResponseWriter, r *http.Request) *LoginStatus {
 		}
 	}
 
-	if login_info == nil {
-		login_info = handleLogin(w, r)
-		if login_info == nil {
-			return nil
-		}
-	}
-
 	l, err := ldapOpen(w)
 	if l == nil {
 		return nil