Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 912 → Rev 913

/sun/hostcaptain/trunk/sql/00.tables.sql
8,7 → 8,7
-- see/use an user if he is the 'boss' or is the same user
-- modify password - as above
-- modify login - only if he is the 'boss', not of his own, and only inside some name rules (e.g. name@domain)
-- 'superuser' is allowed to do anything with all objects, but cannot delete himself or modify own
-- 'superuser' is allowed to do anything with all objects, but cannot delete himself or modify own
-- 'superuser' flag (to guarantee at least one superuser exists in the system)
create table users
(
16,7 → 16,9
login varchar(255) not null,
password varchar(255) not null,
boss integer,
superuser char(1) default 'N' check (superuser = 'Y' or superuser = 'N'),
superuser char(1) default ' ' check (superuser = '1' or superuser = ' '),
enabled char(1) default '1' check (enabled = '1' or enabled = ' '),
comment text,
mod_stamp timestamp,
mod_user integer,
 
26,7 → 28,7
);
 
-- default user admin:admin
insert into users (id, login, password, superuser) values (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', 'Y');
insert into users (id, login, password, superuser) values (1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '1');
select nextval('hibernate_sequence'); -- skip id of the default user
 
-- an user is allowed to see and use a system user if he is the 'owner' or the system user has no owner (null)
36,6 → 38,8
uid integer not null,
name varchar(255) not null,
owner integer,
enabled char(1) default '1' check (enabled = '1' or enabled = ' '),
comment text,
mod_stamp timestamp,
mod_user integer,
 
50,6 → 54,8
id integer not null,
name varchar(255) not null,
owner integer not null,
enabled char(1) default '1' check (enabled = '1' or enabled = ' '),
comment text,
mod_stamp timestamp,
mod_user integer,
 
67,9 → 73,11
password varchar(255), -- if null, then owner's password is used
domain integer not null,
owner integer not null,
virusCheck char(1),
spamCheck char(1),
virusCheck char(1) default '1' check (virusCheck = '1' or virusCheck = ' '),
spamCheck char(1) default '1' check (spamCheck = '1' or spamCheck = ' '),
systemuser integer,
enabled char(1) default '1' check (enabled = '1' or enabled = ' '),
comment text,
mod_stamp timestamp,
mod_user integer,
 
87,6 → 95,8
address varchar(255) not null,
domain integer not null,
owner integer not null,
enabled char(1) default '1' check (enabled = '1' or enabled = ' '),
comment text,
mod_stamp timestamp,
mod_user integer,
 
102,6 → 112,8
alias integer not null,
mailbox integer,
email varchar(255),
enabled char(1) default '1' check (enabled = '1' or enabled = ' '),
comment text,
mod_stamp timestamp,
mod_user integer,
 
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/SystemUser.java
7,7 → 7,7
* @hibernate.class table="systemusers"
*/
public class SystemUser
implements ModelObject
extends GeneralModelObject
{
private Long id;
 
96,8 → 96,13
return ak.hostcaptain.core.CoreResources.TYPE_SYSTEM_USER;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getName() + " (" + getUid() + ")"; // FIXME: is it really so good style?
return ak.hostcaptain.core.CoreResources.IDENT_SYSTEM_USER;
}
 
public Object[] getIdentParams()
{
return new Object[] { getName(), getUid() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/GeneralModelObject.java
0,0 → 1,36
package ak.hostcaptain.core.model;
 
public abstract class GeneralModelObject
implements ModelObject
{
private Boolean enabled;
private String comment;
 
/**
*
* @hibernate.property
*/
public Boolean getEnabled()
{
return enabled;
}
 
public void setEnabled(Boolean enabled)
{
this.enabled = enabled;
}
 
/**
*
* @hibernate.property
*/
public String getComment()
{
return comment;
}
 
public void setComment(String comment)
{
this.comment = comment;
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/InetDomain.java
7,7 → 7,7
* @hibernate.class table="domains"
*/
public class InetDomain
implements ModelObject
extends GeneralModelObject
{
private Long id;
private String name;
79,8 → 79,13
return ak.hostcaptain.core.CoreResources.TYPE_DOMAIN;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getName();
return ak.hostcaptain.core.CoreResources.IDENT_DOMAIN;
}
 
public Object[] getIdentParams()
{
return new Object[] { getName() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/ModelObject.java
4,5 → 4,7
{
public String getTypeKey();
 
public String getIdentificationString();
public String getIdentKey();
 
public Object[] getIdentParams();
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/UserManager.java
55,7 → 55,7
{
try {
List list = HibernateUtil.currentSession().find(
"from User where login=?", login, Hibernate.STRING);
"from User where login=? and enabled='1'", login, Hibernate.STRING);
 
if(list.size() == 0)
return null;
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/Mailbox.java
8,7 → 8,7
* @hibernate.class table="mailboxes"
*/
public class Mailbox
implements ModelObject
extends GeneralModelObject
{
private Long id;
private String login;
163,8 → 163,13
return ak.hostcaptain.core.CoreResources.TYPE_MAILBOX;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getLogin() + "@" + getDomain().getName();
return ak.hostcaptain.core.CoreResources.IDENT_MAILBOX;
}
 
public Object[] getIdentParams()
{
return new Object[] { getLogin(), getDomain().getName() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/MailAlias.java
8,7 → 8,7
* @hibernate.class table="mailaliases"
*/
public class MailAlias
implements ModelObject
extends GeneralModelObject
{
private Long id;
private String address;
116,8 → 116,13
return ak.hostcaptain.core.CoreResources.TYPE_MAIL_ALIAS;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getAddress() + "@" + getDomain().getName();
return ak.hostcaptain.core.CoreResources.IDENT_MAIL_ALIAS;
}
 
public Object[] getIdentParams()
{
return new Object[] { getAddress(), getDomain().getName() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/MailAliasDestination.java
7,7 → 7,7
* @hibernate.class table="mailaliasdests"
*/
public class MailAliasDestination
implements ModelObject
extends GeneralModelObject
{
private Long id;
private MailAlias alias;
94,8 → 94,19
return ak.hostcaptain.core.CoreResources.TYPE_MAIL_ALIAS_DESTINATION;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return (getMailbox() == null) ? getEmail() : getMailbox().getIdentificationString();
if(getMailbox() == null)
return ak.hostcaptain.core.CoreResources.IDENT_MAIL_ALIAS_DESTINATION_EXTERNAL;
else
return ak.hostcaptain.core.CoreResources.IDENT_MAIL_ALIAS_DESTINATION_INTERNAL;
}
 
public Object[] getIdentParams()
{
if(getMailbox() == null)
return new Object[] { getEmail() };
else
return new Object[] { getMailbox().getLogin(), getMailbox().getDomain().getName() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/model/User.java
8,7 → 8,7
* @hibernate.class table="users"
*/
public class User
implements ModelObject
extends GeneralModelObject
{
private Long id;
private String login;
147,8 → 147,13
return ak.hostcaptain.core.CoreResources.TYPE_USER;
}
 
public String getIdentificationString()
public String getIdentKey()
{
return getLogin();
return ak.hostcaptain.core.CoreResources.IDENT_USER;
}
 
public Object[] getIdentParams()
{
return new Object[] { getLogin() };
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/taglib/ModelObjectOptionsTag.java
0,0 → 1,71
// based on jakarta struts taglib
package ak.hostcaptain.core.taglib;
 
import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
 
import javax.servlet.jsp.JspException;
 
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.taglib.html.Constants;
import org.apache.struts.taglib.html.SelectTag;
import org.apache.struts.taglib.html.OptionsTag;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.ResponseUtils;
 
import ak.hostcaptain.core.model.ModelObject;
 
public class ModelObjectOptionsTag extends OptionsTag
{
protected static MessageResources coreMessages =
MessageResources.getMessageResources("ak.hostcaptain.core.CoreResources");
 
public int doEndTag() throws JspException
{
SelectTag selectTag = (SelectTag) pageContext.getAttribute(Constants.SELECT_KEY);
if (selectTag == null) {
throw new JspException(messages.getMessage("optionsTag.select"));
}
StringBuffer sb = new StringBuffer();
 
if (collection != null) {
Iterator collIterator = getIterator(collection, null);
while (collIterator.hasNext()) {
Object bean = collIterator.next();
Object value = null;
 
if(!(bean instanceof ModelObject))
throw new JspException("Not a ModelObject");
 
ModelObject model = (ModelObject)bean;
 
try {
value = PropertyUtils.getProperty(bean, property);
if (value == null) {
value = "";
}
} catch (IllegalAccessException e) {
throw new JspException(
messages.getMessage("getter.access", property, collection));
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
throw new JspException(
messages.getMessage("getter.result", property, t.toString()));
} catch (NoSuchMethodException e) {
throw new JspException(
messages.getMessage("getter.method", property, collection));
}
 
String identKey = model.getIdentKey();
Object[] identParams = model.getIdentParams();
String label = coreMessages.getMessage(identKey, identParams);
String stringValue = value.toString();
 
addOption(sb, stringValue, label, selectTag.isMatched(stringValue));
}
}
 
ResponseUtils.write(pageContext, sb.toString());
return EVAL_PAGE;
}
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/CoreResources.java
15,4 → 15,14
public static final String TYPE_MAIL_ALIAS = "ak.hostcaptain.core.type.mailAlias";
public static final String TYPE_MAIL_ALIAS_DESTINATION
= "ak.hostcaptain.core.type.mailAliasDestination";
 
public static final String IDENT_USER = "ak.hostcaptain.core.ident.user";
public static final String IDENT_SYSTEM_USER = "ak.hostcaptain.core.ident.systemUser";
public static final String IDENT_DOMAIN = "ak.hostcaptain.core.ident.domain";
public static final String IDENT_MAILBOX = "ak.hostcaptain.core.ident.mailbox";
public static final String IDENT_MAIL_ALIAS = "ak.hostcaptain.core.ident.mailAlias";
public static final String IDENT_MAIL_ALIAS_DESTINATION_EXTERNAL
= "ak.hostcaptain.core.ident.mailAliasDestination.external";
public static final String IDENT_MAIL_ALIAS_DESTINATION_INTERNAL
= "ak.hostcaptain.core.ident.mailAliasDestination.internal";
}
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/MailAliasAction.java
69,7 → 69,7
this, request, "ak.hostcaptain.core.form.MailAliasEditForm");
 
if(aliasId == null) {
 
showForm.set("enabled", new Boolean(true));
}
else {
MailAlias alias = MailAliasManager.getInstance().get(aliasId);
86,11 → 86,11
 
showForm.set("address", alias.getAddress());
if(alias.getDomain() != null)
showForm.set("domain",
StringConverter.toString(alias.getDomain().getId()));
showForm.set("domain", StringConverter.toString(alias.getDomain().getId()));
if(alias.getOwner() != null)
showForm.set("owner",
StringConverter.toString(alias.getOwner().getId()));
showForm.set("owner", StringConverter.toString(alias.getOwner().getId()));
showForm.set("enabled", alias.getEnabled());
showForm.set("comment", alias.getComment());
}
 
initLists(request, user);
155,6 → 155,8
StringConverter.parseLong(theForm.get("domain"))));
alias.setOwner(UserManager.getInstance().get(
StringConverter.parseLong(theForm.get("owner"))));
alias.setEnabled((Boolean)theForm.get("enabled"));
alias.setComment((String)theForm.get("comment"));
 
// update alias
MailAliasManager.getInstance().save(alias);
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/UserAction.java
59,7 → 59,7
this, request, "ak.hostcaptain.core.form.UserEditForm");
 
if(userId == null) {
 
showForm.set("enabled", new Boolean(true));
}
else {
User u = UserManager.getInstance().get(userId);
67,6 → 67,8
if(u.getBoss() != null)
showForm.set("boss", StringConverter.toString(u.getBoss().getId()));
showForm.set("superuser", u.getSuperuser());
showForm.set("enabled", u.getEnabled());
showForm.set("comment", u.getComment());
}
 
initUserList(request);
107,6 → 109,8
 
Long bossId = StringConverter.parseLong(theForm.get("boss"));
if(bossId == null)
u.setBoss(null);
else
u.setBoss(UserManager.getInstance().get(bossId));
 
if(!user.equals(u)) // do not allow user to change own superuser status
115,6 → 119,9
if(password != null && !password.equals(""))
u.setNewPassword(password);
 
u.setEnabled((Boolean)theForm.get("enabled"));
u.setComment((String)theForm.get("comment"));
 
UserManager.getInstance().save(u);
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());
return null;
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/SystemUserAction.java
59,7 → 59,7
this, request, "ak.hostcaptain.core.form.SystemUserEditForm");
 
if(userId == null) {
 
showForm.set("enabled", new Boolean(true));
}
else {
SystemUser u = SystemUserManager.getInstance().get(userId);
67,6 → 67,8
showForm.set("name", u.getName());
if(u.getOwner() != null)
showForm.set("owner", StringConverter.toString(u.getOwner().getId()));
showForm.set("enabled", u.getEnabled());
showForm.set("comment", u.getComment());
}
 
initUserList(request);
95,7 → 97,7
 
u.setUid(StringConverter.parseInteger(theForm.get("uid")));
u.setName((String)theForm.get("name"));
 
 
Long ownerId = StringConverter.parseLong(theForm.get("owner"));
if(ownerId == null)
u.setOwner(null);
102,6 → 104,9
else
u.setOwner(UserManager.getInstance().get(ownerId));
 
u.setEnabled((Boolean)theForm.get("enabled"));
u.setComment((String)theForm.get("comment"));
 
SystemUserManager.getInstance().save(u);
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());
return null;
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/InetDomainAction.java
59,7 → 59,7
this, request, "ak.hostcaptain.core.form.InetDomainEditForm");
 
if(domainId == null) {
 
showForm.set("enabled", new Boolean(true));
}
else {
InetDomain domain = InetDomainManager.getInstance().get(domainId);
66,6 → 66,8
showForm.set("name", domain.getName());
if(domain.getOwner() != null)
showForm.set("owner", StringConverter.toString(domain.getOwner().getId()));
showForm.set("enabled", domain.getEnabled());
showForm.set("comment", domain.getComment());
}
 
initUserList(request);
96,6 → 98,9
domain.setOwner(UserManager.getInstance().get(
StringConverter.parseLong(theForm.get("owner"))));
 
domain.setEnabled((Boolean)theForm.get("enabled"));
domain.setComment((String)theForm.get("comment"));
 
InetDomainManager.getInstance().save(domain);
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());
return null;
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/action/MailboxAction.java
60,7 → 60,7
this, request, "ak.hostcaptain.core.form.MailboxEditForm");
 
if(boxId == null) {
 
showForm.set("enabled", new Boolean(true));
}
else {
Mailbox mailbox = MailboxManager.getInstance().get(boxId);
73,6 → 73,8
showForm.set("spamcheck", mailbox.getSpamCheck());
if(mailbox.getSystemUser() != null)
showForm.set("systemuser", StringConverter.toString(mailbox.getSystemUser().getId()));
showForm.set("enabled", mailbox.getEnabled());
showForm.set("comment", mailbox.getComment());
}
 
initLists(request);
124,6 → 126,9
if(password != null && !password.equals(""))
mailbox.setNewPassword(password);
 
mailbox.setEnabled((Boolean)theForm.get("enabled"));
mailbox.setComment((String)theForm.get("comment"));
 
MailboxManager.getInstance().save(mailbox);
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl());
return null;
/sun/hostcaptain/trunk/src/ak/hostcaptain/core/CoreResources.properties
5,7 → 5,15
ak.hostcaptain.core.type.mailAlias=mail alias
ak.hostcaptain.core.type.mailAliasDestination=mail alias destination
 
ak.hostcaptain.core.login.failed=Wrong login or password
ak.hostcaptain.core.ident.user={0}
ak.hostcaptain.core.ident.systemUser={0} ({1})
ak.hostcaptain.core.ident.domain={0}
ak.hostcaptain.core.ident.mailbox={0}@{1}
ak.hostcaptain.core.ident.mailAlias={0}@{1}
ak.hostcaptain.core.ident.mailAliasDestination.external={0}
ak.hostcaptain.core.ident.mailAliasDestination.internal={0}@{1}
 
ak.hostcaptain.core.login.failed=Wrong login or password or the user is disabled
ak.hostcaptain.core.login.required=You have to enter the login
ak.hostcaptain.core.password.required=You have to enter the password
ak.hostcaptain.core.oldpassword.required=You have to enter the old password
79,6 → 87,9
 
ak.hostcaptain.page.user.list.title=hostcaptain - users - list
ak.hostcaptain.page.user.list.login=Login
ak.hostcaptain.page.user.list.boss=Boss
ak.hostcaptain.page.user.list.superuser=Superuser
ak.hostcaptain.page.user.list.enabled=Enabled
ak.hostcaptain.page.user.list.delete=delete
ak.hostcaptain.page.user.list.edit=edit
ak.hostcaptain.page.user.list.add=add new user
90,7 → 101,9
ak.hostcaptain.page.user.edit.password_again=Password again
ak.hostcaptain.page.user.edit.boss=Boss
ak.hostcaptain.page.user.edit.boss.empty=-- no boss --
ak.hostcaptain.page.user.edit.superuser=
ak.hostcaptain.page.user.edit.superuser=Superuser
ak.hostcaptain.page.user.edit.enabled=Enabled
ak.hostcaptain.page.user.edit.comment=Comment
ak.hostcaptain.page.user.edit.submit=submit
ak.hostcaptain.page.user.edit.back=back
 
97,6 → 110,8
ak.hostcaptain.page.user.system.list.title=hostcaptain - system users - list
ak.hostcaptain.page.user.system.list.uid=System ID
ak.hostcaptain.page.user.system.list.name=User name
ak.hostcaptain.page.user.system.list.owner=Owner
ak.hostcaptain.page.user.system.list.enabled=Enabled
ak.hostcaptain.page.user.system.list.delete=delete
ak.hostcaptain.page.user.system.list.edit=edit
ak.hostcaptain.page.user.system.list.add=add new user
107,6 → 122,8
ak.hostcaptain.page.user.system.edit.name=User name
ak.hostcaptain.page.user.system.edit.owner=Owner
ak.hostcaptain.page.user.system.edit.owner.empty=-- common user --
ak.hostcaptain.page.user.system.edit.enabled=Enabled
ak.hostcaptain.page.user.system.edit.comment=Comment
ak.hostcaptain.page.user.system.edit.submit=submit
ak.hostcaptain.page.user.system.edit.back=back
 
113,6 → 130,7
ak.hostcaptain.page.domain.list.title=hostcaptain - domains - list
ak.hostcaptain.page.domain.list.name=Name
ak.hostcaptain.page.domain.list.owner=Owner
ak.hostcaptain.page.domain.list.enabled=Enabled
ak.hostcaptain.page.domain.list.delete=delete
ak.hostcaptain.page.domain.list.edit=edit
ak.hostcaptain.page.domain.list.add=add new domain
122,11 → 140,14
ak.hostcaptain.page.domain.edit.name=Name
ak.hostcaptain.page.domain.edit.owner=Owner
ak.hostcaptain.page.domain.edit.owner.empty=-- please select --
ak.hostcaptain.page.domain.edit.enabled=Enabled
ak.hostcaptain.page.domain.edit.comment=Comment
ak.hostcaptain.page.domain.edit.submit=submit
ak.hostcaptain.page.domain.edit.back=back
 
ak.hostcaptain.page.mail.alias.list.title=hostcaptain - mail aliases - list
ak.hostcaptain.page.mail.alias.list.alias=Alias
ak.hostcaptain.page.mail.alias.list.enabled=Enabled
ak.hostcaptain.page.mail.alias.list.edit=edit
ak.hostcaptain.page.mail.alias.list.delete=delete
ak.hostcaptain.page.mail.alias.list.back=back
138,6 → 159,8
ak.hostcaptain.page.mail.alias.edit.domain.empty=-- please select --
ak.hostcaptain.page.mail.alias.edit.owner=Owner
ak.hostcaptain.page.mail.alias.edit.owner.empty=-- please select --
ak.hostcaptain.page.mail.alias.edit.enabled=Enabled
ak.hostcaptain.page.mail.alias.edit.comment=Comment
ak.hostcaptain.page.mail.alias.edit.header.tomailbox=To mailbox
ak.hostcaptain.page.mail.alias.edit.header.toexternal=or to external email
ak.hostcaptain.page.mail.alias.edit.external=external redirect
150,6 → 173,7
ak.hostcaptain.page.mail.box.list.login=Box
ak.hostcaptain.page.mail.box.list.domain=Domain
ak.hostcaptain.page.mail.box.list.owner=Owner
ak.hostcaptain.page.mail.box.list.enabled=Enabled
ak.hostcaptain.page.mail.box.list.edit=edit
ak.hostcaptain.page.mail.box.list.delete=delete
ak.hostcaptain.page.mail.box.list.add=add new mail box
167,5 → 191,7
ak.hostcaptain.page.mail.box.edit.systemuser.empty=-- please select --
ak.hostcaptain.page.mail.box.edit.viruscheck=check mails for viruses
ak.hostcaptain.page.mail.box.edit.spamcheck=check mails for spam
ak.hostcaptain.page.mail.box.edit.enabled=Enabled
ak.hostcaptain.page.mail.box.edit.comment=Comment
ak.hostcaptain.page.mail.box.edit.submit=submit
ak.hostcaptain.page.mail.box.edit.back=back
/sun/hostcaptain/trunk/webapp/WEB-INF/hostcaptain-core.tld
0,0 → 1,47
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
<taglib>
<tlibversion>1.0</tlibversion>
<jspversion>1.1</jspversion>
<shortname>hostcaptain-core</shortname>
<uri>http://26th.net/hostcaptain/core</uri>
 
<tag>
<name>options</name>
<tagclass>ak.hostcaptain.core.taglib.ModelObjectOptionsTag</tagclass>
<bodycontent>empty</bodycontent>
<attribute>
<name>collection</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>filter</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>name</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>property</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>style</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>styleClass</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
</taglib>
 
 
 
/sun/hostcaptain/trunk/webapp/WEB-INF/struts-config.xml
36,6 → 36,8
<form-property name="password2" type="java.lang.String" />
<form-property name="boss" type="java.lang.String" />
<form-property name="superuser" type="java.lang.Boolean" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
</form-bean>
 
<form-bean
51,6 → 53,8
<form-property name="uid" type="java.lang.String" />
<form-property name="name" type="java.lang.String" />
<form-property name="owner" type="java.lang.String" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
</form-bean>
 
<form-bean
65,6 → 69,8
<form-property name="id" type="java.lang.String" />
<form-property name="name" type="java.lang.String" />
<form-property name="owner" type="java.lang.String" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
</form-bean>
 
<form-bean
85,6 → 91,8
<form-property name="viruscheck" type="java.lang.Boolean" />
<form-property name="spamcheck" type="java.lang.Boolean" />
<form-property name="systemuser" type="java.lang.String" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
</form-bean>
 
<form-bean
100,6 → 108,8
<form-property name="address" type="java.lang.String" />
<form-property name="domain" type="java.lang.String" />
<form-property name="owner" type="java.lang.String" />
<form-property name="enabled" type="java.lang.Boolean" />
<form-property name="comment" type="java.lang.String" />
<form-property name="dests" type="ak.hostcaptain.core.form.MailAliasDestBean[]"
size="1" />
</form-bean>
107,11 → 117,11
 
<global-exceptions>
<!-- FIXME: it doesn't work :( -->
<exception
<!-- exception
key="GeneralException"
type="java.lang.Exception"
path="/generalError.jsp"
/>
/ -->
 
<exception
key="UserException"
/sun/hostcaptain/trunk/webapp/WEB-INF/web.xml
116,4 → 116,9
<taglib-location>/WEB-INF/ak-backpath.tld</taglib-location>
</taglib>
 
<taglib>
<taglib-uri>/ak/hostcaptain/core</taglib-uri>
<taglib-location>/WEB-INF/hostcaptain-core.tld</taglib-location>
</taglib>
 
</web-app>
/sun/hostcaptain/trunk/webapp/domain/edit.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,17 → 21,25
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.domain.edit.name" />:
<html:text property="name" />
<bean:message key="ak.hostcaptain.page.domain.edit.name" />:
<html:text property="name" />
<br>
 
<bean:message key="ak.hostcaptain.page.domain.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.domain.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<bean:message key="ak.hostcaptain.page.domain.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.domain.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.domain.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.domain.edit.comment" />:
<html:textarea property="comment" />
<br>
 
<html:submit><bean:message key="ak.hostcaptain.page.domain.edit.submit" /></html:submit>
 
<backpath:backlink><bean:message key="ak.hostcaptain.page.domain.edit.back" /></backpath:backlink>
/sun/hostcaptain/trunk/webapp/domain/list.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,6 → 21,7
<tr>
<th><bean:message key="ak.hostcaptain.page.domain.list.name" /></th>
<th><bean:message key="ak.hostcaptain.page.domain.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.domain.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
28,6 → 30,10
<tr>
<td><bean:write name="domain" property="name" /></td>
<td><bean:write name="domain" property="owner.login" /></td>
<td>
<logic:equal name="domain" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="domain" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/domain/edit" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.edit" /></backpath:link></td>
<td><backpath:link action="/domain/delete" paramId="id" paramName="domain" paramProperty="id"><bean:message key="ak.hostcaptain.page.domain.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/user/system/list.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,6 → 21,8
<tr>
<th><bean:message key="ak.hostcaptain.page.user.system.list.uid" /></th>
<th><bean:message key="ak.hostcaptain.page.user.system.list.name" /></th>
<th><bean:message key="ak.hostcaptain.page.user.system.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.user.system.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
28,6 → 31,15
<tr>
<td><bean:write name="u" property="uid" /></td>
<td><bean:write name="u" property="name" /></td>
<td>
<logic:present name="u" property="owner">
<bean:write name="u" property="owner.login" />
</logic:present>
</td>
<td>
<logic:equal name="u" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="u" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/user/system/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.edit" /></backpath:link></td>
<td><backpath:link action="/user/system/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.system.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/user/system/edit.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,21 → 21,29
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.user.system.edit.uid" />:
<html:text property="uid" />
<bean:message key="ak.hostcaptain.page.user.system.edit.uid" />:
<html:text property="uid" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.system.edit.name" />:
<html:text property="name" />
<bean:message key="ak.hostcaptain.page.user.system.edit.name" />:
<html:text property="name" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.system.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.user.system.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<bean:message key="ak.hostcaptain.page.user.system.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.user.system.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.user.system.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.system.edit.comment" />:
<html:textarea property="comment" />
<br>
 
<html:submit><bean:message key="ak.hostcaptain.page.user.system.edit.submit" /></html:submit>
 
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.system.edit.back" /></backpath:backlink>
/sun/hostcaptain/trunk/webapp/user/list.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
19,6 → 20,9
<table>
<tr>
<th><bean:message key="ak.hostcaptain.page.user.list.login" /></th>
<th><bean:message key="ak.hostcaptain.page.user.list.boss" /></th>
<th><bean:message key="ak.hostcaptain.page.user.list.superuser" /></th>
<th><bean:message key="ak.hostcaptain.page.user.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
26,6 → 30,19
<logic:iterate name="users" id="u">
<tr>
<td><bean:write name="u" property="login" /></td>
<td>
<logic:present name="u" property="boss">
<bean:write name="u" property="boss.login" />
</logic:present>
</td>
<td>
<logic:equal name="u" property="superuser" value="true">x</logic:equal>
<logic:notEqual name="u" property="superuser" value="true">&nbsp;</logic:notEqual>
</td>
<td>
<logic:equal name="u" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="u" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/user/edit" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.edit" /></backpath:link></td>
<td><backpath:link action="/user/delete" paramId="id" paramName="u" paramProperty="id"><bean:message key="ak.hostcaptain.page.user.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/user/edit.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,29 → 21,38
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.user.edit.login" />:
<html:text property="login" />
<bean:message key="ak.hostcaptain.page.user.edit.login" />:
<html:text property="login" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.edit.password" />:
<html:password property="password" redisplay="false" />
<bean:message key="ak.hostcaptain.page.user.edit.password" />:
<html:password property="password" redisplay="false" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<bean:message key="ak.hostcaptain.page.user.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.edit.boss" />:
<html:select property="boss">
<html:option value="" key="ak.hostcaptain.page.user.edit.boss.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<bean:message key="ak.hostcaptain.page.user.edit.boss" />:
<html:select property="boss">
<html:option value="" key="ak.hostcaptain.page.user.edit.boss.empty"/>
<core:options collection="users" property="id" />
</html:select>
<br>
 
<html:checkbox property="superuser" />
<bean:message key="ak.hostcaptain.page.user.edit.superuser" />
<html:checkbox property="superuser" />
<bean:message key="ak.hostcaptain.page.user.edit.superuser" />
FIXME: don't show this checkbox for editor itself
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.user.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.user.edit.comment" />:
<html:textarea property="comment" />
<br>
 
<html:submit><bean:message key="ak.hostcaptain.page.user.edit.submit" /></html:submit>
 
<backpath:backlink><bean:message key="ak.hostcaptain.page.user.edit.back" /></backpath:backlink>
/sun/hostcaptain/trunk/webapp/user/password/change.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
/sun/hostcaptain/trunk/webapp/generalError.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
16,7 → 17,7
 
<p><bean:message key="ak.hostcaptain.page.generalError.message" /></p>
 
<backpath:link><bean:message key="ak.hostcaptain.page.generalError.index" /></backpath:link>
<!-- FIXME: backpath:link><bean:message key="ak.hostcaptain.page.generalError.index" /></ backpath : link-->
<br>
<backpath:backlink><bean:message key="ak.hostcaptain.page.generalError.back" /></backpath:backlink>
 
/sun/hostcaptain/trunk/webapp/index.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
/sun/hostcaptain/trunk/webapp/mail/alias/edit.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
84,6 → 85,14
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.mail.alias.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.mail.alias.edit.comment" />:
<html:textarea property="comment" />
<br>
</p>
 
<table>
/sun/hostcaptain/trunk/webapp/mail/alias/list.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
19,6 → 20,7
<table>
<tr>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.alias" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.alias.list.enabled" /></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
26,6 → 28,10
<logic:iterate name="aliases" id="alias">
<tr>
<td><bean:write name="alias" property="address" /></td>
<td>
<logic:equal name="alias" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="alias" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/mail/alias/edit" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.edit" /></backpath:link></td>
<td><backpath:link action="/mail/alias/delete" paramId="id" paramName="alias" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.alias.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/mail/box/edit.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
20,51 → 21,59
<backpath:current />
<html:hidden property="id" />
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.login" />:
<html:text property="login" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.login" />:
<html:text property="login" />
<br>
 
FIXME: checkbox to get password from owner
FIXME: checkbox to get password from owner
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.password" />:
<html:password property="password" redisplay="false" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.password" />:
<html:password property="password" redisplay="false" />
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.password_again" />:
<html:password property="password2" redisplay="false" />
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.domain" />:
<html:select property="domain">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
<bean:message key="ak.hostcaptain.page.mail.box.edit.domain" />:
<html:select property="domain">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.domain.empty"/>
<html:options collection="domains" property="id" labelProperty="name" />
</html:select>
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<bean:message key="ak.hostcaptain.page.mail.box.edit.owner" />:
<html:select property="owner">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.owner.empty"/>
<html:options collection="users" property="id" labelProperty="login" />
</html:select>
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.systemuser" />:
<html:select property="systemuser">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.systemuser.empty"/>
<html:options collection="systemusers" property="id" labelProperty="name" />
</html:select>
FIXME: uid+name should be shown
<bean:message key="ak.hostcaptain.page.mail.box.edit.systemuser" />:
<html:select property="systemuser">
<html:option value="" key="ak.hostcaptain.page.mail.box.edit.systemuser.empty"/>
<core:options collection="systemusers" property="id" />
</html:select>
FIXME: uid+name should be shown
<br>
 
<html:checkbox property="viruscheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.viruscheck" />
<html:checkbox property="viruscheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.viruscheck" />
<br>
 
<html:checkbox property="spamcheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.spamcheck" />
<html:checkbox property="spamcheck" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.spamcheck" />
<br>
 
<html:checkbox property="enabled" />
<bean:message key="ak.hostcaptain.page.mail.box.edit.enabled" />
<br>
 
<bean:message key="ak.hostcaptain.page.mail.box.edit.comment" />:
<html:textarea property="comment" />
<br>
 
<html:submit><bean:message key="ak.hostcaptain.page.mail.box.edit.submit" /></html:submit>
 
<backpath:backlink><bean:message key="ak.hostcaptain.page.mail.box.edit.back" /></backpath:backlink>
/sun/hostcaptain/trunk/webapp/mail/box/list.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
21,6 → 22,7
<th><bean:message key="ak.hostcaptain.page.mail.box.list.login" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.domain" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.owner" /></th>
<th><bean:message key="ak.hostcaptain.page.mail.box.list.enabled" /></th>
<th>&nbsp;</th>
</tr>
 
29,6 → 31,10
<td><bean:write name="mailbox" property="login" /></td>
<td><bean:write name="mailbox" property="domain.name" /></td>
<td><bean:write name="mailbox" property="owner.login" /></td>
<td>
<logic:equal name="mailbox" property="enabled" value="true">x</logic:equal>
<logic:notEqual name="mailbox" property="enabled" value="true">&nbsp;</logic:notEqual>
</td>
<td><backpath:link action="/mail/box/edit" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.edit" /></backpath:link></td>
<td><backpath:link action="/mail/box/delete" paramId="id" paramName="mailbox" paramProperty="id"><bean:message key="ak.hostcaptain.page.mail.box.list.delete" /></backpath:link></td>
</tr>
/sun/hostcaptain/trunk/webapp/error.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
/sun/hostcaptain/trunk/webapp/system/login.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>
/sun/hostcaptain/trunk/webapp/system/logout.jsp
1,8 → 1,9
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/ak-backpath.tld" prefix="backpath" %>
<%@ taglib uri="/WEB-INF/hostcaptain-core.tld" prefix="core" %>
<html>
 
<head>