Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 950 → Rev 951

/sun/hostadmiral/trunk/sql/00.tables.sql
37,7 → 37,7
login varchar(255) not null,
logintime timestamp not null,
success char(1) default '0' check (success = '1' or success = '0'),
ip inet not null,
ip inet not null,
 
constraint userlogins_prim primary key (id),
constraint userlogins_user foreign key (usr) references users(id)
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/IndexAction.java
24,13 → 24,13
User user = (User)request.getSession().getAttribute("user");
 
request.setAttribute("showSystemUsers",
new Boolean(SystemUserManager.getInstance().areSystemUsersAvailable(user)));
Boolean.valueOf(SystemUserManager.getInstance().areSystemUsersAvailable(user)));
request.setAttribute("showInetDomains",
new Boolean(InetDomainManager.getInstance().areInetDomainsAvailable(user)));
Boolean.valueOf(InetDomainManager.getInstance().areInetDomainsAvailable(user)));
request.setAttribute("showMailboxes",
new Boolean(MailboxManager.getInstance().areMailboxesAvailable(user)));
Boolean.valueOf(MailboxManager.getInstance().areMailboxesAvailable(user)));
request.setAttribute("showMailAliases",
new Boolean(MailAliasManager.getInstance().areMailAliasesAvailable(user)));
Boolean.valueOf(MailAliasManager.getInstance().areMailAliasesAvailable(user)));
 
return mapping.findForward("success");
}
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/InetDomainAction.java
53,7 → 53,7
Collections.sort(list, InetDomainManager.NAME_COMPARATOR);
request.setAttribute("domains", list);
request.setAttribute("allowedToCreate",
new Boolean(InetDomainManager.getInstance().allowedToCreate(user)));
Boolean.valueOf(InetDomainManager.getInstance().allowedToCreate(user)));
 
return mapping.findForward("default");
}
66,7 → 66,7
 
if(domainId == null) {
domain = InetDomainManager.getInstance().create(user);
showForm.set("enabled", new Boolean(true));
showForm.set("enabled", Boolean.TRUE);
}
else {
domain = InetDomainManager.getInstance().get(user, domainId);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/LoginAction.java
32,6 → 32,8
(String)theForm.get("login"), (String)theForm.get("password"), request.getRemoteAddr());
 
if(user == null) {
Thread.sleep(1000); // FIXME: make this delay configurable
 
ActionErrors errors = new ActionErrors();
errors.add(ActionMessages.GLOBAL_MESSAGE,
new ActionError(CoreResources.LOGIN_FAILED));
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/MailboxAction.java
54,7 → 54,7
Collections.sort(list, MailboxManager.LOGIN_COMPARATOR);
request.setAttribute("mailboxes", list);
request.setAttribute("allowedToCreate",
new Boolean(MailboxManager.getInstance().allowedToCreate(user)));
Boolean.valueOf(MailboxManager.getInstance().allowedToCreate(user)));
 
return mapping.findForward("default");
}
67,9 → 67,9
 
if(boxId == null) {
mailbox = MailboxManager.getInstance().create(user);
showForm.set("enabled", new Boolean(true));
showForm.set("viruscheck", new Boolean(true));
showForm.set("spamcheck", new Boolean(true));
showForm.set("enabled", Boolean.TRUE);
showForm.set("viruscheck", Boolean.TRUE);
showForm.set("spamcheck", Boolean.TRUE);
}
else {
mailbox = MailboxManager.getInstance().get(user, boxId);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/MailAliasAction.java
61,7 → 61,7
Collections.sort(list, MailAliasManager.ADDRESS_COMPARATOR);
request.setAttribute("aliases", list);
request.setAttribute("allowedToCreate",
new Boolean(MailAliasManager.getInstance().allowedToCreate(user)));
Boolean.valueOf(MailAliasManager.getInstance().allowedToCreate(user)));
 
return mapping.findForward("default");
}
77,7 → 77,7
if(aliasId == null) {
alias = MailAliasManager.getInstance().create(user);
dests = new ArrayList();
showForm.set("enabled", new Boolean(true));
showForm.set("enabled", Boolean.TRUE);
}
else {
alias = MailAliasManager.getInstance().get(user, aliasId);
213,7 → 213,7
if(dests.length > 0)
System.arraycopy(dests, 0, newDests, 0, dests.length);
newDests[dests.length] = new MailAliasDestBean();
newDests[dests.length].setEnabled(new Boolean(true));
newDests[dests.length].setEnabled(Boolean.TRUE);
theForm.set("dests", newDests);
 
initLists(request, user);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/UserAction.java
81,7 → 81,7
 
if(userId == null) {
u = UserManager.getInstance().create(user);
showForm.set("enabled", new Boolean(true));
showForm.set("enabled", Boolean.TRUE);
}
else {
u = UserManager.getInstance().get(user, userId);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/action/SystemUserAction.java
53,7 → 53,7
Collections.sort(list, SystemUserManager.NAME_COMPARATOR);
request.setAttribute("users", list);
request.setAttribute("allowedToCreate",
new Boolean(SystemUserManager.getInstance().allowedToCreate(user)));
Boolean.valueOf(SystemUserManager.getInstance().allowedToCreate(user)));
 
return mapping.findForward("default");
}
66,7 → 66,7
 
if(userId == null) {
u = SystemUserManager.getInstance().create(user);
showForm.set("enabled", new Boolean(true));
showForm.set("enabled", Boolean.TRUE);
}
else {
u = SystemUserManager.getInstance().get(user, userId);
/sun/hostadmiral/trunk/src/ak/hostadmiral/core/model/UserManager.java
112,7 → 112,7
try {
List list = HibernateUtil.currentSession().find(
"from User where login = ? and enabled = ?",
new Object[] { login, new Boolean(true) },
new Object[] { login, Boolean.TRUE },
new Type[] { Hibernate.STRING, Hibernate.BOOLEAN } );
 
if(list.size() == 0)
239,7 → 239,7
{
User user = (login == null || password == null) ? null : findForLogin(login);
boolean success = (user == null) ? false : user.checkPassword(password);
UserLogin userLogin = new UserLogin(user, login, new Date(), new Boolean(success), ip);
UserLogin userLogin = new UserLogin(user, login, new Date(), Boolean.valueOf(success), ip);
 
// save login information
try {
270,7 → 270,7
try {
return HibernateUtil.currentSession().find(
"from UserLogin where success = ?",
new Boolean(false), Hibernate.BOOLEAN);
Boolean.FALSE, Hibernate.BOOLEAN);
}
catch(HibernateException ex)
{