diff options
Diffstat (limited to 'pdf-as-web')
| -rw-r--r-- | pdf-as-web/pom.xml | 2 | ||||
| -rw-r--r-- | pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SignServlet.java | 5 | ||||
| -rw-r--r-- | pdf-as-web/src/main/webapp/jsp/signupload.jsp | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/pdf-as-web/pom.xml b/pdf-as-web/pom.xml index 30dd2e7..fdde11d 100644 --- a/pdf-as-web/pom.xml +++ b/pdf-as-web/pom.xml @@ -7,7 +7,7 @@ <parent>
<groupId>eu.europa.ec.joinup.egovlabs.pdf-as</groupId>
<artifactId>pdf-as</artifactId>
- <version>3.5.1</version>
+ <version>3.5.4</version>
</parent>
<packaging>war</packaging>
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 6cb55fe..dce16b7 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 @@ -36,6 +36,7 @@ import java.net.MalformedURLException; import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.net.URLEncoder;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Iterator;
@@ -265,7 +266,7 @@ public class SignServlet extends HttpServlet { // if we already have parameters "&" must be used instead of "?"
String paramSeparator = (pdf_url.indexOf("?") != -1) ? "&" : "?";
- String query = pdf_url + "/" + filename + paramSeparator
+ String query = pdf_url + "/" + URLEncoder.encode(filename, "UTF-8") + paramSeparator
+ FormFields.FIELD_PDF_ID + "=" + pdf_id;
// query = pdf_url;
@@ -728,7 +729,7 @@ public class SignServlet extends HttpServlet { }
continue;
}
-
+
throw new ServletException("Unrecognized POST data."); //$NON-NLS-1$
}
diff --git a/pdf-as-web/src/main/webapp/jsp/signupload.jsp b/pdf-as-web/src/main/webapp/jsp/signupload.jsp index ddcf16c..078639d 100644 --- a/pdf-as-web/src/main/webapp/jsp/signupload.jsp +++ b/pdf-as-web/src/main/webapp/jsp/signupload.jsp @@ -721,8 +721,8 @@ </div>
<div class="pdfasverticalspace"></div>
<div class="linkslabelkurz">
- <label id="labeldocument" for="Choose document" style="display:block"><fmt:message key="signupload.choose.document"/> <b>*</b>:</label>
- <label id="labeltext" for="Enter text" style="display:none"><fmt:message key="signupload.choose.text"/> <b>*</b>:</label>
+ <label id="labeldocument" for="fileupload" style="display:block"><fmt:message key="signupload.choose.document"/> <b>*</b>:</label>
+ <label id="labeltext" for="freetext" style="display:none"><fmt:message key="signupload.choose.text"/> <b>*</b>:</label>
</div>
<div class="linkssourcefield">
<textarea class="freetext" id="freetext" name="<%= FormFields.FIELD_SOURCE_FREETEXT %>" autocomplete="off" align="right" style="display:none"></textarea>
@@ -740,8 +740,8 @@ </div>
<div class="pdfasverticalspace"></div>
<div class="linkslabelkurz">
- <label id="labeldocument" for="Choose document" style="display:none"><fmt:message key="signupload.choose.document"/> <b>*</b>:</label>
- <label id="labeltext" for="Enter text" style="display:block"><fmt:message key="signupload.choose.text"/> <b>*</b>:</label>
+ <label id="labeldocument" for="fileupload" style="display:none"><fmt:message key="signupload.choose.document"/> <b>*</b>:</label>
+ <label id="labeltext" for="freetext" style="display:block"><fmt:message key="signupload.choose.text"/> <b>*</b>:</label>
</div>
<div class="linkssourcefield">
<textarea class="freetext" id="freetext" name="<%= FormFields.FIELD_SOURCE_FREETEXT %>" autocomplete="off" align="right" style="display:block"><%= sign_freetext %></textarea>
|