From 40f4c479dccda8fb16fa6027fb271d40f7f4dfa7 Mon Sep 17 00:00:00 2001
From: rpiazzi <rpiazzi@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Thu, 6 Oct 2011 11:23:29 +0000
Subject: Added redirection to https if http is called, to avoid unsecure
 problems with IE

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@855 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 pdf-as-web/src/main/webapp/jsp/signupload.jsp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'pdf-as-web/src')

diff --git a/pdf-as-web/src/main/webapp/jsp/signupload.jsp b/pdf-as-web/src/main/webapp/jsp/signupload.jsp
index f3f8a48..1866c46 100644
--- a/pdf-as-web/src/main/webapp/jsp/signupload.jsp
+++ b/pdf-as-web/src/main/webapp/jsp/signupload.jsp
@@ -155,6 +155,11 @@
 		<link rel="stylesheet" type="text/css" href="<%=baseUrl%>/css/extern-styles.css" />
 	<% } %>	
 	
+	<% if ((serverUrl.contains("http")) && (!serverUrl.contains("https"))) {
+		baseUrl = baseUrl.replace("http","https"); %>
+		<meta HTTP-EQUIV="REFRESH" content="0; url=<%=baseUrl %>/">
+	<% } %>
+		
 	
 	<meta http-equiv="pragma" content="no-cache,no-store,private,must-revalidate,max-stale=0,post-check=0,pre-check=0"/>
 	<meta http-equiv="cache-control" content="no-cache,no-store,must-revalidate,max-age=-1"/>
@@ -261,7 +266,7 @@
 
 			//Function for changing the IFrame position and size when the error has to be
 			//shown within the IFrame to no force a reload of the page
-			function moveErrorIFrame(object) {
+			function moveErrorIFrame(object,height) {
 				var signSettings = document.getElementById('signaturesettings');
 				var signButtons = document.getElementById('sign');
 				var signIframe = document.getElementById('signiframe');
@@ -278,6 +283,7 @@
 					document.getElementById('descriptionduring').style.display='none'
 				}
 				document.getElementById('descriptionerror').style.display='block';
+				document.getElementById('backlink').style.display='none';
 				
 				inhalt.removeChild(signSettings);
 				inhalt.removeChild(signButtons);
@@ -288,7 +294,7 @@
 				document.getElementById('iframe').width = '460px';
 				
 				document.getElementById('downloadsignbuttons').style.display='block';
-				document.getElementById('downloadsignbuttons').style.height = document.submitform.height_sign_div.value;
+				document.getElementById('downloadsignbuttons').style.height = height;
 				
 				document.getElementById('localbku').style.display='none';
 				document.getElementById('backlink').style.display='none';
@@ -390,6 +396,7 @@
 				}
 				var input = document.createElement('input');
 				input.style.verticalAlign = 'top';
+				input.size = '15';
 				fakeFileUpload.appendChild(input);
 				
 				var img = document.createElement('img');
@@ -652,7 +659,7 @@
 				</div>
 				<div class="linkssourcefield">
 					<textarea class="freetext" id="freetext" name="<%= FormFields.FIELD_SOURCE_FREETEXT %>" autocomplete="off" align="right" style="display:none"></textarea>
-					<input size="20" type="file" id="fileupload" name="<%= FormFields.FIELD_SOURCE_FILE %>" accept="application/pdf" autocomplete="off" align="right" style="display:block"/>
+					<input size="15" type="file" id="fileupload" name="<%= FormFields.FIELD_SOURCE_FILE %>" accept="application/pdf" autocomplete="off" align="right" style="display:block"/>
 				</div>
 			<% } else {%>
 				<div class="linkslabelkurz">
@@ -671,7 +678,7 @@
 				</div>
 				<div class="linkssourcefield">
 					<textarea class="freetext" id="freetext" name="<%= FormFields.FIELD_SOURCE_FREETEXT %>" autocomplete="off" align="right" style="display:block"><%= sign_freetext %></textarea>
-					<input size="20" type="file" id="fileupload" name="<%= FormFields.FIELD_SOURCE_FILE %>" accept="application/pdf" autocomplete="off" align="right" style="display:none"/>
+					<input size="15" type="file" id="fileupload" name="<%= FormFields.FIELD_SOURCE_FILE %>" accept="application/pdf" autocomplete="off" align="right" style="display:none"/>
 				</div>
 			<% } %>
 		<% } else { %>
@@ -691,7 +698,7 @@
 			</div>
 			<div class="linkssourcefield">
 				<textarea class="freetext" id="freetext" name="<%= FormFields.FIELD_SOURCE_FREETEXT %>" autocomplete="off" align="right" style="display:none"></textarea>
-				<input size="20" type="file" id="fileupload" name="<%= FormFields.FIELD_SOURCE_FILE %>" accept="application/pdf" autocomplete="off" align="right" style="display:block"/>
+				<input size="15" type="file" id="fileupload" name="<%= FormFields.FIELD_SOURCE_FILE %>" accept="application/pdf" autocomplete="off" align="right" style="display:block"/>
 			</div>
 		<% } %>
 		<!-- <div class="pdfasverticalspace"></div>
@@ -807,7 +814,7 @@
 				<div style="font-size:75%"><fmt:message key="nullrequestpage.localbku.advice"/></div>
 				<div class="pdfassmallverticalspace"></div>
 			</div>
-			<div id="backlink" align="left"><a href="<%=baseUrl%>/" target="_parent"><fmt:message key="common.cancel"/></a></div>
+			<div id="backlink" align="left" style="display:block"><a href="<%=baseUrl%>/" target="_parent"><fmt:message key="common.cancel"/></a></div>
 		</div>
 	</div>
 	<!-- Fake signature buttons for the case an error occured and this error has to be displayed
-- 
cgit v1.2.3