BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/ @ 920

  → /sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/ @ 921

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 920 → Rev 921

/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/SystemUserAction.java
98,17 → 98,17
u = SystemUserManager.getInstance().get(user, userId);
}
u.setUid(StringConverter.parseInteger(theForm.get("uid")));
u.setName((String)theForm.get("name"));
u.setUid(user, StringConverter.parseInteger(theForm.get("uid")));
u.setName(user, (String)theForm.get("name"));
Long ownerId = StringConverter.parseLong(theForm.get("owner"));
if(ownerId == null)
u.setOwner(null);
u.setOwner(user, null);
else
u.setOwner(UserManager.getInstance().get(user, ownerId));
u.setOwner(user, UserManager.getInstance().get(user, ownerId));
u.setEnabled((Boolean)theForm.get("enabled"));
u.setComment((String)theForm.get("comment"));
u.setEnabled(user, (Boolean)theForm.get("enabled"));
u.setComment(user, (String)theForm.get("comment"));
SystemUserManager.getInstance().save(user, u);
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());

/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/InetDomainAction.java
97,12 → 97,12
domain = InetDomainManager.getInstance().get(user, domainId);
}
domain.setName((String)theForm.get("name"));
domain.setOwner(UserManager.getInstance().get(user,
domain.setName(user, (String)theForm.get("name"));
domain.setOwner(user, UserManager.getInstance().get(user,
StringConverter.parseLong(theForm.get("owner"))));
domain.setEnabled((Boolean)theForm.get("enabled"));
domain.setComment((String)theForm.get("comment"));
domain.setEnabled(user, (Boolean)theForm.get("enabled"));
domain.setComment(user, (String)theForm.get("comment"));
InetDomainManager.getInstance().save(user, domain);
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());

/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/MailboxAction.java
114,27 → 114,27
mailbox = MailboxManager.getInstance().get(user, boxId);
}
mailbox.setLogin((String)theForm.get("login"));
mailbox.setDomain(InetDomainManager.getInstance().get(user,
mailbox.setLogin(user, (String)theForm.get("login"));
mailbox.setDomain(user, InetDomainManager.getInstance().get(user,
StringConverter.parseLong(theForm.get("domain"))));
mailbox.setOwner(UserManager.getInstance().get(user,
mailbox.setOwner(user, UserManager.getInstance().get(user,
StringConverter.parseLong(theForm.get("owner"))));
mailbox.setVirusCheck((Boolean)theForm.get("viruscheck"));
mailbox.setSpamCheck((Boolean)theForm.get("spamcheck"));
mailbox.setVirusCheck(user, (Boolean)theForm.get("viruscheck"));
mailbox.setSpamCheck(user, (Boolean)theForm.get("spamcheck"));
Long systemUserId = StringConverter.parseLong(theForm.get("systemuser"));
if(systemUserId == null) {
mailbox.setSystemUser(null);
mailbox.setSystemUser(user, null);
}
else {
mailbox.setSystemUser(SystemUserManager.getInstance().get(user, systemUserId));
mailbox.setSystemUser(user, SystemUserManager.getInstance().get(user, systemUserId));
}
if(password != null && !password.equals(""))
mailbox.setNewPassword(password);
mailbox.setPassword(user, password);
mailbox.setEnabled((Boolean)theForm.get("enabled"));
mailbox.setComment((String)theForm.get("comment"));
mailbox.setEnabled(user, (Boolean)theForm.get("enabled"));
mailbox.setComment(user, (String)theForm.get("comment"));
MailboxManager.getInstance().save(user, mailbox);
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());

/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/MailAliasAction.java
131,7 → 131,7
if(alias == null)
alias = MailAliasManager.getInstance().create(user);
alias.getDestinations().clear();
alias.getDestinations(user).clear();
for(int i = 0; i < dests.length; i++) {
// FIXME: validate dest id, mailbox id, email
159,21 → 159,21
dest.setEmail(dests[i].getEmail());
}
dest.setEnabled(dests[i].getEnabled());
dest.setComment(dests[i].getComment());
dest.setEnabled(user, dests[i].getEnabled());
dest.setComment(user, dests[i].getComment());
// connect
dest.setAlias(alias);
alias.getDestinations().add(dest);
alias.getDestinations(user).add(dest);
}
alias.setAddress((String)theForm.get("address"));
alias.setDomain(InetDomainManager.getInstance().get(user,
alias.setAddress(user, (String)theForm.get("address"));
alias.setDomain(user, InetDomainManager.getInstance().get(user,
StringConverter.parseLong(theForm.get("domain"))));
alias.setOwner(UserManager.getInstance().get(user,
alias.setOwner(user, UserManager.getInstance().get(user,
StringConverter.parseLong(theForm.get("owner"))));
alias.setEnabled((Boolean)theForm.get("enabled"));
alias.setComment((String)theForm.get("comment"));
alias.setEnabled(user, (Boolean)theForm.get("enabled"));
alias.setComment(user, (String)theForm.get("comment"));
// update alias
MailAliasManager.getInstance().save(user, alias);