tentative fix for password fieldmy_branch

2 files changed, 22 insertions, 15 deletions

diff --git a/templates/settings.tmpl b/templates/settings.tmpl
index 5c757ee..dd4b53e 100644
--- a/templates/settings.tmpl
+++ b/templates/settings.tmpl
@@ -7,7 +7,7 @@
 		<input name="name" id="name" type="text" value={{.UserName}}>
 		<label for="name">Name</label>
 	</div>
-		
+
 	<div class="form-element">
 		<input name="email" id="email" type="text" value={{.Email}}>
 		<label for="email">Email</label>
@@ -22,9 +22,9 @@
 		<input name="lfm_name" id="lfm_name" type="text" value={{.LfmName}}>
 		<label for="lfm_name">Username</label>
 	</div>
-		
+
 	<div class="form-element">
-		<input name="lfm_password" id="lfm_password" type="password" value={{.LfmPassword}}>
+		<input name="lfm_password" id="lfm_password" type="password" autocomplete="current-password">
 		<label for="lfm_password">Password</label>
 	</div>
 	</div>
diff --git a/web.go b/web.go
index 5e17b61..d8f68f3 100644
--- a/web.go
+++ b/web.go
@@ -104,9 +104,17 @@ func (app *App) settings(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if r.Method == "POST" {
-		_, err = app.DB.Exec("UPDATE users SET name=$1, email=$2, lfm_name=$3, lfm_password=$4 WHERE  user_id=$5",
-			r.FormValue("name"), r.FormValue("email"), r.FormValue("lfm_name"),
-			md5hex(r.FormValue("lfm_password")), se.UserId)
+		if r.FormValue("lfm_password") == "" {
+			_, err = app.DB.Exec(`UPDATE users SET name=$1, email=$2, lfm_name=$3
+                                  WHERE user_id=$4`,
+				r.FormValue("name"), r.FormValue("email"), r.FormValue("lfm_name"),
+				se.UserId)
+		} else {
+			_, err = app.DB.Exec(`UPDATE users SET name=$1, email=$2, lfm_name=$3,
+                                  lfm_password=$4 WHERE  user_id=$5`,
+				r.FormValue("name"), r.FormValue("email"), r.FormValue("lfm_name"),
+				md5hex(r.FormValue("lfm_password")), se.UserId)
+		}
 		if err != nil {
 			log.Println(err)
 		}
@@ -114,15 +122,14 @@ func (app *App) settings(w http.ResponseWriter, r *http.Request) {
 		app.SetCookie(w, "session", se, 86400*30)
 	}
 
-	var userName, email, lfmName, lfmPassword string
-	row := app.DB.QueryRow("SELECT name, email, lfm_name, lfm_password FROM users WHERE user_id=$1",
+	var userName, email, lfmName string
+	row := app.DB.QueryRow("SELECT name, email, lfm_name FROM users WHERE user_id=$1",
 		se.UserId)
-	row.Scan(&userName, &email, &lfmName, &lfmPassword)
+	row.Scan(&userName, &email, &lfmName)
 	app.Template.ExecuteTemplate(w, "settings.tmpl", struct {
-		Session     *UserSession
-		UserName    string
-		Email       string
-		LfmName     string
-		LfmPassword string
-	}{se, userName, email, lfmName, lfmPassword})
+		Session  *UserSession
+		UserName string
+		Email    string
+		LfmName  string
+	}{se, userName, email, lfmName})
 }