Refactoring

model-user.go

@@ -112,15 +112,16 @@ func add(user User, config *ConfigFile, ldapConn *ldap.Conn) error {
 		log.Printf(fmt.Sprintf("add(User) ldapconn.Add: %v", user))
 		//return err
 	}
-	passwordModifyRequest := ldap.NewPasswordModifyRequest(user.DN, "", user.Password)
-	_, err = ldapConn.PasswordModify(passwordModifyRequest)
-	if err != nil {
-		return err
-	}
+	// passwordModifyRequest := ldap.NewPasswordModifyRequest(user.DN, "", user.Password)
+	// _, err = ldapConn.PasswordModify(passwordModifyRequest)
+	// if err != nil {
+	// 	return err
+	// }
 
 	// Send the email
 
-	err = passwordLost(user, config, ldapConn)
+	newUserLdapConn, _ := openNewUserLdap(config)
+	err = passwordLost(user, config, newUserLdapConn)
 
 	// sendMailTplData := SendMailTplData{
 	// 	From:            "alice@resdigita.org",

templates/user/new.html

@@ -85,10 +85,10 @@
     Le mot de passe choisi est trop court (minimum 8 caractères).
   </div>
   {{end}}
-  <div class="form-group">
+  <!-- <div class="form-group">
     <label for="password2">Répéter le mot de passe :</label>
     <input type="password" id="password2" name="password2" class="form-control" />
-  </div>
+  </div> -->
   {{if .ErrorPasswordMismatch}}
   <div class="alert alert-warning">
     Les deux mots de passe entrés ne correspondent pas.

view-invite.go

@@ -205,7 +205,7 @@ func handleNewAccount(w http.ResponseWriter, r *http.Request, l *ldap.Conn, invi
 		newUser.Mail = strings.TrimSpace(strings.Join(r.Form["mail"], ""))
 		newUser.UID = strings.TrimSpace(strings.Join(r.Form["othermailbox"], ""))
 		newUser.CN = strings.TrimSpace(strings.Join(r.Form["username"], ""))
-		newUser.DN = "cn=" + strings.TrimSpace(strings.Join(r.Form["username"], "")) + "," + config.InvitationBaseDN
+		newUser.DN = "cn=" + strings.TrimSpace(strings.Join(r.Form["username"], "")) + "," + config.UserBaseDN
 
 		password1 := strings.Join(r.Form["password"], "")
 		password2 := strings.Join(r.Form["password2"], "")