use old ConfigTool

4 files changed, 94 insertions, 18 deletions

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 2d3963c11..1b2e31cd4 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -207,6 +207,12 @@
             <artifactId>xalan</artifactId>

             <!-- should be provided by the container or jre -->

             <scope>provided</scope>

+            <exclusions>

+            	<exclusion>

+            		<artifactId>serializer</artifactId>

+            		<groupId>xalan</groupId>

+            	</exclusion>

+            </exclusions>

         </dependency>

         <dependency>

             <groupId>xerces</groupId>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
index 113e9cdda..60d676868 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProviderImpl.java
@@ -121,7 +121,7 @@ public abstract class ConfigurationProviderImpl implements ConfigurationProvider
   protected Map<String, String> genericConfiguration;
 
   /** The default chaining mode. */
-  protected String defaultChainingMode;
+  protected String defaultChainingMode = "pkix";
 
   /** 
      * A <code>Map</code> which contains the <code>IssuerAndSerial</code> to
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index f7b6b8dde..4d88caffc 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -287,6 +287,7 @@ public class DispatcherServlet extends AuthServlet{
 						MOAReversionLogger.getInstance().logEvent(MOAIDEventConstants.SESSION_CREATED, uniqueSessionIdentifier);
 						MOAReversionLogger.getInstance().logEvent(MOAIDEventConstants.TRANSACTION_CREATED, protocolRequestID);						
 						MOAReversionLogger.getInstance().logEvent(uniqueSessionIdentifier, protocolRequestID, MOAIDEventConstants.TRANSACTION_IP, req.getRemoteAddr());						
+						
 						protocolRequest = info.preProcess(req, resp, action, uniqueSessionIdentifier, protocolRequestID);
 						
 						MOAReversionLogger.getInstance().logEvent(protocolRequest.getOnlineApplicationConfiguration(), 
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
index e293d8456..123a23837 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -15,13 +15,17 @@
 			  	text-align: center;
 			  	background-color: #6B7B8B;
 				}
+                
+                .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
 				
         #localBKU p {
           font-size: 0.7em;
         } 
         
         #localBKU input{
-          font-size: 0.7em;
+          font-size: 0.85em;
           /*border-radius: 5px;*/
         }
         
@@ -142,6 +146,8 @@
           margin-bottom: 10px;
         }
         
+        
+        
        #validation {
         position: absolute;
         bottom: 0px;
@@ -154,7 +160,10 @@
       @media screen and (max-width: 205px) {
         #localBKU p {
           font-size: 0.6em;
-        } 
+        }
+       .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
         
         #localBKU input {
           font-size: 0.6em;
@@ -191,6 +200,9 @@
         #localBKU p {
           font-size: 0.7em;
         } 
+        .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
         
         #localBKU input {
           font-size: 0.7em;
@@ -227,6 +239,9 @@
         #localBKU p {
           font-size: 0.9em;
         } 
+        .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
         
         #localBKU input {
           font-size: 0.8em;
@@ -257,7 +272,9 @@
         #localBKU p {
           font-size: 0.9em;
         } 
-        
+        .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
         #localBKU input {
           font-size: 0.8em;
           min-width: 70px;
@@ -288,7 +305,9 @@
         #localBKU p {
           font-size: 0.9em;
         } 
-        
+       .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        } 
         #localBKU input {
           font-size: 0.8em;
           min-width: 70px;
@@ -327,7 +346,9 @@
           font-size: 100%;
 			  	background-color: #MAIN_BACKGOUNDCOLOR#;
 				}
-        				
+        		.browserInfoButton{
+                    color: rgb(128, 128, 128); 
+                }		
 			  #page {
 			     visibility: hidden;
 			     margin-top: 0%;
@@ -464,12 +485,11 @@
       }
       
       #localBKU {
-        padding-left: 5%;
-        padding-right: 2%;
         padding-bottom: 4%;
         /*padding-top: 4%;*/
         position: relative;
-        clear: both;        
+        clear: both;     
+        text-align: center;
 			}
           			
 			#bkukarte {
@@ -526,13 +546,13 @@
       
       #localBKU input {
 /*        color: #BUTTON_COLOR#;  */
-        border: 0px;
+        /*border: 0px;*/
         display: inline-block;
         
       }
 			
       #localBKU input:hover, #localBKU input:focus, #localBKU input:active {
