diff --git a/WebContent/html/webpages/administration/adminDeviceSettings.jsp b/WebContent/html/webpages/administration/adminDeviceSettings.jsp
index b6a908f..476c6a3 100644
--- a/WebContent/html/webpages/administration/adminDeviceSettings.jsp
+++ b/WebContent/html/webpages/administration/adminDeviceSettings.jsp
@@ -415,13 +415,6 @@ function fuzzyFilter(deviceArray)
for (var i = lockerFilterResults.length - 1; i >= 0; i--) {
lockerFilterResults[i].original.locker=lockerFilterResults[i].string;
}
- ////// Eight pass: filter by Admin Comments
- options.extract = function(arg) {return arg.admincomment;};
- var admincommentFilterResults = fuzzy.filter(searchText, deviceArray, options);
- // replace releveant field with bolded string
- for (var i = admincommentFilterResults.length - 1; i >= 0; i--) {
- admincommentFilterResults[i].original.admincomment=admincommentFilterResults[i].string;
- }
////// Ninth pass: filter by OS
options.extract = function(arg) {return arg.os;};
var osFilterResults = fuzzy.filter(searchText, deviceArray, options);
@@ -429,15 +422,8 @@ function fuzzyFilter(deviceArray)
for (var i = osFilterResults.length - 1; i >= 0; i--) {
osFilterResults[i].original.os=osFilterResults[i].string;
}
- ////// Tenth pass: filter by description
- options.extract = function(arg) {return arg.description;};
- var descriptionFilterResults = fuzzy.filter(searchText, deviceArray, options);
- // replace releveant field with bolded string
- for (var i = descriptionFilterResults.length - 1; i >= 0; i--) {
- descriptionFilterResults[i].original.description=descriptionFilterResults[i].string;
- }
- var filteredResults = union([nameFilterResults,macFilterResults,manufacturerFilterResults,hardwareFilterResults,modelFilterResults,serialFilterResults,lockerFilterResults,admincommentFilterResults,osFilterResults,descriptionFilterResults]);
+ var filteredResults = union([nameFilterResults,macFilterResults,manufacturerFilterResults,hardwareFilterResults,modelFilterResults,serialFilterResults,lockerFilterResults,osFilterResults]);
// this returns a filtered array of objects with attributes 'index', 'original', 'score', and 'string'
// I am interested in the 'original' attribute, which is the relevant object exactly as it was submitted,
diff --git a/src/utilities/Mail.java b/src/utilities/Mail.java
index 33c02b0..3e9499a 100644
--- a/src/utilities/Mail.java
+++ b/src/utilities/Mail.java
@@ -176,6 +176,41 @@ protected PasswordAuthentication getPasswordAuthentication(){
mex.printStackTrace();
}
}
+
+ public void sendTemporaryPassword(String password) {
+ String subject = "Your temporary {Application name} password";
+ String messege = ""
+ + ""
+ + ""
+ + "Your pasword has been reset. To login in, please use the password "+password+"
"
+ + "You will be prompted to set a new password. If you didn't initiate this, sorry. Someone's probably messing with you.
"
+ + ""
+ + ""
+ + "";
+ Properties properties = System.getProperties();
+ properties = setProp(sender, client.getEmail());
+ Session session = Session.getInstance(properties, new Authenticator() {
+ protected PasswordAuthentication getPasswordAuthentication(){
+ return new PasswordAuthentication(sender, password);
+ }
+ });
+
+ try {
+ Address address = new InternetAddress(client.getEmail());
+ MimeMessage message = new MimeMessage(session);
+ message.setFrom(address);
+ message.addRecipient(Message.RecipientType.TO, address);
+ message.setSubject(subject);
+ message.setText(messege,"utf-8","html");
+ message.saveChanges();
+ Transport.send(message);
+ System.out.println("Sent message successfully....");
+
+ } catch (Exception mex) {
+ mex.printStackTrace();
+ }
+ }
+
private Properties setProp(String email, String targetEmail) {
Properties props = null;
try {