private String email;
- public Organisation(String name, String state, String province, String city, String email, User creator) throws GigiApiException {
+ private String optionalName;
+
+ private String postalAddress;
+
+ public Organisation(String name, String state, String province, String city, String email, String optionalName, String postalAddress, User creator) throws GigiApiException {
if ( !creator.isInGroup(Group.ORGASSURER)) {
- throw new GigiApiException("Only org-assurers may create organisations.");
+ throw new GigiApiException("Only Organisation RA Agents may create organisations.");
}
this.name = name;
this.state = state;
this.province = province;
this.city = city;
this.email = email;
+ this.optionalName = optionalName;
+ this.postalAddress = postalAddress;
int id = getId();
- try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, contactEmail=?, creator=?")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO organisations SET id=?, name=?, state=?, province=?, city=?, contactEmail=?, optional_name=?, postal_address=?, creator=?")) {
ps.setInt(1, id);
ps.setString(2, name);
ps.setString(3, state);
ps.setString(4, province);
ps.setString(5, city);
ps.setString(6, email);
- ps.setInt(7, creator.getId());
+ ps.setString(7, optionalName);
+ ps.setString(8, postalAddress);
+ ps.setInt(9, creator.getId());
synchronized (Organisation.class) {
ps.execute();
}
province = rs.getString("province");
city = rs.getString("city");
email = rs.getString("contactEmail");
+ optionalName = rs.getString("optional_name");
+ postalAddress = rs.getString("postal_address");
}
public String getName() {
return email;
}
+ public String getOptionalName() {
+ return optionalName;
+ }
+
+ public String getPostalAddress() {
+ return postalAddress;
+ }
+
public static synchronized Organisation getById(int id) {
CertificateOwner co = CertificateOwner.getById(id);
if (co instanceof Organisation) {
public synchronized void addAdmin(User admin, User actor, boolean master) throws GigiApiException {
if ( !admin.canAssure()) {
- throw new GigiApiException("Cannot add non-assurer.");
+ throw new GigiApiException("Cannot add person who is not RA Agent.");
}
if ( !actor.isInGroup(Group.ORGASSURER) && !isMaster(actor)) {
- throw new GigiApiException("Only org assurer or master-admin may add admins to an organisation.");
+ throw new GigiApiException("Only Organisation RA Agents or Organisation Administrators may add admins to an organisation.");
}
try (GigiPreparedStatement ps1 = new GigiPreparedStatement("SELECT 1 FROM `org_admin` WHERE `orgid`=? AND `memid`=? AND `deleted` IS NULL")) {
ps1.setInt(1, getId());
public void removeAdmin(User admin, User actor) throws GigiApiException {
if ( !actor.isInGroup(Group.ORGASSURER) && !isMaster(actor)) {
- throw new GigiApiException("Only org assurer or master-admin may delete admins from an organisation.");
+ throw new GigiApiException("Only Organisation RA Agents or Organisation Administrators may delete admins from an organisation.");
}
try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE org_admin SET deleter=?, deleted=NOW() WHERE orgid=? AND memid=?")) {
ps.setInt(1, actor.getId());
}
}
- public void update(String o, String c, String st, String l, String mail) {
+ public void updateCertData(String o, String c, String st, String l) {
for (Certificate cert : getCertificates(false)) {
if (cert.getStatus() == CertificateStatus.ISSUED) {
cert.revoke();
}
}
- try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `organisations` SET `name`=?, `state`=?, `province`=?, `city`=?, `contactEmail`=?")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `organisations` SET `name`=?, `state`=?, `province`=?, `city`=? WHERE `id`=?")) {
ps.setString(1, o);
ps.setString(2, c);
ps.setString(3, st);
ps.setString(4, l);
- ps.setString(5, mail);
- ps.execute();
+ ps.setInt(5, getId());
+ ps.executeUpdate();
}
- email = mail;
name = o;
state = c;
province = st;
city = l;
}
+ public void updateOrgData(String mail, String o_name, String p_address) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE `organisations` SET `contactEmail`=?, `optional_name`=?, `postal_address`=? WHERE `id`=?")) {
+ ps.setString(1, mail);
+ ps.setString(2, o_name);
+ ps.setString(3, p_address);
+ ps.setInt(4, getId());
+ ps.executeUpdate();
+ }
+ email = mail;
+ optionalName = o_name;
+ postalAddress = p_address;
+ }
+
public boolean isMaster(User u) {
for (Affiliation i : getAllAdmins()) {
if (i.isMaster() && i.getTarget() == u) {
return isValidDomain(email.split("@", 2)[1]);
}
- public static final String SELF_ORG_NAME = "CAcert";
+ public static final String SELF_ORG_NAME = "SomeCA";
public boolean isSelfOrganisation() {
return SELF_ORG_NAME.equals(getName());