Merge remote-tracking branch 'refs/remotes/origin/master' into bugs

arc12012 · Apr 23, 2017 · 4e02bc4 · 4e02bc4
2 parents d9c38d7 + 1a3e3d4
commit 4e02bc4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Senior Design.war b/Senior Design.war
diff --git a/WebContent/passwordreset.jsp b/WebContent/passwordreset.jsp
@@ -103,15 +103,15 @@ if(request.getParameter("reset") != null){
 	*/
 	ResultSet set = stmt.executeQuery("SELECT * from employee WHERE Email = \'" + email + "\' AND Employee_ID = " + ssoNum);
 	if(set.next()){
-		success = 1;
-		stmt.executeUpdate("UPDATE admin SET Password = \"" + hashpass + "\", Password_Flag = 0 WHERE Admin_ID = " + ssoNum);
 		User changepass = new User(ssoNum,
 			set.getInt("Location_ID"),
 			set.getString("Name"),
 			set.getString("Phone_Number"),
 			set.getString("Email"),
 			set.getInt("Img_Index"),
 			set.getInt("Notification_Preference"));
+		success = 1;
+		stmt.executeUpdate("UPDATE admin SET Password = \"" + hashpass + "\", Password_Flag = 0 WHERE Admin_ID = " + ssoNum);
 		stmt.close();
 		connection.close();
 		new Mail(changepass).sendTemporaryPassword(newpass);

diff --git a/src/utilities/Mail.java b/src/utilities/Mail.java
@@ -177,12 +177,12 @@ protected PasswordAuthentication getPasswordAuthentication(){
         }
     }
 
-    public void sendTemporaryPassword(String password) {
+    public void sendTemporaryPassword(String newpassword) {
         String subject = "Your temporary {Application name} password";
         String messege = "<!DOCTYPE html>"
                         + "<html>"
                         + "<body>"
-                        + "<p>Your pasword has been reset. To login in, please use the password <b>"+password+"</b></p><br>"
+                        + "<p>Your pasword has been reset. To login in, please use the password <b>"+newpassword+"</b></p><br>"
                         + "<p>You will be prompted to set a new password. If you didn't initiate this, sorry. Someone's probably messing with you.</p>"
                         + "</body>"
                         + "<footer style='text-align: center;'><font size='1'>To change notification settings, please visit your <a href='"+profileLink+"'>profile settings page</a></font></footer>"