just saving progress

arc12012 · Apr 13, 2017 · c4c90bc · c4c90bc
1 parent 0a919e1
commit c4c90bc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/WebContent/WEB-INF/lib/activation.jar b/WebContent/WEB-INF/lib/activation.jar
diff --git a/WebContent/WEB-INF/lib/mail.jar b/WebContent/WEB-INF/lib/mail.jar
diff --git a/WebContent/WEB-INF/lib/servlet-api.jar b/WebContent/WEB-INF/lib/servlet-api.jar
diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
@@ -1,4 +1,4 @@
-<%@ page import = "database.*,entities.User" %>
+<%@ page import = "database.*,entities.User,utilities.Mail" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
 <div class="container-fluid">
 	<div class="navbar-header">
@@ -24,14 +24,17 @@
 		</ul>
 	</div>
 	<%
+
+	Mail mail = new Mail();
+	mail.send();
+
+
 	Cookie[] usercookies = request.getCookies();
 	String navsso = "invalid";
 	String navname = "error";
 	Cookie newCookie;
 	//iterate cookies
-	System.out.println("Cookies:\n----------\n");
 	for(Cookie c : usercookies){
-	System.out.println(c.getName());
 		if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it
 			navsso = c.getValue(); 
 			c.setMaxAge(0);//delete current
@@ -41,7 +44,6 @@
 			break;
 		}
 	}
-	System.out.println("\nnavsso = "+navsso+"\n");
 	if(navsso.equals("invalid"))//if we didn't get a cookie, redirect to the homepage to log in again!
 		response.sendRedirect("../../index.jsp");
 	else{

diff --git a/WebContent/html/webpages/orderFormHandler.jsp b/WebContent/html/webpages/orderFormHandler.jsp
@@ -62,6 +62,10 @@ for(int i=0; i<devIDs.length; i++)
 	TicketQueries.generateTicket(sso, location, devIDs[i], request.getParameter("timeNeeded"));//TODO get ID somehow
 }
 
+// Now that tickets have been generated we will want to notify users.
+
+
+
 %>
 window.location.replace("shoppingCart.jsp");
 </script>