aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-web
diff options
context:
space:
mode:
authorbschnalzer <bianca.schnalzer@egiz.gv.at>2017-07-17 08:20:30 +0200
committerbschnalzer <bianca.schnalzer@egiz.gv.at>2017-07-17 08:20:30 +0200
commit1c06339a8232dcc1c6d9ca471698732248e62f02 (patch)
treeb98c8dee3ee4a3143fc731358cfe540434ecd604 /pdf-as-web
parentd2a5915e8b9f1bbee77d916208c2e98c234b0d3a (diff)
downloadpdf-as-4-1c06339a8232dcc1c6d9ca471698732248e62f02.tar.gz
pdf-as-4-1c06339a8232dcc1c6d9ca471698732248e62f02.tar.bz2
pdf-as-4-1c06339a8232dcc1c6d9ca471698732248e62f02.zip
Removed OnlineBKU Option
Diffstat (limited to 'pdf-as-web')
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java28
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java9
-rw-r--r--pdf-as-web/src/main/webapp/index.jsp9
-rw-r--r--pdf-as-web/src/main/webapp/testindex.jsp9
4 files changed, 3 insertions, 52 deletions
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
index 6c3b4a76..cdd66a1d 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java
@@ -207,7 +207,7 @@ public class WebConfiguration implements IConfigurationConstants {
}
public static String getLocalBKUURL() {
- if(!getLocalBKUEnabled()) {
+ if(getLocalBKUEnabled()) {
String overwrite = properties.getProperty(CONFIG_BKU_URL);
if(overwrite == null) {
overwrite = properties.getProperty(LOCAL_BKU_URL);
@@ -220,22 +220,8 @@ public class WebConfiguration implements IConfigurationConstants {
return null;
}
- public static String getOnlineBKUURL() {
- if(!getOnlineBKUEnabled()) {
- String overwrite = properties.getProperty(MOC_SIGN_URL);
- if(overwrite == null) {
- overwrite = properties.getProperty(ONLINE_BKU_URL);
- if(overwrite == null) {
- overwrite = PdfAsHelper.getPdfAsConfig().getValue(MOC_SIGN_URL);
- }
- }
- return overwrite;
- }
- return null;
- }
-
public static String getHandyBKUURL() {
- if(!getMobileBKUEnabled()) {
+ if(getMobileBKUEnabled()) {
String overwrite = properties.getProperty(MOBILE_SIGN_URL);
if(overwrite == null) {
overwrite = properties.getProperty(MOBILE_BKU_URL);
@@ -427,16 +413,6 @@ public class WebConfiguration implements IConfigurationConstants {
return false;
}
- public static boolean getOnlineBKUEnabled() {
- String value = properties.getProperty(ONLINE_BKU_ENABLED);
- if (value != null) {
- if (value.equals("true")) {
- return true;
- }
- }
- return false;
- }
-
public static boolean getMobileBKUEnabled() {
String value = properties.getProperty(MOBILE_BKU_ENABLED);
if (value != null) {
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java
index f21447dd..b986d175 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java
@@ -358,15 +358,8 @@ public class ExternSignServlet extends HttpServlet {
throw new PdfAsWebException("Invalid connector bku is not supported");
}
}
-
- if(connector.equals("onlinebku")) {
- if(WebConfiguration.getLocalBKUURL() == null) {
- throw new PdfAsWebException("Invalid connector onlinebku is not supported");
- }
- }
-
if(connector.equals("mobilebku")) {
- if(WebConfiguration.getLocalBKUURL() == null) {
+ if(WebConfiguration.getHandyBKUURL() == null) {
throw new PdfAsWebException("Invalid connector mobilebku is not supported");
}
}
diff --git a/pdf-as-web/src/main/webapp/index.jsp b/pdf-as-web/src/main/webapp/index.jsp
index f3a3b957..ae3ef88d 100644
--- a/pdf-as-web/src/main/webapp/index.jsp
+++ b/pdf-as-web/src/main/webapp/index.jsp
@@ -28,15 +28,6 @@
}
%>
<%
- if (WebConfiguration.getOnlineBKUURL() != null) {
- %>
- <img src="assets/img/onlineBKU.png" />
- <button type="submit" value="onlinebku" name="connector"
- id="onlinebku">Online BKU</button>
- <%
- }
- %>
- <%
if (WebConfiguration.getHandyBKUURL() != null) {
%>
<img src="assets/img/mobileBKU.png" />
diff --git a/pdf-as-web/src/main/webapp/testindex.jsp b/pdf-as-web/src/main/webapp/testindex.jsp
index 8d49caeb..fea19ea8 100644
--- a/pdf-as-web/src/main/webapp/testindex.jsp
+++ b/pdf-as-web/src/main/webapp/testindex.jsp
@@ -28,15 +28,6 @@
}
%>
<%
- if (WebConfiguration.getOnlineBKUURL() != null) {
- %>
- <img src="assets/img/onlineBKU.png" />
- <button type="submit" value="onlinebku" name="connector"
- id="onlinebku">Online BKU</button>
- <%
- }
- %>
- <%
if (WebConfiguration.getHandyBKUURL() != null) {
%>
<img src="assets/img/mobileBKU.png" />