import org.cacert.gigi.email.EmailProvider;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.DateSelector;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.Page;
import org.cacert.gigi.util.HTMLEncoder;
@Override
public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
update(req);
- if (buildup.getFname().equals("") || buildup.getLname().equals("")) {
- outputError(out, req, "First and/or last names were blank.");
+ if (buildup.getLname().trim().equals("")) {
+ outputError(out, req, "Last name were blank.");
}
if ( !myDoB.isValid()) {
outputError(out, req, "Invalid date of birth");
if (isFailed(out)) {
return false;
}
- GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted`=0");
- GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from certOwners inner join users on users.id=certOwners.id where `email`=? and `deleted`=0");
+ GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted` IS NULL");
+ GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from certOwners inner join users on users.id=certOwners.id where `email`=? and `deleted` IS NULL");
q1.setString(1, buildup.getEmail());
q2.setString(1, buildup.getEmail());
GigiResultSet r1 = q1.executeQuery();
run(req, pw1);
} catch (SQLException e) {
e.printStackTrace();
+ } catch (GigiApiException e) {
+ outputError(out, req, e.getMessage());
+ return false;
}
return true;
}
- private void run(HttpServletRequest req, String password) throws SQLException {
+ private void run(HttpServletRequest req, String password) throws SQLException, GigiApiException {
try {
DatabaseConnection.getInstance().beginTransaction();
buildup.setPreferredLocale(Page.getLanguage(req).getLocale());