-        text-decoration: underline;
+        /*text-decoration: underline;*/
       }
       
 			#installJava, #BrowserNOK {
@@ -720,13 +740,63 @@
 			}
 		}
 		function onChangeChecks() {
-      if (self.innerWidth < 650) {
+      if (top.innerWidth < 650) {
          document.getElementById("moaidform").setAttribute("target","_parent");
       } else {
          document.getElementById("moaidform").removeAttribute("target");
       }
       
     }
+    
+     function checkIfBrowserSupportsJava(){
+        console.log("Browser is Chrome: "+checkIfBrowserIsChrome());
+        console.log("Browser is Safari: "+checkIfBrowserIsSafari());
+        console.log("Browser is Edge: "+checkIfBrowserIsEdge());
+        
+        var cnt = 0;
+        
+        if(checkIfBrowserIsChrome())cnt++;
+        if(checkIfBrowserIsEdge())cnt++;
+        if(checkIfBrowserIsSafari())cnt++;
+           
+        if(cnt==0 || cnt>1)//cnt>1 means perhaps wrong detection
+            return true;
+        
+        var image = document.getElementById("bkuimage");
+        var srcatt = image.getAttribute("src");
+        var last = srcatt.substring(srcatt.lastIndexOf('/')+1);
+        srcatt = srcatt.replace(last,'online-bku-deactivated.png');    
+        image.setAttribute("src",srcatt);
+         
+         
+        var button = document.getElementsByName("bkuButtonOnline")[0];               
+        button.setAttribute("class","browserInfoButton");
+        button.setAttribute("title","Java wird nicht unterstützt, klicken für mehr Informationen.");
+        button.setAttribute("onClick","alert('Java wird von Ihrem Browser nicht unterstützt, ist jedoch für den Betrieb der Online Bürgerkartenumgebung notwendig.\\nWollen Sie dennoch die Online Bürgerkartenumgebung verwenden, wird zur Zeit Java noch von Firefox und MS Internet Explorer unterstützt. \\nAlternativ koennen Sie auch eine lokale Bürgerkartenumgebung verwenden, verfügbar unter www.buergerkarte.at.');");
+         
+        return false;
+   
+    }
+    function checkIfBrowserIsChrome(){
+        var chrome_defined = !!window.chrome;//chrome object defined
+        var webstore_defined = false;
+        if(window.chrome){
+            webstore_defined = !!window.chrome.webstore;
+           }
+        return chrome_defined && webstore_defined;
+    }
+    function checkIfBrowserIsEdge(){//edge also defines the chrome object, but not the webapp
+        var chrome_defined = !!window.chrome;//chrome object defined
+        var webstore_defined = true;
+        if(window.chrome){
+            webstore_defined = !!window.chrome.webstore;
+           }
+        return chrome_defined && !webstore_defined;
+    }
+    function checkIfBrowserIsSafari(){
+        var cond1 = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
+        return cond1;
+    }
 /* 		function setSSOSelection() {
 			document.getElementById("useSSO").value = "false";
 			var checkbox = document.getElementById("SSOCheckBox");
@@ -754,7 +824,7 @@
 	</script>
 <title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title>
 </head>
-<body onload="onChangeChecks();" onresize="onChangeChecks();">
+<body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();">
 	<div id="page">
 		<div id="page1" class="case selected-case" role="main">
 			<h2 class="OA_header" role="heading">Anmeldung an: #OAName#</h2>
@@ -779,7 +849,7 @@
 						</div>
 						<div id="bkuselectionarea">
 							<div id="bkukarte">
-								<img class="bkuimage" src="#CONTEXTPATH#/img/online-bku.png"
+								<img id="bkuimage" class="bkuimage" src="#CONTEXTPATH#/img/online-bku.png"
 									alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
 									onClick="bkuOnlineClicked();" tabindex="2" role="button"
 									value="Karte" />
@@ -801,9 +871,8 @@
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
 									name="MOASessionID" value="#SESSIONID#"> 
-                  <input type="submit" value=">lokale Bürgerkartenumgebung" tabindex="4"
-									role="button" class="hell"
-                  onclick="setMandateSelection();"
+                  <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
+									role="button" onclick="setMandateSelection();"
                   >
 								<!--p>
                     <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
@@ -837,7 +906,7 @@
 				src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
 			</a> <a href="http://jigsaw.w3.org/css-validator/"> <img
 				style="border: 0; width: 88px; height: 31px"
-				src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
 		</div>