55,9 → 55,11 |
{ |
User user = (User)request.getSession().getAttribute("user"); |
if("list".equals(mapping.getParameter())) { |
List list = new ArrayList(MailAliasManager.getInstance().listMailAliases()); |
List list = new ArrayList(MailAliasManager.getInstance().listMailAliases(user)); |
Collections.sort(list, MailAliasManager.ADDRESS_COMPARATOR); |
request.setAttribute("aliases", list); |
request.setAttribute("allowedToCreate", |
new Boolean(MailAliasManager.getInstance().allowedToCreate(user))); |
|
return mapping.findForward("default"); |
} |
72,9 → 74,9 |
showForm.set("enabled", new Boolean(true)); |
} |
else { |
MailAlias alias = MailAliasManager.getInstance().get(aliasId); |
MailAlias alias = MailAliasManager.getInstance().get(user, aliasId); |
List dests = new ArrayList(MailAliasDestinationManager.getInstance() |
.listMailAliasesDestination(alias)); |
.listMailAliasesDestination(alias)); |
MailAliasDestBean[] d = new MailAliasDestBean[dests.size()]; |
|
// FIXME: sort dests here |
99,9 → 101,9 |
else if("delete".equals(mapping.getParameter())) { |
DynaActionForm theForm = (DynaActionForm)form; |
Long aliasId = StringConverter.parseLong(theForm.get("id")); |
MailAlias alias = MailAliasManager.getInstance().get(aliasId); |
MailAlias alias = MailAliasManager.getInstance().get(user, aliasId); |
|
MailAliasManager.getInstance().delete(alias); |
MailAliasManager.getInstance().delete(user, alias); |
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl()); |
return null; |
} |
109,13 → 111,13 |
DynaActionForm theForm = (DynaActionForm)form; |
Long aliasId = StringConverter.parseLong(theForm.get("id")); |
MailAlias alias = (aliasId == null) ? null |
: MailAliasManager.getInstance().get(aliasId); |
: MailAliasManager.getInstance().get(user, aliasId); |
MailAliasDestBean[] dests = (MailAliasDestBean[])theForm.get("dests"); |
|
// submit |
if(request.getParameter("submit") != null) { |
if(alias == null) |
alias = MailAliasManager.getInstance().create(); |
alias = MailAliasManager.getInstance().create(user); |
|
alias.getDestinations().clear(); |
for(int i = 0; i < dests.length; i++) { |
137,7 → 139,7 |
|
// set mailbox or email |
if(mailboxId != null) { |
dest.setMailbox(MailboxManager.getInstance().get(mailboxId)); |
dest.setMailbox(MailboxManager.getInstance().get(user, mailboxId)); |
dest.setEmail(null); |
} |
else if(dests[i].getEmail() != null && !dests[i].getEmail().equals("")) { |
151,7 → 153,7 |
} |
|
alias.setAddress((String)theForm.get("address")); |
alias.setDomain(InetDomainManager.getInstance().get( |
alias.setDomain(InetDomainManager.getInstance().get(user, |
StringConverter.parseLong(theForm.get("domain")))); |
alias.setOwner(UserManager.getInstance().get( |
StringConverter.parseLong(theForm.get("owner")))); |
159,7 → 161,7 |
alias.setComment((String)theForm.get("comment")); |
|
// update alias |
MailAliasManager.getInstance().save(alias); |
MailAliasManager.getInstance().save(user, alias); |
|
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl()); |
return null; |
233,7 → 235,7 |
Collections.sort(users, UserManager.LOGIN_COMPARATOR); |
request.setAttribute("users", users); |
|
List domains = new ArrayList(InetDomainManager.getInstance().listInetDomains()); |
List domains = new ArrayList(InetDomainManager.getInstance().listInetDomains(user)); |
Collections.sort(domains, InetDomainManager.NAME_COMPARATOR); |
request.setAttribute("domains", domains); |
} |