Fixed problem with PAdES Signatures, removed some attributes from CAdES signatures which are not required, minor bug fixes, implemented new style (lineCenter)4.1.1-RC

2 files changed, 25 insertions, 3 deletions

diff --git a/pdf-as-web/src/main/configuration/pdf-as-web.properties b/pdf-as-web/src/main/configuration/pdf-as-web.properties
index b06fb152..10ef26a1 100644
--- a/pdf-as-web/src/main/configuration/pdf-as-web.properties
+++ b/pdf-as-web/src/main/configuration/pdf-as-web.properties
@@ -5,8 +5,6 @@ error.showdetails=false
 
 bku.local.url=http://127.0.0.1:3495/http-security-layer-request
 
-#bku.online.url=http://www.example.com/bkuonline/http-security-layer-request
-
 bku.mobile.url=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx
 
 # Allow configuration overwrite from external sources
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 cdd66a1d..9b14df16 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
@@ -220,6 +220,20 @@ 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()) {
 			String overwrite = properties.getProperty(MOBILE_SIGN_URL);
@@ -422,7 +436,17 @@ 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 getSoapSignEnabled() {
 		String value = properties.getProperty(SOAP_SIGN_ENABLED);
 		if (value != null) {