import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.cacert.gigi.User;
+import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.output.DateSelector;
import org.cacert.gigi.output.Form;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.Page;
import org.cacert.gigi.util.Notary;
-import org.cacert.gigi.util.Notary.AssuranceResult;
public class AssurePage extends Page {
private void outputForm(HttpServletRequest req, PrintWriter out, AssuranceForm form) {
User myself = LoginPage.getUser(req);
- AssuranceResult check = Notary.checkAssuranceIsPossible(myself, form.getAssuree());
- if (check != AssuranceResult.ASSURANCE_SUCCEDED) {
- out.println(translate(req, check.getMessage()));
- return;
+ try {
+ Notary.checkAssuranceIsPossible(myself, form.getAssuree());
+ } catch (GigiApiException e) {
+ e.format(out, Page.getLanguage(req));
}
form.output(out, getLanguage(req), new HashMap<String, Object>());
} else if (getUser(req).getId() == id) {
} else {
- AssuranceForm form = new AssuranceForm(req, id);
+ AssuranceForm form = new AssuranceForm(req, User.getById(id));
outputForm(req, out, form);
}
}