import javax.servlet.http.HttpServletResponse;
import org.cacert.gigi.Language;
+import org.cacert.gigi.User;
import org.cacert.gigi.output.template.Template;
/**
return l.getTranslation(string);
}
+ public static User getUser(HttpServletRequest req) {
+ return LoginPage.getUser(req);
+ }
+
}
import javax.servlet.http.HttpServletResponse;
import org.cacert.gigi.output.Form;
-import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.Page;
public class ChangePasswordPage extends Page {
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- new ChangeForm(req, LoginPage.getUser(req)).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+ new ChangeForm(req, getUser(req)).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
}
@Override
import javax.servlet.http.HttpServletRequest;
import org.cacert.gigi.Certificate;
+import org.cacert.gigi.Certificate.CSRType;
import org.cacert.gigi.Digest;
import org.cacert.gigi.EmailAddress;
import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.Language;
import org.cacert.gigi.User;
-import org.cacert.gigi.Certificate.CSRType;
import org.cacert.gigi.crypto.SPKAC;
import org.cacert.gigi.output.Form;
import org.cacert.gigi.output.template.HashAlgorithms;
public IssueCertificateForm(HttpServletRequest hsr) {
super(hsr);
- u = LoginPage.getUser(hsr);
+ u = Page.getUser(hsr);
spkacChallange = RandomToken.generateToken(16);
}
String serial = pi;
try {
Certificate c = Certificate.getBySerial(serial);
- if (c == null || LoginPage.getUser(req).getId() != c.getOwnerId()) {
+ if (c == null || getUser(req).getId() != c.getOwnerId()) {
resp.sendError(404);
return true;
}
import org.cacert.gigi.User;
import org.cacert.gigi.output.Form;
import org.cacert.gigi.output.Outputable;
-import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.Page;
public class MailOverview extends Page {
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- final User us = LoginPage.getUser(req);
+ final User us = getUser(req);
Language lang = Page.getLanguage(req);
HashMap<String, Object> vars = new HashMap<>();
vars.put("mailData", t);
import org.cacert.gigi.User;
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;
return false;
}
try {
- AssuranceResult success = Notary.assure(LoginPage.getUser(req), assuree, Integer.parseInt(req.getParameter("points")), req.getParameter("location"), req.getParameter("date"));
+ AssuranceResult success = Notary.assure(Page.getUser(req), assuree, Integer.parseInt(req.getParameter("points")), req.getParameter("location"), req.getParameter("date"));
if (success != AssuranceResult.ASSURANCE_SUCCEDED) {
outputError(out, req, success.getMessage());
}
PrintWriter out = resp.getWriter();
String pi = req.getPathInfo().substring(PATH.length());
if (pi.length() > 1) {
- User myself = LoginPage.getUser(req);
+ User myself = getUser(req);
int mid = Integer.parseInt(pi.substring(1));
if (mid == myself.getId()) {
out.println(translate(req, "Cannot assure myself."));