/hostadmiral/trunk/src/ak/hostadmiral/core/model/InetDomainManager.java |
---|
116,8 → 116,7 |
{ |
try { |
List list = HibernateUtil.currentSession().find( |
"select d from InetDomain d left join fetch d.owner where d.name=?", |
name, Hibernate.STRING); |
"from InetDomain where name=?", name, Hibernate.STRING); |
if(list.size() == 0) |
return null; |
272,7 → 271,7 |
"select d from InetDomain d left join fetch d.owner"); |
else |
return HibernateUtil.currentSession().find( |
"select d from InetDomain d where d.owner=?", |
"select d from InetDomain d left join fetch d.owner where d.owner=?", |
editor, Hibernate.entity(User.class)); |
} |
catch(HibernateException ex) |
305,7 → 304,7 |
try { |
domains = HibernateUtil.currentSession().find( |
"select d from InetDomain d where d.owner = ?", |
"from InetDomain where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
339,7 → 338,7 |
try { |
domains = HibernateUtil.currentSession().find( |
"select d from InetDomain d where d.owner = ?", |
"from InetDomain where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailboxManager.java |
---|
133,9 → 133,7 |
{ |
try { |
List list = HibernateUtil.currentSession().find( |
"select mb from Mailbox mb left join fetch mb.domain as d" |
+ " left join fetch mb.owner where mb.login=?", |
login, Hibernate.STRING); |
"from Mailbox where login=?", login, Hibernate.STRING); |
if(list.size() == 0) |
return null; |
339,7 → 337,7 |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"select mb from Mailbox mb left join fetch mb.domain where mb.owner = ?", |
"from Mailbox where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
357,7 → 355,7 |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"select mb from Mailbox mb left join fetch mb.domain where mb.owner = ?", |
"from Mailbox where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
377,7 → 375,7 |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"select mb from Mailbox mb left join fetch mb.owner where mb.domain = ?", |
"from Mailbox where domain = ?", |
domain, Hibernate.entity(InetDomain.class) ); |
} |
catch(HibernateException ex) |
395,7 → 393,7 |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"select mb from Mailbox mb left join fetch mb.owner where mb.domain = ?", |
"from Mailbox where domain = ?", |
domain, Hibernate.entity(InetDomain.class) ); |
} |
catch(HibernateException ex) |
415,8 → 413,7 |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"select mb from Mailbox mb left join fetch mb.domain as d" |
+ " left join fetch mb.owner where mb.systemUser = ?", |
"from Mailbox where systemUser = ?", |
user, Hibernate.entity(SystemUser.class) ); |
} |
catch(HibernateException ex) |
434,8 → 431,7 |
try { |
mailboxes = HibernateUtil.currentSession().find( |
"select mb from Mailbox mb left join fetch mb.domain as d" |
+ " left join fetch mb.owner where mb.systemUser = ?", |
"from Mailbox where systemUser = ?", |
user, Hibernate.entity(SystemUser.class) ); |
} |
catch(HibernateException ex) |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAliasManager.java |
---|
125,8 → 125,7 |
{ |
try { |
List list = HibernateUtil.currentSession().find( |
"select a from MailAlias a left join fetch a.domain" |
+ " left join fetch a.owner where a.name=?", name, Hibernate.STRING); |
"from MailAlias where name=?", name, Hibernate.STRING); |
if(list.size() == 0) |
return null; |
276,11 → 275,8 |
{ |
try { |
if(editor.isSuperuser()) |
return HibernateUtil.currentSession().find( |
"select a from MailAlias a left join fetch a.domain as d" |
+ " left join fetch a.owner"); |
return HibernateUtil.currentSession().find("from MailAlias"); |
else |
// FIXME: any problems for big lists or by pages? |
return CollectionUtils.addUnique( |
HibernateUtil.currentSession().find( |
"select a from MailAlias a left join fetch a.domain as d" |
330,7 → 326,7 |
try { |
mailAliases = HibernateUtil.currentSession().find( |
"select a from MailAlias a left join fetch a.domain where a.owner = ?", |
"from MailAlias where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
348,7 → 344,7 |
try { |
mailAliases = HibernateUtil.currentSession().find( |
"select a from MailAlias a left join fetch a.domain where a.owner = ?", |
"from MailAlias where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
368,7 → 364,7 |
try { |
mailAliases = HibernateUtil.currentSession().find( |
"select a from MailAlias a left join fetch a.owner where a.domain = ?", |
"from MailAlias where domain = ?", |
domain, Hibernate.entity(InetDomain.class) ); |
} |
catch(HibernateException ex) |
386,7 → 382,7 |
try { |
mailAliases = HibernateUtil.currentSession().find( |
"select a from MailAlias a left join fetch a.owner where a.domain = ?", |
"from MailAlias where domain = ?", |
domain, Hibernate.entity(InetDomain.class) ); |
} |
catch(HibernateException ex) |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/UserManager.java |
---|
27,12 → 27,12 |
registered = true; |
try { |
/* FIMXE: do the same for all classes |
HibernateUtil.getConfiguration().addResource( |
"ak/hostadmiral/core/model/User.hbm.xml"); |
HibernateUtil.getConfiguration().addResource( |
"ak/hostadmiral/core/model/UserLogin.hbm.xml"); |
HibernateUtil.getConfiguration().addResource( |
"ak/hostadmiral/core/model/PasswordStoreAbstract.hbm.xml"); |
*/ |
userManager = new UserManager(); |
} |
catch(Exception ex) { |
128,7 → 128,7 |
{ |
try { |
List list = HibernateUtil.currentSession().find( |
"select u from User u left join fetch u.boss where u.login = ? and u.enabled = ?", |
"from User where login = ? and enabled = ?", |
new Object[] { login, Boolean.TRUE }, |
new Type[] { Hibernate.STRING, Hibernate.BOOLEAN } ); |
288,12 → 288,11 |
{ |
try { |
if(editor.isSuperuser()) { |
return HibernateUtil.currentSession().find( |
"select u from User u left join fetch u.boss"); |
return HibernateUtil.currentSession().find("from User"); |
} |
else { |
return HibernateUtil.currentSession().find( |
"select u from User u where u = ? or u.boss = ?", |
"from User u where u = ? or u.boss = ?", |
new Object[] { editor, editor}, |
new Type[] { Hibernate.entity(User.class), Hibernate.entity(User.class) } ); |
} |
311,7 → 310,6 |
return true; |
} |
else { |
// FIXME: always true? |
return ((Integer)HibernateUtil.currentSession().iterate( |
"select count(*) from User u where u = ? or u.boss = ?", |
new Object[] { editor, editor}, |
359,7 → 357,7 |
try { |
return HibernateUtil.currentSession().find( |
"select l from UserLogin l left join fetch l.user where l.success = ?", |
"from UserLogin where success = ?", |
Boolean.FALSE, Hibernate.BOOLEAN); |
} |
catch(HibernateException ex) { |
374,7 → 372,7 |
try { |
subusers = HibernateUtil.currentSession().find( |
"select u from User u where u.boss = ?", |
"from User where boss = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) { |
407,7 → 405,7 |
try { |
subusers = HibernateUtil.currentSession().find( |
"select u from User u where u.boss = ?", |
"from User where boss = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) { |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/SystemUserManager.java |
---|
136,8 → 136,7 |
{ |
try { |
List list = HibernateUtil.currentSession().find( |
"select u from SystemUser u left join fetch u.owner where u.name=?", |
name, Hibernate.STRING); |
"from SystemUser where name=?", name, Hibernate.STRING); |
if(list.size() == 0) |
return null; |
155,8 → 154,7 |
{ |
try { |
List list = HibernateUtil.currentSession().find( |
"select u from SystemUser u left join fetch u.owner where u.uid=?", |
uid, Hibernate.INTEGER); |
"from SystemUser where uid=?", uid, Hibernate.INTEGER); |
if(list.size() == 0) |
return null; |
306,8 → 304,7 |
{ |
try { |
if(editor.isSuperuser()) { |
return HibernateUtil.currentSession().find( |
"select u from SystemUser u left join fetch u.owner"); |
return HibernateUtil.currentSession().find("from SystemUser"); |
} |
else { |
return HibernateUtil.currentSession().find( |
345,7 → 342,7 |
try { |
systemUsers = HibernateUtil.currentSession().find( |
"select u from SystemUser u where u.owner = ?", |
"from SystemUser where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
379,7 → 376,7 |
try { |
systemUsers = HibernateUtil.currentSession().find( |
"select u from SystemUser u where u.owner = ?", |
"from SystemUser where owner = ?", |
user, Hibernate.entity(User.class) ); |
} |
catch(HibernateException ex) |
/hostadmiral/trunk/src/ak/hostadmiral/core/model/MailAliasDestinationManager.java |
---|
109,7 → 109,7 |
{ |
try { |
return HibernateUtil.currentSession().find( |
"select d from MailAliasDestination d left join fetch d.mailbox where d.alias=?", |
"from MailAliasDestination where alias=?", |
alias, Hibernate.entity(MailAlias.class)); |
} |
catch(HibernateException ex) |