From 78c6b0e57cd3bda51254384a98006ebc6983d52e Mon Sep 17 00:00:00 2001 From: rpiazzi Date: Thu, 6 Oct 2011 10:59:22 +0000 Subject: Corrected an error that happened because of code changing when testing. The attribute "error_within_iframe" is again set to yes, if mobile or online CCS are choosen. git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@851 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- .../java/at/gv/egiz/pdfas/web/servlets/SignServlet.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'pdf-as-web/src/main/java/at') diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java index 5e6ee03..dcc0bb2 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java @@ -459,6 +459,7 @@ public class SignServlet extends HttpServlet } if (localFound) { + session.setAttribute(SignServlet.ERROR_WITHIN_IFRAME, "no"); pdfaEnabled = "on".equalsIgnoreCase((String)session.getAttribute(SUBMITFORM_PDFA_KEY)); sig_type = (String)session.getAttribute(SUBMITFORM_SIGNATURE_TYPE_KEY); @@ -482,7 +483,7 @@ public class SignServlet extends HttpServlet { FileItem item = (FileItem) it.next(); log.debug("item = " + item.getFieldName()); //$NON-NLS-1$ - + if (log.isDebugEnabled()) { if (item.isFormField()) @@ -505,7 +506,7 @@ public class SignServlet extends HttpServlet continue; } - if ((item.getFieldName().equals(FormFields.FIELD_CONNECTOR_SMARTCARD)) || (item.getFieldName().equals(FormFields.FIELD_CONNECTOR_MOBILE))) { + if ((item.getFieldName().equals(FormFields.FIELD_CONNECTOR_SMARTCARD)) || (item.getFieldName().equals(FormFields.FIELD_CONNECTOR_MOBILE)) || (item.getFieldName().equals(FormFields.FIELD_CONNECTOR_LOCALBKU))) { if (item.getFieldName().equals(FormFields.FIELD_CONNECTOR_SMARTCARD)) { session.setAttribute(SUBMITFORM_SIGNATURE_DEVICE_KEY, "moc"); sig_app = "moc"; @@ -514,6 +515,10 @@ public class SignServlet extends HttpServlet session.setAttribute(SUBMITFORM_SIGNATURE_DEVICE_KEY, "mobile"); sig_app = "mobile"; } + if (item.getFieldName().equals(FormFields.FIELD_CONNECTOR_LOCALBKU)) { + session.setAttribute(SUBMITFORM_SIGNATURE_DEVICE_KEY, "bku"); + sig_app = "bku"; + } continue; } @@ -664,9 +669,9 @@ public class SignServlet extends HttpServlet throw new PDFDocumentException(201, "Unable to create PDF document.", e); } - } + //} // byte[] pdf = file_upload_fi.get(); - //} + } } -- cgit v1.2.3