From 5db533f9eeb40c3fa4a27f99478608e016611c71 Mon Sep 17 00:00:00 2001
From: "mayhew64@gmail.com"
 <mayhew64@gmail.com@4033779f-a91e-0410-96ef-6bf7bf53c507>
Date: Mon, 9 Nov 2009 03:58:08 +0000
Subject: [PATCH] Fixed some broken formatting on screen layout, added the
 Malicious code to the hidden lessons until real lessons can be built

git-svn-id: http://webgoat.googlecode.com/svn/trunk@410 4033779f-a91e-0410-96ef-6bf7bf53c507
---
 .../webapp/WEB-INF/webgoat-owasp.properties   |  1 +
 .../main/webapp/WEB-INF/webgoat.properties    |  1 +
 webgoat/src/main/webapp/css/webgoat.css       | 19 ++++++-
 webgoat/src/main/webapp/main.jsp              | 54 ++++++++++++-------
 4 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/webgoat/src/main/webapp/WEB-INF/webgoat-owasp.properties b/webgoat/src/main/webapp/WEB-INF/webgoat-owasp.properties
index 985d9dda0..3fb9410b1 100644
--- a/webgoat/src/main/webapp/WEB-INF/webgoat-owasp.properties
+++ b/webgoat/src/main/webapp/WEB-INF/webgoat-owasp.properties
@@ -1 +1,2 @@
 #lesson.BufferOverflow.hidden=true
+lesson.BlindScript.hidden=true
diff --git a/webgoat/src/main/webapp/WEB-INF/webgoat.properties b/webgoat/src/main/webapp/WEB-INF/webgoat.properties
index 985d9dda0..3fb9410b1 100755
--- a/webgoat/src/main/webapp/WEB-INF/webgoat.properties
+++ b/webgoat/src/main/webapp/WEB-INF/webgoat.properties
@@ -1 +1,2 @@
 #lesson.BufferOverflow.hidden=true
+lesson.BlindScript.hidden=true
diff --git a/webgoat/src/main/webapp/css/webgoat.css b/webgoat/src/main/webapp/css/webgoat.css
index cdcf9c32c..33f0ee536 100644
--- a/webgoat/src/main/webapp/css/webgoat.css
+++ b/webgoat/src/main/webapp/css/webgoat.css
@@ -184,6 +184,12 @@ html>body #navBar li {}
 	height: 100%;
 	padding: 10px;
 }
+#lessonAreaTop {
+	float: right;
+	width: 540px;
+	height: 15px;
+	padding: 10px;
+}
 
 #wrap {
 	width: 800px;
@@ -192,14 +198,23 @@ html>body #navBar li {}
 
 #topRight {
 	position:absolute;
-	left:485px;
+	left:380px;
 	top:0px;
-	width:320px;
+	width:400px;
 	height:23px;
 	z-index:3;
 	float: right;
 }
 
+#topLeft {
+	position:absolute;
+	left:100px;
+	top:0px;
+	width:400px;
+	height:23px;
+	z-index:3;
+	float: right;
+}
 #topRightInner {
 	position:absolute;
 	left:450px;
diff --git a/webgoat/src/main/webapp/main.jsp b/webgoat/src/main/webapp/main.jsp
index 6f290afbc..1accc610a 100644
--- a/webgoat/src/main/webapp/main.jsp
+++ b/webgoat/src/main/webapp/main.jsp
@@ -114,24 +114,35 @@ StringBuffer buildList = new StringBuffer();
 		</div><%
 			}%>
 		<div id="top"></div>
-		<div id="topRight">
-	  		<div align="left">
-	  		
-	  		<form method="get" action="attack" style="display:inline;">
-	  		Choose another language:
-	  		<select name="language" size="1" onChange="changeLanguage();">
-	  		<%
-	  			for(String lang: currentLesson.getAvailableLanguages()){
-	  				%> <option value="<%=lang%>" <% if(webSession.getCurrrentLanguage().equals(lang)) out.println("selected" );%>><%=lang%> </option><%
-	  					
-	  			}
-	  			
-	  		%>
-	  		</select>
-	  		 
-	  		</form><a href="attack?action=Logout" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('logout','','images/buttons/logoutOver.jpg',1)"><img src="images/buttons/logout.jpg" alt="LogOut" name="logout" width="45" height="22" border="0" id="logout" /></a>  <a href="#getFAQ()" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('help','','images/buttons/helpOver.jpg',1)"><img src="images/buttons/help.jpg" alt="Help" name="help" width="22" height="22" border="0" id="help" /></a></div>
+		<div id="topLeft">
+		<div align="left">
+		
+		<form method="get" action="attack" style="display: inline;">
+		Choose another language: <select name="language" size="1"
+			onChange="changeLanguage();">
+			<%
+					  			for(String lang: currentLesson.getAvailableLanguages()){
+					  				%>
+			<option value="<%=lang%>"
+				<% if(webSession.getCurrrentLanguage().equals(lang)) out.println("selected" );%>><%=lang%>
+			</option>
+			<%
+					  					
+					  			}
+					  			
+					  		%>
+		</select></form></div></div>
+		<div align="right" id="topRight">
+		<a href="attack?action=Logout" onmouseout="MM_swapImgRestore()"
+			onmouseover="MM_swapImage('logout','','images/buttons/logoutOver.jpg',1)"><img
+			src="images/buttons/logout.jpg" alt="LogOut" name="logout" width="45"
+			height="22" border="0" id="logout" /></a> <a href="#getFAQ()"
+			onmouseout="MM_swapImgRestore()"
+			onmouseover="MM_swapImage('help','','images/buttons/helpOver.jpg',1)"><img
+			src="images/buttons/help.jpg" alt="Help" name="help" width="22"
+			height="22" border="0" id="help" /></a>
 		</div>
-			<div id="lessonTitle" align="right"><%=currentLesson.getTitle()%></div>
+<div id="lessonTitle" align="right"><%=currentLesson.getTitle()%></div>
 			<div id="hMenuBar">
 				<% 
 				if (webSession.isAuthorizedInLesson(webSession.getRole(), WebSession.SHOWHINTS))
@@ -187,7 +198,7 @@ StringBuffer buildList = new StringBuffer();
 			</div>
 			<div id="twoCol">
 	 	 	<div id="menuSpacer"></div>
-	 	 	<div id="lessonArea">
+	 	 	<div id="lessonAreaTop">
 	 	 	<%
 			    if (currentLesson != null)
 			    {
@@ -197,8 +208,11 @@ StringBuffer buildList = new StringBuffer();
 			    	<div id="reset" class="info"><a href="<%=webSession.getRestartLink()%>"><%=WebGoatI18N.get("RestartLesson")%></a></div>
 			    	</div>
 	    			<%
-	    			}
-
+	    		}
+	 	 	%>
+	 	 	</div>
+	 	 	<div id="lessonArea">
+	 	 	<%
 				if (webSession.getHint() != null)
 				{
 					printHint = "<div id=\"hint\" class=\"info\">" + webSession.getHint() + "</div><br>";