X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2Fsupport%2FSupportUserDetailsForm.java;h=1a700961b34345d7ed715761aa6c9d43a8ca50d1;hb=7a9b55470434239a3dd260005932e9e6096a9921;hp=e1c94c6b84577b92eaa9bad5edde0fb274a64a8c;hpb=b207e1989b166619e924946731e40ccf98457fae;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
index e1c94c6b..1a700961 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
@@ -85,8 +85,8 @@ public class SupportUserDetailsForm extends Form {
                 body.append("\n");
                 body.append(l.getTranslation("Best regards"));
                 body.append("\n");
-                body.append(l.getTranslation("CAcert.org Support!"));
-                Sendmail.getInstance().sendmail(user.getTargetUser().getEmail(), "[CAcert.org] " + l.getTranslation("Password reset by support."), body.toString(), "support@cacert.org", null, null, null, null, false);
+                body.append(l.getTranslation("SomeCA.org Support!"));
+                Sendmail.getInstance().sendmail(user.getTargetUser().getEmail(), "[SomeCA.org] " + l.getTranslation("Password reset by support."), body.toString(), "support@cacert.org", null, null, null, null, false);
                 out.println(Page.getLanguage(req).getTranslation("Password reset successful."));
             } catch (IOException e) {
                 e.printStackTrace();
@@ -105,8 +105,10 @@ public class SupportUserDetailsForm extends Form {
             throw new GigiApiException("Invalid date of birth!");
         }
         Name newName = new Name(fname, lname, mname, suffix);
-        if (user.setDob(dobSelector.getDate()) | user.setName(newName)) {
-            user.submitSupportAction();
+        synchronized (user.getTargetUser()) {
+            if (user.setDob(dobSelector.getDate()) | user.setName(newName)) {
+                user.submitSupportAction();
+            }
         }
         return true;
     }
@@ -136,7 +138,7 @@ public class SupportUserDetailsForm extends Form {
                     return false;
                 }
                 Group g = i.next();
-                vars.put("group_name", l.getTranslation("Group: " + g.getDatabaseName()));
+                vars.put("group_name", g.getName());
                 return true;
             }
         });