-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #122 from arc12012/bugs
Bugs
- Loading branch information
Showing
18 changed files
with
341 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <%@ page import = "database.*,entities.User" %> | ||
| <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content=""> | ||
|
|
||
| <title>Synchrony Financial</title> | ||
|
|
||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> | ||
| <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script> | ||
| <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> | ||
| <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css"> | ||
| <link rel = "shortcut icon" href = "../imgs/synchrony-financial-logo-dlpx_1.ico"> | ||
| <link rel="stylesheet" type="text/css" href="../javascript/iconselect.js-1.0/css/lib/control/iconselect.css" > | ||
| <script type="text/javascript" src="../javascript/iconselect.js-1.0/lib/control/iconselect.js"></script> | ||
| <script type="text/javascript" src="../javascript/iconselect.js-1.0/lib/iscroll.js"></script> | ||
|
|
||
| <style> | ||
| </style> | ||
|
|
||
| </head> | ||
|
|
||
| <body> | ||
| <!-- Header. --> | ||
| <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal"> | ||
| <div class="container-fluid"><div class="navbar-header"><button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand" href="index.jsp"><img src="html/imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%;"></a></div><div id="navbar" class="navbar-collapse collapse" aria-expanded="false"><ul class="nav navbar-nav navbar-right"><li><a href="index.jsp">Synchrony Device Request System</a></li></ul></div></div> | ||
| </nav> | ||
| <!-- All profile information --> | ||
| <div style = "margin-left: 30px;"> | ||
| <!-- Where main user information is edited --> | ||
| <form action = "adminpasswordchange.jsp" class = "infobar"> | ||
| <h2>Change Your Password</h2> | ||
| <h3>Since it is your first time logging in, you need to update your password.</h3> | ||
| <div class = "form-group"> | ||
| <label for="old">Old Password</label> | ||
| <input style = "width: 200px;" name = "old" type = "password" class="form-control" id="old" required = "true"> | ||
| </div> | ||
| <div class = "form-group"> | ||
| <label for="new">New Password</label> | ||
| <input style = "width: 200px;" name = "new" type = "password" class="form-control" id="new" required = "true"> | ||
| </div> | ||
| <div class = "form-group"> | ||
| <label for="confirm">Confirm Password</label> | ||
| <input style = "width: 200px;" name = "confirm" type = "password" class="form-control" id="confirm" required = "true"> | ||
| </div> | ||
| <div class = "form-group"> | ||
| <label for="confirm">Pincode for Locker (4 digits long)</label> | ||
| <input style = "width: 200px;" name = "pincode" type = "password" class="form-control" id="pincode" required = "true"> | ||
| </div> | ||
| <button name = "submit" type="submit" class="btn btn-primary" id = "submit">Apply Changes</button> | ||
| </form> | ||
| </div> | ||
| </body> | ||
|
|
||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| <%@ page import = "database.*,entities.Device" %> | ||
| <%@ page import = "java.sql.*" %> | ||
| <%@ page language="java" contentType="text/html; charset=ISO-8859-1" | ||
| pageEncoding="ISO-8859-1"%> | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content=""> | ||
|
|
||
| <title>Synchrony Financial</title> | ||
|
|
||
| <link rel="stylesheet" type="text/css" href="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/css/jquery.dataTables.css"> | ||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> | ||
| <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script> | ||
| <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> | ||
| <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css"> | ||
| <link rel = "shortcut icon" href = "../imgs/synchrony-financial-logo-dlpx_1.ico"> | ||
| <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal"> | ||
| <%@ include file="navbar.jsp"%> | ||
| </nav> | ||
| </head> | ||
| <body> | ||
| <h2>Redirect Page</h2> | ||
| <p>You shouldn't be seeing this page :)</p> | ||
|
|
||
| <% | ||
| //add form was submitted | ||
| if(request.getParameter("submit") != null){ | ||
| String old = request.getParameter("old"); | ||
| String newpass = request.getParameter("new"); | ||
| String confirm = request.getParameter("confirm"); | ||
| String pincode = request.getParameter("pincode"); | ||
| String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317"; | ||
| String user = "b372dfe7409692"; | ||
| String password = "74f6e317"; | ||
| System.getenv("VCAP_SERVICES"); | ||
| Class.forName("com.mysql.jdbc.Driver"); | ||
| Connection connection = DriverManager.getConnection(database, user, password); | ||
| Statement stmt = connection.createStatement(); | ||
| ResultSet result; | ||
| result = stmt.executeQuery("select * FROM admin where Admin_ID='" + navsso + "' AND Password='" + old + "'"); | ||
| if(result.next()){//if old password is accurate | ||
| if (!old.equals(newpass) && newpass.equals(confirm) && pincode.length() == 4 && AdminQueries.pincodeInt(pincode)){//if the password is new AND both news ones are equal AND pincode is 4 digits AND pincode is a number | ||
| stmt.executeUpdate("UPDATE admin SET Password = \"" + newpass + "\", Password_Flag = 1, Pincode = " + pincode + " WHERE Admin_ID = " + navsso); | ||
| stmt.close(); | ||
| connection.close(); | ||
| response.sendRedirect("admin.jsp"); | ||
| return; | ||
| } | ||
| else{ | ||
| stmt.close(); | ||
| connection.close(); | ||
| response.sendRedirect("adminpasswordtryagain.jsp"); | ||
| return; | ||
| } | ||
| } | ||
| else{ | ||
| stmt.close(); | ||
| connection.close(); | ||
| response.sendRedirect("adminpasswordtryagain.jsp"); | ||
| return; | ||
| } | ||
| } | ||
| %> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <%@ page import = "database.*,entities.User" %> | ||
| <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content=""> | ||
|
|
||
| <title>Synchrony Financial</title> | ||
|
|
||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> | ||
| <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script> | ||
| <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> | ||
| <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css"> | ||
| <link rel = "shortcut icon" href = "../imgs/synchrony-financial-logo-dlpx_1.ico"> | ||
| <link rel="stylesheet" type="text/css" href="../javascript/iconselect.js-1.0/css/lib/control/iconselect.css" > | ||
| <script type="text/javascript" src="../javascript/iconselect.js-1.0/lib/control/iconselect.js"></script> | ||
| <script type="text/javascript" src="../javascript/iconselect.js-1.0/lib/iscroll.js"></script> | ||
|
|
||
| <style> | ||
| </style> | ||
|
|
||
| </head> | ||
|
|
||
| <body> | ||
| <!-- Header. --> | ||
| <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal"> | ||
| <div class="container-fluid"><div class="navbar-header"><button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand" href="index.jsp"><img src="html/imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%;"></a></div><div id="navbar" class="navbar-collapse collapse" aria-expanded="false"><ul class="nav navbar-nav navbar-right"><li><a href="index.jsp">Synchrony Device Request System</a></li></ul></div></div> | ||
| </nav> | ||
| <!-- All profile information --> | ||
| <div style = "margin-left: 30px;"> | ||
| <!-- Where main user information is edited --> | ||
| <form action = "adminpasswordchange.jsp" class = "infobar"> | ||
| <h2>Change Your Password</h2> | ||
| <h3>Since it is your first time logging in, you need to update your password.</h3> | ||
| <h4>Please make sure your old password is correct, your new ones are new and matching, and your pincode is 4 digits long.</h4> | ||
| <div class = "form-group"> | ||
| <label for="old">Old Password</label> | ||
| <input style = "width: 200px;" name = "old" type = "password" class="form-control" id="old" required = "true"> | ||
| </div> | ||
| <div class = "form-group"> | ||
| <label for="new">New Password</label> | ||
| <input style = "width: 200px;" name = "new" type = "password" class="form-control" id="new" required = "true"> | ||
| </div> | ||
| <div class = "form-group"> | ||
| <label for="confirm">Confirm Password</label> | ||
| <input style = "width: 200px;" name = "confirm" type = "password" class="form-control" id="confirm" required = "true"> | ||
| </div> | ||
| <div class = "form-group"> | ||
| <label for="confirm">Pincode for Locker (4 digits long)</label> | ||
| <input style = "width: 200px;" name = "pincode" type = "password" class="form-control" id="pincode" required = "true"> | ||
| </div> | ||
| <button name = "submit" type="submit" class="btn btn-primary" id = "submit">Apply Changes</button> | ||
| </form> | ||
| </div> | ||
| </body> | ||
|
|
||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <%@ page import = "database.*" %> | ||
| <%@ page language="java" contentType="text/html; charset=ISO-8859-1" | ||
| pageEncoding="ISO-8859-1"%> | ||
| <%@ page import = "java.sql.*" %> | ||
|
|
||
| <% | ||
| Cookie[] usercookies = request.getCookies(); | ||
| if(usercookies != null){ | ||
| for(Cookie c : usercookies){ | ||
| if(c.getName().equals("ssoNum") || c.getName().equals("admin")){//when (and if) we get to user cookie we want to reset it | ||
| c.setMaxAge(0);//delete current | ||
| String cookiename = c.getName(); | ||
| Cookie newCookie = new Cookie(cookiename,"");//make new one | ||
| newCookie.setMaxAge(0); | ||
| newCookie.setPath("/"); | ||
| response.addCookie(newCookie); | ||
| } | ||
| } | ||
| } | ||
| response.sendRedirect("index.jsp"); | ||
| return; | ||
| %> |
Oops, something went wrong.