Merge pull request #112 from arc12012/bugs

Bugs
arc12012 · Apr 13, 2017 · f22f1a4 · f22f1a4
2 parents 7535ac3 + 6fd0ac4
commit f22f1a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
@@ -43,8 +43,10 @@
 			}
 		}
 	}
-	if(navsso.equals("invalid"))//if we didn't get a cookie, redirect to the homepage to log in again!
+	if(navsso.equals("invalid")){//if we didn't get a cookie, redirect to the homepage to log in again!
 		response.sendRedirect("../../index.jsp");
+		return;
+	}
 	else{
 	self = EmployeeQueries.getEmployeeByID(Integer.parseInt(navsso));
 	navname = self.getName();

diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp
@@ -74,11 +74,11 @@
     	width: 20px;
     }
   </style>
-  <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.jsp"%>
-  </nav>
 </head>
 <body>
+<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
+  <%@ include file="navbar.jsp"%>
+</nav>
   <!-- Modal for transaction review. -->
   <div id="orderInfoModal" class="modal">
         <div class="modal-content">
@@ -122,17 +122,7 @@
   </div>
 
 <%
-//get user information
-Cookie[] cookies = request.getCookies();
-String sso = "";
-for(Cookie c : cookies){
-	if(c.getName().equals("ssoNum")){
-		sso = c.getValue();
-		break;
-	}
-}
-
-Device[] mydevices = DeviceQueries.getUserDevices(sso);
+Device[] mydevices = DeviceQueries.getUserDevices(navsso);
 //string representation of array.
 String deviceString = Device.arrayToString(mydevices);
 %>